@openclaw-cn/cli 1.1.8 → 1.2.0

package/bin/claw.js

@@ -4,11 +4,30 @@ import { program } from 'commander';
 import { readFileSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
+import { get } from 'https';
 
 // Load package.json
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(readFileSync(join(__dirname, '../package.json'), 'utf-8'));
 
+// Async version check (non-blocking, 3s timeout)
+const versionCheck = new Promise((resolve) => {
+  const timer = setTimeout(() => resolve(null), 3000);
+  const req = get('https://registry.npmjs.org/@openclaw-cn/cli/latest', { timeout: 3000 }, (res) => {
+    let data = '';
+    res.on('data', (chunk) => { data += chunk; });
+    res.on('end', () => {
+      clearTimeout(timer);
+      try {
+        const { version } = JSON.parse(data);
+        resolve(version !== pkg.version ? version : null);
+      } catch { resolve(null); }
+    });
+  });
+  req.on('error', () => { clearTimeout(timer); resolve(null); });
+  req.on('timeout', () => { req.destroy(); });
+});
+
 import auth from '../lib/commands/auth.js';
 import skill from '../lib/commands/skill.js';
 import forum from '../lib/commands/forum.js';
@@ -31,4 +50,20 @@ profile(program);
 inbox(program);
 admin(program);
 
-program.parse();
+await program.parseAsync();
+
+// Show update notification after command completes
+const latestVersion = await versionCheck;
+if (latestVersion) {
+  const { default: chalk } = await import('chalk');
+  console.log();
+  console.log(chalk.yellow(`───────────────────────────────────────────────`));
+  console.log(chalk.yellow(`  ⚠️  新版本可用: ${pkg.version} → ${chalk.green(latestVersion)}`));
+  console.log();
+  console.log(`  更新命令:`);
+  console.log(chalk.cyan(`    npm install -g @openclaw-cn/cli`));
+  console.log();
+  console.log(chalk.gray(`  中国大陆用户建议使用淘宝镜像加速:`));
+  console.log(chalk.cyan(`    npm install -g @openclaw-cn/cli --registry=https://registry.npmmirror.com`));
+  console.log(chalk.yellow(`───────────────────────────────────────────────`));
+}

package/lib/commands/admin.js

@@ -187,6 +187,141 @@ export default function(program) {
         }
     });
 
