@wang121ye/skillmanager 0.0.5 → 0.0.7

package/README.md

@@ -71,6 +71,15 @@ npx @wang121ye/skillmanager install
 skillmanager install
 ```
 
+### 命令行交互式选择（类似 openskills）
+
+默认 `skillmanager install` 会进入交互式选择（按来源分组）。支持：
+- 空格选择/取消
+- a 全选，i 反选
+- h 顶部，e 底部
+- [ / ] 切换分组
+- Esc 退出，Enter 确认
+
 ### 2) 安装时启用 Web UI 选择（默认全选，可批量全选/全不选/反选/搜索）
 
 ```bash
@@ -221,15 +230,15 @@ skillmanager source remove superpowers
 
 ### 默认更新（推荐）
 
-这会调用 `openskills update` 更新所有 openskills 已记录的来源，然后重新 `sync`：
+默认会优先按 profile 选择集更新（显式 `--profile` 优先，否则使用默认 profile）：
 
 ```bash
 skillmanager update
 ```
 
-### 如果你用了 profile 做"子集安装"（Web UI 勾选）
+如果目标 profile 不存在或没有有效选择集，会自动回退到 `openskills update`。
 
-因为子集安装是按"本地目录复制安装"（为了兼容 Windows 下 openskills 的本地路径识别问题），`openskills update` 不一定能自动追踪来源；此时用 profile 方式更新最稳：
+### 指定 profile 更新（子集安装最稳）
 
 ```bash
 skillmanager update --profile laptop
@@ -242,6 +251,12 @@ skillmanager webui --profile laptop
 skillmanager update --profile laptop
 ```
 
+### 强制使用 openskills 原生更新链路
+
+```bash
+skillmanager update --openskills
+```
+
 ## 卸载 skills
 
 ### 用 Web UI 勾选要卸载的已安装 skills（推荐）

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wang121ye/skillmanager",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Cross-platform agent skill manager (bootstrap + optional Web UI selection) built on top of openskills.",
   "keywords": [
     "skillmanager",
@@ -45,6 +45,7 @@
     "gray-matter": "^4.0.3",
     "openskills": "^1.5.0",
     "simple-git": "^3.27.0",
-    "undici": "^6.23.0"
+    "undici": "^6.23.0",
+    "yoctocolors-cjs": "^2.1.3"
   }
 }

package/src/cli.js

