@midscene/computer 1.9.6 → 1.9.7

package/dist/lib/cli.js

@@ -66,6 +66,33 @@ class ComputerInputDriver {
     moveMouse(x, y) {
         this.getLibnutOrThrow('moveMouse').moveMouse(x, y);
     }
+    focusActiveWindow() {
+        const lib = this.getLibnutOrThrow('focusActiveWindow');
+        if ('function' != typeof lib.getActiveWindow || 'function' != typeof lib.focusWindow) return false;
+        try {
+            const handle = lib.getActiveWindow();
+            if (!handle) return false;
+            lib.focusWindow(handle);
+            return true;
+        } catch (error) {
+            this.options.debug(`focusActiveWindow failed: ${error}`);
+            return false;
+        }
+    }
+    getActiveWindowRect() {
+        const lib = this.getLibnutOrThrow('getActiveWindowRect');
+        if ('function' != typeof lib.getActiveWindow || 'function' != typeof lib.getWindowRect) return null;
+        try {
+            const handle = lib.getActiveWindow();
+            if (!handle) return null;
+            const rect = lib.getWindowRect(handle);
+            if (!Number.isFinite(rect.x) || !Number.isFinite(rect.y) || !Number.isFinite(rect.width) || !Number.isFinite(rect.height) || rect.width <= 0 || rect.height <= 0) return null;
+            return rect;
+        } catch (error) {
+            this.options.debug(`getActiveWindowRect failed: ${error}`);
+            return null;
+        }
+    }
     mouseClick(button, double) {
         const lib = this.getLibnutOrThrow('mouseClick');
         if (void 0 !== double) lib.mouseClick(button, double);
@@ -78,6 +105,13 @@ class ComputerInputDriver {
     scrollMouse(x, y) {
         this.getLibnutOrThrow('scrollMouse').scrollMouse(x, y);
     }
+    async emitScrollDetents(dx, dy, detents, delayMs) {
+        this.assertActive('emitScrollDetents');
+        for(let i = 0; i < detents; i++){
+            this.scrollMouse(dx, dy);
+            if (i < detents - 1) await this.delay(delayMs);
+        }
+    }
     keyTap(key, modifiers) {
         const lib = this.getLibnutOrThrow('keyTap');
         if (void 0 !== modifiers) lib.keyTap(key, modifiers);
@@ -256,13 +290,17 @@ const CLICK_HOLD_DURATION = 100;
 const CLICK_FOCUS_SETTLE_DELAY = 120;
 const INPUT_FOCUS_DELAY = 300;
 const INPUT_CLEAR_DELAY = 150;
-const SCROLL_REPEAT_COUNT = 10;
 const SCROLL_STEP_DELAY = 100;
 const SCROLL_COMPLETE_DELAY = 500;
 const EDGE_SCROLL_TOTAL_PX = 50000;
 const EDGE_SCROLL_STEPS = 400;
 const PHASED_PIXELS_PER_STEP = 30;
 const PHASED_MIN_STEPS = 10;
+const LIBNUT_FALLBACK_PIXELS_PER_DETENT = 100;
+const LIBNUT_FALLBACK_TICK_DELAY_MS = 30;
+const LIBNUT_FALLBACK_MAX_DETENTS = 200;
+const LIBNUT_FALLBACK_DETENT_AMOUNT = 'win32' === process.platform ? 120 : 1;
+const LIBNUT_FALLBACK_EDGE_DETENTS = Math.min(LIBNUT_FALLBACK_MAX_DETENTS, Math.max(1, Math.ceil(EDGE_SCROLL_TOTAL_PX / LIBNUT_FALLBACK_PIXELS_PER_DETENT)));
 const DEFAULT_SCROLL_VIEWPORT_RATIO = 0.7;
 const EDGE_SCROLL_SPEC = {
     scrollToTop: {
@@ -270,7 +308,7 @@ const EDGE_SCROLL_SPEC = {
         key: 'home',
         libnut: [
             0,
-            10
+            1
         ]
     },
     scrollToBottom: {
@@ -278,14 +316,14 @@ const EDGE_SCROLL_SPEC = {
         key: 'end',
         libnut: [
             0,
-            -10
+            -1
         ]
     },
     scrollToLeft: {
         direction: 'left',
         key: 'home',
         libnut: [
-            -10,
+            -1,
             0
         ]
     },
@@ -293,7 +331,7 @@ const EDGE_SCROLL_SPEC = {
         direction: 'right',
         key: 'end',
         libnut: [
-            10,
+            1,
             0
         ]
     }
@@ -682,7 +720,7 @@ Available Displays: ${displays.length > 0 ? displays.map((d)=>d.name).join(', ')
     }
     async healthCheck() {
         console.log('[HealthCheck] Starting health check...');
-        console.log("[HealthCheck] @midscene/computer v1.9.6");
+        console.log("[HealthCheck] @midscene/computer v1.9.7");
         console.log('[HealthCheck] Taking screenshot...');
         const screenshotTimeout = 15000;
         let timeoutId;
@@ -860,7 +898,20 @@ Original error: ${lastRawMessage}`);
         });
         this.inputDriver.sendKey(key, modifiers);
     }
-    async performScroll(param) {
+    resolveUntargetedScrollPoint(screenSize) {
+        if ('win32' === process.platform) {
+            const activeWindowRect = this.inputDriver.getActiveWindowRect();
+            if (activeWindowRect) return {
+                x: activeWindowRect.x + activeWindowRect.width / 2,
+                y: activeWindowRect.y + activeWindowRect.height / 2
+            };
+        }
+        return this.toGlobalPoint({
+            x: screenSize.width / 2,
+            y: screenSize.height / 2
+        });
+    }
+    async moveMouseToScrollTarget(param) {
         if (param.locate) {
             const element = param.locate;
             const [x, y] = element.center;
@@ -869,7 +920,17 @@ Original error: ${lastRawMessage}`);
                 y
             });
             this.inputDriver.moveMouse(Math.round(point.x), Math.round(point.y));
+            return;
         }
+        const screenSize = await this.size();
+        if ('win32' === process.platform && this.inputDriver.focusActiveWindow()) await this.inputDriver.delay(CLICK_FOCUS_SETTLE_DELAY);
+        const point = this.resolveUntargetedScrollPoint(screenSize);
+        this.inputDriver.moveMouse(Math.round(point.x), Math.round(point.y));
+        await this.inputDriver.delay(MOUSE_MOVE_EFFECT_WAIT);
+        return screenSize;
+    }
+    async performScroll(param) {
+        let screenSize = await this.moveMouseToScrollTarget(param);
         const scrollType = param?.scrollType;
         const edgeSpec = scrollType && scrollType in EDGE_SCROLL_SPEC ? EDGE_SCROLL_SPEC[scrollType] : null;
         if (edgeSpec) {
@@ -879,11 +940,8 @@ Original error: ${lastRawMessage}`);
                 await this.inputDriver.delay(SCROLL_COMPLETE_DELAY);
                 return;
             }
-            const [dx, dy] = edgeSpec.libnut;
-            for(let i = 0; i < SCROLL_REPEAT_COUNT; i++){
-                this.inputDriver.scrollMouse(dx, dy);
-                await this.inputDriver.delay(SCROLL_STEP_DELAY);
-            }
+            const [ux, uy] = edgeSpec.libnut;
+            await this.inputDriver.emitScrollDetents(ux * LIBNUT_FALLBACK_DETENT_AMOUNT, uy * LIBNUT_FALLBACK_DETENT_AMOUNT, LIBNUT_FALLBACK_EDGE_DETENTS, LIBNUT_FALLBACK_TICK_DELAY_MS);
             return;
         }
         if ('singleAction' === scrollType || !scrollType) {
@@ -891,9 +949,8 @@ Original error: ${lastRawMessage}`);
             const isKnownDirection = 'up' === direction || 'down' === direction || 'left' === direction || 'right' === direction;
             const isHorizontal = 'left' === direction || 'right' === direction;
             let distance = param?.distance ?? void 0;
-            let screenSize;
             if (!distance) {
-                screenSize = await this.size();
+                screenSize ??= await this.size();
                 const base = isHorizontal ? screenSize.width : screenSize.height;
                 distance = Math.max(1, Math.round(base * DEFAULT_SCROLL_VIEWPORT_RATIO));
             }
@@ -912,30 +969,30 @@ Original error: ${lastRawMessage}`);
                 await this.inputDriver.delay(SCROLL_COMPLETE_DELAY);
                 return;
             }
-            const ticks = Math.ceil(distance / 100);
-            const directionMap = {
+            const detents = Math.min(LIBNUT_FALLBACK_MAX_DETENTS, Math.max(1, Math.ceil(distance / LIBNUT_FALLBACK_PIXELS_PER_DETENT)));
+            const directionUnit = {
                 up: [
                     0,
-                    ticks
+                    1
                 ],
                 down: [
                     0,
-                    -ticks
+                    -1
                 ],
                 left: [
-                    -ticks,
+                    -1,
                     0
                 ],
                 right: [
-                    ticks,
+                    1,
                     0
                 ]
             };
-            const [dx, dy] = directionMap[direction] || [
+            const [ux, uy] = directionUnit[direction] || [
                 0,
-                -ticks
+                -1
             ];
-            this.inputDriver.scrollMouse(dx, dy);
+            await this.inputDriver.emitScrollDetents(ux * LIBNUT_FALLBACK_DETENT_AMOUNT, uy * LIBNUT_FALLBACK_DETENT_AMOUNT, detents, LIBNUT_FALLBACK_TICK_DELAY_MS);
             await this.inputDriver.delay(SCROLL_COMPLETE_DELAY);
             return;
         }
@@ -2025,7 +2082,7 @@ class ComputerMidsceneTools extends base_tools_namespaceObject.BaseMidsceneTools
 const tools = new ComputerMidsceneTools();
 (0, cli_namespaceObject.runToolsCLI)(tools, 'midscene-computer', {
     stripPrefix: 'computer_',
-    version: "1.9.6",
+    version: "1.9.7",
     extraCommands: (0, core_namespaceObject.createReportCliCommands)()
 }).catch((e)=>{
     process.exit((0, cli_namespaceObject.reportCLIError)(e));

package/dist/lib/index.js

@@ -93,6 +93,33 @@ class ComputerInputDriver {
     moveMouse(x, y) {
         this.getLibnutOrThrow('moveMouse').moveMouse(x, y);
     }
+    focusActiveWindow() {
+        const lib = this.getLibnutOrThrow('focusActiveWindow');
+        if ('function' != typeof lib.getActiveWindow || 'function' != typeof lib.focusWindow) return false;
+        try {
+            const handle = lib.getActiveWindow();
+            if (!handle) return false;
+            lib.focusWindow(handle);
+            return true;
+        } catch (error) {
+            this.options.debug(`focusActiveWindow failed: ${error}`);
+            return false;
+        }
+    }
+    getActiveWindowRect() {
+        const lib = this.getLibnutOrThrow('getActiveWindowRect');
+        if ('function' != typeof lib.getActiveWindow || 'function' != typeof lib.getWindowRect) return null;
+        try {
+            const handle = lib.getActiveWindow();
+            if (!handle) return null;
+            const rect = lib.getWindowRect(handle);
+            if (!Number.isFinite(rect.x) || !Number.isFinite(rect.y) || !Number.isFinite(rect.width) || !Number.isFinite(rect.height) || rect.width <= 0 || rect.height <= 0) return null;
+            return rect;
+        } catch (error) {
+            this.options.debug(`getActiveWindowRect failed: ${error}`);
+            return null;
+        }
+    }
     mouseClick(button, double) {
         const lib = this.getLibnutOrThrow('mouseClick');
         if (void 0 !== double) lib.mouseClick(button, double);
@@ -105,6 +132,13 @@ class ComputerInputDriver {
     scrollMouse(x, y) {
         this.getLibnutOrThrow('scrollMouse').scrollMouse(x, y);
     }
+    async emitScrollDetents(dx, dy, detents, delayMs) {
+        this.assertActive('emitScrollDetents');
+        for(let i = 0; i < detents; i++){
+            this.scrollMouse(dx, dy);
+            if (i < detents - 1) await this.delay(delayMs);
+        }
+    }
     keyTap(key, modifiers) {
         const lib = this.getLibnutOrThrow('keyTap');
         if (void 0 !== modifiers) lib.keyTap(key, modifiers);
@@ -283,13 +317,17 @@ const CLICK_HOLD_DURATION = 100;
 const CLICK_FOCUS_SETTLE_DELAY = 120;
 const INPUT_FOCUS_DELAY = 300;
 const INPUT_CLEAR_DELAY = 150;
-const SCROLL_REPEAT_COUNT = 10;
 const SCROLL_STEP_DELAY = 100;
 const SCROLL_COMPLETE_DELAY = 500;
 const EDGE_SCROLL_TOTAL_PX = 50000;
 const EDGE_SCROLL_STEPS = 400;
 const PHASED_PIXELS_PER_STEP = 30;
 const PHASED_MIN_STEPS = 10;
+const LIBNUT_FALLBACK_PIXELS_PER_DETENT = 100;
+const LIBNUT_FALLBACK_TICK_DELAY_MS = 30;
+const LIBNUT_FALLBACK_MAX_DETENTS = 200;
+const LIBNUT_FALLBACK_DETENT_AMOUNT = 'win32' === process.platform ? 120 : 1;
+const LIBNUT_FALLBACK_EDGE_DETENTS = Math.min(LIBNUT_FALLBACK_MAX_DETENTS, Math.max(1, Math.ceil(EDGE_SCROLL_TOTAL_PX / LIBNUT_FALLBACK_PIXELS_PER_DETENT)));
 const DEFAULT_SCROLL_VIEWPORT_RATIO = 0.7;
 const EDGE_SCROLL_SPEC = {
     scrollToTop: {
@@ -297,7 +335,7 @@ const EDGE_SCROLL_SPEC = {
         key: 'home',
         libnut: [
             0,
-            10
+            1
         ]
     },
     scrollToBottom: {
@@ -305,14 +343,14 @@ const EDGE_SCROLL_SPEC = {
         key: 'end',
         libnut: [
             0,
-            -10
+            -1
         ]
     },
     scrollToLeft: {
         direction: 'left',
         key: 'home',
         libnut: [
-            -10,
+            -1,
             0
         ]
     },
@@ -320,7 +358,7 @@ const EDGE_SCROLL_SPEC = {
         direction: 'right',
         key: 'end',
         libnut: [
-            10,
+            1,
             0
         ]
     }
@@ -709,7 +747,7 @@ Available Displays: ${displays.length > 0 ? displays.map((d)=>d.name).join(', ')
     }
     async healthCheck() {
         console.log('[HealthCheck] Starting health check...');
-        console.log("[HealthCheck] @midscene/computer v1.9.6");
+        console.log("[HealthCheck] @midscene/computer v1.9.7");
         console.log('[HealthCheck] Taking screenshot...');
         const screenshotTimeout = 15000;
         let timeoutId;
@@ -887,7 +925,20 @@ Original error: ${lastRawMessage}`);
         });
         this.inputDriver.sendKey(key, modifiers);
     }