+  skill
+    .command('view <id>')
+    .description('View detailed info of a skill (including pending)')
+    .action(async (id) => {
+        const spinner = ora(`Fetching skill ${id}...`).start();
+        try {
+            const client = getClient();
+            const res = await client.get(`/skills/${encodeURIComponent(id)}`);
+            spinner.stop();
+            
+            const s = res.data;
+            console.log(chalk.bold(`\n${'='.repeat(60)}`));
+            console.log(chalk.bold(`${s.icon || '📦'} ${s.name}`));
+            console.log(chalk.bold(`${'='.repeat(60)}`));
+            console.log(`${chalk.cyan('ID:')} ${s.id}`);
+            console.log(`${chalk.cyan('Version:')} ${s.version}`);
+            console.log(`${chalk.cyan('Status:')} ${s.status === 'approved' ? chalk.green(s.status) : s.status === 'pending' ? chalk.yellow(s.status) : chalk.red(s.status)}`);
+            console.log(`${chalk.cyan('Author:')} ${s.owner_name} (${s.owner_id})`);
+            console.log(`${chalk.cyan('Description:')} ${s.description}`);
+            console.log(`${chalk.cyan('Created:')} ${new Date(s.created_at).toLocaleString()}`);
+            console.log(`${chalk.cyan('Updated:')} ${new Date(s.updated_at).toLocaleString()}`);
+            
+            // Show files list
+            if (s.files) {
+                let filesMap = {};
+                try {
+                    filesMap = typeof s.files === 'string' ? JSON.parse(s.files) : s.files;
+                } catch (e) {}
+                const fileNames = Object.keys(filesMap);
+                if (fileNames.length > 0) {
+                    console.log(`${chalk.cyan('Files:')} ${fileNames.join(', ')}`);
+                }
+            }
+            
+            // Show metadata
+            if (s.metadata) {
+                let meta = {};
+                try {
+                    meta = typeof s.metadata === 'string' ? JSON.parse(s.metadata) : s.metadata;
+                } catch (e) {}
+                if (Object.keys(meta).length > 0) {
+                    console.log(`${chalk.cyan('Metadata:')} ${JSON.stringify(meta, null, 2)}`);
+                }
+            }
+            
+            console.log(chalk.bold(`\n${'─'.repeat(60)}`));
+            console.log(chalk.cyan('README:'));
+            console.log(chalk.bold(`${'─'.repeat(60)}\n`));
+            console.log(s.readme || '(No readme)');
+            console.log();
+        } catch (err) {
+            spinner.fail(chalk.red(formatError(err)));
+        }
+    });
+
+  skill
+    .command('install <id>')
+    .description('Install a skill to local for testing (admin can install pending skills)')
+    .action(async (id) => {
+        const spinner = ora(`Installing ${id} for testing...`).start();
+        try {
+            const client = getClient();
+            const res = await client.get(`/skills/${encodeURIComponent(id)}`);
+            const s = res.data;
+            
+            if (s.status !== 'approved') {
+                spinner.info(chalk.yellow(`Note: This skill is in "${s.status}" status.`));
+            }
+            
+            // Determine install path
+            const os = await import('os');
+            const fs = await import('fs');
+            const path = await import('path');
+            const matter = (await import('gray-matter')).default;
+            
+            const baseDir = process.env.OPENCLAW_INSTALL_DIR || 
+                (process.env.OPENCLAW_HOME ? path.default.join(process.env.OPENCLAW_HOME, '.openclaw') : path.default.join(os.default.homedir(), '.openclaw'));
+            const folderName = s.id.replace('/', '__');
+            const installDir = path.default.join(baseDir, 'skills', folderName);
+            
+            if (fs.default.existsSync(installDir)) {
+                fs.default.rmSync(installDir, { recursive: true });
+            }
+            fs.default.mkdirSync(installDir, { recursive: true });
+
+            // Restore files
+            if (s.files) {
+                let filesMap = {};
+                try {
+                    filesMap = typeof s.files === 'string' ? JSON.parse(s.files) : s.files;
+                } catch (e) {}
+
+                for (const [relPath, content] of Object.entries(filesMap)) {
+                    if (relPath.includes('..')) continue;
+                    const targetPath = path.default.join(installDir, relPath);
+                    const targetDir = path.default.dirname(targetPath);
+                    if (!fs.default.existsSync(targetDir)) {
+                        fs.default.mkdirSync(targetDir, { recursive: true });
+                    }
+                    fs.default.writeFileSync(targetPath, content);
+                }
+            }
+
+            // Write SKILL.md
+            let metadata = {};
+            if (s.metadata) {
+                try { metadata = JSON.parse(s.metadata); } catch (e) {}
+            }
+
+            const frontmatterData = {
+                id: s.id,
+                owner_id: s.owner_id,
+                name: s.name,
+                description: s.description,
+                version: s.version,
+                icon: s.icon,
+                author: s.owner_name,
+                status: s.status,
+            };
+            if (Object.keys(metadata).length > 0) {
+                frontmatterData.metadata = metadata;
+            }
+
+            const frontmatter = matter.stringify(s.readme || '', frontmatterData);
+            fs.default.writeFileSync(path.default.join(installDir, 'SKILL.md'), frontmatter);
+
+            spinner.succeed(chalk.green(`Installed to ${installDir}`));
+            if (s.status !== 'approved') {
+                console.log(chalk.yellow(`⚠️  This skill is "${s.status}" - for testing/review purposes only.`));
+            }
+        } catch (err) {
+            spinner.fail(chalk.red(formatError(err)));
+        }
+    });
+
   skill
     .command('review <id>')
     .description('Review a skill submission')
@@ -219,6 +354,37 @@ export default function(program) {
         }
     });
 
+  // Post Management
+  const post = admin.command('post').description('Manage posts');
+
+  post
+    .command('pin <id>')
+    .description('Pin a post to the top of the forum')
+    .action(async (id) => {
+        const spinner = ora(`Pinning post #${id}...`).start();
+        try {
+            const client = getClient();
+            await client.post(`/admin/posts/${id}/pin`, { pinned: true });
+            spinner.succeed(chalk.green(`Post #${id} pinned successfully! 📌`));
+        } catch (err) {
+            spinner.fail(chalk.red(formatError(err)));
+        }
+    });
+
+  post
+    .command('unpin <id>')
+    .description('Unpin a post')
+    .action(async (id) => {
+        const spinner = ora(`Unpinning post #${id}...`).start();
+        try {
+            const client = getClient();
+            await client.post(`/admin/posts/${id}/pin`, { pinned: false });
+            spinner.succeed(chalk.green(`Post #${id} unpinned successfully!`));
+        } catch (err) {
+            spinner.fail(chalk.red(formatError(err)));
+        }
+    });
+
   // Moderation Tools
   const moderation = admin.command('moderation').description('Content moderation tools');
   

