uwonbot 1.2.2 → 1.2.4

package/package.json

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

package/src/agent.js

@@ -85,17 +85,21 @@ async function loadNativeModules() {
         }
         console.log(chalk.green('  ✓ nut-js loaded (mouse/keyboard control)'));
         if (!accessOk) {
-            console.log(chalk.yellow('    ⚠ 접근성 권한이 없어 마우스/키보드 제어가 제한될 수 있습니다.'));
+            console.log(chalk.yellow('    ⚠ 접근성 권한이 없어 CoreGraphics 폴백을 사용합니다.'));
         }
-    } catch {
+    } catch (nutErr) {
         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'));
             robot = null;
+            if (platform === 'darwin') {
+                console.log(chalk.green('  ✓ CoreGraphics 직접 제어 모드 (macOS 네이티브)'));
+            } else {
+                console.log(chalk.yellow('  ⚠ No mouse/keyboard module found.'));
+                console.log(chalk.yellow('    Install: npm install -g @nut-tree-fork/nut-js'));
+            }
         }
     }
 
@@ -129,10 +133,25 @@ async function getScreenSize() {
     return { width: 1920, height: 1080 };
 }
 
+async function cgMoveMouse(px, py) {
+    await execAsync(`osascript -l JavaScript -e 'ObjC.import("CoreGraphics"); $.CGWarpMouseCursorPosition($.CGPointMake(${px}, ${py}))'`);
+}
+
+async function cgMouseEvent(eventType, px, py, mouseButton = 0) {
+    const script = `ObjC.import("CoreGraphics");
+var pt = $.CGPointMake(${px}, ${py});
+var e = $.CGEventCreateMouseEvent($(), ${eventType}, pt, ${mouseButton});
+$.CGEventPost($.kCGHIDEventTap, e);`;
+    await execAsync(`osascript -l JavaScript -e '${script.replace(/\n/g, ' ')}'`);
+}
+
+let _lastKnownPos = { x: 960, y: 540 };
+
 async function moveMouse(x, y) {
     const screen = await getScreenSize();
     const px = Math.round(x * screen.width);
     const py = Math.round(y * screen.height);
+    _lastKnownPos = { x: px, y: py };
 
     try {
         if (robot?.mouse?.setPosition) {
@@ -143,9 +162,11 @@ async function moveMouse(x, y) {
             robot.moveMouse(px, py);
             return;
         }
-    } catch {}
+    } catch (e) {
+        console.log(chalk.gray(`  [mouse] nut-js fallback: ${e.message}`));
+    }
     if (platform === 'darwin') {
-        try { await execAsync(`osascript -e 'tell application "System Events" to set position of mouse to {${px}, ${py}}'`); } catch {}
+        try { await cgMoveMouse(px, py); } catch {}
     }
 }
 
@@ -161,39 +182,86 @@ async function mouseClick(button = 'left', double = false) {
             robot.mouseClick(button, double);
             return;
         }
