opencode-zombie-monitor 1.0.1 → 1.1.0

package/README.md

@@ -1,5 +1,6 @@
 # 🧟 OpenCode Zombie Monitor
 
+[![npm](https://img.shields.io/npm/v/opencode-zombie-monitor)](https://www.npmjs.com/package/opencode-zombie-monitor)
 [![GitHub](https://img.shields.io/github/license/Matroskin86/opencode-zombie-monitor)](https://github.com/Matroskin86/opencode-zombie-monitor/blob/main/LICENSE)
 [![Platform](https://img.shields.io/badge/platform-macOS%20%7C%20Linux-blue)]()
 [![OpenCode](https://img.shields.io/badge/opencode-plugin-purple)]()
@@ -39,7 +40,7 @@ Add to your `opencode.json`:
 
 ```json
 {
-  "plugin": ["github:Matroskin86/opencode-zombie-monitor"]
+  "plugin": ["opencode-zombie-monitor"]
 }
 ```
 
@@ -53,40 +54,71 @@ Just chat normally. The plugin silently patrols your system and eliminates zombi
 
 When zombies are neutralized, you'll see:
 ```
-🧟 Killed 3 zombie opencode processes | Freed ~300MB RAM
+🧟 Killed 3 zombie processes | Freed 300MB RAM | Headshot! 💥
 ```
 
-### Manual Mode
+### Commands
 
-Want to check the situation yourself?
+| Command | Description |
+|---------|-------------|
+| `/zombies` | Check zombie status |
+| `/kill-zombies` | Manually kill all zombies |
 
+**Check status:**
 ```
 /zombies
 ```
-
-Response when all clear:
 ```
 ✅ 2 processes, no zombies
 ```
+or
+```
+🧟 5 zombies of 7 processes | 500MB RAM | /kill-zombies
+```
 
-Response when trouble brewing:
+**Manual kill:**
+```
+/kill-zombies
+```
 ```
-🧟 5 zombies of 7 processes | ~500MB RAM | Fix: oc-kill-zombies
+💥 Headshot! Killed 5 zombies | Freed 500MB RAM
 ```
 
 ## ⚙️ Configuration
 
-Edit `index.mjs` to adjust aggression level:
+Configure in your `opencode.json`:
 
-```javascript
-// RAMBO MODE: Kill on sight (default)
-const AUTO_KILL_THRESHOLD = 1
+```json
+{
+  "plugin": [
+    ["opencode-zombie-monitor", {
+      "autoKill": true,
+      "threshold": 1
+    }]
+  ]
+}
+```
 
-// PATIENT MODE: Wait until horde forms
-const AUTO_KILL_THRESHOLD = 5
+| Option | Default | Description |
+|--------|---------|-------------|
+| `autoKill` | `true` | Auto-kill zombies on every message |
+| `threshold` | `1` | Minimum zombies to trigger action |
 
-// PACIFIST MODE: Only notify, never kill
-const AUTO_KILL_THRESHOLD = 999
+### Modes
+
+**RAMBO MODE** (default) — Kill on sight:
+```json
+{ "autoKill": true, "threshold": 1 }
+```
+
+**PATIENT MODE** — Wait until horde forms:
+```json
+{ "autoKill": true, "threshold": 5 }
+```
+
+**MANUAL MODE** — Only notify, kill with `/kill-zombies`:
+```json
+{ "autoKill": false }
 ```
 
 ## 🖥️ Supported Platforms

package/index.mjs

@@ -18,45 +18,55 @@ const getLang = () => {
   return "en"
 }
 
+// Format memory size
+const formatMB = (mb) => mb >= 1024 ? `${(mb / 1024).toFixed(1)}GB` : `${Math.round(mb)}MB`
+
 // Localized messages
 const i18n = {
   en: {
-    killed: (n) => `🧟 Killed ${n} zombie opencode process${n > 1 ? "es" : ""} | Freed ~${n * 100}MB RAM`,
-    found: (n) => `🧟 ${n} zombie opencode process${n > 1 ? "es" : ""} | ~${n * 100}MB RAM | Fix: oc-kill-zombies`,
-    status: (zombies, total) => zombies > 0
-      ? `🧟 ${zombies} zombie${zombies > 1 ? "s" : ""} of ${total} process${total > 1 ? "es" : ""} | ~${zombies * 100}MB RAM | Fix: oc-kill-zombies`
+    killed: (n, mb) => `🧟 Killed ${n} zombie process${n > 1 ? "es" : ""} | Freed ${formatMB(mb)} RAM | Headshot! 💥`,
+    found: (n, mb) => `🧟 ${n} zombie process${n > 1 ? "es" : ""} | ${formatMB(mb)} RAM | /kill-zombies`,
+    status: (zombies, total, mb) => zombies > 0
+      ? `🧟 ${zombies} zombie${zombies > 1 ? "s" : ""} of ${total} process${total > 1 ? "es" : ""} | ${formatMB(mb)} RAM | /kill-zombies`
       : `✅ ${total} process${total > 1 ? "es" : ""}, no zombies`,
-    commandDesc: "Check zombie opencode processes"
+    commandDesc: "Check zombie opencode processes",
+    killDesc: "Kill zombie opencode processes",
+    manualKilled: (n, mb) => `💥 Headshot! Killed ${n} zombie${n > 1 ? "s" : ""} | Freed ${formatMB(mb)} RAM`
   },
   ru: {
-    killed: (n) => `🧟 Убито ${n} зомби-процессов opencode | Освобождено ~${n * 100}MB RAM`,
-    found: (n) => `🧟 ${n} зомби-процессов opencode | ~${n * 100}MB RAM | Fix: oc-kill-zombies`,
-    status: (zombies, total) => zombies > 0
-      ? `🧟 ${zombies} зомби из ${total} процессов | ~${zombies * 100}MB RAM | Fix: oc-kill-zombies`
+    killed: (n, mb) => `🧟 Убито ${n} зомби-процесс${n > 1 ? "ов" : ""} | Освобождено ${formatMB(mb)} RAM | Headshot! 💥`,
+    found: (n, mb) => `🧟 ${n} зомби-процесс${n > 1 ? "ов" : ""} | ${formatMB(mb)} RAM | /kill-zombies`,
+    status: (zombies, total, mb) => zombies > 0
+      ? `🧟 ${zombies} зомби из ${total} процессов | ${formatMB(mb)} RAM | /kill-zombies`
       : `✅ ${total} процессов, зомби нет`,
-    commandDesc: "Проверить зомби-процессы opencode"
+    commandDesc: "Проверить зомби-процессы opencode",
+    killDesc: "Убить зомби-процессы opencode",
+    manualKilled: (n, mb) => `💥 Headshot! Убито ${n} зомби | Освобождено ${formatMB(mb)} RAM`
   },
   zh: {
-    killed: (n) => `🧟 已击杀 ${n} 个僵尸 opencode 进程 | 释放 ~${n * 100}MB 内存`,
-    found: (n) => `🧟 发现 ${n} 个僵尸 opencode 进程 | ~${n * 100}MB 内存 | 修复: oc-kill-zombies`,
-    status: (zombies, total) => zombies > 0
-      ? `🧟 ${total} 个进程中有 ${zombies} 个僵尸 | ~${zombies * 100}MB 内存 | 修复: oc-kill-zombies`
+    killed: (n, mb) => `🧟 已击杀 ${n} 个僵尸进程 | 释放 ${formatMB(mb)} 内存 | Headshot! 💥`,
+    found: (n, mb) => `🧟 发现 ${n} 个僵尸进程 | ${formatMB(mb)} 内存 | /kill-zombies`,
+    status: (zombies, total, mb) => zombies > 0
+      ? `🧟 ${total} 个进程中有 ${zombies} 个僵尸 | ${formatMB(mb)} 内存 | /kill-zombies`
       : `✅ ${total} 个进程，没有僵尸`,
-    commandDesc: "检查僵尸 opencode 进程"
+    commandDesc: "检查僵尸进程",
+    killDesc: "击杀僵尸进程",
+    manualKilled: (n, mb) => `💥 Headshot! 已击杀 ${n} 个僵尸 | 释放 ${formatMB(mb)} 内存`
   }
 }
 
 const t = i18n[getLang()]
 
-// Count only processes WITHOUT terminal (real zombies)
-const getZombieCount = async () => {
+// Get zombie count and their total memory (RSS in MB)
+const getZombieStats = async () => {
   try {
-    // macOS: TTY = "??" | Linux: TTY = "?"
     const ttyPattern = isMac ? '??' : '?'
-    const { stdout } = await execAsync(`ps aux | grep "[o]pencode" | grep -v "opencode/" | awk '$7 == "${ttyPattern}" {count++} END {print count+0}'`)
-    return parseInt(stdout.trim()) || 0
+    // $6 = RSS in KB on both macOS and Linux
+    const { stdout } = await execAsync(`ps aux | grep "[o]pencode" | grep -v "opencode/" | awk '$7 == "${ttyPattern}" {count++; mem+=$6} END {print count+0, mem/1024}'`)
+    const [count, mb] = stdout.trim().split(/\s+/)
+    return { count: parseInt(count) || 0, mb: parseFloat(mb) || 0 }
   } catch {
-    return 0
+    return { count: 0, mb: 0 }
   }
 }
 
@@ -81,8 +91,13 @@ const killZombies = async () => {
   }
 }
 
-// Auto-kill threshold (1 = kill immediately)
-const AUTO_KILL_THRESHOLD = 1
+// Configuration defaults
+// autoKill: true = kill automatically, false = notify only (manual mode)
+// threshold: minimum zombies to trigger action (1 = immediate)
+const DEFAULT_CONFIG = {
+  autoKill: true,
+  threshold: 1
+}
 
 const sendNotification = async (client, sessionId, text) => {
   await client.session.prompt({
@@ -103,8 +118,11 @@ const getSessionIdFromMessages = (messages) => {
   return null
 }
 
-export const ZombieMonitor = async ({ client }) => {
+export const ZombieMonitor = async ({ client, config: pluginConfig }) => {
   let lastNotifiedCount = 0
+  
+  // Merge user config with defaults
+  const cfg = { ...DEFAULT_CONFIG, ...pluginConfig }
 
   return {
     config: async (opencodeConfig) => {
@@ -113,27 +131,31 @@ export const ZombieMonitor = async ({ client }) => {
         template: "",
         description: t.commandDesc
       }
+      opencodeConfig.command["kill-zombies"] = {
+        template: "",
+        description: t.killDesc
+      }
     },
 
     "experimental.chat.messages.transform": async (input, output) => {
       const sessionId = getSessionIdFromMessages(output.messages)
       if (!sessionId) return
 
-      const zombies = await getZombieCount()
+      const { count: zombies, mb } = await getZombieStats()
       
-      // Auto-kill if zombies >= threshold
-      if (zombies >= AUTO_KILL_THRESHOLD) {
+      // Auto-kill if enabled and zombies >= threshold
+      if (cfg.autoKill && zombies >= cfg.threshold) {
         await killZombies()
         try {
-          await sendNotification(client, sessionId, t.killed(zombies))
+          await sendNotification(client, sessionId, t.killed(zombies, mb))
         } catch (e) {}
         lastNotifiedCount = 0
       }
-      // Notify if zombies appeared (but below threshold)
+      // Notify if zombies appeared (manual mode or below threshold)
       else if (zombies > 0 && zombies > lastNotifiedCount) {
         lastNotifiedCount = zombies
         try {
-          await sendNotification(client, sessionId, t.found(zombies))
+          await sendNotification(client, sessionId, t.found(zombies, mb))
         } catch (e) {}
       } else if (zombies === 0) {
         lastNotifiedCount = 0
@@ -141,13 +163,25 @@ export const ZombieMonitor = async ({ client }) => {
     },
 
     "command.execute.before": async (input) => {
-      if (input.command !== "zombies") return
-
-      const zombies = await getZombieCount()
-      const total = await getTotalCount()
-
-      await sendNotification(client, input.sessionID, t.status(zombies, total))
-      throw new Error("__ZOMBIES_HANDLED__")
+      // /zombies - check status
+      if (input.command === "zombies") {
+        const { count: zombies, mb } = await getZombieStats()
+        const total = await getTotalCount()
+        await sendNotification(client, input.sessionID, t.status(zombies, total, mb))
+        throw new Error("__ZOMBIES_HANDLED__")
+      }
+      
+      // /kill-zombies - manual kill
+      if (input.command === "kill-zombies") {
+        const { count: zombies, mb } = await getZombieStats()
+        if (zombies > 0) {
+          await killZombies()
+          await sendNotification(client, input.sessionID, t.manualKilled(zombies, mb))
+        } else {
+          await sendNotification(client, input.sessionID, t.status(0, await getTotalCount(), 0))
+        }
+        throw new Error("__ZOMBIES_HANDLED__")
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-zombie-monitor",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Auto-kill zombie opencode processes. Supports macOS and Linux with auto language detection (EN/RU).",
   "main": "index.mjs",
   "type": "module",
@@ -9,7 +9,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/jenshen86/opencode-zombie-monitor"
+    "url": "https://github.com/Matroskin86/opencode-zombie-monitor"
   },
   "peerDependencies": {
     "@opencode-ai/plugin": ">=1.0.0"

package/download-emoji.mjs

@@ -1,115 +0,0 @@
-/**
- * Скрипт для скачивания Telegram custom emoji
- * 
- * 1. Отправь эмодзи боту @your_bot
- * 2. Запусти: node download-emoji.mjs
- * 3. Эмодзи сохранится в ./assets/emoji.webp
- */
-
-import https from 'https'
-import fs from 'fs'
-import path from 'path'
-
-const BOT_TOKEN = '8061734285:AAHeLB0YHXomdjPPyTg18GM0_RrdvTbp4aA'
-const API_URL = `https://api.telegram.org/bot${BOT_TOKEN}`
-
-async function fetchJson(url) {
-  return new Promise((resolve, reject) => {
-    https.get(url, (res) => {
-      let data = ''
-      res.on('data', chunk => data += chunk)
-      res.on('end', () => resolve(JSON.parse(data)))
-    }).on('error', reject)
-  })
-}
-
-async function downloadFile(filePath, destPath) {
-  const fileUrl = `https://api.telegram.org/file/bot${BOT_TOKEN}/${filePath}`
-  return new Promise((resolve, reject) => {
-    const file = fs.createWriteStream(destPath)
-    https.get(fileUrl, (res) => {
-      res.pipe(file)
-      file.on('finish', () => {
-        file.close()
-        resolve(destPath)
-      })
-    }).on('error', reject)
-  })
-}
-
-async function main() {
-  console.log('🔍 Получаю последние сообщения...')
-  
-  // Получить updates
-  const updates = await fetchJson(`${API_URL}/getUpdates?limit=10`)
-  
-  if (!updates.ok || !updates.result.length) {
-    console.log('❌ Нет сообщений. Отправь эмодзи боту и попробуй снова.')
-    return
-  }
-  
-  // Найти сообщение с custom emoji
-  let customEmojiId = null
-  let messageText = null
-  
-  for (const update of updates.result.reverse()) {
-    const msg = update.message
-    if (msg?.entities) {
-      for (const entity of msg.entities) {
-        if (entity.type === 'custom_emoji') {
-          customEmojiId = entity.custom_emoji_id
-          messageText = msg.text
-          break
-        }
-      }
-    }
-    if (customEmojiId) break
-  }
-  
-  if (!customEmojiId) {
-    console.log('❌ Custom emoji не найден. Отправь эмодзи из платного/премиум пака.')
-    console.log('📋 Последние сообщения:', updates.result.map(u => u.message?.text).filter(Boolean))
-    return
-  }
-  
-  console.log(`✅ Найден emoji: "${messageText}" (ID: ${customEmojiId})`)
-  
-  // Получить стикер по emoji ID
-  console.log('📥 Получаю файл стикера...')
-  const stickers = await fetchJson(`${API_URL}/getCustomEmojiStickers?custom_emoji_ids=["${customEmojiId}"]`)
-  
-  if (!stickers.ok || !stickers.result.length) {
-    console.log('❌ Не удалось получить стикер:', stickers)
-    return
-  }
-  
-  const sticker = stickers.result[0]
-  console.log(`📦 Стикер: ${sticker.file_id}`)
-  
-  // Получить путь к файлу
-  const fileInfo = await fetchJson(`${API_URL}/getFile?file_id=${sticker.file_id}`)
-  
-  if (!fileInfo.ok) {
-    console.log('❌ Не удалось получить файл:', fileInfo)
-    return
-  }
-  
-  // Создать папку assets
-  const assetsDir = './assets'
-  if (!fs.existsSync(assetsDir)) {
-    fs.mkdirSync(assetsDir)
-  }
-  
-  // Скачать файл
-  const ext = path.extname(fileInfo.result.file_path) || '.webp'
-  const destPath = `${assetsDir}/emoji${ext}`
-  
-  console.log(`💾 Скачиваю в ${destPath}...`)
-  await downloadFile(fileInfo.result.file_path, destPath)
-  
-  console.log(`✅ Готово! Файл сохранён: ${destPath}`)
-  console.log(`\n📝 Для README используй:`)
-  console.log(`<img src="${destPath}" width="20" height="20">`)
-}
-
-main().catch(console.error)