@agentrules/cli 0.0.13 → 0.1.0

package/dist/index.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import { createRequire } from "module";
-import { AGENT_RULES_DIR, API_ENDPOINTS, COMMON_LICENSES, LATEST_VERSION, PLATFORMS, PLATFORM_IDS, PRESET_CONFIG_FILENAME, PRESET_SCHEMA_URL, STATIC_BUNDLE_DIR, buildPresetPublishInput, buildPresetRegistry, createDiffPreview, decodeBundledFile, descriptionSchema, fetchBundle, getPlatformFromDir, isLikelyText, isPlatformDir, isSupportedPlatform, licenseSchema, normalizeBundlePath, normalizePlatformInput, resolvePreset, slugSchema, tagsSchema, titleSchema, toUtf8String, validatePresetConfig, verifyBundledFileChecksum } from "@agentrules/core";
+import { AGENT_RULES_DIR, API_ENDPOINTS, COMMON_LICENSES, LATEST_VERSION, PLATFORMS, PLATFORM_IDS, PRESET_CONFIG_FILENAME, PRESET_SCHEMA_URL, STATIC_BUNDLE_DIR, buildPresetPublishInput, buildPresetRegistry, createDiffPreview, decodeBundledFile, descriptionSchema, fetchBundle, getInstallPath, getLatestPresetVersion, getLatestRuleVersion, getPlatformFromDir, getPresetVariant, getPresetVersion, getRuleVariant, getRuleVersion, getValidRuleTypes, hasBundle, isLikelyText, isPlatformDir, isSupportedPlatform, licenseSchema, nameSchema, normalizeBundlePath, normalizePlatformEntry, normalizePlatformInput, resolveSlug, tagsSchema, titleSchema, toUtf8String, validatePresetConfig, verifyBundledFileChecksum } from "@agentrules/core";
 import { Command } from "commander";
 import { basename, dirname, join, relative, resolve, sep } from "path";
-import { exec } from "child_process";
-import { promisify } from "util";
-import * as client from "openid-client";
 import chalk from "chalk";
-import { chmod, constants } from "fs";
-import { access, constants as constants$1, copyFile, mkdir, readFile, readdir, rm, stat, writeFile } from "fs/promises";
+import { access, constants, copyFile, mkdir, readFile, readdir, rm, stat, writeFile } from "fs/promises";
 import { homedir } from "os";
+import { chmod, constants as constants$1 } from "fs";
+import * as client from "openid-client";
+import { promisify } from "util";
+import { exec } from "child_process";
 import * as p from "@clack/prompts";
 
 //#region src/lib/ui.ts
@@ -317,10 +317,16 @@ function relativeTime(date) {
 }
 /**
 * Formats an array of files as a tree structure
+*
+* By default shows folder-level sizes only. Pass `showFileSizes: true` to also show
+* individual file sizes.
 */
