supercompat 3.1.0-beta.2 → 3.1.0-beta.4

package/dist/index.cjs

@@ -1838,11 +1838,13 @@ var nonEmptyMessages = function(param) {
     var messages3 = param.messages;
     var result = [];
     messages3.forEach(function(message) {
-        return result.push(_object_spread_props(_object_spread({}, message), {
+        var hasContent = "content" in message;
+        var next = hasContent ? _object_spread_props(_object_spread({}, message), {
             content: nonEmptyContent({
                 message: message
             })
-        }));
+        }) : message;
+        result.push(next);
     });
     return result;
 };
@@ -1896,13 +1898,31 @@ var serializeMessage2 = function(param) {
                     text: message.content
                 }
             ].concat(_to_consumable_array(((_message_tool_calls = message.tool_calls) !== null && _message_tool_calls !== void 0 ? _message_tool_calls : []).map(function(toolCall) {
-                return {
-                    type: "tool_use",
-                    id: toolCall.id,
-                    name: toolCall.function.name,
-                    input: toolCall.function.arguments ? JSON.parse(toolCall.function.arguments) : {}
-                };
-            })))
+                if (toolCall.type === "function") {
+                    return {
+                        type: "tool_use",
+                        id: toolCall.id,
+                        name: toolCall.function.name,
+                        input: toolCall.function.arguments ? JSON.parse(toolCall.function.arguments) : {}
+                    };
+                }
+                if (toolCall.type === "custom") {
+                    var input = {};
+                    try {
+                        input = toolCall.custom.input ? JSON.parse(toolCall.custom.input) : {};
+                    } catch (e) {
+                        var _toolCall_custom_input;
+                        input = (_toolCall_custom_input = toolCall.custom.input) !== null && _toolCall_custom_input !== void 0 ? _toolCall_custom_input : {};
+                    }
+                    return {
+                        type: "tool_use",
+                        id: toolCall.id,
+                        name: toolCall.custom.name,
+                        input: input
+                    };
+                }
+                return null;
+            }).filter(Boolean)))
         };
     } else if (message.role === "tool") {
         return {
@@ -1950,9 +1970,8 @@ var post5 = function(param) {
                                 })
                             })
                         });
