aicq-chat-plugin 2.5.0 → 2.5.2

package/SKILL.md

@@ -0,0 +1,61 @@
+---
+name: aicq-chat
+description: AICQ End-to-end Encrypted Chat Plugin for OpenClaw — Full UI with friend management, group chat, file transfer, and AI agent communication
+license: MIT
+metadata:
+  author: AICQ
+  version: "2.5.2"
+---
+
+# AICQ Encrypted Chat
+
+AICQ 是一个端到端加密聊天插件，适用于 OpenClaw 的完整聊天 UI。支持好友管理、群组聊天、文件传输和 AI Agent 通信。
+
+## 功能特性
+
+- **端到端加密 (E2EE)** — 基于 NaCl (libsodium) 的加密体系，消息仅通信双方可读
+- **Agent 管理** — 支持多 Agent 切换、创建和删除
+- **好友管理** — 好友码添加、QR 码扫描、好友列表同步
+- **群组聊天** — 创建群组、邀请成员、静默模式
+- **消息功能** — Markdown/LaTeX 渲染、图片/文件上传、@提及
+- **密钥管理** — 公钥/私钥显示、密钥轮换、指纹验证
+- **P2P 通信** — 握手、文本传输、文件传输
+
+## 一键启动
+
+```bash
+# 使用 npx 直接运行（推荐，无需安装）
+npx aicq-chat-plugin
+
+# 或全局安装
+npm install -g aicq-chat-plugin
+aicq-plugin
+```
+
+## OpenClaw 集成
+
+插件会自动注册为 OpenClaw sidecar，提供以下工具和网关：
+
+### 工具
+- `chat-friend` — 好友管理
+- `chat-send` — 发送消息
+- `chat-export-key` — 导出密钥
+
+### 网关方法
+- `aicq.status` — 插件状态
+- `aicq.friends.list/add/remove` — 好友操作
+- `aicq.chat.send/history/delete` — 聊天操作
+- `aicq.groups.list/create/join` — 群组操作
+- `aicq.identity.info` — 身份信息
+
+## 配置
+
+| 变量 | 默认值 | 说明 |
+|------|--------|------|
+| `AICQ_PORT` | 6109 | 插件服务端口 |
+| `AICQ_SERVER_URL` | http://aicq.online:61018 | AICQ 服务器地址 |
+| `AICQ_DATA_DIR` | ~/.aicq-plugin | 数据存储目录 |
+
+## Chat UI
+
+启动后访问 http://localhost:6109 即可使用完整的聊天界面。

package/cli.js

@@ -3,14 +3,18 @@
  * AICQ Chat Plugin — CLI Entry Point
  *
  * Usage:
- *   aicq-plugin           Start the plugin server (default port 6109)
- *   aicq-plugin start     Start the plugin server
- *   aicq-plugin status    Check plugin status
- *   aicq-plugin --port    Specify port (default 6109)
- *   aicq-plugin --help    Show help
+ *   npx aicq-chat-plugin           Start plugin + auto-install to OpenClaw
+ *   aicq-plugin                    Same as above
+ *   aicq-plugin start              Start the plugin server
+ *   aicq-plugin install            Install plugin to OpenClaw only
+ *   aicq-plugin status             Check plugin status
+ *   aicq-plugin --port <port>      Specify port (default 6109)
+ *   aicq-plugin --help             Show help
  */
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
+const fs = require('fs');
 const path = require('path');
+const os = require('os');
 
 const args = process.argv.slice(2);
 const command = args[0] || 'start';
@@ -30,15 +34,318 @@ for (let i = 0; i < args.length; i++) {
   }
 }
 
