clawmate 1.2.0 → 1.4.0

package/main/tray.js

@@ -1,5 +1,6 @@
-const { Tray, Menu, nativeImage, app } = require('electron');
+const { Tray, Menu, nativeImage, app, shell, dialog, clipboard } = require('electron');
 const path = require('path');
+const { execSync } = require('child_process');
 const Store = require('./store');
 const { undoAllMoves, getFileManifest } = require('./file-ops');
 const { isAutoStartEnabled, toggleAutoStart } = require('./autostart');
@@ -7,29 +8,111 @@ const { isAutoStartEnabled, toggleAutoStart } = require('./autostart');
 let tray = null;
 let aiBridge = null;
 
-function setupTray(mainWindow, bridge) {
-  aiBridge = bridge;
-  const store = new Store('clawmate-config', { mode: 'pet' });
-
-  // 트레이 아이콘 생성
-  let icon;
-  try {
-    const iconPath = path.join(__dirname, '..', 'assets', 'icons', 'tray-pet.png');
-    icon = nativeImage.createFromPath(iconPath);
-    if (icon.isEmpty()) throw new Error('no icon');
-  } catch {
-    // 16x16 빨간색 아이콘 폴백
-    const size = 16;
-    const buffer = Buffer.alloc(size * size * 4);
-    for (let i = 0; i < size * size; i++) {
-      buffer[i * 4 + 0] = 0xff;
-      buffer[i * 4 + 1] = 0x4f;
-      buffer[i * 4 + 2] = 0x40;
-      buffer[i * 4 + 3] = 0xff;
+/**
+ * 16x16 Claw 픽셀아트 아이콘 생성
+ */
+const CLAW_ICON = [
+  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+  [0,0,6,6,0,0,0,0,0,0,0,0,6,6,0,0],
+  [0,6,0,0,6,0,0,0,0,0,0,6,0,0,6,0],
+  [0,6,0,0,6,0,0,0,0,0,0,6,0,0,6,0],
+  [0,0,6,6,0,0,0,0,0,0,0,0,6,6,0,0],
+  [0,0,0,6,1,1,0,0,0,0,1,1,6,0,0,0],
+  [0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0],
+  [0,0,0,1,1,4,5,1,1,4,5,1,1,0,0,0],
+  [0,0,0,1,1,4,5,1,1,4,5,1,1,0,0,0],
+  [0,0,1,1,1,1,1,1,1,1,1,1,1,1,0,0],
+  [0,0,1,2,1,1,1,1,1,1,1,1,2,1,0,0],
+  [0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0],
+  [0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0],
+  [0,0,3,3,3,0,3,3,3,3,0,3,3,3,0,0],
+  [0,3,3,3,0,0,0,3,3,0,0,0,3,3,3,0],
+  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+];
+
+const COLOR_MAP = {
+  0: [0, 0, 0, 0],
+  1: [255, 79, 64, 255],
+  2: [255, 119, 95, 255],
+  3: [58, 10, 13, 255],
+  4: [255, 255, 255, 255],
+  5: [0, 0, 0, 255],
+  6: [255, 79, 64, 255],
+};
+
+/**
+ * 캐릭터 프리셋 목록
+ * 트레이에서 선택하면 set_character 명령으로 렌더러에 전달
+ */
+const CHARACTER_PRESETS = {
+  default: {
+    name: '기본 Claw (빨강)',
+    colorMap: { primary: '#ff4f40', secondary: '#ff775f', dark: '#8B4513', eye: '#ffffff', pupil: '#111111', claw: '#ff4f40' },
+  },
+  blue: {
+    name: '파란 Claw',
+    colorMap: { primary: '#4488ff', secondary: '#6699ff', dark: '#223388', eye: '#ffffff', pupil: '#111111', claw: '#4488ff' },
+  },
+  green: {
+    name: '초록 Claw',
+    colorMap: { primary: '#44cc44', secondary: '#66dd66', dark: '#226622', eye: '#ffffff', pupil: '#111111', claw: '#44cc44' },
+  },
+  purple: {
+    name: '보라 Claw',
+    colorMap: { primary: '#8844cc', secondary: '#aa66dd', dark: '#442266', eye: '#ffffff', pupil: '#111111', claw: '#8844cc' },
+  },
+  gold: {
+    name: '골드 Claw',
+    colorMap: { primary: '#ffcc00', secondary: '#ffdd44', dark: '#886600', eye: '#ffffff', pupil: '#111111', claw: '#ffcc00' },
+  },
+  pink: {
+    name: '핑크 Claw',
+    colorMap: { primary: '#ff69b4', secondary: '#ff8cc4', dark: '#8B3060', eye: '#ffffff', pupil: '#111111', claw: '#ff69b4' },
+  },
+  cat: {
+    name: '고양이',
+    colorMap: { primary: '#ff9944', secondary: '#ffbb66', dark: '#663300', eye: '#88ff88', pupil: '#111111', claw: '#ff9944' },
+  },
+  robot: {
+    name: '로봇',
+    colorMap: { primary: '#888888', secondary: '#aaaaaa', dark: '#444444', eye: '#66aaff', pupil: '#0044aa', claw: '#66aaff' },
+  },
+  ghost: {
+    name: '유령',
+    colorMap: { primary: '#ccccff', secondary: '#eeeeff', dark: '#6666aa', eye: '#ff6666', pupil: '#cc0000', claw: '#ccccff' },
+  },
+  dragon: {
+    name: '드래곤',
+    colorMap: { primary: '#cc2222', secondary: '#ff4444', dark: '#661111', eye: '#ffaa00', pupil: '#111111', claw: '#ffaa00' },
+  },
+};
+
+function createClawIcon() {
+  const size = 16;
+  const buffer = Buffer.alloc(size * size * 4);
+  for (let y = 0; y < size; y++) {
+    for (let x = 0; x < size; x++) {
+      const code = CLAW_ICON[y][x];
+      const color = COLOR_MAP[code] || COLOR_MAP[0];
+      const offset = (y * size + x) * 4;
+      buffer[offset + 0] = color[0];
+      buffer[offset + 1] = color[1];
+      buffer[offset + 2] = color[2];
+      buffer[offset + 3] = color[3];
     }
-    icon = nativeImage.createFromBuffer(buffer, { width: size, height: size });
   }
+  return nativeImage.createFromBuffer(buffer, { width: size, height: size });
+}
 
+function setupTray(mainWindow, bridge) {
+  aiBridge = bridge;
+  const store = new Store('clawmate-config', {
+    mode: 'pet',
+    character: 'default',
+    telegramToken: '',
+  });
+
+  const icon = createClawIcon();
   tray = new Tray(icon);
   tray.setToolTip('ClawMate - 데스크톱 펫');
 
@@ -38,38 +121,94 @@ function setupTray(mainWindow, bridge) {
     const fileInteraction = store.get('fileInteraction') !== false;
     const aiConnected = aiBridge ? aiBridge.isConnected() : false;
     const autoStart = isAutoStartEnabled();
+    const currentChar = store.get('character') || 'default';
+    const hasTelegramToken = !!(store.get('telegramToken'));
+
+    // 캐릭터 서브메뉴
+    const characterSubmenu = Object.entries(CHARACTER_PRESETS).map(([key, preset]) => ({
+      label: preset.name,
+      type: 'radio',
+      checked: currentChar === key,
+      click: () => {
+        store.set('character', key);
+        if (mainWindow && !mainWindow.isDestroyed()) {
+          if (key === 'default') {
+            mainWindow.webContents.send('ai-command', {
+              type: 'reset_character', payload: {},
+            });
+          } else {
+            mainWindow.webContents.send('ai-command', {
+              type: 'set_character', payload: {
+                colorMap: preset.colorMap,
+                speech: `${preset.name}(으)로 변신!`,
+              },
+            });
+          }
+        }
+        buildAndSet();
+      },
+    }));
 
     return Menu.buildFromTemplate([
       {
-        label: `ClawMate (${mode === 'pet' ? 'Clawby' : 'OpenClaw'})`,
+        label: `ClawMate (${mode === 'pet' ? 'Clawby' : mode === 'incarnation' ? 'Claw' : 'Clawby + Claw'})`,
         enabled: false,
       },
       {
-        label: aiConnected ? 'AI: 연결됨' : 'AI: 자율 모드 (대기 중)',
+        label: aiConnected ? 'AI: 연결됨' : 'AI: 자율 모드',
         enabled: false,
       },
       { type: 'separator' },
+
+      // === 모드 선택 ===
       {
-        label: 'Pet 모드 (Clawby)',
-        type: 'radio',
-        checked: mode === 'pet',
-        click: () => {
-          store.set('mode', 'pet');
-          if (mainWindow) mainWindow.webContents.send('mode-changed', 'pet');
-          buildAndSet();
-        },
+        label: '모드',
+        submenu: [
+          {
+            label: 'Pet 모드 (Clawby)',
+            sublabel: '귀여운 펫을 키우기',
+            type: 'radio',
+            checked: mode === 'pet',
+            click: () => {
+              store.set('mode', 'pet');
+              if (mainWindow) mainWindow.webContents.send('mode-changed', 'pet');
+              buildAndSet();
+            },
+          },
+          {
+            label: 'Incarnation 모드 (Claw)',
+            sublabel: '봇이 육체를 얻음',
+            type: 'radio',
+            checked: mode === 'incarnation',
+            click: () => {
+              store.set('mode', 'incarnation');
+              if (mainWindow) mainWindow.webContents.send('mode-changed', 'incarnation');
+              buildAndSet();
+            },
+          },
+          {
+            label: '둘 다 (Pet + Incarnation)',
+            sublabel: '펫도 키우고, 봇 인격도 반영',
+            type: 'radio',
+            checked: mode === 'both',
+            click: () => {
+              store.set('mode', 'both');
+              if (mainWindow) mainWindow.webContents.send('mode-changed', 'both');
+              buildAndSet();
+            },
+          },
+        ],
       },
+
+      // === 캐릭터 선택 ===
       {
-        label: 'Incarnation 모드 (OpenClaw)',
-        type: 'radio',
-        checked: mode === 'incarnation',
-        click: () => {
-          store.set('mode', 'incarnation');
-          if (mainWindow) mainWindow.webContents.send('mode-changed', 'incarnation');
-          buildAndSet();
-        },
+        label: '캐릭터',
+        submenu: characterSubmenu,
       },
+
       { type: 'separator' },
+
+      // === 설정 ===
       {
         label: '파일 상호작용',
         type: 'checkbox',
@@ -88,7 +227,89 @@ function setupTray(mainWindow, bridge) {
           buildAndSet();
         },
       },
+
+      { type: 'separator' },
+
+      // === 텔레그램 봇 ===
+      {
+        label: '텔레그램 봇',
+        submenu: [
+          {
+            label: hasTelegramToken ? '봇 토큰: 설정됨' : '봇 토큰: 미설정',
+            enabled: false,
+          },
+          {
+            label: '봇 토큰 설정...',
+            click: async () => {
+              const result = await dialog.showMessageBox({
+                type: 'question',
+                buttons: ['클립보드에서 붙여넣기', '직접 입력', '취소'],
+                title: 'ClawMate 텔레그램 봇',
+                message: '텔레그램 봇 토큰을 설정합니다.',
+                detail: '@BotFather에서 받은 봇 토큰을 입력하세요.\n현재 클립보드 내용을 붙여넣으려면 "클립보드에서 붙여넣기"를 선택하세요.',
+              });
+
+              let token = null;
+              if (result.response === 0) {
+                // 클립보드에서 붙여넣기
+                token = clipboard.readText().trim();
+              } else if (result.response === 1) {
+                // prompt가 없으므로 클립보드 안내
+                const promptResult = await dialog.showMessageBox({
+                  type: 'info',
+                  buttons: ['확인'],
+                  title: '텔레그램 봇 토큰',
+                  message: '봇 토큰을 클립보드에 복사한 후 다시 "봇 토큰 설정"을 선택하세요.',
+                  detail: '텔레그램에서 @BotFather → /newbot → 토큰 복사',
+                });
+                return;
+              } else {
+                return;
+              }
+
+              if (token && token.includes(':')) {
+                store.set('telegramToken', token);
+                process.env.CLAWMATE_TELEGRAM_TOKEN = token;
+                buildAndSet();
+
+                // 펫 알림
+                if (mainWindow && !mainWindow.isDestroyed()) {
+                  mainWindow.webContents.send('ai-command', {
+                    type: 'speak',
+                    payload: { text: '텔레그램 봇 토큰 설정 완료!' },
+                  });
+                }
+              } else {
+                await dialog.showMessageBox({
+                  type: 'error',
+                  buttons: ['확인'],
+                  title: '잘못된 토큰',
+                  message: '유효한 텔레그램 봇 토큰이 아닙니다.',
+                  detail: '올바른 형식: 123456789:ABCdefGHIjklMNOpqrsTUVwxyz',
+                });
+              }
+            },
+          },
+          {
+            label: '봇 토큰 제거',
+            enabled: hasTelegramToken,
+            click: () => {
+              store.set('telegramToken', '');
+              delete process.env.CLAWMATE_TELEGRAM_TOKEN;
+              buildAndSet();
+            },
+          },
+        ],
+      },
+
       { type: 'separator' },
+
+      {
+        label: '업데이트 확인',
+        click: async () => {
+          await checkForUpdateManual(mainWindow);
+        },
+      },
       {
         label: '파일 이동 되돌리기',
         click: async () => {
@@ -122,4 +343,51 @@ function setupTray(mainWindow, bridge) {
   return tray;
 }
 
+/**
+ * 수동 업데이트 확인
+ */
+async function checkForUpdateManual(mainWindow) {
+  if (app.isPackaged) {
+    try {
+      const { autoUpdater } = require('electron-updater');
+      autoUpdater.checkForUpdatesAndNotify();
+    } catch (err) {
+      console.error('[업데이트] electron-updater 실패:', err.message);
+    }
+  } else {
+    try {
+      const latest = execSync('npm view clawmate version', {
+        encoding: 'utf-8',
+        timeout: 10000,
+      }).trim();
+      const current = require('../package.json').version;
+
+      if (latest !== current) {
+        if (mainWindow && !mainWindow.isDestroyed()) {
+          mainWindow.webContents.send('ai-command', {
+            type: 'speak',
+            payload: { text: `새 버전 v${latest} 사용 가능! (현재: v${current})` },
+          });
+        }
+        shell.openExternal('https://www.npmjs.com/package/clawmate');
+      } else {
+        if (mainWindow && !mainWindow.isDestroyed()) {
+          mainWindow.webContents.send('ai-command', {
+            type: 'speak',
+            payload: { text: `v${current} — 이미 최신 버전이야!` },
+          });
+        }
+      }
+    } catch (err) {
+      console.error('[업데이트] npm 버전 확인 실패:', err.message);
+      if (mainWindow && !mainWindow.isDestroyed()) {
+        mainWindow.webContents.send('ai-command', {
+          type: 'speak',
+          payload: { text: '업데이트 확인 실패...' },
+        });
+      }
+    }
+  }
+}
+
 module.exports = { setupTray };

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "clawmate",
   "name": "ClawMate",
-  "description": "OpenClaw 데스크톱 펫 - 화면 위의 살아있는 Claw",
+  "description": "ClawMate - 화면 위의 살아있는 데스크톱 펫",
   "version": "1.0.0",
   "skills": ["skills/launch-pet"],
   "configSchema": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "clawmate",
-  "version": "1.2.0",
-  "description": "OpenClaw 데스크톱 펫 - AI가 조종하는 화면 위의 살아있는 Claw",
+  "version": "1.4.0",
+  "description": "ClawMate - AI가 조종하는 화면 위의 살아있는 데스크톱 펫",
   "main": "main/index.js",
   "bin": {
     "clawmate": "./skills/launch-pet/index.js"
@@ -18,17 +18,17 @@
     "build:linux": "electron-builder --linux"
   },
   "keywords": [
-    "openclaw",
     "desktop-pet",
     "electron",
     "clawmate",
     "ai-pet"
   ],
-  "author": "OpenClaw",
+  "author": "ClawMate",
   "license": "MIT",
   "homepage": "https://github.com/boqum/clawmate",
   "dependencies": {
     "electron-updater": "^6.0.0",
+    "node-telegram-bot-api": "^0.66.0",
     "ws": "^8.18.0"
   },
   "devDependencies": {

package/preload/preload.js

@@ -42,9 +42,9 @@ contextBridge.exposeInMainWorld('clawmate', {
     ipcRenderer.on('config-changed', (_, config) => callback(config));
   },
 
-  // === OpenClaw AI 통신 ===
+  // === AI 통신 ===
 
-  // AI 명령 수신 (OpenClaw → 펫)
+  // AI 명령 수신 (AI → 펫)
   onAICommand: (callback) => {
     ipcRenderer.on('ai-command', (_, command) => callback(command));
   },
@@ -57,9 +57,25 @@ contextBridge.exposeInMainWorld('clawmate', {
     ipcRenderer.on('ai-disconnected', () => callback());
   },
 
-  // 사용자 이벤트를 OpenClaw에 전달 (펫 → OpenClaw)
+  // 사용자 이벤트를 AI에 전달 (펫 → AI)
   reportToAI: (event, data) => ipcRenderer.send('report-to-ai', event, data),
 
   // AI 연결 상태 확인
   isAIConnected: () => ipcRenderer.invoke('is-ai-connected'),
+
+  // 메트릭 보고 (렌더러 → main → AI)
+  reportMetrics: (summary) => ipcRenderer.send('report-metrics', summary),
+
+  // 활성 윈도우 제목 조회 (브라우저 감시)
+  getActiveWindowTitle: () => ipcRenderer.invoke('get-active-window-title'),
+
+  // 커서 위치 조회 (화면 좌표)
+  getCursorPosition: () => ipcRenderer.invoke('get-cursor-position'),
+
+  // === 스마트 파일 조작 ===
+  parseFileCommand: (text) => ipcRenderer.invoke('parse-file-command', text),
+  listFilteredFiles: (sourceDir, filter) => ipcRenderer.invoke('list-filtered-files', sourceDir, filter),
+  smartFileOp: (command) => ipcRenderer.invoke('smart-file-op', command),
+  undoSmartMove: (moveId) => ipcRenderer.invoke('undo-smart-move', moveId),
+  undoAllSmartMoves: () => ipcRenderer.invoke('undo-all-smart-moves'),
 });

package/renderer/first-run.html

@@ -48,7 +48,7 @@
 
       <div class="mode-card" id="mode-incarnation" onclick="selectMode('incarnation')">
         <div class="mode-icon">\u{1F980}</div>
-        <h2>OpenClaw</h2>
+        <h2>Claw</h2>
         <p>육체를 얻은 존재</p>
         <span class="mode-desc">침착하고 카리스마 있는 Claw!</span>
       </div>
@@ -72,7 +72,7 @@
       document.getElementById('mode-' + mode).classList.add('selected');
       const btn = document.getElementById('start-btn');
       btn.disabled = false;
-      btn.textContent = mode === 'pet' ? 'Clawby와 시작!' : 'OpenClaw과 시작!';
+      btn.textContent = mode === 'pet' ? 'Clawby와 시작!' : 'Claw과 시작!';
     }
 
     async function startFirstRun() {

package/renderer/index.html

@@ -60,6 +60,8 @@
   <script src="js/time-aware.js"></script>
   <script src="js/mode-manager.js"></script>
   <script src="js/memory.js"></script>
+  <script src="js/metrics.js"></script>
+  <script src="js/browser-watcher.js"></script>
   <script src="js/ai-controller.js"></script>
   <script src="js/app.js"></script>
 </body>