-function fileTree(files) {
+function fileTree(files, options) {
+	const { header: headerTitle, showFileSizes = false, showFolderSizes = false } = options;
 	const root = {
 		name: "",
+		totalSize: 0,
+		isFile: false,
 		children: new Map()
 	};
 	for (const file of files) {
@@ -333,7 +339,9 @@ function fileTree(files) {
 			if (!child) {
 				child = {
 					name: part,
-					size: isFile ? file.size : void 0,
+					fileSize: isFile ? file.size : void 0,
+					totalSize: 0,
+					isFile,
 					children: new Map()
 				};
 				current.children.set(part, child);
@@ -341,11 +349,22 @@ function fileTree(files) {
 			current = child;
 		}
 	}
+	function calculateSizes(node) {
+		if (node.isFile) node.totalSize = node.fileSize ?? 0;
+		else node.totalSize = Array.from(node.children.values()).reduce((sum, child) => sum + calculateSizes(child), 0);
+		return node.totalSize;
+	}
+	calculateSizes(root);
 	const lines = [];
+	const countStr = theme.muted(`(${files.length})`);
+	const sizeStr = showFolderSizes ? ` ${theme.info(`(${formatBytes$1(root.totalSize)} total)`)}` : "";
+	lines.push(`${theme.title(headerTitle)} ${countStr}${sizeStr}`);
 	function renderNode(node, prefix, isLast) {
 		const connector = isLast ? "└── " : "├── ";
-		const sizeStr = node.size !== void 0 ? muted(` (${formatBytes$1(node.size)})`) : "";
-		lines.push(`${prefix}${connector}${node.name}${sizeStr}`);
+		let nodeSizeStr = "";
+		if (node.isFile && showFileSizes) nodeSizeStr = theme.info(` (${formatBytes$1(node.totalSize)})`);
+		else if (!node.isFile && showFolderSizes) nodeSizeStr = theme.info(` (${formatBytes$1(node.totalSize)})`);
+		lines.push(`${prefix}${connector}${node.name}${nodeSizeStr}`);
 		const children = Array.from(node.children.values());
 		const newPrefix = prefix + (isLast ? "    " : "│   ");
 		children.forEach((child, index) => {
@@ -516,6 +535,164 @@ const log = {
 	spinner
 };
 
+//#endregion
+//#region src/lib/config.ts
+/** Directory for CLI configuration and credentials (e.g., ~/.agentrules/) */
+const CONFIG_DIRNAME = ".agentrules";
+const CONFIG_FILENAME = "config.json";
+const CONFIG_HOME_ENV = "AGENT_RULES_HOME";
+const DEFAULT_REGISTRY_ALIAS = "main";
+const DEFAULT_REGISTRY_URL = "https://agentrules.directory/";
+const DEFAULT_CONFIG = {
+	defaultRegistry: DEFAULT_REGISTRY_ALIAS,
+	registries: { [DEFAULT_REGISTRY_ALIAS]: { url: DEFAULT_REGISTRY_URL } }
+};
+async function loadConfig$1() {
+	await ensureConfigDir();
+	const configPath = getConfigPath();
+	log.debug(`Loading config from ${configPath}`);
+	try {
+		await access(configPath, constants$1.F_OK);
+	} catch (error$2) {
+		if (isNodeError(error$2) && error$2.code === "ENOENT") {
+			log.debug("Config file not found, creating default config");
+			await writeDefaultConfig();
+			return structuredClone(DEFAULT_CONFIG);
+		}
+		throw error$2 instanceof Error ? error$2 : new Error(String(error$2));
+	}
+	const raw = await readFile(configPath, "utf8");
+	let parsed = {};
+	try {
+		parsed = JSON.parse(raw);
+	} catch (error$2) {
+		throw new Error(`Failed to parse ${configPath}: ${error$2.message}`);
+	}
+	return mergeWithDefaults(parsed);
+}
+async function saveConfig(config) {
+	await ensureConfigDir();
+	const configPath = getConfigPath();
+	log.debug(`Saving config to ${configPath}`);
+	const serialized = JSON.stringify(config, null, 2);
+	await writeFile(configPath, serialized, "utf8");
+}
+function getConfigPath() {
+	return join(getConfigDir(), CONFIG_FILENAME);
+}
+function getConfigDir() {
+	const customDir = process.env[CONFIG_HOME_ENV];
+	if (customDir && customDir.trim().length > 0) return customDir;
+	return join(homedir(), CONFIG_DIRNAME);
+}
+/**
+* Normalizes a registry URL to a base URL with trailing slash.
+*
+* Examples:
+* - "https://example.com" → "https://example.com/"
+* - "https://example.com/custom/" → "https://example.com/custom/"
+* - "https://example.com/custom" → "https://example.com/custom/"
+*/
+function normalizeRegistryUrl(input) {
+	try {
+		const parsed = new URL(input);
+		if (!parsed.pathname.endsWith("/")) parsed.pathname = `${parsed.pathname}/`;
+		return parsed.toString();
+	} catch (error$2) {
+		throw new Error(`Invalid registry URL "${input}": ${error$2.message}`);
+	}
+}
+async function ensureConfigDir() {
+	const dir = getConfigDir();
+	await mkdir(dir, { recursive: true });
+}
+async function writeDefaultConfig() {
+	const configPath = getConfigPath();
+	await mkdir(dirname(configPath), { recursive: true });
+	await writeFile(configPath, JSON.stringify(DEFAULT_CONFIG, null, 2), "utf8");
+}
+function isNodeError(error$2) {
+	return error$2 instanceof Error && typeof error$2.code === "string";
+}
+function mergeWithDefaults(partial) {
+	const registries = {
+		...DEFAULT_CONFIG.registries,
+		...partial.registries ?? {}
+	};
+	if (!registries[DEFAULT_REGISTRY_ALIAS]) registries[DEFAULT_REGISTRY_ALIAS] = structuredClone(DEFAULT_CONFIG.registries[DEFAULT_REGISTRY_ALIAS]);
+	return {
+		defaultRegistry: partial.defaultRegistry ?? DEFAULT_CONFIG.defaultRegistry,
+		registries
+	};
+}
+
+//#endregion
+//#region src/commands/registry/manage.ts
+const REGISTRY_ALIAS_PATTERN = /^[a-z0-9][a-z0-9-_]{0,63}$/i;
+async function listRegistries() {
+	const config = await loadConfig$1();
+	const items = Object.entries(config.registries).map(([alias, settings]) => ({
+		alias,
+		...settings,
+		isDefault: alias === config.defaultRegistry
+	})).sort((a, b) => a.alias.localeCompare(b.alias));
+	log.debug(`Loaded ${items.length} registries`);
+	return items;
+}
+async function addRegistry(alias, url, options = {}) {
+	const normalizedAlias = normalizeAlias(alias);
+	const normalizedUrl = normalizeRegistryUrl(url);
+	const config = await loadConfig$1();
+	if (config.registries[normalizedAlias] && !options.overwrite) throw new Error(`Registry "${normalizedAlias}" already exists. Re-run with --force to overwrite.`);
+	const isUpdate = !!config.registries[normalizedAlias];
+	config.registries[normalizedAlias] = { url: normalizedUrl };
+	if (!config.defaultRegistry || options.makeDefault) {
+		config.defaultRegistry = normalizedAlias;
+		log.debug(`Set "${normalizedAlias}" as default registry`);
+	}
+	await saveConfig(config);
+	log.debug(`${isUpdate ? "Updated" : "Added"} registry "${normalizedAlias}" -> ${normalizedUrl}`);
+	return config.registries[normalizedAlias];
+}
+async function removeRegistry(alias, options = {}) {
+	const normalizedAlias = normalizeAlias(alias);
+	const config = await loadConfig$1();
+	if (!config.registries[normalizedAlias]) throw new Error(`Registry "${normalizedAlias}" was not found.`);
+	if (normalizedAlias === DEFAULT_REGISTRY_ALIAS) throw new Error("The built-in main registry cannot be removed. Point it somewhere else instead.");
+	const isDefault = normalizedAlias === config.defaultRegistry;
+	if (isDefault && !options.allowDefaultRemoval) throw new Error(`Registry "${normalizedAlias}" is currently the default. Re-run with --force to remove it.`);
+	delete config.registries[normalizedAlias];
+	log.debug(`Removed registry "${normalizedAlias}"`);
+	if (isDefault) {
+		config.defaultRegistry = pickFallbackDefault(config, normalizedAlias);
+		log.debug(`Default registry changed to "${config.defaultRegistry}"`);
+	}
+	await saveConfig(config);
+	return {
+		removedDefault: isDefault,
+		nextDefault: config.defaultRegistry
+	};
+}
+async function useRegistry(alias) {
+	const normalizedAlias = normalizeAlias(alias);
+	const config = await loadConfig$1();
+	if (!config.registries[normalizedAlias]) throw new Error(`Registry "${normalizedAlias}" is not defined.`);
+	config.defaultRegistry = normalizedAlias;
+	await saveConfig(config);
+	log.debug(`Switched default registry to "${normalizedAlias}"`);
+}
+function normalizeAlias(alias) {
+	const trimmed = alias.trim();
+	if (!trimmed) throw new Error("Alias is required.");
+	const normalized = trimmed.toLowerCase();
+	if (!REGISTRY_ALIAS_PATTERN.test(normalized)) throw new Error("Aliases may only contain letters, numbers, dashes, and underscores.");
+	return normalized;
+}
+function pickFallbackDefault(config, removedAlias) {
+	const fallback = Object.keys(config.registries).find((alias) => alias !== removedAlias);
+	return fallback ?? DEFAULT_REGISTRY_ALIAS;
+}
+
 //#endregion
 //#region src/lib/url.ts
 /**
@@ -682,9 +859,78 @@ async function publishPreset(baseUrl, token, input) {
 }
 /**
 * Unpublishes a preset version from the registry.
+* This unpublishes all platform variants for the specified version.
 */
-async function unpublishPreset(baseUrl, token, slug, platform, version$1) {
-	const url = `${baseUrl}${API_ENDPOINTS.presets.unpublish(slug, platform, version$1)}`;
+async function unpublishPreset(baseUrl, token, slug, version$1) {
+	const url = `${baseUrl}${API_ENDPOINTS.presets.unpublish(slug, version$1)}`;
+	log.debug(`DELETE ${url}`);
+	try {
+		const response = await fetch(url, {
+			method: "DELETE",
+			headers: { Authorization: `Bearer ${token}` }
+		});
+		log.debug(`Response status: ${response.status}`);
+		if (!response.ok) {
+			const errorData = await response.json();
+			return {
+				success: false,
+				error: errorData.error || `HTTP ${response.status}`
+			};
+		}
+		const data = await response.json();
+		return {
+			success: true,
+			data
+		};
+	} catch (error$2) {
+		return {
+			success: false,
+			error: `Failed to connect to registry: ${getErrorMessage(error$2)}`
+		};
+	}
+}
+
+//#endregion
+//#region src/lib/api/rules.ts
+/**
+* Publish a rule (create or update).
+* The registry handles create vs update automatically.
+*/
+async function publishRule(baseUrl, token, input) {
+	const url = `${baseUrl}${API_ENDPOINTS.rules.base}`;
+	log.debug(`POST ${url}`);
+	try {
+		const response = await fetch(url, {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				Authorization: `Bearer ${token}`
+			},
+			body: JSON.stringify(input)
+		});
+		log.debug(`Response status: ${response.status}`);
+		if (!response.ok) {
+			const errorData = await response.json();
+			return {
+				success: false,
+				error: errorData.error || `HTTP ${response.status}`,
+				issues: errorData.issues
+			};
+		}
+		const data = await response.json();
+		return {
+			success: true,
+			data
+		};
+	} catch (error$2) {
+		return {
+			success: false,
+			error: `Failed to connect to registry: ${getErrorMessage(error$2)}`
+		};
+	}
+}
+async function deleteRule(baseUrl, token, slug) {
+	const url = `${baseUrl}${API_ENDPOINTS.rules.bySlug(slug)}`;
 	log.debug(`DELETE ${url}`);
 	try {
 		const response = await fetch(url, {
@@ -735,164 +981,6 @@ async function fetchSession(baseUrl, token) {
 	}
 }
 
-//#endregion
-//#region src/lib/config.ts
-/** Directory for CLI configuration and credentials (e.g., ~/.agentrules/) */
-const CONFIG_DIRNAME = ".agentrules";
-const CONFIG_FILENAME = "config.json";
-const CONFIG_HOME_ENV = "AGENT_RULES_HOME";
-const DEFAULT_REGISTRY_ALIAS = "main";
-const DEFAULT_REGISTRY_URL = "https://agentrules.directory/";
-const DEFAULT_CONFIG = {
-	defaultRegistry: DEFAULT_REGISTRY_ALIAS,
-	registries: { [DEFAULT_REGISTRY_ALIAS]: { url: DEFAULT_REGISTRY_URL } }
-};
-async function loadConfig() {
-	await ensureConfigDir();
-	const configPath = getConfigPath();
-	log.debug(`Loading config from ${configPath}`);
-	try {
-		await access(configPath, constants.F_OK);
-	} catch (error$2) {
-		if (isNodeError(error$2) && error$2.code === "ENOENT") {
-			log.debug("Config file not found, creating default config");
-			await writeDefaultConfig();
-			return structuredClone(DEFAULT_CONFIG);
-		}
-		throw error$2 instanceof Error ? error$2 : new Error(String(error$2));
-	}
-	const raw = await readFile(configPath, "utf8");
-	let parsed = {};
-	try {
-		parsed = JSON.parse(raw);
-	} catch (error$2) {
-		throw new Error(`Failed to parse ${configPath}: ${error$2.message}`);
-	}
-	return mergeWithDefaults(parsed);
-}
-async function saveConfig(config) {
-	await ensureConfigDir();
-	const configPath = getConfigPath();
-	log.debug(`Saving config to ${configPath}`);
-	const serialized = JSON.stringify(config, null, 2);
-	await writeFile(configPath, serialized, "utf8");
-}
-function getConfigPath() {
-	return join(getConfigDir(), CONFIG_FILENAME);
-}
-function getConfigDir() {
-	const customDir = process.env[CONFIG_HOME_ENV];
-	if (customDir && customDir.trim().length > 0) return customDir;
-	return join(homedir(), CONFIG_DIRNAME);
-}
-/**
-* Normalizes a registry URL to a base URL with trailing slash.
-*
-* Examples:
-* - "https://example.com" → "https://example.com/"
-* - "https://example.com/custom/" → "https://example.com/custom/"
-* - "https://example.com/custom" → "https://example.com/custom/"
-*/
-function normalizeRegistryUrl(input) {
-	try {
-		const parsed = new URL(input);
-		if (!parsed.pathname.endsWith("/")) parsed.pathname = `${parsed.pathname}/`;
-		return parsed.toString();
-	} catch (error$2) {
-		throw new Error(`Invalid registry URL "${input}": ${error$2.message}`);
-	}
-}
-async function ensureConfigDir() {
-	const dir = getConfigDir();
-	await mkdir(dir, { recursive: true });
-}
-async function writeDefaultConfig() {
-	const configPath = getConfigPath();
-	await mkdir(dirname(configPath), { recursive: true });
-	await writeFile(configPath, JSON.stringify(DEFAULT_CONFIG, null, 2), "utf8");
-}
-function isNodeError(error$2) {
-	return error$2 instanceof Error && typeof error$2.code === "string";
-}
-function mergeWithDefaults(partial) {
-	const registries = {
-		...DEFAULT_CONFIG.registries,
-		...partial.registries ?? {}
-	};
-	if (!registries[DEFAULT_REGISTRY_ALIAS]) registries[DEFAULT_REGISTRY_ALIAS] = structuredClone(DEFAULT_CONFIG.registries[DEFAULT_REGISTRY_ALIAS]);
-	return {
-		defaultRegistry: partial.defaultRegistry ?? DEFAULT_CONFIG.defaultRegistry,
-		registries
-	};
-}
-
-//#endregion
-//#region src/commands/registry/manage.ts
-const REGISTRY_ALIAS_PATTERN = /^[a-z0-9][a-z0-9-_]{0,63}$/i;
-async function listRegistries() {
-	const config = await loadConfig();
-	const items = Object.entries(config.registries).map(([alias, settings]) => ({
-		alias,
-		...settings,
-		isDefault: alias === config.defaultRegistry
-	})).sort((a, b) => a.alias.localeCompare(b.alias));
-	log.debug(`Loaded ${items.length} registries`);
-	return items;
-}
-async function addRegistry(alias, url, options = {}) {
-	const normalizedAlias = normalizeAlias(alias);
-	const normalizedUrl = normalizeRegistryUrl(url);
-	const config = await loadConfig();
-	if (config.registries[normalizedAlias] && !options.overwrite) throw new Error(`Registry "${normalizedAlias}" already exists. Re-run with --force to overwrite.`);
-	const isUpdate = !!config.registries[normalizedAlias];
-	config.registries[normalizedAlias] = { url: normalizedUrl };
-	if (!config.defaultRegistry || options.makeDefault) {
-		config.defaultRegistry = normalizedAlias;
-		log.debug(`Set "${normalizedAlias}" as default registry`);
-	}
-	await saveConfig(config);
-	log.debug(`${isUpdate ? "Updated" : "Added"} registry "${normalizedAlias}" -> ${normalizedUrl}`);
-	return config.registries[normalizedAlias];
-}
-async function removeRegistry(alias, options = {}) {
-	const normalizedAlias = normalizeAlias(alias);
-	const config = await loadConfig();
-	if (!config.registries[normalizedAlias]) throw new Error(`Registry "${normalizedAlias}" was not found.`);
-	if (normalizedAlias === DEFAULT_REGISTRY_ALIAS) throw new Error("The built-in main registry cannot be removed. Point it somewhere else instead.");
-	const isDefault = normalizedAlias === config.defaultRegistry;
-	if (isDefault && !options.allowDefaultRemoval) throw new Error(`Registry "${normalizedAlias}" is currently the default. Re-run with --force to remove it.`);
-	delete config.registries[normalizedAlias];
-	log.debug(`Removed registry "${normalizedAlias}"`);
-	if (isDefault) {
-		config.defaultRegistry = pickFallbackDefault(config, normalizedAlias);
-		log.debug(`Default registry changed to "${config.defaultRegistry}"`);
-	}
-	await saveConfig(config);
-	return {
-		removedDefault: isDefault,
-		nextDefault: config.defaultRegistry
-	};
-}
-async function useRegistry(alias) {
-	const normalizedAlias = normalizeAlias(alias);
-	const config = await loadConfig();
-	if (!config.registries[normalizedAlias]) throw new Error(`Registry "${normalizedAlias}" is not defined.`);
-	config.defaultRegistry = normalizedAlias;
-	await saveConfig(config);
-	log.debug(`Switched default registry to "${normalizedAlias}"`);
-}
-function normalizeAlias(alias) {
-	const trimmed = alias.trim();
-	if (!trimmed) throw new Error("Alias is required.");
-	const normalized = trimmed.toLowerCase();
-	if (!REGISTRY_ALIAS_PATTERN.test(normalized)) throw new Error("Aliases may only contain letters, numbers, dashes, and underscores.");
-	return normalized;
-}
-function pickFallbackDefault(config, removedAlias) {
-	const fallback = Object.keys(config.registries).find((alias) => alias !== removedAlias);
-	return fallback ?? DEFAULT_REGISTRY_ALIAS;
-}
-
 //#endregion
 //#region src/lib/credentials.ts
 const chmodAsync = promisify(chmod);
@@ -922,7 +1010,7 @@ function normalizeUrl(url) {
 async function loadStore() {
 	const credentialsPath = getCredentialsPath();
 	try {
-		await access(credentialsPath, constants$1.F_OK);
+		await access(credentialsPath, constants.F_OK);
 	} catch {
 		log.debug(`Credentials file not found at ${credentialsPath}`);
 		return {};
@@ -1014,7 +1102,7 @@ async function clearAllCredentials() {
 async function createAppContext(options = {}) {
 	const { url: explicitUrl, registryAlias } = options;
 	log.debug("Loading app context");
-	const config = await loadConfig();
+	const config = await loadConfig$1();
 	const registry$1 = explicitUrl ? resolveExplicitUrl(explicitUrl) : resolveRegistry(config, registryAlias);
 	log.debug(`Active registry: ${registry$1.alias} → ${registry$1.url}`);
 	const credentials = await getCredentials(registry$1.url);
@@ -1099,273 +1187,150 @@ async function initAppContext(options = {}) {
 }
 
 //#endregion
-//#region src/commands/auth/login.ts
-const execAsync = promisify(exec);
-const CLIENT_ID = "agentrules-cli";
-/**
-* Performs device code flow login to an agentrules registry.
-*/
-async function login(options = {}) {
-	const { noBrowser = false, onDeviceCode, onBrowserOpen, onPollingStart, onAuthorized } = options;
+//#region src/commands/add.ts
+async function add(options) {
 	const ctx = useAppContext();
-	const { url: registryUrl } = ctx.registry;
-	log.debug(`Authenticating with ${registryUrl}`);
-	try {
-		log.debug("Requesting device code");
-		const codeResult = await requestDeviceCode({
-			issuer: registryUrl,
-			clientId: CLIENT_ID
-		});
-		if (codeResult.success === false) return {
-			success: false,
-			error: codeResult.error
-		};
-		const { data: deviceAuthResponse, config } = codeResult;
-		const formattedCode = formatUserCode(deviceAuthResponse.user_code);
-		onDeviceCode?.({
-			userCode: formattedCode,
-			verificationUri: deviceAuthResponse.verification_uri,
-			verificationUriComplete: deviceAuthResponse.verification_uri_complete
-		});
-		let browserOpened = false;
-		if (!noBrowser) try {
-			const urlToOpen = deviceAuthResponse.verification_uri_complete ?? deviceAuthResponse.verification_uri;
-			log.debug(`Opening browser: ${urlToOpen}`);
-			await openBrowser(urlToOpen);
-			browserOpened = true;
-		} catch {
-			log.debug("Failed to open browser");
-		}
-		onBrowserOpen?.(browserOpened);
-		log.debug("Waiting for user authorization");
-		onPollingStart?.();
-		const pollResult = await pollForToken({
-			config,
-			deviceAuthorizationResponse: deviceAuthResponse
-		});
-		if (pollResult.success === false) return {
-			success: false,
-			error: pollResult.error
-		};
-		onAuthorized?.();
-		const token = pollResult.token.access_token;
-		log.debug("Fetching user info");
-		const session = await fetchSession(registryUrl, token);
-		const user = session?.user;
-		const sessionExpiresAt = session?.session?.expiresAt;
-		const expiresAt = sessionExpiresAt ?? (pollResult.token.expires_in ? new Date(Date.now() + pollResult.token.expires_in * 1e3).toISOString() : void 0);
-		log.debug("Saving credentials");
-		await saveCredentials(registryUrl, {
-			token,
-			expiresAt,
-			userId: user?.id,
-			userName: user?.name,
-			userEmail: user?.email
+	const { alias: registryAlias, url: registryUrl } = ctx.registry;
+	const dryRun = Boolean(options.dryRun);
+	const { slug, platform, version: version$1 } = parseInput(options.slug, options.platform, options.version);
+	log.debug(`Resolving ${slug}${version$1 ? ` (version ${version$1})` : ""}`);
+	const resolved = await resolveSlug(registryUrl, slug, version$1);
+	if (!resolved) throw new Error(`"${slug}" was not found in the registry.`);
+	if (resolved.kind === "preset") {
+		const { selectedVersion: presetVersion, selectedVariant: presetVariant } = selectPresetVariant(resolved, version$1, platform);
+		return addPreset(resolved, presetVersion, presetVariant, {
+			...options,
+			registryAlias,
+			dryRun
 		});
-		return {
-			success: true,
-			user: user ? {
-				id: user.id,
-				name: user.name,
-				email: user.email
-			} : void 0
-		};
-	} catch (error$2) {
-		return {
-			success: false,
-			error: getErrorMessage(error$2)
-		};
 	}
+	const { selectedVersion: ruleVersion, selectedVariant: ruleVariant } = selectRuleVariant(resolved, version$1, platform);
+	return addRule(resolved, ruleVersion, ruleVariant, {
+		...options,
+		registryAlias,
+		dryRun
+	});
 }
-/**
-* Format user code as XXXX-XXXX for display.
-*/
-function formatUserCode(code$1) {
-	const cleaned = code$1.toUpperCase().replace(/[^A-Z0-9]/g, "");
-	if (cleaned.length <= 4) return cleaned;
-	return `${cleaned.slice(0, 4)}-${cleaned.slice(4, 8)}`;
-}
-/**
-* Opens a URL in the default browser.
-*/
-async function openBrowser(url) {
-	const platform = process.platform;
-	const commands = {
-		darwin: `open "${url}"`,
-		win32: `start "" "${url}"`,
-		linux: `xdg-open "${url}"`
-	};
-	const command$1 = commands[platform];
-	if (!command$1) throw new Error(`Unsupported platform: ${platform}`);
-	await execAsync(command$1);
-}
-
-//#endregion
-//#region src/commands/auth/logout.ts
-/**
-* Logs out by clearing stored credentials
-*/
-async function logout(options = {}) {
-	const { all = false } = options;
-	if (all) {
-		log.debug("Clearing all stored credentials");
-		await clearAllCredentials();
-		return {
-			success: true,
-			hadCredentials: true
-		};
+function selectPresetVariant(resolved, requestedVersion, platform) {
+	const selectedVersion = requestedVersion ? getPresetVersion(resolved, requestedVersion) : getLatestPresetVersion(resolved);
+	if (!selectedVersion) {
+		const versionLabel = requestedVersion ?? "latest";
+		throw new Error(`Version "${versionLabel}" not found for "${resolved.slug}".`);
 	}
-	const ctx = useAppContext();
-	const { url: registryUrl } = ctx.registry;
-	const hadCredentials = ctx.credentials !== null;
-	if (hadCredentials) {
-		log.debug(`Clearing credentials for ${registryUrl}`);
-		await clearCredentials(registryUrl);
-	} else log.debug(`No credentials found for ${registryUrl}`);
+	if (selectedVersion.variants.length === 0) throw new Error(`No platform variants found for "${resolved.slug}".`);
+	if (selectedVersion.variants.length > 1 && !platform) {
+		const platforms = selectedVersion.variants.map((v) => v.platform).join(", ");
+		throw new Error(`"${resolved.slug}" is available for multiple platforms: ${platforms}. Use --platform <platform> to specify which one.`);
+	}
+	const selectedVariant = platform ? getPresetVariant(selectedVersion, platform) : selectedVersion.variants[0];
+	if (!selectedVariant) throw new Error(`Platform "${platform}" not found for "${resolved.slug}" v${selectedVersion.version}.`);
 	return {
-		success: true,
-		hadCredentials
+		selectedVersion,
+		selectedVariant
 	};
 }
-
-//#endregion
-//#region src/commands/auth/whoami.ts
-/**
-* Returns information about the currently authenticated user
-*/
-async function whoami() {
-	const ctx = useAppContext();
-	const { url: registryUrl } = ctx.registry;
+function selectRuleVariant(resolved, requestedVersion, platform) {
+	const selectedVersion = requestedVersion ? getRuleVersion(resolved, requestedVersion) : getLatestRuleVersion(resolved);
+	if (!selectedVersion) {
+		const versionLabel = requestedVersion ?? "latest";
+		throw new Error(`Version "${versionLabel}" not found for "${resolved.slug}".`);
+	}
+	if (selectedVersion.variants.length === 0) throw new Error(`No platform variants found for "${resolved.slug}".`);
+	if (selectedVersion.variants.length > 1 && !platform) {
+		const platforms = selectedVersion.variants.map((v) => v.platform).join(", ");
+		throw new Error(`"${resolved.slug}" is available for multiple platforms: ${platforms}. Use --platform <platform> to specify which one.`);
+	}
+	const selectedVariant = platform ? getRuleVariant(selectedVersion, platform) : selectedVersion.variants[0];
+	if (!selectedVariant) throw new Error(`Platform "${platform}" not found for "${resolved.slug}" v${selectedVersion.version}.`);
 	return {
-		success: true,
-		loggedIn: ctx.isLoggedIn,
-		user: ctx.user ?? void 0,
-		registryUrl,
-		expiresAt: ctx.credentials?.expiresAt
+		selectedVersion,
+		selectedVariant
 	};
 }
-
-//#endregion
-//#region src/commands/preset/add.ts
-async function addPreset(options) {
-	const ctx = useAppContext();
-	const { alias: registryAlias, url: registryUrl } = ctx.registry;
-	const dryRun = Boolean(options.dryRun);
-	const { slug, platform, version: version$1 } = parsePresetInput(options.preset, options.platform, options.version);
-	log.debug(`Resolving preset ${slug} for platform ${platform}${version$1 ? ` (version ${version$1})` : ""}`);
-	const { preset, bundleUrl } = await resolvePreset(registryUrl, slug, platform, version$1);
-	log.debug(`Downloading bundle from ${bundleUrl}`);
-	const bundle = await fetchBundle(bundleUrl);
-	if (bundle.slug !== preset.slug || bundle.platform !== preset.platform) throw new Error(`Preset bundle metadata mismatch for "${preset.name}". Expected slug "${preset.slug}" (${preset.platform}).`);
-	const target = resolveInstallTarget(bundle.platform, options);
+async function addPreset(resolved, version$1, variant, options) {
+	log.debug(`Installing preset: ${variant.platform} v${version$1.version}`);
+	let bundle;
+	if (hasBundle(variant)) {
+		log.debug(`Downloading bundle from ${variant.bundleUrl}`);
+		bundle = await fetchBundle(variant.bundleUrl);
+	} else {
+		log.debug("Using inline bundle content");
+		bundle = JSON.parse(variant.content);
+	}
+	if (bundle.slug !== resolved.slug || bundle.platform !== variant.platform) throw new Error(`Bundle metadata mismatch for "${resolved.slug}". Expected slug "${resolved.slug}" (${variant.platform}).`);
+	const target = resolveInstallTarget(variant.platform, options);
 	log.debug(`Writing ${bundle.files.length} files to ${target.root}`);
-	const writeStats = await writeBundleFiles(bundle, target, {
+	const filesToWrite = [];
+	for (const file of bundle.files) {
+		const decoded = decodeBundledFile(file);
+		const data = Buffer.from(decoded);
+		await verifyBundledFileChecksum(file, data);
+		const destPath = computePresetDestinationPath(file.path, target);
+		filesToWrite.push({
+			path: destPath,
+			content: data
+		});
+	}
+	const writeStats = await writeFiles(filesToWrite, target.root, {
 		force: Boolean(options.force),
 		skipConflicts: Boolean(options.skipConflicts),
 		noBackup: Boolean(options.noBackup),
-		dryRun
+		dryRun: options.dryRun
 	});
 	return {
-		preset,
+		kind: "preset",
+		resolved,
+		version: version$1,
+		variant,
 		bundle,
 		files: writeStats.files,
-		conflicts: writeStats.conflicts,
 		backups: writeStats.backups,
 		targetRoot: target.root,
 		targetLabel: target.label,
-		registryAlias,
-		dryRun
-	};
-}
-/**
-* Parses preset input to extract slug, platform, and version.
-* Supports formats:
-* - "my-preset" (requires explicit platform)
-* - "my-preset.claude" (platform inferred from suffix)
-* - "my-preset@1.0" (with version)
-* - "my-preset.claude@1.0" (platform and version)
-*
-* Version can also be provided via --version flag (takes precedence).
-*/
-function parsePresetInput(input, explicitPlatform, explicitVersion) {
-	let normalized = input.toLowerCase().trim();
-	let parsedVersion;
-	const atIndex = normalized.lastIndexOf("@");
-	if (atIndex > 0) {
-		parsedVersion = normalized.slice(atIndex + 1);
-		normalized = normalized.slice(0, atIndex);
-	}
-	const version$1 = explicitVersion ?? parsedVersion;
-	if (explicitPlatform) {
-		const parts$1 = normalized.split(".");
-		const maybePlatform$1 = parts$1.at(-1);
-		if (maybePlatform$1 && isSupportedPlatform(maybePlatform$1)) return {
-			slug: parts$1.slice(0, -1).join("."),
-			platform: explicitPlatform,
-			version: version$1
-		};
-		return {
-			slug: normalized,
-			platform: explicitPlatform,
-			version: version$1
-		};
-	}
-	const parts = normalized.split(".");
-	const maybePlatform = parts.at(-1);
-	if (maybePlatform && isSupportedPlatform(maybePlatform)) return {
-		slug: parts.slice(0, -1).join("."),
-		platform: maybePlatform,
-		version: version$1
+		registryAlias: options.registryAlias,
+		dryRun: options.dryRun
 	};
-	throw new Error(`Platform not specified. Use --platform <platform> or specify as <slug>.<platform> (e.g., "${input}.claude").`);
 }
-function resolveInstallTarget(platform, options) {
-	const { projectDir, globalDir } = PLATFORMS[platform];
-	if (options.directory) {
-		const customRoot = resolve(expandHome(options.directory));
-		return {
-			root: customRoot,
-			mode: "custom",
-			platform,
-			projectDir,
-			label: `custom directory ${customRoot}`
-		};
-	}
-	if (options.global) {
-		const globalRoot = resolve(expandHome(globalDir));
-		return {
-			root: globalRoot,
-			mode: "global",
-			platform,
-			projectDir,
-			label: `global path ${globalRoot}`
-		};
-	}
-	const projectRoot = process.cwd();
+async function addRule(resolved, version$1, variant, options) {
+	log.debug(`Installing rule: ${variant.platform} v${version$1.version}`);
+	const { targetPath, targetRoot, targetLabel } = resolveRuleTarget(variant.platform, variant.type, resolved.name, options);
+	log.debug(`Target path: ${targetPath}`);
+	const writeStats = await writeFiles([{
+		path: targetPath,
+		content: Buffer.from(variant.content, "utf-8")
+	}], targetRoot, {
+		force: Boolean(options.force),
+		skipConflicts: false,
+		noBackup: Boolean(options.noBackup),
+		dryRun: options.dryRun
+	});
 	return {
-		root: projectRoot,
-		mode: "project",
-		platform,
-		projectDir,
-		label: `project root ${projectRoot}`
+		kind: "rule",
+		resolved,
+		version: version$1,
+		variant,
+		files: writeStats.files,
+		backups: writeStats.backups,
+		targetRoot,
+		targetLabel,
+		registryAlias: options.registryAlias,
+		dryRun: options.dryRun
 	};
 }
-async function writeBundleFiles(bundle, target, behavior) {
+/**
+* Write files with conflict detection, backup support, and diff preview.
+* Used by both preset and rule installation.
+*/
+async function writeFiles(filesToWrite, root, options) {
 	const files = [];
-	const conflicts = [];
 	const backups = [];
-	if (!behavior.dryRun) await mkdir(target.root, { recursive: true });
-	for (const file of bundle.files) {
-		const decoded = decodeBundledFile(file);
-		const data = Buffer.from(decoded);
-		await verifyBundledFileChecksum(file, data);
-		const destResult = computeDestinationPath(file.path, target);
-		const destination = destResult.path;
-		if (!behavior.dryRun) await mkdir(dirname(destination), { recursive: true });
+	if (!options.dryRun) await mkdir(root, { recursive: true });
+	for (const { path: destination, content } of filesToWrite) {
+		if (!options.dryRun) await mkdir(dirname(destination), { recursive: true });
 		const existing = await readExistingFile(destination);
-		const relativePath = relativize(destination, target.root);
+		const relativePath = relativize(destination, root);
 		if (!existing) {
-			if (!behavior.dryRun) await writeFile(destination, data);
+			if (!options.dryRun) await writeFile(destination, content);
 			files.push({
 				path: relativePath,
 				status: "created"
@@ -1373,7 +1338,7 @@ async function writeBundleFiles(bundle, target, behavior) {
 			log.debug(`Created: ${relativePath}`);
 			continue;
 		}
-		if (existing.equals(data)) {
+		if (existing.equals(content)) {
 			files.push({
 				path: relativePath,
 				status: "unchanged"
@@ -1381,18 +1346,19 @@ async function writeBundleFiles(bundle, target, behavior) {
 			log.debug(`Unchanged: ${relativePath}`);
 			continue;
 		}
-		if (behavior.force) {
-			if (!behavior.noBackup) {
+		const diff = renderDiffPreview(relativePath, existing, content);
+		if (options.force) {
+			if (!options.noBackup) {
 				const backupPath = `${destination}.bak`;
 				const relativeBackupPath = `${relativePath}.bak`;
-				if (!behavior.dryRun) await copyFile(destination, backupPath);
+				if (!options.dryRun) await copyFile(destination, backupPath);
 				backups.push({
 					originalPath: relativePath,
 					backupPath: relativeBackupPath
 				});
 				log.debug(`Backed up: ${relativePath} → ${relativeBackupPath}`);
 			}
-			if (!behavior.dryRun) await writeFile(destination, data);
+			if (!options.dryRun) await writeFile(destination, content);
 			files.push({
 				path: relativePath,
 				status: "overwritten"
@@ -1400,31 +1366,78 @@ async function writeBundleFiles(bundle, target, behavior) {
 			log.debug(`Overwritten: ${relativePath}`);
 			continue;
 		}
-		conflicts.push({
-			path: relativePath,
-			diff: renderDiffPreview(relativePath, existing, data)
-		});
-		files.push({
-			path: relativePath,
-			status: "conflict"
-		});
-		log.debug(`Conflict: ${relativePath}`);
+		if (options.skipConflicts) {
+			files.push({
+				path: relativePath,
+				status: "skipped",
+				diff
+			});
+			log.debug(`Skipped: ${relativePath}`);
+		} else {
+			files.push({
+				path: relativePath,
+				status: "conflict",
+				diff
+			});
+			log.debug(`Conflict: ${relativePath}`);
+		}
 	}
 	return {
 		files,
-		conflicts,
 		backups
 	};
 }
 /**
-* Compute destination path for a bundled file.
-*
-* Bundle files are stored with paths relative to the platform directory
-* (e.g., "AGENTS.md", "commands/test.md") and installed to:
-* - Project/custom: <root>/<projectDir>/<path> (e.g., .opencode/AGENTS.md)
-* - Global: <root>/<path> (e.g., ~/.config/opencode/AGENTS.md)
+* Parse input to extract slug and version.
+* Platform must be specified via --platform flag.
 */
-function computeDestinationPath(pathInput, target) {
+function parseInput(input, explicitPlatform, explicitVersion) {
+	let normalized = input.toLowerCase().trim();
+	let parsedVersion;
+	const atIndex = normalized.lastIndexOf("@");
+	if (atIndex > 0) {
+		parsedVersion = normalized.slice(atIndex + 1);
+		normalized = normalized.slice(0, atIndex);
+	}
+	return {
+		slug: normalized,
+		platform: explicitPlatform,
+		version: explicitVersion ?? parsedVersion
+	};
+}
+function resolveInstallTarget(platform, options) {
+	const { projectDir, globalDir } = PLATFORMS[platform];
+	if (options.directory) {
+		const customRoot = resolve(expandHome(options.directory));
+		return {
+			root: customRoot,
+			mode: "custom",
+			platform,
+			projectDir,
+			label: `custom directory ${customRoot}`
+		};
+	}
+	if (options.global) {
+		if (!globalDir) throw new Error(`Platform "${platform}" does not support global installation`);
+		const globalRoot = resolve(expandHome(globalDir));
+		return {
+			root: globalRoot,
+			mode: "global",
+			platform,
+			projectDir,
+			label: `global path ${globalRoot}`
+		};
+	}
+	const projectRoot = process.cwd();
+	return {
+		root: projectRoot,
+		mode: "project",
+		platform,
+		projectDir,
+		label: `project root ${projectRoot}`
+	};
+}
+function computePresetDestinationPath(pathInput, target) {
 	const normalized = normalizeBundlePath(pathInput);
 	if (!normalized) throw new Error(`Unable to derive destination for ${pathInput}. The computed relative path is empty.`);
 	let relativePath;
@@ -1432,7 +1445,36 @@ function computeDestinationPath(pathInput, target) {
 	else relativePath = `${target.projectDir}/${normalized}`;
 	const destination = resolve(target.root, relativePath);
 	ensureWithinRoot(destination, target.root);
-	return { path: destination };
+	return destination;
+}
+function resolveRuleTarget(platform, type, name, options) {
+	const location = options.global ? "global" : "project";
+	const pathTemplate = getInstallPath(platform, type, name, location);
+	if (!pathTemplate) {
+		const locationLabel = options.global ? "globally" : "to a project";
+		throw new Error(`Rule type "${type}" cannot be installed ${locationLabel} for platform "${platform}"`);
+	}
+	if (options.directory) {
+		const customRoot = resolve(expandHome(options.directory));
+		const filename = pathTemplate.split("/").pop() ?? `${name}.md`;
+		const targetPath$1 = resolve(customRoot, filename);
+		ensureWithinRoot(targetPath$1, customRoot);
+		return {
+			targetPath: targetPath$1,
+			targetRoot: customRoot,
+			targetLabel: `custom directory ${customRoot}`
+		};
+	}
+	const expanded = expandHome(pathTemplate);
+	const targetPath = expanded.startsWith("/") ? expanded : resolve(process.cwd(), expanded);
+	const targetRoot = options.global ? dirname(targetPath) : process.cwd();
+	ensureWithinRoot(targetPath, targetRoot);
+	const targetLabel = options.global ? `global path ${targetRoot}` : `project root ${targetRoot}`;
+	return {
+		targetPath,
+		targetRoot,
+		targetLabel
+	};
 }
 async function readExistingFile(pathname) {
 	try {
@@ -1463,14 +1505,169 @@ function ensureWithinRoot(candidate, root) {
 	if (candidate === root) return;
 	if (!candidate.startsWith(normalizedRoot)) throw new Error(`Refusing to write outside of ${root}. Derived path: ${candidate}`);
 }
+/**
+* Expands ~ to the user's home directory.
+*
+* Uses process.env.HOME (Unix) or process.env.USERPROFILE (Windows) first,
+* falling back to os.homedir(). This matches shell behavior and allows
+* tests to override the home directory via environment variables.
+*/
 function expandHome(value) {
 	if (value.startsWith("~")) {
 		const remainder = value.slice(1);
-		if (!remainder) return homedir();
-		if (remainder.startsWith("/") || remainder.startsWith("\\")) return `${homedir()}${remainder}`;
-		return `${homedir()}/${remainder}`;
+		const home = process.env.HOME || process.env.USERPROFILE || homedir();
+		if (!remainder) return home;
+		if (remainder.startsWith("/") || remainder.startsWith("\\")) return `${home}${remainder}`;
+		return `${home}/${remainder}`;
+	}
+	return value;
+}
+
+//#endregion
+//#region src/commands/auth/login.ts
+const execAsync = promisify(exec);
+const CLIENT_ID = "agentrules-cli";
+/**
+* Performs device code flow login to an agentrules registry.
+*/
+async function login(options = {}) {
+	const { noBrowser = false, onDeviceCode, onBrowserOpen, onPollingStart, onAuthorized } = options;
+	const ctx = useAppContext();
+	const { url: registryUrl } = ctx.registry;
+	log.debug(`Authenticating with ${registryUrl}`);
+	try {
+		log.debug("Requesting device code");
+		const codeResult = await requestDeviceCode({
+			issuer: registryUrl,
+			clientId: CLIENT_ID
+		});
+		if (codeResult.success === false) return {
+			success: false,
+			error: codeResult.error
+		};
+		const { data: deviceAuthResponse, config } = codeResult;
+		const formattedCode = formatUserCode(deviceAuthResponse.user_code);
+		onDeviceCode?.({
+			userCode: formattedCode,
+			verificationUri: deviceAuthResponse.verification_uri,
+			verificationUriComplete: deviceAuthResponse.verification_uri_complete
+		});
+		let browserOpened = false;
+		if (!noBrowser) try {
+			const urlToOpen = deviceAuthResponse.verification_uri_complete ?? deviceAuthResponse.verification_uri;
+			log.debug(`Opening browser: ${urlToOpen}`);
+			await openBrowser(urlToOpen);
+			browserOpened = true;
+		} catch {
+			log.debug("Failed to open browser");
+		}
+		onBrowserOpen?.(browserOpened);
+		log.debug("Waiting for user authorization");
+		onPollingStart?.();
+		const pollResult = await pollForToken({
+			config,
+			deviceAuthorizationResponse: deviceAuthResponse
+		});
+		if (pollResult.success === false) return {
+			success: false,
+			error: pollResult.error
+		};
+		onAuthorized?.();
+		const token = pollResult.token.access_token;
+		log.debug("Fetching user info");
+		const session = await fetchSession(registryUrl, token);
+		const user = session?.user;
+		const sessionExpiresAt = session?.session?.expiresAt;
+		const expiresAt = sessionExpiresAt ?? (pollResult.token.expires_in ? new Date(Date.now() + pollResult.token.expires_in * 1e3).toISOString() : void 0);
+		log.debug("Saving credentials");
+		await saveCredentials(registryUrl, {
+			token,
+			expiresAt,
+			userId: user?.id,
+			userName: user?.name,
+			userEmail: user?.email
+		});
+		return {
+			success: true,
+			user: user ? {
+				id: user.id,
+				name: user.name,
+				email: user.email
+			} : void 0
+		};
+	} catch (error$2) {
+		return {
+			success: false,
+			error: getErrorMessage(error$2)
+		};
+	}
+}
+/**
+* Format user code as XXXX-XXXX for display.
+*/
+function formatUserCode(code$1) {
+	const cleaned = code$1.toUpperCase().replace(/[^A-Z0-9]/g, "");
+	if (cleaned.length <= 4) return cleaned;
+	return `${cleaned.slice(0, 4)}-${cleaned.slice(4, 8)}`;
+}
+/**
+* Opens a URL in the default browser.
+*/
+async function openBrowser(url) {
+	const platform = process.platform;
+	const commands = {
+		darwin: `open "${url}"`,
+		win32: `start "" "${url}"`,
+		linux: `xdg-open "${url}"`
+	};
+	const command$1 = commands[platform];
+	if (!command$1) throw new Error(`Unsupported platform: ${platform}`);
+	await execAsync(command$1);
+}
+
+//#endregion
+//#region src/commands/auth/logout.ts
+/**
+* Logs out by clearing stored credentials
+*/
+async function logout(options = {}) {
+	const { all = false } = options;
+	if (all) {
+		log.debug("Clearing all stored credentials");
+		await clearAllCredentials();
+		return {
+			success: true,
+			hadCredentials: true
+		};
 	}
-	return value;
+	const ctx = useAppContext();
+	const { url: registryUrl } = ctx.registry;
+	const hadCredentials = ctx.credentials !== null;
+	if (hadCredentials) {
+		log.debug(`Clearing credentials for ${registryUrl}`);
+		await clearCredentials(registryUrl);
+	} else log.debug(`No credentials found for ${registryUrl}`);
+	return {
+		success: true,
+		hadCredentials
+	};
+}
+
+//#endregion
+//#region src/commands/auth/whoami.ts
+/**
+* Returns information about the currently authenticated user
+*/
+async function whoami() {
+	const ctx = useAppContext();
+	const { url: registryUrl } = ctx.registry;
+	return {
+		success: true,
+		loggedIn: ctx.isLoggedIn,
+		user: ctx.user ?? void 0,
+		registryUrl,
+		expiresAt: ctx.credentials?.expiresAt
+	};
 }
 
 //#endregion
@@ -1534,61 +1731,116 @@ async function resolveConfigPath(inputPath) {
 	return inputPath;
 }
 /**
-* Load a preset from a directory containing agentrules.json.
+* Load and normalize a preset config file.
 *
-* Config in platform dir (e.g., .claude/agentrules.json):
-*   - Preset files: siblings of config
-*   - Metadata: .agentrules/ subfolder
+* This is the single source of truth for reading preset configs.
+* Always returns a normalized shape with `platforms` as PlatformConfig[].
 *
-* Config at repo root:
-*   - Preset files: in .claude/ (or `path` from config)
-*   - Metadata: .agentrules/ subfolder
+* @throws Error if config file is missing, invalid JSON, or fails validation
 */
-async function loadPreset(presetDir) {
-	const configPath = join(presetDir, PRESET_CONFIG_FILENAME);
-	if (!await fileExists(configPath)) throw new Error(`Config file not found: ${configPath}`);
-	const configRaw = await readFile(configPath, "utf8");
+async function loadConfig(inputPath) {
+	const configPath = await resolveConfigPath(inputPath);
+	log.debug(`Resolved config path: ${configPath}`);
+	const configRaw = await readFile(configPath, "utf8").catch(() => null);
+	if (configRaw === null) throw new Error(`Config file not found: ${configPath}`);
 	let configJson;
 	try {
 		configJson = JSON.parse(configRaw);
-	} catch {
-		throw new Error(`Invalid JSON in ${configPath}`);
+	} catch (e) {
+		throw new Error(`Invalid JSON in ${configPath}: ${e instanceof Error ? e.message : String(e)}`);
 	}
 	const configObj = configJson;
 	const identifier = typeof configObj?.name === "string" ? configObj.name : configPath;
-	const config = validatePresetConfig(configJson, identifier);
-	const slug = config.name;
-	const dirName = basename(presetDir);
-	const isConfigInPlatformDir = isPlatformDir(dirName);
-	let filesDir;
-	let metadataDir;
-	if (isConfigInPlatformDir) {
-		filesDir = presetDir;
-		metadataDir = join(presetDir, AGENT_RULES_DIR);
-		log.debug(`Config in platform dir: files in ${filesDir}, metadata in ${metadataDir}`);
-	} else {
-		const platformDir = config.path ?? PLATFORMS[config.platform].projectDir;
-		filesDir = join(presetDir, platformDir);
-		metadataDir = join(presetDir, AGENT_RULES_DIR);
-		log.debug(`Config at repo root: files in ${filesDir}, metadata in ${metadataDir}`);
-		if (!await directoryExists(filesDir)) throw new Error(`Files directory not found: ${filesDir}. Create the directory or set "path" in ${PRESET_CONFIG_FILENAME}.`);
-	}
+	const rawConfig = validatePresetConfig(configJson, identifier);
+	const platforms = rawConfig.platforms.map(normalizePlatformEntry);
+	if (platforms.length === 0) throw new Error(`Config must have at least one platform in the "platforms" array.`);
+	const config = {
+		$schema: rawConfig.$schema,
+		name: rawConfig.name,
+		title: rawConfig.title,
+		description: rawConfig.description,
+		license: rawConfig.license,
+		version: rawConfig.version,
+		tags: rawConfig.tags,
+		features: rawConfig.features,
+		ignore: rawConfig.ignore,
+		agentrulesDir: rawConfig.agentrulesDir,
+		platforms
+	};
+	const configDir = dirname(configPath);
+	const dirName = basename(configDir);
+	const isInProjectMode = isPlatformDir(dirName);
+	if (isInProjectMode && platforms.length > 1) throw new Error(`Multi-platform configs must be placed at project root, not inside a platform directory like "${dirName}".`);
+	const platformNames = platforms.map((p$1) => p$1.platform).join(", ");
+	log.debug(`Loaded config: ${config.name}, platforms: ${platformNames}, mode: ${isInProjectMode ? "in-project" : "standalone"}`);
+	return {
+		configPath,
+		config,
+		configDir,
+		isInProjectMode
+	};
+}
+/**
+* Load a preset from a directory containing agentrules.json.
+*
+* Always returns normalized PresetInput format with platformFiles array.
+*
+* Config in platform dir (e.g., .claude/agentrules.json):
+*   - Preset files: siblings of config
+*   - Extras (README, LICENSE, INSTALL): agentrulesDir subfolder (default: .agentrules/)
+*
+* Config at repo root:
+*   - Files in each platform's directory (or custom path if specified)
+*   - Extras (README, LICENSE, INSTALL): agentrulesDir subfolder (default: .agentrules/)
+*
+* Use agentrulesDir: "." to read extras from the config directory itself
+* (useful for dedicated preset repos where README.md should be at root).
+*/
+async function loadPreset(presetDir) {
+	const { config, configDir, isInProjectMode } = await loadConfig(join(presetDir, PRESET_CONFIG_FILENAME));
+	const { platforms } = config;
+	const agentrulesDir = config.agentrulesDir ?? AGENT_RULES_DIR;
+	const isAgentrulesAtRoot = agentrulesDir === ".";
+	const agentrulesPath = isAgentrulesAtRoot ? configDir : join(configDir, agentrulesDir);
 	let installMessage;
 	let readmeContent;
 	let licenseContent;
-	if (await directoryExists(metadataDir)) {
-		installMessage = await readFileIfExists(join(metadataDir, INSTALL_FILENAME));
-		readmeContent = await readFileIfExists(join(metadataDir, README_FILENAME));
-		licenseContent = await readFileIfExists(join(metadataDir, LICENSE_FILENAME));
+	if (isAgentrulesAtRoot || await directoryExists(agentrulesPath)) {
+		installMessage = await readFileIfExists(join(agentrulesPath, INSTALL_FILENAME));
+		readmeContent = await readFileIfExists(join(agentrulesPath, README_FILENAME));
+		licenseContent = await readFileIfExists(join(agentrulesPath, LICENSE_FILENAME));
 	}
 	const ignorePatterns = [...DEFAULT_IGNORE_PATTERNS, ...config.ignore ?? []];
-	const rootExclude = [PRESET_CONFIG_FILENAME, AGENT_RULES_DIR];
-	const files = await collectFiles(filesDir, rootExclude, ignorePatterns);
-	if (files.length === 0) throw new Error(`No files found in ${filesDir}. Presets must include at least one file.`);
+	const platformFiles = [];
+	for (const entry of platforms) {
+		const { platform, path: customPath } = entry;
+		let filesDir;
+		if (isInProjectMode) {
+			filesDir = configDir;
+			log.debug(`Config in platform dir: files for ${platform} in ${filesDir}`);
+		} else {
+			const platformDir = customPath ?? PLATFORMS[platform].projectDir;
+			filesDir = join(configDir, platformDir);
+			log.debug(`Config at repo root: files for ${platform} in ${filesDir}`);
+			if (!await directoryExists(filesDir)) throw new Error(`Files directory not found: ${filesDir}. Create the directory or set "path" in the platform entry.`);
+		}
+		const rootExclude = isAgentrulesAtRoot ? [
+			PRESET_CONFIG_FILENAME,
+			README_FILENAME,
+			LICENSE_FILENAME,
+			INSTALL_FILENAME
+		] : [PRESET_CONFIG_FILENAME, agentrulesDir];
+		const files = await collectFiles(filesDir, rootExclude, ignorePatterns);
+		if (files.length === 0) throw new Error(`No files found in ${filesDir}. Presets must include at least one file.`);
+		platformFiles.push({
+			platform,
+			files
+		});
+	}
 	return {
-		slug,
+		name: config.name,
 		config,
-		files,
+		platformFiles,
 		installMessage,
 		readmeContent,
 		licenseContent
@@ -1638,11 +1890,11 @@ async function collectFiles(dir, rootExclude, ignorePatterns, root) {
 			const nested = await collectFiles(fullPath, rootExclude, ignorePatterns, configRoot);
 			files.push(...nested);
 		} else if (entry.isFile()) {
-			const contents = await readFile(fullPath, "utf8");
+			const content = await readFile(fullPath, "utf8");
 			const relativePath = relative(configRoot, fullPath);
 			files.push({
 				path: relativePath,
-				contents
+				content
 			});
 		}
 	}
@@ -1775,7 +2027,7 @@ async function initPreset(options) {
 		description,
 		tags: options.tags ?? [],
 		license,
-		platform
+		platforms: [platform]
 	};
 	let createdDir;
 	if (await directoryExists(platformDir)) log.debug(`Platform directory exists: ${platformDir}`);
@@ -1891,10 +2143,10 @@ async function initInteractive(options) {
 	}
 	const result = await p.group({
 		name: () => p.text({
-			message: "Preset name (slug)",
+			message: "Preset name",
 			placeholder: normalizeName(defaultName),
 			defaultValue: normalizeName(defaultName),
-			validate: check(slugSchema)
+			validate: check(nameSchema)
 		}),
 		title: ({ results }) => {
 			const defaultTitle = titleOption ?? toTitleCase(results.name ?? defaultName);
@@ -1972,78 +2224,56 @@ async function initInteractive(options) {
 //#endregion
 //#region src/commands/preset/validate.ts
 async function validatePreset(options) {
-	const configPath = await resolveConfigPath(options.path);
-	log.debug(`Resolved config path: ${configPath}`);
 	const errors = [];
 	const warnings = [];
-	const configRaw = await readFile(configPath, "utf8").catch(() => null);
-	if (configRaw === null) {
-		errors.push(`Config file not found: ${configPath}`);
-		log.debug("Config file read failed");
-		return {
-			valid: false,
-			configPath,
-			preset: null,
-			errors,
-			warnings
-		};
-	}
-	log.debug("Config file read successfully");
-	let configJson;
-	try {
-		configJson = JSON.parse(configRaw);
-		log.debug("JSON parsed successfully");
-	} catch (e) {
-		errors.push(`Invalid JSON: ${e instanceof Error ? e.message : String(e)}`);
-		log.debug(`JSON parse error: ${e instanceof Error ? e.message : String(e)}`);
-		return {
-			valid: false,
-			configPath,
-			preset: null,
-			errors,
-			warnings
-		};
-	}
-	let preset;
+	let configPath;
+	let config;
+	let configDir;
+	let isInProjectMode;
 	try {
-		preset = validatePresetConfig(configJson, configPath);
-		log.debug("Preset config validation passed");
+		const result = await loadConfig(options.path);
+		configPath = result.configPath;
+		config = result.config;
+		configDir = result.configDir;
+		isInProjectMode = result.isInProjectMode;
+		log.debug("Config loaded and normalized successfully");
 	} catch (e) {
-		errors.push(e instanceof Error ? e.message : String(e));
-		log.debug(`Preset config validation failed: ${e instanceof Error ? e.message : String(e)}`);
+		const message = e instanceof Error ? e.message : String(e);
+		errors.push(message);
+		log.debug(`Config load failed: ${message}`);
+		const fallbackPath = options.path ?? "agentrules.json";
 		return {
 			valid: false,
-			configPath,
+			configPath: fallbackPath,
 			preset: null,
 			errors,
 			warnings
 		};
 	}
-	log.debug(`Preset slug: ${preset.name}`);
-	const presetDir = dirname(configPath);
-	const platform = preset.platform;
-	log.debug(`Checking platform: ${platform}`);
-	if (isSupportedPlatform(platform)) {
-		const dirName = basename(presetDir);
-		const isInProjectMode = isPlatformDir(dirName);
-		if (isInProjectMode) log.debug(`In-project mode: files expected in ${presetDir}`);
+	log.debug(`Preset name: ${config.name}`);
+	for (const entry of config.platforms) {
+		const { platform, path: customPath } = entry;
+		log.debug(`Checking platform: ${platform}`);
+		if (!isSupportedPlatform(platform)) {
+			errors.push(`Unknown platform "${platform}". Supported: ${PLATFORM_IDS.join(", ")}`);
+			log.debug(`Platform "${platform}" is not supported`);
+			continue;
+		}
+		if (isInProjectMode) log.debug(`In-project mode: files expected in ${configDir}`);
 		else {
-			const filesPath = preset.path ?? PLATFORMS[platform].projectDir;
-			const filesDir = join(presetDir, filesPath);
+			const filesPath = customPath ?? PLATFORMS[platform].projectDir;
+			const filesDir = join(configDir, filesPath);
 			const filesExists = await directoryExists(filesDir);
-			log.debug(`Standalone mode: files directory check: ${filesDir} - ${filesExists ? "exists" : "not found"}`);
-			if (!filesExists) errors.push(`Files directory not found: ${filesPath}`);
+			log.debug(`Standalone mode: files directory check for ${platform}: ${filesDir} - ${filesExists ? "exists" : "not found"}`);
+			if (!filesExists) errors.push(`Files directory not found for ${platform}: ${filesPath}`);
 		}
-	} else {
-		errors.push(`Unknown platform "${platform}". Supported: ${PLATFORM_IDS.join(", ")}`);
-		log.debug(`Platform "${platform}" is not supported`);
 	}
-	const hasPlaceholderTags = preset.tags?.some((t) => t.startsWith("//"));
-	const hasPlaceholderFeatures = preset.features?.some((f) => f.startsWith("//"));
+	const hasPlaceholderTags = config.tags?.some((t) => t.startsWith("//"));
+	const hasPlaceholderFeatures = config.features?.some((f) => f.startsWith("//"));
 	if (hasPlaceholderTags) {
 		errors.push("Replace placeholder comments in tags before publishing.");
 		log.debug("Found placeholder comments in tags");
-	} else if (!preset.tags || preset.tags.length === 0) {
+	} else if (!config.tags || config.tags.length === 0) {
 		errors.push("At least one tag is required.");
 		log.debug("No tags specified");
 	}
@@ -2056,7 +2286,7 @@ async function validatePreset(options) {
 	return {
 		valid: isValid,
 		configPath,
-		preset: isValid ? preset : null,
+		preset: isValid ? config : null,
 		errors,
 		warnings
 	};
@@ -2064,8 +2294,8 @@ async function validatePreset(options) {
 
 //#endregion
 //#region src/commands/publish.ts
-/** Maximum size per bundle in bytes (1MB) */
-const MAX_BUNDLE_SIZE_BYTES = 1 * 1024 * 1024;
+/** Maximum size per variant/platform bundle in bytes (1MB) */
+const MAX_VARIANT_SIZE_BYTES = 1 * 1024 * 1024;
 /**
 * Formats bytes as human-readable string
 */
@@ -2107,7 +2337,8 @@ async function publish(options = {}) {
 	let presetInput;
 	try {
 		presetInput = await loadPreset(presetDir);
-		log.debug(`Loaded preset "${presetInput.slug}" for platform ${presetInput.config.platform}`);
+		const platforms$1 = presetInput.config.platforms.map((p$1) => p$1.platform).join(", ");
+		log.debug(`Loaded preset "${presetInput.name}" for platforms: ${platforms$1}`);
 	} catch (error$2) {
 		const message = getErrorMessage(error$2);
 		spinner$1.fail("Failed to load preset");
@@ -2117,63 +2348,74 @@ async function publish(options = {}) {
 			error: message
 		};
 	}
-	spinner$1.update("Building bundle...");
+	spinner$1.update("Building platform bundles...");
 	let publishInput;
 	try {
 		publishInput = await buildPresetPublishInput({
 			preset: presetInput,
 			version: version$1
 		});
-		log.debug(`Built publish input for ${publishInput.platform}`);
+		const platforms$1 = publishInput.variants.map((v) => v.platform).join(", ");
+		log.debug(`Built publish input for platforms: ${platforms$1}`);
 	} catch (error$2) {
 		const message = getErrorMessage(error$2);
-		spinner$1.fail("Failed to build bundle");
+		spinner$1.fail("Failed to build platform bundles");
 		log.error(message);
 		return {
 			success: false,
 			error: message
 		};
 	}
-	const inputJson = JSON.stringify(publishInput);
-	const inputSize = Buffer.byteLength(inputJson, "utf8");
-	const fileCount = publishInput.files.length;
-	log.debug(`Publish input size: ${formatBytes(inputSize)}, files: ${fileCount}`);
-	if (inputSize > MAX_BUNDLE_SIZE_BYTES) {
-		const errorMessage = `Bundle exceeds maximum size (${formatBytes(inputSize)} > ${formatBytes(MAX_BUNDLE_SIZE_BYTES)})`;
-		spinner$1.fail("Bundle too large");
-		log.error(errorMessage);
-		return {
-			success: false,
-			error: errorMessage
-		};
+	const totalFileCount = publishInput.variants.reduce((sum, v) => sum + v.files.length, 0);
+	const platformList = publishInput.variants.map((v) => v.platform).join(", ");
+	let totalSize = 0;
+	for (const variant of publishInput.variants) {
+		const variantJson = JSON.stringify(variant);
+		const variantSize = Buffer.byteLength(variantJson, "utf8");
+		totalSize += variantSize;
+		log.debug(`Variant ${variant.platform}: ${formatBytes(variantSize)}, ${variant.files.length} files`);
+		if (variantSize > MAX_VARIANT_SIZE_BYTES) {
+			const errorMessage = `Files for "${variant.platform}" exceed maximum size (${formatBytes(variantSize)} > ${formatBytes(MAX_VARIANT_SIZE_BYTES)})`;
+			spinner$1.fail("Platform bundle too large");
+			log.error(errorMessage);
+			return {
+				success: false,
+				error: errorMessage
+			};
+		}
 	}
+	log.debug(`Total publish size: ${formatBytes(totalSize)}, files: ${totalFileCount}, platforms: ${platformList}`);
 	if (dryRun) {
 		spinner$1.success("Dry run complete");
 		log.print("");
 		log.print(ui.header("Publish Preview"));
 		log.print(ui.keyValue("Preset", publishInput.title));
-		log.print(ui.keyValue("Slug", publishInput.slug));
-		log.print(ui.keyValue("Platform", publishInput.platform));
+		log.print(ui.keyValue("Name", publishInput.name));
+		log.print(ui.keyValue("Platforms", platformList));
 		log.print(ui.keyValue("Version", version$1 ? `${version$1}.x (auto-assigned minor)` : "1.x (auto-assigned)"));
-		log.print(ui.keyValue("Files", `${fileCount} file${fileCount === 1 ? "" : "s"}`));
-		log.print(ui.keyValue("Size", formatBytes(inputSize)));
-		log.print("");
-		log.print(ui.header("Files to publish", fileCount));
-		log.print(ui.fileTree(publishInput.files));
+		log.print(ui.keyValue("Files", `${totalFileCount} file${totalFileCount === 1 ? "" : "s"}`));
+		log.print(ui.keyValue("Size", formatBytes(totalSize)));
 		log.print("");
+		for (const variant of publishInput.variants) {
+			log.print(ui.fileTree(variant.files, {
+				showFolderSizes: true,
+				header: `Files for ${variant.platform}`
+			}));
+			log.print("");
+		}
 		log.print(ui.hint("Run without --dry-run to publish."));
 		return {
 			success: true,
 			preview: {
-				slug: publishInput.slug,
-				platform: publishInput.platform,
+				slug: publishInput.name,
+				platforms: publishInput.variants.map((v) => v.platform),
 				title: publishInput.title,
-				totalSize: inputSize,
-				fileCount
+				totalSize,
+				fileCount: totalFileCount
 			}
 		};
 	}
-	spinner$1.update(`Publishing ${publishInput.title} (${publishInput.platform})...`);
+	spinner$1.update(`Publishing ${publishInput.title} (${platformList})...`);
 	if (!ctx.credentials) throw new Error("Credentials should exist at this point");
 	const result = await publishPreset(ctx.registry.url, ctx.credentials.token, publishInput);
 	if (!result.success) {
@@ -2197,23 +2439,27 @@ async function publish(options = {}) {
 	}
 	const { data } = result;
 	const action = data.isNewPreset ? "Published new preset" : "Published";
-	spinner$1.success(`${action} ${ui.code(data.slug)} ${ui.version(data.version)} (${data.platform})`);
+	const platforms = data.variants.map((v) => v.platform).join(", ");
+	spinner$1.success(`${action} ${ui.code(data.slug)} ${ui.version(data.version)} (${platforms})`);
 	log.print("");
-	log.print(ui.header("Published files", fileCount));
-	log.print(ui.fileTree(publishInput.files));
-	const presetName$1 = `${data.slug}.${data.platform}`;
-	const presetRegistryUrl = `${ctx.registry.url}preset/${presetName$1}`;
+	for (const variant of publishInput.variants) {
+		log.print(ui.fileTree(variant.files, {
+			showFolderSizes: true,
+			header: `Published files for ${variant.platform}`
+		}));
+		log.print("");
+	}
 	log.info("");
-	log.info(ui.keyValue("Now live at", ui.link(presetRegistryUrl)));
+	log.info(ui.keyValue("Now live at", ui.link(data.url)));
 	return {
 		success: true,
 		preset: {
 			slug: data.slug,
-			platform: data.platform,
 			title: data.title,
 			version: data.version,
 			isNewPreset: data.isNewPreset,
-			bundleUrl: data.bundleUrl
+			variants: data.variants,
+			url: data.url
 		}
 	};
 }
@@ -2242,7 +2488,7 @@ async function buildRegistry(options) {
 	});
 	if (validateOnly || !outputDir) return {
 		presets: presets.length,
-		entries: result.entries.length,
+		items: result.items.length,
 		bundles: result.bundles.length,
 		outputDir: null,
 		validateOnly
@@ -2257,23 +2503,20 @@ async function buildRegistry(options) {
 		await writeFile(join(bundleDir, bundle.version), bundleJson);
 		await writeFile(join(bundleDir, LATEST_VERSION), bundleJson);
 	}
-	for (const entry of result.entries) {
-		const apiPresetDir = join(outputDir, API_ENDPOINTS.presets.base, entry.slug, entry.platform);
-		await mkdir(apiPresetDir, { recursive: true });
-		const entryJson = JSON.stringify(entry, null, indent$1);
-		await writeFile(join(apiPresetDir, entry.version), entryJson);
-		await writeFile(join(apiPresetDir, LATEST_VERSION), entryJson);
+	for (const item of result.items) {
+		const itemJson = JSON.stringify(item, null, indent$1);
+		const itemPath = join(outputDir, API_ENDPOINTS.items.get(item.slug));
+		await mkdir(join(itemPath, ".."), { recursive: true });
+		await writeFile(itemPath, itemJson);
 	}
 	const registryJson = JSON.stringify({
 		$schema: "https://agentrules.directory/schema/registry.json",
-		items: result.entries
+		items: result.items
 	}, null, indent$1);
 	await writeFile(join(outputDir, "registry.json"), registryJson);
-	const indexJson = JSON.stringify(result.index, null, indent$1);
-	await writeFile(join(outputDir, "registry.index.json"), indexJson);
 	return {
 		presets: presets.length,
-		entries: result.entries.length,
+		items: result.items.length,
 		bundles: result.bundles.length,
 		outputDir,
 		validateOnly: false
@@ -2296,19 +2539,147 @@ async function discoverPresetDirs(inputDir) {
 	return presetDirs.sort();
 }
 
+//#endregion
+//#region src/commands/share.ts
+async function share(options = {}) {
+	const ctx = useAppContext();
+	if (!(ctx.isLoggedIn && ctx.credentials)) {
+		const error$2 = "Not logged in. Run `agentrules login` to authenticate.";
+		log.error(error$2);
+		return {
+			success: false,
+			error: error$2
+		};
+	}
+	let content = options.content;
+	if (options.file) {
+		const filePath = resolve(options.file);
+		try {
+			content = await readFile(filePath, "utf-8");
+		} catch {
+			const error$2 = `Failed to read file: ${options.file}`;
+			log.error(error$2);
+			return {
+				success: false,
+				error: error$2
+			};
+		}
+	}
+	if (!options.name) {
+		const error$2 = "Name is required. Use --name <name>";
+		log.error(error$2);
+		return {
+			success: false,
+			error: error$2
+		};
+	}
+	if (!options.platform) {
+		const error$2 = `Platform is required. Use --platform <${PLATFORM_IDS.join("|")}>`;
+		log.error(error$2);
+		return {
+			success: false,
+			error: error$2
+		};
+	}
+	if (!PLATFORM_IDS.includes(options.platform)) {
+		const error$2 = `Invalid platform "${options.platform}". Valid platforms: ${PLATFORM_IDS.join(", ")}`;
+		log.error(error$2);
+		return {
+			success: false,
+			error: error$2
+		};
+	}
+	const validTypes = getValidRuleTypes(options.platform);
+	if (!options.type) {
+		const error$2 = `Type is required. Use --type <${validTypes.join("|")}>`;
+		log.error(error$2);
+		return {
+			success: false,
+			error: error$2
+		};
+	}
+	if (!validTypes.includes(options.type)) {
+		const error$2 = `Invalid type "${options.type}" for platform "${options.platform}". Valid types: ${validTypes.join(", ")}`;
+		log.error(error$2);
+		return {
+			success: false,
+			error: error$2
+		};
+	}
+	if (!options.title) {
+		const error$2 = "Title is required. Use --title <title>";
+		log.error(error$2);
+		return {
+			success: false,
+			error: error$2
+		};
+	}
+	if (!content) {
+		const error$2 = "Content is required. Provide a file path or use --content";
+		log.error(error$2);
+		return {
+			success: false,
+			error: error$2
+		};
+	}
+	if (!options.tags || options.tags.length === 0) {
+		const error$2 = "At least one tag is required. Use --tags <tag1,tag2,...>";
+		log.error(error$2);
+		return {
+			success: false,
+			error: error$2
+		};
+	}
+	const spinner$1 = await log.spinner(`Publishing rule "${options.name}"...`);
+	const result = await publishRule(ctx.registry.url, ctx.credentials.token, {
+		name: options.name,
+		platform: options.platform,
+		type: options.type,
+		title: options.title,
+		description: options.description,
+		content,
+		tags: options.tags
+	});
+	if (!result.success) {
+		spinner$1.fail("Publish failed");
+		log.error(result.error);
+		if (result.issues) for (const issue of result.issues) log.error(`  ${issue.path}: ${issue.message}`);
+		return {
+			success: false,
+			error: result.error
+		};
+	}
+	const action = result.data.isNew ? "Created" : "Updated";
+	spinner$1.success(`${action} rule ${ui.code(result.data.slug)}`);
+	log.print("");
+	log.print(ui.keyValue("Now live at", ui.link(result.data.url)));
+	log.print("");
+	log.print(ui.keyValue("Install command", ui.code(`npx @agentrules/cli add ${result.data.slug}`)));
+	return {
+		success: true,
+		rule: {
+			slug: result.data.slug,
+			platform: result.data.platform,
+			type: result.data.type,
+			title: result.data.title,
+			isNew: result.data.isNew
+		}
+	};
+}
+
 //#endregion
 //#region src/commands/unpublish.ts
 /**
-* Parses preset input to extract slug, platform, and version.
+* Parses preset input to extract slug and version.
 * Supports formats:
-* - "my-preset.claude@1.0" (platform and version in string)
-* - "my-preset@1.0" (requires explicit platform)
-* - "my-preset.claude" (requires explicit version)
+* - "my-preset@1.0" (slug and version)
+* - "username/my-preset@1.0" (namespaced slug and version)
+* - "my-preset" (requires explicit --version)
 *
-* Explicit --platform and --version flags take precedence.
+* Explicit --version flag takes precedence.
 */
-function parseUnpublishInput(input, explicitPlatform, explicitVersion) {
-	let normalized = input.toLowerCase().trim();
+function parseUnpublishInput(input, explicitVersion) {
+	let normalized = input.trim();
 	let parsedVersion;
 	const atIndex = normalized.lastIndexOf("@");
 	if (atIndex > 0) {
@@ -2316,28 +2687,17 @@ function parseUnpublishInput(input, explicitPlatform, explicitVersion) {
 		normalized = normalized.slice(0, atIndex);
 	}
 	const version$1 = explicitVersion ?? parsedVersion;
-	const parts = normalized.split(".");
-	const maybePlatform = parts.at(-1);
-	let slug;
-	let platform;
-	if (maybePlatform && isSupportedPlatform(maybePlatform)) {
-		slug = parts.slice(0, -1).join(".");
-		platform = explicitPlatform ?? maybePlatform;
-	} else {
-		slug = normalized;
-		platform = explicitPlatform;
-	}
 	return {
-		slug,
-		platform,
+		slug: normalized,
 		version: version$1
 	};
 }
 /**
-* Unpublishes a preset version from the registry
+* Unpublishes a preset version from the registry.
+* This unpublishes all platform variants for the specified version.
 */
 async function unpublish(options) {
-	const { slug, platform, version: version$1 } = parseUnpublishInput(options.preset, options.platform, options.version);
+	const { slug, version: version$1 } = parseUnpublishInput(options.preset, options.version);
 	if (!slug) {
 		log.error("Preset slug is required");
 		return {
@@ -2345,21 +2705,14 @@ async function unpublish(options) {
 			error: "Preset slug is required"
 		};
 	}
-	if (!platform) {
-		log.error("Platform is required. Use --platform or specify as <slug>.<platform>@<version>");
-		return {
-			success: false,
-			error: "Platform is required"
-		};
-	}
 	if (!version$1) {
-		log.error("Version is required. Use --version or specify as <slug>.<platform>@<version>");
+		log.error("Version is required. Use --version or specify as <slug>@<version>");
 		return {
 			success: false,
 			error: "Version is required"
 		};
 	}
-	log.debug(`Unpublishing preset: ${slug}.${platform}@${version$1}`);
+	log.debug(`Unpublishing preset: ${slug}@${version$1}`);
 	const ctx = useAppContext();
 	if (!(ctx.isLoggedIn && ctx.credentials)) {
 		const error$2 = "Not logged in. Run `agentrules login` to authenticate.";
@@ -2370,8 +2723,8 @@ async function unpublish(options) {
 		};
 	}
 	log.debug(`Authenticated, unpublishing from ${ctx.registry.url}`);
-	const spinner$1 = await log.spinner(`Unpublishing ${ui.code(slug)}.${platform} ${ui.version(version$1)}...`);
-	const result = await unpublishPreset(ctx.registry.url, ctx.credentials.token, slug, platform, version$1);
+	const spinner$1 = await log.spinner(`Unpublishing ${ui.code(slug)} ${ui.version(version$1)}...`);
+	const result = await unpublishPreset(ctx.registry.url, ctx.credentials.token, slug, version$1);
 	if (!result.success) {
 		spinner$1.fail("Unpublish failed");
 		log.error(result.error);
@@ -2382,18 +2735,63 @@ async function unpublish(options) {
 		};
 	}
 	const { data } = result;
-	spinner$1.success(`Unpublished ${ui.code(data.slug)}.${data.platform} ${ui.version(data.version)}`);
-	log.info(ui.hint("This version can no longer be republished."));
+	spinner$1.success(`Unpublished ${ui.code(data.slug)} ${ui.version(data.version)}`);
+	log.info(ui.hint("This version and all its platform variants have been removed."));
 	return {
 		success: true,
 		preset: {
 			slug: data.slug,
-			platform: data.platform,
 			version: data.version
 		}
 	};
 }
 
+//#endregion
+//#region src/commands/unshare.ts
+/**
+* Unshares a rule from the registry (soft delete)
+*/
+async function unshare(options) {
+	const slug = options.slug?.trim().toLowerCase();
+	if (!slug) {
+		const error$2 = "Rule slug is required. Usage: agentrules unshare <slug>";
+		log.error(error$2);
+		return {
+			success: false,
+			error: error$2
+		};
+	}
+	log.debug(`Unsharing rule: ${slug}`);
+	const ctx = useAppContext();
+	if (!(ctx.isLoggedIn && ctx.credentials)) {
+		const error$2 = "Not logged in. Run `agentrules login` to authenticate.";
+		log.error(error$2);
+		return {
+			success: false,
+			error: error$2
+		};
+	}
+	log.debug(`Authenticated, unsharing from ${ctx.registry.url}`);
+	const spinner$1 = await log.spinner(`Unsharing ${ui.code(slug)}...`);
+	const result = await deleteRule(ctx.registry.url, ctx.credentials.token, slug);
+	if (!result.success) {
+		spinner$1.fail("Unshare failed");
+		log.error(result.error);
+		if (result.error.includes("connect")) log.info(ui.hint("Check your network connection and try again."));
+		return {
+			success: false,
+			error: result.error
+		};
+	}
+	const { data } = result;
+	spinner$1.success(`Unshared ${ui.code(data.slug)}`);
+	log.info(ui.hint("The rule has been removed from the registry."));
+	return {
+		success: true,
+		rule: { slug: data.slug }
+	};
+}
+
 //#endregion
 //#region src/help-agent/publish.ts
 /**
@@ -2680,14 +3078,14 @@ program.name("agentrules").description("The AI Agent Directory CLI").version(pac
 		log.debug(`Failed to init context: ${getErrorMessage(error$2)}`);
 	}
 }).showHelpAfterError();
-program.command("add <preset>").description("Download and install a preset from the registry").option("-p, --platform <platform>", "Target platform (opencode, codex, claude, cursor)").option("-V, --version <version>", "Install a specific version").option("-r, --registry <alias>", "Use a specific registry alias").option("-g, --global", "Install to global directory").option("--dir <path>", "Install to a custom directory").option("-f, --force", "Overwrite existing files (backs up originals)").option("-y, --yes", "Alias for --force").option("--dry-run", "Preview changes without writing").option("--skip-conflicts", "Skip conflicting files").option("--no-backup", "Don't backup files before overwriting (use with --force)").action(handle(async (preset, options) => {
-	const platform = options.platform ? normalizePlatformInput(options.platform) : void 0;
+program.command("add <item>").description("Download and install a preset or rule from the registry").option("-p, --platform <platform>", "Target platform (opencode, codex, claude, cursor)").option("--version <version>", "Install a specific version (or use slug@version)").option("-r, --registry <alias>", "Use a specific registry alias").option("-g, --global", "Install to global directory").option("--dir <path>", "Install to a custom directory").option("-f, --force", "Overwrite existing files (backs up originals)").option("-y, --yes", "Alias for --force").option("--dry-run", "Preview changes without writing").option("--skip-conflicts", "Skip conflicting files (presets only)").option("--no-backup", "Don't backup files before overwriting (use with --force)").action(handle(async (item, options) => {
 	const dryRun = Boolean(options.dryRun);
-	const spinner$1 = await log.spinner("Fetching preset...");
+	const platform = options.platform ? normalizePlatformInput(options.platform) : void 0;
+	const spinner$1 = await log.spinner("Resolving...");
 	let result;
 	try {
-		result = await addPreset({
-			preset,
+		result = await add({
+			slug: item,
 			platform,
 			version: options.version,
 			global: Boolean(options.global),
@@ -2702,22 +3100,28 @@ program.command("add <preset>").description("Download and install a preset from
 		throw err;
 	}
 	spinner$1.stop();
-	const hasBlockingConflicts = result.conflicts.length > 0 && !options.skipConflicts && !dryRun;
+	const conflicts = result.files.filter((f) => f.status === "conflict");
+	const hasBlockingConflicts = conflicts.length > 0 && !options.skipConflicts && !dryRun;
 	if (hasBlockingConflicts) {
-		const count$1 = result.conflicts.length === 1 ? "1 file has" : `${result.conflicts.length} files have`;
+		const count$1 = conflicts.length === 1 ? "1 file has" : `${conflicts.length} files have`;
 		const forceHint = `Use ${ui.command("--force")} to overwrite ${ui.muted("(--no-backup to skip backups)")}`;
 		log.error(`${count$1} conflicts. ${forceHint}`);
 		log.print("");
-		for (const conflict of result.conflicts.slice(0, 3)) {
+		for (const conflict of conflicts.slice(0, 3)) {
 			log.print(`  ${ui.muted("•")} ${conflict.path}`);
 			if (conflict.diff) log.print(conflict.diff.split("\n").map((l) => `    ${l}`).join("\n"));
 		}
-		if (result.conflicts.length > 3) log.print(`\n  ${ui.muted(`...and ${result.conflicts.length - 3} more`)}`);
+		if (conflicts.length > 3) log.print(`\n  ${ui.muted(`...and ${conflicts.length - 3} more`)}`);
 		log.print("");
 		log.print(forceHint);
 		process.exitCode = 1;
 		return;
 	}
+	const allUnchanged = result.files.every((f) => f.status === "unchanged");
+	if (allUnchanged) {
+		log.info("Already up to date.");
+		return;
+	}
 	if (result.backups.length > 0) {
 		log.print("");
 		for (const backup of result.backups) log.print(ui.backupStatus(backup.originalPath, backup.backupPath, { dryRun }));
@@ -2730,10 +3134,12 @@ program.command("add <preset>").description("Download and install a preset from
 	}
 	log.print("");
 	const verb = dryRun ? "Would install" : "Installed";
-	log.success(`${verb} ${ui.bold(result.preset.title)} ${ui.muted(`for ${result.preset.platform}`)}`);
-	if (result.conflicts.length > 0 && options.skipConflicts) log.warn(`${result.conflicts.length} conflicting file${result.conflicts.length === 1 ? "" : "s"} skipped`);
+	const kindLabel = result.kind === "rule" ? `(${result.variant.platform}/${result.variant.type})` : `for ${result.variant.platform}`;
+	log.success(`${verb} ${ui.bold(result.resolved.title)} ${ui.muted(kindLabel)}`);
+	const skippedConflicts = result.files.filter((f) => f.status === "skipped");
+	if (skippedConflicts.length > 0) log.warn(`${skippedConflicts.length} conflicting file${skippedConflicts.length === 1 ? "" : "s"} skipped`);
 	if (dryRun) log.print(ui.hint("\nDry run complete. No files were written."));
-	if (result.bundle.installMessage) log.print(`\n${result.bundle.installMessage}`);
+	if (result.kind === "preset" && result.bundle.installMessage) log.print(`\n${result.bundle.installMessage}`);
 }));
 program.command("init").description("Initialize a new preset").argument("[directory]", "Directory to initialize (created if it doesn't exist)").option("-y, --yes", "Accept defaults without prompting").option("-n, --name <name>", "Preset name").option("-t, --title <title>", "Display title").option("--description <text>", "Preset description").option("-p, --platform <platform>", "Target platform (opencode, claude, cursor, codex)").option("-l, --license <license>", "License (e.g., MIT)").option("-f, --force", "Overwrite existing agentrules.json").action(handle(async (directory, options) => {
 	const targetDir = directory ?? process.cwd();
@@ -2799,10 +3205,11 @@ program.command("validate").description("Validate an agentrules.json configurati
 	const result = await validatePreset({ path: path$1 });
 	if (result.valid && result.preset) {
 		const p$1 = result.preset;
+		const platforms = p$1.platforms.map((entry) => entry.platform).join(", ");
 		log.success(p$1.title);
 		log.print(ui.keyValue("Description", p$1.description));
 		log.print(ui.keyValue("License", p$1.license));
-		log.print(ui.keyValue("Platform", p$1.platform));
+		log.print(ui.keyValue("Platforms", platforms));
 		if (p$1.tags?.length) log.print(ui.keyValue("Tags", p$1.tags.join(", ")));
 	} else if (!result.valid) log.error(`Invalid: ${ui.path(result.configPath)}`);
 	if (result.errors.length > 0) {
@@ -2839,15 +3246,15 @@ registry.command("build").description("Build registry from preset directories").
 		validateOnly: options.validateOnly
 	});
 	if (result.validateOnly) {
-		log.success(`Validated ${result.presets} preset${result.presets === 1 ? "" : "s"} ${ui.muted(`→ ${result.entries} entries`)}`);
+		log.success(`Validated ${result.presets} preset${result.presets === 1 ? "" : "s"} ${ui.muted(`→ ${result.items} items`)}`);
 		return;
 	}
 	if (!result.outputDir) {
-		log.info(`Found ${result.presets} preset${result.presets === 1 ? "" : "s"} → ${result.entries} entries`);
+		log.info(`Found ${result.presets} preset${result.presets === 1 ? "" : "s"} → ${result.items} items`);
 		log.print(ui.hint(`Use ${ui.command("--out <path>")} to write files`));
 		return;
 	}
-	log.success(`Built ${result.presets} preset${result.presets === 1 ? "" : "s"} ${ui.muted(`→ ${result.entries} entries, ${result.bundles} bundles`)}`);
+	log.success(`Built ${result.presets} preset${result.presets === 1 ? "" : "s"} ${ui.muted(`→ ${result.items} items, ${result.bundles} bundles`)}`);
 	log.print(ui.keyValue("Output", ui.path(result.outputDir)));
 }));
 registry.command("add <alias> <url>").description("Add or update a registry endpoint").option("-f, --force", "Overwrite existing entry").option("-d, --default", "Set as default registry").action(handle(async (alias, url, options) => {
@@ -2925,7 +3332,7 @@ program.command("whoami").description("Show the currently authenticated user").a
 		log.print(ui.keyValue("Session", `expires in ${daysUntilExpiry} day${daysUntilExpiry === 1 ? "" : "s"}`));
 	}
 }));
-program.command("publish").description("Publish a preset to the registry").argument("[path]", "Path to agentrules.json or directory containing it").option("-V, --version <major>", "Major version", Number.parseInt).option("--dry-run", "Preview what would be published without publishing").action(handle(async (path$1, options) => {
+program.command("publish").description("Publish a preset to the registry").argument("[path]", "Path to agentrules.json or directory containing it").option("--version <major>", "Major version (overrides config)", Number.parseInt).option("--dry-run", "Preview what would be published without publishing").action(handle(async (path$1, options) => {
 	const result = await publish({
 		path: path$1,
 		version: options.version,
@@ -2933,11 +3340,28 @@ program.command("publish").description("Publish a preset to the registry").argum
 	});
 	if (!result.success) process.exitCode = 1;
 }));
-program.command("unpublish").description("Remove a preset version from the registry").argument("<preset>", "Preset to unpublish (e.g., my-preset.claude@1.0 or my-preset@1.0)").option("-p, --platform <platform>", "Target platform (opencode, codex, claude, cursor)").option("-V, --version <version>", "Version to unpublish").action(handle(async (preset, options) => {
-	const platform = options.platform ? normalizePlatformInput(options.platform) : void 0;
+program.command("share").description("Share a rule to the registry").argument("[file]", "Path to file containing rule content").requiredOption("-n, --name <name>", "Rule name (URL identifier)").requiredOption("-p, --platform <platform>", "Target platform (opencode, codex, claude, cursor)").requiredOption("-t, --type <type>", "Rule type (instruction, agent, command, tool, skill, rule)").requiredOption("--title <title>", "Display title").requiredOption("--tags <tags>", "Comma-separated tags (e.g., typescript,react,testing)").option("--description <text>", "Optional description").option("-c, --content <content>", "Rule content (or provide file path)").action(handle(async (file, options) => {
+	const platform = normalizePlatformInput(options.platform);
+	const tags = options.tags.split(",").map((t) => t.trim()).filter(Boolean);
+	const result = await share({
+		name: options.name,
+		platform,
+		type: options.type,
+		title: options.title,
+		description: options.description,
+		content: options.content,
+		file,
+		tags
+	});
+	if (!result.success) process.exitCode = 1;
+}));
+program.command("unshare").description("Remove a rule from the registry").argument("<slug>", "Rule slug to unshare").action(handle(async (slug) => {
+	const result = await unshare({ slug });
+	if (!result.success) process.exitCode = 1;
+}));
+program.command("unpublish").description("Remove a preset version from the registry (removes all platform variants)").argument("<preset>", "Preset to unpublish (e.g., my-preset@1.0.0)").option("--version <version>", "Version to unpublish (or use preset@version)").action(handle(async (preset, options) => {
 	const result = await unpublish({
 		preset,
-		platform,
 		version: options.version
 	});
 	if (!result.success) process.exitCode = 1;