supercompat 3.1.0-beta.5 → 3.1.0

package/dist/index.cjs

@@ -462,21 +462,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;
@@ -3288,11 +3320,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;
@@ -3313,15 +3345,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, _2;
+        var run3, getMessages2, _, _1, _2;
         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;
                     _2 = (0, import_radash5.flat);
@@ -3422,12 +3454,12 @@ var toolCallsData = function(param) {
 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;
+            var clientAdapter, run3, onEvent2, getMessages2, client, opts, _tmp, providerResponse, e, _e_cause, _e_message, _e_cause_message, message, toolCallsRunStep, currentContent, currentToolCalls, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, chunk, _chunk_choices, choices, choice, delta, _delta_content, err;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
-                        clientAdapter = param.client, run4 = param.run, onEvent2 = param.onEvent, getMessages2 = param.getMessages;
-                        if (run4.status !== "queued") return [
+                        clientAdapter = param.client, run3 = param.run, onEvent2 = param.onEvent, getMessages2 = param.getMessages;
+                        if (run3.status !== "queued") return [
                             2
                         ];
                         client = supercompat({
@@ -3435,7 +3467,7 @@ var completionsRunAdapter = function() {
                         });
                         onEvent2({
                             event: "thread.run.in_progress",
-                            data: _object_spread_props(_object_spread({}, run4), {
+                            data: _object_spread_props(_object_spread({}, run3), {
                                 status: "in_progress"
                             })
                         });
@@ -3443,15 +3475,15 @@ var completionsRunAdapter = function() {
                         return [
                             4,
                             messages({
-                                run: run4,
+                                run: run3,
                                 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),
-                            (0, import_radash6.isEmpty)(run4.tools) ? {} : {
-                                tools: run4.tools
+                            (_tmp.messages = _state.sent(), _tmp.model = run3.model, _tmp.stream = true, _tmp.response_format = run3.response_format, _tmp),
+                            (0, import_radash6.isEmpty)(run3.tools) ? {} : {
+                                tools: run3.tools
                             }
                         ]);
                         _state.label = 2;
@@ -3479,7 +3511,7 @@ var completionsRunAdapter = function() {
                             2,
                             onEvent2({
                                 event: "thread.run.failed",
-                                data: _object_spread_props(_object_spread({}, run4), {
+                                data: _object_spread_props(_object_spread({}, run3), {
                                     failed_at: (0, import_dayjs.default)().unix(),
                                     status: "in_progress",
                                     last_error: {
@@ -3498,14 +3530,14 @@ var completionsRunAdapter = function() {
                                     id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
                                     object: "thread.message",
                                     completed_at: null,
-                                    run_id: run4.id,
+                                    run_id: run3.id,
                                     created_at: (0, import_dayjs.default)().unix(),
-                                    assistant_id: run4.assistant_id,
+                                    assistant_id: run3.assistant_id,
                                     incomplete_at: null,
                                     incomplete_details: null,
                                     metadata: {},
                                     attachments: [],
-                                    thread_id: run4.thread_id,
+                                    thread_id: run3.thread_id,
                                     content: [
                                         {
                                             text: {
@@ -3527,9 +3559,9 @@ var completionsRunAdapter = function() {
                             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,
+                                run_id: run3.id,
+                                assistant_id: run3.assistant_id,
+                                thread_id: run3.thread_id,
                                 type: "message_creation",
                                 status: "completed",
                                 completed_at: (0, import_dayjs.default)().unix(),
@@ -3598,9 +3630,9 @@ var completionsRunAdapter = function() {
                                 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,
+                                    run_id: run3.id,
+                                    assistant_id: run3.assistant_id,
+                                    thread_id: run3.thread_id,
                                     type: "tool_calls",
                                     status: "in_progress",
                                     completed_at: null,
@@ -3626,7 +3658,7 @@ var completionsRunAdapter = function() {
                             event: "thread.run.step.delta",
                             data: {
                                 object: "thread.run.step.delta",
-                                run_id: run4.id,
+                                run_id: run3.id,
                                 id: toolCallsRunStep.id,
                                 delta: {
                                     step_details: {
@@ -3747,7 +3779,7 @@ var completionsRunAdapter = function() {
                                 2,
                                 onEvent2({
                                     event: "thread.run.completed",
-                                    data: _object_spread_props(_object_spread({}, run4), {
+                                    data: _object_spread_props(_object_spread({}, run3), {
                                         status: "completed",
                                         completed_at: (0, import_dayjs.default)().unix()
                                     })
@@ -3758,7 +3790,7 @@ var completionsRunAdapter = function() {
                             2,
                             onEvent2({
                                 event: "thread.run.requires_action",
-                                data: _object_spread_props(_object_spread({}, run4), {
+                                data: _object_spread_props(_object_spread({}, run3), {
                                     status: "requires_action",
                                     required_action: {
                                         type: "submit_tool_outputs",
@@ -4059,26 +4091,26 @@ var import_radash10 = require("radash");
 // src/adapters/storage/prismaStorageAdapter/threads/runs/serializeRun.ts
 var import_dayjs5 = __toESM(require("dayjs"), 1);
 var serializeRun = function(param) {
-    var run4 = param.run;
+    var run3 = param.run;
     return {
-        id: run4.id,
+        id: run3.id,
         object: "thread.run",
-        created_at: (0, import_dayjs5.default)(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: (0, import_dayjs5.default)(run4.expiresAt).unix(),
-        started_at: run4.startedAt ? (0, import_dayjs5.default)(run4.startedAt).unix() : null,
-        cancelled_at: run4.cancelledAt ? (0, import_dayjs5.default)(run4.cancelledAt).unix() : null,
-        failed_at: run4.failedAt ? (0, import_dayjs5.default)(run4.failedAt).unix() : null,
-        completed_at: run4.completedAt ? (0, import_dayjs5.default)(run4.completedAt).unix() : null,
-        model: run4.model,
-        instructions: run4.instructions,
-        tools: run4.tools,
-        metadata: run4.metadata,
-        usage: run4.usage,
+        created_at: (0, import_dayjs5.default)(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: (0, import_dayjs5.default)(run3.expiresAt).unix(),
+        started_at: run3.startedAt ? (0, import_dayjs5.default)(run3.startedAt).unix() : null,
+        cancelled_at: run3.cancelledAt ? (0, import_dayjs5.default)(run3.cancelledAt).unix() : null,
+        failed_at: run3.failedAt ? (0, import_dayjs5.default)(run3.failedAt).unix() : null,
+        completed_at: run3.completedAt ? (0, import_dayjs5.default)(run3.completedAt).unix() : null,
+        model: run3.model,
+        instructions: run3.instructions,
+        tools: run3.tools,
+        metadata: run3.metadata,
+        usage: run3.usage,
         truncation_strategy: {
             type: "auto"
         },
@@ -4132,9 +4164,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,
@@ -4447,33 +4479,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: {
@@ -4519,7 +4551,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, _ref, 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:
@@ -4577,9 +4609,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) {
@@ -4608,7 +4640,7 @@ var post12 = function(param) {
                                                         }),
                                                         getMessages: getMessages({
                                                             prisma: prisma,
-                                                            run: run4
+                                                            run: run3
                                                         })
                                                     })
                                                 ];
@@ -4631,7 +4663,7 @@ var post12 = function(param) {
                                                 })({
                                                     event: "thread.run.failed",
                                                     data: {
-                                                        id: run4.id,
+                                                        id: run3.id,
                                                         failed_at: (0, import_dayjs7.default)().unix(),
                                                         last_error: {
                                                             code: "server_error",
@@ -4702,7 +4734,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:
@@ -4718,11 +4750,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: {
@@ -4740,7 +4772,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({
@@ -4993,7 +5025,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:
@@ -5008,7 +5040,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:
@@ -5042,12 +5074,12 @@ var post13 = function(param) {
                                                     })
                                                 ];
                                             case 1:
-                                                run4 = _state.sent();
+                                                run3 = _state.sent();
                                                 return [
                                                     4,
                                                     runAdapter({
                                                         run: serializeRun({
-                                                            run: run4
+                                                            run: run3
                                                         }),
                                                         onEvent: onEvent({
                                                             controller: _object_spread_props(_object_spread({}, controller), {
@@ -5059,7 +5091,7 @@ var post13 = function(param) {
                                                         }),
                                                         getMessages: getMessages({
                                                             prisma: prisma,
-                                                            run: run4
+                                                            run: run3
                                                         })
                                                     })
                                                 ];
@@ -5093,7 +5125,7 @@ var post13 = function(param) {
                             })
                         ];
                     case 2:
-                        run4 = _state.sent();
+                        run3 = _state.sent();
                         return [
                             4,
                             new Promise(function(resolve) {
@@ -5107,7 +5139,7 @@ var post13 = function(param) {
                                                             4,
                                                             runAdapter({
                                                                 run: serializeRun({
-                                                                    run: run4
+                                                                    run: run3
                                                                 }),
                                                                 onEvent: onEvent({
                                                                     controller: _object_spread_props(_object_spread({}, controller), {
@@ -5119,7 +5151,7 @@ var post13 = function(param) {
                                                                 }),
                                                                 getMessages: getMessages({
                                                                     prisma: prisma,
-                                                                    run: run4
+                                                                    run: run3
                                                                 })
                                                             })
                                                         ];
@@ -5141,7 +5173,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"
@@ -5250,7 +5282,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({
@@ -5263,13 +5295,12 @@ var prismaStorageAdapter = function(param) {
     };
 };
 // src/adapters/storage/responsesStorageAdapter/threads/serializeThread.ts
-var import_dayjs10 = __toESM(require("dayjs"), 1);
 var serializeThread2 = function(param) {
     var conversation = param.conversation;
     return {
         id: conversation.id,
         object: "thread",
-        created_at: (0, import_dayjs10.default)(conversation.created_at).unix(),
+        created_at: conversation.created_at,
         metadata: conversation.metadata,
         // TODO
         tool_resources: null
@@ -5336,10 +5367,9 @@ var threads2 = function(param) {
     };
 };
 // src/adapters/storage/responsesStorageAdapter/threads/messages/post.ts
-var import_dayjs12 = __toESM(require("dayjs"), 1);
+var import_dayjs10 = __toESM(require("dayjs"), 1);
 var import_radash14 = require("radash");
-// src/adapters/storage/responsesStorageAdapter/threads/messages/serializeMessage.ts
-var import_dayjs11 = __toESM(require("dayjs"), 1);
+// src/lib/items/serializeItemAsMessage.ts
 var import_radash13 = require("radash");
 var serializeContent2 = function(param) {
     var item = param.item;
@@ -5371,14 +5401,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 || (0, import_radash13.uid)(24),
         object: "thread.message",
-        created_at: (0, import_dayjs11.default)(initialCreatedAt).add(index, "seconds").unix(),
+        created_at: createdAt,
         thread_id: threadId,
         completed_at: null,
         incomplete_at: null,
@@ -5387,18 +5419,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
+var import_radash15 = require("radash");
 var messageContentBlocks2 = function(param) {
     var content = param.content;
     if ((0, import_radash14.isArray)(content)) {
@@ -5439,48 +5472,39 @@ var messageContentBlocks2 = function(param) {
     ];
 };
 var post16 = function(param) {
-    var openai = param.openai;
+    var openai = param.openai, openaiAssistant = param.openaiAssistant, 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;
             return _ts_generator(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        url = new URL(urlString);
-                        _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(messagesRegexp)), 2), threadId = _url_pathname_match[1];
-                        body = JSON.parse(options.body);
-                        role = body.role, content = body.content, metadata = body.metadata;
-                        return [
-                            4,
-                            openai.conversations.items.create(threadId, {
-                                items: [
-                                    {
-                                        type: "message",
-                                        role: role,
-                                        content: messageContentBlocks2({
-                                            content: content
-                                        })
-                                    }
-                                ]
-                            })
-                        ];
-                    case 1:
-                        items = _state.sent();
-                        return [
-                            2,
-                            new Response(JSON.stringify(serializeMessage5({
-                                item: items.data[0],
-                                threadId: threadId,
-                                initialCreatedAt: (0, import_dayjs12.default)().subtract(1, "seconds").format(),
-                                index: 0
-                            })), {
-                                status: 200,
-                                headers: {
-                                    "Content-Type": "application/json"
-                                }
-                            })
-                        ];
-                }
+                url = new URL(urlString);
+                _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(messagesRegexp)), 2), threadId = _url_pathname_match[1];
+                body = JSON.parse(options.body);
+                role = body.role, content = body.content, metadata = body.metadata;
+                item = {
+                    id: "msg_".concat((0, import_radash15.uid)(24)),
+                    status: "in_progress",
+                    type: "message",
+                    role: role,
+                    content: messageContentBlocks2({
+                        content: content
+                    })
+                };
+                createResponseItems.push(item);
+                return [
+                    2,
+                    new Response(JSON.stringify(serializeItemAsMessage({
+                        item: item,
+                        threadId: threadId,
+                        openaiAssistant: openaiAssistant,
+                        createdAt: (0, import_dayjs10.default)().unix()
+                    })), {
+                        status: 200,
+                        headers: {
+                            "Content-Type": "application/json"
+                        }
+                    })
+                ];
             });
         });
         return function(urlString, options) {
@@ -5489,42 +5513,105 @@ var post16 = function(param) {
     }();
 };
 // src/adapters/storage/responsesStorageAdapter/threads/messages/get.ts
-var import_radash15 = require("radash");
-var import_dayjs13 = __toESM(require("dayjs"), 1);
+var import_radash16 = require("radash");
+// 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 openai = param.openai, openaiAssistant = param.openaiAssistant;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString) {
-            var url, _url_pathname_match, threadId, _ref, limit, order, after, items, initialCreatedAt;
+            var url, _url_pathname_match, threadId, _ref, limit, order, after, conversation, sortOrder, items, itemsWithRunIds, responseMap, timestampedItems;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
                         url = new URL(urlString);
                         _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(messagesRegexp)), 2), threadId = _url_pathname_match[1];
-                        _ref = (0, import_radash15.assign)({
+                        _ref = (0, import_radash16.assign)({
                             limit: "20",
                             order: "desc"
                         }, Object.fromEntries(url.searchParams)), limit = _ref.limit, order = _ref.order, after = _ref.after;
+                        return [
+                            4,
+                            openai.conversations.retrieve(threadId)
+                        ];
+                    case 1:
+                        conversation = _state.sent();
+                        sortOrder = order === "asc" ? "asc" : "desc";
                         return [
                             4,
                             openai.conversations.items.list(threadId, {
-                                limit: parseInt(limit),
+                                limit: parseInt(limit, 10),
                                 after: after,
-                                order: order
+                                order: sortOrder
                             })
                         ];
-                    case 1:
+                    case 2:
                         items = _state.sent();
-                        initialCreatedAt = (0, import_dayjs13.default)().subtract(items.data.length, "seconds").format();
+                        itemsWithRunIds = mapItemsWithRunIds({
+                            conversation: conversation,
+                            items: items.data
+                        });
+                        return [
+                            4,
+                            fetchResponsesForItems({
+                                openai: openai,
+                                items: itemsWithRunIds
+                            })
+                        ];
+                    case 3:
+                        responseMap = _state.sent();
+                        timestampedItems = assignTimestamps({
+                            items: itemsWithRunIds,
+                            responseMap: responseMap,
+                            sortOrder: sortOrder,
+                            conversationCreatedAt: conversation.created_at
+                        });
                         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,
@@ -5544,20 +5631,147 @@ 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 openai, items, responseIds, results, map;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    openai = param.openai, 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 openai.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 openai = param.openai, openaiAssistant = param.openaiAssistant, createResponseItems = param.createResponseItems;
     return {
         post: post16({
-            openai: openai
+            openai: openai,
+            openaiAssistant: openaiAssistant,
+            createResponseItems: createResponseItems
         }),
         get: get14({
-            openai: openai
+            openai: openai,
+            openaiAssistant: openaiAssistant
         })
     };
 };
 // src/adapters/storage/responsesStorageAdapter/threads/runs/get.ts
-var import_radash16 = require("radash");
+var import_radash17 = require("radash");
 var get15 = function(param) {
     var prisma = param.prisma;
     return /*#__PURE__*/ function() {
@@ -5566,12 +5780,24 @@ var get15 = function(param) {
             return _ts_generator(this, function(_state) {
                 url = new URL(urlString);
                 _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(runsRegexp)), 2), threadId = _url_pathname_match[1];
-                _ref = (0, import_radash16.assign)({
+                _ref = (0, import_radash17.assign)({
                     limit: "20",
                     order: "desc"
                 }, Object.fromEntries(url.searchParams)), limit = _ref.limit, order = _ref.order, after = _ref.after;
                 pageSize = parseInt(limit, 10);
-                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) {
@@ -5580,39 +5806,101 @@ var get15 = function(param) {
     }();
 };
 // src/adapters/storage/responsesStorageAdapter/threads/runs/post.ts
-var import_radash17 = require("radash");
-var import_dayjs15 = __toESM(require("dayjs"), 1);
 var import_radash18 = require("radash");
-// src/adapters/storage/responsesStorageAdapter/threads/runs/serializeRun.ts
-var import_dayjs14 = __toESM(require("dayjs"), 1);
-var serializeRun2 = function(param) {
+var import_dayjs11 = __toESM(require("dayjs"), 1);
+var import_radash19 = require("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: (0, import_dayjs14.default)(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: (0, import_dayjs14.default)(run.expiresAt).unix(),
-        started_at: run.startedAt ? (0, import_dayjs14.default)(run.startedAt).unix() : null,
-        cancelled_at: run.cancelledAt ? (0, import_dayjs14.default)(run.cancelledAt).unix() : null,
-        failed_at: run.failedAt ? (0, import_dayjs14.default)(run.failedAt).unix() : null,
-        completed_at: run.completedAt ? (0, import_dayjs14.default)(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,
@@ -5620,78 +5908,342 @@ 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, _ref, 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
-                        });
-                        _ref = (0, import_radash18.assign)(_object_spread({}, defaultAssistant, openaiAssistant), body), model = _ref.model, instructions = _ref.instructions, tools = _ref.tools, metadata = _ref.metadata, response_format = _ref.response_format, truncation_strategy = _ref.truncation_strategy;
-                        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();
-                        readableStream = new ReadableStream({
-                            start: function start(controller) {
-                                return _async_to_generator(function() {
-                                    var error, _error_cause, _error_message, _error_cause_message, event;
-                                    return _ts_generator(this, function(_state) {
-                                        switch(_state.label){
-                                            case 0:
-                                                _state.trys.push([
-                                                    0,
+}
+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 last6 = next[next.length - 1];
+            if (last6 && last6.responseId === responseId2) {
+                last6.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 openai, threadId, responseId2, itemIds, conversation, updated;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    openai = param.openai, threadId = param.threadId, responseId2 = param.responseId, itemIds = param.itemIds;
+                    return [
+                        4,
+                        openai.conversations.retrieve(threadId)
+                    ];
+                case 1:
+                    conversation = _state.sent();
+                    updated = appendItemIdsToConversationMetadata({
+                        metadata: conversation.metadata,
+                        responseId: responseId2,
+                        itemIds: itemIds
+                    });
+                    return [
+                        4,
+                        openai.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 openai = param.openai, openaiAssistant = param.openaiAssistant, runAdapter = param.runAdapter, createResponseItems = param.createResponseItems;
+    return /*#__PURE__*/ function() {
+        var _ref = _async_to_generator(function(urlString, options) {
+            var url, _url_pathname_match, threadId, body, assistant_id, stream, _ref, model, instructions, // additional_instructions,
+            tools, metadata, response_format, truncation_strategy, response, readableStream, _response_output, itemIds, data;
+            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;
+                        _ref = (0, import_radash19.assign)(_object_spread({}, defaultAssistant, openaiAssistant), body), model = _ref.model, instructions = _ref.instructions, tools = _ref.tools, metadata = _ref.metadata, response_format = _ref.response_format, truncation_strategy = _ref.truncation_strategy;
+                        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: createResponseItems
+                            }))
+                        ];
+                    case 1:
+                        response = _state.sent();
+                        readableStream = new ReadableStream({
+                            start: function start(controller) {
+                                return _async_to_generator(function() {
+                                    var error, _error_cause, _error_message, _error_cause_message, event;
+                                    return _ts_generator(this, function(_state) {
+                                        switch(_state.label){
+                                            case 0:
+                                                _state.trys.push([
+                                                    0,
                                                     2,
                                                     ,
                                                     3
@@ -5699,6 +6251,7 @@ var post17 = function(param) {
                                                 return [
                                                     4,
                                                     runAdapter({
+                                                        threadId: threadId,
                                                         response: response,
                                                         onEvent: /*#__PURE__*/ function() {
                                                             var _ref = _async_to_generator(function(event) {
@@ -5727,8 +6280,8 @@ var post17 = function(param) {
                                                 event = {
                                                     event: "thread.run.failed",
                                                     data: {
-                                                        id: (0, import_radash17.uid)(24),
-                                                        failed_at: (0, import_dayjs15.default)().unix(),
+                                                        id: (0, import_radash18.uid)(24),
+                                                        failed_at: (0, import_dayjs11.default)().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 : "")
@@ -5750,29 +6303,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,
+                            2
+                        ];
+                        return [
+                            2,
+                            new Response(readableStream, {
+                                headers: {
+                                    "Content-Type": "text/event-stream"
+                                }
+                            })
+                        ];
+                    case 2:
+                        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,
+                            4
+                        ];
+                        return [
+                            4,
+                            saveResponseItemsToConversationMetadata({
+                                openai: openai,
+                                threadId: threadId,
+                                responseId: response.id,
+                                itemIds: itemIds
+                            })
+                        ];
+                    case 3:
+                        _state.sent();
+                        _state.label = 4;
+                    case 4:
+                        data = serializeResponseAsRun({
+                            response: response,
+                            assistantId: assistant_id
+                        });
+                        return [
+                            2,
+                            new Response(JSON.stringify(data), {
+                                status: 200,
+                                headers: {
+                                    "Content-Type": "application/json"
+                                }
+                            })
+                        ];
+                    case 5:
                         return [
                             2
                         ];
@@ -5786,7 +6365,7 @@ 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 openai = param.openai, openaiAssistant = param.openaiAssistant, runAdapter = param.runAdapter, createResponseItems = param.createResponseItems;
     return {
         get: get15({
             openai: openai
@@ -5794,71 +6373,375 @@ var runs2 = function(param) {
         post: post17({
             openai: openai,
             openaiAssistant: openaiAssistant,
+            createResponseItems: createResponseItems,
             runAdapter: runAdapter
         })
     };
 };
 // src/adapters/storage/responsesStorageAdapter/threads/run/get.ts
 var get16 = function(param) {
-    var openai = param.openai;
+    var openai = param.openai, openaiAssistant = param.openaiAssistant;
     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;
             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,
+                            openai.responses.retrieve(runId)
+                        ];
+                    case 1:
+                        response = _state.sent();
+                        data = serializeResponseAsRun({
+                            response: response,
+                            assistantId: openaiAssistant.id
+                        });
+                        return [
+                            2,
+                            new Response(JSON.stringify(data), {
+                                status: 200,
+                                headers: {
+                                    "Content-Type": "application/json",
+                                    "openai-poll-after-ms": "5000"
+                                }
+                            })
+                        ];
+                }
             });
         });
-        return function(urlString) {
-            return _ref.apply(this, arguments);
-        };
-    }();
-};
-// src/adapters/storage/responsesStorageAdapter/threads/run/index.ts
-var run3 = function(param) {
-    var openai = param.openai, runAdapter = param.runAdapter;
-    return {
-        get: get16({
-            openai: openai
-        })
-    };
-};
+        return function(urlString) {
+            return _ref.apply(this, arguments);
+        };
+    }();
+};
+// src/adapters/storage/responsesStorageAdapter/threads/run/index.ts
+var run2 = function(param) {
+    var openai = param.openai, openaiAssistant = param.openaiAssistant, runAdapter = param.runAdapter;
+    return {
+        get: get16({
+            openai: openai,
+            openaiAssistant: openaiAssistant
+        })
+    };
+};
+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
+var import_radash21 = require("radash");
+// src/lib/items/serializeItemAsRunStep.ts
+var import_dayjs12 = __toESM(require("dayjs"), 1);
 var import_radash20 = require("radash");
-// src/adapters/storage/responsesStorageAdapter/threads/runs/steps/serializeRunStep.ts
-var import_dayjs16 = __toESM(require("dayjs"), 1);
-var import_radash19 = require("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 = (0, import_dayjs16.default)().unix();
-    var assistantId = "asst_".concat((0, import_radash19.uid)(24));
-    var runId = "run_".concat((0, import_radash19.uid)(24));
-    var itemId = typeof item.id === "string" ? item.id : "item_".concat((0, import_radash19.uid)(18));
+function serializeItemAsRunStep(param) {
+    var item = param.item, items = param.items, threadId = param.threadId, openaiAssistant = param.openaiAssistant, _param_runId = param.runId, runId = _param_runId === void 0 ? "run_".concat((0, import_radash20.uid)(24)) : _param_runId, tmp = param.status, status3 = tmp === void 0 ? "completed" : tmp, _param_completedAt = param.completedAt, completedAt = _param_completedAt === void 0 ? (0, import_dayjs12.default)().unix() : _param_completedAt;
+    var itemId = typeof item.id === "string" ? item.id : "item_".concat((0, import_radash20.uid)(18));
     var base = {
         id: itemId,
-        // <- always string
         object: "thread.run.step",
-        created_at: now,
-        assistant_id: assistantId,
+        created_at: (0, import_dayjs12.default)().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: {
@@ -5874,16 +6757,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), {
@@ -5903,44 +6787,105 @@ 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 openai = param.openai, openaiAssistant = param.openaiAssistant;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString) {
-            var _this, url, _url_pathname_match, threadId, runId, _ref, limit, order, after, items, _id;
+            var _this, url, _url_pathname_match, threadId, runId, response, functionCalls, functionCallOutputsResponses, functionCallOutputs, nonFcItems, data, _id;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
                         url = new URL(urlString);
                         _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(stepsRegexp)), 3), threadId = _url_pathname_match[1], runId = _url_pathname_match[2];
-                        _ref = (0, import_radash20.assign)({
-                            limit: "20",
-                            order: "desc"
-                        }, Object.fromEntries(url.searchParams)), limit = _ref.limit, order = _ref.order, after = _ref.after;
                         return [
                             4,
-                            openai.conversations.items.list(threadId, {
-                                limit: parseInt(limit),
-                                after: after,
-                                order: order
-                            })
+                            openai.responses.retrieve(runId)
                         ];
                     case 1:
-                        items = _state.sent();
+                        response = _state.sent();
+                        functionCalls = response.output.filter(function(item) {
+                            return item.type === "function_call";
+                        });
+                        return [
+                            4,
+                            pMap(functionCalls, /*#__PURE__*/ function() {
+                                var _ref = _async_to_generator(function(functionCall) {
+                                    var items;
+                                    return _ts_generator(this, function(_state) {
+                                        switch(_state.label){
+                                            case 0:
+                                                return [
+                                                    4,
+                                                    openai.conversations.items.list(threadId, {
+                                                        after: functionCall.id,
+                                                        order: "asc"
+                                                    })
+                                                ];
+                                            case 1:
+                                                items = _state.sent();
+                                                return [
+                                                    2,
+                                                    items.data.find(function(item) {
+                                                        return item.type === "function_call_output" && item.call_id === functionCall.call_id;
+                                                    })
+                                                ];
+                                        }
+                                    });
+                                });
+                                return function(functionCall) {
+                                    return _ref.apply(this, arguments);
+                                };
+                            }())
+                        ];
+                    case 2:
+                        functionCallOutputsResponses = _state.sent();
+                        functionCallOutputs = functionCallOutputsResponses.filter(Boolean);
+                        nonFcItems = response.output.filter(function(item) {
+                            return item.type !== "function_call";
+                        });
+                        data = response.output.flatMap(function(item) {
+                            var step = serializeItemAsRunStep({
+                                item: item,
+                                items: functionCallOutputs,
+                                threadId: threadId,
+                                openaiAssistant: openaiAssistant,
+                                runId: response.id
+                            });
+                            if (item.type === "function_call") {
+                                var synthCreation = {
+                                    id: "mc".concat(item.id),
+                                    run_id: response.id,
+                                    status: "completed",
+                                    completed_at: step.created_at,
+                                    step_details: {
+                                        type: "message_creation",
+                                        message_creation: {
+                                            message_id: item.id
+                                        }
+                                    }
+                                };
+                                return [
+                                    synthCreation,
+                                    step
+                                ];
+                            }
+                            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: (_id = (_this = (0, import_radash20.last)(items.data)) === null || _this === void 0 ? void 0 : _this.id) !== null && _id !== void 0 ? _id : null
+                                data: data,
+                                has_more: false,
+                                last_id: (_id = (_this = (0, import_radash21.last)(response.output)) === null || _this === void 0 ? void 0 : _this.id) !== null && _id !== void 0 ? _id : null
                             }), {
                                 status: 200,
                                 headers: {
@@ -5958,10 +6903,11 @@ var get17 = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/threads/runs/steps/index.ts
 var steps2 = function(param) {
-    var openai = param.openai;
+    var openai = param.openai, openaiAssistant = param.openaiAssistant;
     return {
         get: get17({
-            openai: openai
+            openai: openai,
+            openaiAssistant: openaiAssistant
         })
     };
 };
@@ -5977,7 +6923,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 {
@@ -5991,7 +6937,7 @@ var post18 = 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, runId, body, tool_outputs, stream, response, readableStream;
+            var url, _url_pathname_match, threadId, runId, body, tool_outputs, stream, functionCallOutputItems, previousResponse, response, readableStream;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -5999,18 +6945,20 @@ 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.retrieve(runId)
+                        ];
+                    case 1:
+                        previousResponse = _state.sent();
                         return [
                             4,
                             openai.responses.create(_object_spread({
                                 conversation: threadId,
-                                input: serializeInput({
-                                    tool_outputs: tool_outputs
-                                }),
+                                input: functionCallOutputItems,
                                 instructions: openaiAssistant.instructions,
                                 model: openaiAssistant.model,
                                 // metadata,
@@ -6019,7 +6967,7 @@ var post18 = function(param) {
                                 tools: openaiAssistant.tools
                             })))
                         ];
-                    case 1:
+                    case 2:
                         response = _state.sent();
                         readableStream = new ReadableStream({
                             start: function start(controller) {
@@ -6027,11 +6975,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({
+                                                        threadId: threadId,
                                                         response: response,
-                                                        // run: serializeRun({ run }),
                                                         onEvent: /*#__PURE__*/ function() {
                                                             var _ref = _async_to_generator(function(event) {
                                                                 return _ts_generator(this, function(_state) {
@@ -6086,57 +7052,100 @@ var submitToolOutputs2 = function(param) {
         })
     };
 };
-// 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 openaiAssistant = param.openaiAssistant;
     return /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(_url, options) {
-            var body, model, instructions;
+        var _ref = _async_to_generator(function(urlString) {
             return _ts_generator(this, function(_state) {
-                body = JSON.parse(options.body);
-                model = body.model, instructions = body.instructions;
-                throw new Error("Not implemented");
+                return [
+                    2,
+                    new Response(JSON.stringify({
+                        data: [
+                            openaiAssistant
+                        ],
+                        has_more: false,
+                        last_id: openaiAssistant.id
+                    }), {
+                        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(param) {
+    var _openaiAssistant = param.openaiAssistant;
+    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 openai = param.openai, openaiAssistant = param.openaiAssistant;
     return {
+        get: get18({
+            openaiAssistant: openaiAssistant
+        }),
         post: post19({
-            openai: openai
+            openaiAssistant: openaiAssistant
         })
     };
 };
 // src/adapters/storage/responsesStorageAdapter/index.ts
 var responsesStorageAdapter = function(param) {
     var openai = param.openai, openaiAssistant = param.openaiAssistant;
+    var createResponseItems = [];
     return function(param) {
         var runAdapter = param.runAdapter;
         var _obj;
         return {
             requestHandlers: (_obj = {
-                "^/(?:v1/|openai/)?assistants$": assistants2({
-                    openai: openai
+                "^/(?:v1|/?openai)/assistants$": assistants2({
+                    openai: openai,
+                    openaiAssistant: openaiAssistant
                 }),
                 "^/(?:v1|/?openai)/threads$": threads2({
                     openai: openai
                 })
             }, _define_property(_obj, messagesRegexp, messages3({
-                openai: openai
+                openai: openai,
+                openaiAssistant: openaiAssistant,
+                createResponseItems: createResponseItems
             })), _define_property(_obj, runsRegexp, runs2({
                 openai: openai,
                 openaiAssistant: openaiAssistant,
-                runAdapter: runAdapter
-            })), _define_property(_obj, runRegexp, run3({
+                runAdapter: runAdapter,
+                createResponseItems: createResponseItems
+            })), _define_property(_obj, runRegexp, run2({
                 openai: openai,
+                openaiAssistant: openaiAssistant,
                 runAdapter: runAdapter
             })), _define_property(_obj, stepsRegexp, steps2({
-                openai: openai
+                openai: openai,
+                openaiAssistant: openaiAssistant
             })), _define_property(_obj, submitToolOutputsRegexp, submitToolOutputs2({
                 openai: openai,
                 openaiAssistant: openaiAssistant,
@@ -6146,462 +7155,238 @@ var responsesStorageAdapter = function(param) {
     };
 };
 // src/adapters/run/responsesRunAdapter/index.ts
-var import_dayjs17 = __toESM(require("dayjs"), 1);
-var import_radash21 = require("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;
-            return _ts_generator(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        response = param.response, onEvent2 = param.onEvent;
-                        now = (0, import_dayjs17.default)().unix();
-                        runId = "run_".concat((0, import_radash21.uid)(18));
-                        threadId = "thread_".concat((0, import_radash21.uid)(18));
-                        asstId = "asst_".concat((0, import_radash21.uid)(18));
-                        model = "unknown";
-                        msg = {
-                            id: "msg_".concat((0, import_radash21.uid)(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
-                                }
-                            })
-                        ];
-                    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
-                                }
-                            })
-                        ];
-                    case 2:
-                        _state.sent();
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.message.created",
-                                data: msg
-                            })
-                        ];
-                    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((0, import_radash21.uid)(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: (0, import_dayjs17.default)().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: (0, import_dayjs17.default)().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:
+var import_dayjs13 = __toESM(require("dayjs"), 1);
+var import_radash22 = require("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 openai = param.openai, openaiAssistant = param.openaiAssistant;
+    return /*#__PURE__*/ function() {
+        var _ref = _async_to_generator(function(param) {
+            var threadId, response, onEvent2, responseCreatedResponse, toolCalls, itemIds, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, event, _, toolCalls2, toolCall, err, e;
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        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,
+                            42,
+                            44,
+                            47
                         ]);
                         _iteratorAbruptCompletion = false, _didIteratorError = false;
-                        _state.label = 5;
-                    case 5:
+                        _state.label = 2;
+                    case 2:
                         _state.trys.push([
-                            5,
-                            34,
+                            2,
                             35,
-                            40
+                            36,
+                            41
                         ]);
                         _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
+                            34
                         ];
                         _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 [
                                     3,
-                                    8
+                                    7
                                 ];
                             case "response.completed":
                                 return [
                                     3,
                                     9
                                 ];
-                            case "response.error":
+                            case "response.failed":
                                 return [
                                     3,
-                                    16
+                                    14
                                 ];
                             case "response.output_text.delta":
                                 return [
                                     3,
-                                    18
-                                ];
-                            case "response.output_text.done":
-                                return [
-                                    3,
-                                    20
+                                    16
                                 ];
                             case "response.output_item.added":
                                 return [
                                     3,
-                                    23
+                                    18
                                 ];
                             case "response.output_item.done":
                                 return [
                                     3,
-                                    26
+                                    24
                                 ];
                             case "response.function_call_arguments.delta":
-                                return [
-                                    3,
-                                    27
-                                ];
-                            case "response.function_call_arguments.done":
                                 return [
                                     3,
                                     30
                                 ];
                         }
-                        return [
-                            3,
-                            31
-                        ];
-                    case 8:
                         return [
                             3,
                             32
                         ];
-                    case 9:
+                    case 5:
+                        responseCreatedResponse = event.response;
                         return [
                             4,
                             onEvent2({
-                                event: "thread.message.completed",
-                                data: _object_spread_props(_object_spread({}, msg), {
-                                    status: "completed"
+                                event: "thread.run.created",
+                                data: serializeResponseAsRun({
+                                    response: event.response,
+                                    assistantId: openaiAssistant.id
                                 })
                             })
                         ];
-                    case 10:
+                    case 6:
                         _state.sent();
-                        if (!sawToolCalls) return [
+                        return [
                             3,
-                            13
+                            33
                         ];
+                    case 7:
                         return [
                             4,
-                            completeToolCallsStep()
+                            onEvent2({
+                                event: "thread.run.in_progress",
+                                data: serializeResponseAsRun({
+                                    response: event.response,
+                                    assistantId: openaiAssistant.id
+                                })
+                            })
                         ];
-                    case 11:
+                    case 8:
                         _state.sent();
-                        finalCalls = callOrder.map(function(cid) {
-                            return callsById.get(cid);
-                        }).filter(Boolean);
+                        return [
+                            3,
+                            33
+                        ];
+                    case 9:
+                        itemIds = event.response.output.filter(function(o) {
+                            return o.id;
+                        }).map(function(o) {
+                            return o.id;
+                        });
+                        toolCalls2 = event.response.output.filter(function(o) {
+                            return o.type === "function_call";
+                        });
+                        if (!(toolCalls2.length > 0)) return [
+                            3,
+                            11
+                        ];
                         return [
                             4,
                             onEvent2({
                                 event: "thread.run.requires_action",
-                                data: {
-                                    id: runId,
-                                    object: "thread.run",
-                                    thread_id: threadId,
-                                    assistant_id: asstId,
+                                data: _object_spread({}, serializeResponseAsRun({
+                                    response: event.response,
+                                    assistantId: openaiAssistant.id
+                                }), {
                                     status: "requires_action",
                                     required_action: {
                                         type: "submit_tool_outputs",
                                         submit_tool_outputs: {
-                                            // IMPORTANT: these must be keyed by stable call_id
-                                            tool_calls: finalCalls
+                                            tool_calls: serializeToolCalls2({
+                                                toolCalls: toolCalls2
+                                            })
                                         }
                                     }
-                                }
+                                })
                             })
                         ];
-                    case 12:
+                    case 10:
                         _state.sent();
                         return [
                             3,
-                            15
+                            13
                         ];
-                    case 13:
+                    case 11:
                         return [
                             4,
                             onEvent2({
                                 event: "thread.run.completed",
-                                data: {
-                                    id: runId,
-                                    object: "thread.run",
-                                    thread_id: threadId,
-                                    assistant_id: asstId,
-                                    status: "completed",
-                                    completed_at: (0, import_dayjs17.default)().unix()
-                                }
+                                data: serializeResponseAsRun({
+                                    response: event.response,
+                                    assistantId: openaiAssistant.id
+                                })
                             })
                         ];
-                    case 14:
+                    case 12:
                         _state.sent();
-                        _state.label = 15;
+                        _state.label = 13;
+                    case 13:
+                        return [
+                            3,
+                            33
+                        ];
+                    case 14:
+                        return [
+                            4,
+                            onEvent2({
+                                event: "thread.run.failed",
+                                data: serializeResponseAsRun({
+                                    response: event.response,
+                                    assistantId: openaiAssistant.id
+                                })
+                            })
+                        ];
                     case 15:
+                        _state.sent();
                         return [
                             3,
-                            32
+                            33
                         ];
                     case 16:
                         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: (0, import_dayjs17.default)().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
+                                                }
+                                            }
+                                        ]
                                     }
                                 }
                             })
@@ -6610,195 +7395,259 @@ var responsesRunAdapter = function() {
                         _state.sent();
                         return [
                             3,
-                            32
+                            33
                         ];
                     case 18:
-                        delta = typeof (evt === null || evt === void 0 ? void 0 : evt.delta) === "string" ? evt.delta : "";
+                        if (!(event.item.type === "message")) return [
+                            3,
+                            21
+                        ];
                         return [
                             4,
-                            emitTextDelta(delta)
+                            onEvent2({
+                                event: "thread.run.step.created",
+                                data: serializeItemAsRunStep({
+                                    item: event.item,
+                                    items: [],
+                                    threadId: threadId,
+                                    openaiAssistant: openaiAssistant,
+                                    runId: responseCreatedResponse.id,
+                                    status: "in_progress",
+                                    completedAt: null
+                                })
+                            })
                         ];
                     case 19:
                         _state.sent();
                         return [
-                            3,
-                            32
+                            4,
+                            onEvent2({
+                                event: "thread.message.created",
+                                data: serializeItemAsMessage({
+                                    item: event.item,
+                                    threadId: threadId,
+                                    openaiAssistant: openaiAssistant,
+                                    createdAt: (0, import_dayjs13.default)().unix(),
+                                    runId: responseCreatedResponse.id,
+                                    status: "in_progress"
+                                })
+                            })
                         ];
                     case 20:
-                        finalText = typeof (evt === null || evt === void 0 ? void 0 : evt.text) === "string" ? evt.text : "";
-                        if (!finalText) return [
+                        _state.sent();
+                        return [
+                            3,
+                            23
+                        ];
+                    case 21:
+                        if (!(event.item.type === "function_call")) return [
                             3,
-                            22
+                            23
                         ];
+                        toolCalls[event.item.id] = event.item;
                         return [
                             4,
-                            emitTextDelta(finalText)
+                            onEvent2({
+                                event: "thread.run.step.created",
+                                data: serializeItemAsRunStep({
+                                    item: event.item,
+                                    items: [],
+                                    threadId: threadId,
+                                    openaiAssistant: openaiAssistant,
+                                    runId: responseCreatedResponse.id
+                                })
+                            })
                         ];
-                    case 21:
-                        _state.sent();
-                        _state.label = 22;
                     case 22:
-                        return [
-                            3,
-                            32
-                        ];
+                        _state.sent();
+                        _state.label = 23;
                     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 [
+                        if (event.item.id) itemIds.push(event.item.id);
+                        return [
                             3,
-                            25
+                            33
                         ];
-                        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 [
+                    case 24:
+                        if (!(event.item.type === "message")) return [
                             3,
-                            25
+                            27
                         ];
-                        itemToCallId.set(itemId, callId);
-                        getOrCreateToolCall(callId, name);
                         return [
                             4,
-                            ensureToolCallsStep()
+                            onEvent2({
+                                event: "thread.run.step.completed",
+                                data: serializeItemAsRunStep({
+                                    item: event.item,
+                                    items: [],
+                                    threadId: threadId,
+                                    openaiAssistant: openaiAssistant,
+                                    runId: responseCreatedResponse.id
+                                })
+                            })
                         ];
-                    case 24:
-                        _state.sent();
-                        sawToolCalls = true;
-                        _state.label = 25;
                     case 25:
+                        _state.sent();
                         return [
-                            3,
-                            32
+                            4,
+                            onEvent2({
+                                event: "thread.message.completed",
+                                data: serializeItemAsMessage({
+                                    item: event.item,
+                                    threadId: threadId,
+                                    openaiAssistant: openaiAssistant,
+                                    createdAt: (0, import_dayjs13.default)().unix(),
+                                    runId: responseCreatedResponse.id
+                                })
+                            })
                         ];
                     case 26:
+                        _state.sent();
                         return [
                             3,
-                            32
+                            29
                         ];
                     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 [
+                        if (!(event.item.type === "function_call")) return [
                             3,
-                            32
+                            29
                         ];
-                        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;
                         return [
                             4,
-                            ensureToolCallsStep()
+                            onEvent2({
+                                event: "thread.run.step.in_progress",
+                                data: serializeItemAsRunStep({
+                                    item: event.item,
+                                    items: [],
+                                    threadId: threadId,
+                                    openaiAssistant: openaiAssistant,
+                                    runId: responseCreatedResponse.id
+                                })
+                            })
                         ];
                     case 28:
                         _state.sent();
-                        sawToolCalls = true;
-                        return [
-                            4,
-                            emitToolArgsDelta(effectiveCallId, tc.function.name, argsDelta)
-                        ];
+                        _state.label = 29;
                     case 29:
-                        _state.sent();
                         return [
                             3,
-                            32
+                            33
                         ];
                     case 30:
-                        {
-                            return [
-                                3,
-                                32
-                            ];
-                        }
-                        _state.label = 31;
+                        toolCall = toolCalls[event.item_id];
+                        if (!toolCall) return [
+                            3,
+                            33
+                        ];
+                        return [
+                            4,
+                            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 31:
+                        _state.sent();
                         return [
                             3,
-                            32
+                            33
                         ];
                     case 32:
-                        _iteratorAbruptCompletion = false;
                         return [
                             3,
-                            6
+                            33
                         ];
                     case 33:
+                        _iteratorAbruptCompletion = false;
                         return [
                             3,
-                            40
+                            3
                         ];
                     case 34:
+                        return [
+                            3,
+                            41
+                        ];
+                    case 35:
                         err = _state.sent();
                         _didIteratorError = true;
                         _iteratorError = err;
                         return [
                             3,
-                            40
+                            41
                         ];
-                    case 35:
+                    case 36:
                         _state.trys.push([
-                            35,
+                            36,
                             ,
-                            38,
-                            39
+                            39,
+                            40
                         ]);
                         if (!(_iteratorAbruptCompletion && _iterator.return != null)) return [
                             3,
-                            37
+                            38
                         ];
                         return [
                             4,
                             _iterator.return()
                         ];
-                    case 36:
-                        _state.sent();
-                        _state.label = 37;
                     case 37:
+                        _state.sent();
+                        _state.label = 38;
+                    case 38:
                         return [
                             3,
-                            39
+                            40
                         ];
-                    case 38:
+                    case 39:
                         if (_didIteratorError) {
                             throw _iteratorError;
                         }
                         return [
                             7
                         ];
-                    case 39:
+                    case 40:
                         return [
                             7
                         ];
-                    case 40:
+                    case 41:
                         return [
                             3,
-                            43
+                            47
                         ];
-                    case 41:
+                    case 42:
                         e = _state.sent();
                         return [
                             4,
                             onEvent2({
                                 event: "thread.run.failed",
                                 data: {
-                                    id: runId,
+                                    id: (responseCreatedResponse === null || responseCreatedResponse === void 0 ? void 0 : responseCreatedResponse.id) || "run_".concat((0, import_radash22.uid)(18)),
                                     object: "thread.run",
                                     thread_id: threadId,
-                                    assistant_id: asstId,
+                                    assistant_id: openaiAssistant.id,
                                     status: "failed",
-                                    failed_at: (0, import_dayjs17.default)().unix(),
+                                    failed_at: (0, import_dayjs13.default)().unix(),
                                     last_error: {
                                         code: "server_error",
                                         message: String((e === null || e === void 0 ? void 0 : e.message) || e || "Unknown error")
@@ -6806,13 +7655,34 @@ var responsesRunAdapter = function() {
                                 }
                             })
                         ];
-                    case 42:
+                    case 43:
                         _state.sent();
                         return [
                             3,
-                            43
+                            47
                         ];
-                    case 43:
+                    case 44:
+                        if (!((responseCreatedResponse === null || responseCreatedResponse === void 0 ? void 0 : responseCreatedResponse.id) && itemIds.length > 0)) return [
+                            3,
+                            46
+                        ];
+                        return [
+                            4,
+                            saveResponseItemsToConversationMetadata({
+                                openai: openai,
+                                threadId: threadId,
+                                responseId: responseCreatedResponse.id,
+                                itemIds: itemIds
+                            })
+                        ];
+                    case 45:
+                        _state.sent();
+                        _state.label = 46;
+                    case 46:
+                        return [
+                            7
+                        ];
+                    case 47:
                         return [
                             2
                         ];