@g3nomaly/skills 1.0.0 → 1.0.1

package/dist/cli/adapter.d.ts

@@ -1,7 +1,9 @@
 import { resolveProjectRoot } from "@g3nomaly/core/config";
 import type { G3nConfig } from "@g3nomaly/core/config";
-import type { EntrySource, InstallTarget } from "@g3nomaly/core/cli";
-import type { SkillRegistry } from "../registry/types";
+import type { InstallCommandContext, ManifestTarget } from "@g3nomaly/core/cli";
+import type { SourceRegistry } from "@g3nomaly/core/installer";
+import type { RegisteredSource } from "@g3nomaly/core/sources";
+import type { SkillMeta, SkillRegistry } from "../registry/types";
 /** Injection point for tests; the real project root comes from git discovery. */
 export interface ProjectDeps {
     resolveProjectRoot?: typeof resolveProjectRoot;
@@ -11,20 +13,21 @@ export declare function openSkillProject(deps?: ProjectDeps): Promise<{
     projectRoot: string;
     config: G3nConfig;
 }>;
-export declare function skillRegistry(): Promise<SkillRegistry>;
-/** One install target per configured harness, narrowed to `only` when given. */
-export declare function skillTargets(config: G3nConfig, projectRoot: string, only?: string[]): Promise<InstallTarget[]>;
+/** One target per configured harness, narrowed to `only` when given; exits on an unreadable `skills.json`. */
+export declare function skillTargets(config: G3nConfig, projectRoot: string, only?: string[]): ManifestTarget[];
+/** Built-in sources plus those registered in any of the targets' `skills.json`. */
+export declare function skillSources(targets: readonly ManifestTarget[]): RegisteredSource[];
+/** Installed skills of one target. */
+export declare function installedSkills(target: ManifestTarget): SkillRegistry;
+/** What the core install and source commands print and check for skills. */
+export declare const SKILL_CONTEXT: InstallCommandContext<SkillMeta>;
 /**
- * Expands group names to their skills and separates unknown keys. With
- * `withDependencies` each skill also pulls in its `registryDependencies`
- * closure; `notes` says which skill required each pulled-in key. When a key
- * names both a group and a skill, the group wins unless `skillFirst` is set
- * (remote plugins often carry a skill named like the plugin itself).
+ * Reads the skills of the targets' sources, or only those of `only`, and
+ * prints what could not be read; the caller disposes the result.
+ *
+ * @param only - Source name to read alone; exits when no such source is registered
  */
-export declare function resolveSkillKeys(keys: string[], registry: SkillRegistry, withDependencies?: boolean, skillFirst?: boolean): {
-    resolved: string[];
-    unknown: string[];
-    notes: Record<string, string>;
-};
-export declare const skillSource: EntrySource;
+export declare function openSkillRegistry(targets: readonly ManifestTarget[], projectRoot: string, only?: string): Promise<SourceRegistry<SkillMeta>>;
+/** Installs the packages of the given skills in one target and prints each failure; sets exit code 1 on any. */
+export declare function installPackagesReporting(target: ManifestTarget, keys: readonly string[]): Promise<void>;
 //# sourceMappingURL=adapter.d.ts.map

package/dist/cli/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/cli/adapter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC1F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,iFAAiF;AACjF,MAAM,WAAW,WAAW;IAC1B,kBAAkB,CAAC,EAAE,OAAO,kBAAkB,CAAC;CAChD;AAED,8FAA8F;AAC9F,wBAAsB,gBAAgB,CAAC,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAE,CAAC,CAOlH;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC,CAE5D;AAED,gFAAgF;AAChF,wBAAsB,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAgBpH;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EAAE,EACd,QAAQ,EAAE,aAAa,EACvB,gBAAgB,UAAQ,EACxB,UAAU,UAAQ,GACjB;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAgC1E;AAED,eAAO,MAAM,WAAW,EAAE,WAGzB,CAAC"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/cli/adapter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiC,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC1F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI/D,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIlE,iFAAiF;AACjF,MAAM,WAAW,WAAW;IAC1B,kBAAkB,CAAC,EAAE,OAAO,kBAAkB,CAAC;CAChD;AAED,8FAA8F;AAC9F,wBAAsB,gBAAgB,CAAC,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAE,CAAC,CAOlH;AAED,8GAA8G;AAC9G,wBAAgB,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,cAAc,EAAE,CAWtG;AAED,mFAAmF;AACnF,wBAAgB,YAAY,CAAC,OAAO,EAAE,SAAS,cAAc,EAAE,GAAG,gBAAgB,EAAE,CAEnF;AAED,sCAAsC;AACtC,wBAAgB,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,aAAa,CAErE;AAED,4EAA4E;AAC5E,eAAO,MAAM,aAAa,EAAE,qBAAqB,CAAC,SAAS,CAAsE,CAAC;AAElI;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,SAAS,cAAc,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAIlJ;AAED,gHAAgH;AAChH,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAM7G"}

