@yonpark/skillhub-cli 0.1.2 → 0.2.0

package/dist/commands/sync.js

@@ -1,31 +1,30 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runSync = runSync;
-const node_child_process_1 = require("node:child_process");
-const node_util_1 = require("node:util");
-const promises_1 = __importDefault(require("node:fs/promises"));
-const node_path_1 = __importDefault(require("node:path"));
-const node_os_1 = __importDefault(require("node:os"));
+const syncCore_1 = require("../core/syncCore");
 const config_1 = require("../service/config");
 const gistService_1 = require("../service/gistService");
-const execAsync = (0, node_util_1.promisify)(node_child_process_1.exec);
-const SKILLS_LOCK_FILENAME = "skills-lock.json";
-const DEFAULT_STRATEGY = "union";
-const DEFAULT_SKILL_SOURCE_REPO = "vercel-labs/agent-skills";
-async function runSync(strategyInput) {
-    const strategy = parseStrategy(strategyInput);
-    const token = await config_1.configStore.getToken();
-    if (!token) {
-        throw new Error("You must login first. Run `skillhub login` and try again.");
-    }
-    const localSkills = await getLocalSkills();
-    const localPayload = {
-        skills: uniqueSortedSkills(localSkills),
-        updatedAt: new Date().toISOString(),
-    };
+const skillsService_1 = require("../service/skillsService");
+const output_1 = require("../utils/output");
+function formatSyncSummary(summary) {
+    const prefix = summary.dryRun ? "Dry-run" : "Sync";
+    const failurePart = summary.failed.length > 0
+        ? ` (${summary.failed.length} failed - check logs or JSON output)`
+        : "";
+    const actionLine = summary.dryRun
+        ? `${prefix}: would upload ${summary.uploaded} change(s), would install ${summary.installPlanned} skill(s)`
+        : `${prefix}: uploaded ${summary.uploaded} change(s), installed ${summary.installed} skill(s)`;
+    const details = [
+        actionLine + failurePart,
+        `strategy=${summary.strategy}`,
+        `gistFound=${summary.gistFound}`,
+        `gistCreated=${summary.gistCreated}`,
+        `remoteNewer=${summary.remoteNewer === null ? "n/a" : String(summary.remoteNewer)}`,
+        `lastSyncAtUpdated=${summary.lastSyncAtUpdated}`,
+    ];
+    return details.join("\n");
+}
+async function resolveRemotePayload(token) {
     const octokit = (0, gistService_1.createOctokit)(token);
     let gistId = await config_1.configStore.getGistId();
     let remotePayload = null;
@@ -38,292 +37,155 @@ async function runSync(strategyInput) {
     if (!gistId) {
         const found = await (0, gistService_1.findSkillhubGist)(octokit);
         if (found?.id) {
-            const foundId = found.id;
-            gistId = foundId;
-            await config_1.configStore.setGistId(foundId);
-            remotePayload = await safeGetPayload(octokit, foundId);
-        }
-    }
-    if (!gistId) {
-        const created = await (0, gistService_1.createSkillhubGist)(octokit, localPayload);
-        if (!created.id) {
-            throw new Error("Gist was created, but the ID could not be determined.");
+            gistId = found.id;
+            await config_1.configStore.setGistId(found.id);
+            remotePayload = await safeGetPayload(octokit, found.id);
         }
-        await config_1.configStore.setGistId(created.id);
-        console.log("No existing SkillHub Gist found. A new one has been created.");
-        console.log(`Uploaded 1 change, installed 0 skills`);
-        return;
-    }
-    const resolvedRemote = remotePayload
-        ? {
-            ...remotePayload,
-            skills: normalizeSkills(remotePayload.skills ?? []),
-        }
-        : { skills: [], updatedAt: "" };
-    if (strategy === "latest") {
-        await applyLatestStrategy({
-            octokit,
-            gistId,
-            local: localPayload,
-            remote: resolvedRemote,
-        });
-        return;
     }
-    await applyUnionStrategy({
+    return {
         octokit,
         gistId,
-        local: localPayload,
-        remote: resolvedRemote,
-    });
-}
-function parseStrategy(input) {
-    if (input === "latest" || input === "union") {
-        return input;
-    }
-    return DEFAULT_STRATEGY;
-}
-async function getLocalSkills() {
-    // 1) Primary source: `skills list -g` output
-    // - generate-lock can be flaky (e.g. "already in lock file" without writing),
-    //   so we prefer parsing the list output when possible.
-    const listResult = await execAsync("npx skills list -g");
-    const listOutput = `${listResult.stdout ?? ""}\n${listResult.stderr ?? ""}`.trim();
-    // When there are no global skills, skills CLI prints:
-    // "No global skills found.\nTry listing project skills without -g"
-    // In that case we treat it as an empty list and avoid polluting Gist.
-    if (listOutput.includes("No global skills found") ||
-        listOutput.includes("Try listing project skills without -g")) {
-        return [];
-    }
-    const fromList = parseSkillsListOutput(listOutput);
-    if (fromList.length > 0) {
-        return fromList;
-    }
-    // 2) Fallback: generate-lock + search for a skills-lock.json file
-    const { stdout, stderr } = await execAsync("npx skills generate-lock");
-    const output = `${stdout ?? ""}\n${stderr ?? ""}`.trim();
-    const candidatePaths = getCandidateSkillsLockPaths();
-    for (const lockPath of candidatePaths) {
-        const parsed = await tryReadSkillsLock(lockPath);
-        if (parsed) {
-            return parsed;
-        }
-    }
-    if (output.includes("No installed skills found") || listOutput.includes("No project skills found")) {
-        return [];
-    }
-    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:`,
-        output,
-    ].join("\n"));
-}
-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);
-    // Cross-platform candidates when we don't know exactly where the tool writes
-    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),
-    ];
-    // Windows-specific candidates
-    const winAppData = process.env.APPDATA;
-    const winLocalAppData = process.env.LOCALAPPDATA;
-    const windowsConfigPaths = [
-        ...(winAppData
-            ? [node_path_1.default.resolve(winAppData, "skills", SKILLS_LOCK_FILENAME)]
-            : []),
-        ...(winLocalAppData
-            ? [node_path_1.default.resolve(winLocalAppData, "skills", SKILLS_LOCK_FILENAME)]
-            : []),
-    ];
-    return [cwdPath, homePath, ...homeConfigPaths, ...windowsConfigPaths];
+        remotePayload: remotePayload ?? { skills: [], updatedAt: "" },
+    };
 }
-async function tryReadSkillsLock(lockPath) {
+async function safeGetPayload(octokit, gistId) {
     try {
-        const raw = await promises_1.default.readFile(lockPath, "utf-8");
-        return parseSkillsLock(raw);
+        return await (0, gistService_1.getSkillhubPayload)(octokit, gistId);
     }
     catch {
         return null;
     }
 }
-function parseSkillsLock(raw) {
-    const parsed = JSON.parse(raw);
-    // skills-lock.json에서 source 정보 추출 시도
-    const extractSkills = (items) => {
-        return items.map((item) => {
-            if (typeof item === "string") {
-                return { name: item, source: DEFAULT_SKILL_SOURCE_REPO };
-            }
-            if (typeof item === "object" && item !== null) {
-                const name = item.name || item.skill || String(item);
-                const source = item.source || item.repo || DEFAULT_SKILL_SOURCE_REPO;
-                return { name: String(name), source: String(source) };
-            }
-            return { name: String(item), source: DEFAULT_SKILL_SOURCE_REPO };
-        });
+function createSummaryFromPlan(params) {
+    return {
+        ok: params.failed.length === 0,
+        strategy: params.strategy,
+        dryRun: params.dryRun,
+        gistFound: params.gistFound,
+        gistCreated: params.gistCreated,
+        remoteNewer: params.remoteNewer,
+        uploaded: params.uploaded,
+        installPlanned: params.installPlanned,
+        installed: params.installed,
+        failed: params.failed,
+        lastSyncAtUpdated: params.lastSyncAtUpdated,
     };
-    const fromSkills = parsed?.skills;
-    if (Array.isArray(fromSkills)) {
-        return extractSkills(fromSkills);
-    }
-    if (Array.isArray(parsed)) {
-        return extractSkills(parsed);
-    }
-    const fromInstalled = parsed?.installedSkills;
-    if (Array.isArray(fromInstalled)) {
-        return extractSkills(fromInstalled);
-    }
-    return [];
 }
-function parseSkillsListOutput(output) {
-    const cleaned = output.replace(/\x1b\[[0-9;]*m/g, "");
-    const lines = cleaned.split(/\r?\n/).map((line) => line.trim());
-    const skills = [];
-    for (const line of lines) {
-        if (!line)
-            continue;
-        if (line === "Global Skills")
-            continue;
-        if (line.startsWith("Agents:"))
-            continue;
-        if (line.startsWith("No project skills found"))
-            continue;
-        if (line.startsWith("Try listing global skills"))
-            continue;
-        if (line.startsWith("No global skills found"))
-            continue;
-        if (line.startsWith("Try listing project skills without -g"))
-            continue;
-        // Example: "find-skills ~\\.agents\\skills\\find-skills"
-        // We only take the first token as the skill name
-        const [name] = line.split(/\s+/);
-        if (!name)
-            continue;
-        // Skip obvious path-like tokens as a safety net
-        if (name.includes("\\") || name.includes("/") || name.includes("~"))
-            continue;
-        // skills list 출력에는 source 정보가 없으므로 기본값 사용
-        skills.push({ name, source: DEFAULT_SKILL_SOURCE_REPO });
+async function runSync(options = {}) {
+    const strategy = (0, syncCore_1.parseStrategy)(options.strategyInput);
+    const dryRun = options.dryRun === true;
+    const asJson = options.json === true;
+    const token = await config_1.configStore.getToken();
+    if (!token) {
+        throw new Error("You must login first. Run `skillhub login` and try again.");
     }
-    return uniqueSortedSkills(skills);
-}
-function normalizeSkills(skills) {
-    const bannedSubstrings = [
-        "No global skills found",
-        "Try listing project skills without -g",
-        "No project skills found",
-        "Try listing global skills",
-    ];
-    const normalized = skills
-        .map((skill) => {
-        if (typeof skill === "string") {
-            return { name: skill, source: DEFAULT_SKILL_SOURCE_REPO };
+    const nowIso = new Date().toISOString();
+    const localSkills = await (0, skillsService_1.getLocalSkills)();
+    const localPayload = {
+        skills: localSkills,
+        updatedAt: nowIso,
+    };
+    const { octokit, gistId, remotePayload } = await resolveRemotePayload(token);
+    const hasRemoteGist = Boolean(gistId);
+    if (!hasRemoteGist) {
+        if (dryRun) {
+            const summary = createSummaryFromPlan({
+                strategy,
+                dryRun: true,
+                gistFound: false,
+                gistCreated: false,
+                remoteNewer: null,
+                uploaded: 1,
+                installPlanned: 0,
+                installed: 0,
+                failed: [],
+                lastSyncAtUpdated: false,
+            });
+            (0, output_1.emitOutput)(summary, asJson, formatSyncSummary);
+            return summary;
         }
-        return skill;
-    })
-        .filter((skill) => !!skill.name &&
-        !bannedSubstrings.some((bad) => skill.name.includes(bad)));
-    return uniqueSortedSkills(normalized);
-}
-async function safeGetPayload(octokit, gistId) {
-    try {
-        return await (0, gistService_1.getSkillhubPayload)(octokit, gistId);
-    }
-    catch {
-        return null;
-    }
-}
-function uniqueSortedSkills(skills) {
-    const seen = new Set();
-    const result = [];
-    for (const skill of skills) {
-        const key = `${skill.source}:${skill.name}`;
-        if (!seen.has(key)) {
-            seen.add(key);
-            result.push(skill);
+        const created = await (0, gistService_1.createSkillhubGist)(octokit, localPayload);
+        if (!created.id) {
+            throw new Error("Gist was created, but the ID could not be determined.");
         }
+        await config_1.configStore.setGistId(created.id);
+        await config_1.configStore.setLastSyncAt(nowIso);
+        const summary = createSummaryFromPlan({
+            strategy,
+            dryRun: false,
+            gistFound: false,
+            gistCreated: true,
+            remoteNewer: null,
+            uploaded: 1,
+            installPlanned: 0,
+            installed: 0,
+            failed: [],
+            lastSyncAtUpdated: true,
+        });
+        (0, output_1.emitOutput)(summary, asJson, formatSyncSummary);
+        return summary;
+    }
+    const lastSyncAt = await config_1.configStore.getLastSyncAt();
+    const plan = (0, syncCore_1.buildSyncPlan)({
+        strategy,
+        localPayload,
+        remotePayload,
+        lastSyncAt,
+        nowIso,
+    });
+    const invalidInstallCandidates = plan.installCandidates
+        .filter((skill) => !(0, skillsService_1.isValidSource)(skill.source))
+        .map((skill) => ({
+        skill,
+        reason: `Invalid source "${skill.source}". Expected owner/repo format.`,
+    }));
+    const validInstallCandidates = plan.installCandidates.filter((skill) => (0, skillsService_1.isValidSource)(skill.source));
+    if (dryRun) {
+        const summary = createSummaryFromPlan({
+            strategy,
+            dryRun: true,
+            gistFound: true,
+            gistCreated: false,
+            remoteNewer: strategy === "latest" ? plan.isRemoteNewer : null,
+            uploaded: plan.uploadPayload ? 1 : 0,
+            installPlanned: plan.installCandidates.length,
+            installed: 0,
+            failed: invalidInstallCandidates,
+            lastSyncAtUpdated: false,
+        });
+        (0, output_1.emitOutput)(summary, asJson, formatSyncSummary);
+        return summary;
     }
-    return result.sort((a, b) => {
-        if (a.source !== b.source) {
-            return a.source.localeCompare(b.source);
-        }
-        return a.name.localeCompare(b.name);
+    const installResult = await (0, skillsService_1.installSkills)(validInstallCandidates, {
+        verbose: !asJson,
     });
-}
-async function installSkills(skills) {
-    const succeeded = [];
-    const failed = [];
-    for (const skill of skills) {
-        try {
-            const { stdout, stderr } = await execAsync(`npx skills add ${skill.source} --skill "${skill.name}" --global --yes`);
-            const output = `${stdout ?? ""}\n${stderr ?? ""}`.trim();
-            if (output) {
-                console.log(output);
-            }
-            succeeded.push(skill);
-        }
-        catch (error) {
-            const stdout = error?.stdout ?? "";
-            const stderr = error?.stderr ?? "";
-            const reason = `${stdout}\n${stderr}`.trim() || String(error);
-            failed.push({ skill, reason });
-            console.warn([
-                `스킬 설치 실패: ${skill.name} (from ${skill.source})`,
-                reason && `  └─ ${reason}`,
-            ]
-                .filter(Boolean)
-                .join("\n"));
+    const failed = [...invalidInstallCandidates, ...installResult.failed];
+    if (plan.uploadPayload) {
+        await (0, gistService_1.updateSkillhubGist)(octokit, gistId, plan.uploadPayload);
+    }
+    const summary = createSummaryFromPlan({
+        strategy,
+        dryRun: false,
+        gistFound: true,
+        gistCreated: false,
+        remoteNewer: strategy === "latest" ? plan.isRemoteNewer : null,
+        uploaded: plan.uploadPayload ? 1 : 0,
+        installPlanned: plan.installCandidates.length,
+        installed: installResult.succeeded.length,
+        failed,
+        lastSyncAtUpdated: false,
+    });
+    if (failed.length === 0) {
+        await config_1.configStore.setLastSyncAt(nowIso);
+        summary.lastSyncAtUpdated = true;
+    }
+    (0, output_1.emitOutput)(summary, asJson, formatSyncSummary);
+    if (failed.length > 0) {
+        if (asJson) {
+            process.exitCode = 1;
+            return summary;
         }
+        throw new Error(`Sync completed with ${failed.length} failed install(s). Check logs above.`);
     }
-    return { succeeded, failed };
-}
-async function applyUnionStrategy(params) {
-    const localSkills = normalizeSkills(params.local.skills);
-    const remoteSkills = normalizeSkills(params.remote.skills);
-    const unionSkills = uniqueSortedSkills([...localSkills, ...remoteSkills]);
-    const missingLocally = unionSkills.filter((skill) => !localSkills.some((local) => local.name === skill.name && local.source === skill.source));
-    const payload = {
-        skills: unionSkills,
-        updatedAt: new Date().toISOString(),
-    };
-    const { succeeded, failed } = await installSkills(missingLocally);
-    await (0, gistService_1.updateSkillhubGist)(params.octokit, params.gistId, payload);
-    const uploadCount = areSameSkills(remoteSkills, unionSkills) ? 0 : 1;
-    const installCount = succeeded.length;
-    const failedCount = failed.length;
-    console.log(`업로드 ${uploadCount}건, 설치 ${installCount}건${failedCount ? ` (실패 ${failedCount}건은 로그 참고)` : ""}`);
-}
-async function applyLatestStrategy(params) {
-    const localTime = Date.parse(params.local.updatedAt);
-    const remoteTime = Date.parse(params.remote.updatedAt);
-    const isRemoteNewer = Number.isFinite(remoteTime) && remoteTime > localTime;
-    if (isRemoteNewer) {
-        const localSkills = normalizeSkills(params.local.skills);
-        const remoteSkills = normalizeSkills(params.remote.skills);
-        const missingLocally = remoteSkills.filter((skill) => !localSkills.some((local) => local.name === skill.name && local.source === skill.source));
-        const { succeeded, failed } = await installSkills(missingLocally);
-        const failedCount = failed.length;
-        console.log(`업로드 0건, 설치 ${succeeded.length}건${failedCount ? ` (실패 ${failedCount}건은 로그 참고)` : ""}`);
-        return;
-    }
-    await (0, gistService_1.updateSkillhubGist)(params.octokit, params.gistId, params.local);
-    console.log("업로드 1건, 설치 0건");
-}
-function areSameSkills(left, right) {
-    const leftSorted = uniqueSortedSkills(left);
-    const rightSorted = uniqueSortedSkills(right);
-    if (leftSorted.length !== rightSorted.length) {
-        return false;
-    }
-    return leftSorted.every((skill, index) => skill.name === rightSorted[index].name &&
-        skill.source === rightSorted[index].source);
+    return summary;
 }

package/dist/core/syncCore.js

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseStrategy = parseStrategy;
+exports.parseTimestamp = parseTimestamp;
+exports.normalizeSkills = normalizeSkills;
+exports.uniqueSortedSkills = uniqueSortedSkills;
+exports.areSameSkills = areSameSkills;
+exports.buildSyncPlan = buildSyncPlan;
+const DEFAULT_SKILL_SOURCE_REPO = "vercel-labs/agent-skills";
+const BANNED_SKILL_NAME_SUBSTRINGS = [
+    "No global skills found",
+    "Try listing project skills without -g",
+    "No project skills found",
+    "Try listing global skills",
+];
+function parseStrategy(input) {
+    if (!input) {
+        return "union";
+    }
+    if (input === "union" || input === "latest") {
+        return input;
+    }
+    throw new Error(`Invalid strategy "${input}". Use one of: union, latest.`);
+}
+function parseTimestamp(value) {
+    if (!value) {
+        return null;
+    }
+    const parsed = Date.parse(value);
+    return Number.isFinite(parsed) ? parsed : null;
+}
+function normalizeSkills(skills) {
+    const normalized = skills
+        .map((skill) => {
+        if (typeof skill === "string") {
+            return { name: skill, source: DEFAULT_SKILL_SOURCE_REPO };
+        }
+        return {
+            name: String(skill?.name ?? ""),
+            source: String(skill?.source ?? DEFAULT_SKILL_SOURCE_REPO),
+        };
+    })
+        .filter((skill) => skill.name.length > 0 &&
+        !BANNED_SKILL_NAME_SUBSTRINGS.some((bad) => skill.name.includes(bad)));
+    return uniqueSortedSkills(normalized);
+}
+function uniqueSortedSkills(skills) {
+    const seen = new Set();
+    const result = [];
+    for (const skill of skills) {
+        const key = `${skill.source}:${skill.name}`;
+        if (!seen.has(key)) {
+            seen.add(key);
+            result.push(skill);
+        }
+    }
+    return result.sort((a, b) => {
+        if (a.source !== b.source) {
+            return a.source.localeCompare(b.source);
+        }
+        return a.name.localeCompare(b.name);
+    });
+}
+function areSameSkills(left, right) {
+    const leftSorted = uniqueSortedSkills(left);
+    const rightSorted = uniqueSortedSkills(right);
+    if (leftSorted.length !== rightSorted.length) {
+        return false;
+    }
+    return leftSorted.every((skill, index) => skill.name === rightSorted[index].name &&
+        skill.source === rightSorted[index].source);
+}
+function buildSyncPlan(params) {
+    const localSkills = normalizeSkills(params.localPayload.skills);
+    const remoteSkills = normalizeSkills(params.remotePayload.skills);
+    if (params.strategy === "union") {
+        const unionSkills = uniqueSortedSkills([...localSkills, ...remoteSkills]);
+        const installCandidates = unionSkills.filter((skill) => !localSkills.some((local) => local.name === skill.name && local.source === skill.source));
+        const uploadPayload = areSameSkills(remoteSkills, unionSkills)
+            ? null
+            : {
+                skills: unionSkills,
+                updatedAt: params.nowIso,
+            };
+        return {
+            strategy: "union",
+            localSkills,
+            remoteSkills,
+            installCandidates,
+            uploadPayload,
+            isRemoteNewer: false,
+        };
+    }
+    const lastSyncTime = parseTimestamp(params.lastSyncAt) ?? 0;
+    const remoteTime = parseTimestamp(params.remotePayload.updatedAt);
+    const isRemoteNewer = remoteTime !== null && remoteTime > lastSyncTime;
+    if (isRemoteNewer) {
+        const installCandidates = remoteSkills.filter((skill) => !localSkills.some((local) => local.name === skill.name && local.source === skill.source));
+        return {
+            strategy: "latest",
+            localSkills,
+            remoteSkills,
+            installCandidates,
+            uploadPayload: null,
+            isRemoteNewer,
+        };
+    }
+    const uploadPayload = areSameSkills(localSkills, remoteSkills)
+        ? null
+        : {
+            skills: localSkills,
+            updatedAt: params.nowIso,
+        };
+    return {
+        strategy: "latest",
+        localSkills,
+        remoteSkills,
+        installCandidates: [],
+        uploadPayload,
+        isRemoteNewer,
+    };
+}