@yonpark/skillhub-cli 0.3.0 → 0.3.1

package/README.md

@@ -70,24 +70,6 @@ Mode behavior:
 - `merge`: union local + remote, installs missing local skills, uploads when remote differs.
 - `auto`: compare `remote.updatedAt` and local `lastSyncAt`; install from remote when remote is newer, otherwise upload local when needed.
 
-## Migration (Breaking Changes in 0.3.0)
-
-Removed commands:
-
-- `skillhub login`
-- `skillhub status`
-- `skillhub logout`
-- `skillhub sync --strategy ...`
-- `skillhub sync` (without a subcommand)
-
-New mapping:
-
-- `skillhub login` -> `skillhub auth login`
-- `skillhub status` -> `skillhub auth status`
-- `skillhub logout` -> `skillhub auth logout`
-- `skillhub sync --strategy union` -> `skillhub sync merge`
-- `skillhub sync --strategy latest` -> `skillhub sync auto`
-
 ## Payload Format
 
 `skillhub.json` in Gist:
@@ -134,3 +116,4 @@ CI release workflow publishes to GitHub Packages only:
 - GitHub Packages target package is `@yw9142/skillhub-cli`.
 
 npmjs publish is manual.
+

package/dist/service/skillsService.js

@@ -15,7 +15,7 @@ const node_util_1 = require("node:util");
 const syncCore_1 = require("../core/syncCore");
 const retry_1 = require("../utils/retry");
 const execFileAsync = (0, node_util_1.promisify)(node_child_process_1.execFile);
-const SKILLS_LOCK_FILENAME = "skills-lock.json";
+const SKILLS_LOCK_FILENAMES = ["skills-lock.json", ".skill-lock.json"];
 const DEFAULT_SKILL_SOURCE_REPO = "vercel-labs/agent-skills";
 const NPX_COMMAND = process.platform === "win32" ? "npx.cmd" : "npx";
 const SOURCE_PATTERN = /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/;
