uwonbot 1.1.2 → 1.1.4

package/bin/uwonbot.js

@@ -14,7 +14,7 @@ showBanner();
 program
     .name('uwonbot')
     .description('Uwonbot AI Assistant — Your AI controls your computer')
-    .version('1.1.2');
+    .version('1.1.4');
 
 program
     .command('login')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uwonbot",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Uwonbot AI Assistant CLI — Your AI controls your computer",
   "main": "src/index.js",
   "bin": {
@@ -27,6 +27,7 @@
     "commander": "^12.1.0",
     "conf": "^13.0.1",
     "inquirer": "^12.0.0",
+    "mic": "^2.5.1",
     "node-fetch": "^3.3.2",
     "open": "^10.1.0",
     "ora": "^8.1.0",
@@ -34,7 +35,6 @@
   },
   "optionalDependencies": {
     "@nut-tree-fork/nut-js": "^4.2.0",
-    "mic": "^2.5.1",
     "screenshot-desktop": "^1.15.0"
   }
 }

package/src/agent.js

@@ -1,11 +1,61 @@
 import { WebSocketServer } from 'ws';
-import { exec } from 'child_process';
+import WebSocket from 'ws';
+import { exec, execSync } from 'child_process';
 import { promisify } from 'util';
 import chalk from 'chalk';
 import { getConfig } from './config.js';
 import ClapListener from './clapListener.js';
+import { fetchAssistants, setIdToken } from './firebase-client.js';
 
 const execAsync = promisify(exec);
+const WEB_APP_URL = 'https://chartapp-653e1.web.app';
+
+function isPortInUse(port) {
+    return new Promise((resolve) => {
+        const ws = new WebSocket(`ws://localhost:${port}`);
+        const timer = setTimeout(() => { ws.terminate(); resolve(false); }, 1000);
+        ws.on('open', () => { clearTimeout(timer); ws.close(); resolve(true); });
+        ws.on('error', () => { clearTimeout(timer); resolve(false); });
+    });
+}
+
+function killProcessOnPort(port) {
+    try {
+        if (process.platform === 'win32') {
+            const out = execSync(`netstat -ano | findstr :${port}`, { encoding: 'utf8' });
+            const pid = out.trim().split(/\s+/).pop();
+            if (pid && pid !== '0') execSync(`taskkill /F /PID ${pid}`, { stdio: 'ignore' });
+        } else {
+            execSync(`lsof -ti :${port} | xargs kill -9 2>/dev/null`, { stdio: 'ignore' });
+        }
+        return true;
+    } catch { return false; }
+}
+
+function checkSoxInstalled() {
+    try { execSync('which sox', { stdio: 'ignore' }); return true; } catch {
+        try { execSync('which rec', { stdio: 'ignore' }); return true; } catch { return false; }
+    }
+}
+
+async function ensureSox() {
+    if (checkSoxInstalled()) return true;
+    console.log(chalk.yellow('  ⚠ SoX가 설치되어 있지 않습니다 (박수 감지에 필요)'));
+    if (process.platform === 'darwin') {
+        console.log(chalk.cyan('  → Homebrew로 자동 설치 시도 중...'));
+        try {
+            execSync('brew install sox', { stdio: 'inherit' });
+            console.log(chalk.green('  ✓ SoX 설치 완료'));
+            return true;
+        } catch {
+            console.log(chalk.yellow('  ⚠ SoX 자동 설치 실패. 수동 설치: brew install sox'));
+            return false;
+        }
+    }
+    console.log(chalk.gray('    macOS: brew install sox'));
+    console.log(chalk.gray('    Linux: sudo apt install sox'));
+    return false;
+}
 const platform = process.platform;
 
 let robot = null;
@@ -272,32 +322,160 @@ async function handleCommand(msg) {
     }
 }
 