-                        resultOptions = _object_spread_props(_object_spread({}, (0, import_radash3.omit)(body, [
-                            "response_format"
-                        ])), {
+                        resultOptions = {
+                            model: body.model,
                             stream: body.stream ? (0, import_radash3.isEmpty)(body.tools) : false,
                             system: system,
                             messages: serializeMessages({
@@ -1961,8 +1980,10 @@ var post5 = function(param) {
                             max_tokens: 4096,
                             tools: serializeTools({
                                 tools: body.tools
-                            })
-                        });
+                            }),
+                            temperature: body.temperature,
+                            top_p: body.top_p
+                        };
                         if (!body.stream) return [
                             3,
                             2
@@ -3258,7 +3279,6 @@ var serializeToolCall = function(param) {
     return {
         tool_call_id: toolCall.id,
         role: "tool",
-        name: toolCall.function.name,
         content: serializeToolContent({
             toolCall: toolCall
         })
@@ -3272,7 +3292,7 @@ var serializeMessageWithContent = function(param) {
         content: serializeContent({
             content: message.content
         })
-    }, (message === null || message === void 0 ? void 0 : (_message_metadata = message.metadata) === null || _message_metadata === void 0 ? void 0 : _message_metadata.toolCalls) ? {
+    }, message.role === "assistant" && (message === null || message === void 0 ? void 0 : (_message_metadata = message.metadata) === null || _message_metadata === void 0 ? void 0 : _message_metadata.toolCalls) ? {
         tool_calls: message.metadata.toolCalls
     } : {});
 };
@@ -3292,17 +3312,19 @@ var serializeMessage3 = function(param) {
     ];
     var run2 = message.run;
     if (!run2) return result;
-    var messageToolCalls = ((_message_metadata = message.metadata) === null || _message_metadata === void 0 ? void 0 : _message_metadata.toolCalls) || [];
+    var messageToolCalls = Array.isArray(message === null || message === void 0 ? void 0 : (_message_metadata = message.metadata) === null || _message_metadata === void 0 ? void 0 : _message_metadata.toolCalls) ? message.metadata.toolCalls : [];
     messageToolCalls.forEach(function(tc) {
         var runStep = run2.runSteps.find(function(rs) {
             if (rs.type !== "tool_calls") return false;
-            return rs.step_details.tool_calls.some(function(rsTc) {
+            var stepDetails2 = rs.step_details;
+            return stepDetails2.tool_calls.some(function(rsTc) {
                 if (rsTc.type !== "function") return false;
                 return rsTc.id === tc.id;
             });
         });
         if (!runStep) return;
-        var toolCall = runStep.step_details.tool_calls.find(function(rsTc) {
+        var stepDetails = runStep.step_details;
+        var toolCall = stepDetails.tool_calls.find(function(rsTc) {
             if (rsTc.type !== "function") return false;
             return rsTc.id === tc.id;
         });
@@ -3809,46 +3831,47 @@ var post10 = function(param) {
     var prisma = param.prisma;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString, options) {
-            var body, messages3, metadata, initialCreatedAt, thread;
+            var body, messages3, metadata, initialCreatedAt, threadData, thread;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
-                        body = JSON.parse(options.body);
+                        body = JSON.parse(options.body || "{}");
                         messages3 = body.messages || [];
                         metadata = body.metadata || {};
                         initialCreatedAt = (0, import_dayjs3.default)().subtract(messages3.length, "seconds").format();
+                        threadData = {
+                            metadata: metadata || {},
+                            messages: {
+                                create: messages3.map(function(message, index) {
+                                    return {
+                                        role: message.role === "user" ? "USER" : "ASSISTANT",
+                                        content: [
+                                            {
+                                                type: "text",
+                                                text: {
+                                                    annotations: [],
+                                                    value: message.content
+                                                }
+                                            }
+                                        ],
+                                        attachments: message.attachments || [],
+                                        metadata: message.metadata || {},
+                                        createdAt: (0, import_dayjs3.default)(initialCreatedAt).add(index, "seconds").toDate()
+                                    };
+                                })
+                            }
+                        };
+                        if (metadata.assistantId) {
+                            threadData.assistant = {
+                                connect: {
+                                    id: metadata.assistantId
+                                }
+                            };
+                        }
                         return [
                             4,
                             prisma.thread.create({
-                                data: _object_spread_props(_object_spread({
-                                    metadata: metadata
-                                }, metadata.assistantId ? {
-                                    assistant: {
-                                        connect: {
-                                            id: metadata.assistantId
-                                        }
-                                    }
-                                } : {}), {
-                                    messages: {
-                                        create: messages3.map(function(message, index) {
-                                            return {
-                                                role: message.role === "user" ? "USER" : "ASSISTANT",
-                                                content: [
-                                                    {
-                                                        type: "text",
-                                                        text: {
-                                                            annotations: [],
-                                                            value: message.content
-                                                        }
-                                                    }
-                                                ],
-                                                attachments: message.attachments,
-                                                metadata: message.metadata,
-                                                createdAt: (0, import_dayjs3.default)(initialCreatedAt).add(index, "seconds").toDate()
-                                            };
-                                        })
-                                    }
-                                })
+                                data: threadData
                             })
                         ];
                     case 1:
@@ -3946,7 +3969,7 @@ var post11 = function(param) {
                     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);
+                        body = JSON.parse(options.body || "{}");
                         role = body.role, content = body.content, metadata = body.metadata;
                         return [
                             4,
@@ -4235,6 +4258,8 @@ var serializeRunStep = function(param) {
         cancelled_at: runStep.cancelledAt ? (0, import_dayjs6.default)(runStep.cancelledAt).unix() : null,
         failed_at: runStep.failedAt ? (0, import_dayjs6.default)(runStep.failedAt).unix() : null,
         completed_at: runStep.completedAt ? (0, import_dayjs6.default)(runStep.completedAt).unix() : null,
+        // metadata type from Prisma is JsonValue, cast to OpenAI Metadata
+        // @ts-ignore-next-line
         metadata: runStep.metadata,
         usage: runStep.usage
     };
@@ -4527,7 +4552,7 @@ var post12 = function(param) {
                     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);
+                        body = JSON.parse(options.body || "{}");
                         assistant_id = body.assistant_id, stream = body.stream;
                         return [
                             4,
@@ -4561,8 +4586,8 @@ var post12 = function(param) {
                                     expiresAt: (0, import_dayjs7.default)().add(1, "hour").unix(),
                                     model: model,
                                     instructions: instructions,
-                                    tools: tools,
-                                    metadata: metadata,
+                                    tools: tools || [],
+                                    metadata: metadata || {},
                                     thread: {
                                         connect: {
                                             id: threadId
@@ -4721,6 +4746,19 @@ var get12 = function(param) {
                         ];
                     case 1:
                         run2 = _state.sent();
+                        if (!run2) {
+                            return [
+                                2,
+                                new Response(JSON.stringify({
+                                    error: "run not found"
+                                }), {
+                                    status: 404,
+                                    headers: {
+                                        "Content-Type": "application/json"
+                                    }
+                                })
+                            ];
+                        }
                         return [
                             2,
                             new Response(JSON.stringify(serializeRun({
@@ -4743,7 +4781,7 @@ var get12 = function(param) {
 };
 // src/adapters/storage/prismaStorageAdapter/threads/run/index.ts
 var run = function(param) {
-    var prisma = param.prisma, runAdapter = param.runAdapter;
+    var prisma = param.prisma;
     return {
         get: get12({
             prisma: prisma
@@ -4832,14 +4870,14 @@ var updateRun = /*#__PURE__*/ function() {
             return [
                 2,
                 prisma.$transaction(/*#__PURE__*/ function() {
-                    var _ref = _async_to_generator(function(prisma2) {
+                    var _ref = _async_to_generator(function(tx) {
                         var runSteps, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step, err;
                         return _ts_generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
                                     return [
                                         4,
-                                        prisma2.runStep.findMany({
+                                        tx.runStep.findMany({
                                             where: {
                                                 threadId: threadId,
                                                 runId: runId,
@@ -4870,7 +4908,7 @@ var updateRun = /*#__PURE__*/ function() {
                                                     runStep = _step.value;
                                                     return [
                                                         4,
-                                                        prisma2.runStep.update({
+                                                        tx.runStep.update({
                                                             where: {
                                                                 id: runStep.id
                                                             },
@@ -4967,7 +5005,7 @@ var updateRun = /*#__PURE__*/ function() {
                                 case 9:
                                     return [
                                         2,
-                                        prisma2.run.update({
+                                        tx.run.update({
                                             where: {
                                                 id: runId
                                             },
@@ -4979,7 +5017,7 @@ var updateRun = /*#__PURE__*/ function() {
                             }
                         });
                     });
-                    return function(prisma2) {
+                    return function(tx) {
                         return _ref.apply(this, arguments);
                     };
                 }())
@@ -5183,7 +5221,7 @@ var post14 = function(param) {
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
-                        body = JSON.parse(options.body);
+                        body = JSON.parse(options.body || "{}");
                         model = body.model, instructions = body.instructions;
                         return [
                             4,
@@ -5253,8 +5291,7 @@ var prismaStorageAdapter = function(param) {
                 prisma: prisma,
                 runAdapter: runAdapter
             })), _define_property(_obj, runRegexp, run({
-                prisma: prisma,
-                runAdapter: runAdapter
+                prisma: prisma
             })), _define_property(_obj, stepsRegexp, steps({
                 prisma: prisma
             })), _define_property(_obj, submitToolOutputsRegexp, submitToolOutputs({
@@ -5269,7 +5306,7 @@ var import_dayjs10 = __toESM(require("dayjs"), 1);
 var responsesRunAdapter = function() {
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(param) {
-            var client, run2, onEvent2, getAssistant, getConversationId, setConversationId, inputItems, previousResponseId, setLastResponseId, conversationId, conv, _ref, model, instructions, mapTools, message, toolCallsRunStep, textBuffer, toolCallByItemId, toolCallDone, latestUserText, page, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, item, _content_find, _content_find1, _item_content, content, _content_find_text, _ref1, txt, err1, e, isContinuation, singleTool, body, stream, responseId, _iteratorAbruptCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _value1, evt, _, _evt_response, _evt_response_id, item1, delta, item_id, delta1, call, item_id1, _evt_response1, _evt_response_id1, _resp_output, resp, _iteratorNormalCompletion, _didIteratorError2, _iteratorError2, _iterator2, _step2, out, _out_content_find, _out_content_find1, _out_content, _out_content_find_text, txt1, _out_arguments, call1, _out_id, toolCalls, err2, e1, _e_cause, _e_message, _e_cause_message;
+            var client, run2, onEvent2, getAssistant, getConversationId, setConversationId, inputItems, previousResponseId, setLastResponseId, conversationId, conv, _ref, model, instructions, mapTools, message, toolCallsRunStep, textBuffer, toolCallByItemId, toolCallDone, latestUserText, page, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, item, _content_find, _content_find1, _item_content, content, _content_find_text, _ref1, txt, err1, e, hasToolOutputs, includeTools, singleTool, body, responseId, attemptedPrevFallback, prevIdRetries, currentBody, stream, _iteratorAbruptCompletion1, _didIteratorError1, _iteratorError1, _loop, _iterator1, _step1, _ret, err2, err3, _err_error, code, retryBody, e1, _e_cause, _e_message, _e_cause_message;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -5359,7 +5396,8 @@ var responsesRunAdapter = function() {
                                     name: fn.name,
                                     description: (_fn_description = fn.description) !== null && _fn_description !== void 0 ? _fn_description : void 0,
                                     parameters: parameters,
-                                    strict: strict !== null && strict !== void 0 ? strict : false
+                                    // Encourage tool use by defaulting to strict
+                                    strict: strict !== null && strict !== void 0 ? strict : true
                                 }
                             ];
                         });
@@ -5372,9 +5410,9 @@ var responsesRunAdapter = function() {
                     case 7:
                         _state.trys.push([
                             7,
-                            71,
+                            45,
                             ,
-                            72
+                            46
                         ]);
                         latestUserText = "";
                         if (!(!previousResponseId && conversationId)) return [
@@ -5502,16 +5540,20 @@ var responsesRunAdapter = function() {
                             23
                         ];
                     case 23:
-                        isContinuation = Array.isArray(inputItems) && inputItems.length > 0;
-                        singleTool = !isContinuation && mapTools.length === 1 ? mapTools[0] : null;
+                        hasToolOutputs = Array.isArray(inputItems) && inputItems.some(function(it) {
+                            return (it === null || it === void 0 ? void 0 : it.type) === "function_call_output";
+                        });
+                        includeTools = mapTools.length > 0 && !hasToolOutputs;
+                        singleTool = includeTools && mapTools.length === 1 ? mapTools[0] : null;
                         body = _object_spread({
                             model: model,
                             input: inputItems && inputItems.length > 0 ? inputItems : latestUserText !== null && latestUserText !== void 0 ? latestUserText : ""
                         }, instructions || run2.instructions ? {
                             instructions: run2.instructions || instructions || ""
-                        } : {}, !isContinuation && mapTools.length ? {
+                        } : {}, includeTools ? {
                             tools: mapTools,
-                            parallel_tool_calls: true
+                            parallel_tool_calls: true,
+                            tool_choice: "required"
                         } : {}, singleTool ? {
                             tool_choice: {
                                 type: "function",
@@ -5525,676 +5567,1091 @@ var responsesRunAdapter = function() {
                                 id: conversationId
                             };
                         }
-                        return [
-                            4,
-                            client.responses.stream(body)
-                        ];
-                    case 24:
-                        stream = _state.sent();
                         responseId = null;
-                        _iteratorAbruptCompletion1 = false, _didIteratorError1 = false;
+                        attemptedPrevFallback = false;
+                        prevIdRetries = 0;
+                        currentBody = body;
+                        _state.label = 24;
+                    case 24:
+                        if (!true) return [
+                            3,
+                            44
+                        ];
+                        stream = void 0;
                         _state.label = 25;
                     case 25:
                         _state.trys.push([
                             25,
-                            64,
-                            65,
-                            70
+                            40,
+                            ,
+                            43
                         ]);
-                        _iterator1 = _async_iterator(stream);
-                        _state.label = 26;
-                    case 26:
                         return [
                             4,
-                            _iterator1.next()
+                            client.responses.stream(currentBody)
                         ];
+                    case 26:
+                        stream = _state.sent();
+                        _iteratorAbruptCompletion1 = false, _didIteratorError1 = false;
+                        _state.label = 27;
                     case 27:
-                        if (!(_iteratorAbruptCompletion1 = !(_step1 = _state.sent()).done)) return [
-                            3,
-                            63
-                        ];
-                        _value1 = _step1.value;
-                        evt = _value1;
-                        _ = evt.type;
-                        switch(_){
-                            case "response.created":
-                                return [
-                                    3,
-                                    28
-                                ];
-                            case "response.in_progress":
-                                return [
-                                    3,
-                                    31
-                                ];
-                            case "response.output_item.added":
-                                return [
-                                    3,
-                                    33
-                                ];
-                            case "response.output_text.delta":
-                                return [
-                                    3,
-                                    41
-                                ];
-                            case "response.function_call_arguments.delta":
-                                return [
-                                    3,
-                                    46
-                                ];
-                            case "response.function_call_arguments.done":
-                                return [
-                                    3,
-                                    49
-                                ];
-                            case "response.completed":
-                                return [
-                                    3,
-                                    50
-                                ];
-                            case "response.failed":
-                                return [
-                                    3,
-                                    60
-                                ];
-                            case "error":
-                                return [
-                                    3,
-                                    60
-                                ];
-                        }
-                        return [
-                            3,
-                            62
-                        ];
-                    case 28:
-                        responseId = (_evt_response_id = (_evt_response = evt.response) === null || _evt_response === void 0 ? void 0 : _evt_response.id) !== null && _evt_response_id !== void 0 ? _evt_response_id : responseId;
-                        if (!(responseId && setLastResponseId)) return [
-                            3,
-                            30
-                        ];
-                        return [
-                            4,
-                            setLastResponseId(responseId)
-                        ];
-                    case 29:
-                        _state.sent();
-                        _state.label = 30;
-                    case 30:
-                        return [
-                            3,
-                            62
-                        ];
-                    case 31:
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.run.in_progress",
-                                data: _object_spread_props(_object_spread({}, run2), {
-                                    status: "in_progress"
-                                })
-                            })
-                        ];
-                    case 32:
-                        _state.sent();
-                        return [
-                            3,
-                            62
-                        ];
-                    case 33:
-                        item1 = evt.item;
-                        if (!(item1.type === "message" && item1.role === "assistant")) return [
-                            3,
-                            36
-                        ];
-                        if (!!message) return [
-                            3,
-                            36
-                        ];
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.message.created",
-                                data: {
-                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
-                                    object: "thread.message",
-                                    completed_at: null,
-                                    run_id: run2.id,
-                                    created_at: (0, import_dayjs10.default)().unix(),
-                                    assistant_id: run2.assistant_id,
-                                    incomplete_at: null,
-                                    incomplete_details: null,
-                                    metadata: {},
-                                    attachments: [],
-                                    thread_id: run2.thread_id,
-                                    content: [
-                                        {
-                                            text: {
-                                                value: "",
-                                                annotations: []
-                                            },
-                                            type: "text"
-                                        }
-                                    ],
-                                    role: "assistant",
-                                    status: "in_progress"
-                                }
-                            })
-                        ];
-                    case 34:
-                        message = _state.sent();
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.run.step.created",
-                                data: {
-                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
-                                    object: "thread.run.step",
-                                    run_id: run2.id,
-                                    assistant_id: run2.assistant_id,
-                                    thread_id: run2.thread_id,
-                                    type: "message_creation",
-                                    status: "completed",
-                                    completed_at: (0, import_dayjs10.default)().unix(),
-                                    created_at: (0, import_dayjs10.default)().unix(),
-                                    expired_at: null,
-                                    last_error: null,
-                                    metadata: {},
-                                    failed_at: null,
-                                    cancelled_at: null,
-                                    usage: null,
-                                    step_details: {
-                                        type: "message_creation",
-                                        message_creation: {
-                                            message_id: message.id
+                        _state.trys.push([
+                            27,
+                            33,
+                            34,
+                            39
+                        ]);
+                        _loop = function() {
+                            var _value, evt, _, _evt_response, _evt_response_id, item, _item_call_id, call_id, _item_arguments, _ref, entry, _item_arguments1, toolCalls, item1, _item_call_id1, call_id1, _item_arguments2, _ref1, entry1, toolCalls1, _tmp, delta, item_id, delta1, call, item_id1, _evt_response1, _resp_output, _evt_response_id1, resp, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, out, _out_content_find, _out_content_find1, _out_content, _out_content_find_text, txt, _out_call_id, call_id2, _out_arguments, _ref2, call1, maxAttempts, attempt, err1, _err_error, _err_error1, code, _err_error_param, isLocked, toolCalls2, _tmp1, _tmp2, _tmp3;
+                            return _ts_generator(this, function(_state) {
+                                switch(_state.label){
+                                    case 0:
+                                        _value = _step1.value;
+                                        evt = _value;
+                                        _ = evt.type;
+                                        switch(_){
+                                            case "response.created":
+                                                return [
+                                                    3,
+                                                    1
+                                                ];
+                                            case "response.in_progress":
+                                                return [
+                                                    3,
+                                                    4
+                                                ];
+                                            case "response.output_item.added":
+                                                return [
+                                                    3,
+                                                    6
+                                                ];
+                                            case "response.output_item.done":
+                                                return [
+                                                    3,
+                                                    15
+                                                ];
+                                            case "response.output_text.delta":
+                                                return [
+                                                    3,
+                                                    21
+                                                ];
+                                            case "response.function_call_arguments.delta":
+                                                return [
+                                                    3,
+                                                    26
+                                                ];
+                                            case "response.custom_tool_call_input.delta":
+                                                return [
+                                                    3,
+                                                    26
+                                                ];
+                                            case "response.function_call_arguments.done":
+                                                return [
+                                                    3,
+                                                    31
+                                                ];
+                                            case "response.custom_tool_call_input.done":
+                                                return [
+                                                    3,
+                                                    31
+                                                ];
+                                            case "response.completed":
+                                                return [
+                                                    3,
+                                                    32
+                                                ];
+                                            case "response.failed":
+                                                return [
+                                                    3,
+                                                    52
+                                                ];
+                                            case "error":
+                                                return [
+                                                    3,
+                                                    52
+                                                ];
                                         }
-                                    }
-                                }
-                            })
-                        ];
-                    case 35:
-                        _state.sent();
-                        _state.label = 36;
-                    case 36:
-                        if (!(item1.type === "function_call")) return [
-                            3,
-                            40
-                        ];
-                        toolCallByItemId.set(item1.id, {
-                            call_id: item1.call_id,
-                            name: item1.name,
-                            arguments: ""
-                        });
-                        if (!!toolCallsRunStep) return [
-                            3,
-                            38
-                        ];
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.run.step.created",
-                                data: {
-                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
-                                    object: "thread.run.step",
-                                    run_id: run2.id,
-                                    assistant_id: run2.assistant_id,
-                                    thread_id: run2.thread_id,
-                                    type: "tool_calls",
-                                    status: "in_progress",
-                                    completed_at: null,
-                                    created_at: (0, import_dayjs10.default)().unix(),
-                                    expired_at: null,
-                                    last_error: null,
-                                    metadata: {},
-                                    failed_at: null,
-                                    cancelled_at: null,
-                                    usage: null,
-                                    step_details: {
-                                        type: "tool_calls",
-                                        tool_calls: []
-                                    }
-                                }
-                            })
-                        ];
-                    case 37:
-                        toolCallsRunStep = _state.sent();
-                        _state.label = 38;
-                    case 38:
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.run.step.delta",
-                                data: {
-                                    object: "thread.run.step.delta",
-                                    run_id: run2.id,
-                                    id: toolCallsRunStep.id,
-                                    delta: {
-                                        step_details: {
-                                            type: "tool_calls",
-                                            tool_calls: [
-                                                {
-                                                    id: item1.call_id,
-                                                    type: "function",
-                                                    function: {
-                                                        name: item1.name,
-                                                        arguments: ""
+                                        return [
+                                            3,
+                                            54
+                                        ];
+                                    case 1:
+                                        responseId = (_evt_response_id = (_evt_response = evt.response) === null || _evt_response === void 0 ? void 0 : _evt_response.id) !== null && _evt_response_id !== void 0 ? _evt_response_id : responseId;
+                                        if (!(responseId && setLastResponseId)) return [
+                                            3,
+                                            3
+                                        ];
+                                        return [
+                                            4,
+                                            setLastResponseId(responseId)
+                                        ];
+                                    case 2:
+                                        _state.sent();
+                                        _state.label = 3;
+                                    case 3:
+                                        return [
+                                            3,
+                                            54
+                                        ];
+                                    case 4:
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.in_progress",
+                                                data: _object_spread_props(_object_spread({}, run2), {
+                                                    status: "in_progress"
+                                                })
+                                            })
+                                        ];
+                                    case 5:
+                                        _state.sent();
+                                        return [
+                                            3,
+                                            54
+                                        ];
+                                    case 6:
+                                        item = evt.item;
+                                        if (!(item.type === "message" && item.role === "assistant")) return [
+                                            3,
+                                            9
+                                        ];
+                                        if (!!message) return [
+                                            3,
+                                            9
+                                        ];
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.message.created",
+                                                data: {
+                                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
+                                                    object: "thread.message",
+                                                    completed_at: null,
+                                                    run_id: run2.id,
+                                                    created_at: (0, import_dayjs10.default)().unix(),
+                                                    assistant_id: run2.assistant_id,
+                                                    incomplete_at: null,
+                                                    incomplete_details: null,
+                                                    metadata: {},
+                                                    attachments: [],
+                                                    thread_id: run2.thread_id,
+                                                    content: [
+                                                        {
+                                                            text: {
+                                                                value: "",
+                                                                annotations: []
+                                                            },
+                                                            type: "text"
+                                                        }
+                                                    ],
+                                                    role: "assistant",
+                                                    status: "in_progress"
+                                                }
+                                            })
+                                        ];
+                                    case 7:
+                                        message = _state.sent();
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.step.created",
+                                                data: {
+                                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
+                                                    object: "thread.run.step",
+                                                    run_id: run2.id,
+                                                    assistant_id: run2.assistant_id,
+                                                    thread_id: run2.thread_id,
+                                                    type: "message_creation",
+                                                    status: "completed",
+                                                    completed_at: (0, import_dayjs10.default)().unix(),
+                                                    created_at: (0, import_dayjs10.default)().unix(),
+                                                    expired_at: null,
+                                                    last_error: null,
+                                                    metadata: {},
+                                                    failed_at: null,
+                                                    cancelled_at: null,
+                                                    usage: null,
+                                                    step_details: {
+                                                        type: "message_creation",
+                                                        message_creation: {
+                                                            message_id: message.id
+                                                        }
                                                     }
                                                 }
-                                            ]
-                                        }
-                                    }
-                                }
-                            })
-                        ];
-                    case 39:
-                        _state.sent();
-                        _state.label = 40;
-                    case 40:
-                        return [
-                            3,
-                            62
-                        ];
-                    case 41:
-                        delta = evt.delta;
-                        textBuffer += delta;
-                        if (!!message) return [
-                            3,
-                            44
-                        ];
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.message.created",
-                                data: {
-                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
-                                    object: "thread.message",
-                                    completed_at: null,
-                                    run_id: run2.id,
-                                    created_at: (0, import_dayjs10.default)().unix(),
-                                    assistant_id: run2.assistant_id,
-                                    incomplete_at: null,
-                                    incomplete_details: null,
-                                    metadata: {},
-                                    attachments: [],
-                                    thread_id: run2.thread_id,
-                                    content: [
-                                        {
-                                            text: {
-                                                value: "",
-                                                annotations: []
-                                            },
-                                            type: "text"
-                                        }
-                                    ],
-                                    role: "assistant",
-                                    status: "in_progress"
-                                }
-                            })
-                        ];
-                    case 42:
-                        message = _state.sent();
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.run.step.created",
-                                data: {
-                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
-                                    object: "thread.run.step",
-                                    run_id: run2.id,
-                                    assistant_id: run2.assistant_id,
-                                    thread_id: run2.thread_id,
-                                    type: "message_creation",
-                                    status: "completed",
-                                    completed_at: (0, import_dayjs10.default)().unix(),
-                                    created_at: (0, import_dayjs10.default)().unix(),
-                                    expired_at: null,
-                                    last_error: null,
-                                    metadata: {},
-                                    failed_at: null,
-                                    cancelled_at: null,
-                                    usage: null,
-                                    step_details: {
-                                        type: "message_creation",
-                                        message_creation: {
-                                            message_id: message.id
-                                        }
-                                    }
-                                }
-                            })
-                        ];
-                    case 43:
-                        _state.sent();
-                        _state.label = 44;
-                    case 44:
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.message.delta",
-                                data: {
-                                    id: message.id,
-                                    delta: {
-                                        content: [
-                                            {
-                                                type: "text",
-                                                index: 0,
-                                                text: {
-                                                    value: delta
+                                            })
+                                        ];
+                                    case 8:
+                                        _state.sent();
+                                        _state.label = 9;
+                                    case 9:
+                                        if (!(item.type === "function_call" || item.type === "tool_call" || item.type === "custom_tool_call")) return [
+                                            3,
+                                            14
+                                        ];
+                                        call_id = (_item_call_id = item.call_id) !== null && _item_call_id !== void 0 ? _item_call_id : item.id;
+                                        entry = {
+                                            call_id: call_id,
+                                            name: item.name,
+                                            arguments: (_ref = (_item_arguments = item.arguments) !== null && _item_arguments !== void 0 ? _item_arguments : item.input) !== null && _ref !== void 0 ? _ref : ""
+                                        };
+                                        if (item.id) toolCallByItemId.set(item.id, entry);
+                                        if (call_id) toolCallByItemId.set(call_id, entry);
+                                        if (!!toolCallsRunStep) return [
+                                            3,
+                                            11
+                                        ];
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.step.created",
+                                                data: {
+                                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
+                                                    object: "thread.run.step",
+                                                    run_id: run2.id,
+                                                    assistant_id: run2.assistant_id,
+                                                    thread_id: run2.thread_id,
+                                                    type: "tool_calls",
+                                                    status: "in_progress",
+                                                    completed_at: null,
+                                                    created_at: (0, import_dayjs10.default)().unix(),
+                                                    expired_at: null,
+                                                    last_error: null,
+                                                    metadata: {},
+                                                    failed_at: null,
+                                                    cancelled_at: null,
+                                                    usage: null,
+                                                    step_details: {
+                                                        type: "tool_calls",
+                                                        tool_calls: []
+                                                    }
                                                 }
-                                            }
-                                        ]
-                                    }
-                                }
-                            })
-                        ];
-                    case 45:
-                        _state.sent();
-                        return [
-                            3,
-                            62
-                        ];
-                    case 46:
-                        item_id = evt.item_id, delta1 = evt.delta;
-                        call = toolCallByItemId.get(item_id);
-                        if (!call) return [
-                            3,
-                            48
-                        ];
-                        call.arguments += delta1;
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.run.step.delta",
-                                data: {
-                                    object: "thread.run.step.delta",
-                                    run_id: run2.id,
-                                    id: toolCallsRunStep === null || toolCallsRunStep === void 0 ? void 0 : toolCallsRunStep.id,
-                                    delta: {
-                                        step_details: {
-                                            type: "tool_calls",
-                                            tool_calls: [
-                                                {
-                                                    id: call.call_id,
-                                                    type: "function",
-                                                    function: {
-                                                        name: call.name,
-                                                        arguments: delta1
+                                            })
+                                        ];
+                                    case 10:
+                                        toolCallsRunStep = _state.sent();
+                                        _state.label = 11;
+                                    case 11:
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.step.delta",
+                                                data: {
+                                                    object: "thread.run.step.delta",
+                                                    run_id: run2.id,
+                                                    id: toolCallsRunStep.id,
+                                                    delta: {
+                                                        step_details: {
+                                                            type: "tool_calls",
+                                                            tool_calls: [
+                                                                {
+                                                                    id: call_id,
+                                                                    type: "function",
+                                                                    function: {
+                                                                        name: item.name,
+                                                                        arguments: (_item_arguments1 = item.arguments) !== null && _item_arguments1 !== void 0 ? _item_arguments1 : ""
+                                                                    }
+                                                                }
+                                                            ]
+                                                        }
                                                     }
                                                 }
-                                            ]
-                                        }
-                                    }
-                                }
-                            })
-                        ];
-                    case 47:
-                        _state.sent();
-                        _state.label = 48;
-                    case 48:
-                        return [
-                            3,
-                            62
-                        ];
-                    case 49:
-                        {
-                            item_id1 = evt.item_id;
-                            if (item_id1) toolCallDone.add(item_id1);
-                            return [
-                                3,
-                                62
-                            ];
-                        }
-                        _state.label = 50;
-                    case 50:
-                        responseId = (_evt_response_id1 = (_evt_response1 = evt.response) === null || _evt_response1 === void 0 ? void 0 : _evt_response1.id) !== null && _evt_response_id1 !== void 0 ? _evt_response_id1 : responseId;
-                        if (!(responseId && setLastResponseId)) return [
-                            3,
-                            52
-                        ];
-                        return [
-                            4,
-                            setLastResponseId(responseId)
-                        ];
-                    case 51:
-                        _state.sent();
-                        _state.label = 52;
-                    case 52:
-                        if (!!message) return [
-                            3,
-                            54
-                        ];
-                        resp = evt.response;
-                        if (resp === null || resp === void 0 ? void 0 : (_resp_output = resp.output) === null || _resp_output === void 0 ? void 0 : _resp_output.length) {
-                            _iteratorNormalCompletion = true, _didIteratorError2 = false, _iteratorError2 = undefined;
-                            try {
-                                for(_iterator2 = resp.output[Symbol.iterator](); !(_iteratorNormalCompletion = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion = true){
-                                    out = _step2.value;
-                                    if (out.type === "message") {
-                                        ;
-                                        ;
-                                        txt1 = (_out_content_find_text = (_out_content = out.content) === null || _out_content === void 0 ? void 0 : (_out_content_find1 = _out_content.find) === null || _out_content_find1 === void 0 ? void 0 : (_out_content_find = _out_content_find1.call(_out_content, function(c) {
-                                            return c.type === "output_text";
-                                        })) === null || _out_content_find === void 0 ? void 0 : _out_content_find.text) !== null && _out_content_find_text !== void 0 ? _out_content_find_text : "";
-                                        if (txt1 && !textBuffer) textBuffer = txt1;
-                                    } else if (out.type === "function_call") {
-                                        ;
-                                        call1 = {
-                                            call_id: out.call_id,
-                                            name: out.name,
-                                            arguments: (_out_arguments = out.arguments) !== null && _out_arguments !== void 0 ? _out_arguments : ""
+                                            })
+                                        ];
+                                    case 12:
+                                        _state.sent();
+                                        toolCalls = Array.from(toolCallByItemId.values());
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.requires_action",
+                                                data: _object_spread_props(_object_spread({}, run2), {
+                                                    status: "requires_action",
+                                                    required_action: {
+                                                        type: "submit_tool_outputs",
+                                                        submit_tool_outputs: {
+                                                            tool_calls: toolCalls.map(function(tc) {
+                                                                return {
+                                                                    id: tc.call_id,
+                                                                    type: "function",
+                                                                    function: {
+                                                                        name: tc.name,
+                                                                        arguments: tc.arguments
+                                                                    }
+                                                                };
+                                                            })
+                                                        }
+                                                    }
+                                                })
+                                            })
+                                        ];
+                                    case 13:
+                                        _state.sent();
+                                        _state.label = 14;
+                                    case 14:
+                                        return [
+                                            3,
+                                            54
+                                        ];
+                                    case 15:
+                                        item1 = evt.item;
+                                        if (!((item1 === null || item1 === void 0 ? void 0 : item1.type) === "function_call" || (item1 === null || item1 === void 0 ? void 0 : item1.type) === "custom_tool_call")) return [
+                                            3,
+                                            20
+                                        ];
+                                        call_id1 = (_item_call_id1 = item1.call_id) !== null && _item_call_id1 !== void 0 ? _item_call_id1 : item1.id;
+                                        entry1 = {
+                                            call_id: call_id1,
+                                            name: item1.name,
+                                            arguments: (_ref1 = (_item_arguments2 = item1.arguments) !== null && _item_arguments2 !== void 0 ? _item_arguments2 : item1.input) !== null && _ref1 !== void 0 ? _ref1 : ""
                                         };
-                                        ;
-                                        toolCallByItemId.set((_out_id = out.id) !== null && _out_id !== void 0 ? _out_id : out.call_id, call1);
-                                    }
-                                }
-                            } catch (err) {
-                                _didIteratorError2 = true;
-                                _iteratorError2 = err;
-                            } finally{
-                                try {
-                                    if (!_iteratorNormalCompletion && _iterator2.return != null) {
-                                        _iterator2.return();
-                                    }
-                                } finally{
-                                    if (_didIteratorError2) {
-                                        throw _iteratorError2;
-                                    }
-                                }
-                            }
-                        }
-                        if (!textBuffer) return [
-                            3,
-                            54
-                        ];
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.message.created",
-                                data: {
-                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
-                                    object: "thread.message",
-                                    completed_at: null,
-                                    run_id: run2.id,
-                                    created_at: (0, import_dayjs10.default)().unix(),
-                                    assistant_id: run2.assistant_id,
-                                    incomplete_at: null,
-                                    incomplete_details: null,
-                                    metadata: {},
-                                    attachments: [],
-                                    thread_id: run2.thread_id,
-                                    content: [
+                                        if (item1.id) toolCallByItemId.set(item1.id, entry1);
+                                        if (call_id1) toolCallByItemId.set(call_id1, entry1);
+                                        if (!!toolCallsRunStep) return [
+                                            3,
+                                            17
+                                        ];
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.step.created",
+                                                data: {
+                                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
+                                                    object: "thread.run.step",
+                                                    run_id: run2.id,
+                                                    assistant_id: run2.assistant_id,
+                                                    thread_id: run2.thread_id,
+                                                    type: "tool_calls",
+                                                    status: "in_progress",
+                                                    completed_at: null,
+                                                    created_at: (0, import_dayjs10.default)().unix(),
+                                                    expired_at: null,
+                                                    last_error: null,
+                                                    metadata: {},
+                                                    failed_at: null,
+                                                    cancelled_at: null,
+                                                    usage: null,
+                                                    step_details: {
+                                                        type: "tool_calls",
+                                                        tool_calls: []
+                                                    }
+                                                }
+                                            })
+                                        ];
+                                    case 16:
+                                        toolCallsRunStep = _state.sent();
+                                        _state.label = 17;
+                                    case 17:
+                                        toolCalls1 = Array.from(toolCallByItemId.values());
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.step.delta",
+                                                data: {
+                                                    object: "thread.run.step.delta",
+                                                    run_id: run2.id,
+                                                    id: toolCallsRunStep === null || toolCallsRunStep === void 0 ? void 0 : toolCallsRunStep.id,
+                                                    delta: {
+                                                        step_details: {
+                                                            type: "tool_calls",
+                                                            tool_calls: toolCalls1.map(function(tc) {
+                                                                return {
+                                                                    id: tc.call_id,
+                                                                    type: "function",
+                                                                    function: {
+                                                                        name: tc.name,
+                                                                        arguments: tc.arguments
+                                                                    }
+                                                                };
+                                                            })
+                                                        }
+                                                    }
+                                                }
+                                            })
+                                        ];
+                                    case 18:
+                                        _state.sent();
+                                        _tmp = {};
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.requires_action",
+                                                data: _object_spread_props(_object_spread({}, run2), {
+                                                    status: "requires_action",
+                                                    required_action: {
+                                                        type: "submit_tool_outputs",
+                                                        submit_tool_outputs: {
+                                                            tool_calls: toolCalls1.map(function(tc) {
+                                                                return {
+                                                                    id: tc.call_id,
+                                                                    type: "function",
+                                                                    function: {
+                                                                        name: tc.name,
+                                                                        arguments: tc.arguments
+                                                                    }
+                                                                };
+                                                            })
+                                                        }
+                                                    }
+                                                })
+                                            })
+                                        ];
+                                    case 19:
+                                        return [
+                                            2,
+                                            (_tmp.v = _state.sent(), _tmp)
+                                        ];
+                                    case 20:
+                                        return [
+                                            3,
+                                            54
+                                        ];
+                                    case 21:
+                                        delta = evt.delta;
+                                        textBuffer += delta;
+                                        if (!!message) return [
+                                            3,
+                                            24
+                                        ];
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.message.created",
+                                                data: {
+                                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
+                                                    object: "thread.message",
+                                                    completed_at: null,
+                                                    run_id: run2.id,
+                                                    created_at: (0, import_dayjs10.default)().unix(),
+                                                    assistant_id: run2.assistant_id,
+                                                    incomplete_at: null,
+                                                    incomplete_details: null,
+                                                    metadata: {},
+                                                    attachments: [],
+                                                    thread_id: run2.thread_id,
+                                                    content: [
+                                                        {
+                                                            text: {
+                                                                value: "",
+                                                                annotations: []
+                                                            },
+                                                            type: "text"
+                                                        }
+                                                    ],
+                                                    role: "assistant",
+                                                    status: "in_progress"
+                                                }
+                                            })
+                                        ];
+                                    case 22:
+                                        message = _state.sent();
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.step.created",
+                                                data: {
+                                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
+                                                    object: "thread.run.step",
+                                                    run_id: run2.id,
+                                                    assistant_id: run2.assistant_id,
+                                                    thread_id: run2.thread_id,
+                                                    type: "message_creation",
+                                                    status: "completed",
+                                                    completed_at: (0, import_dayjs10.default)().unix(),
+                                                    created_at: (0, import_dayjs10.default)().unix(),
+                                                    expired_at: null,
+                                                    last_error: null,
+                                                    metadata: {},
+                                                    failed_at: null,
+                                                    cancelled_at: null,
+                                                    usage: null,
+                                                    step_details: {
+                                                        type: "message_creation",
+                                                        message_creation: {
+                                                            message_id: message.id
+                                                        }
+                                                    }
+                                                }
+                                            })
+                                        ];
+                                    case 23:
+                                        _state.sent();
+                                        _state.label = 24;
+                                    case 24:
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.message.delta",
+                                                data: {
+                                                    id: message.id,
+                                                    delta: {
+                                                        content: [
+                                                            {
+                                                                type: "text",
+                                                                index: 0,
+                                                                text: {
+                                                                    value: delta
+                                                                }
+                                                            }
+                                                        ]
+                                                    }
+                                                }
+                                            })
+                                        ];
+                                    case 25:
+                                        _state.sent();
+                                        return [
+                                            3,
+                                            54
+                                        ];
+                                    case 26:
+                                        item_id = evt.item_id, delta1 = evt.delta;
+                                        call = toolCallByItemId.get(item_id);
+                                        if (!!toolCallsRunStep) return [
+                                            3,
+                                            28
+                                        ];
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.step.created",
+                                                data: {
+                                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
+                                                    object: "thread.run.step",
+                                                    run_id: run2.id,
+                                                    assistant_id: run2.assistant_id,
+                                                    thread_id: run2.thread_id,
+                                                    type: "tool_calls",
+                                                    status: "in_progress",
+                                                    completed_at: null,
+                                                    created_at: (0, import_dayjs10.default)().unix(),
+                                                    expired_at: null,
+                                                    last_error: null,
+                                                    metadata: {},
+                                                    failed_at: null,
+                                                    cancelled_at: null,
+                                                    usage: null,
+                                                    step_details: {
+                                                        type: "tool_calls",
+                                                        tool_calls: []
+                                                    }
+                                                }
+                                            })
+                                        ];
+                                    case 27:
+                                        toolCallsRunStep = _state.sent();
+                                        _state.label = 28;
+                                    case 28:
+                                        if (!call) return [
+                                            3,
+                                            30
+                                        ];
+                                        call.arguments += delta1;
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.step.delta",
+                                                data: {
+                                                    object: "thread.run.step.delta",
+                                                    run_id: run2.id,
+                                                    id: toolCallsRunStep === null || toolCallsRunStep === void 0 ? void 0 : toolCallsRunStep.id,
+                                                    delta: {
+                                                        step_details: {
+                                                            type: "tool_calls",
+                                                            tool_calls: [
+                                                                {
+                                                                    id: call.call_id,
+                                                                    type: "function",
+                                                                    function: {
+                                                                        name: call.name,
+                                                                        arguments: delta1
+                                                                    }
+                                                                }
+                                                            ]
+                                                        }
+                                                    }
+                                                }
+                                            })
+                                        ];
+                                    case 29:
+                                        _state.sent();
+                                        _state.label = 30;
+                                    case 30:
+                                        return [
+                                            3,
+                                            54
+                                        ];
+                                    case 31:
                                         {
-                                            text: {
-                                                value: "",
-                                                annotations: []
-                                            },
-                                            type: "text"
+                                            item_id1 = evt.item_id;
+                                            if (item_id1) toolCallDone.add(item_id1);
+                                            return [
+                                                3,
+                                                54
+                                            ];
                                         }