@@ -59,12 +59,13 @@ async function main() {
 
   program
     .command('update')
-    .description('更新 skills，并同步生成/更新 AGENTS.md。')
+    .description('更新 skills，并同步生成/更新 AGENTS.md（默认按 profile 更新）。')
     .option('--global', '安装到全局（默认：当前项目）', false)
     .option('--universal', '使用通用目录 .agent/skills（默认：.claude/skills）', false)
     .option('--output <path>', 'sync 输出文件（默认：AGENTS.md）')
     .option('--no-sync', '跳过 openskills sync', false)
     .option('--profile <name>', '按 profile 选择集更新（会重新安装选中的 skills）')
+    .option('--openskills', '强制走 openskills update（忽略 profile 选择集）', false)
     .option('--concurrency <n>', '选择模式下的并发扫描数（默认：3）', '3')
     .option('--force-refresh', '强制刷新来源仓库缓存（重新拉取）', false)
     .action(async (opts) => {
@@ -179,4 +180,3 @@ main().catch((err) => {
   console.error(err?.stack || String(err));
   process.exitCode = 1;
 });
-

package/src/commands/bootstrap.js

@@ -3,7 +3,7 @@ const { ensureDir } = require('../lib/fs');
 const { loadSourcesManifest } = require('../lib/manifest');
 const { ensureRepo } = require('../lib/git');
 const { scanSkillsInRepo } = require('../lib/scan');
-const { loadProfile } = require('../lib/profiles');
+const { loadProfile, saveProfile } = require('../lib/profiles');
 const { mapWithConcurrency } = require('../lib/concurrency');
 const { getEffectiveDefaultProfile } = require('../lib/config');
 const path = require('path');
@@ -11,6 +11,7 @@ const os = require('os');
 const { installSourceRef, syncAgents } = require('../lib/openskills');
 const { installFromLocalSkillDir } = require('../lib/local-install');
 const { warnPrereqs } = require('../lib/prereqs');
+const { promptSkillSelection } = require('../lib/cli-select');
 
 
 function uniq(arr) {
@@ -28,47 +29,9 @@ async function bootstrap(opts) {
 
   const profileName = opts?.profile || (await getEffectiveDefaultProfile());
   const existing = await loadProfile({ profilesDir: paths.profilesDir, profileName });
-
-  const wantsSelection = existing?.selectedSkillIds && Array.isArray(existing.selectedSkillIds);
   const globalInstall = !!opts?.global;
   const universal = !!opts?.universal;
 
-  if (!wantsSelection) {
-    // Default path: install everything from each enabled source via openskills directly.
-    // This avoids repo scanning and matches “bootstrap 安装所有 skills”的默认体验。
-    // eslint-disable-next-line no-console
-    console.log(`将从 ${enabledSources.length} 个来源安装（global=${globalInstall}, universal=${universal}）…`);
-
-    if (opts?.dryRun) {
-      // eslint-disable-next-line no-console
-      console.log('\n--dry-run 已启用：将安装以下来源（不执行安装）');
-      for (const s of enabledSources) {
-        const ref = s.openskillsRef || s.repo;
-        // eslint-disable-next-line no-console
-        console.log(`- ${s.name || s.id}  (${ref || 'missing-ref'})`);
-      }
-      // eslint-disable-next-line no-console
-      console.log('\n完成（dry-run）。');
-      return;
-    }
-
-    for (const s of enabledSources) {
-      const ref = s.openskillsRef || s.repo;
-      if (!ref) continue;
-      // eslint-disable-next-line no-console
-      console.log(`\n==> Installing source: ${s.name || s.id}  (${ref})`);
-      await installSourceRef({ ref, globalInstall, universal });
-    }
-
-    if (opts?.sync !== false) {
-      await syncAgents({ output: opts?.output, cwd: process.cwd() });
-    }
-
-    // eslint-disable-next-line no-console
-    console.log('\n完成。');
-    return;
-  }
-
   // Selection path: clone repos + scan SKILL.md, then install selected skill dirs.
   const concurrency = Number(opts?.concurrency || process.env.SKILLMANAGER_CONCURRENCY || 3);
   // eslint-disable-next-line no-console
@@ -103,7 +66,18 @@ async function bootstrap(opts) {
       ? existing.selectedSkillIds
       : allSkills.map((s) => s.id);
 
-  // 交互式选择已迁移到：skillmanager webui（mode=install）
+  const chosen = await promptSkillSelection({
+    title: `skillmanager install · profile=${profileName}`,
+    skills: allSkills,
+    initialSelectedIds: selectedIds
+  });
+  if (chosen == null) {
+    // eslint-disable-next-line no-console
+    console.log('已取消（未执行安装）。');
+    return;
+  }
+  selectedIds = chosen;
+  await saveProfile({ profilesDir: paths.profilesDir, profileName, selectedSkillIds: selectedIds });
 
   selectedIds = uniq(selectedIds).filter((id) => skillsById.has(id));
 

package/src/commands/uninstall.js

@@ -4,6 +4,7 @@ const fsp = require('fs/promises');
 
 const { listInstalledSkills } = require('../lib/installed');
 const { syncAgents } = require('../lib/openskills');
+const { promptSkillSelection } = require('../lib/cli-select');
 
 function resolveTargetDir({ globalInstall, universal }) {
   const folder = universal ? '.agent/skills' : '.claude/skills';
@@ -18,10 +19,35 @@ async function uninstall(opts, skillNames) {
   const installed = await listInstalledSkills(targetDir);
   const installedByName = new Map(installed.map((s) => [s.name, s]));
 
-  let toRemove = Array.isArray(skillNames) ? skillNames.filter(Boolean) : [];
+  if (installed.length === 0) {
+    // eslint-disable-next-line no-console
+    console.log(`未检测到可卸载的 skill。目标目录：${targetDir}`);
+    return;
+  }
 
+  let toRemove = [];
   if (opts?.all) {
     toRemove = installed.map((s) => s.name);
+  } else {
+    const initialSelected = Array.isArray(skillNames) ? skillNames.filter(Boolean) : [];
+    const chosen = await promptSkillSelection({
+      title: 'skillmanager uninstall',
+      skills: installed.map((s) => ({
+        id: s.name,
+        sourceId: 'installed',
+        sourceName: 'Installed',
+        name: s.name,
+        description: s.description,
+        skillDir: s.skillDir
+      })),
+      initialSelectedIds: initialSelected
+    });
+    if (chosen == null) {
+      // eslint-disable-next-line no-console
+      console.log('已取消（未执行卸载）。');
+      return;
+    }
+    toRemove = chosen;
   }
 
   toRemove = Array.from(new Set(toRemove)).filter((n) => installedByName.has(n));
@@ -29,14 +55,6 @@ async function uninstall(opts, skillNames) {
   if (toRemove.length === 0) {
     // eslint-disable-next-line no-console
     console.log(`未选择任何可卸载的 skill。目标目录：${targetDir}`);
-    // eslint-disable-next-line no-console
-    console.log('用法：');
-    // eslint-disable-next-line no-console
-    console.log('  - skillmanager webui --mode uninstall');
-    // eslint-disable-next-line no-console
-    console.log('  - skillmanager uninstall <skill1> <skill2>');
-    // eslint-disable-next-line no-console
-    console.log('  - skillmanager uninstall --all');
     return;
   }
 

package/src/commands/update.js

@@ -17,31 +17,46 @@ function uniq(arr) {
   return Array.from(new Set(arr));
 }
 
+async function runFallbackOpenSkillsUpdate(opts) {
+  // eslint-disable-next-line no-console
+  console.log('正在执行 openskills update（更新所有已记录来源）…');
+  await runOpenSkills(['update']);
+  if (opts?.sync !== false) {
+    await syncAgents({ output: opts?.output, cwd: process.cwd() });
+  }
+  // eslint-disable-next-line no-console
+  console.log('\n完成。');
+}
+
 async function update(opts) {
   await warnPrereqs({ needGit: true, needOpenSkills: true });
   const globalInstall = !!opts?.global;
   const universal = !!opts?.universal;
 
-  const profileName = opts?.profile;
-  const wantsSelection = !!profileName;
+  if (opts?.openskills) {
+    await runFallbackOpenSkillsUpdate(opts);
+    return;
+  }
 
-  if (!wantsSelection) {
-    // Default: ask openskills to update everything it has tracked.
-    // eslint-disable-next-line no-console
-    console.log('正在执行 openskills update（更新所有已记录来源）…');
-    await runOpenSkills(['update']);
-    if (opts?.sync !== false) {
-      await syncAgents({ output: opts?.output, cwd: process.cwd() });
-    }
+  // Default path: profile-based update (explicit profile > default profile).
+  const paths = getAppPaths();
+  await ensureDir(paths.profilesDir);
+  const effectiveProfileName = opts?.profile || (await getEffectiveDefaultProfile());
+  const existing = await loadProfile({ profilesDir: paths.profilesDir, profileName: effectiveProfileName });
+  const hasSelection = Array.isArray(existing?.selectedSkillIds);
+
+  if (!hasSelection) {
     // eslint-disable-next-line no-console
-    console.log('\n完成。');
+    console.warn(
+      `未找到可用 profile 选择集：${effectiveProfileName}，将回退到 openskills update。` +
+        `可先运行 skillmanager webui --profile ${effectiveProfileName} 保存选择集。`
+    );
+    await runFallbackOpenSkillsUpdate(opts);
     return;
   }
 
   // Profile-based update: refresh repos cache and re-install selected skill dirs.
-  const paths = getAppPaths();
   await ensureDir(paths.reposDir);
-  await ensureDir(paths.profilesDir);
 
   const { sources } = await loadSourcesManifest();
   const enabledSources = sources.filter((s) => s && s.enabled !== false);
@@ -73,21 +88,16 @@ async function update(opts) {
     for (const sk of skills) skillsById.set(sk.id, sk);
   }
 
-  const allSkills = Array.from(skillsById.values());
-
-  const effectiveProfileName = profileName || (await getEffectiveDefaultProfile());
-  const existing = await loadProfile({ profilesDir: paths.profilesDir, profileName: effectiveProfileName });
-  let selectedIds =
-    existing?.selectedSkillIds && Array.isArray(existing.selectedSkillIds)
-      ? existing.selectedSkillIds
-      : allSkills.map((s) => s.id);
+  let selectedIds = existing.selectedSkillIds;
 
   // 交互式选择已迁移到：skillmanager webui（mode=install），先保存 profile 再 update --profile
 
   selectedIds = uniq(selectedIds).filter((id) => skillsById.has(id));
 
   // eslint-disable-next-line no-console
-  console.log(`将更新/重装 ${selectedIds.length} 个 skills（global=${globalInstall}, universal=${universal}）…`);
+  console.log(
+    `将按 profile=${effectiveProfileName} 更新/重装 ${selectedIds.length} 个 skills（global=${globalInstall}, universal=${universal}）…`
+  );
 
   for (const id of selectedIds) {
     const skill = skillsById.get(id);
@@ -109,4 +119,3 @@ async function update(opts) {
 }
 
 module.exports = { update };
-

package/src/lib/cli-select.js

@@ -0,0 +1,200 @@
+const {
+  createPrompt,
+  useState,
+  useKeypress,
+  usePagination,
+  usePrefix,
+  isUpKey,
+  isDownKey,
+  isSpaceKey,
+  isEnterKey
+} = require('@inquirer/core');
+const colors = require('yoctocolors-cjs');
+
+function groupSkills(skills) {
+  const bySource = new Map();
+  for (const skill of skills) {
+    const key = skill.sourceName || skill.sourceId || 'unknown';
+    if (!bySource.has(key)) bySource.set(key, []);
+    bySource.get(key).push(skill);
+  }
+  for (const [key, list] of bySource.entries()) {
+    list.sort((a, b) => a.name.localeCompare(b.name));
+    bySource.set(key, list);
+  }
+  return Array.from(bySource.entries()).sort((a, b) => a[0].localeCompare(b[0]));
+}
+
+function buildItems(skills) {
+  const grouped = groupSkills(skills);
+  const items = [];
+  let groupIndex = 0;
+  for (const [sourceName, list] of grouped) {
+    items.push({ type: 'separator', label: `-- ${sourceName} --`, groupIndex });
+    for (const skill of list) {
+      items.push({
+        type: 'choice',
+        id: skill.id,
+        name: skill.name,
+        description: skill.description || '',
+        groupIndex
+      });
+    }
+    groupIndex += 1;
+  }
+  return items;
+}
+
+function getSelectableIndexes(items) {
+  const indexes = [];
+  for (let i = 0; i < items.length; i++) {
+    if (items[i].type === 'choice') indexes.push(i);
+  }
+  return indexes;
+}
+
+function findNextSelectable(items, startIndex, direction) {
+  const step = direction >= 0 ? 1 : -1;
+  for (let i = startIndex + step; i >= 0 && i < items.length; i += step) {
+    if (items[i].type === 'choice') return i;
+  }
+  return null;
+}
+
+function findGroupStart(items, groupIndex) {
+  for (let i = 0; i < items.length; i++) {
+    if (items[i].type === 'choice' && items[i].groupIndex === groupIndex) return i;
+  }
+  return null;
+}
+
+const promptSkillSelection = createPrompt((config, done) => {
+  const items = buildItems(config.skills || []);
+  const selectableIndexes = getSelectableIndexes(items);
+  const firstSelectable = selectableIndexes[0] ?? 0;
+  const lastSelectable = selectableIndexes[selectableIndexes.length - 1] ?? 0;
+  const [activeIndex, setActiveIndex] = useState(firstSelectable);
+  const [status, setStatus] = useState('idle');
+  const [selectedSet, setSelectedSet] = useState(
+    new Set(Array.isArray(config.initialSelectedIds) ? config.initialSelectedIds : [])
+  );
+
+  const moveToIndex = (idx) => {
+    if (idx == null) return;
+    if (items[idx]?.type !== 'choice') return;
+    setActiveIndex(idx);
+  };
+
+  const moveBy = (dir) => {
+    const next = findNextSelectable(items, activeIndex, dir);
+    if (next != null) {
+      setActiveIndex(next);
+      return;
+    }
+    // loop to start/end
+    setActiveIndex(dir > 0 ? firstSelectable : lastSelectable);
+  };
+
+  const moveGroup = (dir) => {
+    const currentGroup = items[activeIndex]?.groupIndex ?? 0;
+    const maxGroup = Math.max(0, ...items.map((i) => i.groupIndex ?? 0));
+    const nextGroup = dir > 0 ? (currentGroup + 1 > maxGroup ? 0 : currentGroup + 1) : currentGroup - 1 < 0 ? maxGroup : currentGroup - 1;
+    moveToIndex(findGroupStart(items, nextGroup));
+  };
+
+  const toggleActive = () => {
+    const item = items[activeIndex];
+    if (!item || item.type !== 'choice') return;
+    const next = new Set(selectedSet);
+    if (next.has(item.id)) next.delete(item.id);
+    else next.add(item.id);
+    setSelectedSet(next);
+  };
+
+  const selectAll = () => {
+    const next = new Set(selectedSet);
+    for (const idx of selectableIndexes) next.add(items[idx].id);
+    setSelectedSet(next);
+  };
+
+  const invertAll = () => {
+    const next = new Set();
+    for (const idx of selectableIndexes) {
+      const id = items[idx].id;
+      if (!selectedSet.has(id)) next.add(id);
+    }
+    setSelectedSet(next);
+  };
+
+  useKeypress((key) => {
+    const keyName = key?.name || key?.sequence;
+    if (isUpKey(key)) return moveBy(-1);
+    if (isDownKey(key)) return moveBy(1);
+    if (isSpaceKey(key)) return toggleActive();
+    if (isEnterKey(key)) {
+      setStatus('done');
+      return done(Array.from(selectedSet));
+    }
+    if (keyName === 'escape') {
+      setStatus('done');
+      return done(null);
+    }
+    if (keyName === 'a') return selectAll();
+    if (keyName === 'i') return invertAll();
+    if (keyName === 'h') return moveToIndex(firstSelectable);
+    if (keyName === 'e') return moveToIndex(lastSelectable);
+    if (keyName === '[') return moveGroup(-1);
+    if (keyName === ']') return moveGroup(1);
+  });
+
+  const prefix = usePrefix({ status });
+  const titleText = config.title || config.message || 'Select skills to install';
+  const total = selectableIndexes.length;
+  const selected = selectedSet.size;
+  const counter = colors.dim(`${selected} / ${total} selected`);
+  const message = `${colors.bold(titleText)}  ${counter}`;
+  const activeItem = items[activeIndex];
+  const desc =
+    activeItem?.type === 'choice' && activeItem.description
+      ? `\n${colors.yellow(activeItem.description.trim())}`
+      : '';
+
+  const page = usePagination({
+    items,
+    active: activeIndex,
+    pageSize: config.pageSize || 18,
+    loop: false,
+    renderItem: ({ item, index, isActive }) => {
+      if (item.type === 'separator') {
+        return `\n  ${colors.bold(colors.cyan(item.label))}`;
+      }
+      const cursor = isActive ? colors.cyan('>') : ' ';
+      const isChecked = selectedSet.has(item.id);
+      const dot = isChecked ? colors.green('●') : colors.dim('○');
+      const label = isChecked ? colors.green(item.name) : isActive ? colors.white(item.name) : colors.dim(item.name);
+      return `${cursor} ${dot} ${label}`;
+    }
+  });
+
+  const help =
+    '\n' +
+    colors.dim('↑↓ 选择 · 空格 勾选 · a 全选 · i 反选 · h 顶部 · e 底部 · [ ] 切组 · Esc 退出 · ⏎ 确认');
+
+  if (status === 'done') {
+    return `${prefix} ${colors.bold(titleText)}  ${colors.green(`✔ ${selected} skills selected`)}`;
+  }
+
+  return `${prefix} ${message}\n${page}${desc}${help}`;
+});
+
+async function promptSkillSelectionWrapper({ title, skills, initialSelectedIds }) {
+  const chosen = await promptSkillSelection({
+    title,
+    skills,
+    initialSelectedIds
+  });
+  if (chosen == null) return null;
+  return Array.isArray(chosen) ? chosen : [];
+}
+
+module.exports = { promptSkillSelection: promptSkillSelectionWrapper };