@oh-my-pi/cli 0.3.0 → 0.4.0

package/src/commands/features.ts

@@ -41,15 +41,25 @@ export async function interactiveFeatures(name: string, options: FeaturesOptions
 		return;
 	}
 
-	// Get runtime config path and current enabled features
+	// Get runtime config path
 	const runtimePath = getRuntimeConfigPath(pkgJson, isGlobal);
 	if (!runtimePath) {
 		console.log(chalk.yellow(`Plugin "${name}" does not have a runtime.json config file.`));
 		return;
 	}
 
-	const runtimeConfig = readRuntimeConfig(runtimePath);
-	const enabledFeatures = runtimeConfig.features ?? getDefaultFeatures(features);
+	// Determine currently enabled features:
+	// 1. Check plugins.json config (source of truth after omp features changes)
+	// 2. Fall back to runtime.json
+	// 3. Fall back to plugin defaults
+	const pluginConfig = pluginsJson.config?.[name];
+	let enabledFeatures: string[];
+	if (Array.isArray(pluginConfig?.features)) {
+		enabledFeatures = pluginConfig.features;
+	} else {
+		const runtimeConfig = readRuntimeConfig(runtimePath);
+		enabledFeatures = runtimeConfig.features ?? getDefaultFeatures(features);
+	}
 
 	// JSON output mode - just list
 	if (options.json) {
@@ -99,8 +109,8 @@ export async function interactiveFeatures(name: string, options: FeaturesOptions
 		});
 
 		// Apply changes
-		await applyFeatureChanges(name, runtimePath, features, enabledFeatures, selected);
-	} catch (err) {
+		await applyFeatureChanges(name, runtimePath, features, enabledFeatures, selected, isGlobal);
+	} catch (_err) {
 		// User cancelled (Ctrl+C)
 		console.log(chalk.dim("\nCancelled."));
 	}
