wordpress-agent-kit 0.3.0 → 0.3.2

package/extensions/wp-agent-kit/index.ts

@@ -1,51 +1,57 @@
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 /**
- * WordPress Agent Kit Pi Extension
+ * WordPress Agent Kit — Pi Extension
  *
- * Provides Pi agents with WordPress development tools:
- * - WordPress agent skills (13 skills covering plugin/theme/block dev, REST API, WP-CLI, etc.)
+ * Provides Pi Coding Agent with WordPress development tools:
+ * - 17 WordPress agent skills (plugin/theme/block dev, REST API, WP-CLI, etc.)
  * - Project triage detection
- * - Skill installation and syncing
- * - Version upgrade management
+ * - Skill installation, syncing, and upgrade management
  *
- * Compatible with Pi Coding Agent SDK (extensions.md spec).
+ * Follows Pi Coding Agent SDK conventions (extensions.md, packages.md, skills.md).
  */
 import type { ExtensionAPI } from '@earendil-works/pi-coding-agent';
 import { Type } from 'typebox';
 
-// Import programmatic API for WordPress Agent Kit operations
-import {
-	type InstallOptions,
-	type SyncOptions,
-	type TriageOptions,
-	computeChanges,
-	installKitApi,
-	isKitInstalled,
-	loadManifest,
-	runTriageApi,
-	syncSkillsApi,
-} from '../../dist/lib/api.js';
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const PACKAGE_ROOT = path.resolve(__dirname, '..', '..');
+
+// Resolve the API import dynamically — works in both dev (src/) and npm (dist/)
+let apiModule: typeof import('../../dist/lib/api.js');
+try {
+	apiModule = await import('../../dist/lib/api.js');
+} catch {
+	// Fallback for dev: import from source via jiti
+	apiModule = (await import('../../src/lib/api.js')) as typeof import('../../dist/lib/api.js');
+}
+
+const { installKitApi, syncSkillsApi, runTriageApi, isKitInstalled, loadManifest } = apiModule;
 
 export default function (pi: ExtensionAPI) {
 	// =========================================================================
 	// Skills Registration
 	// =========================================================================
-	// Register WordPress skills via resources_discover so Pi agents can use them.
-	// Skills are loaded from .github/skills/ (also declared in package.json pi.skills).
 	pi.on('resources_discover', async (_event, _ctx) => {
-		// Skills are auto-discovered from pi.skills in package.json.
-		// No additional configuration needed here — the manifest handles it.
-		return {};
+		const skillsDir = path.join(PACKAGE_ROOT, '.github', 'skills');
+		const promptsDir = path.join(PACKAGE_ROOT, '.github', 'prompts');
+		return {
+			skillPaths: [skillsDir],
+			promptPaths: [promptsDir],
+		};
 	});
 
 	// =========================================================================
 	// Session notifications
 	// =========================================================================
 	pi.on('session_start', async (_event, ctx) => {
-		const cwd = ctx.cwd;
-		if (isKitInstalled(cwd, 'github')) {
-			const manifest = loadManifest(cwd, 'github');
-			if (manifest) {
-				ctx.ui.setStatus('wp-agent-kit', `WP Agent Kit v${manifest.version}`);
+		const platforms: Array<'pi' | 'github'> = ['pi', 'github'];
+		for (const p of platforms) {
+			if (isKitInstalled(ctx.cwd, p)) {
+				const manifest = loadManifest(ctx.cwd, p);
+				if (manifest) {
+					ctx.ui.setStatus('wp-agent-kit', `WP Agent Kit v${manifest.version}`);
+				}
+				break;
 			}
 		}
 	});
@@ -55,37 +61,29 @@ export default function (pi: ExtensionAPI) {
 	// =========================================================================
 
 	// --- wp_triage ---
-	// Run WordPress project triage to detect project type, signals, and tooling.
 	pi.registerTool({
 		name: 'wp_triage',
 		label: 'WP Triage',
 		description:
-			'Run WordPress project detection to classify the codebase (plugin, theme, block theme, WP core, Gutenberg). Returns project kind, signals (block.json, Interactivity API, WP-CLI, REST API), and tooling (PHP/Node). Use before making changes to a WordPress project.',
+			'Detect WordPress project type (plugin, theme, block theme, site, Gutenberg), signals (block.json, Interactivity API, WP-CLI, REST API), and tooling (PHP/Node). Use before making changes to any WordPress project.',
 		promptSnippet: 'Detect WordPress project type, signals, and tooling',
 		promptGuidelines: [
-			'Use wp_triage before making changes to any WordPress project to understand the codebase structure.',
+			'Use wp_triage before making changes to any WordPress project to understand the codebase.',
 			'Use wp_triage output to route to the correct WordPress development skill.',
 		],
 		parameters: Type.Object({
 			targetDir: Type.Optional(
 				Type.String({
-					description: 'Target directory to triage (defaults to current working directory)',
-				})
-			),
-			platform: Type.Optional(
-				Type.String({
-					description:
-						'Platform where skills are installed (github, cursor, claude, agent, pi). Default: github',
+					description: 'WordPress project directory (defaults to current working directory)',
 				})
 			),
 		}),
-		async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
-			const options: TriageOptions = {
-				targetDir: params.targetDir || process.cwd(),
-				platform: (params.platform as TriageOptions['platform']) || 'github',
-			};
-
-			const result = await runTriageApi(options);
+		async execute(_callId, params, _signal, _onUpdate, _ctx) {
+			const targetDir = params.targetDir || process.cwd();
+			const result = await runTriageApi({
+				targetDir,
+				platform: 'pi',
+			});
 
 			if (!result.success) {
 				return {
@@ -100,18 +98,18 @@ export default function (pi: ExtensionAPI) {
 				};
 			}
 
-			const triage = result.data;
+			const t = result.data;
 			return {
 				content: [
 					{
 						type: 'text',
 						text: JSON.stringify(
 							{
-								project: triage.project,
-								signals: triage.signals,
-								tooling: triage.tooling,
-								recommendation: triage.project
-									? `This appears to be a ${triage.project.primary} project (confidence: ${triage.project.confidence}). Use the appropriate wp-* skill for development.`
+								project: t.project,
+								signals: t.signals,
+								tooling: t.tooling,
+								recommendation: t.project
+									? `${t.project.primary} project (confidence: ${t.project.confidence}). Use the matching wp-* skill.`
 									: 'Could not determine project type. Review signals manually.',
 							},
 							null,
@@ -119,108 +117,87 @@ export default function (pi: ExtensionAPI) {
 						),
 					},
 				],
-				details: triage,
+				details: t,
 			};
 		},
 	});
 
 	// --- wp_install_kit ---
-	// Install WordPress Agent Kit skills into a target directory.
 	pi.registerTool({
 		name: 'wp_install_kit',
 		label: 'WP Install Kit',
 		description:
-			'Install the WordPress Agent Kit into a project directory. Copies .github/skills (13 WordPress development skills), agent definitions, instructions, and AGENTS.md template. Supports safe update mode that preserves user modifications. Use when setting up a new WordPress project or adding AI agent support.',
+			'Install WordPress Agent Kit into a project directory. Copies 17 WordPress development skills, agent definitions, workflow instructions, and an AGENTS.md template. Safe by default — preserves user modifications on re-run.',
 		promptSnippet: 'Install WordPress AI agent skills and configuration into a project',
 		promptGuidelines: [
 			'Use wp_install_kit when setting up a new WordPress project for AI agent development.',
-			'Use wp_install_kit with dryRun:true to preview changes before applying.',
+			'Use wp_install_kit with dryRun: true to preview changes before applying.',
 		],
 		parameters: Type.Object({
 			targetDir: Type.String({
-				description: 'Target directory to install into (the WordPress project root)',
+				description: 'WordPress project root directory to install into',
 			}),
-			platform: Type.Optional(
-				Type.String({
-					description: 'Target platform: github, cursor, claude, agent, or pi. Default: github',
-				})
-			),
 			dryRun: Type.Optional(
 				Type.Boolean({
-					description: 'If true, preview changes without making them. Default: false',
+					description: 'Preview changes without applying (default: false)',
 				})
 			),
 			force: Type.Optional(
 				Type.Boolean({
-					description: 'Overwrite user modifications on update. Default: false',
+					description: 'Overwrite user modifications on update (default: false)',
 				})
 			),
 		}),
-		async execute(_toolCallId, params, _signal, onUpdate, _ctx) {
-			const options: InstallOptions = {
+		async execute(_callId, params, _signal, onUpdate, _ctx) {
+			const opts = {
 				targetDir: params.targetDir,
-				platform: (params.platform as InstallOptions['platform']) || 'github',
+				platform: 'pi' as const,
 				dryRun: params.dryRun ?? false,
 				force: params.force ?? false,
-				safe: !params.force, // Default: safe unless forced
+				safe: !(params.force ?? false),
 				backup: true,
 			};
 
-			if (options.dryRun) {
-				onUpdate?.({
-					content: [
-						{
-							type: 'text',
-							text: 'Computing changes (dry-run)...',
-						},
-					],
-				});
+			if (opts.dryRun) {
+				onUpdate?.({ content: [{ type: 'text', text: 'Computing changes (dry-run)...' }] });
 			}
 
-			const result = await installKitApi(options);
+			const result = await installKitApi(opts);
 
 			if (!result.success) {
 				return {
 					content: [
-						{
-							type: 'text',
-							text: `Install failed: ${result.error?.message || 'Unknown error'}`,
-						},
+						{ type: 'text', text: `Install failed: ${result.error?.message || 'Unknown error'}` },
 					],
-					details: { error: result.error },
 					isError: true,
 				};
 			}
 
-			// Handle dry-run results
-			if (options.dryRun && 'wouldExecute' in (result.data || {})) {
-				const dryRun = result.data as {
+			// Dry-run: show change preview
+			if (opts.dryRun && 'wouldExecute' in (result.data || {})) {
+				const dr = result.data as {
 					wouldExecute: boolean;
 					actions: Array<{ type: string; description: string }>;
-					summary: Record<string, unknown>;
 				};
 				return {
 					content: [
 						{
 							type: 'text',
 							text: [
-								'# WordPress Agent Kit — Dry Run Preview',
-								'',
-								`Target: ${options.targetDir}`,
-								`Platform: ${options.platform}`,
+								'# WordPress Agent Kit — Dry Run',
 								'',
 								'## Changes',
-								...dryRun.actions.map((a) => `- ${a.type}: ${a.description}`),
+								...dr.actions.map((a) => `- **${a.type}**: ${a.description}`),
 								'',
-								'Run without dryRun to apply these changes.',
+								'Run without `dryRun` to apply.',
 							].join('\n'),
 						},
 					],
-					details: dryRun,
+					details: dr,
 				};
 			}
 
-			// Handle real results
+			// Real result
 			const data = result.data as {
 				filesCreated: string[];
 				filesSkipped: string[];
@@ -230,40 +207,28 @@ export default function (pi: ExtensionAPI) {
 			};
 
 			const lines = [
-				data.isUpdate ? '# WordPress Agent Kit — Updated' : '# WordPress Agent Kit — Installed',
+				data.isUpdate ? '# Updated' : '# Installed',
 				'',
-				`Target: ${options.targetDir}`,
-				`Platform: ${options.platform}`,
-				`Files created/updated: ${data.filesCreated.length}`,
+				`**Target**: ${opts.targetDir}`,
+				`**Files**: ${data.filesCreated.length} created/updated`,
 			];
 
 			if (data.filesSkipped.length > 0) {
-				lines.push(`Files preserved: ${data.filesSkipped.length} (user-modified)`);
-				for (const skipped of data.filesSkipped.slice(0, 10)) {
-					lines.push(`  - ${skipped}`);
-				}
+				lines.push(`**Preserved**: ${data.filesSkipped.length} files (user-modified)`);
 			}
 
-			if (data.conflicts && data.conflicts.length > 0) {
-				lines.push(
-					'',
-					`⚠ ${data.conflicts.length} conflict(s) — re-run with force:true to overwrite:`
-				);
-				for (const conflict of data.conflicts.slice(0, 5)) {
-					lines.push(`  - ${conflict}`);
-				}
+			if (data.conflicts?.length) {
+				lines.push('', '⚠ **Conflicts** (re-run with `force: true` to overwrite):');
+				for (const c of data.conflicts.slice(0, 5)) lines.push(`- ${c}`);
 			}
 
-			if (data.backupDir) {
-				lines.push('', `Backup created: ${data.backupDir}`);
-			}
+			if (data.backupDir) lines.push('', `**Backup**: ${data.backupDir}`);
 
 			lines.push(
 				'',
 				'## Next Steps',
-				'1. Run wp_triage to detect project type',
-				'2. Review AGENTS.md for project-specific guidance',
-				'3. Use `/skill:wp-project-triage` to begin development'
+				'1. Run `wp_triage` to detect project type',
+				'2. Review `AGENTS.md` for guidance'
 			);
 
 			return {
@@ -274,109 +239,45 @@ export default function (pi: ExtensionAPI) {
 	});
 
 	// --- wp_sync_skills ---
-	// Sync WordPress skills from upstream WordPress/agent-skills repo.
 	pi.registerTool({
 		name: 'wp_sync_skills',
 		label: 'WP Sync Skills',
 		description:
-			'Sync WordPress agent skills from the upstream WordPress/agent-skills repository into the local project. Fetches the latest skill definitions and replaces the local .github/skills directory. Use when skills need updating from upstream.',
+			'Sync WordPress agent skills from the upstream WordPress/agent-skills repository. Fetches the latest 17 skill definitions and replaces the local skills directory.',
 		promptSnippet: 'Sync latest WordPress agent skills from upstream',
 		promptGuidelines: [
 			'Use wp_sync_skills to pull the latest WordPress development skills from WordPress/agent-skills.',
-			'Use wp_sync_skills with dryRun:true to preview before syncing.',
 		],
 		parameters: Type.Object({
-			targetDir: Type.Optional(
-				Type.String({
-					description: 'Target directory (defaults to the project root running wp-agent-kit)',
-				})
-			),
 			ref: Type.Optional(
 				Type.String({
 					description: 'Git ref to sync from (default: trunk)',
 				})
 			),
-			dryRun: Type.Optional(
-				Type.Boolean({
-					description: 'If true, preview without applying. Default: false',
-				})
-			),
 		}),
-		async execute(_toolCallId, params, _signal, onUpdate, _ctx) {
-			const options: SyncOptions = {
-				targetDir: params.targetDir || process.cwd(),
-				ref: params.ref || 'trunk',
-				dryRun: params.dryRun ?? false,
-			};
+		async execute(_callId, params, _signal, onUpdate, _ctx) {
+			onUpdate?.({ content: [{ type: 'text', text: 'Syncing from WordPress/agent-skills...' }] });
 
-			onUpdate?.({
-				content: [
-					{
-						type: 'text',
-						text: params.dryRun
-							? 'Previewing skill sync (dry-run)...'
-							: `Syncing skills from WordPress/agent-skills@${options.ref}...`,
-					},
-				],
+			const result = await syncSkillsApi({
+				targetDir: PACKAGE_ROOT,
+				ref: params.ref || 'trunk',
 			});
 
-			const result = await syncSkillsApi(options);
-
 			if (!result.success) {
 				return {
 					content: [
-						{
-							type: 'text',
-							text: `Sync failed: ${result.error?.message || 'Unknown error'}`,
-						},
+						{ type: 'text', text: `Sync failed: ${result.error?.message || 'Unknown error'}` },
 					],
-					details: { error: result.error },
 					isError: true,
 				};
 			}
 
-			if (options.dryRun && 'wouldExecute' in (result.data || {})) {
-				const dryRun = result.data as {
-					wouldExecute: boolean;
-					actions: Array<{ type: string; description: string }>;
-				};
-				return {
-					content: [
-						{
-							type: 'text',
-							text: [
-								'# Skill Sync — Dry Run',
-								'',
-								`Source: WordPress/agent-skills@${options.ref}`,
-								'',
-								'## Actions',
-								...dryRun.actions.map((a) => `- ${a.type}: ${a.description}`),
-								'',
-								'Run without dryRun to apply.',
-							].join('\n'),
-						},
-					],
-					details: dryRun,
-				};
-			}
-
-			const data = result.data as {
-				skillsSynced: number;
-				method: string;
-				sourceUrl: string;
-			};
-
+			const data = result.data as { skillsSynced: number; method: string };
 			return {
 				content: [
 					{
 						type: 'text',
-						text: [
-							'# Skills Synced',
-							'',
-							`Skills synced: ${data.skillsSynced}`,
-							`Method: ${data.method}`,
-							`Source: ${data.sourceUrl}`,
-						].join('\n'),
+						text: `# Skills Synced\n\n**Synced**: ${data.skillsSynced} skills\n**Method**: ${data.method}`,
 					},
 				],
 				details: data,
@@ -385,60 +286,44 @@ export default function (pi: ExtensionAPI) {
 	});
 
 	// --- wp_upgrade ---
-	// Check and apply WordPress Agent Kit upgrades.
 	pi.registerTool({
 		name: 'wp_upgrade',
 		label: 'WP Upgrade',
 		description:
-			'Check for WordPress Agent Kit updates and apply them. Shows current vs latest version, detects installed platforms, and can preview or apply the upgrade. Use to keep agent skills and configuration current.',
-		promptSnippet: 'Check and apply WordPress Agent Kit version upgrades',
+			'Check for WordPress Agent Kit updates. Shows current vs latest version and can preview or apply upgrades.',
+		promptSnippet: 'Check WordPress Agent Kit version',
 		promptGuidelines: [
 			'Use wp_upgrade to check if the installed WordPress Agent Kit is up to date.',
-			'Use wp_upgrade with checkOnly:true to preview without applying.',
+			'Use wp_upgrade with checkOnly: true to preview without applying.',
 		],
 		parameters: Type.Object({
 			targetDir: Type.Optional(
 				Type.String({
-					description: 'Target directory to check/upgrade (defaults to current working directory)',
+					description: 'Project directory to check (defaults to cwd)',
 				})
 			),
 			checkOnly: Type.Optional(
 				Type.Boolean({
-					description: 'Only check for updates, do not apply. Default: false',
-				})
-			),
-			force: Type.Optional(
-				Type.Boolean({
-					description: 'Overwrite user modifications on upgrade. Default: false',
+					description: 'Only check for updates, do not apply (default: false)',
 				})
 			),
 		}),
-		async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
+		async execute(_callId, params, _signal, _onUpdate, _ctx) {
 			const targetDir = params.targetDir || process.cwd();
-			const force = params.force ?? false;
 			const checkOnly = params.checkOnly ?? false;
+			const manifest = loadManifest(targetDir, 'pi') || loadManifest(targetDir, 'github');
+			const currentVersion = manifest?.version || 'not installed';
+			const latestVersion = (() => {
+				try {
+					const fs = require('node:fs');
+					return JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT, 'package.json'), 'utf-8'))
+						.version;
+				} catch {
+					return 'unknown';
+				}
+			})();
 
-			// Detect installed platforms and current version
-			const fs = await import('node:fs');
-			const path = await import('node:path');
-			const pkgPath = path.join(
-				path.dirname(new URL(import.meta.url).pathname),
-				'..',
-				'..',
-				'..',
-				'package.json'
-			);
-			let latestVersion = 'unknown';
-			try {
-				const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-				latestVersion = pkg.version;
-			} catch {
-				// fallback
-			}
-
-			const manifest = loadManifest(targetDir, 'github');
-			const currentVersion = manifest?.version || 'unknown';
-			const isInstalled = isKitInstalled(targetDir, 'github');
+			const installed = isKitInstalled(targetDir, 'pi') || isKitInstalled(targetDir, 'github');
 
 			if (checkOnly) {
 				return {
@@ -448,57 +333,39 @@ export default function (pi: ExtensionAPI) {
 							text: [
 								'# WordPress Agent Kit — Version Check',
 								'',
-								`Target: ${targetDir}`,
-								`Installed: ${isInstalled ? 'yes' : 'no'}`,
-								`Current version: ${currentVersion}`,
-								`Latest version: ${latestVersion}`,
+								`**Installed**: ${installed ? 'yes' : 'no'}`,
+								`**Current**: ${currentVersion}`,
+								`**Latest**: ${latestVersion}`,
 								'',
-								currentVersion !== latestVersion && isInstalled
-									? '⚠ Update available. Run without checkOnly to apply.'
-									: isInstalled
-										? '✓ Up to date.'
-										: 'Not installed. Use wp_install_kit to install.',
+								currentVersion !== latestVersion && installed
+									? '⚠ Update available. Run without `checkOnly` to apply.'
+									: installed
+										? '✅ Up to date.'
+										: 'Not installed. Use `wp_install_kit` to install.',
 							].join('\n'),
 						},
 					],
-					details: {
-						targetDir,
-						currentVersion,
-						latestVersion,
-						isInstalled,
-					},
+					details: { currentVersion, latestVersion, installed },
 				};
 			}
 
-			// Apply upgrade
-			if (!isInstalled) {
+			if (!installed) {
 				return {
-					content: [
-						{
-							type: 'text',
-							text: 'Kit not installed. Use wp_install_kit to install first.',
-						},
-					],
+					content: [{ type: 'text', text: 'Kit not installed. Use `wp_install_kit` first.' }],
 					isError: true,
 				};
 			}
 
 			const result = await installKitApi({
 				targetDir,
-				platform: 'github',
-				force,
-				safe: !force,
+				platform: 'pi',
+				safe: true,
 				backup: true,
 			});
 
 			if (!result.success) {
 				return {
-					content: [
-						{
-							type: 'text',
-							text: `Upgrade failed: ${result.error?.message || 'Unknown error'}`,
-						},
-					],
+					content: [{ type: 'text', text: `Upgrade failed: ${result.error?.message}` }],
 					isError: true,
 				};
 			}
@@ -507,28 +374,17 @@ export default function (pi: ExtensionAPI) {
 				filesCreated: string[];
 				filesSkipped: string[];
 				conflicts?: string[];
-				backupDir: string | null;
 			};
-
 			const lines = [
-				'# WordPress Agent Kit — Upgraded',
+				'# Upgraded',
 				'',
-				`Version: ${currentVersion} → ${latestVersion}`,
-				`Files updated: ${data.filesCreated.length}`,
+				`**Version**: ${currentVersion} → ${latestVersion}`,
+				`**Files updated**: ${data.filesCreated.length}`,
 			];
-
-			if (data.filesSkipped.length > 0) {
-				lines.push(`Files preserved: ${data.filesSkipped.length} (user-modified)`);
-			}
-			if (data.conflicts && data.conflicts.length > 0) {
-				lines.push(
-					'',
-					`⚠ ${data.conflicts.length} conflict(s) — re-run with force:true to overwrite.`
-				);
-			}
-			if (data.backupDir) {
-				lines.push(`Backup: ${data.backupDir}`);
-			}
+			if (data.filesSkipped.length)
+				lines.push(`**Preserved**: ${data.filesSkipped.length} (user-modified)`);
+			if (data.conflicts?.length)
+				lines.push(`⚠ ${data.conflicts.length} conflicts (use force: true)`);
 
 			return {
 				content: [{ type: 'text', text: lines.join('\n') }],
@@ -546,85 +402,51 @@ export default function (pi: ExtensionAPI) {
 		handler: async (args, ctx) => {
 			const targetDir = args?.trim() || ctx.cwd;
 			ctx.ui.setStatus('wp-triage', 'Running triage...');
-			const result = await runTriageApi({ targetDir });
-
+			const result = await runTriageApi({ targetDir, platform: 'pi' });
 			if (!result.success) {
 				ctx.ui.notify(`Triage failed: ${result.error?.message}`, 'error');
 				return;
 			}
-
-			const triage = result.data;
-			const summary = triage.project
-				? `${triage.project.primary} (confidence: ${triage.project.confidence})`
+			const t = result.data;
+			const summary = t.project
+				? `${t.project.primary} (confidence: ${t.project.confidence})`
 				: 'unknown';
 			ctx.ui.notify(`Project: ${summary}`, 'info');
-			ctx.ui.setStatus('wp-triage', `Detected: ${summary}`);
+			ctx.ui.setStatus('wp-triage', summary);
 		},
 	});
 
 	pi.registerCommand('wp-install', {
-		description: 'Install WordPress Agent Kit into a project',
+		description: 'Install WordPress Agent Kit into current project',
 		handler: async (args, ctx) => {
 			const targetDir = args?.trim() || ctx.cwd;
 			ctx.ui.setStatus('wp-install', 'Installing...');
-			const result = await installKitApi({
-				targetDir,
-				platform: 'github',
-				safe: true,
-				backup: true,
-			});
-
+			const result = await installKitApi({ targetDir, platform: 'pi', safe: true, backup: true });
 			if (!result.success) {
 				ctx.ui.notify(`Install failed: ${result.error?.message}`, 'error');
 				return;
 			}
-
 			const data = result.data as { filesCreated: string[]; isUpdate: boolean };
-			const verb = data.isUpdate ? 'Updated' : 'Installed';
-			ctx.ui.notify(`${verb} (${data.filesCreated.length} files)`, 'info');
-			ctx.ui.setStatus('wp-install', `${verb} ${data.filesCreated.length} files`);
+			ctx.ui.notify(
+				`${data.isUpdate ? 'Updated' : 'Installed'} (${data.filesCreated.length} entries)`,
+				'info'
+			);
+			ctx.ui.setStatus('wp-agent-kit', 'v0.3.0 installed');
 		},
 	});
 
 	pi.registerCommand('wp-sync-skills', {
 		description: 'Sync WordPress skills from upstream',
 		handler: async (args, ctx) => {
-			ctx.ui.setStatus('wp-sync', 'Syncing skills...');
-			const result = await syncSkillsApi({
-				ref: args?.trim() || 'trunk',
-			});
-
+			ctx.ui.setStatus('wp-sync', 'Syncing...');
+			const result = await syncSkillsApi({ targetDir: PACKAGE_ROOT, ref: args?.trim() || 'trunk' });
 			if (!result.success) {
 				ctx.ui.notify(`Sync failed: ${result.error?.message}`, 'error');
 				return;
 			}
-
-			const data = result.data as { skillsSynced: number; method: string };
-			ctx.ui.notify(`Synced ${data.skillsSynced} skills (${data.method})`, 'info');
-			ctx.ui.setStatus('wp-sync', `${data.skillsSynced} skills`);
-		},
-	});
-
-	pi.registerCommand('wp-upgrade', {
-		description: 'Check or apply WordPress Agent Kit upgrades',
-		handler: async (_args, ctx) => {
-			const targetDir = ctx.cwd;
-			const manifest = loadManifest(targetDir, 'github');
-			const currentVersion = manifest?.version || 'not installed';
-
-			const pkgPath = `${ctx.cwd}/node_modules/wordpress-agent-kit/package.json`;
-			let latestVersion = 'unknown';
-			try {
-				const fs = await import('node:fs');
-				if (fs.existsSync(pkgPath)) {
-					const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-					latestVersion = pkg.version;
-				}
-			} catch {
-				// fallback
-			}
-
-			ctx.ui.notify(`WP Agent Kit: ${currentVersion} → ${latestVersion}`, 'info');
+			const data = result.data as { skillsSynced: number };
+			ctx.ui.notify(`Synced ${data.skillsSynced} skills`, 'info');
+			ctx.ui.setStatus('wp-agent-kit', `${data.skillsSynced} skills`);
 		},
 	});
 }