uwonbot 1.2.6 → 1.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uwonbot",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "Uwonbot AI Assistant CLI — Your AI controls your computer",
   "main": "src/index.js",
   "bin": {

package/src/agent.js

@@ -61,42 +61,30 @@ const platform = process.platform;
 let robot = null;
 let screenshotDesktop = null;
 
-async function checkAccessibility() {
-    if (platform !== 'darwin') return true;
-    try {
-        const perms = await import('@nut-tree-fork/node-mac-permissions');
-        const p = perms.default || perms;
-        const status = p.getAuthStatus('accessibility');
-        if (status === 'authorized') return true;
-        console.log(chalk.yellow(`  ⚠ 손쉬운 사용 권한: ${status}`));
-        console.log(chalk.yellow('    시스템 설정 > 개인정보 보호 및 보안 > 손쉬운 사용에서 터미널을 허용해주세요.'));
-        return false;
-    } catch { return true; }
-}
-
 async function loadNativeModules() {
-    const accessOk = await checkAccessibility();
+    robot = null;
 
-    try {
-        robot = (await import('@nut-tree-fork/nut-js')).default || (await import('@nut-tree-fork/nut-js'));
-        if (robot.mouse) {
-            robot.mouse.config.autoDelayMs = 0;
-            robot.mouse.config.mouseSpeed = 2000;
-        }
-        console.log(chalk.green('  ✓ nut-js loaded (mouse/keyboard control)'));
-        if (!accessOk) {
-            console.log(chalk.yellow('    ⚠ 접근성 권한이 없어 CoreGraphics 폴백을 사용합니다.'));
+    if (platform === 'darwin') {
+        try {
+            await execAsync(`osascript -l JavaScript -e 'ObjC.import("CoreGraphics"); 0'`);
+            console.log(chalk.green('  ✓ CoreGraphics 네이티브 마우스/키보드 제어'));
+        } catch {
+            console.log(chalk.red('  ✗ CoreGraphics 사용 불가'));
         }
-    } catch (nutErr) {
+    } else {
         try {
-            const rjs = await import('robotjs');
-            robot = rjs.default || rjs;
-            console.log(chalk.green('  ✓ robotjs loaded (mouse/keyboard control)'));
+            robot = (await import('@nut-tree-fork/nut-js')).default || (await import('@nut-tree-fork/nut-js'));
+            if (robot.mouse) {
+                robot.mouse.config.autoDelayMs = 0;
+                robot.mouse.config.mouseSpeed = 2000;
+            }
+            console.log(chalk.green('  ✓ nut-js loaded (mouse/keyboard control)'));
         } catch {
-            robot = null;
-            if (platform === 'darwin') {
-                console.log(chalk.green('  ✓ CoreGraphics 직접 제어 모드 (macOS 네이티브)'));
-            } else {
+            try {
+                const rjs = await import('robotjs');
+                robot = rjs.default || rjs;
+                console.log(chalk.green('  ✓ robotjs loaded (mouse/keyboard control)'));
+            } catch {
                 console.log(chalk.yellow('  ⚠ No mouse/keyboard module found.'));
                 console.log(chalk.yellow('    Install: npm install -g @nut-tree-fork/nut-js'));
             }
@@ -108,19 +96,9 @@ async function loadNativeModules() {
         screenshotDesktop = mod.default || mod;
         console.log(chalk.green('  ✓ screenshot-desktop loaded'));
     } catch {
-        console.log(chalk.yellow('  ⚠ screenshot-desktop not found.'));
         screenshotDesktop = null;
     }
 
-    if (platform === 'darwin' && !robot) {
-        try {
-            await execAsync(`osascript -l JavaScript -e 'ObjC.import("CoreGraphics"); 0'`);
-            console.log(chalk.green('  ✓ CoreGraphics 마우스 제어 테스트 성공'));
-        } catch {
-            console.log(chalk.red('  ✗ CoreGraphics 사용 불가'));
-        }
-    }
-
     const screen = await getScreenSize();
     console.log(chalk.gray(`  Screen: ${screen.width}x${screen.height}`));
 }
@@ -128,9 +106,15 @@ async function loadNativeModules() {
 async function getScreenSize() {
     if (platform === 'darwin') {
         try {
-            const { stdout } = await execAsync(`osascript -e 'tell application "Finder" to get bounds of window of desktop' 2>/dev/null || osascript -e 'tell application "System Events" to get {0, 0, 1920, 1080}'`);
-            const nums = stdout.trim().split(/[,\s]+/).map(Number);
-            if (nums.length >= 4) return { width: nums[2], height: nums[3] };
+            const script = `ObjC.import("CoreGraphics"); var d = $.CGMainDisplayID(); var w = $.CGDisplayPixelsWide(d); var h = $.CGDisplayPixelsHigh(d); JSON.stringify({w:w,h:h})`;
+            const { stdout } = await execAsync(`osascript -l JavaScript -e '${script}'`, { timeout: 3000 });
+            const parsed = JSON.parse(stdout.trim());
+            if (parsed.w && parsed.h) return { width: Number(parsed.w), height: Number(parsed.h) };
+        } catch {}
+        try {
+            const { stdout } = await execAsync(`system_profiler SPDisplaysDataType 2>/dev/null | grep Resolution | head -1`, { timeout: 3000 });
+            const m = stdout.match(/(\d+)\s*x\s*(\d+)/);
+            if (m) return { width: parseInt(m[1]), height: parseInt(m[2]) };
         } catch {}
     }
     if (robot?.screen?.width) {