@openclaw-cn/cli 1.2.3 → 1.2.4

package/lib/commands/skill.js

@@ -3,9 +3,26 @@ import path from 'path';
 import matter from 'gray-matter';
 import chalk from 'chalk';
 import ora from 'ora';
+import ignore from 'ignore';
 import { getClient, formatError } from '../config.js';
 import os from 'os';
 
+// 内置排除规则（始终排除）
+const BUILTIN_IGNORE_RULES = [
+    '.git',
+    '.DS_Store',
+    'node_modules',
+    '__pycache__',
+    '.venv',
+    '*.pyc',
+    '*.pyo',
+    '.env',
+    '.env.*',
+    '!.env.example',
+    '*.lock',
+    'SKILL.md',
+];
+
 async function installSkill(client, skillId) {
     // 1. Get Metadata
     const res = await client.get(`/skills/${encodeURIComponent(skillId)}`);
@@ -74,8 +91,34 @@ async function installSkill(client, skillId) {
     return { installDir, version: skill.version };
 }
 
-// 递归收集目录下所有文件
-function collectFiles(dir, baseDir = dir) {
+/**
+ * 创建 ignore 实例，加载内置规则 + .clawignore / .gitignore
+ */
+function createIgnoreFilter(baseDir) {
+    const ig = ignore();
+
+    // 内置排除规则
+    ig.add(BUILTIN_IGNORE_RULES);
+
+    // 优先读取 .clawignore，回退 .gitignore
+    const clawignorePath = path.join(baseDir, '.clawignore');
+    const gitignorePath = path.join(baseDir, '.gitignore');
+
+    if (fs.existsSync(clawignorePath)) {
+        ig.add(fs.readFileSync(clawignorePath, 'utf8'));
+    } else if (fs.existsSync(gitignorePath)) {
+        ig.add(fs.readFileSync(gitignorePath, 'utf8'));
+    }
+
+    return ig;
+}
+
+// 递归收集目录下所有文件（支持 .clawignore 排除）
+function collectFiles(dir, baseDir = dir, ig = null) {
+    if (!ig) {
+        ig = createIgnoreFilter(baseDir);
+    }
+
     const files = {};
     const entries = fs.readdirSync(dir, { withFileTypes: true });
     
@@ -83,13 +126,13 @@ function collectFiles(dir, baseDir = dir) {
         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__') {
+        // 使用 ignore 规则判断是否排除
+        if (ig.ignores(relativePath)) {
             continue;
         }
         
         if (entry.isDirectory()) {
-            Object.assign(files, collectFiles(fullPath, baseDir));
+            Object.assign(files, collectFiles(fullPath, baseDir, ig));
         } else {
             // 跳过二进制文件和过大的文件
             const ext = path.extname(entry.name).toLowerCase();
@@ -150,10 +193,17 @@ export default function(program) {
           .replace(/^-|-$/g, '')
           .toLowerCase() || 'skill';
 
-        // 收集目录下所有文件
+        // 收集目录下所有文件（应用 .clawignore 排除规则）
         spinner.text = 'Collecting files...';
         const files = collectFiles(process.cwd());
         
+        // README.md 优先作为技能介绍，回退到 SKILL.md 正文
+        let readmeContent = content;
+        const readmeMdPath = path.join(process.cwd(), 'README.md');
+        if (fs.existsSync(readmeMdPath)) {
+            readmeContent = fs.readFileSync(readmeMdPath, 'utf8');
+        }
+
         spinner.text = 'Publishing to OpenClaw...';
         
         const client = getClient();
@@ -164,7 +214,7 @@ export default function(program) {
           version: data.version,
           icon: icon,
           metadata: JSON.stringify(metadata), // Send as JSON string
-          readme: content,
+          readme: readmeContent,
           files: JSON.stringify(files)
         });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw-cn/cli",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "The official CLI for OpenClaw-CN Agent ecosystem",
   "bin": {
     "claw": "./bin/claw.js"
@@ -17,6 +17,7 @@
     "gray-matter": "^4.0.3",
     "inquirer": "^9.2.12",
     "marked": "^11.1.1",
+    "ignore": "^6.0.2",
     "marked-terminal": "^6.1.0",
     "ora": "^8.0.1"
   }