@@ -36,26 +36,31 @@ async function runSkillsCommand(args, label) {
 function isValidSource(source) {
     return SOURCE_PATTERN.test(source);
 }
-function getCandidateSkillsLockPaths() {
-    const cwdPath = node_path_1.default.resolve(process.cwd(), SKILLS_LOCK_FILENAME);
-    const homePath = node_path_1.default.resolve(node_os_1.default.homedir(), SKILLS_LOCK_FILENAME);
+function getCandidateSkillsLockPaths(filename) {
+    const cwdPath = node_path_1.default.resolve(process.cwd(), filename);
+    const homePath = node_path_1.default.resolve(node_os_1.default.homedir(), filename);
     const homeConfigPaths = [
-        node_path_1.default.resolve(node_os_1.default.homedir(), ".config", "skills", SKILLS_LOCK_FILENAME),
-        node_path_1.default.resolve(node_os_1.default.homedir(), ".config", "skillhub", SKILLS_LOCK_FILENAME),
-        node_path_1.default.resolve(node_os_1.default.homedir(), ".skills", SKILLS_LOCK_FILENAME),
+        node_path_1.default.resolve(node_os_1.default.homedir(), ".config", "skills", filename),
+        node_path_1.default.resolve(node_os_1.default.homedir(), ".config", "skillhub", filename),
+        node_path_1.default.resolve(node_os_1.default.homedir(), ".skills", filename),
+        node_path_1.default.resolve(node_os_1.default.homedir(), ".agents", filename),
     ];
     const winAppData = process.env.APPDATA;
     const winLocalAppData = process.env.LOCALAPPDATA;
     const windowsConfigPaths = [
         ...(winAppData
-            ? [node_path_1.default.resolve(winAppData, "skills", SKILLS_LOCK_FILENAME)]
+            ? [node_path_1.default.resolve(winAppData, "skills", filename)]
             : []),
         ...(winLocalAppData
-            ? [node_path_1.default.resolve(winLocalAppData, "skills", SKILLS_LOCK_FILENAME)]
+            ? [node_path_1.default.resolve(winLocalAppData, "skills", filename)]
             : []),
     ];
     return [cwdPath, homePath, ...homeConfigPaths, ...windowsConfigPaths];
 }
+function getAllCandidateSkillsLockPaths() {
+    const paths = SKILLS_LOCK_FILENAMES.flatMap((filename) => getCandidateSkillsLockPaths(filename));
+    return [...new Set(paths)];
+}
 function parseSkillsLock(raw) {
     const parsed = JSON.parse(raw);
     const extractSkills = (items) => {
@@ -83,6 +88,21 @@ function parseSkillsLock(raw) {
     if (Array.isArray(parsed?.skills)) {
         return extractSkills(parsed.skills);
     }
+    if (parsed?.skills && typeof parsed.skills === "object") {
+        const objectSkills = parsed.skills;
+        return Object.entries(objectSkills).map(([name, metadata]) => {
+            if (typeof metadata === "object" && metadata !== null) {
+                const objectItem = metadata;
+                const source = typeof objectItem.source === "string"
+                    ? objectItem.source
+                    : typeof objectItem.repo === "string"
+                        ? objectItem.repo
+                        : DEFAULT_SKILL_SOURCE_REPO;
+                return { name, source };
+            }
+            return { name, source: DEFAULT_SKILL_SOURCE_REPO };
+        });
+    }
     if (Array.isArray(parsed)) {
         return extractSkills(parsed);
     }
@@ -128,6 +148,45 @@ async function tryReadSkillsLock(lockPath) {
         return null;
     }
 }
+async function readFirstAvailableSkillsLock() {
+    const candidatePaths = getAllCandidateSkillsLockPaths();
+    for (const lockPath of candidatePaths) {
+        const parsed = await tryReadSkillsLock(lockPath);
+        if (parsed && parsed.length > 0) {
+            return {
+                skills: (0, syncCore_1.normalizeSkills)(parsed),
+                candidatePaths,
+            };
+        }
+    }
+    return {
+        skills: [],
+        candidatePaths,
+    };
+}
+function hydrateSourcesFromLock(listSkills, lockSkills) {
+    const lockByName = new Map();
+    for (const skill of lockSkills) {
+        const existing = lockByName.get(skill.name);
+        if (existing) {
+            existing.push(skill);
+            continue;
+        }
+        lockByName.set(skill.name, [skill]);
+    }
+    const hydrated = listSkills.map((skill) => {
+        const matches = lockByName.get(skill.name);
+        if (!matches || matches.length === 0) {
+            return skill;
+        }
+        const preferred = matches.find((item) => isValidSource(item.source)) ?? matches[0];
+        return {
+            name: skill.name,
+            source: preferred.source,
+        };
+    });
+    return (0, syncCore_1.normalizeSkills)(hydrated);
+}
 async function getLocalSkills() {
     const listResult = await runSkillsCommand(["list", "-g"], "skills list -g");
     const listOutput = stringifyCommandResult(listResult);
@@ -136,32 +195,23 @@ async function getLocalSkills() {
         return [];
     }
     const fromList = parseSkillsListOutput(listOutput);
+    const fromLock = await readFirstAvailableSkillsLock();
     if (fromList.length > 0) {
-        return fromList;
-    }
-    const lockResult = await runSkillsCommand(["generate-lock"], "skills generate-lock");
-    const lockOutput = stringifyCommandResult(lockResult);
-    const candidatePaths = getCandidateSkillsLockPaths();
-    for (const lockPath of candidatePaths) {
-        const parsed = await tryReadSkillsLock(lockPath);
-        if (parsed) {
-            return (0, syncCore_1.normalizeSkills)(parsed);
+        if (fromLock.skills.length > 0) {
+            return hydrateSourcesFromLock(fromList, fromLock.skills);
         }
+        return fromList;
     }
-    if (lockOutput.includes("No installed skills found") ||
-        listOutput.includes("No project skills found")) {
-        return [];
+    if (fromLock.skills.length > 0) {
+        return fromLock.skills;
     }
     throw new Error([
         "Unable to construct local skills list.",
         "- skills list -g output:",
         listOutput,
         "",
-        `- Searched ${SKILLS_LOCK_FILENAME} paths:`,
-        ...candidatePaths.map((p) => `  - ${p}`),
-        "",
-        "- npx skills generate-lock output:",
-        lockOutput,
+        "- Searched lock paths:",
+        ...fromLock.candidatePaths.map((p) => `  - ${p}`),
     ].join("\n"));
 }
 async function installSkills(skills, options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yonpark/skillhub-cli",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "SkillHub CLI - sync skills with GitHub Gist",
   "bin": {
     "skillhub": "bin/skillhub.js"