+async function openWebAssistant(assistantId) {
+    const url = `${WEB_APP_URL}/assistant/live?id=${assistantId}`;
+    try {
+        if (platform === 'darwin') {
+            await execAsync(`open -na "Google Chrome" --args --new-window "${url}" 2>/dev/null || open -na "Safari" --args "${url}" 2>/dev/null || open "${url}"`);
+        } else if (platform === 'win32') {
+            await execAsync(`start chrome --new-window "${url}" 2>nul || start "" "${url}"`);
+        } else {
+            await execAsync(`google-chrome --new-window "${url}" 2>/dev/null || xdg-open "${url}"`);
+        }
+        return true;
+    } catch {
+        try { await execAsync(`open "${url}"`); return true; } catch { return false; }
+    }
+}
+
+async function activateAllAssistants(assistants) {
+    const opened = [];
+    for (const a of assistants) {
+        const mode = a.activationMode || 'web';
+        if (mode === 'terminal') {
+            await openTerminalWithChat(a.name);
+            opened.push({ name: a.name, mode: 'terminal' });
+        } else if (mode === 'web') {
+            await openWebAssistant(a.id);
+            opened.push({ name: a.name, mode: 'web' });
+        } else {
+            await openTerminalWithChat(a.name);
+            await openWebAssistant(a.id);
+            opened.push({ name: a.name, mode: 'both' });
+        }
+        await new Promise(r => setTimeout(r, 500));
+    }
+    return opened;
+}
+
+async function loadUserAssistants(uid) {
+    try {
+        const assistants = await fetchAssistants(uid);
+        return assistants;
+    } catch {
+        return [];
+    }
+}
+
+async function listenForName(assistants, apiKey) {
+    if (!apiKey || assistants.length <= 1) return;
+    let VoiceInput;
+    try {
+        VoiceInput = (await import('./voiceInput.js')).default;
+    } catch { return; }
+
+    const vi = new VoiceInput(apiKey);
+    const names = assistants.map(a => a.name.toLowerCase());
+
+    console.log(chalk.cyan('  🎙 비서 이름을 말하면 해당 비서만 유지됩니다...'));
+    console.log(chalk.gray(`     비서 목록: ${assistants.map(a => a.name).join(', ')}`));
+
+    const ok = await vi.start({
+        onListening: () => {},
+        onSpeechStart: () => {},
+        onSpeechEnd: () => {},
+        onTranscript: (text) => {
+            const lower = text.toLowerCase().trim();
+            const matched = names.find(n => lower.includes(n));
+            if (matched) {
+                const matchedAssistant = assistants.find(a => a.name.toLowerCase() === matched);
+                console.log(chalk.bold.green(`  ✓ "${matchedAssistant.name}" 선택됨 — 나머지 비서를 종료합니다.`));
+                vi.stop();
+            }
+        },
+    });
+
+    if (!ok) {
+        console.log(chalk.gray('  (음성 인식을 사용할 수 없어 모든 비서가 활성 상태로 유지됩니다)'));
+    }
+}
+
 export async function startAgent(port = 9876, options = {}) {
     console.log('');
     console.log(chalk.bold.cyan('  🖥️  Uwonbot Agent'));
     console.log(chalk.gray('  ────────────────────────'));
     console.log('');
 
+    const alreadyRunning = await isPortInUse(port);
+    if (alreadyRunning) {
+        console.log(chalk.yellow(`  ⚠ Agent가 이미 포트 ${port}에서 실행 중입니다.`));
+        console.log(chalk.gray('  기존 프로세스를 종료하고 재시작합니다...'));
+        killProcessOnPort(port);
+        await new Promise(r => setTimeout(r, 1500));
+    }
+
     await loadNativeModules();
     console.log('');
 
     const config = getConfig();
     const uid = config.get('uid');
     const email = config.get('email');
+    const idToken = config.get('idToken');
 
     if (!uid) {
         console.log(chalk.red('  ✗ Not logged in. Run: uwonbot login'));
         process.exit(1);
     }
 
+    if (idToken) setIdToken(idToken);
+
     console.log(chalk.gray(`  User: ${email}`));
     console.log(chalk.gray(`  Port: ${port}`));
+
+    let userAssistants = [];
+    try {
+        userAssistants = await loadUserAssistants(uid);
+        if (userAssistants.length > 0) {
+            console.log(chalk.gray(`  Assistants: ${userAssistants.map(a => a.name).join(', ')}`));
+        } else {
+            console.log(chalk.gray('  Assistants: (none — default Uwonbot will be used)'));
+        }
+    } catch {}
     console.log('');
 
     if (!options.noMic) {
-        const clapListener = new ClapListener(() => {
-            console.log(chalk.bold.cyan('  🎯 Opening terminal...'));
-            openTerminalWithChat();
+        await ensureSox();
+        const clapListener = new ClapListener(async () => {
+            console.log(chalk.bold.cyan('  👏 박수 감지! 비서 활성화 중...'));
+
+            if (userAssistants.length === 0) {
+                console.log(chalk.gray('  → 기본 Uwonbot 실행'));
+                openTerminalWithChat('Uwonbot');
+                return;
+            }
+
+            if (userAssistants.length === 1) {
+                const a = userAssistants[0];
+                const mode = a.activationMode || 'web';
+                console.log(chalk.green(`  → ${a.name} 실행 (${mode})`));
+                if (mode === 'terminal' || mode === 'both') await openTerminalWithChat(a.name);
+                if (mode === 'web' || mode === 'both') await openWebAssistant(a.id);
+                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 키가 필요합니다)'));
+            }
         });
         await clapListener.start();
         console.log('');
@@ -318,22 +496,36 @@ export async function startAgent(port = 9876, options = {}) {
             console.log(chalk.yellow('  ○ Client disconnected'));
         });
 
-        ws.send(JSON.stringify({ type: 'welcome', agent: 'uwonbot', version: '1.0.3', uid }));
+        ws.send(JSON.stringify({ type: 'welcome', agent: 'uwonbot', version: '1.1.2', uid }));
     });
 