package/dist/cli/adapter.js

@@ -1,86 +1,62 @@
 // packages/skills/src/cli/adapter.ts
 import path from "node:path";
-import { collectDependencies, entries } from "@g3nomaly/core/registry";
-import { copySource } from "@g3nomaly/core/installer";
 import { SkillTargetSchema, loadConfig, resolveProjectRoot } from "@g3nomaly/core/config";
-import { lineError } from "@g3nomaly/core/cli";
-import { loadPackageRegistry, resolveSkillSourcePath } from "../registry/loadPackageRegistry";
-import { loadUserManifest } from "../registry/userManifest";
+import { c, lineError, narrowSources, orExit, reportSourceRegistry } from "@g3nomaly/core/cli";
+import { installedEntries, loadInstallManifest, loadSourceRegistry, manifestSources } from "@g3nomaly/core/installer";
+import { skillsManifestPath } from "../registry/manifest";
+import { readSkillSource } from "../registry/readSource";
 import { SkillMetaSchema } from "../registry/types";
+import { installSkillPackages } from "../packages/install";
+import { BUILTIN_SOURCES } from "../sources/builtins";
 /** Anchors the command to the git project and loads its config; exits when outside a repo. */
 export async function openSkillProject(deps = {}) {
     const projectRoot = (deps.resolveProjectRoot ?? resolveProjectRoot)();
     if (projectRoot === null) {
-        console.error(lineError("No g3n project found — run `g3n-skills init` inside a git repository."));
+        console.error(lineError("No g3n project found: run `g3n-skills init` inside a git repository."));
         process.exit(1);
     }
     return { projectRoot, config: await loadConfig(projectRoot) };
 }
