supercompat 3.17.0 → 3.17.2

package/dist/index.cjs

@@ -3519,6 +3519,310 @@ var models9 = function(param) {
 // src/adapters/client/googleClientAdapter/completions/post.ts
 var import_cuid2 = require("@paralleldrive/cuid2");
 var import_radash5 = require("radash");
+// src/adapters/client/googleClientAdapter/normalizeGeminiAction.ts
+var GEMINI_ACTION_NAMES = /* @__PURE__ */ new Set([
+    "click_at",
+    "single_click_at",
+    "right_click_at",
+    "double_click_at",
+    "triple_click_at",
+    "hover_at",
+    "type_text_at",
+    "key_combination",
+    "scroll_at",
+    "scroll_document",
+    "drag_and_drop",
+    "wait_5_seconds",
+    "wait_for_load",
+    "navigate",
+    "go_back",
+    "go_forward",
+    "open_web_browser"
+]);
+var isGeminiAction = function(name) {
+    return GEMINI_ACTION_NAMES.has(name);
+};
+var normalizeGeminiKey = function(key) {
+    var lower = key.toLowerCase();
+    switch(lower){
+        case "control":
+            return "ctrl";
+        case "command":
+        case "cmd":
+            return "meta";
+        case "option":
+            return "alt";
+        default:
+            return lower;
+    }
+};
+var scrollFromDirection = function(direction, amount) {
+    if (!direction) return {
+        scroll_x: 0,
+        scroll_y: 0
+    };
+    switch(direction.toLowerCase()){
+        case "up":
+            return {
+                scroll_x: 0,
+                scroll_y: -amount
+            };
+        case "down":
+            return {
+                scroll_x: 0,
+                scroll_y: amount
+            };
+        case "left":
+            return {
+                scroll_x: -amount,
+                scroll_y: 0
+            };
+        case "right":
+            return {
+                scroll_x: amount,
+                scroll_y: 0
+            };
+        default:
+            return {
+                scroll_x: 0,
+                scroll_y: 0
+            };
+    }
+};
+var normalizeGeminiAction = function(name, args) {
+    var x = typeof args.x === "number" ? args.x : typeof args.coordinate_x === "number" ? args.coordinate_x : 0;
+    var y = typeof args.y === "number" ? args.y : typeof args.coordinate_y === "number" ? args.coordinate_y : 0;
+    switch(name){
+        case "click_at":
+        case "single_click_at":
+            return {
+                action: {
+                    type: "click",
+                    button: "left",
+                    x: x,
+                    y: y
+                },
+                pending_safety_checks: []
+            };
+        case "right_click_at":
+            return {
+                action: {
+                    type: "click",
+                    button: "right",
+                    x: x,
+                    y: y
+                },
+                pending_safety_checks: []
+            };
+        case "double_click_at":
+            return {
+                action: {
+                    type: "double_click",
+                    x: x,
+                    y: y
+                },
+                pending_safety_checks: []
+            };
+        case "triple_click_at":
+            return {
+                action: {
+                    type: "double_click",
+                    x: x,
+                    y: y,
+                    repetitions: 3
+                },
+                pending_safety_checks: []
+            };
+        case "hover_at":
+            return {
+                action: {
+                    type: "move",
+                    x: x,
+                    y: y
+                },
+                pending_safety_checks: []
+            };
+        case "type_text_at":
+            {
+                var text = typeof args.text === "string" ? args.text : "";
+                var pendingActions = [
+                    {
+                        type: "type",
+                        text: text
+                    }
+                ];
+                if (args.submit_after_type === true) {
+                    pendingActions.push({
+                        type: "keypress",
+                        keys: [
+                            "Return"
+                        ]
+                    });
+                }
+                return {
+                    action: {
+                        type: "click",
+                        button: "left",
+                        x: x,
+                        y: y,
+                        pending_actions: pendingActions
+                    },
+                    pending_safety_checks: []
+                };
+            }
+        case "key_combination":
+            {
+                var rawKeys = args.keys;
+                var keys;
+                if (Array.isArray(rawKeys)) {
+                    keys = rawKeys.map(String).map(normalizeGeminiKey);
+                } else if (typeof rawKeys === "string") {
+                    keys = rawKeys.split(/[+\s]+/).map(function(k) {
+                        return k.trim();
+                    }).filter(Boolean).map(normalizeGeminiKey);
+                } else {
+                    keys = [];
+                }
+                return {
+                    action: {
+                        type: "keypress",
+                        keys: keys
+                    },
+                    pending_safety_checks: []
+                };
+            }
+        case "scroll_at":
+            {
+                var direction = typeof args.direction === "string" ? args.direction : void 0;
+                var amount = typeof args.amount === "number" ? args.amount : 3;
+                var _scrollFromDirection = scrollFromDirection(direction, amount), scroll_x = _scrollFromDirection.scroll_x, scroll_y = _scrollFromDirection.scroll_y;
+                return {
+                    action: {
+                        type: "scroll",
+                        x: x,
+                        y: y,
+                        scroll_x: scroll_x,
+                        scroll_y: scroll_y
+                    },
+                    pending_safety_checks: []
+                };
+            }
+        case "scroll_document":
+            {
+                var direction1 = typeof args.direction === "string" ? args.direction : void 0;
+                var amount1 = typeof args.amount === "number" ? args.amount : 3;
+                var _scrollFromDirection1 = scrollFromDirection(direction1, amount1), scroll_x1 = _scrollFromDirection1.scroll_x, scroll_y1 = _scrollFromDirection1.scroll_y;
+                return {
+                    action: {
+                        type: "scroll",
+                        x: 640,
+                        y: 360,
+                        scroll_x: scroll_x1,
+                        scroll_y: scroll_y1
+                    },
+                    pending_safety_checks: []
+                };
+            }
+        case "drag_and_drop":
+            {
+                var destX = typeof args.destination_x === "number" ? args.destination_x : 0;
+                var destY = typeof args.destination_y === "number" ? args.destination_y : 0;
+                return {
+                    action: {
+                        type: "drag",
+                        path: [
+                            {
+                                x: x,
+                                y: y
+                            },
+                            {
+                                x: destX,
+                                y: destY
+                            }
+                        ]
+                    },
+                    pending_safety_checks: []
+                };
+            }
+        case "wait_5_seconds":
+        case "wait_for_load":
+            return {
+                action: {
+                    type: "wait"
+                },
+                pending_safety_checks: []
+            };
+        case "navigate":
+            {
+                var url = typeof args.url === "string" ? args.url : "";
+                return {
+                    action: {
+                        type: "keypress",
+                        keys: [
+                            "ctrl",
+                            "l"
+                        ],
+                        pending_actions: [
+                            {
+                                type: "wait"
+                            },
+                            {
+                                type: "type",
+                                text: url
+                            },
+                            {
+                                type: "keypress",
+                                keys: [
+                                    "Return"
+                                ]
+                            },
+                            {
+                                type: "wait"
+                            }
+                        ]
+                    },
+                    pending_safety_checks: []
+                };
+            }
+        case "go_back":
+            return {
+                action: {
+                    type: "keypress",
+                    keys: [
+                        "alt",
+                        "left"
+                    ]
+                },
+                pending_safety_checks: []
+            };
+        case "go_forward":
+            return {
+                action: {
+                    type: "keypress",
+                    keys: [
+                        "alt",
+                        "right"
+                    ]
+                },
+                pending_safety_checks: []
+            };
+        case "open_web_browser":
+            return {
+                action: {
+                    type: "screenshot"
+                },
+                pending_safety_checks: []
+            };
+        default:
+            return {
+                action: _object_spread({
+                    type: name
+                }, args),
+                pending_safety_checks: []
+            };
+    }
+};
+// src/adapters/client/googleClientAdapter/completions/post.ts
 var stripFunctionPrefix = function(name) {
     return name.replace(/^default_api:/, "");
 };
@@ -3653,19 +3957,22 @@ var serializeMessages2 = function(messages5) {
                                 var _tc_function1;
                                 args = JSON.parse((_ref1 = (_tc_function1 = tc.function) === null || _tc_function1 === void 0 ? void 0 : _tc_function1.arguments) !== null && _ref1 !== void 0 ? _ref1 : "{}");
                             } catch (unused) {}
-                            var geminiName = name;
-                            if (name === "computer_call" && args.action && _type_of(args.action) === "object") {
-                                var _args_action_type;
-                                geminiName = (_args_action_type = args.action.type) !== null && _args_action_type !== void 0 ? _args_action_type : name;
-                            }
                             var thoughtSignature = args._thoughtSignature;
+                            var geminiActionName = args._geminiAction;
                             var cleanArgs = _object_spread({}, args);
                             delete cleanArgs._thoughtSignature;
+                            delete cleanArgs._geminiAction;
+                            var geminiName = name;
+                            if (name === "computer_call" && args.action && _type_of(args.action) === "object") {
+                                var _ref2;
+                                geminiName = (_ref2 = geminiActionName !== null && geminiActionName !== void 0 ? geminiActionName : args.action.type) !== null && _ref2 !== void 0 ? _ref2 : name;
+                            }
                             var geminiArgs = void 0;
                             if (name === "computer_call" && cleanArgs.action && _type_of(cleanArgs.action) === "object") {
                                 var action = cleanArgs.action;
-                                var _type = action.type, rest = _object_without_properties(action, [
-                                    "type"
+                                var _type = action.type, _pa = action.pending_actions, rest = _object_without_properties(action, [
+                                    "type",
+                                    "pending_actions"
                                 ]);
                                 geminiArgs = rest;
                             } else {
@@ -3922,6 +4229,8 @@ var denormalizeCoords = function(args, tools) {
             denormY(result.end_coordinate[1])
         ];
     }
+    if (typeof result.destination_x === "number") result.destination_x = denormX(result.destination_x);
+    if (typeof result.destination_y === "number") result.destination_y = denormY(result.destination_y);
     return result;
 };
 var isComputerUseFunction = function(name, tools) {
@@ -3936,13 +4245,16 @@ var functionCallToToolCallDelta = function(fc, index, tools, thoughtSignature) {
     if (isComputerUseFunction(name, tools)) {
         var _fc_args1, _fc_id1;
         var denormed = denormalizeCoords((_fc_args1 = fc.args) !== null && _fc_args1 !== void 0 ? _fc_args1 : {}, tools);
-        var normalized = normalizeComputerToolCallPayload(_object_spread_props(_object_spread({}, denormed), {
+        var normalized = isGeminiAction(name) ? normalizeGeminiAction(name, denormed) : normalizeComputerToolCallPayload(_object_spread_props(_object_spread({}, denormed), {
             type: name
         }));
         var payload = _object_spread({}, normalized);
         if (thoughtSignature) {
             payload._thoughtSignature = thoughtSignature;
         }
+        if (isGeminiAction(name)) {
+            payload._geminiAction = name;
+        }
         return {
             index: index,
             id: (_fc_id1 = fc.id) !== null && _fc_id1 !== void 0 ? _fc_id1 : "call_".concat((0, import_cuid2.createId)()),
@@ -5300,6 +5612,27 @@ var sanitizeContent = function(content) {
     if (!content) return content;
     return content.replace(ARTIFACT_TAGS, "").trim();
 };
+var convertScreenshotToolMessages = function(messages5) {
+    return messages5.map(function(msg) {
+        if (msg.role !== "tool" || typeof msg.content !== "string") return msg;
+        try {
+            var parsed = JSON.parse(msg.content);
+            if (parsed.type === "computer_screenshot" && parsed.image_url) {
+                return _object_spread_props(_object_spread({}, msg), {
+                    content: [
+                        {
+                            type: "image_url",
+                            image_url: {
+                                url: parsed.image_url
+                            }
+                        }
+                    ]
+                });
+            }
+        } catch (unused) {}
+        return msg;
+    });
+};
 var post10 = function(param) {
     var openRouter = param.openRouter;
     return function(_url, options) {
@@ -5311,7 +5644,9 @@ var post10 = function(param) {
                         body = JSON.parse(options.body);
                         model = body.model;
                         _transformTools = transformTools(body.tools, model), transformedTools = _transformTools.tools, computerUseConfig = _transformTools.computerUseConfig;
-                        resultOptions = _object_spread({}, body, transformedTools.length > 0 ? {
+                        resultOptions = _object_spread({}, body, computerUseConfig && body.messages ? {
+                            messages: convertScreenshotToolMessages(body.messages)
+                        } : {}, transformedTools.length > 0 ? {
                             tools: transformedTools
                         } : {});
                         if (!body.stream) return [
@@ -5860,21 +6195,6 @@ var serializeToolContent = function(param) {
         }
         return JSON.stringify(toolCall.function.output);
     }
-    if (typeof toolCall.function.output === "string") {
-        try {
-            var parsed = JSON.parse(toolCall.function.output);
-            if (parsed.type === "computer_screenshot" && parsed.image_url) {
-                return [
-                    {
-                        type: "image_url",
-                        image_url: {
-                            url: parsed.image_url
-                        }
-                    }
-                ];
-            }
-        } catch (unused) {}
-    }
     return (_toolCall_function_output = toolCall.function.output) !== null && _toolCall_function_output !== void 0 ? _toolCall_function_output : "";
 };
 var serializeToolCall = function(param) {