-                                    ],
-                                    role: "assistant",
-                                    status: "in_progress"
-                                }
-                            })
-                        ];
-                    case 53:
-                        message = _state.sent();
-                        _state.label = 54;
-                    case 54:
-                        if (!message) return [
-                            3,
-                            56
-                        ];
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.message.completed",
-                                data: _object_spread_props(_object_spread({}, message), {
-                                    status: "completed",
-                                    content: [
-                                        {
-                                            text: {
-                                                value: textBuffer,
-                                                annotations: []
-                                            },
-                                            type: "text"
+                                        _state.label = 32;
+                                    case 32:
+                                        responseId = (_evt_response_id1 = (_evt_response1 = evt.response) === null || _evt_response1 === void 0 ? void 0 : _evt_response1.id) !== null && _evt_response_id1 !== void 0 ? _evt_response_id1 : responseId;
+                                        if (!(responseId && setLastResponseId)) return [
+                                            3,
+                                            34
+                                        ];
+                                        return [
+                                            4,
+                                            setLastResponseId(responseId)
+                                        ];
+                                    case 33:
+                                        _state.sent();
+                                        _state.label = 34;
+                                    case 34:
+                                        resp = evt.response;
+                                        if (resp === null || resp === void 0 ? void 0 : (_resp_output = resp.output) === null || _resp_output === void 0 ? void 0 : _resp_output.length) {
+                                            _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                                            try {
+                                                for(_iterator = resp.output[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                                                    out = _step.value;
+                                                    if (out.type === "message") {
+                                                        ;
+                                                        ;
+                                                        txt = (_out_content_find_text = (_out_content = out.content) === null || _out_content === void 0 ? void 0 : (_out_content_find1 = _out_content.find) === null || _out_content_find1 === void 0 ? void 0 : (_out_content_find = _out_content_find1.call(_out_content, function(c) {
+                                                            return c.type === "output_text";
+                                                        })) === null || _out_content_find === void 0 ? void 0 : _out_content_find.text) !== null && _out_content_find_text !== void 0 ? _out_content_find_text : "";
+                                                        if (txt && !textBuffer) textBuffer = txt;
+                                                    } else if (out.type === "function_call" || out.type === "tool_call" || out.type === "custom_tool_call") {
+                                                        ;
+                                                        call_id2 = (_out_call_id = out.call_id) !== null && _out_call_id !== void 0 ? _out_call_id : out.id;
+                                                        ;
+                                                        call1 = {
+                                                            call_id: call_id2,
+                                                            name: out.name,
+                                                            arguments: (_ref2 = (_out_arguments = out.arguments) !== null && _out_arguments !== void 0 ? _out_arguments : out.input) !== null && _ref2 !== void 0 ? _ref2 : ""
+                                                        };
+                                                        if (out.id) toolCallByItemId.set(out.id, call1);
+                                                        if (call_id2) toolCallByItemId.set(call_id2, call1);
+                                                    }
+                                                }
+                                            } catch (err) {
+                                                _didIteratorError = true;
+                                                _iteratorError = err;
+                                            } finally{
+                                                try {
+                                                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                                        _iterator.return();
+                                                    }
+                                                } finally{
+                                                    if (_didIteratorError) {
+                                                        throw _iteratorError;
+                                                    }
+                                                }
+                                            }
                                         }
-                                    ],
-                                    tool_calls: void 0
-                                })
-                            })
-                        ];
-                    case 55:
-                        _state.sent();
-                        _state.label = 56;
-                    case 56:
-                        toolCalls = Array.from(toolCallByItemId.values());
-                        if (!toolCalls.length) return [
-                            3,
-                            58
-                        ];
-                        return [
-                            4,
-                            onEvent2({
-                                event: "thread.run.requires_action",
-                                data: _object_spread_props(_object_spread({}, run2), {
-                                    status: "requires_action",
-                                    required_action: {
-                                        type: "submit_tool_outputs",
-                                        submit_tool_outputs: {
-                                            tool_calls: toolCalls.map(function(tc) {
-                                                return {
-                                                    id: tc.call_id,
-                                                    type: "function",
-                                                    function: {
-                                                        name: tc.name,
-                                                        arguments: tc.arguments
+                                        if (!(!message && textBuffer)) return [
+                                            3,
+                                            36
+                                        ];
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.message.created",
+                                                data: {
+                                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
+                                                    object: "thread.message",
+                                                    completed_at: null,
+                                                    run_id: run2.id,
+                                                    created_at: (0, import_dayjs10.default)().unix(),
+                                                    assistant_id: run2.assistant_id,
+                                                    incomplete_at: null,
+                                                    incomplete_details: null,
+                                                    metadata: {},
+                                                    attachments: [],
+                                                    thread_id: run2.thread_id,
+                                                    content: [
+                                                        {
+                                                            text: {
+                                                                value: "",
+                                                                annotations: []
+                                                            },
+                                                            type: "text"
+                                                        }
+                                                    ],
+                                                    role: "assistant",
+                                                    status: "in_progress"
+                                                }
+                                            })
+                                        ];
+                                    case 35:
+                                        message = _state.sent();
+                                        _state.label = 36;
+                                    case 36:
+                                        if (!message) return [
+                                            3,
+                                            38
+                                        ];
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.message.completed",
+                                                data: _object_spread_props(_object_spread({}, message), {
+                                                    status: "completed",
+                                                    content: [
+                                                        {
+                                                            text: {
+                                                                value: textBuffer,
+                                                                annotations: []
+                                                            },
+                                                            type: "text"
+                                                        }
+                                                    ],
+                                                    tool_calls: void 0
+                                                })
+                                            })
+                                        ];
+                                    case 37:
+                                        _state.sent();
+                                        _state.label = 38;
+                                    case 38:
+                                        if (!(previousResponseId && (conversationId !== null && conversationId !== void 0 ? conversationId : null) && typeof textBuffer === "string" && textBuffer.trim().length > 0)) return [
+                                            3,
+                                            45
+                                        ];
+                                        maxAttempts = 5;
+                                        attempt = 0;
+                                        _state.label = 39;
+                                    case 39:
+                                        if (!true) return [
+                                            3,
+                                            45
+                                        ];
+                                        _state.label = 40;
+                                    case 40:
+                                        _state.trys.push([
+                                            40,
+                                            42,
+                                            ,
+                                            44
+                                        ]);
+                                        console.log("[responsesRunAdapter] insert assistant -> conversation", {
+                                            conversationId: conversationId,
+                                            textBuffer: textBuffer
+                                        });
+                                        return [
+                                            4,
+                                            client.conversations.items.create(conversationId, {
+                                                items: [
+                                                    {
+                                                        type: "message",
+                                                        role: "assistant",
+                                                        content: [
+                                                            {
+                                                                type: "output_text",
+                                                                text: textBuffer
+                                                            }
+                                                        ]
                                                     }
-                                                };
+                                                ]
                                             })
-                                        }
-                                    }
-                                })
-                            })
-                        ];
-                    case 57:
-                        return [
-                            2,
-                            _state.sent()
-                        ];
-                    case 58:
+                                        ];
+                                    case 41:
+                                        _state.sent();
+                                        return [
+                                            3,
+                                            45
+                                        ];
+                                    case 42:
+                                        err1 = _state.sent();
+                                        code = (err1 === null || err1 === void 0 ? void 0 : err1.code) || (err1 === null || err1 === void 0 ? void 0 : (_err_error = err1.error) === null || _err_error === void 0 ? void 0 : _err_error.code);
+                                        isLocked = code === "conversation_locked" || /conversation/i.test((_err_error_param = err1 === null || err1 === void 0 ? void 0 : (_err_error1 = err1.error) === null || _err_error1 === void 0 ? void 0 : _err_error1.param) !== null && _err_error_param !== void 0 ? _err_error_param : "");
+                                        attempt += 1;
+                                        if (!isLocked || attempt >= maxAttempts) throw err1;
+                                        return [
+                                            4,
+                                            new Promise(function(r) {
+                                                return setTimeout(r, 200 * attempt);
+                                            })
+                                        ];
+                                    case 43:
+                                        _state.sent();
+                                        return [
+                                            3,
+                                            44
+                                        ];
+                                    case 44:
+                                        return [
+                                            3,
+                                            39
+                                        ];
+                                    case 45:
+                                        toolCalls2 = Array.from(toolCallByItemId.values());
+                                        if (!toolCalls2.length) return [
+                                            3,
+                                            50
+                                        ];
+                                        if (!!toolCallsRunStep) return [
+                                            3,
+                                            47
+                                        ];
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.step.created",
+                                                data: {
+                                                    id: "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID",
+                                                    object: "thread.run.step",
+                                                    run_id: run2.id,
+                                                    assistant_id: run2.assistant_id,
+                                                    thread_id: run2.thread_id,
+                                                    type: "tool_calls",
+                                                    status: "in_progress",
+                                                    completed_at: null,
+                                                    created_at: (0, import_dayjs10.default)().unix(),
+                                                    expired_at: null,
+                                                    last_error: null,
+                                                    metadata: {},
+                                                    failed_at: null,
+                                                    cancelled_at: null,
+                                                    usage: null,
+                                                    step_details: {
+                                                        type: "tool_calls",
+                                                        tool_calls: []
+                                                    }
+                                                }
+                                            })
+                                        ];
+                                    case 46:
+                                        toolCallsRunStep = _state.sent();
+                                        _state.label = 47;
+                                    case 47:
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.step.delta",
+                                                data: {
+                                                    object: "thread.run.step.delta",
+                                                    run_id: run2.id,
+                                                    id: toolCallsRunStep === null || toolCallsRunStep === void 0 ? void 0 : toolCallsRunStep.id,
+                                                    delta: {
+                                                        step_details: {
+                                                            type: "tool_calls",
+                                                            tool_calls: toolCalls2.map(function(tc) {
+                                                                return {
+                                                                    id: tc.call_id,
+                                                                    type: "function",
+                                                                    function: {
+                                                                        name: tc.name,
+                                                                        arguments: tc.arguments
+                                                                    }
+                                                                };
+                                                            })
+                                                        }
+                                                    }
+                                                }
+                                            })
+                                        ];
+                                    case 48:
+                                        _state.sent();
+                                        _tmp1 = {};
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.requires_action",
+                                                data: _object_spread_props(_object_spread({}, run2), {
+                                                    status: "requires_action",
+                                                    required_action: {
+                                                        type: "submit_tool_outputs",
+                                                        submit_tool_outputs: {
+                                                            tool_calls: toolCalls2.map(function(tc) {
+                                                                return {
+                                                                    id: tc.call_id,
+                                                                    type: "function",
+                                                                    function: {
+                                                                        name: tc.name,
+                                                                        arguments: tc.arguments
+                                                                    }
+                                                                };
+                                                            })
+                                                        }
+                                                    }
+                                                })
+                                            })
+                                        ];
+                                    case 49:
+                                        return [
+                                            2,
+                                            (_tmp1.v = _state.sent(), _tmp1)
+                                        ];
+                                    case 50:
+                                        _tmp2 = {};
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.completed",
+                                                data: _object_spread_props(_object_spread({}, run2), {
+                                                    status: "completed",
+                                                    completed_at: (0, import_dayjs10.default)().unix()
+                                                })
+                                            })
+                                        ];
+                                    case 51:
+                                        return [
+                                            2,
+                                            (_tmp2.v = _state.sent(), _tmp2)
+                                        ];
+                                    case 52:
+                                        _tmp3 = {};
+                                        return [
+                                            4,
+                                            onEvent2({
+                                                event: "thread.run.failed",
+                                                data: _object_spread_props(_object_spread({}, run2), {
+                                                    failed_at: (0, import_dayjs10.default)().unix(),
+                                                    status: "failed",
+                                                    last_error: {
+                                                        code: "server_error",
+                                                        message: "response failed"
+                                                    }
+                                                })
+                                            })
+                                        ];
+                                    case 53:
+                                        return [
+                                            2,
+                                            (_tmp3.v = _state.sent(), _tmp3)
+                                        ];
+                                    case 54:
+                                        return [
+                                            2
+                                        ];
+                                }
+                            });
+                        };
+                        _iterator1 = _async_iterator(stream);
+                        _state.label = 28;
+                    case 28:
                         return [
                             4,
-                            onEvent2({
-                                event: "thread.run.completed",
-                                data: _object_spread_props(_object_spread({}, run2), {
-                                    status: "completed",
-                                    completed_at: (0, import_dayjs10.default)().unix()
-                                })
-                            })
+                            _iterator1.next()
                         ];