-    async performScroll(param) {
+    resolveUntargetedScrollPoint(screenSize) {
+        if ('win32' === process.platform) {
+            const activeWindowRect = this.inputDriver.getActiveWindowRect();
+            if (activeWindowRect) return {
+                x: activeWindowRect.x + activeWindowRect.width / 2,
+                y: activeWindowRect.y + activeWindowRect.height / 2
+            };
+        }
+        return this.toGlobalPoint({
+            x: screenSize.width / 2,
+            y: screenSize.height / 2
+        });
+    }
+    async moveMouseToScrollTarget(param) {
         if (param.locate) {
             const element = param.locate;
             const [x, y] = element.center;
@@ -896,7 +947,17 @@ Original error: ${lastRawMessage}`);
                 y
             });
             this.inputDriver.moveMouse(Math.round(point.x), Math.round(point.y));
+            return;
         }
+        const screenSize = await this.size();
+        if ('win32' === process.platform && this.inputDriver.focusActiveWindow()) await this.inputDriver.delay(CLICK_FOCUS_SETTLE_DELAY);
+        const point = this.resolveUntargetedScrollPoint(screenSize);
+        this.inputDriver.moveMouse(Math.round(point.x), Math.round(point.y));
+        await this.inputDriver.delay(MOUSE_MOVE_EFFECT_WAIT);
+        return screenSize;
+    }
+    async performScroll(param) {
+        let screenSize = await this.moveMouseToScrollTarget(param);
         const scrollType = param?.scrollType;
         const edgeSpec = scrollType && scrollType in EDGE_SCROLL_SPEC ? EDGE_SCROLL_SPEC[scrollType] : null;
         if (edgeSpec) {
@@ -906,11 +967,8 @@ Original error: ${lastRawMessage}`);
                 await this.inputDriver.delay(SCROLL_COMPLETE_DELAY);
                 return;
             }
-            const [dx, dy] = edgeSpec.libnut;
-            for(let i = 0; i < SCROLL_REPEAT_COUNT; i++){
-                this.inputDriver.scrollMouse(dx, dy);
-                await this.inputDriver.delay(SCROLL_STEP_DELAY);
-            }
+            const [ux, uy] = edgeSpec.libnut;
+            await this.inputDriver.emitScrollDetents(ux * LIBNUT_FALLBACK_DETENT_AMOUNT, uy * LIBNUT_FALLBACK_DETENT_AMOUNT, LIBNUT_FALLBACK_EDGE_DETENTS, LIBNUT_FALLBACK_TICK_DELAY_MS);
             return;
         }
         if ('singleAction' === scrollType || !scrollType) {
@@ -918,9 +976,8 @@ Original error: ${lastRawMessage}`);
             const isKnownDirection = 'up' === direction || 'down' === direction || 'left' === direction || 'right' === direction;
             const isHorizontal = 'left' === direction || 'right' === direction;
             let distance = param?.distance ?? void 0;
-            let screenSize;
             if (!distance) {
-                screenSize = await this.size();
+                screenSize ??= await this.size();
                 const base = isHorizontal ? screenSize.width : screenSize.height;
                 distance = Math.max(1, Math.round(base * DEFAULT_SCROLL_VIEWPORT_RATIO));
             }
@@ -939,30 +996,30 @@ Original error: ${lastRawMessage}`);
                 await this.inputDriver.delay(SCROLL_COMPLETE_DELAY);
                 return;
             }
