@spences10/pi-skills 0.0.19 → 0.0.21

package/dist/commands/skill-handlers.js

@@ -0,0 +1,184 @@
+import { show_text_modal } from '@spences10/pi-tui-modal';
+import { find_skill, format_skill_detail, format_skill_list, sort_skills, } from '../skill-utils.js';
+import { pick_skill, show_defaults_modal, show_refresh_summary, show_skill_detail_modal, show_skill_list_modal, } from '../skills-ui.js';
+import { handle_github_import } from './github-handlers.js';
+function notify_error(ctx, error) {
+    ctx.ui.notify(error instanceof Error ? error.message : String(error), 'warning');
+}
+export async function handle_list_command({ mgr, ctx, }) {
+    const skills = [...mgr.discover(), ...mgr.discover_importable()];
+    if (ctx.hasUI)
+        await show_skill_list_modal(ctx, mgr);
+    else
+        ctx.ui.notify(format_skill_list(skills));
+    return false;
+}
+export async function handle_show_command({ arg, mgr, ctx, }) {
+    const skills = [...mgr.discover(), ...mgr.discover_importable()];
+    let target = arg;
+    if (!target && ctx.hasUI) {
+        target =
+            (await pick_skill(ctx, {
+                title: 'Show skill details',
+                subtitle: 'Open a read-only skill detail view',
+                skills: sort_skills(skills),
+                empty_message: 'No skills found',
+            })) ?? '';
+        if (!target)
+            return true;
+    }
+    if (!target) {
+        ctx.ui.notify('Usage: /skills show <key|name>', 'warning');
+        return true;
+    }
+    try {
+        const skill = find_skill(skills, target);
+        if (ctx.hasUI)
+            await show_skill_detail_modal(ctx, skill);
+        else
+            ctx.ui.notify(format_skill_detail(skill));
+    }
+    catch (error) {
+        notify_error(ctx, error);
+    }
+    return false;
+}
+export async function handle_toggle_command(request) {
+    const { sub, arg, mgr, ctx } = request;
+    let target = arg;
+    if (!target && ctx.hasUI) {
+        target =
+            (await pick_skill(ctx, {
+                title: sub === 'enable'
+                    ? 'Enable skill in active profile'
+                    : 'Disable skill in active profile',
+                subtitle: `Profile: ${mgr.get_active_profile()}`,
+                skills: sort_skills(mgr.discover()),
+                empty_message: 'No managed skills found',
+            })) ?? '';
+        if (!target)
+            return true;
+    }
+    if (!target) {
+        ctx.ui.notify(`Usage: /skills ${sub} <key|name|pattern>`, 'warning');
+        return true;
+    }
+    let pattern = target;
+    try {
+        pattern = find_skill(mgr.discover(), target).key;
+    }
+    catch {
+        // Treat misses as patterns, e.g. design-* or *@plugin:vendor.
+    }
+    if (sub === 'enable')
+        mgr.enable(pattern);
+    else
+        mgr.disable(pattern);
+    ctx.ui.notify(`Updated ${mgr.get_active_profile()} profile. Reloading...`, 'info');
+    await ctx.reload();
+    return true;
+}
+export async function handle_import_command(request) {
+    const { arg, mgr, ctx } = request;
+    let target = arg;
+    if (!target && ctx.hasUI) {
+        target =
+            (await pick_skill(ctx, {
+                title: 'Import skill',
+                subtitle: 'Copy an external skill into Pi-native storage, or run: /skills import <owner/repo> <skill>',
+                skills: sort_skills(mgr.discover_importable()),
+                empty_message: 'No importable skills found',
+            })) ?? '';
+        if (!target)
+            return true;
+    }
+    if (!target) {
+        ctx.ui.notify('Usage: /skills import <key|name> OR /skills import <owner/repo> <skill[@ref]> [--pin ref|--scope project|--dir path|--force]', 'warning');
+        return true;
+    }
+    if (await handle_github_import(request))
+        return true;
+    try {
+        const result = mgr.import_skill(target);
+        ctx.ui.notify(`Imported ${target} to ${result.skillDir}. Reloading...`, 'info');
+        await ctx.reload();
+        return true;
+    }
+    catch (error) {
+        notify_error(ctx, error);
+        return true;
+    }
+}
+export async function handle_sync_command({ arg, mgr, ctx, }) {
+    let target = arg;
+    if (!target && ctx.hasUI) {
+        target =
+            (await pick_skill(ctx, {
+                title: 'Sync imported skill',
+                subtitle: 'Update an imported skill from its upstream source',
+                skills: sort_skills(mgr
+                    .discover()
+                    .filter((skill) => Boolean(skill.import_meta))),
+                empty_message: 'No imported skills found',
+            })) ?? '';
+        if (!target)
+            return true;
+    }
+    if (!target) {
+        ctx.ui.notify('Usage: /skills sync <key|name>', 'warning');
+        return true;
+    }
+    try {
+        const result = mgr.sync_skill(target);
+        if (result.changed) {
+            ctx.ui.notify(`Synced ${target}. Reloading...`, 'info');
+            await ctx.reload();
+            return true;
+        }
+        if (ctx.hasUI) {
+            await show_text_modal(ctx, {
+                title: 'Skill already up to date',
+                text: `${target} is already up to date.`,
+            });
+        }
+        else {
+            ctx.ui.notify(`${target} is already up to date.`, 'info');
+        }
+        return true;
+    }
+    catch (error) {
+        notify_error(ctx, error);
+        return true;
+    }
+}
+export async function handle_refresh_command({ mgr, ctx, }) {
+    if (ctx.hasUI) {
+        await show_refresh_summary(ctx, mgr);
+        return false;
+    }
+    mgr.refresh();
+    ctx.ui.notify(`Rescanned: ${mgr.discover().length} managed skills, ${mgr.discover_importable().length} importable skills found`);
+    return false;
+}
+export async function handle_defaults_command({ arg, mgr, ctx, }) {
+    if (!arg && ctx.hasUI) {
+        await show_defaults_modal(ctx, mgr);
+        return false;
+    }
+    if (arg !== 'all-enabled' && arg !== 'all-disabled') {
+        ctx.ui.notify('Usage: /skills defaults <all-enabled|all-disabled>', 'warning');
+        return true;
+    }
+    mgr.set_defaults(arg);
+    if (ctx.hasUI) {
+        await show_text_modal(ctx, {
+            title: 'Default skill policy updated',
+            text: `Active profile now starts from: ${arg}`,
+        });
+    }
+    else {
+        ctx.ui.notify(`Default skill policy: ${arg}`);
+    }
+    return false;
+}
+//# sourceMappingURL=skill-handlers.js.map

