zhitalk 0.0.11 → 0.0.12

package/dist/install.js

@@ -5,34 +5,112 @@ import { execSync } from 'child_process';
 import { WORKSPACE_DIR, CONFIG_PATH } from './agent/config.js';
 import { initDb } from './agent/db.js';
 const SKILLS_DIR = path.join(WORKSPACE_DIR, 'skills');
+// 核心 skills
+const CORE_SKILLS = [
+    {
+        name: 'find-skills',
+        repo: 'vercel-labs/skills',
+        path: 'skills/find-skills',
+    },
+    {
+        name: 'skill-creator',
+        repo: 'anthropics/skills',
+        path: 'skills/skill-creator',
+    },
+];
+// 可选的常用 skills，默认一起安装
+const OPTIONAL_SKILLS = [
+    {
+        name: 'canvas-design',
+        repo: 'anthropics/skills',
+        path: 'skills/canvas-design',
+    },
+    { name: 'docx', repo: 'anthropics/skills', path: 'skills/docx' },
+    { name: 'pdf', repo: 'anthropics/skills', path: 'skills/pdf' },
+    { name: 'pptx', repo: 'anthropics/skills', path: 'skills/pptx' },
+    { name: 'xlsx', repo: 'anthropics/skills', path: 'skills/xlsx' },
+    {
+        name: 'frontend-design',
+        repo: 'anthropics/skills',
+        path: 'skills/frontend-design',
+    },
+    {
+        name: 'webapp-testing',
+        repo: 'anthropics/skills',
+        path: 'skills/webapp-testing',
+    },
+];
+const ALL_SKILLS = [...CORE_SKILLS, ...OPTIONAL_SKILLS];
 function run(command, options) {
     execSync(command, { stdio: 'inherit', ...options });
 }
-function installSkill(name, repo, skillPath, targetDir, tempDir) {
-    if (fs.existsSync(targetDir)) {
-        console.log(`  ✅ ${name} 已存在，跳过`);
-        return;
+function installSkills(skills, targetBaseDir) {
+    const installed = [];
+    const skipped = [];
+    const failed = [];
+    // 按 repo 分组，避免重复下载
+    const byRepo = new Map();
+    for (const skill of skills) {
+        const list = byRepo.get(skill.repo) ?? [];
+        list.push(skill);
+        byRepo.set(skill.repo, list);
     }
-    console.log(`  📥 正在下载 ${name}...`);
-    const tarPath = path.join(tempDir, `${name}.tar.gz`);
-    const extractDir = path.join(tempDir, `${name}-extract`);
-    fs.mkdirSync(extractDir, { recursive: true });
-    try {
-        run(`curl -fsSL -o "${tarPath}" "https://github.com/${repo}/archive/refs/heads/main.tar.gz"`, { timeout: 30000 });
-        run(`tar -xzf "${tarPath}" -C "${extractDir}"`, { timeout: 30000 });
-        const subDir = fs.readdirSync(extractDir)[0];
-        fs.cpSync(path.join(extractDir, subDir, skillPath), targetDir, {
-            recursive: true,
-        });
-        console.log(`  ✅ ${name} 安装完成`);
-    }
-    catch (error) {
-        if (error.killed || error.code === 'ETIMEDOUT') {
-            console.log(`  ⏱️  ${name} 安装超时（网络较慢），已跳过，继续下一步`);
-            return;
+    for (const [repo, repoSkills] of byRepo) {
+        const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'zhitalk-'));
+        const markFailed = () => {
+            const repoFailed = repoSkills.filter((s) => !fs.existsSync(path.join(targetBaseDir, s.name)));
+            if (repoFailed.length === 0)
+                return;
+            for (const skill of repoFailed) {
+                console.log(`  ❌ ${skill.name} 安装失败，已跳过`);
+                failed.push(skill.name);
+            }
+            console.log(`  ⚠️  ${repo} 下载失败，你可以手动安装：`);
+            console.log(`     1. 下载 https://github.com/${repo}/archive/refs/heads/main.tar.gz`);
+            console.log(`     2. 解压后找到以下目录并拷贝：`);
+            for (const skill of repoFailed) {
+                console.log(`        ${skill.path} → ${path.join(targetBaseDir, skill.name)}`);
+            }
+        };
+        console.log(`  📥 正在下载 ${repo}...`);
+        try {
+            const tarPath = path.join(tempDir, 'repo.tar.gz');
+            run(`curl --connect-timeout 10 --max-time 30 -fsSL -o "${tarPath}" "https://github.com/${repo}/archive/refs/heads/main.tar.gz"`, { timeout: 45000 });
+            run(`tar -xzf "${tarPath}" -C "${tempDir}"`, { timeout: 30000 });
+            const subDir = fs.readdirSync(tempDir).find((d) => d !== 'repo.tar.gz');
+            if (!subDir) {
+                markFailed();
+                continue;
+            }
+            const extractDir = path.join(tempDir, subDir);
+            for (const skill of repoSkills) {
+                const targetDir = path.join(targetBaseDir, skill.name);
+                if (fs.existsSync(targetDir)) {
+                    console.log(`  ✅ ${skill.name} 已存在，跳过`);
+                    skipped.push(skill.name);
+                    continue;
+                }
+                console.log(`  📥 正在安装 ${skill.name}...`);
+                fs.cpSync(path.join(extractDir, skill.path), targetDir, {
+                    recursive: true,
+                });
+                console.log(`  ✅ ${skill.name} 安装完成`);
+                installed.push(skill.name);
+            }
+        }
+        catch {
+            markFailed();
+        }
+        finally {
+            try {
+                fs.rmSync(tempDir, { recursive: true, force: true });
+            }
+            catch {
+                // 忽略清理失败
+            }
         }
-        throw error;
     }
+    return { installed, skipped, failed };
 }
 export async function runInstall() {
     console.log('🚀 欢迎使用 Zhitalk！首次使用需要进行初始化配置。\n');
@@ -41,17 +119,13 @@ export async function runInstall() {
     initDb();
     console.log('✅ 数据库初始化完成\n');
     // 2. 安装 skills
-    console.log('🔧 正在安装默认 skills...');
+    console.log('🔧 正在安装内置 skills...');
     fs.mkdirSync(SKILLS_DIR, { recursive: true });
-    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'zhitalk-'));
-    try {
-        installSkill('find-skills', 'vercel-labs/skills', 'skills/find-skills', path.join(SKILLS_DIR, 'find-skills'), tempDir);
-        installSkill('skill-creator', 'anthropics/skills', 'skills/skill-creator', path.join(SKILLS_DIR, 'skill-creator'), tempDir);
-    }
-    finally {
-        fs.rmSync(tempDir, { recursive: true, force: true });
+    const { installed, skipped, failed } = installSkills(ALL_SKILLS, SKILLS_DIR);
+    if (failed.length > 0) {
+        console.log(`\n⚠️  以下 ${failed.length} 个 skill 安装失败：${failed.join(', ')}`);
     }
-    console.log('✅ Skills 安装完成\n');
+    console.log(`\n✅ Skills 安装完成（${installed.length} 个新安装，${skipped.length} 个已存在跳过）\n`);
     // 3. 创建配置文件
     console.log('⚙️  正在创建配置文件...');
     const configTemplate = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zhitalk",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "A personal AI Agent like OpenClaw, including tools, skills, memory, hook, sub-agent, MCP server, etc. Run in the terminal.",
   "type": "module",
   "main": "dist/index.js",