@agentrules/cli 0.0.10 → 0.0.12

package/README.md

@@ -34,7 +34,8 @@ agentrules add <preset> --platform <platform> [options]
 | `-g, --global` | Install to global config directory |
 | `--dir <path>` | Install to a custom directory |
 | `-r, --registry <alias>` | Use a specific registry |
-| `-f, --force` | Overwrite existing files |
+| `-f, --force` | Overwrite existing files (backs up originals to `.bak`) |
+| `--no-backup` | Don't backup files before overwriting (use with `--force`) |
 | `--dry-run` | Preview changes without writing |
 | `--skip-conflicts` | Skip files that already exist |
 
@@ -63,7 +64,7 @@ agentrules add agentic-dev-starter --platform opencode --dry-run
 
 ### `agentrules init [directory]`
 
-Initialize a new preset.
+Initialize a preset config in a platform directory. The command guides you through the required fields for publishing.
 
 ```bash
 agentrules init [directory] [options]
@@ -73,7 +74,7 @@ agentrules init [directory] [options]
 
 | Option | Description |
 |--------|-------------|
-| `-n, --name <name>` | Preset name (default: directory name, or `my-preset`) |
+| `-n, --name <name>` | Preset name (default: `my-preset`) |
 | `-t, --title <title>` | Display title |
 | `--description <text>` | Preset description |
 | `-p, --platform <platform>` | Target platform |
@@ -84,30 +85,69 @@ agentrules init [directory] [options]
 **Examples:**
 
 ```bash
-# Create a new preset directory and initialize (interactive prompts)
-agentrules init my-preset
-cd my-preset
-
-# Initialize in current directory
+# Initialize in your existing platform directory
+cd .opencode
 agentrules init
 
-# Set defaults for prompts
-agentrules init my-preset --name awesome-rules --platform opencode
+# Initialize in a specific platform directory
+agentrules init .claude
 
 # Accept all defaults, skip prompts
-agentrules init my-preset --yes
+agentrules init .opencode --yes
+```
+
+After running `init`, your preset structure is:
+
+```
+.opencode/
+├── agentrules.json       # Preset config (created by init)
+├── AGENTS.md             # Your config files (included in bundle)
+├── commands/
+│   └── review.md
+└── .agentrules/          # Optional metadata folder
+    ├── README.md         # Shown on registry page
+    ├── LICENSE.md        # Full license text
+    └── INSTALL.txt       # Shown after install
+```
+
+### Preset Config Fields
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `name` | Yes | URL-safe identifier (lowercase, hyphens) |
+| `title` | Yes | Display name |
+| `description` | Yes | Short description (max 500 chars) |
+| `license` | Yes | SPDX license identifier (e.g., `MIT`) |
+| `platform` | Yes | Target platform: `opencode`, `claude`, `cursor`, `codex` |
+| `version` | No | Major version (default: 1) |
+| `tags` | No | Up to 10 tags for discoverability |
+| `features` | No | Up to 5 key features to highlight |
+| `ignore` | No | Additional patterns to exclude from bundle |
+
+### Auto-Excluded Files
+
+These files are automatically excluded from bundles:
+- `node_modules/`, `.git/`, `.DS_Store`
+- Lock files: `package-lock.json`, `bun.lockb`, `pnpm-lock.yaml`, `*.lock`
+
+Use the `ignore` field for additional exclusions:
+
+```json
+{
+  "ignore": ["*.log", "test-fixtures", "*.tmp"]
+}
 ```
 
 ### `agentrules validate [path]`
 
-Validate a preset configuration.
+Validate a preset configuration before publishing.
 
 ```bash
 # Validate current directory
 agentrules validate
 
 # Validate a specific path
-agentrules validate ./my-preset
+agentrules validate .opencode
 ```
 
 ---
@@ -161,14 +201,36 @@ agentrules publish --dry-run
 
 **Versioning:** Presets use `MAJOR.MINOR` versioning. You set the major version, and the registry auto-increments the minor version on each publish.
 
-### `agentrules unpublish <name>`
+### `agentrules unpublish <preset>`
+
+Remove a specific version of a preset from the registry. Requires authentication.
+
+```bash
+agentrules unpublish <preset> [options]
+```
+
+**Options:**
+
+| Option | Description |
+|--------|-------------|
+| `-p, --platform <platform>` | Target platform (if not in preset string) |
+| `-V, --version <version>` | Version to unpublish (if not in preset string) |
 
-Remove a preset from the registry. Requires authentication.
+**Examples:**
 
 ```bash