package/dist/commands/skill-handlers.js.map

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

package/dist/commands/types.d.ts

@@ -0,0 +1,13 @@
+import type { ExtensionCommandContext } from '@earendil-works/pi-coding-agent';
+import type { create_skills_manager } from '../manager.js';
+export type SkillsManager = ReturnType<typeof create_skills_manager>;
+export type SkillsCommandUiContext = ExtensionCommandContext;
+export type SkillsCommandRequest = {
+    args: string;
+    trimmed: string;
+    sub: string;
+    rest: string[];
+    arg: string;
+    mgr: SkillsManager;
+    ctx: SkillsCommandUiContext;
+};

package/dist/commands/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/commands/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/commands/types.ts"],"names":[],"mappings":""}

package/dist/commands.js

@@ -1,14 +1,10 @@
-import { run_with_progress_modal, show_input_modal, show_text_modal, } from '@spences10/pi-tui-modal';
-import { has_gh_skill, parse_gh_skill_install_args, run_gh_skill_install, run_gh_skill_install_async, run_gh_skill_update, run_gh_skill_update_async, } from './gh-skill.js';
+import { run_with_progress_modal, show_confirm_modal, show_input_modal, show_text_modal, } from '@spences10/pi-tui-modal';
+import { get_skill_argument_completions, SKILL_SUBCOMMANDS, } from './commands/completions.js';
+import { has_gh_skill, parse_gh_skill_install_args, run_gh_skill_install, run_gh_skill_install_async, run_gh_skill_search, run_gh_skill_update, run_gh_skill_update_async, } from './gh-skill.js';
 import { create_skills_manager } from './manager.js';