-    } catch {}
+    } catch (e) {
+        console.log(chalk.gray(`  [click] nut-js fallback: ${e.message}`));
+    }
     if (platform === 'darwin') {
-        const clickType = button === 'right' ? 'right' : 'left';
-        const script = `osascript -e 'tell application "System Events" to click'`;
-        try { await execAsync(script); } catch {}
+        try {
+            const { x, y } = _lastKnownPos;
+            if (button === 'right') {
+                await cgMouseEvent('$.kCGEventRightMouseDown', x, y, '$.kCGMouseButtonRight');
+                await cgMouseEvent('$.kCGEventRightMouseUp', x, y, '$.kCGMouseButtonRight');
+            } else {
+                await cgMouseEvent('$.kCGEventLeftMouseDown', x, y, 0);
+                await cgMouseEvent('$.kCGEventLeftMouseUp', x, y, 0);
+                if (double) {
+                    await new Promise(r => setTimeout(r, 50));
+                    await cgMouseEvent('$.kCGEventLeftMouseDown', x, y, 0);
+                    await cgMouseEvent('$.kCGEventLeftMouseUp', x, y, 0);
+                }
+            }
+        } catch {}
     }
 }
 
 async function mouseDown(button = 'left') {
-    if (robot?.mouse?.pressButton) {
-        const { Button } = await import('@nut-tree-fork/nut-js');
-        await robot.mouse.pressButton(button === 'right' ? Button.RIGHT : Button.LEFT);
-    } else if (robot?.mouseToggle) {
-        robot.mouseToggle('down', button);
+    try {
+        if (robot?.mouse?.pressButton) {
+            const { Button } = await import('@nut-tree-fork/nut-js');
+            await robot.mouse.pressButton(button === 'right' ? Button.RIGHT : Button.LEFT);
+            return;
+        } else if (robot?.mouseToggle) {
+            robot.mouseToggle('down', button);
+            return;
+        }
+    } catch {}
+    if (platform === 'darwin') {
+        const { x, y } = _lastKnownPos;
+        try {
+            if (button === 'right') await cgMouseEvent('$.kCGEventRightMouseDown', x, y, '$.kCGMouseButtonRight');
+            else await cgMouseEvent('$.kCGEventLeftMouseDown', x, y, 0);
+        } catch {}
     }
 }
 
 async function mouseUp(button = 'left') {
-    if (robot?.mouse?.releaseButton) {
-        const { Button } = await import('@nut-tree-fork/nut-js');
-        await robot.mouse.releaseButton(button === 'right' ? Button.RIGHT : Button.LEFT);
-    } else if (robot?.mouseToggle) {
-        robot.mouseToggle('up', button);
+    try {
+        if (robot?.mouse?.releaseButton) {
+            const { Button } = await import('@nut-tree-fork/nut-js');
+            await robot.mouse.releaseButton(button === 'right' ? Button.RIGHT : Button.LEFT);
+            return;
+        } else if (robot?.mouseToggle) {
+            robot.mouseToggle('up', button);
+            return;
+        }
+    } catch {}
+    if (platform === 'darwin') {
+        const { x, y } = _lastKnownPos;
+        try {
+            if (button === 'right') await cgMouseEvent('$.kCGEventRightMouseUp', x, y, '$.kCGMouseButtonRight');
+            else await cgMouseEvent('$.kCGEventLeftMouseUp', x, y, 0);
+        } catch {}
     }
 }
 
 async function mouseScroll(dx, dy) {
-    if (robot?.mouse?.scrollDown && robot?.mouse?.scrollUp) {
-        const amount = Math.abs(dy);
-        if (dy > 0) await robot.mouse.scrollDown(amount);
-        else await robot.mouse.scrollUp(amount);
-    } else if (robot?.scrollMouse) {
-        robot.scrollMouse(dx, dy);
+    try {
+        if (robot?.mouse?.scrollDown && robot?.mouse?.scrollUp) {
+            const amount = Math.abs(dy);
+            if (dy > 0) await robot.mouse.scrollDown(amount);
+            else await robot.mouse.scrollUp(amount);
+            return;
+        } else if (robot?.scrollMouse) {
+            robot.scrollMouse(dx, dy);
+            return;
+        }
+    } catch {}
+    if (platform === 'darwin') {
+        const lines = Math.round(dy / 10) || (dy > 0 ? 1 : -1);
+        try {
+            const script = `ObjC.import("CoreGraphics"); var e = $.CGEventCreateScrollWheelEvent($(), 0, 1, ${-lines}); $.CGEventPost($.kCGHIDEventTap, e);`;
+            await execAsync(`osascript -l JavaScript -e '${script}'`);
+        } catch {}
     }
 }
 
@@ -207,10 +275,18 @@ async function mouseDrag(fromX, fromY, toX, toY) {
 }
 
 async function typeText(text) {
-    if (robot?.keyboard?.type) {
-        await robot.keyboard.type(text);
-    } else if (robot?.typeString) {
-        robot.typeString(text);
+    try {
+        if (robot?.keyboard?.type) {
+            await robot.keyboard.type(text);
+            return;
+        } else if (robot?.typeString) {
+            robot.typeString(text);
+            return;
+        }
+    } catch {}
+    if (platform === 'darwin') {
+        const escaped = text.replace(/'/g, "'\\''").replace(/"/g, '\\"');
+        try { await execAsync(`osascript -e 'tell application "System Events" to keystroke "${escaped}"'`); } catch {}
     }
 }
 
@@ -513,10 +589,10 @@ async function openWebAssistant(assistantId) {
 
 async function activateAllAssistants(assistants) {
     const opened = [];
-    for (const a of assistants) {
-        await openWebAssistant(a.id);
-        opened.push({ name: a.name, mode: 'web' });
-        await new Promise(r => setTimeout(r, 500));
+    const first = assistants[0];
+    if (first) {
+        await openWebAssistant(first.id);
+        opened.push({ name: first.name, mode: 'web' });
     }
     return opened;
 }
@@ -632,19 +708,9 @@ export async function startAgent(port = 9876, options = {}) {
                 return;
             }
 
-            console.log(chalk.cyan(`  → ${userAssistants.length}개 비서 모두 활성화`));
-            const opened = await activateAllAssistants(userAssistants);
-            opened.forEach(o => {
-                console.log(chalk.gray(`    ✓ ${o.name} (${o.mode})`));
-            });
-
-            const geminiKey = userAssistants.find(a => a.apiKey)?.apiKey;
-            if (geminiKey) {
-                await listenForName(userAssistants, geminiKey);
-            } else {
-                console.log(chalk.gray('  → 모든 비서가 활성 상태로 유지됩니다.'));
-                console.log(chalk.gray('    (비서 이름을 말해 선택하려면 API 키가 필요합니다)'));
-            }
+            const first = userAssistants[0];
+            console.log(chalk.green(`  → ${first.name} 웹 실행 (비서 ${userAssistants.length}개 중 첫 번째)`));
+            await openWebAssistant(first.id);
         });
         await clapListener.start();
         console.log('');