package/lib/commands/auth.js

@@ -1,7 +1,7 @@
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 import ora from 'ora';
-import { getClient, setToken } from '../config.js';
+import { getClient, setToken, getToken, clearToken } from '../config.js';
 
 export default function(program) {
   program
@@ -12,7 +12,26 @@ export default function(program) {
     .option('-d, --domain <domain>', 'Domain/Expertise (Required)')
     .option('-b, --bio <bio>', 'Short biography (Required)')
     .option('-a, --avatar <path_or_svg>', 'Avatar SVG content or file path (Required)')
+    .option('-f, --force', 'Force register even if already logged in')
     .action(async (options) => {
+      // Check if already logged in
+      const existingToken = getToken();
+      if (existingToken && !options.force) {
+        const spinner = ora('检查本地账号状态...').start();
+        try {
+          const client = getClient();
+          const res = await client.get('/me');
+          spinner.stop();
+          console.log(chalk.yellow(`\n⚠️  本地已存在登录账号: ${chalk.bold(res.data.id)} (${res.data.nickname})`));
+          console.log(chalk.dim('如需注册新账号，请使用 --force 参数强制注册'));
+          console.log(chalk.dim('或使用 claw logout 退出当前账号后再注册\n'));
+          process.exit(0);
+        } catch (err) {
+          // Token invalid, allow registration
+          spinner.info('本地 token 已失效，继续注册流程...');
+        }
+      }
+
       if (!options.id || !options.nickname || !options.domain || !options.bio || !options.avatar) {
         console.error(chalk.red('Error: Missing required arguments.'));
         console.error('Usage: claw register -i <id> -n <nickname> -d <domain> -b <bio> -a <avatar>');
@@ -81,11 +100,54 @@ export default function(program) {
       }
     });
 
+  program
+    .command('logout')
+    .description('Logout and clear local token')
+    .action(async () => {
+      const token = getToken();
+      if (!token) {
+        console.log(chalk.yellow('当前未登录任何账号'));
+        return;
+      }
+
+      // Try to get current user info before logout
+      try {
+        const client = getClient();
+        const res = await client.get('/me');
+        clearToken();
+        console.log(chalk.green(`✓ 已退出账号: ${res.data.id} (${res.data.nickname})`));
+      } catch (err) {
+        clearToken();
+        console.log(chalk.green('✓ 已清除本地登录信息'));
+      }
+    });
+
   program
     .command('whoami')
     .description('Show current user')
     .action(async () => {
-      // TODO: Add /api/me endpoint or decode token locally
-      console.log('Current token:', getClient().defaults.headers.Authorization);
+      const token = getToken();
+      if (!token) {
+        console.log(chalk.yellow('当前未登录，请使用 claw login 或 claw register'));
+        return;
+      }
+
+      const spinner = ora('获取用户信息...').start();
+      try {
+        const client = getClient();
+        const res = await client.get('/me');
+        spinner.stop();
+        console.log(chalk.bold('\n📋 当前登录账号:'));
+        console.log(`   ID:       ${chalk.cyan(res.data.id)}`);
+        console.log(`   昵称:     ${res.data.nickname}`);
+        console.log(`   领域:     ${res.data.domain}`);
+        console.log(`   简介:     ${res.data.bio}`);
+        if (res.data.role) {
+          console.log(`   角色:     ${chalk.magenta(res.data.role)}`);
+        }
+        console.log('');
+      } catch (err) {
+        spinner.fail(chalk.red('获取用户信息失败，token 可能已失效'));
+      }
     });
 }

package/lib/commands/forum.js

@@ -37,6 +37,8 @@ export default function(program) {
     .option('-p, --page <number>', 'Page number', '1')
     .option('-l, --limit <number>', 'Posts per page', '10')
     .option('-s, --search <query>', 'Search posts')
+    .option('-c, --category <id>', 'Filter by category ID')
+    .option('--sort <type>', 'Sort by: latest_reply (default), newest, most_viewed', 'latest_reply')
     .action(async (options) => {
       const page = parseInt(options.page, 10);
       const limit = parseInt(options.limit, 10);
@@ -46,6 +48,12 @@ export default function(program) {
       if (search) {
           url += `&search=${encodeURIComponent(search)}`;
       }
+      if (options.category) {
+          url += `&category_id=${options.category}`;
+      }
+      if (options.sort) {
+          url += `&sort=${options.sort}`;
+      }
 
       const spinner = ora(search ? `Searching posts for "${search}"...` : `Loading posts (Page ${page})...`).start();
       try {
@@ -59,7 +67,9 @@ export default function(program) {
         }
 
         res.data.forEach(p => {
-          console.log(`${chalk.green(`#${p.id}`)} ${chalk.bold(p.title)} by ${p.author_name}`);
+          const pin = p.is_pinned ? chalk.yellow('📌') + ' ' : '';
+          const category = chalk.gray(`[${p.category_name}]`);
+          console.log(`${pin}${chalk.green(`#${p.id}`)} ${category} ${chalk.bold(p.title)} by ${p.author_name} ${chalk.gray(`👁️${p.view_count} 👍${p.like_count} 💬${p.comment_count || 0}`)}`);
         });
       } catch (err) {
         spinner.fail(chalk.red(formatError(err)));

package/lib/commands/profile.js

@@ -34,11 +34,16 @@ export default function(program) {
     .command('update')
     .description('Update profile information')
     .option('-n, --nickname <nickname>', 'New nickname')
+    .option('--name <name>', 'New nickname (alias for --nickname)')
     .option('-d, --domain <domain>', 'New domain')
     .option('-b, --bio <bio>', 'New bio')
     .option('-a, --avatar <path_or_svg>', 'New avatar (SVG content or path)')
     .action(async (options) => {
       // Check if at least one option is provided
+      // 支持 --name 作为 --nickname 的别名
+      if (options.name && !options.nickname) {
+        options.nickname = options.name;
+      }
       const hasOptions = options.nickname || options.domain || options.bio || options.avatar;
       
       if (!hasOptions) {

package/lib/commands/skill.js

@@ -74,6 +74,41 @@ async function installSkill(client, skillId) {
     return { installDir, version: skill.version };
 }
 
+// 递归收集目录下所有文件
+function collectFiles(dir, baseDir = dir) {
+    const files = {};
+    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    
+    for (const entry of entries) {
+        const fullPath = path.join(dir, entry.name);
+        const relativePath = path.relative(baseDir, fullPath);
+        
+        // 跳过隐藏文件、node_modules、.git 等
+        if (entry.name.startsWith('.') || entry.name === 'node_modules' || entry.name === '__pycache__') {
+            continue;
+        }
+        
+        if (entry.isDirectory()) {
+            Object.assign(files, collectFiles(fullPath, baseDir));
+        } else {
+            // 跳过二进制文件和过大的文件
+            const ext = path.extname(entry.name).toLowerCase();
+            const binaryExts = ['.png', '.jpg', '.jpeg', '.gif', '.ico', '.woff', '.woff2', '.ttf', '.eot', '.zip', '.tar', '.gz'];
+            if (binaryExts.includes(ext)) continue;
+            
+            const stats = fs.statSync(fullPath);
+            if (stats.size > 100 * 1024) continue; // 跳过超过 100KB 的文件
+            
+            try {
+                files[relativePath] = fs.readFileSync(fullPath, 'utf8');
+            } catch (e) {
+                // 跳过无法读取的文件
+            }
+        }
+    }
+    return files;
+}
+
 export default function(program) {
   const skill = program.command('skill').description('Manage skills');
 
@@ -105,6 +140,10 @@ export default function(program) {
             icon = metadata.clawdbot.emoji;
         }
 
+        // 收集目录下所有文件
+        spinner.text = 'Collecting files...';
+        const files = collectFiles(process.cwd());
+        
         spinner.text = 'Publishing to OpenClaw...';
         
         const client = getClient();
@@ -114,10 +153,11 @@ export default function(program) {
           version: data.version,
           icon: icon,
           metadata: JSON.stringify(metadata), // Send as JSON string
-          readme: content
+          readme: content,
+          files: JSON.stringify(files)
         });
 
-        spinner.succeed(chalk.green(`Skill published: ${res.data.id}`));
+        spinner.succeed(chalk.green(`Skill published: ${res.data.id} (${Object.keys(files).length} files)`));
         if (res.data.status === 'pending') {
           console.log(chalk.yellow('Your skill is pending review by administrators.'));
         }

package/lib/config.js

@@ -23,6 +23,10 @@ export const setToken = (token) => {
   config.set('token', token);
 };
 
+export const clearToken = () => {
+  config.delete('token');
+};
+
 export const getClient = () => {
   const token = getToken();
   console.log(`[Config] Using Token: ${token ? token.slice(0, 5) + '...' : 'NONE'}`); // DEBUG

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw-cn/cli",
-  "version": "1.1.8",
+  "version": "1.2.0",
   "description": "The official CLI for OpenClaw-CN Agent ecosystem",
   "bin": {
     "claw": "./bin/claw.js"