+import { is_resource_enabled } from './resource-discovery.js';
 import { find_skill, format_profile_detail, format_skill_detail, format_skill_list, profile_description, sort_skills, } from './skill-utils.js';
-import { pick_profile, pick_skill, show_add_github_skill_modal, show_defaults_modal, show_importable_skills_modal, show_profiles_modal, show_refresh_summary, show_skill_detail_modal, show_skill_list_modal, show_skills_home_modal, show_skills_manager_modal, show_update_github_skills_modal, } from './skills-ui.js';
-function is_resource_enabled(value) {
-    const normalized = value?.trim().toLowerCase();
-    if (!normalized)
-        return true;
-    return !['0', 'false', 'no', 'skip', 'disable'].includes(normalized);
-}
+import { pick_profile, pick_skill, show_add_github_skill_modal, show_defaults_modal, show_profiles_modal, show_refresh_summary, show_search_github_skills_modal, show_skill_detail_modal, show_skill_list_modal, show_skills_home_modal, show_skills_manager_modal, show_update_github_skills_modal, } from './skills-ui.js';
 export default async function skills(pi) {
     const mgr = create_skills_manager();
     pi.on('resources_discover', async (event) => {
@@ -18,119 +14,28 @@ export default async function skills(pi) {
         });
         return { skillPaths: resource_mgr.get_enabled_skill_paths() };
     });