-agentrules unpublish my-preset
+# Full format: slug.platform@version
+agentrules unpublish my-preset.opencode@1.0
+
+# With flags
+agentrules unpublish my-preset --platform opencode --version 1.0
+
+# Mixed: version in string, platform as flag
+agentrules unpublish my-preset@1.0 --platform opencode
 ```
 
+**Note:** Unpublished versions cannot be republished with the same version number.
+
 ---
 
 ## Registry Management

package/dist/index.js

@@ -1,14 +1,14 @@
 #!/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, 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 { API_ENDPOINTS, COMMON_LICENSES, CONFIG_DIR_NAME, LATEST_VERSION, PLATFORMS, PLATFORM_IDS, PRESET_CONFIG_FILENAME, PRESET_SCHEMA_URL, STATIC_BUNDLE_DIR, buildPresetPublishInput, buildPresetRegistry, createDiffPreview, decodeBundledFile, descriptionSchema, fetchBundle, isLikelyText, isSupportedPlatform, licenseSchema, normalizeBundlePath, normalizePlatformInput, resolvePreset, slugSchema, titleSchema, toUtf8String, validatePresetConfig, verifyBundledFileChecksum } from "@agentrules/core";
 import * as client from "openid-client";
 import chalk from "chalk";
 import { chmod, constants } from "fs";
-import { access, constants as constants$1, mkdir, readFile, readdir, rm, stat, writeFile } from "fs/promises";
+import { access, constants as constants$1, copyFile, mkdir, readFile, readdir, rm, stat, writeFile } from "fs/promises";
 import { homedir } from "os";
 import * as p from "@clack/prompts";
 
@@ -221,6 +221,14 @@ function fileStatus(status, filePath, options = {}) {
 	return `${config.style(config.symbol)} ${config.style(pad(label, 14))} ${filePath}`;
 }
 /**
+* Format a backup status line
+* e.g., "↪ backed up    .opencode/AGENT_RULES.md → .opencode/AGENT_RULES.md.bak"
+*/
+function backupStatus(originalPath, backupPath, options = {}) {
+	const label = options.dryRun ? "would backup" : "backed up";
+	return `${theme.info("↪")} ${theme.info(pad(label, 14))} ${originalPath} ${symbols.arrow} ${backupPath}`;
+}
+/**
 * Step indicator for multi-step operations
 * e.g., "[1/3] Fetching registry..."
 */
@@ -335,6 +343,7 @@ const ui = {
 	warning,
 	info: info$1,
 	fileStatus,
+	backupStatus,
 	step,
 	brand,
 	banner,
@@ -575,6 +584,19 @@ function formatPollingError(err) {
 	return "Lost connection to server. Please try again.";
 }
 
+//#endregion
+//#region src/lib/errors.ts
+/**
+* Error utilities
+*/
+/**
+* Safely extract an error message from any error type.
+*/
+function getErrorMessage(error$2) {
+	if (error$2 instanceof Error) return error$2.message;
+	return String(error$2);
+}
+
 //#endregion
 //#region src/lib/api/presets.ts
 /**
@@ -608,10 +630,9 @@ async function publishPreset(baseUrl, token, input) {
 			data
 		};
 	} catch (error$2) {
-		const message = error$2 instanceof Error ? error$2.message : String(error$2);
 		return {
 			success: false,
-			error: `Failed to connect to registry: ${message}`
+			error: `Failed to connect to registry: ${getErrorMessage(error$2)}`
 		};
 	}
 }
@@ -640,10 +661,9 @@ async function unpublishPreset(baseUrl, token, slug, platform, version$1) {
 			data
 		};
 	} catch (error$2) {
-		const message = error$2 instanceof Error ? error$2.message : String(error$2);
 		return {
 			success: false,
-			error: `Failed to connect to registry: ${message}`
+			error: `Failed to connect to registry: ${getErrorMessage(error$2)}`
 		};
 	}
 }
@@ -673,6 +693,7 @@ 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";
@@ -867,7 +888,7 @@ async function loadStore() {
 		const store = JSON.parse(raw);
 		return store;
 	} catch (error$2) {
-		log.debug(`Failed to load credentials: ${error$2 instanceof Error ? error$2.message : String(error$2)}`);
+		log.debug(`Failed to load credentials: ${getErrorMessage(error$2)}`);
 		return {};
 	}
 }
@@ -981,7 +1002,7 @@ async function createAppContext(options = {}) {
 				log.debug("Saved fetched user info to credentials");
 			}
 		} catch (error$2) {
-			log.debug(`Failed to fetch user info: ${error$2 instanceof Error ? error$2.message : String(error$2)}`);
+			log.debug(`Failed to fetch user info: ${getErrorMessage(error$2)}`);
 		}
 	}
 	log.debug(`App context loaded: isLoggedIn=${isLoggedIn}, user=${user?.name ?? "none"}`);
@@ -1018,10 +1039,11 @@ function resolveRegistry(config, alias) {
 }
 let globalContext = null;
 /**
-* Gets the global app context, or null if not initialized.
-* Use this in commands to access cached config, registry, and auth state.
+* Gets the global app context.
+* Throws if context has not been initialized via initAppContext().
 */
 function useAppContext() {
+	if (!globalContext) throw new Error("App context not initialized");
 	return globalContext;
 }
 /**
@@ -1042,7 +1064,6 @@ const CLIENT_ID = "agentrules-cli";
 async function login(options = {}) {
 	const { noBrowser = false, onDeviceCode, onBrowserOpen, onPollingStart, onAuthorized } = options;
 	const ctx = useAppContext();
-	if (!ctx) throw new Error("App context not initialized");
 	const { url: registryUrl } = ctx.registry;
 	log.debug(`Authenticating with ${registryUrl}`);
 	try {
@@ -1106,10 +1127,9 @@ async function login(options = {}) {
 			} : void 0
 		};
 	} catch (error$2) {
-		const message = error$2 instanceof Error ? error$2.message : String(error$2);
 		return {
 			success: false,
-			error: message
+			error: getErrorMessage(error$2)
 		};
 	}
 }
@@ -1152,7 +1172,6 @@ async function logout(options = {}) {
 		};
 	}
 	const ctx = useAppContext();
-	if (!ctx) throw new Error("App context not initialized");
 	const { url: registryUrl } = ctx.registry;
 	const hadCredentials = ctx.credentials !== null;
 	if (hadCredentials) {
@@ -1172,7 +1191,6 @@ async function logout(options = {}) {
 */
 async function whoami() {
 	const ctx = useAppContext();
-	if (!ctx) throw new Error("App context not initialized");
 	const { url: registryUrl } = ctx.registry;
 	return {
 		success: true,
@@ -1187,7 +1205,6 @@ async function whoami() {
 //#region src/commands/preset/add.ts
 async function addPreset(options) {
 	const ctx = useAppContext();
-	if (!ctx) throw new Error("App context not initialized");
 	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);
@@ -1201,6 +1218,7 @@ async function addPreset(options) {
 	const writeStats = await writeBundleFiles(bundle, target, {
 		force: Boolean(options.force),
 		skipConflicts: Boolean(options.skipConflicts),
+		noBackup: Boolean(options.noBackup),
 		dryRun
 	});
 	return {
@@ -1208,6 +1226,7 @@ async function addPreset(options) {
 		bundle,
 		files: writeStats.files,
 		conflicts: writeStats.conflicts,
+		backups: writeStats.backups,
 		targetRoot: target.root,
 		targetLabel: target.label,
 		registryAlias,
@@ -1290,20 +1309,13 @@ function resolveInstallTarget(platform, options) {
 async function writeBundleFiles(bundle, target, behavior) {
 	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);
-		if (destResult.skipped) {
-			files.push({
-				path: file.path,
-				status: "skipped"
-			});
-			log.debug(`Skipped (root file): ${file.path}`);
-			continue;
-		}
 		const destination = destResult.path;
 		if (!behavior.dryRun) await mkdir(dirname(destination), { recursive: true });
 		const existing = await readExistingFile(destination);
@@ -1326,6 +1338,16 @@ async function writeBundleFiles(bundle, target, behavior) {
 			continue;
 		}
 		if (behavior.force) {
+			if (!behavior.noBackup) {
+				const backupPath = `${destination}.bak`;
+				const relativeBackupPath = `${relativePath}.bak`;
+				if (!behavior.dryRun) await copyFile(destination, backupPath);
+				backups.push({
+					originalPath: relativePath,
+					backupPath: relativeBackupPath
+				});
+				log.debug(`Backed up: ${relativePath} → ${relativeBackupPath}`);
+			}
 			if (!behavior.dryRun) await writeFile(destination, data);
 			files.push({
 				path: relativePath,
@@ -1346,30 +1368,27 @@ async function writeBundleFiles(bundle, target, behavior) {
 	}
 	return {
 		files,
-		conflicts
+		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)
+*/
 function computeDestinationPath(pathInput, target) {
 	const normalized = normalizeBundlePath(pathInput);
-	const configPrefix = `${CONFIG_DIR_NAME}/`;
-	const isConfigFile = normalized.startsWith(configPrefix);
-	if (target.mode === "global" && !isConfigFile) return {
-		skipped: true,
-		path: null
-	};
+	if (!normalized) throw new Error(`Unable to derive destination for ${pathInput}. The computed relative path is empty.`);
 	let relativePath;
-	if (isConfigFile) {
-		const withoutConfigPrefix = normalized.slice(configPrefix.length);
-		if (target.mode === "global") relativePath = withoutConfigPrefix;
-		else relativePath = `${target.projectDir}/${withoutConfigPrefix}`;
-	} else relativePath = normalized;
-	if (!relativePath) throw new Error(`Unable to derive destination for ${pathInput}. The computed relative path is empty.`);
+	if (target.mode === "global") relativePath = normalized;
+	else relativePath = `${target.projectDir}/${normalized}`;
 	const destination = resolve(target.root, relativePath);
 	ensureWithinRoot(destination, target.root);
-	return {
-		skipped: false,
-		path: destination
-	};
+	return { path: destination };
 }
 async function readExistingFile(pathname) {
 	try {
@@ -1431,6 +1450,22 @@ async function directoryExists(path$1) {
 
 //#endregion
 //#region src/lib/preset-utils.ts
+const INSTALL_FILENAME = "INSTALL.txt";
+const README_FILENAME = "README.md";
+const LICENSE_FILENAME = "LICENSE.md";
+/**
+* Files/directories that are always excluded from presets.
+* These are never useful in a preset bundle.
+*/
+const DEFAULT_IGNORE_PATTERNS = [
+	"node_modules",
+	".git",
+	".DS_Store",
+	"*.lock",
+	"package-lock.json",
+	"bun.lockb",
+	"pnpm-lock.yaml"
+];
 /**
 * Normalize a string to a valid preset slug (lowercase kebab-case)
 */
@@ -1454,6 +1489,128 @@ async function resolveConfigPath(inputPath) {
 	if (stats?.isDirectory()) return join(inputPath, PRESET_CONFIG_FILENAME);
 	return inputPath;
 }
+/**
+* Load a preset from a directory containing agentrules.json.
+*
+* Config in platform dir (e.g., .claude/agentrules.json):
+*   - Preset files: siblings of config
+*   - Metadata: .agentrules/ subfolder
+*
+* Config at repo root:
+*   - Preset files: in .claude/ (or `path` from config)
+*   - Metadata: .agentrules/ subfolder
+*/
+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");
+	let configJson;
+	try {
+		configJson = JSON.parse(configRaw);
+	} catch {
+		throw new Error(`Invalid JSON in ${configPath}`);
+	}
+	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}.`);
+	}
+	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));
+	}
+	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.`);
+	return {
+		slug,
+		config,
+		files,
+		installMessage,
+		readmeContent,
+		licenseContent
+	};
+}
+/**
+* Check if a filename matches an ignore pattern.
+* Supports:
+* - Exact match: "node_modules"
+* - Extension match: "*.lock"
+* - Prefix match: ".git*" (not implemented yet, keeping simple)
+*/
+function matchesPattern(name, pattern) {
+	if (pattern.startsWith("*.")) {
+		const ext = pattern.slice(1);
+		return name.endsWith(ext);
+	}
+	return name === pattern;
+}
+/**
+* Check if a filename should be ignored based on patterns.
+*/
+function shouldIgnore(name, patterns) {
+	return patterns.some((pattern) => matchesPattern(name, pattern));
+}
+/**
+* Recursively collect all files from a directory.
+*
+* @param dir - Current directory being scanned
+* @param rootExclude - Entries to exclude at root level only (config, metadata dir)
+* @param ignorePatterns - Patterns to ignore at all levels
+* @param root - The root directory (for computing relative paths)
+*/
+async function collectFiles(dir, rootExclude, ignorePatterns, root) {
+	const configRoot = root ?? dir;
+	const isRoot = configRoot === dir;
+	const entries = await readdir(dir, { withFileTypes: true });
+	const files = [];
+	for (const entry of entries) {
+		if (isRoot && rootExclude.includes(entry.name)) continue;
+		if (shouldIgnore(entry.name, ignorePatterns)) {
+			log.debug(`Ignoring: ${entry.name}`);
+			continue;
+		}
+		const fullPath = join(dir, entry.name);
+		if (entry.isDirectory()) {
+			const nested = await collectFiles(fullPath, rootExclude, ignorePatterns, configRoot);
+			files.push(...nested);
+		} else if (entry.isFile()) {
+			const contents = await readFile(fullPath, "utf8");
+			const relativePath = relative(configRoot, fullPath);
+			files.push({
+				path: relativePath,
+				contents
+			});
+		}
+	}
+	return files;
+}
+/**
+* Read a file if it exists, otherwise return undefined.
+*/
+async function readFileIfExists(path$1) {
+	if (await fileExists(path$1)) return await readFile(path$1, "utf8");
+	return;
+}
 
 //#endregion
 //#region src/commands/preset/init.ts
@@ -1461,11 +1618,9 @@ async function resolveConfigPath(inputPath) {
 const PLATFORM_DETECTION_PATHS = {
 	opencode: [".opencode"],
 	claude: [".claude"],
-	cursor: [".cursor", ".cursorrules"],
+	cursor: [".cursor"],
 	codex: [".codex"]
 };
-/** Default path for new preset authoring */
-const DEFAULT_FILES_PATH = "files";
 /** Default preset name when none specified */
 const DEFAULT_PRESET_NAME$1 = "my-preset";
 /**
@@ -1488,49 +1643,105 @@ async function detectPlatforms(directory) {
 	}
 	return detected;
 }
+/**
+* Resolve the target platform directory for initialization.
+*
+* Detection order (deterministic):
+* 1. If targetDir itself is a platform directory (e.g., ".claude"), use it directly
+* 2. Otherwise, detect platform directories inside targetDir
+*
+* @param targetDir - The target directory (cwd or user-provided path)
+* @param platformOverride - Optional platform to use instead of detecting/inferring
+*/
+async function resolvePlatformDirectory(targetDir, platformOverride) {
+	const targetDirName = basename(targetDir);
+	const targetPlatform = getPlatformFromDir(targetDirName);
+	if (targetPlatform) {
+		const platform$1 = platformOverride ? normalizePlatform(platformOverride) : targetPlatform;
+		return {
+			platformDir: targetDir,
+			platform: platform$1,
+			isTargetPlatformDir: true,
+			detected: []
+		};
+	}
+	const detected = await detectPlatforms(targetDir);
+	let platform;
+	let platformDir;
+	if (platformOverride) {
+		platform = normalizePlatform(platformOverride);
+		const detectedPath = detected.find((d) => d.id === platform)?.path;
+		platformDir = detectedPath ? join(targetDir, detectedPath) : join(targetDir, PLATFORMS[platform].projectDir);
+	} else if (detected.length > 0) {
+		platform = detected[0].id;
+		platformDir = join(targetDir, detected[0].path);
+	} else {
+		platform = "opencode";
+		platformDir = join(targetDir, PLATFORMS.opencode.projectDir);
+	}
+	return {
+		platformDir,
+		platform,
+		isTargetPlatformDir: false,
+		detected
+	};
+}
+/**
+* Check if --platform flag is required for non-interactive mode.
+* Returns the reason if required, so CLI can show appropriate error.
+*/
+function requiresPlatformFlag(resolved) {
+	if (resolved.isTargetPlatformDir) return { required: false };
+	if (resolved.detected.length === 0) return {
+		required: true,
+		reason: "no_platforms"
+	};
+	if (resolved.detected.length > 1) return {
+		required: true,
+		reason: "multiple_platforms",
+		platforms: resolved.detected.map((d) => d.id)
+	};
+	return { required: false };
+}
+/**
+* Initialize a preset in a platform directory.
+*
+* Structure:
+* - platformDir/agentrules.json - preset config
+* - platformDir/* - platform files (added by user)
+* - platformDir/.agentrules/ - optional metadata folder (README, LICENSE, etc.)
+*/
 async function initPreset(options) {
-	const directory = options.directory ?? process.cwd();
-	log.debug(`Initializing preset in: ${directory}`);
+	const platformDir = options.directory ?? process.cwd();
+	log.debug(`Initializing preset in: ${platformDir}`);
+	const inferredPlatform = getPlatformFromDir(basename(platformDir));
+	const platform = normalizePlatform(options.platform ?? inferredPlatform ?? "opencode");
 	const name = normalizeName(options.name ?? DEFAULT_PRESET_NAME$1);
 	const title = options.title ?? toTitleCase(name);
 	const description = options.description ?? `${title} preset`;
-	const platform = normalizePlatform(options.platform ?? "opencode");
-	const detectedPath = options.detectedPath;
 	const license = options.license ?? "MIT";
 	log.debug(`Preset name: ${name}, platform: ${platform}`);
-	const configPath = join(directory, PRESET_CONFIG_FILENAME);
+	const configPath = join(platformDir, PRESET_CONFIG_FILENAME);
 	if (!options.force && await fileExists(configPath)) throw new Error(`${PRESET_CONFIG_FILENAME} already exists. Use --force to overwrite.`);
-	const defaultPath = PLATFORMS[platform].projectDir;
-	const effectivePath = detectedPath ?? DEFAULT_FILES_PATH;
 	const preset = {
 		$schema: PRESET_SCHEMA_URL,
 		name,
 		title,
 		version: 1,
 		description,
-		tags: ["// TODO: Replace - Tags help users discover your preset (e.g., typescript, react)"],
-		features: ["// TODO: Replace - Features describe what your preset does (e.g., Built-in commands for common workflows)"],
 		license,
 		platform
 	};
-	if (effectivePath !== defaultPath) preset.path = effectivePath;
-	await mkdir(directory, { recursive: true });
-	log.debug(`Created/verified directory: ${directory}`);
-	const content = `${JSON.stringify(preset, null, 2)}\n`;
-	await writeFile(configPath, content, "utf8");
-	log.debug(`Wrote config file: ${configPath}`);
 	let createdDir;
-	if (detectedPath) log.debug(`Using detected platform directory: ${detectedPath}`);
+	if (await directoryExists(platformDir)) log.debug(`Platform directory exists: ${platformDir}`);
 	else {
-		const filesPath = effectivePath;
-		const fullPath = join(directory, filesPath);
-		if (await directoryExists(fullPath)) log.debug(`Files directory already exists: ${filesPath}`);
-		else {
-			await mkdir(fullPath, { recursive: true });
-			createdDir = filesPath;
-			log.debug(`Created files directory: ${filesPath}`);
-		}
+		await mkdir(platformDir, { recursive: true });
+		createdDir = platformDir;
+		log.debug(`Created platform directory: ${platformDir}`);
 	}
+	const content = `${JSON.stringify(preset, null, 2)}\n`;
+	await writeFile(configPath, content, "utf8");
+	log.debug(`Wrote config file: ${configPath}`);
 	log.debug("Preset initialization complete.");
 	return {
 		configPath,
@@ -1562,17 +1773,55 @@ function check(schema) {
 //#region src/commands/preset/init-interactive.ts
 const DEFAULT_PRESET_NAME = "my-preset";
 /**
-* Run interactive init flow with clack prompts
+* Run interactive init flow with clack prompts.
+*
+* If platformDir is provided, init directly in that directory.
+* Otherwise, detect platform directories and prompt user to select one.
 */
 async function initInteractive(options) {
-	const { directory, name: nameOption, title: titleOption, description: descriptionOption, platform: platformOption, license: licenseOption } = options;
+	const { baseDir, platformDir: explicitPlatformDir, name: nameOption, title: titleOption, description: descriptionOption, platform: platformOption, license: licenseOption } = options;
 	let { force } = options;
 	const defaultName = nameOption ?? DEFAULT_PRESET_NAME;
 	p.intro("Create a new preset");
-	const configPath = join(directory, PRESET_CONFIG_FILENAME);
+	let targetPlatformDir;
+	let selectedPlatform;
+	if (explicitPlatformDir) {
+		targetPlatformDir = explicitPlatformDir;
+		const dirName = basename(explicitPlatformDir);
+		selectedPlatform = platformOption ?? getPlatformFromDir(dirName) ?? "opencode";
+	} else {
+		const resolved = await resolvePlatformDirectory(baseDir, platformOption);
+		if (resolved.isTargetPlatformDir) {
+			targetPlatformDir = resolved.platformDir;
+			selectedPlatform = resolved.platform;
+			p.note(`Detected platform directory: ${resolved.platform}`, "Using current directory");
+		} else {
+			const detectedMap = new Map(resolved.detected.map((d) => [d.id, d]));
+			if (resolved.detected.length > 0) p.note(resolved.detected.map((d) => `${d.id} → ${d.path}`).join("\n"), "Detected platform directories");
+			const platformChoice = await p.select({
+				message: "Platform",
+				options: PLATFORM_IDS.map((id) => ({
+					value: id,
+					label: detectedMap.has(id) ? `${id} (detected)` : id,
+					hint: detectedMap.get(id)?.path
+				})),
+				initialValue: resolved.platform
+			});
+			if (p.isCancel(platformChoice)) {
+				p.cancel("Cancelled");
+				process.exit(0);
+			}
+			selectedPlatform = platformChoice;
+			if (selectedPlatform !== resolved.platform) {
+				const reResolved = await resolvePlatformDirectory(baseDir, selectedPlatform);
+				targetPlatformDir = reResolved.platformDir;
+			} else targetPlatformDir = resolved.platformDir;
+		}
+	}
+	const configPath = join(targetPlatformDir, PRESET_CONFIG_FILENAME);
 	if (!force && await fileExists(configPath)) {
 		const overwrite = await p.confirm({
-			message: `${PRESET_CONFIG_FILENAME} already exists. Overwrite?`,
+			message: `${PRESET_CONFIG_FILENAME} already exists in ${targetPlatformDir}. Overwrite?`,
 			initialValue: false
 		});
 		if (p.isCancel(overwrite) || !overwrite) {
@@ -1581,9 +1830,6 @@ async function initInteractive(options) {
 		}
 		force = true;
 	}
-	const detected = await detectPlatforms(directory);
-	const detectedMap = new Map(detected.map((d) => [d.id, d]));
-	if (detected.length > 0) p.note(detected.map((d) => `${d.id} → ${d.path}`).join("\n"), "Detected platform directories");
 	const result = await p.group({
 		name: () => p.text({
 			message: "Preset name (slug)",
@@ -1609,18 +1855,6 @@ async function initInteractive(options) {
 				validate: check(descriptionSchema)
 			});
 		},
-		platform: () => {
-			const defaultPlatform = platformOption ?? (detected.length > 0 ? detected[0].id : "opencode");
-			return p.select({
-				message: "Platform",
-				options: PLATFORM_IDS.map((id) => ({
-					value: id,
-					label: detectedMap.has(id) ? `${id} (detected)` : id,
-					hint: detectedMap.get(id)?.path
-				})),
-				initialValue: defaultPlatform
-			});
-		},
 		license: async () => {
 			const defaultLicense = licenseOption ?? "MIT";
 			const choice = await p.select({
@@ -1656,14 +1890,12 @@ async function initInteractive(options) {
 		p.cancel("Cancelled");
 		return process.exit(0);
 	} });
-	const detectedPath = detectedMap.get(result.platform)?.path;
 	const initOptions = {
-		directory,
+		directory: targetPlatformDir,
 		name: result.name,
 		title: result.title,
 		description: result.description,
-		platform: result.platform,
-		detectedPath,
+		platform: selectedPlatform,
 		license: result.license,
 		force
 	};
@@ -1727,11 +1959,16 @@ async function validatePreset(options) {
 	const platform = preset.platform;
 	log.debug(`Checking platform: ${platform}`);
 	if (isSupportedPlatform(platform)) {
-		const filesPath = preset.path ?? PLATFORMS[platform].projectDir;
-		const filesDir = join(presetDir, filesPath);
-		const filesExists = await directoryExists(filesDir);
-		log.debug(`Files directory check: ${filesDir} - ${filesExists ? "exists" : "not found"}`);
-		if (!filesExists) errors.push(`Files directory not found: ${filesPath}`);
+		const dirName = basename(presetDir);
+		const isInProjectMode = isPlatformDir(dirName);
+		if (isInProjectMode) log.debug(`In-project mode: files expected in ${presetDir}`);
+		else {
+			const filesPath = preset.path ?? PLATFORMS[platform].projectDir;
+			const filesDir = join(presetDir, 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}`);
+		}
 	} else {
 		errors.push(`Unknown platform "${platform}". Supported: ${PLATFORM_IDS.join(", ")}`);
 		log.debug(`Platform "${platform}" is not supported`);
@@ -1762,9 +1999,6 @@ async function validatePreset(options) {
 
 //#endregion
 //#region src/commands/publish.ts
-const INSTALL_FILENAME$1 = "INSTALL.txt";
-const README_FILENAME$1 = "README.md";
-const LICENSE_FILENAME$1 = "LICENSE.md";
 /** Maximum size per bundle in bytes (1MB) */
 const MAX_BUNDLE_SIZE_BYTES = 1 * 1024 * 1024;
 /**
@@ -1782,12 +2016,12 @@ async function publish(options = {}) {
 	const { path: path$1, version: version$1, dryRun = false } = options;
 	log.debug(`Publishing preset from path: ${path$1 ?? process.cwd()}${dryRun ? " (dry run)" : ""}`);
 	const ctx = useAppContext();
-	if (!ctx) throw new Error("App context not initialized");
 	if (!(dryRun || ctx.isLoggedIn && ctx.credentials)) {
-		log.error(`Not logged in. Run ${ui.command("agentrules login")} to authenticate.`);
+		const error$2 = "Not logged in. Run `agentrules login` to authenticate.";
+		log.error(error$2);
 		return {
 			success: false,
-			error: `Not logged in. Run ${ui.command("agentrules login")} to authenticate.`
+			error: error$2
 		};
 	}
 	if (!dryRun) log.debug(`Authenticated as user, publishing to ${ctx.registry.url}`);
@@ -1807,15 +2041,15 @@ async function publish(options = {}) {
 	spinner$1.update("Loading preset...");
 	let presetInput;
 	try {
-		presetInput = await loadPreset$1(presetDir);
+		presetInput = await loadPreset(presetDir);
 		log.debug(`Loaded preset "${presetInput.slug}" for platform ${presetInput.config.platform}`);
 	} catch (error$2) {
-		const errorMessage = error$2 instanceof Error ? error$2.message : String(error$2);
+		const message = getErrorMessage(error$2);
 		spinner$1.fail("Failed to load preset");
-		log.error(errorMessage);
+		log.error(message);
 		return {
 			success: false,
-			error: errorMessage
+			error: message
 		};
 	}
 	spinner$1.update("Building bundle...");
@@ -1827,12 +2061,12 @@ async function publish(options = {}) {
 		});
 		log.debug(`Built publish input for ${publishInput.platform}`);
 	} catch (error$2) {
-		const errorMessage = error$2 instanceof Error ? error$2.message : String(error$2);
+		const message = getErrorMessage(error$2);
 		spinner$1.fail("Failed to build bundle");
-		log.error(errorMessage);
+		log.error(message);
 		return {
 			success: false,
-			error: errorMessage
+			error: message
 		};
 	}
 	const inputJson = JSON.stringify(publishInput);
@@ -1912,79 +2146,9 @@ async function publish(options = {}) {
 		}
 	};
 }
-/**
-* Load a preset from a directory
-*/
-async function loadPreset$1(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");
-	let configJson;
-	try {
-		configJson = JSON.parse(configRaw);
-	} catch {
-		throw new Error(`Invalid JSON in ${configPath}`);
-	}
-	const configObj = configJson;
-	const identifier = typeof configObj?.name === "string" ? configObj.name : configPath;
-	const config = validatePresetConfig(configJson, identifier);
-	const slug = config.name;
-	const installPath = join(presetDir, INSTALL_FILENAME$1);
-	const installMessage = await readFileIfExists$1(installPath);
-	const readmePath = join(presetDir, README_FILENAME$1);
-	const readmeContent = await readFileIfExists$1(readmePath);
-	const licensePath = join(presetDir, LICENSE_FILENAME$1);
-	const licenseContent = await readFileIfExists$1(licensePath);
-	const filesPath = config.path ?? PLATFORMS[config.platform].projectDir;
-	const filesDir = join(presetDir, filesPath);
-	if (!await directoryExists(filesDir)) throw new Error(`Files directory not found: ${filesDir} (referenced in ${configPath})`);
-	const files = await collectFiles$1(filesDir);
-	if (files.length === 0) throw new Error(`No files found in ${filesDir}. Presets must include at least one file.`);
-	return {
-		slug,
-		config,
-		files,
-		installMessage,
-		readmeContent,
-		licenseContent
-	};
-}
-/**
-* Recursively collect all files from a directory
-*/
-async function collectFiles$1(dir, baseDir) {
-	const root = baseDir ?? dir;
-	const entries = await readdir(dir, { withFileTypes: true });
-	const files = [];
-	for (const entry of entries) {
-		const fullPath = join(dir, entry.name);
-		if (entry.isDirectory()) {
-			const nested = await collectFiles$1(fullPath, root);
-			files.push(...nested);
-		} else if (entry.isFile()) {
-			const contents = await readFile(fullPath, "utf8");
-			const relativePath = relative(root, fullPath);
-			files.push({
-				path: relativePath,
-				contents
-			});
-		}
-	}
-	return files;
-}
-/**
-* Read a file if it exists, otherwise return undefined
-*/
-async function readFileIfExists$1(path$1) {
-	if (await fileExists(path$1)) return await readFile(path$1, "utf8");
-	return;
-}
 
 //#endregion
 //#region src/commands/registry/build.ts
-const INSTALL_FILENAME = "INSTALL.txt";
-const README_FILENAME = "README.md";
-const LICENSE_FILENAME = "LICENSE.md";
 async function buildRegistry(options) {
 	const inputDir = options.input;
 	const outputDir = options.out ?? null;
@@ -2060,69 +2224,49 @@ async function discoverPresetDirs(inputDir) {
 	await searchDir(inputDir, 0);
 	return presetDirs.sort();
 }
-async function loadPreset(presetDir) {
-	const configPath = join(presetDir, PRESET_CONFIG_FILENAME);
-	const configRaw = await readFile(configPath, "utf8");
-	let configJson;
-	try {
-		configJson = JSON.parse(configRaw);
-	} catch {
-		throw new Error(`Invalid JSON in ${configPath}`);
+
+//#endregion
+//#region src/commands/unpublish.ts
+/**
+* Parses preset input to extract slug, platform, 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)
+*
+* Explicit --platform and --version flags take precedence.
+*/
+function parseUnpublishInput(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;
+	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;
 	}
-	const config = validatePresetConfig(configJson, basename(presetDir));
-	const slug = config.name;
-	const installPath = join(presetDir, INSTALL_FILENAME);
-	const installMessage = await readFileIfExists(installPath);
-	const readmePath = join(presetDir, README_FILENAME);
-	const readmeContent = await readFileIfExists(readmePath);
-	const licensePath = join(presetDir, LICENSE_FILENAME);
-	const licenseContent = await readFileIfExists(licensePath);
-	const filesPath = config.path ?? PLATFORMS[config.platform].projectDir;
-	const filesDir = join(presetDir, filesPath);
-	if (!await directoryExists(filesDir)) throw new Error(`Files directory not found: ${filesDir} (referenced in ${configPath})`);
-	const files = await collectFiles(filesDir);
-	if (files.length === 0) throw new Error(`No files found in ${filesDir}. Presets must include at least one file.`);
 	return {
 		slug,
-		config,
-		files,
-		installMessage,
-		readmeContent,
-		licenseContent
+		platform,
+		version: version$1
 	};
 }
-async function collectFiles(dir, baseDir) {
-	const root = baseDir ?? dir;
-	const entries = await readdir(dir, { withFileTypes: true });
-	const files = [];
-	for (const entry of entries) {
-		const fullPath = join(dir, entry.name);
-		if (entry.isDirectory()) {
-			const nested = await collectFiles(fullPath, root);
-			files.push(...nested);
-		} else if (entry.isFile()) {
-			const contents = await readFile(fullPath, "utf8");
-			const relativePath = relative(root, fullPath);
-			files.push({
-				path: relativePath,
-				contents
-			});
-		}
-	}
-	return files;
-}
-async function readFileIfExists(path$1) {
-	if (await fileExists(path$1)) return await readFile(path$1, "utf8");
-	return;
-}
-
-//#endregion
-//#region src/commands/unpublish.ts
 /**
 * Unpublishes a preset version from the registry
 */
 async function unpublish(options) {
-	const { slug, platform, version: version$1 } = options;
+	const { slug, platform, version: version$1 } = parseUnpublishInput(options.preset, options.platform, options.version);
 	if (!slug) {
 		log.error("Preset slug is required");
 		return {
@@ -2131,14 +2275,14 @@ async function unpublish(options) {
 		};
 	}
 	if (!platform) {
-		log.error("Platform is required");
+		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");
+		log.error("Version is required. Use --version or specify as <slug>.<platform>@<version>");
 		return {
 			success: false,
 			error: "Version is required"
@@ -2146,12 +2290,12 @@ async function unpublish(options) {
 	}
 	log.debug(`Unpublishing preset: ${slug}.${platform}@${version$1}`);
 	const ctx = useAppContext();
-	if (!ctx) throw new Error("App context not initialized");
 	if (!(ctx.isLoggedIn && ctx.credentials)) {
-		log.error(`Not logged in. Run ${ui.command("agentrules login")} to authenticate.`);
+		const error$2 = "Not logged in. Run `agentrules login` to authenticate.";
+		log.error(error$2);
 		return {
 			success: false,
-			error: `Not logged in. Run ${ui.command("agentrules login")} to authenticate.`
+			error: error$2
 		};
 	}
 	log.debug(`Authenticated, unpublishing from ${ctx.registry.url}`);
@@ -2194,10 +2338,10 @@ program.name("agentrules").description("The AI Agent Directory CLI").version(pac
 			url: actionOpts.url
 		});
 	} catch (error$2) {
-		log.debug(`Failed to init context: ${error$2 instanceof Error ? error$2.message : String(error$2)}`);
+		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").option("-y, --yes", "Alias for --force").option("--dry-run", "Preview changes without writing").option("--skip-conflicts", "Skip conflicting files").action(handle(async (preset, options) => {
+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;
 	const dryRun = Boolean(options.dryRun);
 	const spinner$1 = await log.spinner("Fetching preset...");
@@ -2211,7 +2355,8 @@ program.command("add <preset>").description("Download and install a preset from
 			directory: options.dir,
 			force: Boolean(options.force || options.yes),
 			dryRun,
-			skipConflicts: Boolean(options.skipConflicts)
+			skipConflicts: Boolean(options.skipConflicts),
+			noBackup: options.backup === false
 		});
 	} catch (err) {
 		spinner$1.stop();
@@ -2221,16 +2366,23 @@ program.command("add <preset>").description("Download and install a preset from
 	const hasBlockingConflicts = result.conflicts.length > 0 && !options.skipConflicts && !dryRun;
 	if (hasBlockingConflicts) {
 		const count$1 = result.conflicts.length === 1 ? "1 file has" : `${result.conflicts.length} files have`;
-		log.error(`${count$1} conflicts. Use ${ui.command("--force")} to overwrite.`);
+		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)) {
 			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`)}`);
+		log.print("");
+		log.print(forceHint);
 		process.exitCode = 1;
 		return;
 	}
+	if (result.backups.length > 0) {
+		log.print("");
+		for (const backup of result.backups) log.print(ui.backupStatus(backup.originalPath, backup.backupPath, { dryRun }));
+	}
 	log.print("");
 	for (const file of result.files) {
 		const status = file.status === "overwritten" ? "updated" : file.status;
@@ -2250,7 +2402,7 @@ program.command("init").description("Initialize a new preset").argument("[direct
 	const useInteractive = !options.yes && process.stdin.isTTY;
 	if (useInteractive) {
 		const result$1 = await initInteractive({
-			directory: targetDir,
+			baseDir: targetDir,
 			name: options.name ?? defaultName,
 			title: options.title,
 			description: options.description,
@@ -2262,23 +2414,32 @@ program.command("init").description("Initialize a new preset").argument("[direct
 			log.print(`\n${ui.header("Directory created")}`);
 			log.print(ui.list([ui.path(result$1.createdDir)]));
 		}
-		const nextSteps$1 = [];
-		if (directory) nextSteps$1.push(`Run ${ui.command(`cd ${directory}`)}`);
-		nextSteps$1.push("Add your config files to the files directory", "Replace the placeholder comments in tags and features", `Run ${ui.command("agentrules validate")} to check your preset`);
+		const nextSteps$1 = [
+			"Add your config files to the platform directory",
+			"Add tags (required) and features (recommended) to agentrules.json",
+			`Run ${ui.command("agentrules publish")} to publish your preset`
+		];
 		log.print(`\n${ui.header("Next steps")}`);
 		log.print(ui.numberedList(nextSteps$1));
 		return;
 	}
-	const detected = await detectPlatforms(targetDir);
-	const platform = options.platform ?? detected[0]?.id ?? "opencode";
-	const detectedPath = detected.find((d) => d.id === platform)?.path;
+	const resolved = await resolvePlatformDirectory(targetDir, options.platform);
+	if (!options.platform) {
+		const check$1 = requiresPlatformFlag(resolved);
+		if (check$1.required) {
+			if (check$1.reason === "no_platforms") {
+				const targetDirName = basename(targetDir);
+				log.error(`No platform directory found in "${targetDirName}". Specify --platform (${PLATFORM_IDS.join(", ")}) or run from a platform directory.`);
+			} else log.error(`Multiple platform directories found (${check$1.platforms.join(", ")}). Specify --platform to choose one.`);
+			process.exit(1);
+		}
+	}
 	const result = await initPreset({
-		directory: targetDir,
+		directory: resolved.platformDir,
 		name: options.name ?? defaultName,
 		title: options.title,
 		description: options.description,
-		platform,
-		detectedPath,
+		platform: resolved.platform,
 		license: options.license,
 		force: options.force
 	});
@@ -2287,9 +2448,11 @@ program.command("init").description("Initialize a new preset").argument("[direct
 		log.print(`\n${ui.header("Directory created")}`);
 		log.print(ui.list([ui.path(result.createdDir)]));
 	}
-	const nextSteps = [];
-	if (directory) nextSteps.push(`Run ${ui.command(`cd ${directory}`)}`);
-	nextSteps.push("Add your config files to the files directory", "Replace the placeholder comments in tags and features", `Run ${ui.command("agentrules validate")} to check your preset`);
+	const nextSteps = [
+		"Add your config files to the platform directory",
+		"Add tags (required) and features (recommended) to agentrules.json",
+		`Run ${ui.command("agentrules publish")} to publish your preset`
+	];
 	log.print(`\n${ui.header("Next steps")}`);
 	log.print(ui.numberedList(nextSteps));
 }));
@@ -2431,11 +2594,12 @@ 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("<slug>", "Preset slug (e.g., my-preset)").argument("<platform>", "Platform (e.g., opencode, claude)").argument("<version>", "Version to unpublish (e.g., 1.1, 2.3)").action(handle(async (slug, platform, version$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;
 	const result = await unpublish({
-		slug,
+		preset,
 		platform,
-		version: version$1
+		version: options.version
 	});
 	if (!result.success) process.exitCode = 1;
 }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentrules/cli",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "author": "Brian Cheung <bcheung.dev@gmail.com> (https://github.com/bcheung)",
   "license": "MIT",
   "homepage": "https://agentrules.directory",
@@ -48,7 +48,7 @@
     "clean": "rm -rf node_modules dist .turbo"
   },
   "dependencies": {
-    "@agentrules/core": "0.0.8",
+    "@agentrules/core": "0.0.9",
     "@clack/prompts": "^0.11.0",
     "chalk": "^5.4.1",
     "commander": "^12.1.0",