fix(execute): windows scaleFactor not work (#2)

Author: ycjcl868

src/main/agent/device.ts

@@ -10,6 +10,7 @@ import {
   ScreenshotResult,
 } from '@ui-tars/desktop-shared/types';
 
+import * as env from '@main/env';
 import { logger } from '@main/logger';
 
 import { FACTOR } from './constant';
@@ -56,11 +57,15 @@ export class Desktop {
     screenWidth: number,
     screenHeight: number,
   ) {
+    const primaryDisplay = screen.getPrimaryDisplay();
+    const { scaleFactor } = primaryDisplay;
+
     await execute({
       prediction,
       screenWidth,
       screenHeight,
       logger,
+      scaleFactor: !env.isMacOS ? scaleFactor : 1,
     });
   }
 

src/main/agent/execute.ts

@@ -26,6 +26,7 @@ const moveStraightTo = async (startX: number | null, startY: number | null) => {
 };
 
 export const execute = async (executeParams: {
+  scaleFactor?: number;
   prediction: PredictionParsed;
   screenWidth: number;
   screenHeight: number;
@@ -36,11 +37,13 @@ export const execute = async (executeParams: {
     screenWidth,
     screenHeight,
     logger = console,
+    scaleFactor = 1,
   } = executeParams;
 
   logger.info(
     '[execute] executeParams',
     JSON.stringify({
+      scaleFactor,
       prediction,
       screenWidth,
       screenHeight,
@@ -53,10 +56,14 @@ export const execute = async (executeParams: {
 
   logger.info('[execute] action_type', action_type, 'startBoxStr', startBoxStr);
 
-  const { x: startX, y: startY } = startBoxStr
+  const { x, y } = startBoxStr
     ? parseBoxToScreenCoords(startBoxStr, screenWidth, screenHeight)
     : { x: null, y: null };
-  logger.info('[execute] [Position]', startX, startY);
+
+  const startX = x ? x * scaleFactor : null;
+  const startY = y ? y * scaleFactor : null;
+
+  logger.info(`[execute] [Position] (${x}, ${y}) => (${startX}, ${startY})`);
 
   // execute configs
   mouse.config.mouseSpeed = 1500;

src/renderer/src/components/RunMessages/index.tsx

@@ -180,7 +180,7 @@ const RunMessages: React.FC<RunMessagesProps> = (props) => {
             );
           }
         })}
-        {thinking && <LoadingText>正在思考...</LoadingText>}
+        {thinking && <LoadingText>Thinking...</LoadingText>}
       </Box>
     </Box>
   );