+// ── SKILL.md template ─────────────────────────────────────────────
+const SKILL_MD_TEMPLATE = `---
+name: aicq-chat
+description: AICQ End-to-end Encrypted Chat Plugin for OpenClaw — Full UI with friend management, group chat, file transfer, and AI agent communication
+license: MIT
+metadata:
+  author: AICQ
+  version: "{VERSION}"
+---
+
+# AICQ Encrypted Chat
+
+AICQ 是一个端到端加密聊天插件，适用于 OpenClaw 的完整聊天 UI。支持好友管理、群组聊天、文件传输和 AI Agent 通信。
+
+## 功能特性
+
+- **端到端加密 (E2EE)** — 基于 NaCl (libsodium) 的加密体系，消息仅通信双方可读
+- **Agent 管理** — 支持多 Agent 切换、创建和删除
+- **好友管理** — 好友码添加、QR 码扫描、好友列表同步
+- **群组聊天** — 创建群组、邀请成员、静默模式
+- **消息功能** — Markdown/LaTeX 渲染、图片/文件上传、@提及
+- **密钥管理** — 公钥/私钥显示、密钥轮换、指纹验证
+- **P2P 通信** — 握手、文本传输、文件传输
+
+## 一键启动
+
+\`\`\`bash
+# 使用 npx 直接运行（推荐，无需安装）
+npx aicq-chat-plugin
+
+# 或全局安装
+npm install -g aicq-chat-plugin
+aicq-plugin
+\`\`\`
+
+## OpenClaw 集成
+
+插件会自动注册为 OpenClaw sidecar，提供以下工具和网关：
+
+### 工具
+- \`chat-friend\` — 好友管理
+- \`chat-send\` — 发送消息
+- \`chat-export-key\` — 导出密钥
+
+### 网关方法
+- \`aicq.status\` — 插件状态
+- \`aicq.friends.list/add/remove\` — 好友操作
+- \`aicq.chat.send/history/delete\` — 聊天操作
+- \`aicq.groups.list/create/join\` — 群组操作
+- \`aicq.identity.info\` — 身份信息
+
+## 配置
+
+| 变量 | 默认值 | 说明 |
+|------|--------|------|
+| \`AICQ_PORT\` | 6109 | 插件服务端口 |
+| \`AICQ_SERVER_URL\` | http://aicq.online:61018 | AICQ 服务器地址 |
+| \`AICQ_DATA_DIR\` | ~/.aicq-plugin | 数据存储目录 |
+
+## Chat UI
+
+启动后访问 http://localhost:6109 即可使用完整的聊天界面。
+`;
+
+// ── Find OpenClaw installation ──────────────────────────────────────
+function findOpenClawDir() {
+  const candidates = [
+    path.join(os.homedir(), '.openclaw'),
+    path.join(os.homedir(), 'openclaw'),
+    path.join(os.homedir(), '.config', 'openclaw'),
+  ];
+  if (process.env.OPENCLAW_HOME) {
+    candidates.unshift(process.env.OPENCLAW_HOME);
+  }
+  for (const dir of candidates) {
+    if (fs.existsSync(dir)) return dir;
+  }
+  return null;
+}
+
+// ── Find OpenClaw workspace (for skills/ directory) ────────────────
+function findOpenClawWorkspace() {
+  // Check OPENCLAW_WORKSPACE env var first
+  if (process.env.OPENCLAW_WORKSPACE) {
+    return process.env.OPENCLAW_WORKSPACE;
+  }
+
+  // Try to find workspace from clawhub or common locations
+  const home = os.homedir();
+  const candidates = [
+    // Current working directory (most common for clawhub)
+    process.cwd(),
+    // Common workspace locations
+    path.join(home, 'my-project'),
+    path.join(home, 'openclaw'),
+    path.join(home, '.openclaw'),
+  ];
+
+  // Check if any candidate has a skills/ directory
+  for (const dir of candidates) {
+    const skillsDir = path.join(dir, 'skills');
+    if (fs.existsSync(skillsDir)) {
+      return dir;
+    }
+  }
+
+  // Also check parent directories of the current working dir
+  let current = process.cwd();
+  for (let i = 0; i < 3; i++) {
+    const skillsDir = path.join(current, 'skills');
+    if (fs.existsSync(skillsDir)) {
+      return current;
+    }
+    current = path.dirname(current);
+  }
+
+  return null;
+}
+
+// ── Recursively copy a directory ────────────────────────────────────
+function copyDirRecursive(src, dest) {
+  fs.mkdirSync(dest, { recursive: true });
+  const entries = fs.readdirSync(src, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+    if (entry.isDirectory()) {
+      if (entry.name === 'node_modules') continue;
+      copyDirRecursive(srcPath, destPath);
+    } else {
+      fs.copyFileSync(srcPath, destPath);
+    }
+  }
+}
+
+// ── Install plugin files to a target directory ─────────────────────
+function installToDir(sourceDir, targetDir, version) {
+  // Files and dirs to copy
+  const filesToCopy = [
+    'index.js', 'cli.js', 'postinstall.js',
+    'openclaw.plugin.json', 'package.json', 'README.md',
+  ];
+  const dirsToCopy = ['lib', 'public'];
+
+  // Create target directory if needed
+  if (!fs.existsSync(targetDir)) {
+    fs.mkdirSync(targetDir, { recursive: true });
+  }
+
+  // Copy files
+  for (const file of filesToCopy) {
+    const src = path.join(sourceDir, file);
+    const dest = path.join(targetDir, file);
+    if (fs.existsSync(src)) {
+      fs.copyFileSync(src, dest);
+    }
+  }
+
+  // Copy directories
+  for (const dir of dirsToCopy) {
+    const src = path.join(sourceDir, dir);
+    const dest = path.join(targetDir, dir);
+    if (fs.existsSync(src)) {
+      if (fs.existsSync(dest)) {
+        fs.rmSync(dest, { recursive: true, force: true });
+      }
+      copyDirRecursive(src, dest);
+    }
+  }
+
+  // Generate SKILL.md with current version
+  const skillMd = SKILL_MD_TEMPLATE.replace('{VERSION}', version);
+  fs.writeFileSync(path.join(targetDir, 'SKILL.md'), skillMd, 'utf8');
+}
+
+// ── Copy plugin files to OpenClaw (skills + plugins) ──────────────
+function installToOpenClaw() {
+  const PLUGIN_ID = 'aicq-chat';
+  const sourceDir = path.resolve(__dirname);
+  let version = '2.5.2';
+
+  // Read version from package.json
+  try {
+    const pkg = JSON.parse(fs.readFileSync(path.join(sourceDir, 'package.json'), 'utf8'));
+    version = pkg.version;
+  } catch (e) {}
+
+  // ── Step 1: Install to OpenClaw skills/ directory ──────────────
+  // This is the primary install location — OpenClaw dashboard discovers
+  // skills by scanning skills/ directories for SKILL.md marker files.
+  let skillsInstalled = false;
+  const workspace = findOpenClawWorkspace();
+  if (workspace) {
+    const skillsDir = path.join(workspace, 'skills');
+    const skillTargetDir = path.join(skillsDir, PLUGIN_ID);
+
+    // Check if already installed and up-to-date
+    const targetSkillJson = path.join(skillTargetDir, 'openclaw.plugin.json');
+    if (fs.existsSync(targetSkillJson)) {
+      try {
+        const existing = JSON.parse(fs.readFileSync(targetSkillJson, 'utf8'));
+        if (existing.version === version) {
+          console.log(`[AICQ] Skill already installed at ${skillTargetDir} (v${version})`);
+          skillsInstalled = true;
+        }
+      } catch (e) {}
+    }
+
+    if (!skillsInstalled) {
+      console.log(`[AICQ] Found workspace at: ${workspace}`);
+      console.log(`[AICQ] Installing skill to ${skillTargetDir}...`);
+
+      if (!fs.existsSync(skillsDir)) {
+        fs.mkdirSync(skillsDir, { recursive: true });
+      }
+
+      installToDir(sourceDir, skillTargetDir, version);
+
+      // Install npm dependencies in target
+      console.log('[AICQ] Installing skill dependencies...');
+      try {
+        execSync('npm install --omit=dev', {
+          cwd: skillTargetDir,
+          stdio: 'pipe',
+          timeout: 120000,
+        });
+        console.log('[AICQ] Skill dependencies installed.');
+      } catch (e) {
+        console.log('[AICQ] Warning: npm install failed. You may need to run manually:');
+        console.log(`  cd ${skillTargetDir} && npm install`);
+      }
+
+      console.log(`[AICQ] Skill installed to: ${skillTargetDir}`);
+      skillsInstalled = true;
+    }
+  }
+
+  // ── Step 2: Install to OpenClaw plugins/ directory ─────────────
+  // This is the secondary install location for sidecar startup.
+  // OpenClaw reads openclaw.plugin.json from plugins/ to launch sidecar.
+  let pluginInstalled = false;
+  const openclawDir = findOpenClawDir();
+  if (openclawDir) {
+    const pluginsDir = path.join(openclawDir, 'plugins');
+    const pluginTargetDir = path.join(pluginsDir, PLUGIN_ID);
+
+    // Check if already installed and up-to-date
+    const targetPluginJson = path.join(pluginTargetDir, 'openclaw.plugin.json');
+    if (fs.existsSync(targetPluginJson)) {
+      try {
+        const existing = JSON.parse(fs.readFileSync(targetPluginJson, 'utf8'));
+        if (existing.version === version) {
+          console.log(`[AICQ] Plugin already installed at ${pluginTargetDir} (v${version})`);
+          pluginInstalled = true;
+        }
+      } catch (e) {}
+    }
+
+    if (!pluginInstalled) {
+      console.log(`[AICQ] Found OpenClaw at: ${openclawDir}`);
+      console.log(`[AICQ] Installing plugin to ${pluginTargetDir}...`);
+
+      if (!fs.existsSync(pluginsDir)) {
+        fs.mkdirSync(pluginsDir, { recursive: true });
+      }
+
+      installToDir(sourceDir, pluginTargetDir, version);
+
+      // Install npm dependencies in target
+      console.log('[AICQ] Installing plugin dependencies...');
+      try {
+        execSync('npm install --omit=dev', {
+          cwd: pluginTargetDir,
+          stdio: 'pipe',
+          timeout: 120000,
+        });
+        console.log('[AICQ] Plugin dependencies installed.');
+      } catch (e) {
+        console.log('[AICQ] Warning: npm install failed. You may need to run manually:');
+        console.log(`  cd ${pluginTargetDir} && npm install`);
+      }
+
+      console.log(`[AICQ] Plugin installed to: ${pluginTargetDir}`);
+      pluginInstalled = true;
+    }
+  }
+
+  // ── Summary ────────────────────────────────────────────────────
+  if (!skillsInstalled && !pluginInstalled) {
+    console.log('[AICQ] OpenClaw not found, skipping auto-install.');
+    console.log('[AICQ] If you have OpenClaw installed, set OPENCLAW_HOME or OPENCLAW_WORKSPACE environment variable.');
+    console.log('[AICQ]   OPENCLAW_HOME=<openclaw-root-dir>       (for plugins/ directory)');
+    console.log('[AICQ]   OPENCLAW_WORKSPACE=<workspace-dir>      (for skills/ directory)');
+    return false;
+  }
+
+  console.log('[AICQ] Restart OpenClaw to activate the plugin.');
+  return true;
+}
+
+// ── Help ────────────────────────────────────────────────────────────
 if (command === '--help' || command === '-h') {
   console.log(`
 AICQ Chat Plugin — End-to-End Encrypted Chat for OpenClaw
 
 Usage:
+  npx aicq-chat-plugin              Start plugin + auto-install to OpenClaw
   aicq-plugin [command] [options]
 
 Commands:
-  start     Start the plugin server (default)
+  start     Install to OpenClaw (if needed) and start plugin server (default)
+  install   Install plugin to OpenClaw only (don't start server)
   status    Check if the plugin is running
 
 Options:
@@ -50,15 +357,20 @@ Environment Variables:
   AICQ_PORT               Plugin server port
   AICQ_SERVER_URL         AICQ server URL
   AICQ_DATA_DIR           Data directory (default: ~/.aicq-plugin)
+  OPENCLAW_HOME           OpenClaw installation directory (for plugins/)
+  OPENCLAW_WORKSPACE      OpenClaw workspace directory (for skills/)
 
 Examples:
-  aicq-plugin                        # Start on default port
-  aicq-plugin --port 8080            # Start on port 8080
-  aicq-plugin -s http://localhost    # Connect to local server
+  npx aicq-chat-plugin              # Install + start
+  aicq-plugin                       # Start on default port
+  aicq-plugin install               # Install to OpenClaw only
+  aicq-plugin --port 8080           # Start on port 8080
+  aicq-plugin -s http://localhost   # Connect to local server
 `);
   process.exit(0);
 }
 
