scriptoriumadmin/skillhub
1
0
Fork 0
mirror of https://github.com/iflytek/skillhub.git synced 2026-09-15 23:31:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(cli): determine scope before agent selection for correct universal grouping

Browse source 
- Move scope selection before agent selection in both installFromRegistry
  and installFromGit flows
- Use isUniversalForScope in selectAgentsInteractive so that the Universal
  locked section correctly reflects the actual scope:
  - Project: agents with skillsDir='.agents/skills' (Cline, Codex, Cursor, etc.)
  - Global: agents with globalSkillsDir='.agents/skills' (Cline, Warp only)
- Clean up unused getUniversalAgents/getNonUniversalAgents imports
This commit is contained in:
chenbaowang 2026-04-20 16:04:28 +08:00
parent 32395ee5c2
commit 3353953675
1 changed files with 61 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
skillhub-cli/src/commands/install.ts
View file

@ -8,7 +8,7 @@ import { loadConfig } from "../core/config.js";
import { readToken } from "../core/auth-token.js";
import { discoverSkills } from "../core/skill-discovery.js";
import { installSkill } from "../core/installer.js";
import { getAllAgents, detectInstalledAgents, getUniversalAgents, getNonUniversalAgents, isUniversalForScope, getAgentTargetDir, type AgentInfo } from "../core/agent-detector.js";
import { getAllAgents, detectInstalledAgents, isUniversalForScope, getAgentTargetDir, type AgentInfo } from "../core/agent-detector.js";
import { parseSource, getCloneUrl } from "../core/source-parser.js";
import { addToLock } from "../core/skill-lock.js";
import { success, error, info, dim } from "../utils/logger.js";
@ -53,11 +53,16 @@ function getInstallSpinner(sourceType: SourceType, arg: string): string {
}
async function selectAgentsInteractive(isGlobal: boolean): Promise<string[] | null> {
const universalAgents = getUniversalAgents();
const nonUniversalAgents = getNonUniversalAgents();
const allAgents = getAllAgents();
// Use scope-aware universal check: an agent is "universal" when its target
// install dir equals the canonical .agents/skills directory for the given scope.
const universalAgents = allAgents.filter((a) => isUniversalForScope(a, isGlobal));
const nonUniversalAgents = allAgents.filter((a) => !isUniversalForScope(a, isGlobal));
const canonicalLabel = isGlobal ? "Universal (~/.agents/skills)" : "Universal (.agents/skills)";
const lockedSection = {
title: "Universal (.agents/skills)",
title: canonicalLabel,
items: universalAgents.map((a) => ({
value: a.key,
label: a.name,
@ -351,27 +356,10 @@ async function installFromRegistry(slug: string, opts: Record<string, string | s
let isGlobal = !!opts.global;
let targetAgents = opts.agent
? getAllAgents().filter((a) => (opts.agent as string[]).includes(a.key))
: detectInstalledAgents();
if (targetAgents.length === 0) {
const claude = getAllAgents().find((a) => a.key === "claude-code");
if (claude) targetAgents.push(claude);
}
let mode: "symlink" | "copy" = opts.copy ? "copy" : "symlink";
if (!opts.yes && !opts.agent) {
const selected = await selectAgentsInteractive(isGlobal);
if (!selected) {
console.log("Cancelled.");
return;
}
targetAgents = getAllAgents().filter((a) => selected.includes(a.key));
}
const supportsGlobal = targetAgents.some((a) => a.globalSkillsDir);
// Determine scope first, so that agent selection can use the correct
// universal/non-universal grouping based on the actual scope.
const allAgents = getAllAgents();
const supportsGlobal = allAgents.some((a) => a.globalSkillsDir);
if (opts.global === undefined && !opts.yes && supportsGlobal) {
const scope = await p.select({
@ -398,6 +386,26 @@ async function installFromRegistry(slug: string, opts: Record<string, string | s
isGlobal = scope as boolean;
}
let targetAgents = opts.agent
? allAgents.filter((a) => (opts.agent as string[]).includes(a.key))
: detectInstalledAgents();
if (targetAgents.length === 0) {
const claude = allAgents.find((a) => a.key === "claude-code");
if (claude) targetAgents.push(claude);
}
let mode: "symlink" | "copy" = opts.copy ? "copy" : "symlink";
if (!opts.yes && !opts.agent) {
const selected = await selectAgentsInteractive(isGlobal);
if (!selected) {
console.log("Cancelled.");
return;
}
targetAgents = allAgents.filter((a) => selected.includes(a.key));
}
// Only prompt for install mode when there are multiple unique target directories.
// When all selected agents share the same skillsDir, symlink vs copy is meaningless.
const uniqueDirs = new Set(targetAgents.map((a) => getAgentTargetDir(a, isGlobal)));
@ -604,32 +612,10 @@ async function installFromGit(skillName: string, source: string, sourceType: Sou
let isGlobal = !!opts.global;
let targetAgents = opts.agent
? getAllAgents().filter((a) => (opts.agent as string[]).includes(a.key))
: detectInstalledAgents();
if (targetAgents.length === 0) {
const all = getAllAgents();
if (!opts.yes) {
info("No agents detected. Installing to Claude Code by default.");
}
const claude = all.find((a) => a.key === "claude-code");
if (claude) targetAgents.push(claude);
else targetAgents.push(all[0]);
}
let mode: "symlink" | "copy" = opts.copy ? "copy" : "symlink";
if (!opts.yes && !opts.agent) {
const selected = await selectAgentsInteractive(isGlobal);
if (!selected) {
console.log("Cancelled.");
return;
}
targetAgents = getAllAgents().filter((a) => selected.includes(a.key));
}
const supportsGlobal = targetAgents.some((a) => a.globalSkillsDir);
// Determine scope first, so that agent selection can use the correct
// universal/non-universal grouping based on the actual scope.
const allAgents = getAllAgents();
const supportsGlobal = allAgents.some((a) => a.globalSkillsDir);
if (opts.global === undefined && !opts.yes && supportsGlobal) {
const scope = await p.select({
@ -656,6 +642,30 @@ async function installFromGit(skillName: string, source: string, sourceType: Sou
isGlobal = scope as boolean;
}
let targetAgents = opts.agent
? allAgents.filter((a) => (opts.agent as string[]).includes(a.key))
: detectInstalledAgents();
if (targetAgents.length === 0) {
if (!opts.yes) {
info("No agents detected. Installing to Claude Code by default.");
}
const claude = allAgents.find((a) => a.key === "claude-code");
if (claude) targetAgents.push(claude);
else targetAgents.push(allAgents[0]);
}
let mode: "symlink" | "copy" = opts.copy ? "copy" : "symlink";
if (!opts.yes && !opts.agent) {
const selected = await selectAgentsInteractive(isGlobal);
if (!selected) {
console.log("Cancelled.");
return;
}
targetAgents = allAgents.filter((a) => selected.includes(a.key));
}
// Only prompt for install mode when there are multiple unique target directories.
// When all selected agents share the same skillsDir, symlink vs copy is meaningless.
const uniqueDirs = new Set(targetAgents.map((a) => getAgentTargetDir(a, isGlobal)));