-export async function skillRegistry() {
-    return entries(await loadPackageRegistry());
-}
-/** One install target per configured harness, narrowed to `only` when given. */
-export async function skillTargets(config, projectRoot, only) {
+/** One target per configured harness, narrowed to `only` when given; exits on an unreadable `skills.json`. */
+export function skillTargets(config, projectRoot, only) {
     const settings = config.skills.settings;
     const wanted = only === undefined || only.length === 0
         ? settings.targets
         : only.map((t) => SkillTargetSchema.parse(t));
-    const targets = [];
-    for (const target of wanted) {
+    return wanted.map((target) => {
         const installDir = settings.installDirs[target];
-        targets.push({
-            label: target,
-            installDir: path.join(projectRoot, installDir),
-            store: await loadUserManifest(projectRoot, installDir),
-        });
-    }
-    return targets;
+        const manifest = orExit(() => loadInstallManifest(skillsManifestPath(projectRoot, installDir), SkillMetaSchema));
+        return { label: target, installDir: path.join(projectRoot, installDir), store: manifest.store, manifest };
+    });
+}
+/** Built-in sources plus those registered in any of the targets' `skills.json`. */
+export function skillSources(targets) {
+    return manifestSources(targets.map((t) => t.manifest), BUILTIN_SOURCES);
 }
+/** Installed skills of one target. */
+export function installedSkills(target) {
+    return installedEntries(target.manifest, SkillMetaSchema);
+}
+/** What the core install and source commands print and check for skills. */
+export const SKILL_CONTEXT = { bin: "g3n-skills", noun: "skill", entrySchema: SkillMetaSchema };
 /**
- * Expands group names to their skills and separates unknown keys. With
- * `withDependencies` each skill also pulls in its `registryDependencies`
- * closure; `notes` says which skill required each pulled-in key. When a key
- * names both a group and a skill, the group wins unless `skillFirst` is set
- * (remote plugins often carry a skill named like the plugin itself).
+ * Reads the skills of the targets' sources, or only those of `only`, and
+ * prints what could not be read; the caller disposes the result.
+ *
+ * @param only - Source name to read alone; exits when no such source is registered
  */
-export function resolveSkillKeys(keys, registry, withDependencies = false, skillFirst = false) {
-    const groups = {};
-    for (const [key, meta] of Object.entries(registry))
-        (groups[meta.group] ??= []).push(key);
-    const named = [];
-    const unknown = [];
-    const notes = {};
-    for (const raw of keys) {
-        const key = raw.toLowerCase();
-        const group = groups[key];
-        if (registry[key] && (skillFirst || group === undefined)) {
-            named.push(key);
-            if (group !== undefined)
-                notes[key] = `also a plugin name — picked the single skill; name the plugin's other skills to add more`;
-        }
-        else if (group !== undefined) {
-            named.push(...group);
-        }
-        else {
-            unknown.push(key);
-        }
-    }
-    if (!withDependencies)
-        return { resolved: [...new Set(named)], unknown, notes };
-    const resolved = [];
-    for (const key of new Set(named)) {
-        const closure = new Set();
-        collectDependencies(key, registry, closure, unknown);
-        for (const dep of closure) {
-            if (!named.includes(dep) && notes[dep] === undefined)
-                notes[dep] = `dep of ${key}`;
-            resolved.push(dep);
-        }
+export async function openSkillRegistry(targets, projectRoot, only) {
+    const registry = await loadSourceRegistry(narrowSources(skillSources(targets), only, "g3n-skills"), projectRoot, readSkillSource);
+    reportSourceRegistry(registry);
+    return registry;
+}
+/** Installs the packages of the given skills in one target and prints each failure; sets exit code 1 on any. */
+export async function installPackagesReporting(target, keys) {
+    for (const result of await installSkillPackages(target.installDir, keys)) {
+        if (result.error === undefined)
+            continue;
+        console.error(lineError(`${c.key(result.key)} (${c.target(target.label)}): its packages could not be installed, so its hooks will not run: ${result.error}`));
+        process.exitCode = 1;
     }
-    return { resolved: [...new Set(resolved)], unknown: [...new Set(unknown)], notes };
 }
-export const skillSource = (entry) => {
-    const { group } = SkillMetaSchema.pick({ group: true }).parse(entry);
-    return copySource((filePath) => resolveSkillSourcePath(group, filePath));
-};
 //# sourceMappingURL=adapter.js.map

package/dist/cli/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/cli/adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/cli/adapter.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/add.d.ts

@@ -1,17 +1,14 @@
-import type { Dialogue, InstallInput, InstallOptions } from "@g3nomaly/core/cli";
+import type { InstallOptions } from "@g3nomaly/core/cli";
 import type { ProjectDeps } from "../adapter";
 export interface AddOptions extends InstallOptions {
     targets?: string[];
-    /** Git URL of a plugin or marketplace repository to install from instead of the package */
-    remote?: string;
 }
-export declare const noValueDialogue: Dialogue<InstallInput>;
-export declare const entryNotFoundDialogue: Dialogue<InstallInput>;
-export declare const collisionDialogue: Dialogue<InstallInput>;
 /**
- * Installs skills (or whole groups) into every configured target. With
- * `--remote` the registry comes from a cloned plugin repository instead of
- * the package; dependency resolution is off there.
+ * Installs skills or whole groups from the registered sources into every
+ * configured target, each with the skills it depends on from any source, and
+ * installs the packages of the skills that ship a `package.json`. A name more
+ * than one source offers is picked as `<name>@<source>`; with no names the
+ * user picks from what the sources offer.
  */
-export declare function addCommand(keys: string[], options?: AddOptions, deps?: ProjectDeps): Promise<void>;
+export declare function addCommand(names: string[], options?: AddOptions, deps?: ProjectDeps): Promise<void>;
 //# sourceMappingURL=add.d.ts.map

package/dist/cli/commands/add.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/add.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAe,YAAY,EAAE,cAAc,EAAiB,MAAM,oBAAoB,CAAC;AAO7G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,UAAW,SAAQ,cAAc;IAChD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,2FAA2F;IAC3F,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,YAAY,CAQlD,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,YAAY,CAQxD,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,YAAY,CAWpD,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,UAAe,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BhH"}
+{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/add.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,UAAW,SAAQ,cAAc;IAChD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,UAAe,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CASjH"}

package/dist/cli/commands/add.js

@@ -1,108 +1,22 @@
 // packages/skills/src/cli/commands/add.ts
-import { addEntries, runDialogueValue, ConflictDecision, StepKind, c, lineError, lineInfo, lineWarn } from "@g3nomaly/core/cli";
-import { saveUserManifest } from "../../registry/userManifest";
-import { cloneRemote, removeCheckout } from "../../remote/fetch";
-import { loadRemoteRegistry, remoteSkillSource } from "../../remote/registry";
-import { openSkillProject, resolveSkillKeys, skillRegistry, skillSource, skillTargets } from "../adapter";
-export const noValueDialogue = {
-    steps: {
-        selectSkills: {
-            kind: StepKind.MultiSelect,
-            message: "Select skills to install:",
-            choices: (input) => input.keyChoices ?? [],
-        },
-    },
-};
-export const entryNotFoundDialogue = {
-    steps: {
-        entryNotFound: {
-            kind: StepKind.Confirm,
-            message: "Unknown skill(s): {unknown}. Continue with the remaining selection?",
-            initial: false,
-        },
-    },
-};
-export const collisionDialogue = {
-    steps: {
-        conflict: {
-            kind: StepKind.Select,
-            message: "{key} ({target}) has local changes. What would you like to do?",
-            choices: [
-                { value: ConflictDecision.Keep, label: "Keep my changes — skip modified files" },
-                { value: ConflictDecision.Overwrite, label: "Overwrite with the package version" },
-            ],
-        },
-    },
-};
+import { addFromSources } from "@g3nomaly/core/cli";
+import { SKILL_CONTEXT, installPackagesReporting, openSkillProject, openSkillRegistry, skillTargets } from "../adapter";
 /**
- * Installs skills (or whole groups) into every configured target. With
- * `--remote` the registry comes from a cloned plugin repository instead of
- * the package; dependency resolution is off there.
+ * Installs skills or whole groups from the registered sources into every
+ * configured target, each with the skills it depends on from any source, and
+ * installs the packages of the skills that ship a `package.json`. A name more
+ * than one source offers is picked as `<name>@<source>`; with no names the
+ * user picks from what the sources offer.
  */
-export async function addCommand(keys, options = {}, deps = {}) {
+export async function addCommand(names, options = {}, deps = {}) {
     const { projectRoot, config } = await openSkillProject(deps);
-    const targets = await skillTargets(config, projectRoot, options.targets);
-    if (options.remote === undefined) {
-        const registry = await skillRegistry();
-        await installSkills(keys, registry, skillSource, targets, options, {
-            withDependencies: true,
-            skillFirst: false,
-            unknownHint: `Run ${c.cmd("g3n-skills ls")} to see what is available.`,
-        });
-        return;
-    }
-    const checkout = await cloneRemoteOrExit(options.remote);
+    const targets = skillTargets(config, projectRoot, options.targets);
+    const registry = await openSkillRegistry(targets, projectRoot);
     try {
-        const { registry, warnings } = await loadRemoteRegistryOrExit(checkout);
-        for (const warning of warnings)
-            console.log(lineWarn(warning));
-        await installSkills(keys, registry, remoteSkillSource(checkout), targets, options, {
-            withDependencies: false,
-            skillFirst: true,
-            unknownHint: `The repository provides: ${Object.keys(registry).map((k) => c.key(k)).join(", ")}.`,
-        });
+        await addFromSources(targets, names, registry, options, SKILL_CONTEXT, installPackagesReporting);
     }
     finally {
-        removeCheckout(checkout);
-    }
-}
-async function installSkills(keys, registry, source, targets, options, plan) {
-    const { resolved, unknown, notes } = resolveSkillKeys(keys, registry, plan.withDependencies, plan.skillFirst);
-    if (unknown.length > 0) {
-        console.error(lineError(`Unknown skill(s): ${unknown.map((k) => c.key(k)).join(", ")}. ${plan.unknownHint}`));
-        const proceed = resolved.length > 0
-            && (await runDialogueValue(entryNotFoundDialogue, { unknown: unknown.map((k) => c.key(k)).join(", ") }, options.answers)) === true;
-        if (!proceed)
-            process.exit(1);
-    }
-    for (const [dep, why] of Object.entries(notes))
-        console.log(lineInfo(`${c.key(dep)} — ${why}`));
-    await addEntries(registry, targets, source, resolved, options, {
-        onNoValue: noValueDialogue,
-        onCollision: collisionDialogue,
-    });
-    for (const target of targets)
-        saveUserManifest(target.store);
-}
-async function cloneRemoteOrExit(url) {
-    try {
-        return await cloneRemote(url);
+        registry.dispose();
     }
-    catch (error) {
-        console.error(lineError(`Could not fetch ${c.key(url)} — ${errorMessage(error)}`));
-        process.exit(1);
-    }
-}
-async function loadRemoteRegistryOrExit(checkout) {
-    try {
-        return await loadRemoteRegistry(checkout);
-    }
-    catch (error) {
-        console.error(lineError(`${c.key(checkout.url)} — ${errorMessage(error)}`));
-        process.exit(1);
-    }
-}
-function errorMessage(error) {
-    return error instanceof Error ? error.message : String(error);
 }
 //# sourceMappingURL=add.js.map

package/dist/cli/commands/add.js.map

@@ -1 +1 @@
-{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../src/cli/commands/add.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../src/cli/commands/add.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAOxH;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,KAAe,EAAE,OAAO,GAAe,EAAE,EAAE,IAAI,GAAgB,EAAE;IAChG,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAI,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC/D,IAAI,CAAC;QACH,MAAM,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,wBAAwB,CAAC,CAAC;IACnG,CAAC;YAAS,CAAC;QACT,QAAQ,CAAC,OAAO,EAAE,CAAC;IACrB,CAAC;AACH,CAAC"}

package/dist/cli/commands/ls.d.ts

@@ -1,4 +1,11 @@
 import type { LSOptions } from "@g3nomaly/core/cli";
-/** Lists skills available in the package, grouped by plugin. */
-export declare function lsCommand(options?: LSOptions): Promise<void>;
+import type { ProjectDeps } from "../adapter";
+export interface LsOptions extends LSOptions {
+    /** List what `skills.json` records instead of what the sources offer */
+    installed?: boolean;
+    /** Only the skills of this registered source */
+    source?: string;
+}
+/** Lists the skills the registered sources offer, `●` marking installed ones, or with `installed` only what is installed. */
+export declare function lsCommand(options?: LsOptions, deps?: ProjectDeps): Promise<void>;
 //# sourceMappingURL=ls.d.ts.map

package/dist/cli/commands/ls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ls.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/ls.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAGpD,gEAAgE;AAChE,wBAAsB,SAAS,CAAC,OAAO,GAAE,SAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtE"}
+{"version":3,"file":"ls.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/ls.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,SAAU,SAAQ,SAAS;IAC1C,wEAAwE;IACxE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gDAAgD;IAChD,MAAM,CAAC,EAAK,MAAM,CAAC;CACpB;AAED,6HAA6H;AAC7H,wBAAsB,SAAS,CAAC,OAAO,GAAE,SAAc,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9F"}

package/dist/cli/commands/ls.js

@@ -1,8 +1,24 @@
 // packages/skills/src/cli/commands/ls.ts
-import { lsEntries } from "@g3nomaly/core/cli";
-import { skillRegistry } from "../adapter";
-/** Lists skills available in the package, grouped by plugin. */
-export async function lsCommand(options = {}) {
-    lsEntries(await skillRegistry(), options);
+import { lsEntries, lsSourceRegistry } from "@g3nomaly/core/cli";
+import { installedSkills, openSkillProject, openSkillRegistry, skillSources, skillTargets } from "../adapter";
+/** Lists the skills the registered sources offer, `●` marking installed ones, or with `installed` only what is installed. */
+export async function lsCommand(options = {}, deps = {}) {
+    const { projectRoot, config } = await openSkillProject(deps);
+    const targets = skillTargets(config, projectRoot);
+    const installed = {};
+    for (const target of targets)
+        for (const [key, entry] of Object.entries(installedSkills(target)))
+            installed[key] ??= entry;
+    if (options.installed === true) {
+        lsEntries(installed, options);
+        return;
+    }
+    const registry = await openSkillRegistry(targets, projectRoot, options.source);
+    try {
+        lsSourceRegistry(registry, skillSources(targets), installed, options);
+    }
+    finally {
+        registry.dispose();
+    }
 }
 //# sourceMappingURL=ls.js.map

package/dist/cli/commands/ls.js.map

@@ -1 +1 @@
-{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../../src/cli/commands/ls.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,gEAAgE;AAChE,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,OAAO,GAAc,EAAE;IACrD,SAAS,CAAC,MAAM,aAAa,EAAE,EAAE,OAAO,CAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../../src/cli/commands/ls.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGjE,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAU9G,6HAA6H;AAC7H,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,OAAO,GAAc,EAAE,EAAE,IAAI,GAAgB,EAAE;IAC7E,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAK,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACpD,MAAM,SAAS,GAAkB,EAAE,CAAC;IACpC,KAAK,MAAM,MAAM,IAAI,OAAO;QAAE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAAE,SAAS,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC;IAE3H,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;QAC/B,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC9B,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/E,IAAI,CAAC;QACH,gBAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;YAAS,CAAC;QACT,QAAQ,CAAC,OAAO,EAAE,CAAC;IACrB,CAAC;AACH,CAAC"}

package/dist/cli/commands/remove.d.ts

@@ -1,12 +1,12 @@
-import type { Dialogue, InstallInput, InstallOptions } from "@g3nomaly/core/cli";
+import type { InstallOptions } from "@g3nomaly/core/cli";
 import type { ProjectDeps } from "../adapter";
 export interface RemoveOptions extends InstallOptions {
     targets?: string[];
 }
-export declare const noValueDialogue: Dialogue<InstallInput>;
-export declare const cascadeDialogue: Dialogue<InstallInput>;
-export declare const collisionDialogue: Dialogue<InstallInput>;
-export declare const incompleteDialogue: Dialogue<InstallInput>;
-/** Removes installed skills and drops them from each target's `skills.json`. */
-export declare function removeCommand(keys: string[], options?: RemoveOptions, deps?: ProjectDeps): Promise<void>;
+/**
+ * Removes installed skills, hooks included, with the packages installed into
+ * them, and drops them from each target's `skills.json`. Works from the
+ * manifests alone; installed dependents are offered for removal too.
+ */
+export declare function removeCommand(names: string[], options?: RemoveOptions, deps?: ProjectDeps): Promise<void>;
 //# sourceMappingURL=remove.d.ts.map

package/dist/cli/commands/remove.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/remove.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,aAAc,SAAQ,cAAc;IACnD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,YAAY,CAQlD,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,YAAY,CAQlD,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,YAAY,CAWpD,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,YAAY,CAQrD,CAAC;AAEF,gFAAgF;AAChF,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,aAAkB,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBtH"}
+{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/remove.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,aAAc,SAAQ,cAAc;IACnD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,aAAkB,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIvH"}

package/dist/cli/commands/remove.js

@@ -1,60 +1,15 @@
 // packages/skills/src/cli/commands/remove.ts
-import { removeEntries, ConflictDecision, StepKind } from "@g3nomaly/core/cli";
-import { saveUserManifest } from "../../registry/userManifest";
-import { openSkillProject, resolveSkillKeys, skillRegistry, skillTargets } from "../adapter";
-export const noValueDialogue = {
-    steps: {
-        selectSkills: {
-            kind: StepKind.MultiSelect,
-            message: "Select skills to remove:",
-            choices: (input) => input.keyChoices ?? [],
-        },
-    },
-};
-export const cascadeDialogue = {
-    steps: {
-        cascade: {
-            kind: StepKind.Confirm,
-            message: "Also remove {dependents}?",
-            initial: true,
-        },
-    },
-};
-export const collisionDialogue = {
-    steps: {
-        conflict: {
-            kind: StepKind.Select,
-            message: "{key} ({target}) has local changes. What would you like to do?",
-            choices: [
-                { value: ConflictDecision.Keep, label: "Keep the skill — remove nothing" },
-                { value: ConflictDecision.Overwrite, label: "Remove it anyway, including my changes" },
-            ],
-        },
-    },
-};
-export const incompleteDialogue = {
-    steps: {
-        incomplete: {
-            kind: StepKind.Confirm,
-            message: "{key} ({target}) is missing {missing} on disk. Remove the rest and untrack it?",
-            initial: true,
-        },
-    },
-};
-/** Removes installed skills and drops them from each target's `skills.json`. */
-export async function removeCommand(keys, options = {}, deps = {}) {
+import { removeFromTargets } from "@g3nomaly/core/cli";
+import { removeSkillPackages } from "../../packages/install";
+import { SKILL_CONTEXT, openSkillProject, skillTargets } from "../adapter";
+/**
+ * Removes installed skills, hooks included, with the packages installed into
+ * them, and drops them from each target's `skills.json`. Works from the
+ * manifests alone; installed dependents are offered for removal too.
+ */
+export async function removeCommand(names, options = {}, deps = {}) {
     const { projectRoot, config } = await openSkillProject(deps);
-    const registry = await skillRegistry();
-    const targets = await skillTargets(config, projectRoot, options.targets);
-    // Unknown keys stay in the list so the command reports them as "not installed".
-    const { resolved, unknown } = resolveSkillKeys(keys, registry);
-    await removeEntries(registry, targets, [...resolved, ...unknown], options, {
-        onNoValue: noValueDialogue,
-        onCascade: cascadeDialogue,
-        onCollision: collisionDialogue,
-        onIncomplete: incompleteDialogue,
-    });
-    for (const target of targets)
-        saveUserManifest(target.store);
+    const targets = skillTargets(config, projectRoot, options.targets);
+    await removeFromTargets(targets, names, options, SKILL_CONTEXT, (target, removed) => removeSkillPackages(target.installDir, removed));
 }
 //# sourceMappingURL=remove.js.map

package/dist/cli/commands/remove.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../src/cli/commands/remove.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAO7F,MAAM,CAAC,MAAM,eAAe,GAA2B;IACrD,KAAK,EAAE;QACL,YAAY,EAAE;YACZ,IAAI,EAAK,QAAQ,CAAC,WAAW;YAC7B,OAAO,EAAE,0BAA0B;YACnC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE;SAC3C;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAA2B;IACrD,KAAK,EAAE;QACL,OAAO,EAAE;YACP,IAAI,EAAK,QAAQ,CAAC,OAAO;YACzB,OAAO,EAAE,2BAA2B;YACpC,OAAO,EAAE,IAAI;SACd;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAA2B;IACvD,KAAK,EAAE;QACL,QAAQ,EAAE;YACR,IAAI,EAAK,QAAQ,CAAC,MAAM;YACxB,OAAO,EAAE,gEAAgE;YACzE,OAAO,EAAE;gBACP,EAAE,KAAK,EAAE,gBAAgB,CAAC,IAAI,EAAO,KAAK,EAAE,iCAAiC,EAAE;gBAC/E,EAAE,KAAK,EAAE,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,wCAAwC,EAAE;aACvF;SACF;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAA2B;IACxD,KAAK,EAAE;QACL,UAAU,EAAE;YACV,IAAI,EAAK,QAAQ,CAAC,OAAO;YACzB,OAAO,EAAE,gFAAgF;YACzF,OAAO,EAAE,IAAI;SACd;KACF;CACF,CAAC;AAEF,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAc,EAAE,OAAO,GAAkB,EAAE,EAAE,IAAI,GAAgB,EAAE;IACrG,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAG,MAAM,aAAa,EAAE,CAAC;IACvC,MAAM,OAAO,GAAI,MAAM,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAE1E,gFAAgF;IAChF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE/D,MAAM,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC,EAAE,OAAO,EAAE;QACzE,SAAS,EAAK,eAAe;QAC7B,SAAS,EAAK,eAAe;QAC7B,WAAW,EAAG,iBAAiB;QAC/B,YAAY,EAAE,kBAAkB;KACjC,CAAC,CAAC;IAEH,KAAK,MAAM,MAAM,IAAI,OAAO;QAAE,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../src/cli/commands/remove.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAO3E;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,KAAe,EAAE,OAAO,GAAkB,EAAE,EAAE,IAAI,GAAgB,EAAE;IACtG,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACnE,MAAM,iBAAiB,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;AACxI,CAAC"}

package/dist/cli/commands/source.d.ts

@@ -0,0 +1,29 @@
+import type { ProjectDeps } from "../adapter";
+export interface SourceAddOptions {
+    /** Name to register under; derived from the source when absent */
+    name?: string;
+    /** Branch or tag a git source is pinned to */
+    ref?: string;
+    targets?: string[];
+}
+export interface SourceLsOptions {
+    json?: boolean;
+    targets?: string[];
+}
+export interface SourceRemoveOptions {
+    /** Unregister even when installed skills came from the source */
+    force?: boolean;
+    targets?: string[];
+}
+/**
+ * Registers a git repository, npm package or local folder as a skill source
+ * in every target's `skills.json`, after checking it offers at least one skill.
+ *
+ * @param input - The source as typed, e.g. `owner/repo`, `npm:@scope/skills` or `./my-skills`
+ */
+export declare function sourceAddCommand(input: string, options?: SourceAddOptions, deps?: ProjectDeps): Promise<void>;
+/** Lists each target's sources, built-in ones first, with how many installed skills came from each. */
+export declare function sourceLsCommand(options?: SourceLsOptions, deps?: ProjectDeps): Promise<void>;
+/** Unregisters a source from every target; refused for built-in sources and, unless forced, while skills came from it. */
+export declare function sourceRemoveCommand(name: string, options?: SourceRemoveOptions, deps?: ProjectDeps): Promise<void>;
+//# sourceMappingURL=source.d.ts.map

package/dist/cli/commands/source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/source.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAC/B,kEAAkE;IAClE,IAAI,CAAC,EAAK,MAAM,CAAC;IACjB,8CAA8C;IAC9C,GAAG,CAAC,EAAM,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAK,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,iEAAiE;IACjE,KAAK,CAAC,EAAI,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAOD;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAI3H;AAED,uGAAuG;AACvG,wBAAsB,eAAe,CAAC,OAAO,GAAE,eAAoB,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1G;AAED,0HAA0H;AAC1H,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhI"}