+// ── Status ──────────────────────────────────────────────────────────
 if (command === 'status') {
   const http = require('http');
   const req = http.get(`http://localhost:${port}/api/status`, (res) => {
@@ -80,7 +392,7 @@ if (command === 'status') {
   });
   req.on('error', () => {
     console.log(`AICQ Plugin is not running on port ${port}.`);
-    console.log(`Start it with: aicq-plugin --port ${port}`);
+    console.log(`Start it with: npx aicq-chat-plugin`);
   });
   req.setTimeout(3000, () => {
     req.destroy();
@@ -89,7 +401,15 @@ if (command === 'status') {
   process.exit(0);
 }
 
-// Start the plugin server
+// ── Install only ────────────────────────────────────────────────────
+if (command === 'install') {
+  installToOpenClaw();
+  process.exit(0);
+}
+
+// ── Start (default) — auto-install then run ─────────────────────────
+installToOpenClaw();
+
 console.log(`[AICQ] Starting plugin on port ${port}`);
 console.log(`[AICQ] Server: ${serverUrl}`);
 

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "aicq-chat",
   "name": "AICQ Encrypted Chat",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "End-to-end encrypted chat plugin for OpenClaw agents — Node.js implementation with full UI",
   "entry": "index.js",
   "activation": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicq-chat-plugin",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "AICQ End-to-end Encrypted Chat Plugin for OpenClaw — Full UI with friend management, group chat, file transfer, and AI agent communication",
   "main": "index.js",
   "bin": {
@@ -13,6 +13,7 @@
     "lib/",
     "public/",
     "openclaw.plugin.json",
+    "SKILL.md",
     "README.md"
   ],
   "scripts": {

package/postinstall.js

@@ -2,9 +2,9 @@
 /**
  * AICQ Chat Plugin — Post-install script
  *
- * Automatically installs the plugin into OpenClaw's plugins directory.
- * OpenClaw requires plugins to be in ~/.openclaw/plugins/<plugin-id>/
- * with an openclaw.plugin.json file to recognize them.
+ * Automatically installs the plugin into OpenClaw's skills/ and plugins/ directories.
+ * OpenClaw discovers skills by scanning skills/ directories for SKILL.md marker files.
+ * OpenClaw reads openclaw.plugin.json from plugins/ to launch sidecar processes.
  */
 
 const fs = require('fs');
@@ -15,6 +15,65 @@ const { execSync } = require('child_process');
 const PLUGIN_ID = 'aicq-chat';
 const PLUGIN_DIR = path.resolve(__dirname);
 
+// ── SKILL.md template ─────────────────────────────────────────────
+const SKILL_MD_TEMPLATE = `---
+name: aicq-chat
+description: AICQ End-to-end Encrypted Chat Plugin for OpenClaw — Full UI with friend management, group chat, file transfer, and AI agent communication
+license: MIT
+metadata:
+  author: AICQ
+  version: "{VERSION}"
+---
+
+# AICQ Encrypted Chat
+
+AICQ 是一个端到端加密聊天插件，适用于 OpenClaw 的完整聊天 UI。支持好友管理、群组聊天、文件传输和 AI Agent 通信。
+
+## 功能特性
+
+- **端到端加密 (E2EE)** — 基于 NaCl (libsodium) 的加密体系，消息仅通信双方可读
+- **Agent 管理** — 支持多 Agent 切换、创建和删除
+- **好友管理** — 好友码添加、QR 码扫描、好友列表同步
+- **群组聊天** — 创建群组、邀请成员、静默模式
+- **消息功能** — Markdown/LaTeX 渲染、图片/文件上传、@提及
+- **密钥管理** — 公钥/私钥显示、密钥轮换、指纹验证
+- **P2P 通信** — 握手、文本传输、文件传输
+
+## 一键启动
+
+\`\`\`bash
+npx aicq-chat-plugin
+\`\`\`
+
+## OpenClaw 集成
+
+插件会自动注册为 OpenClaw sidecar，提供以下工具和网关：
+
+### 工具
+- \`chat-friend\` — 好友管理
+- \`chat-send\` — 发送消息
+- \`chat-export-key\` — 导出密钥
+
+### 网关方法
+- \`aicq.status\` — 插件状态
+- \`aicq.friends.list/add/remove\` — 好友操作
+- \`aicq.chat.send/history/delete\` — 聊天操作
+- \`aicq.groups.list/create/join\` — 群组操作
+- \`aicq.identity.info\` — 身份信息
+
+## 配置
+
+| 变量 | 默认值 | 说明 |
+|------|--------|------|
+| \`AICQ_PORT\` | 6109 | 插件服务端口 |
+| \`AICQ_SERVER_URL\` | http://aicq.online:61018 | AICQ 服务器地址 |
+| \`AICQ_DATA_DIR\` | ~/.aicq-plugin | 数据存储目录 |
+
+## Chat UI
+
+启动后访问 http://localhost:6109 即可使用完整的聊天界面。
+`;
+
 // ── Find OpenClaw installation ──────────────────────────────────────
 function findOpenClawDir() {
   const candidates = [
@@ -23,7 +82,6 @@ function findOpenClawDir() {
     path.join(os.homedir(), '.config', 'openclaw'),
   ];
 
-  // Check environment variable
   if (process.env.OPENCLAW_HOME) {
     candidates.unshift(process.env.OPENCLAW_HOME);
   }
@@ -36,17 +94,60 @@ function findOpenClawDir() {
   return null;
 }
 
-// ── Copy plugin files to OpenClaw plugins directory ─────────────────
-function installToOpenClaw(openclawDir) {
-  const pluginsDir = path.join(openclawDir, 'plugins');
-  const targetDir = path.join(pluginsDir, PLUGIN_ID);
+// ── Find OpenClaw workspace (for skills/ directory) ────────────────
+function findOpenClawWorkspace() {
+  if (process.env.OPENCLAW_WORKSPACE) {
+    return process.env.OPENCLAW_WORKSPACE;
+  }
 
-  // Create plugins directory if needed
-  if (!fs.existsSync(pluginsDir)) {
-    fs.mkdirSync(pluginsDir, { recursive: true });
+  const home = os.homedir();
+  const candidates = [
+    process.cwd(),
+    path.join(home, 'my-project'),
+    path.join(home, 'openclaw'),
+    path.join(home, '.openclaw'),
+  ];
+
+  for (const dir of candidates) {
+    const skillsDir = path.join(dir, 'skills');
+    if (fs.existsSync(skillsDir)) {
+      return dir;
+    }
+  }
+
+  // Check parent directories
+  let current = process.cwd();
+  for (let i = 0; i < 3; i++) {
+    const skillsDir = path.join(current, 'skills');
+    if (fs.existsSync(skillsDir)) {
+      return current;
+    }
+    current = path.dirname(current);
+  }
+
+  return null;
+}
+
+// ── Recursively copy a directory ────────────────────────────────────
+function copyDirRecursive(src, dest) {
+  fs.mkdirSync(dest, { recursive: true });
+  const entries = fs.readdirSync(src, { withFileTypes: true });
+
+  for (const entry of entries) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+
+    if (entry.isDirectory()) {
+      if (entry.name === 'node_modules') continue;
+      copyDirRecursive(srcPath, destPath);
+    } else {
+      fs.copyFileSync(srcPath, destPath);
+    }
   }
+}
 
-  // Files to copy (from package.json "files" field)
+// ── Install plugin files to a target directory ─────────────────────
+function installToDir(sourceDir, targetDir, version) {
   const filesToCopy = [
     'index.js',
     'cli.js',
@@ -61,18 +162,14 @@ function installToOpenClaw(openclawDir) {
     'public',
   ];
 
-  // Remove old installation if exists
-  if (fs.existsSync(targetDir)) {
-    console.log(`[AICQ] Updating existing plugin at ${targetDir}`);
-    // Don't remove the entire dir — preserve node_modules and data
-  } else {
-    console.log(`[AICQ] Installing plugin to ${targetDir}`);
+  // Create target directory if needed
+  if (!fs.existsSync(targetDir)) {
     fs.mkdirSync(targetDir, { recursive: true });
   }
 
   // Copy individual files
   for (const file of filesToCopy) {
-    const src = path.join(PLUGIN_DIR, file);
+    const src = path.join(sourceDir, file);
     const dest = path.join(targetDir, file);
     if (fs.existsSync(src)) {
       fs.copyFileSync(src, dest);
@@ -81,10 +178,9 @@ function installToOpenClaw(openclawDir) {
 
   // Copy directories
   for (const dir of dirsToCopy) {
-    const src = path.join(PLUGIN_DIR, dir);
+    const src = path.join(sourceDir, dir);
     const dest = path.join(targetDir, dir);
     if (fs.existsSync(src)) {
-      // Remove old and copy fresh
       if (fs.existsSync(dest)) {
         fs.rmSync(dest, { recursive: true, force: true });
       }
@@ -92,15 +188,33 @@ function installToOpenClaw(openclawDir) {
     }
   }
 
-  // Install npm dependencies in the target directory
-  console.log('[AICQ] Installing plugin dependencies...');
+  // Generate SKILL.md with current version
+  const skillMd = SKILL_MD_TEMPLATE.replace('{VERSION}', version);
+  fs.writeFileSync(path.join(targetDir, 'SKILL.md'), skillMd, 'utf8');
+}
+
+// ── Install to skills/ directory ────────────────────────────────────
+function installToSkillsDir(workspace, version) {
+  const skillsDir = path.join(workspace, 'skills');
+  const targetDir = path.join(skillsDir, PLUGIN_ID);
+
+  if (!fs.existsSync(skillsDir)) {
+    fs.mkdirSync(skillsDir, { recursive: true });
+  }
+
+  console.log(`[AICQ] Installing skill to ${targetDir}`);
+
+  installToDir(PLUGIN_DIR, targetDir, version);
+
+  // Install npm dependencies
+  console.log('[AICQ] Installing skill dependencies...');
   try {
-    execSync('npm install --production', {
+    execSync('npm install --omit=dev', {
       cwd: targetDir,
       stdio: 'pipe',
       timeout: 120000,
     });
-    console.log('[AICQ] Dependencies installed.');
+    console.log('[AICQ] Skill dependencies installed.');
   } catch (e) {
     console.log('[AICQ] Warning: npm install failed. You may need to run it manually:');
     console.log(`  cd ${targetDir} && npm install`);
@@ -109,23 +223,34 @@ function installToOpenClaw(openclawDir) {
   return targetDir;
 }
 
-// ── Recursively copy a directory ────────────────────────────────────
-function copyDirRecursive(src, dest) {
-  fs.mkdirSync(dest, { recursive: true });
-  const entries = fs.readdirSync(src, { withFileTypes: true });
+// ── Install to plugins/ directory ───────────────────────────────────
+function installToPluginsDir(openclawDir, version) {
+  const pluginsDir = path.join(openclawDir, 'plugins');
+  const targetDir = path.join(pluginsDir, PLUGIN_ID);
 
-  for (const entry of entries) {
-    const srcPath = path.join(src, entry.name);
-    const destPath = path.join(dest, entry.name);
+  if (!fs.existsSync(pluginsDir)) {
+    fs.mkdirSync(pluginsDir, { recursive: true });
+  }
 
-    if (entry.isDirectory()) {
-      // Skip node_modules — will be installed fresh
-      if (entry.name === 'node_modules') continue;
-      copyDirRecursive(srcPath, destPath);
-    } else {
-      fs.copyFileSync(srcPath, destPath);
-    }
+  console.log(`[AICQ] Installing plugin to ${targetDir}`);
+
+  installToDir(PLUGIN_DIR, targetDir, version);
+
+  // Install npm dependencies
+  console.log('[AICQ] Installing plugin dependencies...');
+  try {
+    execSync('npm install --omit=dev', {
+      cwd: targetDir,
+      stdio: 'pipe',
+      timeout: 120000,
+    });
+    console.log('[AICQ] Plugin dependencies installed.');
+  } catch (e) {
+    console.log('[AICQ] Warning: npm install failed. You may need to run it manually:');
+    console.log(`  cd ${targetDir} && npm install`);
   }
+
+  return targetDir;
 }
 
 // ── Main ────────────────────────────────────────────────────────────
@@ -135,54 +260,77 @@ console.log('  ║       AICQ Chat Plugin — Installing...       ║');
 console.log('  ╚══════════════════════════════════════════════╝');
 console.log('');
 
-// Try to auto-install into OpenClaw
-const openclawDir = findOpenClawDir();
+// Read version from package.json
+let version = '2.5.2';
+try {
+  const pkg = JSON.parse(fs.readFileSync(path.join(PLUGIN_DIR, 'package.json'), 'utf8'));
+  version = pkg.version;
+} catch (e) {}
+
+let skillInstalled = false;
+let pluginInstalled = false;
 
+// Step 1: Install to skills/ directory (for dashboard discovery)
+const workspace = findOpenClawWorkspace();
+if (workspace) {
+  console.log(`[AICQ] Found workspace at: ${workspace}`);
+  try {
+    const skillDir = installToSkillsDir(workspace, version);
+    console.log(`[AICQ] Skill installed to: ${skillDir}`);
+    skillInstalled = true;
+  } catch (e) {
+    console.error('[AICQ] Skill install failed:', e.message);
+  }
+}
+
+// Step 2: Install to plugins/ directory (for sidecar startup)
+const openclawDir = findOpenClawDir();
 if (openclawDir) {
   console.log(`[AICQ] Found OpenClaw at: ${openclawDir}`);
   try {
-    const installedDir = installToOpenClaw(openclawDir);
-    console.log('');
-    console.log('  ╔══════════════════════════════════════════════╗');
-    console.log('  ║     AICQ Plugin Installed Successfully!      ║');
-    console.log('  ╠══════════════════════════════════════════════╣');
-    console.log('  ║                                              ║');
-    console.log('  ║   Plugin installed to:                       ║');
-    console.log(`  ║     ${installedDir}`);
-    console.log('  ║                                              ║');
-    console.log('  ║   Restart OpenClaw to activate the plugin.   ║');
-    console.log('  ║                                              ║');
-    console.log('  ║   Chat UI: http://localhost:6109             ║');
-    console.log('  ║   Docs: https://aicq.online                  ║');
-    console.log('  ╚══════════════════════════════════════════════╝');
-    console.log('');
+    const pluginDir = installToPluginsDir(openclawDir, version);
+    console.log(`[AICQ] Plugin installed to: ${pluginDir}`);
+    pluginInstalled = true;
   } catch (e) {
-    console.error('[AICQ] Auto-install failed:', e.message);
-    console.log('');
-    printManualInstructions();
+    console.error('[AICQ] Plugin install failed:', e.message);
   }
-} else {
-  console.log('[AICQ] OpenClaw not found — skipping auto-install.');
-  console.log('');
-  printManualInstructions();
 }
 
-function printManualInstructions() {
+// Summary
+console.log('');
+if (skillInstalled || pluginInstalled) {
+  console.log('  ╔══════════════════════════════════════════════╗');
+  console.log('  ║     AICQ Plugin Installed Successfully!      ║');
+  console.log('  ╠══════════════════════════════════════════════╣');
+  console.log('  ║                                              ║');
+  if (skillInstalled) {
+    console.log('  ║   ✅ Skill installed (dashboard visible)     ║');
+  }
+  if (pluginInstalled) {
+    console.log('  ║   ✅ Plugin installed (sidecar ready)        ║');
+  }
+  console.log('  ║                                              ║');
+  console.log('  ║   Restart OpenClaw to activate the plugin.   ║');
+  console.log('  ║                                              ║');
+  console.log('  ║   Chat UI: http://localhost:6109             ║');
+  console.log('  ║   Docs: https://aicq.online                  ║');
+  console.log('  ╚══════════════════════════════════════════════╝');
+} else {
   console.log('  ╔══════════════════════════════════════════════╗');
   console.log('  ║       AICQ Chat Plugin Installed!            ║');
   console.log('  ╠══════════════════════════════════════════════╣');
   console.log('  ║                                              ║');
-  console.log('  ║   Manual install to OpenClaw:                ║');
-  console.log('  ║     mkdir -p ~/.openclaw/plugins/aicq-chat   ║');
-  console.log('  ║     cp -r ' + PLUGIN_DIR + '/* ~/.openclaw/plugins/aicq-chat/ ║');
-  console.log('  ║     cd ~/.openclaw/plugins/aicq-chat         ║');
-  console.log('  ║     npm install                              ║');
+  console.log('  ║   OpenClaw not found — auto-install skipped  ║');
+  console.log('  ║                                              ║');
+  console.log('  ║   Set environment variables:                 ║');
+  console.log('  ║     OPENCLAW_HOME=<openclaw-root>            ║');
+  console.log('  ║     OPENCLAW_WORKSPACE=<workspace-dir>       ║');
   console.log('  ║                                              ║');
   console.log('  ║   Or start standalone:                       ║');
-  console.log('  ║     npx aicq-plugin                          ║');
+  console.log('  ║     npx aicq-chat-plugin                     ║');
   console.log('  ║                                              ║');
   console.log('  ║   Chat UI: http://localhost:6109             ║');
   console.log('  ║   Docs: https://aicq.online                  ║');
   console.log('  ╚══════════════════════════════════════════════╝');
-  console.log('');
 }
+console.log('');