-            const ticks = Math.ceil(distance / 100);
-            const directionMap = {
+            const detents = Math.min(LIBNUT_FALLBACK_MAX_DETENTS, Math.max(1, Math.ceil(distance / LIBNUT_FALLBACK_PIXELS_PER_DETENT)));
+            const directionUnit = {
                 up: [
                     0,
-                    ticks
+                    1
                 ],
                 down: [
                     0,
-                    -ticks
+                    -1
                 ],
                 left: [
-                    -ticks,
+                    -1,
                     0
                 ],
                 right: [
-                    ticks,
+                    1,
                     0
                 ]
             };
-            const [dx, dy] = directionMap[direction] || [
+            const [ux, uy] = directionUnit[direction] || [
                 0,
-                -ticks
+                -1
             ];
-            this.inputDriver.scrollMouse(dx, dy);
+            await this.inputDriver.emitScrollDetents(ux * LIBNUT_FALLBACK_DETENT_AMOUNT, uy * LIBNUT_FALLBACK_DETENT_AMOUNT, detents, LIBNUT_FALLBACK_TICK_DELAY_MS);
             await this.inputDriver.delay(SCROLL_COMPLETE_DELAY);
             return;
         }
@@ -2097,7 +2154,7 @@ class ComputerMidsceneTools extends base_tools_namespaceObject.BaseMidsceneTools
 }
 const env_namespaceObject = require("@midscene/shared/env");
 function version() {
-    const currentVersion = "1.9.6";
+    const currentVersion = "1.9.7";
     console.log(`@midscene/computer v${currentVersion}`);
     return currentVersion;
 }