@@ -111,7 +121,14 @@ export async function interactiveFeatures(name: string, options: FeaturesOptions
  */
 function listFeaturesNonInteractive(
 	name: string,
-	features: Record<string, { description?: string; default?: boolean; variables?: Record<string, unknown> }>,
+	features: Record<
+		string,
+		{
+			description?: string;
+			default?: boolean;
+			variables?: Record<string, unknown>;
+		}
+	>,
 	enabledFeatures: string[],
 ): void {
 	console.log(chalk.bold(`\nFeatures for ${name}:\n`));
@@ -141,7 +158,14 @@ function listFeaturesNonInteractive(
 async function applyFeatureChanges(
 	name: string,
 	runtimePath: string,
-	features: Record<string, { description?: string; default?: boolean; variables?: Record<string, unknown> }>,
+	_features: Record<
+		string,
+		{
+			description?: string;
+			default?: boolean;
+			variables?: Record<string, unknown>;
+		}
+	>,
 	currentlyEnabled: string[],
 	newEnabled: string[],
 	isGlobal: boolean,
@@ -214,7 +238,7 @@ export async function configureFeatures(name: string, options: FeaturesOptions =
 
 	const allFeatureNames = Object.keys(features);
 
-	// Get runtime config
+	// Get runtime config path
 	const runtimePath = getRuntimeConfigPath(pkgJson, isGlobal);
 	if (!runtimePath) {
 		console.log(chalk.yellow(`Plugin "${name}" does not have a runtime.json config file.`));
@@ -222,8 +246,18 @@ export async function configureFeatures(name: string, options: FeaturesOptions =
 		return;
 	}
 
-	const runtimeConfig = readRuntimeConfig(runtimePath);
-	const currentlyEnabled = runtimeConfig.features ?? getDefaultFeatures(features);
+	// Determine currently enabled features:
+	// 1. Check plugins.json config (source of truth after omp features changes)
+	// 2. Fall back to runtime.json
+	// 3. Fall back to plugin defaults
+	const pluginConfig = pluginsJson.config?.[name];
+	let currentlyEnabled: string[];
+	if (Array.isArray(pluginConfig?.features)) {
+		currentlyEnabled = pluginConfig.features;
+	} else {
+		const runtimeConfig = readRuntimeConfig(runtimePath);
+		currentlyEnabled = runtimeConfig.features ?? getDefaultFeatures(features);
+	}
 
 	let newEnabled: string[];
 
@@ -234,7 +268,10 @@ export async function configureFeatures(name: string, options: FeaturesOptions =
 		} else if (options.set === "") {
 			newEnabled = [];
 		} else {
-			newEnabled = options.set.split(",").map((f) => f.trim()).filter(Boolean);
+			newEnabled = options.set
+				.split(",")
+				.map((f) => f.trim())
+				.filter(Boolean);
 			// Validate
 			for (const f of newEnabled) {
 				if (!features[f]) {
@@ -273,7 +310,7 @@ export async function configureFeatures(name: string, options: FeaturesOptions =
 		}
 	}
 
-	await applyFeatureChanges(name, runtimePath, features, currentlyEnabled, newEnabled);
+	await applyFeatureChanges(name, runtimePath, features, currentlyEnabled, newEnabled, isGlobal);
 
 	if (options.json) {
 		console.log(JSON.stringify({ plugin: name, enabled: newEnabled }, null, 2));

package/src/commands/install.ts

@@ -12,7 +12,6 @@ import {
 	loadPluginsJson,
 	type PluginConfig,
 	type PluginPackageJson,
-	type PluginsJson,
 	readPluginPackageJson,
 	savePluginsJson,
 } from "@omp/manifest";
@@ -59,7 +58,12 @@ export function parsePackageSpecWithFeatures(spec: string): ParsedPackageSpec {
 
 	if (!match) {
 		// Fallback: treat as plain name
-		return { name: spec, version: "latest", features: null, allFeatures: false };
+		return {
+			name: spec,
+			version: "latest",
+			features: null,
+			allFeatures: false,
+		};
 	}
 
 	const [, name, featuresStr, version = "latest"] = match;
@@ -80,7 +84,10 @@ export function parsePackageSpecWithFeatures(spec: string): ParsedPackageSpec {
 	}
 
 	// [f1,f2,...] = specific features
-	const features = featuresStr.split(",").map((f) => f.trim()).filter(Boolean);
+	const features = featuresStr
+		.split(",")
+		.map((f) => f.trim())
+		.filter(Boolean);
 	return { name, version, features, allFeatures: false };
 }
 
@@ -287,7 +294,12 @@ export async function installPlugin(packages?: string[], options: InstallOptions
 	// Get existing plugins for conflict detection
 	const existingPlugins = await getInstalledPlugins(isGlobal);
 
-	const results: Array<{ name: string; version: string; success: boolean; error?: string }> = [];
+	const results: Array<{
+		name: string;
+		version: string;
+		success: boolean;
+		error?: string;
+	}> = [];
 
 	// Load plugins.json once for reinstall detection and config storage
 	let pluginsJson = await loadPluginsJson(isGlobal);
@@ -322,7 +334,12 @@ export async function installPlugin(packages?: string[], options: InstallOptions
 			if (!info) {
 				console.log(chalk.red(`  ✗ Package not found: ${name}`));
 				process.exitCode = 1;
-				results.push({ name, version, success: false, error: "Package not found" });
+				results.push({
+					name,
+					version,
+					success: false,
+					error: "Package not found",
+				});
 				continue;
 			}
 			resolvedVersion = info.version;
@@ -340,7 +357,12 @@ export async function installPlugin(packages?: string[], options: InstallOptions
 						console.log(chalk.red(`    ${dupe.dest} ← ${dupe.sources.join(", ")}`));
 					}
 					process.exitCode = 1;
-					results.push({ name, version: info.version, success: false, error: "Duplicate destinations in plugin" });
+					results.push({
+						name,
+						version: info.version,
+						success: false,
+						error: "Duplicate destinations in plugin",
+					});
 					continue;
 				}
 
@@ -382,7 +404,12 @@ export async function installPlugin(packages?: string[], options: InstallOptions
 					if (abort) {
 						console.log(chalk.yellow(`  Aborted due to conflicts (before download)`));
 						process.exitCode = 1;
-						results.push({ name, version: info.version, success: false, error: "Conflicts" });
+						results.push({
+							name,
+							version: info.version,
+							success: false,
+							error: "Conflicts",
+						});
 						continue;
 					}
 				}
@@ -412,9 +439,16 @@ export async function installPlugin(packages?: string[], options: InstallOptions
 						console.log(chalk.red(`    ${dupe.dest} ← ${dupe.sources.join(", ")}`));
 					}
 					// Rollback: uninstall the package
-					execFileSync("npm", ["uninstall", "--prefix", prefix, name], { stdio: "pipe" });
+					execFileSync("npm", ["uninstall", "--prefix", prefix, name], {
+						stdio: "pipe",
+					});
 					process.exitCode = 1;
-					results.push({ name, version: info.version, success: false, error: "Duplicate destinations in plugin" });
+					results.push({
+						name,
+						version: info.version,
+						success: false,
+						error: "Duplicate destinations in plugin",
+					});
 					continue;
 				}
 
@@ -428,7 +462,9 @@ export async function installPlugin(packages?: string[], options: InstallOptions
 							console.log(chalk.yellow(`  ⚠ ${formatConflicts([conflict])[0]}`));
 						}
 						// Rollback: uninstall the package
-						execFileSync("npm", ["uninstall", "--prefix", prefix, name], { stdio: "pipe" });
+						execFileSync("npm", ["uninstall", "--prefix", prefix, name], {
+							stdio: "pipe",
+						});
 						process.exitCode = 1;
 						results.push({
 							name,
@@ -455,21 +491,23 @@ export async function installPlugin(packages?: string[], options: InstallOptions
 					if (abort) {
 						console.log(chalk.yellow(`  Aborted due to conflicts`));
 						// Rollback: uninstall the package
-						execFileSync("npm", ["uninstall", "--prefix", prefix, name], { stdio: "pipe" });
+						execFileSync("npm", ["uninstall", "--prefix", prefix, name], {
+							stdio: "pipe",
+						});
 						process.exitCode = 1;
-						results.push({ name, version: info.version, success: false, error: "Conflicts" });
+						results.push({
+							name,
+							version: info.version,
+							success: false,
+							error: "Conflicts",
+						});
 						continue;
 					}
 				}
 			}
 
 			// 6. Resolve features and create symlinks
-			const { enabledFeatures, configToStore } = resolveFeatures(
-				pkgJson,
-				parsed,
-				existingConfig,
-				isReinstall,
-			);
+			const { enabledFeatures, configToStore } = resolveFeatures(pkgJson, parsed, existingConfig, isReinstall);
 
 			// Log feature selection if plugin has features
 			const allFeatureNames = getAllFeatureNames(pkgJson);
@@ -484,7 +522,14 @@ export async function installPlugin(packages?: string[], options: InstallOptions
 			}
 
 			// Create symlinks for omp.install entries (skip destinations user assigned to existing plugins)
-			const symlinkResult = await createPluginSymlinks(name, pkgJson, isGlobal, true, skipDestinations, enabledFeatures);
+			const symlinkResult = await createPluginSymlinks(
+				name,
+				pkgJson,
+				isGlobal,
+				true,
+				skipDestinations,
+				enabledFeatures,
+			);
 			createdSymlinks = symlinkResult.created;
 
 			// 7. Process dependencies with omp field (with cycle detection)
@@ -553,14 +598,21 @@ export async function installPlugin(packages?: string[], options: InstallOptions
 			if (npmInstallSucceeded) {
 				console.log(chalk.dim("  Rolling back npm install..."));
 				try {
-					execFileSync("npm", ["uninstall", "--prefix", prefix, name], { stdio: "pipe" });
+					execFileSync("npm", ["uninstall", "--prefix", prefix, name], {
+						stdio: "pipe",
+					});
 				} catch {
 					// Ignore cleanup errors
 				}
 			}
 
 			process.exitCode = 1;
-			results.push({ name, version: resolvedVersion, success: false, error: errorMsg });
+			results.push({
+				name,
+				version: resolvedVersion,
+				success: false,
+				error: errorMsg,
+			});
 		}
 	}
 
@@ -589,7 +641,12 @@ async function installLocalPlugin(
 	localPath: string,
 	isGlobal: boolean,
 	_options: InstallOptions,
-): Promise<{ name: string; version: string; success: boolean; error?: string }> {
+): Promise<{
+	name: string;
+	version: string;
+	success: boolean;
+	error?: string;
+}> {
 	// Expand ~ to home directory
 	if (localPath.startsWith("~")) {
 		localPath = join(process.env.HOME || "", localPath.slice(1));
@@ -599,7 +656,12 @@ async function installLocalPlugin(
 	if (!existsSync(localPath)) {
 		console.log(chalk.red(`Error: Path does not exist: ${localPath}`));
 		process.exitCode = 1;
-		return { name: basename(localPath), version: "local", success: false, error: "Path not found" };
+		return {
+			name: basename(localPath),
+			version: "local",
+			success: false,
+			error: "Path not found",
+		};
 	}
 
 	const _prefix = isGlobal ? PLUGINS_DIR : ".pi";
@@ -695,6 +757,11 @@ async function installLocalPlugin(
 		const errorMsg = (err as Error).message;
 		console.log(chalk.red(`  ✗ Failed: ${errorMsg}`));
 		process.exitCode = 1;
-		return { name: basename(localPath), version: "local", success: false, error: errorMsg };
+		return {
+			name: basename(localPath),
+			version: "local",
+			success: false,
+			error: errorMsg,
+		};
 	}
 }

package/src/commands/list.ts

@@ -47,20 +47,31 @@ const FILE_CATEGORIES: FileCategory[] = [
 		pattern: /^agent\/prompts?\//,
 		label: "Prompts",
 		color: chalk.blue,
-		extractName: (dest) => dest.split("/").pop()?.replace(/\.[^.]+$/, "") || dest,
+		extractName: (dest) =>
+			dest
+				.split("/")
+				.pop()
+				?.replace(/\.[^.]+$/, "") || dest,
 	},
 	{
 		pattern: /^agent\/hooks?\//,
 		label: "Hooks",
 		color: chalk.red,
-		extractName: (dest) => dest.split("/").pop()?.replace(/\.[^.]+$/, "") || dest,
+		extractName: (dest) =>
+			dest
+				.split("/")
+				.pop()
+				?.replace(/\.[^.]+$/, "") || dest,
 	},
 ];
 
 /**
  * Categorize installed files into known categories
  */
-function categorizeFiles(files: string[]): { categorized: Map<string, string[]>; uncategorized: string[] } {
+function categorizeFiles(files: string[]): {
+	categorized: Map<string, string[]>;
+	uncategorized: string[];
+} {
 	const categorized = new Map<string, string[]>();
 	const uncategorized: string[] = [];
 

package/src/commands/uninstall.ts

@@ -70,7 +70,10 @@ export async function uninstallPlugin(name: string, options: UninstallOptions =
 				}
 
 				if (process.stdin.isTTY && process.stdout.isTTY) {
-					const rl = createInterface({ input: process.stdin, output: process.stdout });
+					const rl = createInterface({
+						input: process.stdin,
+						output: process.stdout,
+					});
 					const answer = await new Promise<string>((resolve) => {
 						rl.question(chalk.yellow("Delete these files anyway? [y/N] "), (ans) => {
 							rl.close();

package/src/commands/update.ts

@@ -68,7 +68,12 @@ export async function updatePlugin(name?: string, options: UpdateOptions = {}):
 
 	console.log(chalk.blue(`Updating ${npmPlugins.length} plugin(s)...`));
 
-	const results: Array<{ name: string; from: string; to: string; success: boolean }> = [];
+	const results: Array<{
+		name: string;
+		from: string;
+		to: string;
+		success: boolean;
+	}> = [];
 
 	// Save old package info before removing symlinks (for recovery on failure)
 	const oldPkgJsons = new Map<string, PluginPackageJson>();

package/src/runtime.ts

@@ -1,13 +1,10 @@
-import type { OmpVariable, PluginPackageJson, PluginsJson } from "@omp/manifest";
+import type { OmpVariable, PluginPackageJson } from "@omp/manifest";
 import { loadPluginsJson, readPluginPackageJson } from "@omp/manifest";
 
 /**
  * Collect all variables from a plugin (top-level + enabled features)
  */
-function collectVariables(
-	pkgJson: PluginPackageJson,
-	enabledFeatures: string[],
-): Record<string, OmpVariable> {
+function collectVariables(pkgJson: PluginPackageJson, enabledFeatures: string[]): Record<string, OmpVariable> {
 	const vars: Record<string, OmpVariable> = {};
 
 	// Top-level variables
@@ -67,11 +64,7 @@ export async function getPluginEnvVars(global = true): Promise<Record<string, st
 
 		const config = pluginsJson.config?.[pluginName];
 		const allFeatureNames = Object.keys(pkgJson.omp.features || {});
-		const enabledFeatures = resolveEnabledFeatures(
-			allFeatureNames,
-			config?.features,
-			pkgJson.omp.features || {},
-		);
+		const enabledFeatures = resolveEnabledFeatures(allFeatureNames, config?.features, pkgJson.omp.features || {});
 
 		// Collect variables from top-level and enabled features
 		const variables = collectVariables(pkgJson, enabledFeatures);

package/src/symlinks.ts

@@ -18,10 +18,7 @@ export function getInstallEntries(pkgJson: PluginPackageJson): OmpInstallEntry[]
 /**
  * @deprecated Use getInstallEntries instead. Features no longer have install arrays.
  */
-export function getEnabledInstallEntries(
-	pkgJson: PluginPackageJson,
-	_enabledFeatures?: string[],
-): OmpInstallEntry[] {
+export function getEnabledInstallEntries(pkgJson: PluginPackageJson, _enabledFeatures?: string[]): OmpInstallEntry[] {
 	return getInstallEntries(pkgJson);
 }
 
@@ -245,7 +242,7 @@ export async function writeRuntimeConfig(
 			features: config.features ?? existing.features ?? [],
 			options: { ...existing.options, ...config.options },
 		};
-		writeFileSync(runtimePath, JSON.stringify(merged, null, 2) + "\n");
+		writeFileSync(runtimePath, `${JSON.stringify(merged, null, 2)}\n`);
 		if (verbose) {
 			console.log(chalk.dim(`  Updated: ${runtimePath}`));
 		}
@@ -275,7 +272,11 @@ export async function removePluginSymlinks(
 	global = true,
 	verbose = true,
 ): Promise<SymlinkRemovalResult> {
-	const result: SymlinkRemovalResult = { removed: [], errors: [], skippedNonSymlinks: [] };
+	const result: SymlinkRemovalResult = {
+		removed: [],
+		errors: [],
+		skippedNonSymlinks: [],
+	};
 
 	const installEntries = getInstallEntries(pkgJson);
 	if (installEntries.length === 0) {
@@ -350,7 +351,11 @@ export async function checkPluginSymlinks(
 	pkgJson: PluginPackageJson,
 	global = true,
 ): Promise<{ valid: string[]; broken: string[]; missing: string[] }> {
-	const result = { valid: [] as string[], broken: [] as string[], missing: [] as string[] };
+	const result = {
+		valid: [] as string[],
+		broken: [] as string[],
+		missing: [] as string[],
+	};
 	const sourceDir = getPluginSourceDir(pluginName, global);
 	const baseDir = getBaseDir(global);