-    const subs = [
-        'list',
-        'show',
-        'enable',
-        'disable',
-        'add',
-        'import',
-        'sync',
-        'update',
-        'profile',
-        'refresh',
-        'defaults',
-    ];
     pi.registerCommand('skills', {
-        description: 'Manage pi-native skills and import external skills',
-        getArgumentCompletions: (prefix) => {
-            const parts = prefix.trimStart().split(/\s+/);
-            const has_trailing_space = /\s$/.test(prefix);
-            if (parts.length <= 1 && !has_trailing_space) {
-                return subs
-                    .filter((s) => s.startsWith(parts[0] || ''))
-                    .map((s) => ({ value: s, label: s }));
-            }
-            if (['show', 'enable', 'disable'].includes(parts[0] ?? '')) {
-                const q = parts.slice(1).join(' ').toLowerCase();
-                const skills = parts[0] === 'show'
-                    ? [...mgr.discover(), ...mgr.discover_importable()]
-                    : mgr.discover();
-                return sort_skills(skills)
-                    .filter((s) => s.key.toLowerCase().includes(q) ||
-                    s.name.toLowerCase().includes(q))
-                    .slice(0, 20)
-                    .map((s) => ({
-                    value: `${parts[0]} ${s.key}`,
-                    label: s.key,
-                }));
-            }
-            if (parts[0] === 'import') {
-                const q = parts.slice(1).join(' ').toLowerCase();
-                return sort_skills(mgr.discover_importable())
-                    .filter((s) => s.key.toLowerCase().includes(q) ||
-                    s.name.toLowerCase().includes(q))
-                    .slice(0, 20)
-                    .map((s) => ({
-                    value: `${parts[0]} ${s.key}`,
-                    label: s.key,
-                }));
-            }
-            if (parts[0] === 'update') {
-                return ['--dry-run', '--all', '--force', '--unpin']
-                    .filter((flag) => flag.startsWith(parts.at(-1) ?? ''))
-                    .map((flag) => ({
-                    value: `${parts.slice(0, -1).join(' ')} ${flag}`.trim(),
-                    label: flag,
-                }));
-            }
-            if (parts[0] === 'sync') {
-                const q = parts.slice(1).join(' ').toLowerCase();
-                return sort_skills(mgr
-                    .discover()
-                    .filter((skill) => Boolean(skill.import_meta)))
-                    .filter((s) => s.key.toLowerCase().includes(q) ||
-                    s.name.toLowerCase().includes(q))
-                    .slice(0, 20)
-                    .map((s) => ({
-                    value: `${parts[0]} ${s.key}`,
-                    label: s.key,
-                }));
-            }
-            if (parts[0] === 'profile') {
-                const profile_subs = [
-                    'list',
-                    'show',
-                    'use',
-                    'create',
-                    'include',
-                    'exclude',
-                ];
-                if (parts.length <= 2 && !has_trailing_space) {
-                    return profile_subs
-                        .filter((s) => s.startsWith(parts[1] || ''))
-                        .map((s) => ({ value: `profile ${s}`, label: s }));
-                }
-                if (['show', 'use', 'include', 'exclude'].includes(parts[1] ?? '')) {
-                    const q = parts.slice(2).join(' ').toLowerCase();
-                    return mgr
-                        .list_profiles()
-                        .filter((profile) => profile.name.toLowerCase().includes(q))
-                        .slice(0, 20)
-                        .map((profile) => ({
-                        value: `profile ${parts[1]} ${profile.name}`,
-                        label: profile.name,
-                    }));
-                }
-            }
-            return null;
-        },
+        description: 'Manage and discover Pi skills',
+        getArgumentCompletions: (prefix) => get_skill_argument_completions(prefix, mgr),
         handler: async (args, ctx) => {
             const trimmed = args.trim();
             if (!trimmed && ctx.hasUI) {
                 let selected;
                 while (true) {
-                    const managed_count = mgr.discover().length;
-                    const importable_count = mgr.discover_importable().length;
-                    selected = await show_skills_home_modal(ctx, managed_count, importable_count, mgr.get_active_profile());
+                    const managed = mgr.discover();
+                    const counts = {
+                        managed: managed.length,
+                        pi_native: managed.filter((skill) => skill.source === 'pi-native').length,
+                    };
+                    selected = await show_skills_home_modal(ctx, counts, mgr.get_active_profile());
                     if (!selected)
                         break;
                     if (selected === 'manage') {
                         if (await show_skills_manager_modal(ctx, mgr))
                             return;
                     }
-                    else if (selected === 'importable') {
-                        if (await show_importable_skills_modal(ctx, mgr))
+                    else if (selected === 'search') {
+                        if (await show_search_github_skills_modal(ctx))
                             return;
                     }
                     else if (selected === 'add') {
@@ -155,10 +60,7 @@ export default async function skills(pi) {
             const arg = rest.join(' ');
             switch (sub) {
                 case 'list': {
-                    const skills = [
-                        ...mgr.discover(),
-                        ...mgr.discover_importable(),
-                    ];
+                    const skills = mgr.discover();
                     if (ctx.hasUI) {
                         await show_skill_list_modal(ctx, mgr);
                     }
@@ -168,10 +70,7 @@ export default async function skills(pi) {
                     break;
                 }
                 case 'show': {
-                    const skills = [
-                        ...mgr.discover(),
-                        ...mgr.discover_importable(),
-                    ];
+                    const skills = mgr.discover();
                     let target = arg;
                     if (!target && ctx.hasUI) {
                         target =
@@ -237,6 +136,78 @@ export default async function skills(pi) {
                     await ctx.reload();
                     return;
                 }
+                case 'delete': {
+                    let targets = rest;
+                    if (!targets.length && ctx.hasUI) {
+                        const target = await pick_skill(ctx, {
+                            title: 'Delete skill',
+                            subtitle: 'Remove a managed skill directory from disk',
+                            skills: sort_skills(mgr.discover()),
+                            empty_message: 'No managed skills found',
+                        });
+                        if (!target)
+                            return;
+                        targets = [target];
+                    }
+                    if (!targets.length) {
+                        ctx.ui.notify('Usage: /skills delete <key|name> [key|name...]', 'warning');
+                        return;
+                    }
+                    if (ctx.hasUI) {
+                        const ok = await show_confirm_modal(ctx, {
+                            title: 'Delete skills?',
+                            message: `Delete ${targets.length} skill${targets.length === 1 ? '' : 's'} from disk? This cannot be undone.`,
+                            confirm_label: 'Delete',
+                            cancel_label: 'Keep skills',
+                        });
+                        if (!ok)
+                            return;
+                    }
+                    let deleted = 0;
+                    for (const target of targets) {
+                        try {
+                            mgr.delete_skill(target);
+                            deleted += 1;
+                        }
+                        catch (error) {
+                            ctx.ui.notify(error instanceof Error
+                                ? error.message
+                                : String(error), 'warning');
+                        }
+                    }
+                    if (deleted) {
+                        ctx.ui.notify(`Deleted ${deleted} skill${deleted === 1 ? '' : 's'}. Reloading...`, 'info');
+                        await ctx.reload();
+                        return;
+                    }
+                    break;
+                }
+                case 'search': {
+                    if (!arg && ctx.hasUI) {
+                        if (await show_search_github_skills_modal(ctx))
+                            return;
+                        break;
+                    }
+                    if (!arg) {
+                        ctx.ui.notify('Usage: /skills search <query>', 'warning');
+                        return;
+                    }
+                    if (!has_gh_skill()) {
+                        ctx.ui.notify('GitHub skill search requires gh v2.90.0+ with `gh skill` support.', 'warning');
+                        return;
+                    }
+                    try {
+                        const results = run_gh_skill_search(arg, 15);
+                        const lines = results.map((result) => `${result.skillName} — ${result.repo} (${result.stars}★)\n  ${result.path}\n  ${result.description}`);
+                        ctx.ui.notify(lines.length
+                            ? `GitHub skill search results for ${arg}:\n\n${lines.join('\n\n')}\n\nReview before installing. Preview: gh skill preview <repo> <path>\nInstall: /skills add <repo> <path>`
+                            : `Nothing found matching “${arg}”. Try a shorter query or run: gh skill search ${arg}`, lines.length ? 'info' : 'warning');
+                    }
+                    catch (error) {
+                        ctx.ui.notify(error instanceof Error ? error.message : String(error), 'warning');
+                    }
+                    return;
+                }
                 case 'add': {
                     if (!arg && ctx.hasUI) {
                         if (await show_add_github_skill_modal(ctx))
@@ -273,113 +244,6 @@ export default async function skills(pi) {
                         return;
                     }
                 }
-                case 'import': {
-                    let target = arg;
-                    if (!target && ctx.hasUI) {
-                        target =
-                            (await pick_skill(ctx, {
-                                title: 'Import skill',
-                                subtitle: 'Copy an external skill into Pi-native storage, or run: /skills import <owner/repo> <skill>',
-                                skills: sort_skills(mgr.discover_importable()),
-                                empty_message: 'No importable skills found',
-                            })) ?? '';
-                        if (!target)
-                            return;
-                    }
-                    if (!target) {
-                        ctx.ui.notify('Usage: /skills import <key|name> OR /skills import <owner/repo> <skill[@ref]> [--pin ref|--scope project|--dir path|--force]', 'warning');
-                        return;
-                    }
-                    const gh_request = parse_gh_skill_install_args(rest);
-                    if (gh_request) {
-                        if (!has_gh_skill()) {
-                            ctx.ui.notify('GitHub skill imports require gh v2.90.0+ with `gh skill` support.', 'warning');
-                            return;
-                        }
-                        try {
-                            const output = ctx.hasUI
-                                ? await run_with_progress_modal(ctx, {
-                                    title: 'Importing GitHub skill',
-                                    message: `Installing ${gh_request.skill} from ${gh_request.repository}`,
-                                }, async ({ signal, update }) => {
-                                    update({ current: gh_request.skill });
-                                    return await run_gh_skill_install_async(gh_request, undefined, { signal });
-                                })
-                                : run_gh_skill_install(gh_request);
-                            if (output === undefined)
-                                return;
-                            if (ctx.hasUI) {
-                                await show_text_modal(ctx, {
-                                    title: 'GitHub skill imported',
-                                    text: `${output || `Imported ${gh_request.skill} from ${gh_request.repository}`}\n\nReloading...`,
-                                });
-                            }
-                            else {
-                                ctx.ui.notify(`${output || `Imported ${gh_request.skill} from ${gh_request.repository}`}\nReloading...`, 'info');
-                            }
-                            await ctx.reload();
-                            return;
-                        }
-                        catch (error) {
-                            ctx.ui.notify(error instanceof Error
-                                ? error.message
-                                : String(error), 'warning');
-                            return;
-                        }
-                    }
-                    try {
-                        const result = mgr.import_skill(target);
-                        ctx.ui.notify(`Imported ${target} to ${result.skillDir}. Reloading...`, 'info');
-                        await ctx.reload();
-                        return;
-                    }
-                    catch (error) {
-                        ctx.ui.notify(error instanceof Error ? error.message : String(error), 'warning');
-                        return;
-                    }
-                }
-                case 'sync': {
-                    let target = arg;
-                    if (!target && ctx.hasUI) {
-                        target =
-                            (await pick_skill(ctx, {
-                                title: 'Sync imported skill',
-                                subtitle: 'Update an imported skill from its upstream source',
-                                skills: sort_skills(mgr
-                                    .discover()
-                                    .filter((skill) => Boolean(skill.import_meta))),
-                                empty_message: 'No imported skills found',
-                            })) ?? '';
-                        if (!target)
-                            return;
-                    }
-                    if (!target) {
-                        ctx.ui.notify('Usage: /skills sync <key|name>', 'warning');
-                        return;
-                    }
-                    try {
-                        const result = mgr.sync_skill(target);
-                        if (result.changed) {
-                            ctx.ui.notify(`Synced ${target}. Reloading...`, 'info');
-                            await ctx.reload();
-                            return;
-                        }
-                        if (ctx.hasUI) {
-                            await show_text_modal(ctx, {
-                                title: 'Skill already up to date',
-                                text: `${target} is already up to date.`,
-                            });
-                        }
-                        else {
-                            ctx.ui.notify(`${target} is already up to date.`, 'info');
-                        }
-                        return;
-                    }
-                    catch (error) {
-                        ctx.ui.notify(error instanceof Error ? error.message : String(error), 'warning');
-                        return;
-                    }
-                }
                 case 'update': {
                     if (!has_gh_skill()) {
                         ctx.ui.notify('GitHub skill updates require gh v2.90.0+ with `gh skill` support.', 'warning');
@@ -545,7 +409,7 @@ export default async function skills(pi) {
                         break;
                     }
                     mgr.refresh();
-                    ctx.ui.notify(`Rescanned: ${mgr.discover().length} managed skills, ${mgr.discover_importable().length} importable skills found`);
+                    ctx.ui.notify(`Rescanned: ${mgr.discover().length} managed skills found`);
                     break;
                 }
                 case 'defaults': {
@@ -570,7 +434,7 @@ export default async function skills(pi) {
                     break;
                 }
                 default:
-                    ctx.ui.notify(`Unknown: ${sub}. Use: ${subs.join(', ')}`, 'warning');
+                    ctx.ui.notify(`Unknown: ${sub}. Use: ${SKILL_SUBCOMMANDS.join(', ')}`, 'warning');
             }
         },
     });