package/dist/lib/mcp-server.js

@@ -80,6 +80,33 @@ class ComputerInputDriver {
     moveMouse(x, y) {
         this.getLibnutOrThrow('moveMouse').moveMouse(x, y);
     }
+    focusActiveWindow() {
+        const lib = this.getLibnutOrThrow('focusActiveWindow');
+        if ('function' != typeof lib.getActiveWindow || 'function' != typeof lib.focusWindow) return false;
+        try {
+            const handle = lib.getActiveWindow();
+            if (!handle) return false;
+            lib.focusWindow(handle);
+            return true;
+        } catch (error) {
+            this.options.debug(`focusActiveWindow failed: ${error}`);
+            return false;
+        }
+    }
+    getActiveWindowRect() {
+        const lib = this.getLibnutOrThrow('getActiveWindowRect');
+        if ('function' != typeof lib.getActiveWindow || 'function' != typeof lib.getWindowRect) return null;
+        try {
+            const handle = lib.getActiveWindow();
+            if (!handle) return null;
+            const rect = lib.getWindowRect(handle);
+            if (!Number.isFinite(rect.x) || !Number.isFinite(rect.y) || !Number.isFinite(rect.width) || !Number.isFinite(rect.height) || rect.width <= 0 || rect.height <= 0) return null;
+            return rect;
+        } catch (error) {
+            this.options.debug(`getActiveWindowRect failed: ${error}`);
+            return null;
+        }
+    }
     mouseClick(button, double) {
         const lib = this.getLibnutOrThrow('mouseClick');
         if (void 0 !== double) lib.mouseClick(button, double);
@@ -92,6 +119,13 @@ class ComputerInputDriver {
     scrollMouse(x, y) {
         this.getLibnutOrThrow('scrollMouse').scrollMouse(x, y);
     }
+    async emitScrollDetents(dx, dy, detents, delayMs) {
+        this.assertActive('emitScrollDetents');
+        for(let i = 0; i < detents; i++){
+            this.scrollMouse(dx, dy);
+            if (i < detents - 1) await this.delay(delayMs);
+        }
+    }
     keyTap(key, modifiers) {
         const lib = this.getLibnutOrThrow('keyTap');
         if (void 0 !== modifiers) lib.keyTap(key, modifiers);
@@ -270,13 +304,17 @@ const CLICK_HOLD_DURATION = 100;
 const CLICK_FOCUS_SETTLE_DELAY = 120;
 const INPUT_FOCUS_DELAY = 300;
 const INPUT_CLEAR_DELAY = 150;
-const SCROLL_REPEAT_COUNT = 10;
 const SCROLL_STEP_DELAY = 100;
 const SCROLL_COMPLETE_DELAY = 500;
 const EDGE_SCROLL_TOTAL_PX = 50000;
 const EDGE_SCROLL_STEPS = 400;
 const PHASED_PIXELS_PER_STEP = 30;
 const PHASED_MIN_STEPS = 10;
+const LIBNUT_FALLBACK_PIXELS_PER_DETENT = 100;
+const LIBNUT_FALLBACK_TICK_DELAY_MS = 30;
+const LIBNUT_FALLBACK_MAX_DETENTS = 200;
+const LIBNUT_FALLBACK_DETENT_AMOUNT = 'win32' === process.platform ? 120 : 1;
+const LIBNUT_FALLBACK_EDGE_DETENTS = Math.min(LIBNUT_FALLBACK_MAX_DETENTS, Math.max(1, Math.ceil(EDGE_SCROLL_TOTAL_PX / LIBNUT_FALLBACK_PIXELS_PER_DETENT)));
 const DEFAULT_SCROLL_VIEWPORT_RATIO = 0.7;
 const EDGE_SCROLL_SPEC = {
     scrollToTop: {
@@ -284,7 +322,7 @@ const EDGE_SCROLL_SPEC = {
         key: 'home',
         libnut: [
             0,
-            10
+            1
         ]
     },
     scrollToBottom: {
@@ -292,14 +330,14 @@ const EDGE_SCROLL_SPEC = {
         key: 'end',
         libnut: [
             0,
-            -10
+            -1
         ]
     },
     scrollToLeft: {
         direction: 'left',
         key: 'home',
         libnut: [
-            -10,
+            -1,
             0
         ]
     },
@@ -307,7 +345,7 @@ const EDGE_SCROLL_SPEC = {
         direction: 'right',
         key: 'end',
         libnut: [
-            10,
+            1,
             0
         ]
     }
@@ -696,7 +734,7 @@ Available Displays: ${displays.length > 0 ? displays.map((d)=>d.name).join(', ')
     }
     async healthCheck() {
         console.log('[HealthCheck] Starting health check...');
-        console.log("[HealthCheck] @midscene/computer v1.9.6");
+        console.log("[HealthCheck] @midscene/computer v1.9.7");
         console.log('[HealthCheck] Taking screenshot...');
         const screenshotTimeout = 15000;
         let timeoutId;
@@ -874,7 +912,20 @@ Original error: ${lastRawMessage}`);
         });
         this.inputDriver.sendKey(key, modifiers);
     }
-    async performScroll(param) {
+    resolveUntargetedScrollPoint(screenSize) {
+        if ('win32' === process.platform) {
+            const activeWindowRect = this.inputDriver.getActiveWindowRect();
+            if (activeWindowRect) return {
+                x: activeWindowRect.x + activeWindowRect.width / 2,
+                y: activeWindowRect.y + activeWindowRect.height / 2
+            };
+        }
+        return this.toGlobalPoint({
+            x: screenSize.width / 2,
+            y: screenSize.height / 2
+        });
+    }
+    async moveMouseToScrollTarget(param) {
         if (param.locate) {
             const element = param.locate;
             const [x, y] = element.center;
@@ -883,7 +934,17 @@ Original error: ${lastRawMessage}`);
                 y
             });
             this.inputDriver.moveMouse(Math.round(point.x), Math.round(point.y));
+            return;
         }
+        const screenSize = await this.size();
+        if ('win32' === process.platform && this.inputDriver.focusActiveWindow()) await this.inputDriver.delay(CLICK_FOCUS_SETTLE_DELAY);
+        const point = this.resolveUntargetedScrollPoint(screenSize);
+        this.inputDriver.moveMouse(Math.round(point.x), Math.round(point.y));
+        await this.inputDriver.delay(MOUSE_MOVE_EFFECT_WAIT);
+        return screenSize;
+    }
+    async performScroll(param) {
+        let screenSize = await this.moveMouseToScrollTarget(param);
         const scrollType = param?.scrollType;
         const edgeSpec = scrollType && scrollType in EDGE_SCROLL_SPEC ? EDGE_SCROLL_SPEC[scrollType] : null;
         if (edgeSpec) {
@@ -893,11 +954,8 @@ Original error: ${lastRawMessage}`);
                 await this.inputDriver.delay(SCROLL_COMPLETE_DELAY);
                 return;
             }
-            const [dx, dy] = edgeSpec.libnut;
-            for(let i = 0; i < SCROLL_REPEAT_COUNT; i++){
-                this.inputDriver.scrollMouse(dx, dy);
-                await this.inputDriver.delay(SCROLL_STEP_DELAY);
-            }
+            const [ux, uy] = edgeSpec.libnut;
+            await this.inputDriver.emitScrollDetents(ux * LIBNUT_FALLBACK_DETENT_AMOUNT, uy * LIBNUT_FALLBACK_DETENT_AMOUNT, LIBNUT_FALLBACK_EDGE_DETENTS, LIBNUT_FALLBACK_TICK_DELAY_MS);
             return;
         }
         if ('singleAction' === scrollType || !scrollType) {
@@ -905,9 +963,8 @@ Original error: ${lastRawMessage}`);
             const isKnownDirection = 'up' === direction || 'down' === direction || 'left' === direction || 'right' === direction;
             const isHorizontal = 'left' === direction || 'right' === direction;
             let distance = param?.distance ?? void 0;
-            let screenSize;
             if (!distance) {
-                screenSize = await this.size();
+                screenSize ??= await this.size();
                 const base = isHorizontal ? screenSize.width : screenSize.height;
                 distance = Math.max(1, Math.round(base * DEFAULT_SCROLL_VIEWPORT_RATIO));
             }
@@ -926,30 +983,30 @@ Original error: ${lastRawMessage}`);
                 await this.inputDriver.delay(SCROLL_COMPLETE_DELAY);
                 return;
             }
-            const ticks = Math.ceil(distance / 100);
-            const directionMap = {
+            const detents = Math.min(LIBNUT_FALLBACK_MAX_DETENTS, Math.max(1, Math.ceil(distance / LIBNUT_FALLBACK_PIXELS_PER_DETENT)));
+            const directionUnit = {
                 up: [
                     0,
-                    ticks
+                    1
                 ],
                 down: [
                     0,
-                    -ticks
+                    -1
                 ],
                 left: [
-                    -ticks,
+                    -1,
                     0
                 ],
                 right: [
-                    ticks,
+                    1,
                     0
                 ]
             };
-            const [dx, dy] = directionMap[direction] || [
+            const [ux, uy] = directionUnit[direction] || [
                 0,
-                -ticks
+                -1
             ];
-            this.inputDriver.scrollMouse(dx, dy);
+            await this.inputDriver.emitScrollDetents(ux * LIBNUT_FALLBACK_DETENT_AMOUNT, uy * LIBNUT_FALLBACK_DETENT_AMOUNT, detents, LIBNUT_FALLBACK_TICK_DELAY_MS);
             await this.inputDriver.delay(SCROLL_COMPLETE_DELAY);
             return;
         }
@@ -2045,7 +2102,7 @@ class ComputerMCPServer extends mcp_namespaceObject.BaseMCPServer {
     constructor(toolsManager){
         super({
             name: '@midscene/computer-mcp',
-            version: "1.9.6",
+            version: "1.9.7",
             description: 'Control the computer desktop using natural language commands'
         }, toolsManager);
     }

package/dist/types/index.d.ts

@@ -119,6 +119,8 @@ export declare class ComputerDevice implements AbstractInterface {
     private smartTypeString;
     private selectAllAndDelete;
     private pressKeyboardShortcut;
+    private resolveUntargetedScrollPoint;
+    private moveMouseToScrollTarget;
     private performScroll;
     actionSpace(): DeviceAction<any>[];
     destroy(): Promise<void>;

package/dist/types/mcp-server.d.ts

@@ -71,6 +71,8 @@ declare class ComputerDevice implements AbstractInterface {
     private smartTypeString;
     private selectAllAndDelete;
     private pressKeyboardShortcut;
+    private resolveUntargetedScrollPoint;
+    private moveMouseToScrollTarget;
     private performScroll;
     actionSpace(): DeviceAction<any>[];
     destroy(): Promise<void>;