supercompat 3.9.5 → 3.10.0

package/dist/index.js

@@ -1750,7 +1750,7 @@ var models6 = function(param) {
     };
 };
 // src/adapters/client/anthropicClientAdapter/completions/post.ts
-import { uid, fork, omit as omit2, isEmpty } from "radash";
+import { uid, fork, omit as omit3 } from "radash";
 // src/lib/messages/nonEmptyMessages.ts
 var nonEmptyContent = function(param) {
     var message = param.message;
@@ -1805,7 +1805,9 @@ var serializeTools = function(param) {
                 }
             };
         }
-        return tool;
+        return _object_spread({
+            type: tool.type
+        }, tool[tool.type] || {});
     });
 };
 // src/adapters/client/anthropicClientAdapter/completions/serializeMessages/serializeMessage.ts
@@ -1858,12 +1860,479 @@ var serializeMessages = function(param) {
         });
     });
 };
+// src/adapters/client/anthropicClientAdapter/completions/serializeBetas.ts
+var serializeBetas = function(param) {
+    var _param_tools = param.tools, tools = _param_tools === void 0 ? [] : _param_tools;
+    var betas = [];
+    if (tools.some(function(tool) {
+        return tool.type === "computer_20250124";
+    })) {
+        betas.push("computer-use-2025-01-24");
+    }
+    if (tools.some(function(tool) {
+        return tool.type === "code_execution_20250825";
+    })) {
+        betas.push("code-execution-2025-08-25");
+    }
+    if (!betas.length) {
+        return {};
+    }
+    return {
+        betas: betas
+    };
+};
+// src/adapters/client/anthropicClientAdapter/normalizeComputerToolCallPayload.ts
+import { omit as omit2 } from "radash";
+var coordinateKeys = [
+    "coordinate",
+    "coordinates",
+    "coordinate_start",
+    "coordinate_end",
+    "start",
+    "end",
+    "from",
+    "to",
+    "target",
+    "point",
+    "position",
+    "cursor_position",
+    "path"
+];
+var clickButtonMap = {
+    left_click: "left",
+    right_click: "right",
+    middle_click: "wheel",
+    double_click: "left",
+    triple_click: "left",
+    left_mouse_down: "left",
+    left_mouse_up: "left"
+};
+var keyAliasMap = {
+    ctrl: "ctrl",
+    control: "ctrl",
+    cmd: "meta",
+    command: "meta",
+    meta: "meta",
+    win: "meta",
+    option: "alt",
+    alt: "alt",
+    shift: "shift",
+    enter: "enter",
+    return: "enter",
+    esc: "escape",
+    escape: "escape",
+    tab: "tab",
+    space: "space",
+    spacebar: "space",
+    backspace: "backspace",
+    del: "delete",
+    delete: "delete",
+    pageup: "pageup",
+    pagedown: "pagedown",
+    up: "up",
+    down: "down",
+    left: "left",
+    right: "right"
+};
+var sanitizeNumber = function(value) {
+    return typeof value === "number" ? value : void 0;
+};
+var toCoordinate = function(value) {
+    if (!value) return void 0;
+    if (Array.isArray(value)) {
+        if (value.length === 2 && typeof value[0] === "number" && typeof value[1] === "number") {
+            return {
+                x: value[0],
+                y: value[1]
+            };
+        }
+        if (value.length > 0 && Array.isArray(value[0])) {
+            var tuple = value[0];
+            if (tuple.length === 2 && typeof tuple[0] === "number" && typeof tuple[1] === "number") {
+                return {
+                    x: tuple[0],
+                    y: tuple[1]
+                };
+            }
+        }
+    }
+    if ((typeof value === "undefined" ? "undefined" : _type_of(value)) === "object") {
+        var maybe = value;
+        var x = sanitizeNumber(maybe.x);
+        var y = sanitizeNumber(maybe.y);
+        if (typeof x === "number" && typeof y === "number") {
+            return {
+                x: x,
+                y: y
+            };
+        }
+    }
+    if (typeof value === "string") {
+        var parts = value.split(/[, ]+/).map(Number).filter(Number.isFinite);
+        if (parts.length >= 2) {
+            return {
+                x: parts[0],
+                y: parts[1]
+            };
+        }
+    }
+    return void 0;
+};
+var findCoordinatesInDetails = function(details) {
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = coordinateKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var key = _step.value;
+            var value = details[key];
+            var coords = toCoordinate(value);
+            if (coords) {
+                return coords;
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return void 0;
+};
+var buildDragPath = function(details) {
+    var path = [];
+    if (Array.isArray(details.path)) {
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = details.path[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var point = _step.value;
+                var coords = toCoordinate(point);
+                if (coords) {
+                    path.push(coords);
+                }
+            }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
+            }
+        }
+    }
+    if (!path.length) {
+        var start = toCoordinate(details.coordinate_start) || toCoordinate(details.start) || toCoordinate(details.from);
+        if (start) {
+            path.push(start);
+        }
+        var end = toCoordinate(details.coordinate_end) || toCoordinate(details.end) || toCoordinate(details.to) || toCoordinate(details.target);
+        if (end) {
+            path.push(end);
+        }
+    }
+    if (!path.length) {
+        var coords1 = findCoordinatesInDetails(details);
+        if (coords1) {
+            path.push(coords1);
+        }
+    }
+    if (!path.length) {
+        path.push({
+            x: 0,
+            y: 0
+        });
+    }
+    return path;
+};
+var parseKeys = function(input) {
+    if (Array.isArray(input)) {
+        return input.map(String).map(function(key) {
+            return key.trim();
+        }).filter(Boolean);
+    }
+    if (typeof input === "string") {
+        return input.split(RegExp("(?:(?<!\\\\)\\+|\\s+)")).map(function(key) {
+            return key.replace(/\\\+/g, "+");
+        }).map(function(key) {
+            return key.trim();
+        }).filter(Boolean);
+    }
+    return [];
+};
+var normalizeKeys = function(keys) {
+    return keys.map(function(key) {
+        var lowerKey = key.toLowerCase();
+        var _keyAliasMap_lowerKey;
+        return (_keyAliasMap_lowerKey = keyAliasMap[lowerKey]) !== null && _keyAliasMap_lowerKey !== void 0 ? _keyAliasMap_lowerKey : lowerKey;
+    });
+};
+var normalizeScroll = function(details) {
+    var _sanitizeNumber;
+    var scrollX = (_sanitizeNumber = sanitizeNumber(details.scroll_x)) !== null && _sanitizeNumber !== void 0 ? _sanitizeNumber : 0;
+    var _sanitizeNumber1;
+    var scrollY = (_sanitizeNumber1 = sanitizeNumber(details.scroll_y)) !== null && _sanitizeNumber1 !== void 0 ? _sanitizeNumber1 : 0;
+    var _sanitizeNumber2, _ref;
+    var amount = (_ref = (_sanitizeNumber2 = sanitizeNumber(details.scroll_amount)) !== null && _sanitizeNumber2 !== void 0 ? _sanitizeNumber2 : sanitizeNumber(details.amount)) !== null && _ref !== void 0 ? _ref : 0;
+    var direction = typeof details.scroll_direction === "string" ? details.scroll_direction.toLowerCase() : typeof details.direction === "string" ? details.direction.toLowerCase() : void 0;
+    if (!scrollX && !scrollY && direction && amount) {
+        switch(direction){
+            case "up":
+                scrollY = -amount;
+                break;
+            case "down":
+                scrollY = amount;
+                break;
+            case "left":
+                scrollX = -amount;
+                break;
+            case "right":
+                scrollX = amount;
+                break;
+            default:
+                break;
+        }
+    }
+    return {
+        scroll_x: scrollX,
+        scroll_y: scrollY
+    };
+};
+var normalizeActionString = function(action, details) {
+    var coords = findCoordinatesInDetails(details);
+    switch(action){
+        case "screenshot":
+            return {
+                type: "screenshot"
+            };
+        case "left_click":
+        case "right_click":
+        case "middle_click":
+            {
+                var _coords_x, _coords_y;
+                return {
+                    type: "click",
+                    button: clickButtonMap[action],
+                    x: (_coords_x = coords === null || coords === void 0 ? void 0 : coords.x) !== null && _coords_x !== void 0 ? _coords_x : 0,
+                    y: (_coords_y = coords === null || coords === void 0 ? void 0 : coords.y) !== null && _coords_y !== void 0 ? _coords_y : 0
+                };
+            }
+        case "double_click":
+            var _coords_x1, _coords_y1;
+            return {
+                type: "double_click",
+                x: (_coords_x1 = coords === null || coords === void 0 ? void 0 : coords.x) !== null && _coords_x1 !== void 0 ? _coords_x1 : 0,
+                y: (_coords_y1 = coords === null || coords === void 0 ? void 0 : coords.y) !== null && _coords_y1 !== void 0 ? _coords_y1 : 0
+            };
+        case "triple_click":
+            var _coords_x2, _coords_y2;
+            return {
+                type: "double_click",
+                x: (_coords_x2 = coords === null || coords === void 0 ? void 0 : coords.x) !== null && _coords_x2 !== void 0 ? _coords_x2 : 0,
+                y: (_coords_y2 = coords === null || coords === void 0 ? void 0 : coords.y) !== null && _coords_y2 !== void 0 ? _coords_y2 : 0,
+                repetitions: 3
+            };
+        case "left_mouse_down":
+            var _coords_x3, _coords_y3;
+            return {
+                type: "click",
+                button: clickButtonMap[action],
+                state: "down",
+                x: (_coords_x3 = coords === null || coords === void 0 ? void 0 : coords.x) !== null && _coords_x3 !== void 0 ? _coords_x3 : 0,
+                y: (_coords_y3 = coords === null || coords === void 0 ? void 0 : coords.y) !== null && _coords_y3 !== void 0 ? _coords_y3 : 0
+            };
+        case "left_mouse_up":
+            var _coords_x4, _coords_y4;
+            return {
+                type: "click",
+                button: clickButtonMap[action],
+                state: "up",
+                x: (_coords_x4 = coords === null || coords === void 0 ? void 0 : coords.x) !== null && _coords_x4 !== void 0 ? _coords_x4 : 0,
+                y: (_coords_y4 = coords === null || coords === void 0 ? void 0 : coords.y) !== null && _coords_y4 !== void 0 ? _coords_y4 : 0
+            };
+        case "left_click_drag":
+            {
+                var path = buildDragPath(details).map(function(param) {
+                    var x = param.x, y = param.y;
+                    return {
+                        x: x,
+                        y: y
+                    };
+                });
+                return {
+                    type: "drag",
+                    path: path
+                };
+            }
+        case "mouse_move":
+        case "cursor_position":
+            var _coords_x5, _coords_y5;
+            return {
+                type: "move",
+                x: (_coords_x5 = coords === null || coords === void 0 ? void 0 : coords.x) !== null && _coords_x5 !== void 0 ? _coords_x5 : 0,
+                y: (_coords_y5 = coords === null || coords === void 0 ? void 0 : coords.y) !== null && _coords_y5 !== void 0 ? _coords_y5 : 0
+            };
+        case "scroll":
+            {
+                var _normalizeScroll = normalizeScroll(details), scroll_x = _normalizeScroll.scroll_x, scroll_y = _normalizeScroll.scroll_y;
+                var _coords_x6, _coords_y6;
+                return _object_spread({
+                    type: "scroll",
+                    x: (_coords_x6 = coords === null || coords === void 0 ? void 0 : coords.x) !== null && _coords_x6 !== void 0 ? _coords_x6 : 0,
+                    y: (_coords_y6 = coords === null || coords === void 0 ? void 0 : coords.y) !== null && _coords_y6 !== void 0 ? _coords_y6 : 0,
+                    scroll_x: scroll_x,
+                    scroll_y: scroll_y
+                }, typeof details.scroll_direction === "string" ? {
+                    direction: details.scroll_direction
+                } : typeof details.direction === "string" ? {
+                    direction: details.direction
+                } : {}, typeof details.scroll_amount === "number" ? {
+                    amount: details.scroll_amount
+                } : typeof details.amount === "number" ? {
+                    amount: details.amount
+                } : {});
+            }
+        case "type":
+            {
+                var text = typeof details.text === "string" ? details.text : typeof details.input === "string" ? details.input : "";
+                return {
+                    type: "type",
+                    text: text
+                };
+            }
+        case "key":
+        case "hold_key":
+            {
+                var _details_text, _ref;
+                var keys = normalizeKeys(parseKeys((_ref = (_details_text = details.text) !== null && _details_text !== void 0 ? _details_text : details.keys) !== null && _ref !== void 0 ? _ref : details.key));
+                var normalized = {
+                    type: "keypress",
+                    keys: keys
+                };
+                if (action === "hold_key") {
+                    var duration = sanitizeNumber(details.duration);
+                    if (typeof duration === "number") {
+                        normalized.hold_duration_ms = Math.round(duration * 1e3);
+                    }
+                }
+                return normalized;
+            }
+        case "wait":
+            {
+                var duration1 = sanitizeNumber(details.duration);
+                return _object_spread({
+                    type: "wait"
+                }, typeof duration1 === "number" ? {
+                    duration_ms: Math.round(duration1 * 1e3)
+                } : {});
+            }
+        default:
+            {
+                return _object_spread({
+                    type: action
+                }, coords ? {
+                    x: coords.x,
+                    y: coords.y
+                } : {}, omit2(details, _to_consumable_array(coordinateKeys).concat([
+                    "text",
+                    "scroll_direction",
+                    "direction",
+                    "scroll_amount",
+                    "amount",
+                    "scroll_x",
+                    "scroll_y",
+                    "keys",
+                    "duration"
+                ])));
+            }
+    }
+};
+var normalizeAction = function(payload) {
+    if (payload && (typeof payload === "undefined" ? "undefined" : _type_of(payload)) === "object") {
+        var rawAction = payload.action;
+        if (typeof rawAction === "string") {
+            var parsedAction = parseJson(rawAction);
+            if (parsedAction && (typeof parsedAction === "undefined" ? "undefined" : _type_of(parsedAction)) === "object") {
+                rawAction = parsedAction;
+            }
+        }
+        if (rawAction && (typeof rawAction === "undefined" ? "undefined" : _type_of(rawAction)) === "object" && typeof rawAction.type === "string") {
+            return rawAction;
+        }
+        if (typeof rawAction === "string") {
+            var details = omit2(payload, [
+                "action",
+                "pending_safety_checks",
+                "status"
+            ]);
+            return normalizeActionString(rawAction, details);
+        }
+        if (typeof payload.type === "string") {
+            return payload;
+        }
+    }
+    if (typeof payload === "string") {
+        var parsed = parseJson(payload);
+        if (parsed && (typeof parsed === "undefined" ? "undefined" : _type_of(parsed)) === "object") {
+            return normalizeAction(parsed);
+        }
+        return {
+            type: payload
+        };
+    }
+    return {
+        type: "unknown",
+        value: payload
+    };
+};
+var normalizeComputerToolCallPayload = function(payload) {
+    var normalizedPayload = payload;
+    if (typeof payload === "string") {
+        var parsed = parseJson(payload);
+        if (parsed !== void 0) {
+            normalizedPayload = parsed;
+        }
+    }
+    var pendingSafetyChecksRaw = normalizedPayload && (typeof normalizedPayload === "undefined" ? "undefined" : _type_of(normalizedPayload)) === "object" ? normalizedPayload.pending_safety_checks : void 0;
+    if (typeof pendingSafetyChecksRaw === "string") {
+        var parsed1 = parseJson(pendingSafetyChecksRaw);
+        pendingSafetyChecksRaw = Array.isArray(parsed1) ? parsed1 : [];
+    }
+    var pendingSafetyChecks = Array.isArray(pendingSafetyChecksRaw) ? pendingSafetyChecksRaw : [];
+    var normalizedAction = normalizeAction(normalizedPayload);
+    var result = {
+        action: normalizedAction,
+        pending_safety_checks: pendingSafetyChecks
+    };
+    if (normalizedPayload && (typeof normalizedPayload === "undefined" ? "undefined" : _type_of(normalizedPayload)) === "object" && "status" in normalizedPayload) {
+        result.status = normalizedPayload.status;
+    }
+    return result;
+};
+var parseJson = function(value) {
+    try {
+        return JSON.parse(value);
+    } catch (e) {
+        return void 0;
+    }
+};
 // src/adapters/client/anthropicClientAdapter/completions/post.ts
 var post5 = function(param) {
     var anthropic = param.anthropic;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(_url, options) {
-            var body, messages4, _fork, systemMessages, otherMessages, system, chatMessages, resultOptions, response, stream, data, error;
+            var body, messages4, _fork, systemMessages, otherMessages, system, chatMessages, resultOptions, response, stream, data, normalizedContent, normalizedData, error;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -1882,10 +2351,14 @@ var post5 = function(param) {
                                 })
                             })
                         });
