my-pi 0.0.2 → 0.0.4

package/src/skills/manager.ts

@@ -1,4 +1,3 @@
-import { type DiscoveredSkill, scan_all_skills } from './scanner.js';
 import {
 	type SkillsConfig,
 	is_skill_enabled,
@@ -6,6 +5,17 @@ import {
 	make_skill_key,
 	save_skills_config,
 } from './config.js';
+import {
+	type ImportSkillResult,
+	type SyncSkillResult,
+	import_external_skill,
+	sync_imported_skill,
+} from './importer.js';
+import {
+	type DiscoveredSkill,
+	scan_importable_skills,
+	scan_managed_skills,
+} from './scanner.js';
 
 export interface ManagedSkill extends DiscoveredSkill {
 	key: string;
@@ -14,71 +24,120 @@ export interface ManagedSkill extends DiscoveredSkill {
 
 export interface SkillsManager {
 	discover(): ManagedSkill[];
+	discover_importable(): ManagedSkill[];
 	get_enabled_skill_paths(): string[];
-	/** Check if a skill should pass through skillsOverride (pi's native loading) */
+	/** Check if a skill should pass through pi's skillsOverride */
 	is_enabled_by_skill(name: string, filePath: string): boolean;
 	enable(key: string): boolean;
 	disable(key: string): boolean;
 	toggle(key: string): boolean;
 	search(query: string): ManagedSkill[];
+	search_importable(query: string): ManagedSkill[];
 	set_defaults(policy: 'all-enabled' | 'all-disabled'): void;
+	import_skill(
+		key_or_name: string,
+	): ImportSkillResult & { key: string };
+	sync_skill(key_or_name: string): SyncSkillResult & { key: string };
 	refresh(): void;
 }
 
+function resolve_skill_key(skill: DiscoveredSkill): string {
+	return make_skill_key(skill.name, skill.source);
+}
+
+function match_skill_by_key_or_name(
+	skills: DiscoveredSkill[],
+	key_or_name: string,
+): DiscoveredSkill {
+	const exact_key = skills.find(
+		(skill) => resolve_skill_key(skill) === key_or_name,
+	);
+	if (exact_key) return exact_key;
+
+	const by_name = skills.filter(
+		(skill) => skill.name === key_or_name,
+	);
+	if (by_name.length === 1) {
+		return by_name[0]!;
+	}
+	if (by_name.length > 1) {
+		throw new Error(
+			`Multiple skills named ${key_or_name}. Use an exact key instead.`,
+		);
+	}
+
+	throw new Error(`Unknown skill: ${key_or_name}`);
+}
+
 export function create_skills_manager(): SkillsManager {
 	let config: SkillsConfig = load_skills_config();
-	let cache: DiscoveredSkill[] | null = null;
+	let managed_cache: DiscoveredSkill[] | null = null;
+	let importable_cache: DiscoveredSkill[] | null = null;
 
-	function get_discovered(): DiscoveredSkill[] {
-		if (!cache) {
-			cache = scan_all_skills();
+	function get_managed(): DiscoveredSkill[] {
+		if (!managed_cache) {
+			managed_cache = scan_managed_skills();
 		}
-		return cache;
+		return managed_cache;
+	}
+
+	function get_importable(): DiscoveredSkill[] {
+		if (!importable_cache) {
+			importable_cache = scan_importable_skills();
+		}
+		return importable_cache;
 	}
 
 	function to_managed(skill: DiscoveredSkill): ManagedSkill {
-		const key = make_skill_key(skill.name, skill.source);
+		const key = resolve_skill_key(skill);
 		return {
 			...skill,
 			key,
-			enabled: is_skill_enabled(config, key),
+			enabled:
+				skill.kind === 'managed'
+					? is_skill_enabled(config, key)
+					: false,
 		};
 	}
 
+	function get_enabled_managed_skills(): ManagedSkill[] {
+		return get_managed()
+			.filter((skill) =>
+				is_skill_enabled(config, resolve_skill_key(skill)),
+			)
+			.map(to_managed);
+	}
+
 	return {
 		discover(): ManagedSkill[] {
-			return get_discovered().map(to_managed);
+			return get_managed().map(to_managed);
+		},
+
+		discover_importable(): ManagedSkill[] {
+			return get_importable().map(to_managed);
 		},
 
 		is_enabled_by_skill(name: string, filePath: string): boolean {
-			// Try to find this skill in our discovered set by filePath
-			const discovered = get_discovered();
+			const discovered = get_managed();
 			const match = discovered.find((s) => s.skillPath === filePath);
 			if (match) {
-				return is_skill_enabled(
-					config,
-					make_skill_key(match.name, match.source),
-				);
+				return is_skill_enabled(config, resolve_skill_key(match));
 			}
-			// Skill not in our discovered set (e.g. from pi's own paths)
-			// Fall back to checking by name with a generic source
+
 			const by_name = discovered.find((s) => s.name === name);
 			if (by_name) {
-				return is_skill_enabled(
-					config,
-					make_skill_key(by_name.name, by_name.source),
-				);
+				return is_skill_enabled(config, resolve_skill_key(by_name));
 			}
-			// Unknown skill — respect defaults
-			return config.defaults === 'all-enabled';
+
+			// Unknown skill sources should remain enabled so pi's native
+			// discovery keeps working for project and other default locations.
+			return true;
 		},
 
 		get_enabled_skill_paths(): string[] {
-			return get_discovered()
-				.filter((s) =>
-					is_skill_enabled(config, make_skill_key(s.name, s.source)),
-				)
-				.map((s) => s.baseDir);
+			return get_enabled_managed_skills().map(
+				(skill) => skill.baseDir,
+			);
 		},
 
 		enable(key: string): boolean {
@@ -110,13 +169,53 @@ export function create_skills_manager(): SkillsManager {
 			);
 		},
 
+		search_importable(query: string): ManagedSkill[] {
+			const q = query.toLowerCase();
+			return this.discover_importable().filter(
+				(s) =>
+					s.name.toLowerCase().includes(q) ||
+					s.description.toLowerCase().includes(q) ||
+					s.source.toLowerCase().includes(q),
+			);
+		},
+
 		set_defaults(policy: 'all-enabled' | 'all-disabled'): void {
 			config.defaults = policy;
 			save_skills_config(config);
 		},
 
+		import_skill(key_or_name: string) {
+			const skill = match_skill_by_key_or_name(
+				get_importable(),
+				key_or_name,
+			);
+			const result = import_external_skill(skill);
+			const managed_key = make_skill_key(skill.name, 'pi-native');
+			config.enabled[managed_key] = true;
+			save_skills_config(config);
+			this.refresh();
+			return {
+				...result,
+				key: managed_key,
+			};
+		},
+
+		sync_skill(key_or_name: string) {
+			const skill = match_skill_by_key_or_name(
+				get_managed(),
+				key_or_name,
+			);
+			const result = sync_imported_skill(skill);
+			this.refresh();
+			return {
+				...result,
+				key: resolve_skill_key(skill),
+			};
+		},
+
 		refresh(): void {
-			cache = null;
+			managed_cache = null;
+			importable_cache = null;
 			config = load_skills_config();
 		},
 	};

package/src/skills/scanner.ts

@@ -1,23 +1,20 @@
-import { existsSync, globSync, readFileSync } from 'node:fs';
-import { basename, dirname, join, resolve } from 'node:path';
-import { homedir } from 'node:os';
 import {
 	parseFrontmatter,
 	type SkillFrontmatter,
 } from '@mariozechner/pi-coding-agent';
+import { existsSync, globSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { basename, dirname, join, resolve } from 'node:path';
 
-export interface DiscoveredSkill {
-	name: string;
-	description: string;
-	skillPath: string;
-	baseDir: string;
-	source: string;
-}
+export const IMPORT_METADATA_FILE = '.my-pi-source.json';
 
-interface InstalledPlugin {
+export interface InstalledPlugin {
 	scope: string;
 	installPath: string;
 	version: string;
+	installedAt?: string;
+	lastUpdated?: string;
+	gitCommitSha?: string;
 }
 
 interface InstalledPluginsFile {
@@ -25,6 +22,38 @@ interface InstalledPluginsFile {
 	plugins: Record<string, InstalledPlugin[]>;
 }
 
+export interface ImportedSkillMetadata {
+	version: number;
+	source: string;
+	upstream_skill_path: string;
+	upstream_base_dir: string;
+	upstream_install_path?: string;
+	upstream_version?: string;
+	upstream_git_commit_sha?: string;
+	imported_at: string;
+	last_synced_at: string;
+	imported_hash: string;
+	upstream_hash: string;
+}
+
+export interface PluginSkillSource {
+	pluginId: string;
+	installPath: string;
+	version: string;
+	gitCommitSha?: string;
+}
+
+export interface DiscoveredSkill {
+	name: string;
+	description: string;
+	skillPath: string;
+	baseDir: string;
+	source: string;
+	kind: 'managed' | 'external';
+	plugin?: PluginSkillSource;
+	import_meta?: ImportedSkillMetadata;
+}
+
 function read_installed_plugins(): InstalledPluginsFile | null {
 	const path = join(
 		homedir(),
@@ -60,41 +89,74 @@ function parse_skill_md(
 	}
 }
 
+function read_import_metadata(
+	base_dir: string,
+): ImportedSkillMetadata | undefined {
+	const metadata_path = join(base_dir, IMPORT_METADATA_FILE);
+	if (!existsSync(metadata_path)) return undefined;
+
+	try {
+		return JSON.parse(
+			readFileSync(metadata_path, 'utf-8'),
+		) as ImportedSkillMetadata;
+	} catch {
+		return undefined;
+	}
+}
+
 function scan_dir_for_skills(
 	dir: string,
-	source: string,
+	options: {
+		source: string;
+		kind: 'managed' | 'external';
+		plugin?: PluginSkillSource;
+		include_direct_root_skill?: boolean;
+	},
 ): DiscoveredSkill[] {
 	if (!existsSync(dir)) return [];
 
 	const results: DiscoveredSkill[] = [];
-
-	// Direct SKILL.md in this dir
 	const direct = join(dir, 'SKILL.md');
-	if (existsSync(direct)) {
+	const include_direct_root_skill =
+		options.include_direct_root_skill ?? true;
+
+	if (include_direct_root_skill && existsSync(direct)) {
 		const parsed = parse_skill_md(direct);
 		if (parsed) {
 			results.push({
 				...parsed,
 				skillPath: direct,
 				baseDir: dir,
-				source,
+				source: options.source,
+				kind: options.kind,
+				plugin: options.plugin,
+				import_meta:
+					options.kind === 'managed'
+						? read_import_metadata(dir)
+						: undefined,
 			});
 		}
-		return results; // SKILL.md at root means this IS the skill, don't recurse
+		return results;
 	}
 
-	// Glob for skills in subdirs
 	try {
 		const matches = globSync('*/SKILL.md', { cwd: dir });
 		for (const match of matches) {
 			const full_path = resolve(dir, match);
 			const parsed = parse_skill_md(full_path);
 			if (parsed) {
+				const base_dir = dirname(full_path);
 				results.push({
 					...parsed,
 					skillPath: full_path,
-					baseDir: dirname(full_path),
-					source,
+					baseDir: base_dir,
+					source: options.source,
+					kind: options.kind,
+					plugin: options.plugin,
+					import_meta:
+						options.kind === 'managed'
+							? read_import_metadata(base_dir)
+							: undefined,
 				});
 			}
 		}
@@ -105,71 +167,109 @@ function scan_dir_for_skills(
 	return results;
 }
 
-export function scan_all_skills(): DiscoveredSkill[] {
-	const all: DiscoveredSkill[] = [];
+function dedupe_by_skill_path(
+	skills: DiscoveredSkill[],
+): DiscoveredSkill[] {
 	const seen = new Set<string>();
+	const deduped: DiscoveredSkill[] = [];
 
-	const add = (skill: DiscoveredSkill) => {
-		if (seen.has(skill.skillPath)) return;
+	for (const skill of skills) {
+		if (seen.has(skill.skillPath)) continue;
 		seen.add(skill.skillPath);
-		all.push(skill);
-	};
+		deduped.push(skill);
+	}
+
+	return deduped;
+}
+
+export function scan_managed_skills(): DiscoveredSkill[] {
+	const skills: DiscoveredSkill[] = [];
+
+	for (const skill of scan_dir_for_skills(
+		join(homedir(), '.claude', 'skills'),
+		{
+			source: 'user-local',
+			kind: 'managed',
+		},
+	)) {
+		skills.push(skill);
+	}
+
+	for (const skill of scan_dir_for_skills(
+		join(homedir(), '.pi', 'agent', 'skills'),
+		{
+			source: 'pi-native',
+			kind: 'managed',
+			include_direct_root_skill: false,
+		},
+	)) {
+		skills.push(skill);
+	}
+
+	return dedupe_by_skill_path(skills);
+}
 
-	// 1. Installed Claude Code plugin skills
+export function scan_importable_skills(): DiscoveredSkill[] {
+	const skills: DiscoveredSkill[] = [];
 	const plugins = read_installed_plugins();
-	if (plugins?.plugins) {
-		for (const [key, entries] of Object.entries(plugins.plugins)) {
-			const entry = entries[0]; // first scope entry
-			if (!entry?.installPath || !existsSync(entry.installPath))
-				continue;
+	if (!plugins?.plugins) return skills;
 
-			const source = `plugin:${key}`;
+	for (const [plugin_id, entries] of Object.entries(
+		plugins.plugins,
+	)) {
+		const entry = entries[0];
+		if (!entry?.installPath || !existsSync(entry.installPath))
+			continue;
 
-			// Standard: {installPath}/skills/*/SKILL.md
-			for (const s of scan_dir_for_skills(
-				join(entry.installPath, 'skills'),
-				source,
-			)) {
-				add(s);
-			}
+		const source = `plugin:${plugin_id}`;
+		const plugin: PluginSkillSource = {
+			pluginId: plugin_id,
+			installPath: entry.installPath,
+			version: entry.version,
+			gitCommitSha: entry.gitCommitSha,
+		};
 
-			// Single-skill plugin: {installPath}/SKILL.md
-			// Use the file path directly — baseDir would be the versioned cache dir
-			// which causes pi's "name doesn't match parent" warning
-			const direct = join(entry.installPath, 'SKILL.md');
-			if (existsSync(direct)) {
-				const parsed = parse_skill_md(direct);
-				if (parsed) {
-					add({
-						...parsed,
-						skillPath: direct,
-						baseDir: direct,
-						source,
-					});
-				}
-			}
+		for (const skill of scan_dir_for_skills(
+			join(entry.installPath, 'skills'),
+			{
+				source,
+				kind: 'external',
+				plugin,
+			},
+		)) {
+			skills.push(skill);
+		}
 
-			// Pi-specific: {installPath}/.pi/skills/*/SKILL.md
-			for (const s of scan_dir_for_skills(
-				join(entry.installPath, '.pi', 'skills'),
+		for (const skill of scan_dir_for_skills(
+			join(entry.installPath, '.pi', 'skills'),
+			{
 				source,
-			)) {
-				add(s);
-			}
+				kind: 'external',
+				plugin,
+			},
+		)) {
+			skills.push(skill);
 		}
-	}
 
-	// 2. User-local Claude skills
-	const claude_skills = join(homedir(), '.claude', 'skills');
-	for (const s of scan_dir_for_skills(claude_skills, 'user-local')) {
-		add(s);
+		const direct_root_skill = join(entry.installPath, 'SKILL.md');
+		if (existsSync(direct_root_skill)) {
+			const parsed = parse_skill_md(direct_root_skill);
+			if (parsed) {
+				skills.push({
+					...parsed,
+					skillPath: direct_root_skill,
+					baseDir: entry.installPath,
+					source,
+					kind: 'external',
+					plugin,
+				});
+			}
+		}
 	}
 
-	// 3. Pi native skills
-	const pi_skills = join(homedir(), '.pi', 'agent', 'skills');
-	for (const s of scan_dir_for_skills(pi_skills, 'pi-native')) {
-		add(s);
-	}
+	return dedupe_by_skill_path(skills);
+}
 
-	return all;
+export function scan_all_skills(): DiscoveredSkill[] {
+	return [...scan_managed_skills(), ...scan_importable_skills()];
 }

package/dist/api.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"api.js","names":[],"sources":["../src/api.ts"],"sourcesContent":["// Composable programmatic API for my-pi\n// Extension loading patterns inspired by https://github.com/disler/pi-vs-claude-code\n\nimport {\n\ttype AgentSessionRuntime,\n\tcreateAgentSessionFromServices,\n\tcreateAgentSessionRuntime,\n\ttype CreateAgentSessionRuntimeFactory,\n\tcreateAgentSessionServices,\n\ttype ExtensionFactory,\n\tgetAgentDir,\n\tSessionManager,\n\tSettingsManager,\n} from '@mariozechner/pi-coding-agent';\nimport { dirname, resolve } from 'node:path';\nimport { fileURLToPath } from 'node:url';\n\nconst __dirname = dirname(fileURLToPath(import.meta.url));\nconst ext_dir = resolve(__dirname, '..', 'src', 'extensions');\n\nexport interface CreateMyPiOptions {\n\tcwd?: string;\n\textensions?: string[];\n\textensionFactories?: ExtensionFactory[];\n\t/** Enable MCP extension (default true) */\n\tmcp?: boolean;\n\t/** Enable skills extension (default true) */\n\tskills?: boolean;\n\t/** Enable chain extension (default true) */\n\tchain?: boolean;\n\t/** Enable filter-output extension for secret redaction (default true) */\n\tfilter_output?: boolean;\n\t/** Enable handoff extension (default true) */\n\thandoff?: boolean;\n\t/** Enable recall extension for searching past sessions (default true) */\n\trecall?: boolean;\n\t/** Override the default model (e.g. \"claude-sonnet-4-5-20241022\") */\n\tmodel?: string;\n}\n\nexport async function create_my_pi(\n\toptions: CreateMyPiOptions = {},\n): Promise<AgentSessionRuntime> {\n\tconst {\n\t\tcwd = process.cwd(),\n\t\textensions = [],\n\t\textensionFactories: user_factories = [],\n\t\tmcp = true,\n\t\tskills = true,\n\t\tchain = true,\n\t\tfilter_output = true,\n\t\thandoff = true,\n\t\trecall = true,\n\t\tmodel,\n\t} = options;\n\n\tconst resolved_extensions = extensions.map((p) => resolve(cwd, p));\n\n\t// All built-in extensions loaded by path so Pi shows filenames\n\tconst builtin_extension_paths: string[] = [\n\t\t...(mcp ? [resolve(ext_dir, 'mcp.ts')] : []),\n\t\t...(skills ? [resolve(ext_dir, 'skills.ts')] : []),\n\t\t...(chain ? [resolve(ext_dir, 'chain.ts')] : []),\n\t\t...(filter_output ? [resolve(ext_dir, 'filter-output.ts')] : []),\n\t\t...(handoff ? [resolve(ext_dir, 'handoff.ts')] : []),\n\t\t...(recall ? [resolve(ext_dir, 'recall.ts')] : []),\n\t];\n\n\tconst create_runtime: CreateAgentSessionRuntimeFactory = async ({\n\t\tcwd: runtime_cwd,\n\t\tsessionManager,\n\t\tsessionStartEvent,\n\t}) => {\n\t\tconst settings_manager = model\n\t\t\t? (() => {\n\t\t\t\t\tconst sm = SettingsManager.create(runtime_cwd);\n\t\t\t\t\tsm.setDefaultModel(model);\n\t\t\t\t\treturn sm;\n\t\t\t\t})()\n\t\t\t: undefined;\n\n\t\tconst services = await createAgentSessionServices({\n\t\t\tcwd: runtime_cwd,\n\t\t\t...(settings_manager && { settingsManager: settings_manager }),\n\t\t\tresourceLoaderOptions: {\n\t\t\t\tadditionalExtensionPaths: [\n\t\t\t\t\t...builtin_extension_paths,\n\t\t\t\t\t...resolved_extensions,\n\t\t\t\t],\n\t\t\t\textensionFactories: [...user_factories],\n\t\t\t},\n\t\t});\n\n\t\treturn {\n\t\t\t...(await createAgentSessionFromServices({\n\t\t\t\tservices,\n\t\t\t\tsessionManager,\n\t\t\t\tsessionStartEvent,\n\t\t\t})),\n\t\t\tservices,\n\t\t\tdiagnostics: services.diagnostics,\n\t\t};\n\t};\n\n\treturn createAgentSessionRuntime(create_runtime, {\n\t\tcwd,\n\t\tagentDir: getAgentDir(),\n\t\tsessionManager: SessionManager.create(cwd),\n\t});\n}\n\nexport {\n\tInteractiveMode,\n\trunPrintMode,\n} from '@mariozechner/pi-coding-agent';\n\nexport type {\n\tAgentSessionRuntime,\n\tExtensionFactory,\n\tInteractiveModeOptions,\n\tPrintModeOptions,\n} from '@mariozechner/pi-coding-agent';\n"],"mappings":";;;;AAkBA,MAAM,UAAU,QADE,QAAQ,cAAc,OAAO,KAAK,IAAI,CAAC,EACtB,MAAM,OAAO,aAAa;AAsB7D,eAAsB,aACrB,UAA6B,EAAE,EACA;CAC/B,MAAM,EACL,MAAM,QAAQ,KAAK,EACnB,aAAa,EAAE,EACf,oBAAoB,iBAAiB,EAAE,EACvC,MAAM,MACN,SAAS,MACT,QAAQ,MACR,gBAAgB,MAChB,UAAU,MACV,SAAS,MACT,UACG;CAEJ,MAAM,sBAAsB,WAAW,KAAK,MAAM,QAAQ,KAAK,EAAE,CAAC;CAGlE,MAAM,0BAAoC;EACzC,GAAI,MAAM,CAAC,QAAQ,SAAS,SAAS,CAAC,GAAG,EAAE;EAC3C,GAAI,SAAS,CAAC,QAAQ,SAAS,YAAY,CAAC,GAAG,EAAE;EACjD,GAAI,QAAQ,CAAC,QAAQ,SAAS,WAAW,CAAC,GAAG,EAAE;EAC/C,GAAI,gBAAgB,CAAC,QAAQ,SAAS,mBAAmB,CAAC,GAAG,EAAE;EAC/D,GAAI,UAAU,CAAC,QAAQ,SAAS,aAAa,CAAC,GAAG,EAAE;EACnD,GAAI,SAAS,CAAC,QAAQ,SAAS,YAAY,CAAC,GAAG,EAAE;EACjD;CAED,MAAM,iBAAmD,OAAO,EAC/D,KAAK,aACL,gBACA,wBACK;EACL,MAAM,mBAAmB,eACf;GACP,MAAM,KAAK,gBAAgB,OAAO,YAAY;AAC9C,MAAG,gBAAgB,MAAM;AACzB,UAAO;MACJ,GACH,KAAA;EAEH,MAAM,WAAW,MAAM,2BAA2B;GACjD,KAAK;GACL,GAAI,oBAAoB,EAAE,iBAAiB,kBAAkB;GAC7D,uBAAuB;IACtB,0BAA0B,CACzB,GAAG,yBACH,GAAG,oBACH;IACD,oBAAoB,CAAC,GAAG,eAAe;IACvC;GACD,CAAC;AAEF,SAAO;GACN,GAAI,MAAM,+BAA+B;IACxC;IACA;IACA;IACA,CAAC;GACF;GACA,aAAa,SAAS;GACtB;;AAGF,QAAO,0BAA0B,gBAAgB;EAChD;EACA,UAAU,aAAa;EACvB,gBAAgB,eAAe,OAAO,IAAI;EAC1C,CAAC"}