-    wss.on('error', (err) => {
+    wss.on('error', async (err) => {
         if (err.code === 'EADDRINUSE') {
-            console.log(chalk.red(`  ✗ Port ${port} is already in use`));
-            console.log(chalk.gray(`    Try: uwonbot agent --port ${port + 1}`));
-            process.exit(1);
+            console.log(chalk.yellow(`  ⚠ 포트 ${port} 충돌 — 기존 프로세스 종료 후 재시도...`));
+            killProcessOnPort(port);
+            await new Promise(r => setTimeout(r, 2000));
+            try {
+                const retry = new WebSocketServer({ port });
+                retry.on('connection', (ws, req) => {
+                    ws.on('message', async (data) => {
+                        const result = await handleCommand(data.toString());
+                        ws.send(JSON.stringify(result));
+                    });
+                    ws.send(JSON.stringify({ type: 'welcome', agent: 'uwonbot', version: '1.1.4', uid }));
+                });
+                console.log(chalk.green(`  ✓ 재시도 성공 — ws://localhost:${port}`));
+            } catch {
+                console.log(chalk.red(`  ✗ 포트 ${port}를 사용할 수 없습니다.`));
+                console.log(chalk.gray(`    uwonbot agent --port ${port + 1}`));
+                process.exit(1);
+            }
+            return;
         }
         console.error(chalk.red('  ✗ Server error:'), err.message);
     });
 
     console.log(chalk.bold.green(`  ✓ Agent running on ws://localhost:${port}`));
-    console.log(chalk.gray('  Waiting for connections...'));
-    console.log('');
-    console.log(chalk.gray('  Press Ctrl+C to stop'));
+    console.log(chalk.gray('  Waiting for connections... (Ctrl+C to stop)'));
     console.log('');
 
     process.on('SIGINT', () => {

package/src/autostart.js

@@ -12,9 +12,25 @@ function getUwonbotPath() {
         const p = execSync('which uwonbot', { encoding: 'utf8' }).trim();
         if (p) return p;
     } catch {}
+    const globalPaths = [
+        '/usr/local/bin/uwonbot',
+        '/opt/homebrew/bin/uwonbot',
+        join(homedir(), '.npm-global', 'bin', 'uwonbot'),
+        join(homedir(), '.nvm', 'versions', 'node', '*', 'bin', 'uwonbot'),
+    ];
+    for (const gp of globalPaths) {
+        if (existsSync(gp)) return gp;
+    }
     return 'uwonbot';
 }
 
+function getNodePath() {
+    try {
+        return execSync('which node', { encoding: 'utf8' }).trim();
+    } catch {}
+    return '/usr/local/bin/node';
+}
+
 function getMacPlistPath() {
     const dir = join(homedir(), 'Library', 'LaunchAgents');
     if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
@@ -36,6 +52,10 @@ export function enableAutostart() {
         const logDir = join(homedir(), '.uwonbot');
         if (!existsSync(logDir)) mkdirSync(logDir, { recursive: true });
 
+        const nodePath = getNodePath();
+        const nodeDir = nodePath.replace(/\/node$/, '');
+        const fullPath = `/usr/local/bin:/usr/bin:/bin:/opt/homebrew/bin:${nodeDir}:${process.env.PATH || ''}`;
+
         const plist = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -50,7 +70,12 @@ export function enableAutostart() {
     <key>RunAtLoad</key>
     <true/>
     <key>KeepAlive</key>
-    <true/>
+    <dict>
+        <key>SuccessfulExit</key>
+        <false/>
+    </dict>
+    <key>ThrottleInterval</key>
+    <integer>10</integer>
     <key>StandardOutPath</key>
     <string>${logPath}</string>
     <key>StandardErrorPath</key>
@@ -58,7 +83,9 @@ export function enableAutostart() {
     <key>EnvironmentVariables</key>
     <dict>
         <key>PATH</key>
-        <string>/usr/local/bin:/usr/bin:/bin:/opt/homebrew/bin:${process.env.PATH || ''}</string>
+        <string>${fullPath}</string>
+        <key>HOME</key>
+        <string>${homedir()}</string>
     </dict>
 </dict>
 </plist>`;
@@ -69,11 +96,16 @@ export function enableAutostart() {
         } catch {}
         try {
             execSync(`launchctl load -w "${plistPath}"`);
-        } catch {}
-
-        console.log(chalk.green('  ✓ uwonbot agent 자동 시작이 등록되었습니다'));
-        console.log(chalk.gray(`    ${plistPath}`));
+            console.log(chalk.green('  ✓ uwonbot agent 자동 시작이 등록되었습니다'));
+            console.log(chalk.green('  ✓ agent가 백그라운드에서 실행되었습니다'));
+        } catch (e) {
+            console.log(chalk.yellow(`  ⚠ launchctl 등록 중 문제: ${e.message}`));
+        }
+        console.log(chalk.gray(`    설정: ${plistPath}`));
         console.log(chalk.gray(`    로그: ${logPath}`));
+        console.log('');
+        console.log(chalk.white('  컴퓨터를 켤 때마다 자동으로 agent가 실행됩니다.'));
+        console.log(chalk.white('  박수 감지, OS 제어 등이 항상 준비됩니다.'));
         return true;
     }
 

package/src/clapListener.js

@@ -25,9 +25,13 @@ export default class ClapListener {
         let micModule;
         try {
             micModule = (await import('mic')).default;
-        } catch {
-            console.log(chalk.yellow('  ⚠ mic module not found. Clap detection disabled.'));
-            console.log(chalk.gray('    Install: npm install -g mic'));
+            if (!micModule) throw new Error('mic default export is null');
+        } catch (e) {
+            console.log(chalk.yellow('  ⚠ mic 모듈을 로드할 수 없습니다. 박수 감지를 사용할 수 없습니다.'));
+            console.log(chalk.gray('    해결 방법:'));
+            console.log(chalk.white('    1. npm install -g uwonbot@latest   (mic 포함 재설치)'));
+            console.log(chalk.white('    2. brew install sox                (macOS)'));
+            console.log(chalk.gray(`    원인: ${e.message}`));
             return false;
         }