-                        resultOptions = _object_spread_props(_object_spread({}, omit2(body, [
+                        resultOptions = _object_spread_props(_object_spread(_object_spread_props(_object_spread({}, omit3(body, [
                             "response_format"
                         ])), {
-                            stream: body.stream ? isEmpty(body.tools) : false,
+                            model: body.model
+                        }), serializeBetas({
+                            tools: body.tools
+                        })), {
+                            stream: body.stream,
                             system: system,
                             messages: serializeMessages({
                                 messages: chatMessages
@@ -1895,23 +2368,98 @@ var post5 = function(param) {
                                 tools: body.tools
                             })
                         });
-                        if (!body.stream) return [
+                        if (!resultOptions.stream) return [
                             3,
                             2
                         ];
                         return [
                             4,
-                            anthropic.messages.stream(resultOptions)
+                            anthropic.beta.messages.create(resultOptions)
                         ];
                     case 1:
                         response = _state.sent();
                         stream = new ReadableStream({
                             start: function start(controller) {
                                 return _async_to_generator(function() {
-                                    var _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, chunk, delta, messageDelta, delta1, messageDelta1, messageDelta2, err;
+                                    var blockIndexToToolUseId, toolUseIdToIndex, toolUseIdArgumentBuffer, computerToolUseIds, normalizedComputerCalls, nextToolCallIndex, parseJson2, getOrCreateIndexForToolUseId, assignBlockToToolUse, markComputerToolUse, getToolUseIdFromBlock, emitNormalizedToolCall, getOrCreateIndexForBlock, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, _ref, chunk, toolUseId, _toolUseIdArgumentBuffer_get, buffered, parsed, normalized, toolCallIndex, chunkIndex, delta, toolUseId1, _toolUseIdArgumentBuffer_get1, existing, _chunk_delta_partial_json, updated, parsed1, normalized1, toolCallIndex1, chunkIndex1, _toolUseIdArgumentBuffer_get2, existing1, _chunk_delta_partial_json1, index, messageDelta, delta1, toolName, normalizedToolName, index1, index2, _chunk_content_block_content, outputPayload, _getToolUseIdFromBlock, toolCallId, index3, _getToolUseIdFromBlock1, toolCallId1, _chunk_content_block, _toolUseId, _type, _id, rest, index4, _chunk_content_block_content1, outputPayload1, messageDelta1, messageDelta2, err;
                                     return _ts_generator(this, function(_state) {
                                         switch(_state.label){
                                             case 0:
+                                                blockIndexToToolUseId = /* @__PURE__ */ new Map();
+                                                toolUseIdToIndex = /* @__PURE__ */ new Map();
+                                                toolUseIdArgumentBuffer = /* @__PURE__ */ new Map();
+                                                computerToolUseIds = /* @__PURE__ */ new Set();
+                                                normalizedComputerCalls = /* @__PURE__ */ new Set();
+                                                nextToolCallIndex = 0;
+                                                parseJson2 = function(value) {
+                                                    try {
+                                                        return JSON.parse(value);
+                                                    } catch (e) {
+                                                        return void 0;
+                                                    }
+                                                };
+                                                getOrCreateIndexForToolUseId = function(toolUseId) {
+                                                    if (!toolUseId) {
+                                                        return 0;
+                                                    }
+                                                    if (!toolUseIdToIndex.has(toolUseId)) {
+                                                        toolUseIdToIndex.set(toolUseId, nextToolCallIndex++);
+                                                    }
+                                                    var _toolUseIdToIndex_get;
+                                                    return (_toolUseIdToIndex_get = toolUseIdToIndex.get(toolUseId)) !== null && _toolUseIdToIndex_get !== void 0 ? _toolUseIdToIndex_get : 0;
+                                                };
+                                                assignBlockToToolUse = function(param) {
+                                                    var blockIndex = param.blockIndex, toolUseId = param.toolUseId;
+                                                    if (typeof blockIndex === "number" && toolUseId) {
+                                                        blockIndexToToolUseId.set(blockIndex, toolUseId);
+                                                    }
+                                                };
+                                                markComputerToolUse = function(toolUseId) {
+                                                    if (!toolUseId) return;
+                                                    computerToolUseIds.add(toolUseId);
+                                                    normalizedComputerCalls.delete(toolUseId);
+                                                    toolUseIdArgumentBuffer.set(toolUseId, "");
+                                                };
+                                                getToolUseIdFromBlock = function(block) {
+                                                    if (!block || (typeof block === "undefined" ? "undefined" : _type_of(block)) !== "object") return void 0;
+                                                    if (typeof block.tool_use_id === "string") {
+                                                        return block.tool_use_id;
+                                                    }
+                                                    if (typeof block.id === "string") {
+                                                        return block.id;
+                                                    }
+                                                    return void 0;
+                                                };
+                                                emitNormalizedToolCall = function(param) {
+                                                    var normalized = param.normalized, toolCallIndex = param.toolCallIndex, chunkIndex = param.chunkIndex;
+                                                    var messageDelta = {
+                                                        id: "chatcmpl-".concat(uid(29)),
+                                                        object: "chat.completion.chunk",
+                                                        choices: [
+                                                            {
+                                                                index: chunkIndex,
+                                                                delta: {
+                                                                    tool_calls: [
+                                                                        {
+                                                                            index: toolCallIndex,
+                                                                            function: {
+                                                                                arguments: JSON.stringify(normalized)
+                                                                            }
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            }
+                                                        ]
+                                                    };
+                                                    controller.enqueue("data: ".concat(JSON.stringify(messageDelta), "\n\n"));
+                                                };
+                                                getOrCreateIndexForBlock = function(blockIndex) {
+                                                    if (typeof blockIndex !== "number") {
+                                                        return 0;
+                                                    }
+                                                    var toolUseId = blockIndexToToolUseId.get(blockIndex);
+                                                    return getOrCreateIndexForToolUseId(toolUseId);
+                                                };
                                                 _iteratorAbruptCompletion = false, _didIteratorError = false;
                                                 _state.label = 1;
                                             case 1:
@@ -1934,14 +2482,79 @@ var post5 = function(param) {
                                                     5
                                                 ];
                                                 _value = _step.value;
-                                                chunk = _value;
+                                                _ref = _value;
+                                                chunk = _ref;
+                                                if (chunk.type === "content_block_stop") {
+                                                    toolUseId = typeof chunk.index === "number" ? blockIndexToToolUseId.get(chunk.index) : void 0;
+                                                    if (toolUseId && computerToolUseIds.has(toolUseId) && !normalizedComputerCalls.has(toolUseId)) {
+                                                        ;
+                                                        buffered = (_toolUseIdArgumentBuffer_get = toolUseIdArgumentBuffer.get(toolUseId)) !== null && _toolUseIdArgumentBuffer_get !== void 0 ? _toolUseIdArgumentBuffer_get : "";
+                                                        parsed = buffered ? parseJson2(buffered) : void 0;
+                                                        if (parsed !== void 0) {
+                                                            normalized = normalizeComputerToolCallPayload(parsed);
+                                                            toolCallIndex = getOrCreateIndexForToolUseId(toolUseId);
+                                                            chunkIndex = typeof chunk.index === "number" ? chunk.index : 0;
+                                                            emitNormalizedToolCall({
+                                                                normalized: normalized,
+                                                                toolCallIndex: toolCallIndex,
+                                                                chunkIndex: chunkIndex
+                                                            });
+                                                            normalizedComputerCalls.add(toolUseId);
+                                                        }
+                                                    }
+                                                    if (toolUseId) {
+                                                        toolUseIdArgumentBuffer.delete(toolUseId);
+                                                        computerToolUseIds.delete(toolUseId);
+                                                        normalizedComputerCalls.delete(toolUseId);
+                                                    }
+                                                    if (typeof chunk.index === "number") {
+                                                        blockIndexToToolUseId.delete(chunk.index);
+                                                    }
+                                                    return [
+                                                        3,
+                                                        4
+                                                    ];
+                                                }
                                                 if (chunk.type === "content_block_delta") {
                                                     delta = void 0;
                                                     if (chunk.delta.type === "input_json_delta") {
+                                                        toolUseId1 = typeof chunk.index === "number" ? blockIndexToToolUseId.get(chunk.index) : void 0;
+                                                        if (toolUseId1 && computerToolUseIds.has(toolUseId1)) {
+                                                            ;
+                                                            existing = (_toolUseIdArgumentBuffer_get1 = toolUseIdArgumentBuffer.get(toolUseId1)) !== null && _toolUseIdArgumentBuffer_get1 !== void 0 ? _toolUseIdArgumentBuffer_get1 : "";
+                                                            ;
+                                                            updated = "".concat(existing).concat((_chunk_delta_partial_json = chunk.delta.partial_json) !== null && _chunk_delta_partial_json !== void 0 ? _chunk_delta_partial_json : "");
+                                                            toolUseIdArgumentBuffer.set(toolUseId1, updated);
+                                                            if (!normalizedComputerCalls.has(toolUseId1)) {
+                                                                parsed1 = parseJson2(updated);
+                                                                if (parsed1 !== void 0) {
+                                                                    normalized1 = normalizeComputerToolCallPayload(parsed1);
+                                                                    toolCallIndex1 = getOrCreateIndexForToolUseId(toolUseId1);
+                                                                    chunkIndex1 = typeof chunk.index === "number" ? chunk.index : 0;
+                                                                    emitNormalizedToolCall({
+                                                                        normalized: normalized1,
+                                                                        toolCallIndex: toolCallIndex1,
+                                                                        chunkIndex: chunkIndex1
+                                                                    });
+                                                                    normalizedComputerCalls.add(toolUseId1);
+                                                                }
+                                                            }
+                                                            return [
+                                                                3,
+                                                                4
+                                                            ];
+                                                        }
+                                                        if (toolUseId1) {
+                                                            ;
+                                                            existing1 = (_toolUseIdArgumentBuffer_get2 = toolUseIdArgumentBuffer.get(toolUseId1)) !== null && _toolUseIdArgumentBuffer_get2 !== void 0 ? _toolUseIdArgumentBuffer_get2 : "";
+                                                            ;
+                                                            toolUseIdArgumentBuffer.set(toolUseId1, "".concat(existing1).concat((_chunk_delta_partial_json1 = chunk.delta.partial_json) !== null && _chunk_delta_partial_json1 !== void 0 ? _chunk_delta_partial_json1 : ""));
+                                                        }
+                                                        index = getOrCreateIndexForBlock(chunk.index);
                                                         delta = {
                                                             tool_calls: [
                                                                 {
-                                                                    index: 0,
+                                                                    index: index,
                                                                     function: {
                                                                         arguments: chunk.delta.partial_json
                                                                     }
@@ -1971,11 +2584,46 @@ var post5 = function(param) {
                                                 } else if (chunk.type === "content_block_start") {
                                                     delta1 = void 0;
                                                     if (chunk.content_block.type === "tool_use") {
+                                                        toolName = chunk.content_block.name;
+                                                        normalizedToolName = toolName === "computer" ? "computer_call" : toolName;
+                                                        index1 = getOrCreateIndexForToolUseId(chunk.content_block.id);
+                                                        assignBlockToToolUse({
+                                                            blockIndex: chunk.index,
+                                                            toolUseId: chunk.content_block.id
+                                                        });
+                                                        if (normalizedToolName === "computer_call") {
+                                                            markComputerToolUse(chunk.content_block.id);
+                                                        } else if (!toolUseIdArgumentBuffer.has(chunk.content_block.id)) {
+                                                            toolUseIdArgumentBuffer.set(chunk.content_block.id, "");
+                                                        }
+                                                        delta1 = {
+                                                            content: null,
+                                                            tool_calls: [
+                                                                {
+                                                                    index: index1,
+                                                                    id: chunk.content_block.id,
+                                                                    type: "function",
+                                                                    function: {
+                                                                        name: normalizedToolName,
+                                                                        arguments: ""
+                                                                    }
+                                                                }
+                                                            ]
+                                                        };
+                                                    } else if (chunk.content_block.type === "server_tool_use") {
+                                                        index2 = getOrCreateIndexForToolUseId(chunk.content_block.id);
+                                                        assignBlockToToolUse({
+                                                            blockIndex: chunk.index,
+                                                            toolUseId: chunk.content_block.id
+                                                        });
+                                                        if (!toolUseIdArgumentBuffer.has(chunk.content_block.id)) {
+                                                            toolUseIdArgumentBuffer.set(chunk.content_block.id, "");
+                                                        }
                                                         delta1 = {
                                                             content: null,
                                                             tool_calls: [
                                                                 {
-                                                                    index: 0,
+                                                                    index: index2,
                                                                     id: chunk.content_block.id,
                                                                     type: "function",
                                                                     function: {
@@ -1985,6 +2633,65 @@ var post5 = function(param) {
                                                                 }
                                                             ]
                                                         };
+                                                    } else if (chunk.content_block.type === "web_search_tool_result") {
+                                                        ;
+                                                        outputPayload = {
+                                                            content: (_chunk_content_block_content = chunk.content_block.content) !== null && _chunk_content_block_content !== void 0 ? _chunk_content_block_content : []
+                                                        };
+                                                        ;
+                                                        toolCallId = (_getToolUseIdFromBlock = getToolUseIdFromBlock(chunk.content_block)) !== null && _getToolUseIdFromBlock !== void 0 ? _getToolUseIdFromBlock : "";
+                                                        index3 = getOrCreateIndexForToolUseId(toolCallId);
+                                                        assignBlockToToolUse({
+                                                            blockIndex: chunk.index,
+                                                            toolUseId: toolCallId
+                                                        });
+                                                        delta1 = {
+                                                            content: null,
+                                                            tool_calls: [
+                                                                {
+                                                                    index: index3,
+                                                                    id: toolCallId,
+                                                                    type: "function",
+                                                                    function: {
+                                                                        output: JSON.stringify(outputPayload)
+                                                                    }
+                                                                }
+                                                            ]
+                                                        };
+                                                    } else if ([
+                                                        "code_execution_tool_result",
+                                                        "bash_code_execution_tool_result",
+                                                        "python_code_execution_tool_result"
+                                                    ].includes(chunk.content_block.type)) {
+                                                        ;
+                                                        toolCallId1 = (_getToolUseIdFromBlock1 = getToolUseIdFromBlock(chunk.content_block)) !== null && _getToolUseIdFromBlock1 !== void 0 ? _getToolUseIdFromBlock1 : "";
+                                                        _chunk_content_block = chunk.content_block, _toolUseId = _chunk_content_block.tool_use_id, _type = _chunk_content_block.type, _id = _chunk_content_block.id, rest = _object_without_properties(_chunk_content_block, [
+                                                            "tool_use_id",
+                                                            "type",
+                                                            "id"
+                                                        ]);
+                                                        index4 = getOrCreateIndexForToolUseId(toolCallId1);
+                                                        assignBlockToToolUse({
+                                                            blockIndex: chunk.index,
+                                                            toolUseId: toolCallId1
+                                                        });
+                                                        ;
+                                                        outputPayload1 = Object.keys(rest).length > 0 ? rest : {
+                                                            content: (_chunk_content_block_content1 = chunk.content_block.content) !== null && _chunk_content_block_content1 !== void 0 ? _chunk_content_block_content1 : {}
+                                                        };
+                                                        delta1 = {
+                                                            content: null,
+                                                            tool_calls: [
+                                                                {
+                                                                    index: index4,
+                                                                    id: toolCallId1,
+                                                                    type: "function",
+                                                                    function: {
+                                                                        output: JSON.stringify(outputPayload1)
+                                                                    }
+                                                                }
+                                                            ]
+                                                        };
                                                     } else if ("text" in chunk.content_block) {
                                                         delta1 = {
                                                             content: chunk.content_block.text
@@ -2105,10 +2812,22 @@ var post5 = function(param) {
                         ];
                     case 3:
                         data = _state.sent();
+                        normalizedContent = Array.isArray(data === null || data === void 0 ? void 0 : data.content) ? data.content.map(function(block) {
+                            if ((block === null || block === void 0 ? void 0 : block.type) === "tool_use" && (block === null || block === void 0 ? void 0 : block.name) === "computer") {
+                                var _block_input;
+                                return _object_spread_props(_object_spread({}, block), {
+                                    input: normalizeComputerToolCallPayload((_block_input = block.input) !== null && _block_input !== void 0 ? _block_input : {})
+                                });
+                            }
+                            return block;
+                        }) : data === null || data === void 0 ? void 0 : data.content;
+                        normalizedData = _object_spread({}, data, normalizedContent ? {
+                            content: normalizedContent
+                        } : {});
                         return [
                             2,
                             new Response(JSON.stringify({
-                                data: data
+                                data: normalizedData
                             }), {
                                 status: 200,
                                 headers: {
@@ -3178,7 +3897,7 @@ var ollamaClientAdapter = function(param) {
 };
 // src/adapters/run/completionsRunAdapter/index.ts
 import _ from "lodash";
-import { uid as uid2, omit as omit3, isEmpty as isEmpty2 } from "radash";
+import { uid as uid2, omit as omit4, isEmpty as isEmpty2 } from "radash";
 import dayjs from "dayjs";
 // src/adapters/run/completionsRunAdapter/messages/index.ts
 import { flat } from "radash";
@@ -3309,7 +4028,7 @@ var messages = /*#__PURE__*/ function() {
 // src/adapters/run/completionsRunAdapter/index.ts
 var updatedToolCall = function(param) {
     var toolCall = param.toolCall, delta = param.delta;
-    if (!toolCall) return omit3(delta, [
+    if (!toolCall) return omit4(delta, [
         "index"
     ]);
     var result = _.cloneDeep(toolCall);
@@ -3340,10 +4059,11 @@ var toolCallsData = function(param) {
     var prevToolCalls = param.prevToolCalls, delta = param.delta;
     if (!prevToolCalls) {
         return delta.tool_calls.map(function(tc) {
+            var _tc_type;
             return _object_spread({
                 id: uid2(24),
-                type: "function"
-            }, omit3(tc, [
+                type: (_tc_type = tc.type) !== null && _tc_type !== void 0 ? _tc_type : "function"
+            }, omit4(tc, [
                 "index"
             ]));
         });
@@ -3378,7 +4098,7 @@ var completionsRunAdapter = function() {
     return {
         handleRun: /*#__PURE__*/ function() {
             var _ref = _async_to_generator(function(param) {
-                var client, run3, onEvent2, getMessages2, opts, _tmp, providerResponse, e, _e_cause, _e_message, _e_cause_message, message, toolCallsRunStep, currentContent, currentToolCalls, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, chunk, _chunk_choices, choices, choice, delta, _delta_content, err;
+                var client, run3, onEvent2, getMessages2, opts, _tmp, providerResponse, e, _e_cause, _e_message, _e_cause_message, message, toolCallsRunStep, currentContent, currentToolCalls, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, chunk, _chunk_choices, choices, choice, delta, _delta_content, err, _message_toolCalls, messageToolCalls, functionToolCalls, pendingFunctionToolCalls, requiredToolCalls;
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
@@ -3585,9 +4305,10 @@ var completionsRunAdapter = function() {
                                         step_details: {
                                             type: "tool_calls",
                                             tool_calls: delta.tool_calls.map(function(tc) {
+                                                var _tc_type;
                                                 return _object_spread({
                                                     id: uid2(24),
-                                                    type: "function"
+                                                    type: (_tc_type = tc.type) !== null && _tc_type !== void 0 ? _tc_type : "function"
                                                 }, tc);
                                             })
                                         }
@@ -3695,18 +4416,83 @@ var completionsRunAdapter = function() {
                             ];
                         case 22:
                             message = _state.sent();
-                            if (isEmpty2(message.toolCalls)) {
-                                return [
-                                    2,
-                                    onEvent2({
-                                        event: "thread.run.completed",
-                                        data: _object_spread_props(_object_spread({}, run3), {
-                                            status: "completed",
-                                            completed_at: dayjs().unix()
-                                        })
+                            messageToolCalls = (_message_toolCalls = message.toolCalls) !== null && _message_toolCalls !== void 0 ? _message_toolCalls : [];
+                            functionToolCalls = messageToolCalls.filter(function(toolCall) {
+                                return toolCall.type === "function";
+                            });
+                            pendingFunctionToolCalls = functionToolCalls.filter(function(toolCall) {
+                                var _toolCall_function;
+                                return !((_toolCall_function = toolCall.function) === null || _toolCall_function === void 0 ? void 0 : _toolCall_function.output);
+                            });
+                            if (!isEmpty2(pendingFunctionToolCalls)) return [
+                                3,
+                                25
+                            ];
+                            if (!toolCallsRunStep) return [
+                                3,
+                                24
+                            ];
+                            return [
+                                4,
+                                onEvent2({
+                                    event: "thread.run.step.completed",
+                                    data: _object_spread_props(_object_spread({}, toolCallsRunStep), {
+                                        status: "completed",
+                                        completed_at: dayjs().unix(),
+                                        step_details: {
+                                            type: "tool_calls",
+                                            tool_calls: currentToolCalls !== null && currentToolCalls !== void 0 ? currentToolCalls : []
+                                        }
                                     })
-                                ];
-                            }
+                                })
+                            ];
+                        case 23:
+                            toolCallsRunStep = _state.sent();
+                            _state.label = 24;
+                        case 24:
+                            return [
+                                2,
+                                onEvent2({
+                                    event: "thread.run.completed",
+                                    data: _object_spread_props(_object_spread({}, run3), {
+                                        status: "completed",
+                                        completed_at: dayjs().unix()
+                                    })
+                                })
+                            ];
+                        case 25:
+                            requiredToolCalls = pendingFunctionToolCalls.map(function(toolCall) {
+                                var _toolCall_function, _toolCall_function1, _toolCall_function2;
+                                var _toolCall_function_arguments;
+                                var args = (_toolCall_function_arguments = (_toolCall_function = toolCall.function) === null || _toolCall_function === void 0 ? void 0 : _toolCall_function.arguments) !== null && _toolCall_function_arguments !== void 0 ? _toolCall_function_arguments : "";
+                                if (((_toolCall_function1 = toolCall.function) === null || _toolCall_function1 === void 0 ? void 0 : _toolCall_function1.name) === "computer_call") {
+                                    var parsedArguments = {};
+                                    try {
+                                        parsedArguments = JSON.parse(args || "{}");
+                                    } catch (e) {
+                                        parsedArguments = {};
+                                    }
+                                    var _parsedArguments_action, _ref;
+                                    var computerCall = {
+                                        action: (_ref = (_parsedArguments_action = parsedArguments === null || parsedArguments === void 0 ? void 0 : parsedArguments.action) !== null && _parsedArguments_action !== void 0 ? _parsedArguments_action : parsedArguments) !== null && _ref !== void 0 ? _ref : {},
+                                        pending_safety_checks: Array.isArray(parsedArguments === null || parsedArguments === void 0 ? void 0 : parsedArguments.pending_safety_checks) ? parsedArguments.pending_safety_checks : []
+                                    };
+                                    return {
+                                        id: toolCall.id,
+                                        type: "computer_call",
+                                        computer_call: computerCall
+                                    };
+                                }
+                                var _toolCall_function_name;
+                                return {
+                                    id: toolCall.id,
+                                    type: "function",
+                                    function: {
+                                        name: (_toolCall_function_name = (_toolCall_function2 = toolCall.function) === null || _toolCall_function2 === void 0 ? void 0 : _toolCall_function2.name) !== null && _toolCall_function_name !== void 0 ? _toolCall_function_name : "",
+                                        arguments: args
+                                    }
+                                };
+                            });
                             return [
                                 2,
                                 onEvent2({
@@ -3716,7 +4502,7 @@ var completionsRunAdapter = function() {
                                         required_action: {
                                             type: "submit_tool_outputs",
                                             submit_tool_outputs: {
-                                                tool_calls: message.toolCalls
+                                                tool_calls: requiredToolCalls
                                             }
                                         }
                                     })
@@ -4289,6 +5075,40 @@ var threadRunStepDelta = function(param) {
     var event = param.event, controller = param.controller;
     return controller.enqueue(event);
 };
+// src/adapters/storage/prismaStorageAdapter/threads/runs/onEvent/handlers/threadRunStepCompleted.ts
+var threadRunStepCompleted = /*#__PURE__*/ function() {
+    var _ref = _async_to_generator(function(param) {
+        var prisma, event, controller;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    prisma = param.prisma, event = param.event, controller = param.controller;
+                    controller.enqueue(event);
+                    return [
+                        4,
+                        prisma.runStep.update({
+                            where: {
+                                id: event.data.id
+                            },
+                            data: {
+                                status: "COMPLETED" /* COMPLETED */ ,
+                                stepDetails: event.data.step_details,
+                                completedAt: event.data.completed_at
+                            }
+                        })
+                    ];
+                case 1:
+                    _state.sent();
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function threadRunStepCompleted(_) {
+        return _ref.apply(this, arguments);
+    };
+}();
 // src/adapters/storage/prismaStorageAdapter/threads/runs/onEvent/handlers/threadMessageCreated.ts
 var status2 = function(event) {
     if (event.data.status === "completed") return "COMPLETED" /* COMPLETED */ ;
@@ -4419,6 +5239,7 @@ var handlers = {
     "thread.run.requires_action": threadRunRequiresAction,
     "thread.run.step.created": threadRunStepCreated,
     "thread.run.step.delta": threadRunStepDelta,
+    "thread.run.step.completed": threadRunStepCompleted,
     "thread.message.created": threadMessageCreated,
     "thread.message.delta": threadMessageDelta,
     "thread.message.completed": threadMessageCompleted