-                    case 59:
-                        return [
-                            2,
-                            _state.sent()
+                    case 29:
+                        if (!(_iteratorAbruptCompletion1 = !(_step1 = _state.sent()).done)) return [
+                            3,
+                            32
                         ];
-                    case 60:
                         return [
-                            4,
-                            onEvent2({
-                                event: "thread.run.failed",
-                                data: _object_spread_props(_object_spread({}, run2), {
-                                    failed_at: (0, import_dayjs10.default)().unix(),
-                                    status: "in_progress",
-                                    last_error: {
-                                        code: "server_error",
-                                        message: "response failed"
-                                    }
-                                })
-                            })
+                            5,
+                            _ts_values(_loop())
                         ];
-                    case 61:
-                        return [
+                    case 30:
+                        _ret = _state.sent();
+                        if (_type_of(_ret) === "object") return [
                             2,
-                            _state.sent()
+                            _ret.v
                         ];
-                    case 62:
+                        _state.label = 31;
+                    case 31:
                         _iteratorAbruptCompletion1 = false;
                         return [
                             3,
-                            26
+                            28
                         ];
-                    case 63:
+                    case 32:
                         return [
                             3,
-                            70
+                            39
                         ];
-                    case 64:
+                    case 33:
                         err2 = _state.sent();
                         _didIteratorError1 = true;
                         _iteratorError1 = err2;
                         return [
                             3,
-                            70
+                            39
                         ];
-                    case 65:
+                    case 34:
                         _state.trys.push([
-                            65,
+                            34,
                             ,
-                            68,
-                            69
+                            37,
+                            38
                         ]);
                         if (!(_iteratorAbruptCompletion1 && _iterator1.return != null)) return [
                             3,
-                            67
+                            36
                         ];
                         return [
                             4,
                             _iterator1.return()
                         ];
-                    case 66:
+                    case 35:
                         _state.sent();
-                        _state.label = 67;
-                    case 67:
+                        _state.label = 36;
+                    case 36:
                         return [
                             3,
-                            69
+                            38
                         ];
-                    case 68:
+                    case 37:
                         if (_didIteratorError1) {
                             throw _iteratorError1;
                         }
                         return [
                             7
                         ];
-                    case 69:
+                    case 38:
                         return [
                             7
                         ];
-                    case 70:
+                    case 39:
+                        return [
+                            3,
+                            44
+                        ];
+                    case 40:
+                        err3 = _state.sent();
+                        code = (err3 === null || err3 === void 0 ? void 0 : err3.code) || (err3 === null || err3 === void 0 ? void 0 : (_err_error = err3.error) === null || _err_error === void 0 ? void 0 : _err_error.code);
+                        if (!(previousResponseId && hasToolOutputs && code === "previous_response_not_found" && prevIdRetries < 5)) return [
+                            3,
+                            42
+                        ];
+                        prevIdRetries += 1;
+                        return [
+                            4,
+                            new Promise(function(r) {
+                                return setTimeout(r, 150);
+                            })
+                        ];
+                    case 41:
+                        _state.sent();
+                        currentBody = body;
+                        return [
+                            3,
+                            24
+                        ];
+                    case 42:
+                        if (!hasToolOutputs && !attemptedPrevFallback && previousResponseId) {
+                            attemptedPrevFallback = true;
+                            retryBody = _object_spread({}, body);
+                            delete retryBody.previous_response_id;
+                            if (conversationId) retryBody.conversation = {
+                                id: conversationId
+                            };
+                            currentBody = retryBody;
+                            return [
+                                3,
+                                24
+                            ];
+                        }
+                        throw err3;
+                    case 43:
+                        return [
+                            3,
+                            44
+                        ];
+                    case 44:
                         return [
                             3,
-                            72
+                            46
                         ];
-                    case 71:
+                    case 45:
                         e1 = _state.sent();
                         console.error(e1);
                         return [
@@ -6203,7 +6660,7 @@ var responsesRunAdapter = function() {
                                 event: "thread.run.failed",
                                 data: _object_spread_props(_object_spread({}, run2), {
                                     failed_at: (0, import_dayjs10.default)().unix(),
-                                    status: "in_progress",
+                                    status: "failed",
                                     last_error: {
                                         code: "server_error",
                                         message: "".concat((_e_message = e1 === null || e1 === void 0 ? void 0 : e1.message) !== null && _e_message !== void 0 ? _e_message : "", " ").concat((_e_cause_message = e1 === null || e1 === void 0 ? void 0 : (_e_cause = e1.cause) === null || _e_cause === void 0 ? void 0 : _e_cause.message) !== null && _e_cause_message !== void 0 ? _e_cause_message : "")
@@ -6211,7 +6668,7 @@ var responsesRunAdapter = function() {
                                 })
                             })
                         ];
-                    case 72:
+                    case 46:
                         return [
                             2
                         ];
@@ -6259,10 +6716,10 @@ var createThreadsHandlers = function() {
 };
 // src/adapters/storage/responsesStorageAdapter/routes/messages.ts
 var createMessagesHandlers = function(param) {
-    var openai = param.openai, ensureConversation = param.ensureConversation, getConversationId = param.getConversationId, serializeThreadMessage2 = param.serializeThreadMessage, threadLastAssistant = param.threadLastAssistant;
+    var openai = param.openai, ensureConversation = param.ensureConversation, getConversationId = param.getConversationId, serializeThreadMessage2 = param.serializeThreadMessage, setLastUserText = param.setLastUserText;
     var get14 = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(url) {
-            var _combined_at, pathname, m, threadId, combined, convId, attempt, list, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, it, err, hasAssistant, e, hasAssistantWithText, attempt1, list2, lastOutput, _iteratorAbruptCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _value1, it1, err1, e1, last4, hasAnyAssistant, i, m2, txt, _m2_content__text, _m2_content_, _m2_content, _m2_content__text_value, _threadLastAssistant_get, _threadLastAssistant_get_text, cached, _combined_at_id;
+            var _combined_at, pathname, m, threadId, combined, convId, list, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, it, err, err1, _err_message, _combined_at_id;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -6278,22 +6735,15 @@ var createMessagesHandlers = function(param) {
                         convId = _state.sent();
                         if (!convId) return [
                             3,
-                            41
+                            17
                         ];
-                        attempt = 0;
                         _state.label = 2;
                     case 2:
-                        if (!(attempt < 3)) return [
-                            3,
-                            21
-                        ];
-                        _state.label = 3;
-                    case 3:
                         _state.trys.push([
-                            3,
-                            18,
+                            2,
+                            16,
                             ,
-                            20
+                            17
                         ]);
                         return [
                             4,
@@ -6301,28 +6751,28 @@ var createMessagesHandlers = function(param) {
                                 order: "asc"
                             })
                         ];
-                    case 4:
+                    case 3:
                         list = _state.sent();
                         _iteratorAbruptCompletion = false, _didIteratorError = false;
-                        _state.label = 5;
-                    case 5:
+                        _state.label = 4;
+                    case 4:
                         _state.trys.push([
-                            5,
+                            4,
+                            9,
                             10,
-                            11,
-                            16
+                            15
                         ]);
                         _iterator = _async_iterator(list);
-                        _state.label = 6;
-                    case 6:
+                        _state.label = 5;
+                    case 5:
                         return [
                             4,
                             _iterator.next()
                         ];
-                    case 7:
+                    case 6:
                         if (!(_iteratorAbruptCompletion = !(_step = _state.sent()).done)) return [
                             3,
-                            9
+                            8
                         ];
                         _value = _step.value;
                         it = _value;
@@ -6332,329 +6782,81 @@ var createMessagesHandlers = function(param) {
                                 threadId: threadId
                             }));
                         }
-                        _state.label = 8;
-                    case 8:
+                        _state.label = 7;
+                    case 7:
                         _iteratorAbruptCompletion = false;
                         return [
                             3,
-                            6
+                            5
                         ];
-                    case 9:
+                    case 8:
                         return [
                             3,
-                            16
+                            15
                         ];
-                    case 10:
+                    case 9:
                         err = _state.sent();
                         _didIteratorError = true;
                         _iteratorError = err;
                         return [
                             3,
-                            16
+                            15
                         ];
-                    case 11:
+                    case 10:
                         _state.trys.push([
-                            11,
+                            10,
                             ,
-                            14,
-                            15
+                            13,
+                            14
                         ]);
                         if (!(_iteratorAbruptCompletion && _iterator.return != null)) return [
                             3,
-                            13
+                            12
                         ];
                         return [
                             4,
                             _iterator.return()
                         ];
-                    case 12:
-                        _state.sent();
-                        _state.label = 13;
-                    case 13:
-                        return [
-                            3,
-                            15
-                        ];
-                    case 14:
-                        if (_didIteratorError) {
-                            throw _iteratorError;
-                        }
-                        return [
-                            7
-                        ];
-                    case 15:
-                        return [
-                            7
-                        ];
-                    case 16:
-                        hasAssistant = combined.some(function(m2) {
-                            return m2.role === "assistant";
-                        });
-                        if (hasAssistant || attempt === 2) return [
-                            3,
-                            21
-                        ];
-                        return [
-                            4,
-                            new Promise(function(r) {
-                                return setTimeout(r, 120);
-                            })
-                        ];
-                    case 17:
-                        _state.sent();
-                        return [
-                            3,
-                            20
-                        ];
-                    case 18:
-                        e = _state.sent();
-                        return [
-                            4,
-                            new Promise(function(r) {
-                                return setTimeout(r, 120);
-                            })
-                        ];
-                    case 19:
-                        _state.sent();
-                        return [
-                            3,
-                            20
-                        ];
-                    case 20:
-                        attempt++;
-                        return [
-                            3,
-                            2
-                        ];
-                    case 21:
-                        hasAssistantWithText = combined.some(function(m2) {
-                            var _m2_content__text, _m2_content_, _m2_content;
-                            var _m2_content__text_value;
-                            return m2.role === "assistant" && ((_m2_content__text_value = (_m2_content = m2.content) === null || _m2_content === void 0 ? void 0 : (_m2_content_ = _m2_content[0]) === null || _m2_content_ === void 0 ? void 0 : (_m2_content__text = _m2_content_.text) === null || _m2_content__text === void 0 ? void 0 : _m2_content__text.value) !== null && _m2_content__text_value !== void 0 ? _m2_content__text_value : "").length > 0;
-                        });
-                        if (!!hasAssistantWithText) return [
-                            3,
-                            41
-                        ];
-                        attempt1 = 0;
-                        _state.label = 22;
-                    case 22:
-                        if (!(attempt1 < 3)) return [
-                            3,
-                            41
-                        ];
-                        _state.label = 23;
-                    case 23:
-                        _state.trys.push([
-                            23,
-                            37,
-                            ,
-                            38
-                        ]);
-                        return [
-                            4,
-                            openai.conversations.items.list(convId, {
-                                order: "asc"
-                            })
-                        ];
-                    case 24:
-                        list2 = _state.sent();
-                        lastOutput = null;
-                        _iteratorAbruptCompletion1 = false, _didIteratorError1 = false;
-                        _state.label = 25;
-                    case 25:
-                        _state.trys.push([
-                            25,
-                            30,
-                            31,
-                            36
-                        ]);
-                        _iterator1 = _async_iterator(list2);
-                        _state.label = 26;
-                    case 26:
-                        return [
-                            4,
-                            _iterator1.next()
-                        ];
-                    case 27:
-                        if (!(_iteratorAbruptCompletion1 = !(_step1 = _state.sent()).done)) return [
-                            3,
-                            29
-                        ];
-                        _value1 = _step1.value;
-                        it1 = _value1;
-                        if (it1.type === "function_call_output" && typeof it1.output === "string") {
-                            lastOutput = it1.output;
-                        }
-                        _state.label = 28;
-                    case 28:
-                        _iteratorAbruptCompletion1 = false;
-                        return [
-                            3,
-                            26
-                        ];
-                    case 29:
-                        return [
-                            3,
-                            36
-                        ];
-                    case 30:
-                        err1 = _state.sent();
-                        _didIteratorError1 = true;
-                        _iteratorError1 = err1;
-                        return [
-                            3,
-                            36
-                        ];
-                    case 31:
-                        _state.trys.push([
-                            31,
-                            ,
-                            34,
-                            35
-                        ]);
-                        if (!(_iteratorAbruptCompletion1 && _iterator1.return != null)) return [
-                            3,
-                            33
-                        ];
-                        return [
-                            4,
-                            _iterator1.return()
-                        ];
-                    case 32:
+                    case 11:
                         _state.sent();
-                        _state.label = 33;
-                    case 33:
+                        _state.label = 12;
+                    case 12:
                         return [
                             3,
-                            35
-                        ];
-                    case 34:
-                        if (_didIteratorError1) {
-                            throw _iteratorError1;
+                            14
+                        ];
+                    case 13:
+                        if (_didIteratorError) {
+                            throw _iteratorError;
                         }
                         return [
                             7
                         ];
-                    case 35:
+                    case 14:
                         return [
                             7
                         ];
-                    case 36:
-                        if (lastOutput) {
-                            combined.push({
-                                id: "msg_".concat(Math.random().toString(36).slice(2)),
-                                object: "thread.message",
-                                created_at: Math.floor(Date.now() / 1e3),
-                                thread_id: threadId,
-                                completed_at: Math.floor(Date.now() / 1e3),
-                                incomplete_at: null,
-                                incomplete_details: null,
-                                role: "assistant",
-                                content: [
-                                    {
-                                        type: "text",
-                                        text: {
-                                            value: lastOutput,
-                                            annotations: []
-                                        }
-                                    }
-                                ],
-                                assistant_id: null,
-                                run_id: null,
-                                attachments: [],
-                                status: "completed",
-                                metadata: {}
-                            });
-                            return [
-                                3,
-                                41
-                            ];
-                        }
-                        return [
-                            3,
-                            38
-                        ];
-                    case 37:
-                        e1 = _state.sent();
+                    case 15:
                         return [
                             3,
-                            38
+                            17
                         ];
-                    case 38:
+                    case 16:
+                        err1 = _state.sent();
                         return [
-                            4,
-                            new Promise(function(r) {
-                                return setTimeout(r, 120);
+                            2,
+                            new Response(JSON.stringify({
+                                error: {
+                                    message: (_err_message = err1 === null || err1 === void 0 ? void 0 : err1.message) !== null && _err_message !== void 0 ? _err_message : "failed to list messages"
+                                }
+                            }), {
+                                status: 500,
+                                headers: {
+                                    "Content-Type": "application/json"
+                                }
                             })
                         ];
-                    case 39:
-                        _state.sent();
-                        _state.label = 40;
-                    case 40:
-                        attempt1++;
-                        return [
-                            3,
-                            22
-                        ];
-                    case 41:
-                        last4 = threadLastAssistant.get(threadId);
-                        hasAnyAssistant = combined.some(function(m2) {
-                            return m2.role === "assistant";
-                        });
-                        if (last4 && !hasAnyAssistant) {
-                            combined.push({
-                                id: last4.id,
-                                object: "thread.message",
-                                created_at: last4.created_at,
-                                thread_id: threadId,
-                                completed_at: last4.created_at,
-                                incomplete_at: null,
-                                incomplete_details: null,
-                                role: "assistant",
-                                content: [
-                                    {
-                                        type: "text",
-                                        text: {
-                                            value: last4.text,
-                                            annotations: []
-                                        }
-                                    }
-                                ],
-                                assistant_id: null,
-                                run_id: null,
-                                attachments: [],
-                                status: "completed",
-                                metadata: {}
-                            });
-                        }
-                        for(i = 0; i < combined.length; i++){
-                            m2 = combined[i];
-                            if ((m2 === null || m2 === void 0 ? void 0 : m2.role) !== "assistant") continue;
-                            txt = "";
-                            try {
-                                ;
-                                ;
-                                txt = String((_m2_content__text_value = m2 === null || m2 === void 0 ? void 0 : (_m2_content = m2.content) === null || _m2_content === void 0 ? void 0 : (_m2_content_ = _m2_content[0]) === null || _m2_content_ === void 0 ? void 0 : (_m2_content__text = _m2_content_.text) === null || _m2_content__text === void 0 ? void 0 : _m2_content__text.value) !== null && _m2_content__text_value !== void 0 ? _m2_content__text_value : "");
-                            } catch (e) {}
-                            if (!txt) {
-                                ;
-                                ;
-                                cached = (_threadLastAssistant_get_text = (_threadLastAssistant_get = threadLastAssistant.get(threadId)) === null || _threadLastAssistant_get === void 0 ? void 0 : _threadLastAssistant_get.text) !== null && _threadLastAssistant_get_text !== void 0 ? _threadLastAssistant_get_text : "";
-                                combined[i] = _object_spread_props(_object_spread({}, m2), {
-                                    content: [
-                                        {
-                                            type: "text",
-                                            text: {
-                                                value: cached,
-                                                annotations: []
-                                            }
-                                        }
-                                    ],
-                                    status: "completed"
-                                });
-                            }
-                        }
+                    case 17:
                         return [
                             2,
                             new Response(JSON.stringify({
@@ -6677,7 +6879,7 @@ var createMessagesHandlers = function(param) {
     }();
     var post15 = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(url, options) {
-            var _created_data_find, _created_data, pathname, m, threadId, body, convId, _body_content, contentItems, created, i, _body_role, e, _body_role1, _created_data_find1, item, msg;
+            var _contentItems_find, _created_data_find, _created_data, pathname, m, threadId, body, convId, _body_content, contentItems, _contentItems_find_text, _ref, txt, created, _body_role, err, _err_message, _body_role1, _created_data_find1, item, msg;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -6702,20 +6904,17 @@ var createMessagesHandlers = function(param) {
                                 text: String((_body_content = body.content) !== null && _body_content !== void 0 ? _body_content : "")
                             }
                         ];
-                        i = 0;
+                        txt = String((_ref = (_contentItems_find_text = (_contentItems_find = contentItems.find(function(c) {
+                            return (c === null || c === void 0 ? void 0 : c.type) === "input_text";
+                        })) === null || _contentItems_find === void 0 ? void 0 : _contentItems_find.text) !== null && _contentItems_find_text !== void 0 ? _contentItems_find_text : "") !== null && _ref !== void 0 ? _ref : "");
+                        if (txt) setLastUserText(threadId, txt);
                         _state.label = 2;
                     case 2:
-                        if (!(i < 5)) return [
-                            3,
-                            8
-                        ];
-                        _state.label = 3;
-                    case 3:
                         _state.trys.push([
-                            3,
-                            5,
+                            2,
+                            4,
                             ,
-                            7
+                            5
                         ]);
                         return [
                             4,
@@ -6729,33 +6928,28 @@ var createMessagesHandlers = function(param) {
                                 ]
                             })
                         ];
-                    case 4:
+                    case 3:
                         created = _state.sent();
                         return [
                             3,
-                            8
+                            5
                         ];
-                    case 5:
-                        e = _state.sent();
+                    case 4:
+                        err = _state.sent();
                         return [
-                            4,
-                            new Promise(function(r) {
-                                return setTimeout(r, 150);
+                            2,
+                            new Response(JSON.stringify({
+                                error: {
+                                    message: (_err_message = err === null || err === void 0 ? void 0 : err.message) !== null && _err_message !== void 0 ? _err_message : "failed to create message"
+                                }
+                            }), {
+                                status: 500,
+                                headers: {
+                                    "Content-Type": "application/json"
+                                }
                             })
                         ];
-                    case 6:
-                        _state.sent();
-                        return [
-                            3,
-                            7
-                        ];
-                    case 7:
-                        i++;
-                        return [
-                            3,
-                            2
-                        ];
-                    case 8:
+                    case 5:
                         item = (_created_data_find1 = created === null || created === void 0 ? void 0 : (_created_data = created.data) === null || _created_data === void 0 ? void 0 : (_created_data_find = _created_data.find) === null || _created_data_find === void 0 ? void 0 : _created_data_find.call(_created_data, function(i) {
                             return i.type === "message";
                         })) !== null && _created_data_find1 !== void 0 ? _created_data_find1 : {
@@ -6792,7 +6986,7 @@ var createMessagesHandlers = function(param) {
 var import_radash14 = require("radash");
 var import_dayjs11 = __toESM(require("dayjs"), 1);
 var createRunsHandlers = function(param) {
-    var openai = param.openai, runAdapter = param.runAdapter, getAssistant = param.getAssistant, getConversationId = param.getConversationId, setConversationId = param.setConversationId, ensureConversation = param.ensureConversation, onEventBridge = param.onEventBridge, runs2 = param.runs, runSteps = param.runSteps, runLastResponseId = param.runLastResponseId;
+    var openai = param.openai, runAdapter = param.runAdapter, getAssistant = param.getAssistant, getConversationId = param.getConversationId, setConversationId = param.setConversationId, ensureConversation = param.ensureConversation, onEventBridge = param.onEventBridge, runs2 = param.runs, runSteps = param.runSteps, runLastResponseId = param.runLastResponseId, getLastUserText = param.getLastUserText;
     var post15 = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(url, options) {
             var pathname, m, threadId, body, assistantId, stream, _ref, model, instructions, runId, _body_instructions, _ref1, _body_tools, _body_metadata, run2, startRun, readable, start, r, _runSteps_get, steps2, hasTool;
@@ -6847,12 +7041,14 @@ var createRunsHandlers = function(param) {
                         runSteps.set(runId, []);
                         startRun = /*#__PURE__*/ function() {
                             var _ref = _async_to_generator(function(controller) {
+                                var seedText;
                                 return _ts_generator(this, function(_state) {
                                     switch(_state.label){
                                         case 0:
+                                            seedText = getLastUserText(threadId);
                                             return [
                                                 4,
-                                                runAdapter({
+                                                runAdapter(_object_spread_props(_object_spread({
                                                     client: openai,
                                                     run: run2,
                                                     onEvent: onEventBridge({
@@ -6895,7 +7091,10 @@ var createRunsHandlers = function(param) {
                                                         return function(convId) {
                                                             return _ref.apply(this, arguments);
                                                         };
-                                                    }(),
+                                                    }()
+                                                }, seedText ? {
+                                                    inputItems: seedText
+                                                } : {}), {
                                                     setLastResponseId: /*#__PURE__*/ function() {
                                                         var _ref = _async_to_generator(function(respId) {
                                                             return _ts_generator(this, function(_state) {
@@ -6909,7 +7108,7 @@ var createRunsHandlers = function(param) {
                                                             return _ref.apply(this, arguments);
                                                         };
                                                     }()
-                                                })
+                                                }))
                                             ];
                                         case 1:
                                             _state.sent();
@@ -7033,7 +7232,7 @@ var createRunHandlers = function(param) {
     var openai = param.openai, runs2 = param.runs, runSteps = param.runSteps, getConversationId = param.getConversationId, runCompletedAfterTool = param.runCompletedAfterTool, runToolSubmitted = param.runToolSubmitted;
     var get14 = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(url) {
-            var pathname, m, threadId, runId, run2, _toolStep_step_details_tool_calls, _toolStep_step_details, start, _runSteps_get, stepsNow, hasToolNow, _runSteps_get1, steps2, toolStep, tool_calls, convId, page, calls, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, it, _it_arguments, err, e, convId1, list, sawOutput, sawAssistant, _iteratorAbruptCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _value1, it1, t, _it_content_find, _it_content_find1, _it_content, text, err1, e1;
+            var pathname, m, threadId, runId, run2, _toolStepNow_step_details_tool_calls, _toolStepNow_step_details, start, _runSteps_get, stepsNow2, hasToolNow, _runSteps_get1, stepsNow, toolStepNow, tool_calls, convId, page, calls, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, it, _it_arguments, err, e, convId1, list, sawOutput, sawAssistant, _iteratorAbruptCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _value1, it1, t, _it_content_find, _it_content_find1, _it_content, text, err1, e1;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -7069,12 +7268,12 @@ var createRunHandlers = function(param) {
                         ];
                         _state.label = 1;
                     case 1:
-                        if (!(Date.now() - start < 1500)) return [
+                        if (!(Date.now() - start < 2500)) return [
                             3,
                             3
                         ];
-                        stepsNow = (_runSteps_get = runSteps.get(runId)) !== null && _runSteps_get !== void 0 ? _runSteps_get : [];
-                        hasToolNow = stepsNow.some(function(s) {
+                        stepsNow2 = (_runSteps_get = runSteps.get(runId)) !== null && _runSteps_get !== void 0 ? _runSteps_get : [];
+                        hasToolNow = stepsNow2.some(function(s) {
                             var _s_step_details, _s_step_details_tool_calls;
                             return ((_s_step_details = s.step_details) === null || _s_step_details === void 0 ? void 0 : _s_step_details.type) === "tool_calls" && ((_s_step_details_tool_calls = s.step_details.tool_calls) === null || _s_step_details_tool_calls === void 0 ? void 0 : _s_step_details_tool_calls.length);
                         });
@@ -7095,13 +7294,13 @@ var createRunHandlers = function(param) {
                             1
                         ];
                     case 3:
-                        steps2 = (_runSteps_get1 = runSteps.get(runId)) !== null && _runSteps_get1 !== void 0 ? _runSteps_get1 : [];
-                        toolStep = steps2.find(function(s) {
+                        stepsNow = (_runSteps_get1 = runSteps.get(runId)) !== null && _runSteps_get1 !== void 0 ? _runSteps_get1 : [];
+                        toolStepNow = stepsNow.find(function(s) {
                             var _s_step_details;
                             return ((_s_step_details = s.step_details) === null || _s_step_details === void 0 ? void 0 : _s_step_details.type) === "tool_calls";
                         });
-                        if (toolStep === null || toolStep === void 0 ? void 0 : (_toolStep_step_details = toolStep.step_details) === null || _toolStep_step_details === void 0 ? void 0 : (_toolStep_step_details_tool_calls = _toolStep_step_details.tool_calls) === null || _toolStep_step_details_tool_calls === void 0 ? void 0 : _toolStep_step_details_tool_calls.length) {
-                            tool_calls = toolStep.step_details.tool_calls.map(function(tc) {
+                        if (toolStepNow === null || toolStepNow === void 0 ? void 0 : (_toolStepNow_step_details = toolStepNow.step_details) === null || _toolStepNow_step_details === void 0 ? void 0 : (_toolStepNow_step_details_tool_calls = _toolStepNow_step_details.tool_calls) === null || _toolStepNow_step_details_tool_calls === void 0 ? void 0 : _toolStepNow_step_details_tool_calls.length) {
+                            tool_calls = toolStepNow.step_details.tool_calls.map(function(tc) {
                                 var _tc_function, _tc_function1;
                                 var _tc_id, _ref, _tc_function_name, _tc_function_arguments, _ref1;
                                 return {
@@ -7485,7 +7684,7 @@ var createStepsHandlers = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/routes/submitToolOutputs.ts
 var createSubmitToolOutputsHandlers = function(param) {
-    var openai = param.openai, runAdapter = param.runAdapter, runs2 = param.runs, onEventBridge = param.onEventBridge, getConversationId = param.getConversationId, ensureConversation = param.ensureConversation, setConversationId = param.setConversationId, getAssistant = param.getAssistant, runLastResponseId = param.runLastResponseId, threadLastAssistant = param.threadLastAssistant, runCompletedAfterTool = param.runCompletedAfterTool, runToolSubmitted = param.runToolSubmitted;
+    var openai = param.openai, runAdapter = param.runAdapter, runs2 = param.runs, onEventBridge = param.onEventBridge, getConversationId = param.getConversationId, ensureConversation = param.ensureConversation, setConversationId = param.setConversationId, getAssistant = param.getAssistant, runLastResponseId = param.runLastResponseId, runCompletedAfterTool = param.runCompletedAfterTool, runToolSubmitted = param.runToolSubmitted;
     var post15 = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(url, options) {
             var pathname, m, threadId, runId, body, tool_outputs, stream, convId, existingRun, startRun, readable;
@@ -7515,7 +7714,7 @@ var createSubmitToolOutputsHandlers = function(param) {
                         ];
                         startRun = /*#__PURE__*/ function() {
                             var _ref = _async_to_generator(function(controller) {
-                                var _tool_outputs_, resumed, wantId, i, page, found, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, it, err, e, ok, i1, e1, _runLastResponseId_get, list, lastMsg, _iteratorAbruptCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _value1, it1, err1, _lastMsg_content_find, _lastMsg_content_find1, _lastMsg_content, _lastMsg_content_find_text, list2, lastOutput, _iteratorAbruptCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, _value2, it2, err2, e2, r;
+                                var resumed, _runLastResponseId_get, r;
                                 return _ts_generator(this, function(_state) {
                                     switch(_state.label){
                                         case 0:
@@ -7525,209 +7724,6 @@ var createSubmitToolOutputsHandlers = function(param) {
                                             });
                                             runs2.set(runId, resumed);
                                             runToolSubmitted.set(runId, true);
-                                            wantId = tool_outputs === null || tool_outputs === void 0 ? void 0 : (_tool_outputs_ = tool_outputs[0]) === null || _tool_outputs_ === void 0 ? void 0 : _tool_outputs_.tool_call_id;
-                                            if (!wantId) return [
-                                                3,
-                                                20
-                                            ];
-                                            i = 0;
-                                            _state.label = 1;
-                                        case 1:
-                                            if (!(i < 10)) return [
-                                                3,
-                                                20
-                                            ];
-                                            _state.label = 2;
-                                        case 2:
-                                            _state.trys.push([
-                                                2,
-                                                16,
-                                                ,
-                                                17
-                                            ]);
-                                            return [
-                                                4,
-                                                openai.conversations.items.list(convId, {
-                                                    order: "desc"
-                                                })
-                                            ];
-                                        case 3:
-                                            page = _state.sent();
-                                            found = false;
-                                            _iteratorAbruptCompletion = false, _didIteratorError = false;
-                                            _state.label = 4;
-                                        case 4:
-                                            _state.trys.push([
-                                                4,
-                                                9,
-                                                10,
-                                                15
-                                            ]);
-                                            _iterator = _async_iterator(page);
-                                            _state.label = 5;
-                                        case 5:
-                                            return [
-                                                4,
-                                                _iterator.next()
-                                            ];
-                                        case 6:
-                                            if (!(_iteratorAbruptCompletion = !(_step = _state.sent()).done)) return [
-                                                3,
-                                                8
-                                            ];
-                                            _value = _step.value;
-                                            it = _value;
-                                            if (it.type === "function_call" && it.call_id === wantId) {
-                                                found = true;
-                                                return [
-                                                    3,
-                                                    8
-                                                ];
-                                            }
-                                            _state.label = 7;
-                                        case 7:
-                                            _iteratorAbruptCompletion = false;
-                                            return [
-                                                3,
-                                                5
-                                            ];
-                                        case 8:
-                                            return [
-                                                3,
-                                                15
-                                            ];
-                                        case 9:
-                                            err = _state.sent();
-                                            _didIteratorError = true;
-                                            _iteratorError = err;
-                                            return [
-                                                3,
-                                                15
-                                            ];
-                                        case 10:
-                                            _state.trys.push([
-                                                10,
-                                                ,
-                                                13,
-                                                14
-                                            ]);
-                                            if (!(_iteratorAbruptCompletion && _iterator.return != null)) return [
-                                                3,
-                                                12
-                                            ];
-                                            return [
-                                                4,
-                                                _iterator.return()
-                                            ];
-                                        case 11:
-                                            _state.sent();
-                                            _state.label = 12;
-                                        case 12:
-                                            return [
-                                                3,
-                                                14
-                                            ];
-                                        case 13:
-                                            if (_didIteratorError) {
-                                                throw _iteratorError;
-                                            }
-                                            return [
-                                                7
-                                            ];
-                                        case 14:
-                                            return [
-                                                7
-                                            ];
-                                        case 15:
-                                            if (found) return [
-                                                3,
-                                                20
-                                            ];
-                                            return [
-                                                3,
-                                                17
-                                            ];
-                                        case 16:
-                                            e = _state.sent();
-                                            return [
-                                                3,
-                                                17
-                                            ];
-                                        case 17:
-                                            return [
-                                                4,
-                                                new Promise(function(r2) {
-                                                    return setTimeout(r2, 100);
-                                                })
-                                            ];
-                                        case 18:
-                                            _state.sent();
-                                            _state.label = 19;
-                                        case 19:
-                                            i++;
-                                            return [
-                                                3,
-                                                1
-                                            ];
-                                        case 20:
-                                            ok = false;
-                                            i1 = 0;
-                                            _state.label = 21;
-                                        case 21:
-                                            if (!(i1 < 5)) return [
-                                                3,
-                                                27
-                                            ];
-                                            _state.label = 22;
-                                        case 22:
-                                            _state.trys.push([
-                                                22,
-                                                24,
-                                                ,
-                                                26
-                                            ]);
-                                            return [
-                                                4,
-                                                openai.conversations.items.create(convId, {
-                                                    items: tool_outputs.map(function(t) {
-                                                        var _t_output;
-                                                        return {
-                                                            type: "function_call_output",
-                                                            call_id: t.tool_call_id,
-                                                            output: String((_t_output = t.output) !== null && _t_output !== void 0 ? _t_output : "")
-                                                        };
-                                                    })
-                                                })
-                                            ];
-                                        case 23:
-                                            _state.sent();
-                                            ok = true;
-                                            return [
-                                                3,
-                                                27
-                                            ];
-                                        case 24:
-                                            e1 = _state.sent();
-                                            return [
-                                                4,
-                                                new Promise(function(r2) {
-                                                    return setTimeout(r2, 150);
-                                                })
-                                            ];
-                                        case 25:
-                                            _state.sent();
-                                            return [
-                                                3,
-                                                26
-                                            ];
-                                        case 26:
-                                            i1++;
-                                            return [
-                                                3,
-                                                21
-                                            ];
-                                        case 27:
-                                            if (!ok) {}
                                             return [
                                                 4,
                                                 runAdapter({
@@ -7785,242 +7781,21 @@ var createSubmitToolOutputsHandlers = function(param) {
                                                     previousResponseId: (_runLastResponseId_get = runLastResponseId.get(runId)) !== null && _runLastResponseId_get !== void 0 ? _runLastResponseId_get : null,
                                                     setLastResponseId: /*#__PURE__*/ function() {
                                                         var _ref = _async_to_generator(function(respId) {
-                                                            return _ts_generator(this, function(_state) {
-                                                                runLastResponseId.set(runId, respId);
-                                                                return [
-                                                                    2
-                                                                ];
-                                                            });
-                                                        });
-                                                        return function(respId) {
-                                                            return _ref.apply(this, arguments);
-                                                        };
-                                                    }()
-                                                })
-                                            ];
-                                        case 28:
-                                            _state.sent();
-                                            _state.label = 29;
-                                        case 29:
-                                            _state.trys.push([
-                                                29,
-                                                57,
-                                                ,
-                                                58
-                                            ]);
-                                            return [
-                                                4,
-                                                openai.conversations.items.list(convId, {
-                                                    order: "asc"
-                                                })
-                                            ];
-                                        case 30:
-                                            list = _state.sent();
-                                            lastMsg = null;
-                                            _iteratorAbruptCompletion1 = false, _didIteratorError1 = false;
-                                            _state.label = 31;
-                                        case 31:
-                                            _state.trys.push([
-                                                31,
-                                                36,
-                                                37,
-                                                42
-                                            ]);
-                                            _iterator1 = _async_iterator(list);
-                                            _state.label = 32;
-                                        case 32:
-                                            return [
-                                                4,
-                                                _iterator1.next()
-                                            ];
-                                        case 33:
-                                            if (!(_iteratorAbruptCompletion1 = !(_step1 = _state.sent()).done)) return [
-                                                3,
-                                                35
-                                            ];
-                                            _value1 = _step1.value;
-                                            it1 = _value1;
-                                            if (it1.type === "message" && it1.role === "assistant") lastMsg = it1;
-                                            _state.label = 34;
-                                        case 34:
-                                            _iteratorAbruptCompletion1 = false;
-                                            return [
-                                                3,
-                                                32
-                                            ];
-                                        case 35:
-                                            return [
-                                                3,
-                                                42
-                                            ];
-                                        case 36:
-                                            err1 = _state.sent();
-                                            _didIteratorError1 = true;
-                                            _iteratorError1 = err1;
-                                            return [
-                                                3,
-                                                42
-                                            ];
-                                        case 37:
-                                            _state.trys.push([
-                                                37,
-                                                ,
-                                                40,
-                                                41
-                                            ]);
-                                            if (!(_iteratorAbruptCompletion1 && _iterator1.return != null)) return [
-                                                3,
-                                                39
-                                            ];
-                                            return [
-                                                4,
-                                                _iterator1.return()
-                                            ];
-                                        case 38:
-                                            _state.sent();
-                                            _state.label = 39;
-                                        case 39:
-                                            return [
-                                                3,
-                                                41
-                                            ];
-                                        case 40:
-                                            if (_didIteratorError1) {
-                                                throw _iteratorError1;
-                                            }
-                                            return [
-                                                7
-                                            ];
-                                        case 41:
-                                            return [
-                                                7
-                                            ];
-                                        case 42:
-                                            if (lastMsg) {
-                                                ;
-                                                ;
-                                                threadLastAssistant.set(threadId, {
-                                                    id: lastMsg.id,
-                                                    text: (_lastMsg_content_find_text = (_lastMsg_content = lastMsg.content) === null || _lastMsg_content === void 0 ? void 0 : (_lastMsg_content_find1 = _lastMsg_content.find) === null || _lastMsg_content_find1 === void 0 ? void 0 : (_lastMsg_content_find = _lastMsg_content_find1.call(_lastMsg_content, function(c) {
-                                                        return c.type === "output_text";
-                                                    })) === null || _lastMsg_content_find === void 0 ? void 0 : _lastMsg_content_find.text) !== null && _lastMsg_content_find_text !== void 0 ? _lastMsg_content_find_text : "",
-                                                    created_at: Math.floor(Date.now() / 1e3)
-                                                });
-                                            }
-                                            if (!!threadLastAssistant.get(threadId)) return [
-                                                3,
-                                                56
-                                            ];
-                                            return [
-                                                4,
-                                                openai.conversations.items.list(convId, {
-                                                    order: "asc"
+                                                            return _ts_generator(this, function(_state) {
+                                                                runLastResponseId.set(runId, respId);
+                                                                return [
+                                                                    2
+                                                                ];
+                                                            });
+                                                        });
+                                                        return function(respId) {
+                                                            return _ref.apply(this, arguments);
+                                                        };
+                                                    }()
                                                 })
                                             ];
-                                        case 43:
-                                            list2 = _state.sent();
-                                            lastOutput = null;
-                                            _iteratorAbruptCompletion2 = false, _didIteratorError2 = false;
-                                            _state.label = 44;
-                                        case 44:
-                                            _state.trys.push([
-                                                44,
-                                                49,
-                                                50,
-                                                55
-                                            ]);
-                                            _iterator2 = _async_iterator(list2);
-                                            _state.label = 45;
-                                        case 45:
-                                            return [
-                                                4,
-                                                _iterator2.next()
-                                            ];
-                                        case 46:
-                                            if (!(_iteratorAbruptCompletion2 = !(_step2 = _state.sent()).done)) return [
-                                                3,
-                                                48
-                                            ];
-                                            _value2 = _step2.value;
-                                            it2 = _value2;
-                                            if (it2.type === "function_call_output" && typeof it2.output === "string") {
-                                                lastOutput = it2.output;
-                                            }
-                                            _state.label = 47;
-                                        case 47:
-                                            _iteratorAbruptCompletion2 = false;
-                                            return [
-                                                3,
-                                                45
-                                            ];
-                                        case 48:
-                                            return [
-                                                3,
-                                                55
-                                            ];
-                                        case 49:
-                                            err2 = _state.sent();
-                                            _didIteratorError2 = true;
-                                            _iteratorError2 = err2;
-                                            return [
-                                                3,
-                                                55
-                                            ];
-                                        case 50:
-                                            _state.trys.push([
-                                                50,
-                                                ,
-                                                53,
-                                                54
-                                            ]);
-                                            if (!(_iteratorAbruptCompletion2 && _iterator2.return != null)) return [
-                                                3,
-                                                52
-                                            ];
-                                            return [
-                                                4,
-                                                _iterator2.return()
-                                            ];
-                                        case 51:
+                                        case 1:
                                             _state.sent();
-                                            _state.label = 52;
-                                        case 52:
-                                            return [
-                                                3,
-                                                54
-                                            ];
-                                        case 53:
-                                            if (_didIteratorError2) {
-                                                throw _iteratorError2;
-                                            }
-                                            return [
-                                                7
-                                            ];
-                                        case 54:
-                                            return [
-                                                7
-                                            ];
-                                        case 55:
-                                            if (lastOutput) {
-                                                threadLastAssistant.set(threadId, {
-                                                    id: "msg_".concat(Math.random().toString(36).slice(2)),
-                                                    text: lastOutput,
-                                                    created_at: Math.floor(Date.now() / 1e3)
-                                                });
-                                            }
-                                            _state.label = 56;
-                                        case 56:
-                                            return [
-                                                3,
-                                                58
-                                            ];
-                                        case 57:
-                                            e2 = _state.sent();
-                                            return [
-                                                3,
-                                                58
-                                            ];
-                                        case 58:
                                             r = runs2.get(runId);
                                             if (r && r.status !== "completed") {
                                                 runs2.set(runId, _object_spread_props(_object_spread({}, r), {
@@ -8157,137 +7932,264 @@ var serializeThreadMessage = function(param) {
 // src/adapters/storage/responsesStorageAdapter/helpers/onEventBridgeInMemory.ts
 var import_radash15 = require("radash");
 var onEventBridgeInMemory = function(param) {
-    var controller = param.controller, runs2 = param.runs, runSteps = param.runSteps, threadLastAssistant = param.threadLastAssistant, runCompletedAfterTool = param.runCompletedAfterTool;
+    var controller = param.controller, runs2 = param.runs, runSteps = param.runSteps, runCompletedAfterTool = param.runCompletedAfterTool, getConversationId = param.getConversationId, openai = param.openai, ensureConversation = param.ensureConversation;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(event) {
-            var run2, prev, run21, prev1, run22, prev2, _run2_completed_at, run23, prev3, _run2_failed_at, step, _runSteps_get, list, assigned, payload, delta, _runSteps_get1, list1, idx, _delta_delta_step_details, _delta_delta, existing, merged, _existing_step_details, _existing_step_details_tool_calls, prevCalls, _delta_delta_step_details_tool_calls, addCalls, msg, assigned1, payload1, _msg_content__text, _msg_content_, _msg_content, msg1, _msg_content__text_value, text, _msg_created_at;
+            var run2, prev, run21, prev1, run22, prev2, _run2_completed_at, run23, prev3, _run2_failed_at, step, _runSteps_get, list, assigned, _step_step_details, payload, delta, _runSteps_get1, list1, idx, _delta_delta_step_details, _delta_delta, existing, merged, _existing_step_details, _existing_step_details_tool_calls, prevCalls, _delta_delta_step_details_tool_calls, addCalls, _delta_delta_step_details1, _delta_delta1, msg, assigned1, payload1, _event_data, _event_data_content__text, _event_data_content_, _event_data_content, _event_data1, threadId, _event_data_content__text_value, txt, convId, maxAttempts, attempt, err, _err_error, _err_error1, code, _err_error_param, isLocked, e;
             return _ts_generator(this, function(_state) {
-                if (event.event === "thread.run.in_progress") {
-                    run2 = event.data;
-                    prev = runs2.get(run2.id);
-                    runs2.set(run2.id, _object_spread_props(_object_spread({}, prev !== null && prev !== void 0 ? prev : run2), {
-                        status: "in_progress"
-                    }));
-                }
-                if (event.event === "thread.run.requires_action") {
-                    run21 = event.data;
-                    prev1 = runs2.get(run21.id);
-                    runs2.set(run21.id, _object_spread_props(_object_spread({}, prev1 !== null && prev1 !== void 0 ? prev1 : run21), {
-                        status: "requires_action",
-                        required_action: run21.required_action
-                    }));
-                }
-                if (event.event === "thread.run.completed") {
-                    run22 = event.data;
-                    prev2 = runs2.get(run22.id);
-                    ;
-                    runs2.set(run22.id, _object_spread_props(_object_spread({}, prev2 !== null && prev2 !== void 0 ? prev2 : run22), {
-                        status: "completed",
-                        completed_at: (_run2_completed_at = run22.completed_at) !== null && _run2_completed_at !== void 0 ? _run2_completed_at : Math.floor(Date.now() / 1e3)
-                    }));
-                    runCompletedAfterTool === null || runCompletedAfterTool === void 0 ? void 0 : runCompletedAfterTool.set(run22.id, true);
-                }
-                if (event.event === "thread.run.failed") {
-                    run23 = event.data;
-                    prev3 = runs2.get(run23.id);
-                    ;
-                    runs2.set(run23.id, _object_spread_props(_object_spread({}, prev3 !== null && prev3 !== void 0 ? prev3 : run23), {
-                        status: "failed",
-                        failed_at: (_run2_failed_at = run23.failed_at) !== null && _run2_failed_at !== void 0 ? _run2_failed_at : Math.floor(Date.now() / 1e3)
-                    }));
-                }
-                if (event.event === "thread.run.step.created") {
-                    step = event.data;
-                    ;
-                    list = (_runSteps_get = runSteps.get(step.run_id)) !== null && _runSteps_get !== void 0 ? _runSteps_get : [];
-                    assigned = _object_spread_props(_object_spread({}, step), {
-                        id: step.id === "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID" ? "step_".concat((0, import_radash15.uid)(24)) : step.id
-                    });
-                    runSteps.set(step.run_id, _to_consumable_array(list).concat([
-                        assigned
-                    ]));
-                    payload = _object_spread_props(_object_spread({}, event), {
-                        data: assigned
-                    });
-                    controller === null || controller === void 0 ? void 0 : controller.enqueue("data: ".concat(JSON.stringify(payload), "\n\n"));
-                    return [
-                        2,
-                        assigned
-                    ];
-                }
-                if (event.event === "thread.run.step.delta") {
-                    delta = event.data;
-                    ;
-                    list1 = (_runSteps_get1 = runSteps.get(delta.run_id)) !== null && _runSteps_get1 !== void 0 ? _runSteps_get1 : [];
-                    idx = list1.findIndex(function(s) {
-                        return s.id === delta.id;
-                    });
-                    if (idx >= 0) {
-                        ;
-                        existing = list1[idx];
-                        merged = _object_spread({}, existing);
-                        if (((_delta_delta = delta.delta) === null || _delta_delta === void 0 ? void 0 : (_delta_delta_step_details = _delta_delta.step_details) === null || _delta_delta_step_details === void 0 ? void 0 : _delta_delta_step_details.type) === "tool_calls") {
+                switch(_state.label){
+                    case 0:
+                        if (event.event === "thread.run.in_progress") {
+                            run2 = event.data;
+                            prev = runs2.get(run2.id);
+                            runs2.set(run2.id, _object_spread_props(_object_spread({}, prev !== null && prev !== void 0 ? prev : run2), {
+                                status: "in_progress"
+                            }));
+                        }
+                        if (event.event === "thread.run.requires_action") {
+                            run21 = event.data;
+                            prev1 = runs2.get(run21.id);
+                            runs2.set(run21.id, _object_spread_props(_object_spread({}, prev1 !== null && prev1 !== void 0 ? prev1 : run21), {
+                                status: "requires_action",
+                                required_action: run21.required_action
+                            }));
+                        }
+                        if (event.event === "thread.run.completed") {
+                            run22 = event.data;
+                            prev2 = runs2.get(run22.id);
                             ;
+                            runs2.set(run22.id, _object_spread_props(_object_spread({}, prev2 !== null && prev2 !== void 0 ? prev2 : run22), {
+                                status: "completed",
+                                completed_at: (_run2_completed_at = run22.completed_at) !== null && _run2_completed_at !== void 0 ? _run2_completed_at : Math.floor(Date.now() / 1e3)
+                            }));
+                            runCompletedAfterTool === null || runCompletedAfterTool === void 0 ? void 0 : runCompletedAfterTool.set(run22.id, true);
+                        }
+                        if (event.event === "thread.run.failed") {
+                            run23 = event.data;
+                            prev3 = runs2.get(run23.id);
                             ;
-                            prevCalls = (_existing_step_details_tool_calls = (_existing_step_details = existing.step_details) === null || _existing_step_details === void 0 ? void 0 : _existing_step_details.tool_calls) !== null && _existing_step_details_tool_calls !== void 0 ? _existing_step_details_tool_calls : [];
+                            runs2.set(run23.id, _object_spread_props(_object_spread({}, prev3 !== null && prev3 !== void 0 ? prev3 : run23), {
+                                status: "failed",
+                                failed_at: (_run2_failed_at = run23.failed_at) !== null && _run2_failed_at !== void 0 ? _run2_failed_at : Math.floor(Date.now() / 1e3)
+                            }));
+                        }
+                        if (event.event === "thread.run.step.created") {
+                            step = event.data;
                             ;
-                            addCalls = (_delta_delta_step_details_tool_calls = delta.delta.step_details.tool_calls) !== null && _delta_delta_step_details_tool_calls !== void 0 ? _delta_delta_step_details_tool_calls : [];
-                            merged.step_details = {
-                                type: "tool_calls",
-                                tool_calls: _to_consumable_array(prevCalls).concat(_to_consumable_array(addCalls))
-                            };
+                            list = (_runSteps_get = runSteps.get(step.run_id)) !== null && _runSteps_get !== void 0 ? _runSteps_get : [];
+                            assigned = _object_spread_props(_object_spread({}, step), {
+                                id: step.id === "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID" ? "step_".concat((0, import_radash15.uid)(24)) : step.id
+                            });
+                            runSteps.set(step.run_id, _to_consumable_array(list).concat([
+                                assigned
+                            ]));
+                            try {
+                                ;
+                                console.log("[bridge] step.created", {
+                                    runId: step.run_id,
+                                    type: step === null || step === void 0 ? void 0 : (_step_step_details = step.step_details) === null || _step_step_details === void 0 ? void 0 : _step_step_details.type
+                                });
+                            } catch (e) {}
+                            payload = _object_spread_props(_object_spread({}, event), {
+                                data: assigned
+                            });
+                            controller === null || controller === void 0 ? void 0 : controller.enqueue("data: ".concat(JSON.stringify(payload), "\n\n"));
+                            return [
+                                2,
+                                assigned
+                            ];
                         }
-                        list1[idx] = merged;
-                        runSteps.set(delta.run_id, list1);
-                    }
-                    controller === null || controller === void 0 ? void 0 : controller.enqueue("data: ".concat(JSON.stringify(event), "\n\n"));
-                    return [
-                        2
-                    ];
-                }
-                if (event.event === "thread.message.created") {
-                    msg = event.data;
-                    assigned1 = _object_spread_props(_object_spread({}, msg), {
-                        id: msg.id === "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID" ? "msg_".concat((0, import_radash15.uid)(24)) : msg.id
-                    });
-                    payload1 = _object_spread_props(_object_spread({}, event), {
-                        data: assigned1
-                    });
-                    controller === null || controller === void 0 ? void 0 : controller.enqueue("data: ".concat(JSON.stringify(payload1), "\n\n"));
-                    return [
-                        2,
-                        assigned1
-                    ];
-                }
-                if (event.event === "thread.message.delta") {
-                    controller === null || controller === void 0 ? void 0 : controller.enqueue("data: ".concat(JSON.stringify(event), "\n\n"));
-                    return [
-                        2
-                    ];
-                }
-                if (event.event === "thread.message.completed") {
-                    ;
-                    msg1 = event.data;
-                    ;
-                    text = (_msg_content__text_value = msg1 === null || msg1 === void 0 ? void 0 : (_msg_content = msg1.content) === null || _msg_content === void 0 ? void 0 : (_msg_content_ = _msg_content[0]) === null || _msg_content_ === void 0 ? void 0 : (_msg_content__text = _msg_content_.text) === null || _msg_content__text === void 0 ? void 0 : _msg_content__text.value) !== null && _msg_content__text_value !== void 0 ? _msg_content__text_value : "";
-                    if (text) {
-                        ;
-                        threadLastAssistant.set(msg1.thread_id, {
-                            id: msg1.id,
-                            text: text,
-                            created_at: (_msg_created_at = msg1.created_at) !== null && _msg_created_at !== void 0 ? _msg_created_at : Math.floor(Date.now() / 1e3)
+                        if (event.event === "thread.run.step.delta") {
+                            delta = event.data;
+                            ;
+                            list1 = (_runSteps_get1 = runSteps.get(delta.run_id)) !== null && _runSteps_get1 !== void 0 ? _runSteps_get1 : [];
+                            idx = list1.findIndex(function(s) {
+                                return s.id === delta.id;
+                            });
+                            if (idx >= 0) {
+                                ;
+                                existing = list1[idx];
+                                merged = _object_spread({}, existing);
+                                if (((_delta_delta = delta.delta) === null || _delta_delta === void 0 ? void 0 : (_delta_delta_step_details = _delta_delta.step_details) === null || _delta_delta_step_details === void 0 ? void 0 : _delta_delta_step_details.type) === "tool_calls") {
+                                    ;
+                                    ;
+                                    prevCalls = (_existing_step_details_tool_calls = (_existing_step_details = existing.step_details) === null || _existing_step_details === void 0 ? void 0 : _existing_step_details.tool_calls) !== null && _existing_step_details_tool_calls !== void 0 ? _existing_step_details_tool_calls : [];
+                                    ;
+                                    addCalls = (_delta_delta_step_details_tool_calls = delta.delta.step_details.tool_calls) !== null && _delta_delta_step_details_tool_calls !== void 0 ? _delta_delta_step_details_tool_calls : [];
+                                    merged.step_details = {
+                                        type: "tool_calls",
+                                        tool_calls: _to_consumable_array(prevCalls).concat(_to_consumable_array(addCalls))
+                                    };
+                                }
+                                list1[idx] = merged;
+                                runSteps.set(delta.run_id, list1);
+                            }
+                            try {
+                                ;
+                                console.log("[bridge] step.delta", {
+                                    runId: delta.run_id,
+                                    id: delta.id,
+                                    type: (_delta_delta1 = delta.delta) === null || _delta_delta1 === void 0 ? void 0 : (_delta_delta_step_details1 = _delta_delta1.step_details) === null || _delta_delta_step_details1 === void 0 ? void 0 : _delta_delta_step_details1.type
+                                });
+                            } catch (e) {}
+                            controller === null || controller === void 0 ? void 0 : controller.enqueue("data: ".concat(JSON.stringify(event), "\n\n"));
+                            return [
+                                2
+                            ];
+                        }
+                        if (event.event === "thread.message.created") {
+                            msg = event.data;
+                            assigned1 = _object_spread_props(_object_spread({}, msg), {
+                                id: msg.id === "THERE_IS_A_BUG_IN_SUPERCOMPAT_IF_YOU_SEE_THIS_ID" ? "msg_".concat((0, import_radash15.uid)(24)) : msg.id
+                            });
+                            payload1 = _object_spread_props(_object_spread({}, event), {
+                                data: assigned1
+                            });
+                            controller === null || controller === void 0 ? void 0 : controller.enqueue("data: ".concat(JSON.stringify(payload1), "\n\n"));
+                            return [
+                                2,
+                                assigned1
+                            ];
+                        }
+                        if (event.event === "thread.message.delta") {
+                            controller === null || controller === void 0 ? void 0 : controller.enqueue("data: ".concat(JSON.stringify(event), "\n\n"));
+                            return [
+                                2
+                            ];
+                        }
+                        if (!(event.event === "thread.message.completed")) return [
+                            3,
+                            14
+                        ];
+                        controller === null || controller === void 0 ? void 0 : controller.enqueue("data: ".concat(JSON.stringify(event), "\n\n"));
+                        _state.label = 1;
+                    case 1:
+                        _state.trys.push([
+                            1,
+                            12,
+                            ,
+                            13
+                        ]);
+                        threadId = (_event_data = event.data) === null || _event_data === void 0 ? void 0 : _event_data.thread_id;
+                        txt = (_event_data_content__text_value = (_event_data1 = event.data) === null || _event_data1 === void 0 ? void 0 : (_event_data_content = _event_data1.content) === null || _event_data_content === void 0 ? void 0 : (_event_data_content_ = _event_data_content[0]) === null || _event_data_content_ === void 0 ? void 0 : (_event_data_content__text = _event_data_content_.text) === null || _event_data_content__text === void 0 ? void 0 : _event_data_content__text.value) !== null && _event_data_content__text_value !== void 0 ? _event_data_content__text_value : "";
+                        if (!(openai && typeof threadId === "string" && txt && txt.trim().length > 0)) return [
+                            3,
+                            11
+                        ];
+                        return [
+                            4,
+                            getConversationId(threadId)
+                        ];
+                    case 2:
+                        convId = _state.sent();
+                        if (!(!convId && ensureConversation)) return [
+                            3,
+                            4
+                        ];
+                        return [
+                            4,
+                            ensureConversation(threadId)
+                        ];
+                    case 3:
+                        convId = _state.sent();
+                        _state.label = 4;
+                    case 4:
+                        if (!convId) return [
+                            3,
+                            11
+                        ];
+                        maxAttempts = 5;
+                        attempt = 0;
+                        _state.label = 5;
+                    case 5:
+                        if (!true) return [
+                            3,
+                            11
+                        ];
+                        _state.label = 6;
+                    case 6:
+                        _state.trys.push([
+                            6,
+                            8,
+                            ,
+                            10
+                        ]);
+                        console.log("[onEventBridgeInMemory] mirror assistant -> conversation", {
+                            threadId: threadId,
+                            convId: convId,
+                            txt: txt
                         });
-                    }
-                    controller === null || controller === void 0 ? void 0 : controller.enqueue("data: ".concat(JSON.stringify(event), "\n\n"));
-                    return [
-                        2
-                    ];
+                        return [
+                            4,
+                            openai.conversations.items.create(convId, {
+                                items: [
+                                    {
+                                        type: "message",
+                                        role: "assistant",
+                                        content: [
+                                            {
+                                                type: "output_text",
+                                                text: txt
+                                            }
+                                        ]
+                                    }
+                                ]
+                            })
+                        ];
+                    case 7:
+                        _state.sent();
+                        return [
+                            3,
+                            11
+                        ];
+                    case 8:
+                        err = _state.sent();
+                        code = (err === null || err === void 0 ? void 0 : err.code) || (err === null || err === void 0 ? void 0 : (_err_error = err.error) === null || _err_error === void 0 ? void 0 : _err_error.code);
+                        isLocked = code === "conversation_locked" || /conversation/i.test((_err_error_param = err === null || err === void 0 ? void 0 : (_err_error1 = err.error) === null || _err_error1 === void 0 ? void 0 : _err_error1.param) !== null && _err_error_param !== void 0 ? _err_error_param : "");
+                        attempt += 1;
+                        if (!isLocked || attempt >= maxAttempts) return [
+                            3,
+                            11
+                        ];
+                        return [
+                            4,
+                            new Promise(function(r) {
+                                return setTimeout(r, 200 * attempt);
+                            })
+                        ];
+                    case 9:
+                        _state.sent();
+                        return [
+                            3,
+                            10
+                        ];
+                    case 10:
+                        return [
+                            3,
+                            5
+                        ];
+                    case 11:
+                        return [
+                            3,
+                            13
+                        ];
+                    case 12:
+                        e = _state.sent();
+                        return [
+                            3,
+                            13
+                        ];
+                    case 13:
+                        return [
+                            2
+                        ];
+                    case 14:
+                        controller === null || controller === void 0 ? void 0 : controller.enqueue("data: ".concat(JSON.stringify(event), "\n\n"));
+                        return [
+                            2,
+                            event.data
+                        ];
                 }
-                controller === null || controller === void 0 ? void 0 : controller.enqueue("data: ".concat(JSON.stringify(event), "\n\n"));
-                return [
-                    2,
-                    event.data
-                ];
             });
         });
         return function(event) {
@@ -8297,37 +8199,10 @@ var onEventBridgeInMemory = function(param) {
 };
 // src/adapters/storage/responsesStorageAdapter/index.ts
 var responsesStorageAdapter = function(param) {
-    var openai = param.openai;
+    var openai = param.openai, getConversationId = param.getConversationId, setConversationId = param.setConversationId;
     return function(param) {
         var runAdapter = param.runAdapter;
-        var threadConversations = /* @__PURE__ */ new Map();
-        var getConversationId = /*#__PURE__*/ function() {
-            var _ref = _async_to_generator(function(threadId) {
-                var _threadConversations_get;
-                return _ts_generator(this, function(_state) {
-                    return [
-                        2,
-                        (_threadConversations_get = threadConversations.get(threadId)) !== null && _threadConversations_get !== void 0 ? _threadConversations_get : null
-                    ];
-                });
-            });
-            return function getConversationId(threadId) {
-                return _ref.apply(this, arguments);
-            };
-        }();
-        var setConversationId = /*#__PURE__*/ function() {
-            var _ref = _async_to_generator(function(threadId, conversationId) {
-                return _ts_generator(this, function(_state) {
-                    threadConversations.set(threadId, conversationId);
-                    return [
-                        2
-                    ];
-                });
-            });
-            return function setConversationId(threadId, conversationId) {
-                return _ref.apply(this, arguments);
-            };
-        }();
+        var threadLastUserText = /* @__PURE__ */ new Map();
         var ensureConversation = /*#__PURE__*/ function() {
             var _ref = _async_to_generator(function(threadId) {
                 var convId, conv;
@@ -8402,7 +8277,6 @@ var responsesStorageAdapter = function(param) {
         }();
         var runs2 = /* @__PURE__ */ new Map();
         var runSteps = /* @__PURE__ */ new Map();
-        var threadLastAssistant = /* @__PURE__ */ new Map();
         var runLastResponseId = /* @__PURE__ */ new Map();
         var runCompletedAfterTool = /* @__PURE__ */ new Map();
         var runToolSubmitted = /* @__PURE__ */ new Map();
@@ -8412,7 +8286,9 @@ var responsesStorageAdapter = function(param) {
             ensureConversation: ensureConversation,
             getConversationId: getConversationId,
             serializeThreadMessage: serializeThreadMessage,
-            threadLastAssistant: threadLastAssistant
+            setLastUserText: function(threadId, text) {
+                if (typeof text === "string") threadLastUserText.set(threadId, text);
+            }
         });
         var runsHandler = createRunsHandlers({
             openai: openai,
@@ -8427,13 +8303,19 @@ var responsesStorageAdapter = function(param) {
                     controller: controller,
                     runs: runs2,
                     runSteps: runSteps,
-                    threadLastAssistant: threadLastAssistant,
-                    runCompletedAfterTool: runCompletedAfterTool
+                    runCompletedAfterTool: runCompletedAfterTool,
+                    getConversationId: getConversationId,
+                    openai: openai,
+                    ensureConversation: ensureConversation
                 });
             },
             runs: runs2,
             runSteps: runSteps,
-            runLastResponseId: runLastResponseId
+            runLastResponseId: runLastResponseId,
+            getLastUserText: function(threadId) {
+                var _threadLastUserText_get;
+                return (_threadLastUserText_get = threadLastUserText.get(threadId)) !== null && _threadLastUserText_get !== void 0 ? _threadLastUserText_get : "";
+            }
         });
         var runHandler = createRunHandlers({
             openai: openai,
@@ -8456,8 +8338,10 @@ var responsesStorageAdapter = function(param) {
                     controller: controller,
                     runs: runs2,
                     runSteps: runSteps,
-                    threadLastAssistant: threadLastAssistant,
-                    runCompletedAfterTool: runCompletedAfterTool
+                    runCompletedAfterTool: runCompletedAfterTool,
+                    getConversationId: getConversationId,
+                    openai: openai,
+                    ensureConversation: ensureConversation
                 });
             },
             getConversationId: getConversationId,
@@ -8465,7 +8349,6 @@ var responsesStorageAdapter = function(param) {
             setConversationId: setConversationId,
             getAssistant: getAssistant,
             runLastResponseId: runLastResponseId,
-            threadLastAssistant: threadLastAssistant,
             runCompletedAfterTool: runCompletedAfterTool,
             runToolSubmitted: runToolSubmitted
         });