opencodekit 0.23.1 → 0.23.2

package/dist/index.js

@@ -4,15 +4,15 @@ import * as p from "@clack/prompts";
 import { cac } from "cac";
 import color from "picocolors";
 import { createHash, createHmac } from "node:crypto";
-import { copyFileSync, existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
+import { copyFileSync, existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
 import { homedir, hostname, platform, release } from "node:os";
 import { basename, dirname, join, relative } from "node:path";
 import envPaths from "env-paths";
 import machineId from "node-machine-id";
 import { z } from "zod";
-import { execSync, spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { applyPatch, createPatch } from "diff";
+import { spawn } from "node:child_process";
 import * as readline from "node:readline";
 
 //#region \0rolldown/runtime.js
@@ -20,7 +20,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region package.json
-var version = "0.23.1";
+var version = "0.23.2";
 
 //#endregion
 //#region src/utils/license.ts
@@ -264,16 +264,28 @@ async function activateCommand(keyArg) {
 //#endregion
 //#region src/utils/errors.ts
 /**
+* Get the global OpenCode config directory based on OS.
+* - macOS/Linux: ~/.config/opencode/ (respects XDG_CONFIG_HOME)
+* - Windows: %APPDATA%\opencode\ or %LOCALAPPDATA%\opencode\
+*/
+function getGlobalConfigDir() {
+	if (platform() === "win32") return join(process.env.APPDATA || process.env.LOCALAPPDATA || join(homedir(), "AppData", "Roaming"), "opencode");
+	return join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "opencode");
+}
+/**
 * Resolve the .opencode directory path.
-* Handles two cases:
+* Handles three cases:
 * 1. Standard project: cwd has .opencode/ subdirectory
 * 2. Global config dir: cwd IS the opencode config dir (has opencode.json directly)
-* Returns null if neither case applies.
+* 3. Global config dir at ~/.config/opencode/ (fallback)
+* Returns null if none apply.
 */
 function resolveOpencodePath() {
 	const nested = join(process.cwd(), ".opencode");
 	if (existsSync(nested)) return nested;
 	if (existsSync(join(process.cwd(), "opencode.json"))) return process.cwd();
+	const globalDir = getGlobalConfigDir();
+	if (existsSync(join(globalDir, "opencode.json"))) return globalDir;
 	return null;
 }
 /**
@@ -321,9 +333,6 @@ function showWarning(message, suggestion) {
 	p.log.warn(`${color.yellow("!")} ${message}`);
 	if (suggestion) p.log.info(`  ${color.dim(`→ ${suggestion}`)}`);
 }
-/**
-* Display empty state with suggestion
-*/
 function showEmpty(resource, createCmd) {
 	p.log.info(color.dim(`No ${resource} found`));
 	if (createCmd) p.log.info(color.dim(`→ Run: ${color.cyan(createCmd)}`));
@@ -338,13 +347,7 @@ function showEmpty(resource, createCmd) {
 const InitOptionsSchema = z.object({
 	force: z.boolean().optional().default(false),
 	global: z.boolean().optional().default(false),
-	free: z.boolean().optional().default(false),
-	recommend: z.boolean().optional().default(false),
-	yes: z.boolean().optional().default(false),
-	backup: z.boolean().optional().default(false),
-	prune: z.boolean().optional().default(false),
-	pruneAll: z.boolean().optional().default(false),
-	projectOnly: z.boolean().optional().default(false)
+	yes: z.boolean().optional().default(false)
 });
 const UpgradeOptionsSchema = z.object({
 	force: z.boolean().optional().default(false),
@@ -2752,825 +2755,116 @@ function fileModificationStatus(filePath, relativePath, manifest) {
 }
 
 //#endregion
-//#region src/utils/patch.ts
-/**
-* Patch utilities for saving/applying user modifications to template files.
-* Uses unified diff format for git-friendly, human-readable patches.
-*/
-const PATCHES_DIR = "patches";
-const PATCHES_JSON = ".patches.json";
-const METADATA_VERSION = "1.0.0";
-/**
-* Calculate SHA-256 hash of content.
-*/
-function calculateHash(content) {
-	return createHash("sha256").update(content).digest("hex").slice(0, 16);
-}
-/**
-* Convert a relative file path to a safe patch filename.
-* e.g., "agent/build.md" -> "agent-build.md.patch"
-*/
-function pathToPatchFilename(relativePath) {
-	return `${relativePath.replace(/\//g, "-")}.patch`;
-}
-/**
-* Get the patches directory path.
-*/
-function getPatchesDir(opencodeDir) {
-	return join(opencodeDir, PATCHES_DIR);
-}
-/**
-* Get the template root directory (from dist/template or dev mode).
-*/
+//#region src/commands/init.ts
+const EXCLUDED_DIRS = [
+	"node_modules",
+	".git",
+	"dist",
+	".DS_Store",
+	"coverage",
+	".next",
+	".turbo"
+];
+const EXCLUDED_FILES = [
+	"bun.lock",
+	"package-lock.json",
+	"yarn.lock",
+	"pnpm-lock.yaml"
+];
 function getTemplateRoot$2() {
 	const __dirname = dirname(fileURLToPath(import.meta.url));
-	const possiblePaths = [
-		join(__dirname, "template"),
-		join(__dirname, "..", "..", ".opencode"),
-		join(__dirname, "..", "template")
-	];
-	for (const path of possiblePaths) {
-		if (existsSync(join(path, ".opencode"))) return path;
-		if (existsSync(join(path, "opencode.json"))) return dirname(path);
-	}
+	const possiblePaths = [join(__dirname, "template"), join(__dirname, "..", "..", ".opencode")];
+	for (const path of possiblePaths) if (existsSync(join(path, ".opencode"))) return path;
 	return null;
 }
-/**
-* Load patch metadata from .patches.json.
-*/
-function loadPatchMetadata(opencodeDir) {
-	const metadataPath = join(getPatchesDir(opencodeDir), PATCHES_JSON);
-	if (!existsSync(metadataPath)) return {
-		version: METADATA_VERSION,
-		patches: {}
-	};
-	try {
-		const content = readFileSync(metadataPath, "utf-8");
-		return JSON.parse(content);
-	} catch {
-		return {
-			version: METADATA_VERSION,
-			patches: {}
-		};
-	}
-}
-/**
-* Save patch metadata to .patches.json.
-*/
-function savePatchMetadata(opencodeDir, metadata) {
-	const patchesDir = getPatchesDir(opencodeDir);
-	if (!existsSync(patchesDir)) mkdirSync(patchesDir, { recursive: true });
-	writeFileSync(join(patchesDir, PATCHES_JSON), JSON.stringify(metadata, null, 2));
-}
-/**
-* Get the current OpenCodeKit version from package.json.
-*/
 function getPackageVersion$2() {
 	const __dirname = dirname(fileURLToPath(import.meta.url));
 	const pkgPaths = [join(__dirname, "..", "..", "package.json"), join(__dirname, "..", "package.json")];
-	for (const pkgPath of pkgPaths) if (existsSync(pkgPath)) try {
-		return JSON.parse(readFileSync(pkgPath, "utf-8")).version || "unknown";
-	} catch {}
+	for (const pkgPath of pkgPaths) {
+		if (!existsSync(pkgPath)) continue;
+		return JSON.parse(readFileSync(pkgPath, "utf-8")).version;
+	}
 	return "unknown";
 }
-/**
-* Generate a unified diff patch between template and user file.
-*/
-function generatePatch(templateContent, userContent, relativePath) {
-	return createPatch(relativePath, templateContent, userContent, "template", "modified");
-}
-/**
-* Save a patch for a modified template file.
-* @returns The patch entry that was saved.
-*/
-function savePatch(opencodeDir, relativePath, templateContent, userContent) {
-	const metadata = loadPatchMetadata(opencodeDir);
-	const patchesDir = getPatchesDir(opencodeDir);
-	if (!existsSync(patchesDir)) mkdirSync(patchesDir, { recursive: true });
-	const patchContent = generatePatch(templateContent, userContent, relativePath);
-	const patchFilename = pathToPatchFilename(relativePath);
-	writeFileSync(join(patchesDir, patchFilename), patchContent);
-	const entry = {
-		originalHash: calculateHash(templateContent),
-		currentHash: calculateHash(userContent),
-		patchFile: patchFilename,
-		createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-		templateVersion: getPackageVersion$2()
-	};
-	metadata.patches[relativePath] = entry;
-	savePatchMetadata(opencodeDir, metadata);
-	return entry;
-}
-/**
-* Remove a patch for a file.
-*/
-function removePatch(opencodeDir, relativePath) {
-	const metadata = loadPatchMetadata(opencodeDir);
-	const entry = metadata.patches[relativePath];
-	if (!entry) return false;
-	const patchPath = join(getPatchesDir(opencodeDir), entry.patchFile);
-	if (existsSync(patchPath)) {
-		const { rmSync } = __require("node:fs");
-		rmSync(patchPath);
+async function copyDir(src, dest) {
+	const { mkdir, readdir } = await import("node:fs/promises");
+	await mkdir(dest, { recursive: true });
+	for (const entry of await readdir(src, { withFileTypes: true })) {
+		if (EXCLUDED_DIRS.includes(entry.name)) continue;
+		if (!entry.isDirectory() && EXCLUDED_FILES.includes(entry.name)) continue;
+		const srcPath = join(src, entry.name);
+		const destPath = join(dest, entry.name);
+		if (entry.isSymbolicLink()) {} else if (entry.isDirectory()) await copyDir(srcPath, destPath);
+		else writeFileSync(destPath, readFileSync(srcPath, "utf-8"));
 	}
-	delete metadata.patches[relativePath];
-	savePatchMetadata(opencodeDir, metadata);
-	return true;
-}
-/**
-* Apply a patch to file content.
-* @returns The patched content, or null if patch failed.
-*/
-function applyPatch$1(originalContent, patchContent) {
-	return applyPatch(originalContent, patchContent);
 }
-/**
-* Apply all saved patches after an upgrade.
-*/
-function applyAllPatches(opencodeDir) {
-	const metadata = loadPatchMetadata(opencodeDir);
-	const patchesDir = getPatchesDir(opencodeDir);
-	const results = [];
-	for (const [relativePath, entry] of Object.entries(metadata.patches)) {
-		if (entry.disabled) {
-			results.push({
-				success: true,
-				file: relativePath,
-				message: "Skipped (disabled)"
-			});
-			continue;
-		}
-		const filePath = join(opencodeDir, relativePath);
-		const patchPath = join(patchesDir, entry.patchFile);
-		if (!existsSync(filePath)) {
-			results.push({
-				success: false,
-				file: relativePath,
-				message: "File no longer exists"
-			});
-			continue;
+async function initCommand(rawOptions = {}) {
+	const options = parseOptions(InitOptionsSchema, rawOptions);
+	if (process.argv.includes("--quiet")) return;
+	p.intro(color.bgCyan(color.black(" OpenCodeKit ")));
+	if (options.global) {
+		const globalDir = getGlobalConfigDir();
+		const osName = process.platform === "win32" ? "Windows" : process.platform === "darwin" ? "macOS" : "Linux";
+		p.log.info(`Installing to global config (${osName})`);
+		p.log.info(`Target: ${color.cyan(globalDir)}`);
+		if (existsSync(globalDir) && !options.force) {
+			p.log.warn(`Global config already exists at ${globalDir}`);
+			p.log.info(`Use ${color.cyan("--force")} to overwrite`);
+			p.outro("Nothing to do");
+			return;
 		}
-		if (!existsSync(patchPath)) {
-			results.push({
-				success: false,
-				file: relativePath,
-				message: "Patch file missing"
-			});
-			continue;
+		const templateRoot = getTemplateRoot$2();
+		if (!templateRoot) {
+			p.log.error("Template not found. Please reinstall opencodekit.");
+			p.outro(color.red("Failed"));
+			process.exit(1);
 		}
-		const currentContent = readFileSync(filePath, "utf-8");
-		const patchContent = readFileSync(patchPath, "utf-8");
-		const patched = applyPatch$1(currentContent, patchContent);
-		if (patched === false) {
-			writeFileSync(`${patchPath}.rej`, patchContent);
-			results.push({
-				success: false,
-				file: relativePath,
-				message: "Patch conflict - saved to .rej file",
-				conflict: true
-			});
-		} else {
-			writeFileSync(filePath, patched);
-			metadata.patches[relativePath].currentHash = calculateHash(patched);
-			savePatchMetadata(opencodeDir, metadata);
-			results.push({
-				success: true,
-				file: relativePath,
-				message: "Patch applied successfully"
-			});
+		const s = p.spinner();
+		s.start("Copying to global config");
+		const opencodeSrc = join(templateRoot, ".opencode");
+		if (!existsSync(opencodeSrc)) {
+			s.stop("Failed");
+			p.log.error("Template .opencode/ not found");
+			p.outro(color.red("Failed"));
+			process.exit(1);
 		}
+		await copyDir(opencodeSrc, globalDir);
+		s.stop("Done");
+		writeFileSync(join(globalDir, ".version"), getPackageVersion$2());
+		generateManifest(globalDir, getPackageVersion$2());
+		p.note(`Global config installed at:\n${globalDir}\n\nThis provides default agents, skills, and tools\nfor all OpenCode projects on this machine.`, "Global Installation Complete");
+		p.outro(color.green("Ready!"));
+		return;
 	}
-	return results;
-}
-/**
-* Check the status of all patches.
-*/
-function checkPatchStatus(opencodeDir, templateRoot) {
-	const metadata = loadPatchMetadata(opencodeDir);
-	const statuses = [];
-	for (const [relativePath, entry] of Object.entries(metadata.patches)) {
-		if (!existsSync(join(opencodeDir, relativePath))) {
-			statuses.push({
-				relativePath,
-				entry,
-				status: "missing",
-				message: "User file no longer exists"
-			});
-			continue;
-		}
-		if (templateRoot) {
-			const templateFilePath = join(templateRoot, ".opencode", relativePath);
-			if (existsSync(templateFilePath)) {
-				const templateContent = readFileSync(templateFilePath, "utf-8");
-				if (calculateHash(templateContent) !== entry.originalHash) {
-					const patchPath = join(getPatchesDir(opencodeDir), entry.patchFile);
-					if (existsSync(patchPath)) if (applyPatch$1(templateContent, readFileSync(patchPath, "utf-8")) === false) statuses.push({
-						relativePath,
-						entry,
-						status: "conflict",
-						message: "Template changed and patch cannot apply cleanly"
-					});
-					else statuses.push({
-						relativePath,
-						entry,
-						status: "stale",
-						message: "Template changed but patch can still apply"
-					});
-					else statuses.push({
-						relativePath,
-						entry,
-						status: "missing",
-						message: "Patch file missing"
-					});
-					continue;
-				}
-			}
-		}
-		statuses.push({
-			relativePath,
-			entry,
-			status: "clean",
-			message: "Patch is up to date"
-		});
-	}
-	return statuses;
-}
-
-//#endregion
-//#region src/commands/init.ts
-const EXCLUDED_DIRS = [
-	"node_modules",
-	".git",
-	"dist",
-	".DS_Store",
-	"coverage",
-	".next",
-	".turbo"
-];
-const EXCLUDED_FILES = [
-	"bun.lock",
-	"package-lock.json",
-	"yarn.lock",
-	"pnpm-lock.yaml"
-];
-const PRESERVE_USER_DIRS = ["memory/project", "context"];
-const SHARED_CONFIG_DIRS = [
-	"agent",
-	"command",
-	"skill",
-	"tool"
-];
-/**
-* Detect if global config has any of the shared dirs populated.
-* Returns null if no global config or no shared dirs found.
-*/
-function detectGlobalConfig() {
-	const globalDir = getGlobalConfigDir();
-	if (!existsSync(globalDir)) return null;
-	const coveredDirs = SHARED_CONFIG_DIRS.filter((d) => {
-		const dirPath = join(globalDir, d);
-		if (!existsSync(dirPath)) return false;
-		try {
-			return readdirSync(dirPath).filter((e) => !e.startsWith(".")).length > 0;
-		} catch {
-			return false;
-		}
-	});
-	if (coveredDirs.length === 0) return null;
-	return {
-		dir: globalDir,
-		coveredDirs
-	};
-}
-/**
-* Get the global OpenCode config directory based on OS.
-* - macOS/Linux: ~/.config/opencode/ (respects XDG_CONFIG_HOME)
-* - Windows: %APPDATA%\opencode\ or %LOCALAPPDATA%\opencode\
-*/
-function getGlobalConfigDir() {
-	if (platform() === "win32") return join(process.env.APPDATA || process.env.LOCALAPPDATA || join(homedir(), "AppData", "Roaming"), "opencode");
-	return join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "opencode");
-}
-function detectMode(targetDir) {
-	if (existsSync(join(targetDir, ".opencode"))) return "already-initialized";
-	if (existsSync(targetDir)) {
-		if (readdirSync(targetDir).some((e) => !e.startsWith(".") && !EXCLUDED_DIRS.includes(e) && e !== "node_modules")) return "add-config";
-	}
-	return "scaffold";
-}
-function getTemplateRoot$1() {
-	const __dirname = dirname(fileURLToPath(import.meta.url));
-	const possiblePaths = [join(__dirname, "template"), join(__dirname, "..", "..", ".opencode")];
-	for (const path of possiblePaths) if (existsSync(join(path, ".opencode"))) return path;
-	return null;
-}
-function getPackageVersion$1() {
-	const __dirname = dirname(fileURLToPath(import.meta.url));
-	const pkgPaths = [join(__dirname, "..", "..", "package.json"), join(__dirname, "..", "package.json")];
-	for (const pkgPath of pkgPaths) {
-		if (!existsSync(pkgPath)) continue;
-		return JSON.parse(readFileSync(pkgPath, "utf-8")).version;
-	}
-	return "unknown";
-}
-async function copyDir(src, dest) {
-	const { mkdir, readdir } = await import("node:fs/promises");
-	await mkdir(dest, { recursive: true });
-	for (const entry of await readdir(src, { withFileTypes: true })) {
-		if (EXCLUDED_DIRS.includes(entry.name)) continue;
-		if (!entry.isDirectory() && EXCLUDED_FILES.includes(entry.name)) continue;
-		const srcPath = join(src, entry.name);
-		const destPath = join(dest, entry.name);
-		if (entry.isSymbolicLink()) {} else if (entry.isDirectory()) await copyDir(srcPath, destPath);
-		else writeFileSync(destPath, readFileSync(srcPath, "utf-8"));
-	}
-}
-async function copyOpenCodeOnly(templateRoot, targetDir, skipDirs) {
-	const opencodeSrc = join(templateRoot, ".opencode");
-	const opencodeDest = join(targetDir, ".opencode");
-	if (!existsSync(opencodeSrc)) return false;
-	if (skipDirs && skipDirs.length > 0) {
-		const skipSet = new Set(skipDirs);
-		mkdirSync(opencodeDest, { recursive: true });
-		for (const entry of readdirSync(opencodeSrc, { withFileTypes: true })) {
-			if (EXCLUDED_DIRS.includes(entry.name)) continue;
-			if (!entry.isDirectory() && EXCLUDED_FILES.includes(entry.name)) continue;
-			if (entry.isSymbolicLink()) continue;
-			if (entry.isDirectory() && skipSet.has(entry.name)) continue;
-			const srcPath = join(opencodeSrc, entry.name);
-			const destPath = join(opencodeDest, entry.name);
-			if (entry.isDirectory()) await copyDir(srcPath, destPath);
-			else writeFileSync(destPath, readFileSync(srcPath, "utf-8"));
-		}
-		return true;
-	}
-	await copyDir(opencodeSrc, opencodeDest);
-	return true;
-}
-const MODEL_PRESETS = {
-	free: {
-		model: "opencode/glm-5-free",
-		agents: {
-			build: "opencode/minimax-m2.5-free",
-			plan: "opencode/minimax-m2.5-free",
-			review: "opencode/minimax-m2.5-free",
-			explore: "opencode/glm-5-free",
-			general: "opencode/glm-5-free",
-			vision: "opencode/minimax-m2.5-free",
-			scout: "opencode/glm-5-free",
-			painter: "opencode/minimax-m2.5-free"
-		}
-	},
-	recommend: {
-		model: "github-copilot/gpt-5.4",
-		agents: {
-			build: "github-copilot/gpt-5.4",
-			plan: "github-copilot/gpt-5.4",
-			review: "github-copilot/gpt-5.3-codex",
-			explore: "github-copilot/claude-haiku-4.5",
-			general: "github-copilot/gpt-5.3-codex",
-			vision: "github-copilot/gemini-3.1-pro-preview",
-			scout: "github-copilot/claude-sonnet-4.6",
-			painter: "proxypal/gemini-3.1-flash-image"
-		}
-	}
-};
-function applyModelPreset(targetDir, preset) {
-	const configPath = join(targetDir, ".opencode", "opencode.json");
-	if (!existsSync(configPath)) return;
-	const config = JSON.parse(readFileSync(configPath, "utf-8"));
-	const presetConfig = MODEL_PRESETS[preset];
-	config.model = presetConfig.model;
-	if (config.agent) {
-		for (const [agentName, model] of Object.entries(presetConfig.agents)) if (config.agent[agentName]) config.agent[agentName].model = model;
-	}
-	writeFileSync(configPath, JSON.stringify(config, null, 2));
-}
-const AGENT_DESCRIPTIONS = {
-	build: "Main coding agent (complex tasks)",
-	plan: "Planning and design agent",
-	review: "Code review and debugging",
-	explore: "Fast codebase search",
-	general: "Quick, simple tasks",
-	painter: "Image generation and editing",
-	vision: "Visual analysis (quality)",
-	scout: "External research/docs",
-	compaction: "Context summarization"
-};
-async function promptCustomModels(targetDir) {
-	const configPath = join(targetDir, ".opencode", "opencode.json");
-	if (!existsSync(configPath)) return;
-	const config = JSON.parse(readFileSync(configPath, "utf-8"));
-	p.log.info(color.dim("Enter model IDs (e.g., github-copilot/gpt-5.4, proxypal/gemini-3.1-flash-image)"));
-	p.log.info(color.dim("Press Enter to keep current value\n"));
-	const mainModel = await p.text({
-		message: "Main session model",
-		placeholder: config.model || "github-copilot/gpt-5.4",
-		defaultValue: config.model
-	});
-	if (p.isCancel(mainModel)) {
-		p.log.warn("Cancelled - keeping defaults");
-		return;
-	}
-	if (mainModel) config.model = mainModel;
-	const agents = Object.keys(AGENT_DESCRIPTIONS);
-	for (const agent of agents) {
-		if (!config.agent?.[agent]) continue;
-		const currentModel = config.agent[agent].model || config.model;
-		const agentModel = await p.text({
-			message: `${agent} - ${AGENT_DESCRIPTIONS[agent]}`,
-			placeholder: currentModel,
-			defaultValue: currentModel
-		});
-		if (p.isCancel(agentModel)) {
-			p.log.warn("Cancelled - saving partial config");
-			break;
-		}
-		if (agentModel) config.agent[agent].model = agentModel;
-	}
-	writeFileSync(configPath, JSON.stringify(config, null, 2));
-}
-function getAffectedFiles(dir, prefix = "") {
-	if (!existsSync(dir)) return [];
-	const files = [];
-	for (const entry of readdirSync(dir, { withFileTypes: true })) {
-		if (EXCLUDED_DIRS.includes(entry.name)) continue;
-		const path = prefix ? `${prefix}/${entry.name}` : entry.name;
-		if (entry.isDirectory()) files.push(...getAffectedFiles(join(dir, entry.name), path));
-		else files.push(path);
-	}
-	return files;
-}
-function backupOpenCode(targetDir) {
-	const opencodeDir = join(targetDir, ".opencode");
-	if (!existsSync(opencodeDir)) return null;
-	const backupDir = join(targetDir, `.opencode.bak-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").slice(0, 19)}`);
-	renameSync(opencodeDir, backupDir);
-	return backupDir;
-}
-function getTemplateFiles(templateRoot) {
-	const opencodeSrc = join(templateRoot, ".opencode");
-	if (!existsSync(opencodeSrc)) return /* @__PURE__ */ new Set();
-	return new Set(getAffectedFiles(opencodeSrc));
-}
-function findOrphans(targetDir, templateFiles) {
-	const opencodeDir = join(targetDir, ".opencode");
-	if (!existsSync(opencodeDir)) return [];
-	return getAffectedFiles(opencodeDir).filter((f) => f !== MANIFEST_FILE && !templateFiles.has(f));
-}
-/**
-* Check if an orphan file is a modified template file (exists in template but content differs).
-* Returns the template content if it's a modified template file, null otherwise.
-*/
-function getModifiedTemplateContent(templateRoot, orphanPath) {
-	const templateFilePath = join(templateRoot, ".opencode", orphanPath);
-	if (!existsSync(templateFilePath)) return null;
-	return readFileSync(templateFilePath, "utf-8");
-}
-/**
-* Auto-detect and save patches for modified template files among orphans.
-* Returns the list of orphans that were NOT saved as patches (true orphans).
-*/
-async function autoSavePatchesForOrphans(targetDir, templateRoot, orphans) {
-	const opencodeDir = join(targetDir, ".opencode");
-	const savedPatches = [];
-	const trueOrphans = [];
-	for (const orphan of orphans) {
-		const templateContent = getModifiedTemplateContent(templateRoot, orphan);
-		if (!templateContent) {
-			trueOrphans.push(orphan);
-			continue;
-		}
-		const userContent = readFileSync(join(opencodeDir, orphan), "utf-8");
-		if (templateContent === userContent) {
-			trueOrphans.push(orphan);
-			continue;
-		}
-		try {
-			savePatch(opencodeDir, orphan, templateContent, userContent);
-			savedPatches.push(orphan);
-		} catch {
-			trueOrphans.push(orphan);
-		}
-	}
-	return {
-		savedPatches,
-		trueOrphans
-	};
-}
-/**
-* Save existing user files from preserve directories before reinit.
-* Returns a map of relative paths to file contents.
-*/
-function preserveUserFiles(targetDir) {
-	const opencodeDir = join(targetDir, ".opencode");
-	const preserved = /* @__PURE__ */ new Map();
-	function collectFiles(currentDir, relativeDir) {
-		for (const entry of readdirSync(currentDir, { withFileTypes: true })) {
-			const filePath = join(currentDir, entry.name);
-			const relativePath = join(relativeDir, entry.name);
-			if (entry.isDirectory()) {
-				collectFiles(filePath, relativePath);
-				continue;
-			}
-			if (!entry.isFile()) continue;
-			preserved.set(relativePath, readFileSync(filePath, "utf-8"));
-		}
-	}
-	for (const relDir of PRESERVE_USER_DIRS) {
-		const dirPath = join(opencodeDir, relDir);
-		if (!existsSync(dirPath)) continue;
-		collectFiles(dirPath, relDir);
-	}
-	return preserved;
-}
-/**
-* Restore preserved user files after fresh template copy.
-*/
-function restoreUserFiles(targetDir, preserved) {
-	const opencodeDir = join(targetDir, ".opencode");
-	for (const [relativePath, content] of preserved) {
-		const filePath = join(opencodeDir, relativePath);
-		mkdirSync(dirname(filePath), { recursive: true });
-		writeFileSync(filePath, content);
-	}
-}
-function finalizeInstalledFiles(targetDir, version, preservedFiles) {
-	generateManifest(join(targetDir, ".opencode"), version);
-	if (!preservedFiles || preservedFiles.size === 0) return 0;
-	restoreUserFiles(targetDir, preservedFiles);
-	return preservedFiles.size;
-}
-async function initCommand(rawOptions = {}) {
-	const options = parseOptions(InitOptionsSchema, rawOptions);
-	if (process.argv.includes("--quiet")) return;
-	p.intro(color.bgCyan(color.black(" OpenCodeKit ")));
-	if (options.global) {
-		const globalDir = getGlobalConfigDir();
-		const os = platform();
-		const osName = os === "win32" ? "Windows" : os === "darwin" ? "macOS" : "Linux";
-		p.log.info(`Installing to global config (${osName})`);
-		p.log.info(`Target: ${color.cyan(globalDir)}`);
-		const templateRoot = getTemplateRoot$1();
-		if (!templateRoot) {
-			p.log.error("Template not found. Please reinstall opencodekit.");
-			p.outro(color.red("Failed"));
-			process.exit(1);
-		}
-		if (existsSync(globalDir) && !options.force) {
-			p.log.warn(`Global config already exists at ${globalDir}`);
-			p.log.info(`Use ${color.cyan("--force")} to overwrite`);
-			p.outro("Nothing to do");
-			return;
-		}
-		const s = p.spinner();
-		s.start("Copying to global config");
-		const opencodeSrc = join(templateRoot, ".opencode");
-		if (!existsSync(opencodeSrc)) {
-			s.stop("Failed");
-			p.log.error("Template .opencode/ not found");
-			p.outro(color.red("Failed"));
-			process.exit(1);
-		}
-		await copyDir(opencodeSrc, globalDir);
-		s.stop("Done");
-		p.note(`Global config installed at:\n${globalDir}\n\nThis provides default agents, skills, and tools\nfor all OpenCode projects on this machine.`, "Global Installation Complete");
-		p.outro(color.green("Ready!"));
-		return;
-	}
-	const targetDir = process.cwd();
-	const mode = detectMode(targetDir);
-	if (mode === "already-initialized" && !options.force) {
-		p.log.warn("Already initialized (.opencode/ exists)");
-		p.log.info(`Use ${color.cyan("--force")} to reinitialize`);
+	const localDir = join(process.cwd(), ".opencode");
+	p.log.info(`Installing to project: ${color.cyan(localDir)}`);
+	if (existsSync(localDir) && !options.force) {
+		p.log.warn("Project already initialized (.opencode/ exists)");
+		p.log.info(`Use ${color.cyan("--force")} to overwrite`);
 		p.outro("Nothing to do");
 		return;
 	}
-	let preservedFiles;
-	if (mode === "already-initialized" && options.force) {
-		const affected = getAffectedFiles(join(targetDir, ".opencode"));
-		if (affected.length > 0 && !options.yes) {
-			p.log.warn(`${affected.length} files will be overwritten:`);
-			const preview = affected.slice(0, 10);
-			for (const file of preview) p.log.info(color.dim(`  .opencode/${file}`));
-			if (affected.length > 10) p.log.info(color.dim(`  ... and ${affected.length - 10} more`));
-			if (!options.backup) {
-				const shouldBackup = await p.confirm({
-					message: "Backup existing .opencode before overwriting?",
-					initialValue: true
-				});
-				if (p.isCancel(shouldBackup)) {
-					p.cancel("Cancelled");
-					process.exit(0);
-				}
-				if (shouldBackup) options.backup = true;
-			}
-			const proceed = await p.confirm({
-				message: options.backup ? "Proceed? (existing config will be backed up)" : "Proceed without backup?",
-				initialValue: options.backup
-			});
-			if (p.isCancel(proceed) || !proceed) {
-				p.cancel("Cancelled");
-				process.exit(0);
-			}
-		}
-		if (options.backup) {
-			preservedFiles = preserveUserFiles(targetDir);
-			const backupPath = backupOpenCode(targetDir);
-			if (backupPath) p.log.info(`Backed up to ${color.cyan(basename(backupPath))}`);
-		} else preservedFiles = preserveUserFiles(targetDir);
-	}
-	const templateRoot = getTemplateRoot$1();
+	const templateRoot = getTemplateRoot$2();
 	if (!templateRoot) {
 		p.log.error("Template not found. Please reinstall opencodekit.");
 		p.outro(color.red("Failed"));
 		process.exit(1);
 	}
-	let projectName = basename(targetDir);
-	if (mode === "scaffold") {
-		const name = await p.text({
-			message: "Project name",
-			placeholder: projectName,
-			defaultValue: projectName
-		});
-		if (p.isCancel(name)) {
-			p.cancel("Cancelled");
-			process.exit(0);
-		}
-		projectName = name || projectName;
-	}
-	let skipDirs = [];
-	if (!options.global) {
-		const globalConfig = detectGlobalConfig();
-		if (globalConfig && options.projectOnly) {
-			skipDirs = globalConfig.coveredDirs;
-			p.log.info(`Using global config from ${color.cyan(globalConfig.dir)}`);
-			p.log.info(`Skipping: ${skipDirs.map((d) => color.dim(d)).join(", ")}`);
-		} else if (globalConfig && !options.yes) {
-			p.log.info(`Global config found at ${color.cyan(globalConfig.dir)}`);
-			p.log.info(`Available globally: ${globalConfig.coveredDirs.map((d) => color.green(d)).join(", ")}`);
-			const useGlobal = await p.confirm({
-				message: "Skip these (use global config)? Only project-scope files will be created locally.",
-				initialValue: true
-			});
-			if (!p.isCancel(useGlobal) && useGlobal) skipDirs = globalConfig.coveredDirs;
-		} else if (globalConfig && options.yes) p.log.info(`Global config found at ${color.cyan(globalConfig.dir)} — use ${color.bold("--project-only")} to skip shared dirs`);
-	}
 	const s = p.spinner();
-	if (mode === "scaffold") {
-		s.start("Scaffolding project");
-		mkdirSync(targetDir, { recursive: true });
-	} else if (mode === "add-config") s.start("Adding OpenCodeKit");
-	else s.start("Reinitializing");
-	if (!await copyOpenCodeOnly(templateRoot, targetDir, skipDirs)) {
+	s.start("Copying to project");
+	const opencodeSrc = join(templateRoot, ".opencode");
+	if (!existsSync(opencodeSrc)) {
 		s.stop("Failed");
-		p.outro(color.red("Template copy failed"));
-		process.exit(1);
-	}
-	s.stop("Done");
-	if (skipDirs.length > 0) p.log.info(`Project-only init: skipped ${skipDirs.map((d) => color.dim(d)).join(", ")} (using global config)`);
-	const restoredFileCount = finalizeInstalledFiles(targetDir, getPackageVersion$1(), preservedFiles);
-	if (restoredFileCount > 0) p.log.info(`Preserved ${restoredFileCount} user memory files (memory/project/)`);
-	if (options.free) {
-		applyModelPreset(targetDir, "free");
-		p.log.info("Applied free model preset");
-	} else if (options.recommend) {
-		applyModelPreset(targetDir, "recommend");
-		p.log.info("Applied recommended model preset");
-	} else if (options.yes) {
-		applyModelPreset(targetDir, "free");
-		p.log.info("Applied free model preset (default)");
-	} else {
-		const preset = await p.select({
-			message: "Choose model preset",
-			options: [
-				{
-					value: "free",
-					label: "Free models",
-					hint: "minimax, glm, grok (no API costs)"
-				},
-				{
-					value: "recommend",
-					label: "Recommended models",
-					hint: "gpt-5.4, gpt-5.3-codex, sonnet-4.6, gemini-3.1"
-				},
-				{
-					value: "custom",
-					label: "Custom",
-					hint: "configure each agent individually"
-				},
-				{
-					value: "skip",
-					label: "Skip",
-					hint: "keep template defaults"
-				}
-			]
-		});
-		if (!p.isCancel(preset)) {
-			if (preset === "custom") {
-				await promptCustomModels(targetDir);
-				p.log.info("Applied custom model configuration");
-			} else if (preset !== "skip") {
-				applyModelPreset(targetDir, preset);
-				p.log.info(`Applied ${preset} model preset`);
-			}
-		}
-	}
-	const opencodeDir = join(targetDir, ".opencode");
-	if (existsSync(join(opencodeDir, "package.json"))) {
-		const installSpinner = p.spinner();
-		installSpinner.start("Installing dependencies");
-		try {
-			execSync("npm install --no-fund --no-audit", {
-				cwd: opencodeDir,
-				stdio: "ignore"
-			});
-			installSpinner.stop("Dependencies installed");
-		} catch {
-			installSpinner.stop("Failed to install (run manually: cd .opencode && npm install)");
-		}
-	}
-	if (mode === "already-initialized" && options.force && !options.backup) {
-		const orphans = findOrphans(targetDir, getTemplateFiles(templateRoot));
-		if (orphans.length > 0) {
-			p.log.warn(`Found ${orphans.length} orphan files not in template`);
-			const { savedPatches, trueOrphans } = await autoSavePatchesForOrphans(targetDir, templateRoot, orphans);
-			if (savedPatches.length > 0) {
-				p.log.success(`Auto-saved ${savedPatches.length} patches for modified template files`);
-				for (const patch of savedPatches) console.log(`  ${color.green("✓")} ${patch}`);
-				p.log.info(color.dim("These patches will be reapplied after template files are updated."));
-			}
-			if (trueOrphans.length === 0) {} else if (options.pruneAll) {
-				const pruneSpinner = p.spinner();
-				pruneSpinner.start("Removing orphan files");
-				for (const orphan of trueOrphans) rmSync(join(opencodeDir, orphan));
-				pruneSpinner.stop(`Removed ${trueOrphans.length} orphan files`);
-			} else if (options.prune) {
-				const selected = await p.multiselect({
-					message: "Select orphan files to delete",
-					options: trueOrphans.map((o) => ({
-						value: o,
-						label: o
-					})),
-					required: false
-				});
-				if (!p.isCancel(selected) && selected.length > 0) {
-					const pruneSpinner = p.spinner();
-					pruneSpinner.start("Deleting files");
-					for (const file of selected) rmSync(join(opencodeDir, file));
-					pruneSpinner.stop(`Deleted ${selected.length} files`);
-				}
-			} else if (!options.yes && trueOrphans.length > 0) {
-				const preview = trueOrphans.slice(0, 5);
-				for (const file of preview) p.log.info(color.dim(`  .opencode/${file}`));
-				if (trueOrphans.length > 5) p.log.info(color.dim(`  ... and ${trueOrphans.length - 5} more`));
-				const orphanAction = await p.select({
-					message: "How to handle orphan files?",
-					options: [
-						{
-							value: "keep",
-							label: "Keep all",
-							hint: "leave orphan files"
-						},
-						{
-							value: "select",
-							label: "Select",
-							hint: "choose which to delete"
-						},
-						{
-							value: "delete",
-							label: "Delete all",
-							hint: "remove all orphans"
-						}
-					]
-				});
-				if (!p.isCancel(orphanAction)) {
-					if (orphanAction === "delete") {
-						const pruneSpinner = p.spinner();
-						pruneSpinner.start("Removing orphan files");
-						for (const orphan of trueOrphans) rmSync(join(opencodeDir, orphan));
-						pruneSpinner.stop(`Removed ${trueOrphans.length} orphan files`);
-					} else if (orphanAction === "select") {
-						const selected = await p.multiselect({
-							message: "Select orphan files to delete",
-							options: trueOrphans.map((o) => ({
-								value: o,
-								label: o
-							})),
-							required: false
-						});
-						if (!p.isCancel(selected) && selected.length > 0) {
-							const pruneSpinner = p.spinner();
-							pruneSpinner.start("Deleting files");
-							for (const file of selected) rmSync(join(opencodeDir, file));
-							pruneSpinner.stop(`Deleted ${selected.length} files`);
-						}
-					}
-				}
-			}
-		}
+		p.log.error("Template .opencode/ not found");
+		p.outro(color.red("Failed"));
+		process.exit(1);
 	}
-	p.outro(color.green("Ready to code!"));
+	await copyDir(opencodeSrc, localDir);
+	s.stop("Done");
+	writeFileSync(join(localDir, ".version"), getPackageVersion$2());
+	generateManifest(localDir, getPackageVersion$2());
+	p.note(`OpenCodeKit config installed at:\n${localDir}\n\nThis provides default agents, skills, and tools\nfor this project.`, "Project Installation Complete");
+	p.outro(color.green("Ready!"));
 }
 
 //#endregion
@@ -3913,6 +3207,251 @@ async function removeSkill(skillDir, skillNameArg) {
 	p.log.success(`Removed skill "${skill.name}"`);
 }
 
+//#endregion
+//#region src/utils/patch.ts
+/**
+* Patch utilities for saving/applying user modifications to template files.
+* Uses unified diff format for git-friendly, human-readable patches.
+*/
+const PATCHES_DIR = "patches";
+const PATCHES_JSON = ".patches.json";
+const METADATA_VERSION = "1.0.0";
+/**
+* Calculate SHA-256 hash of content.
+*/
+function calculateHash(content) {
+	return createHash("sha256").update(content).digest("hex").slice(0, 16);
+}
+/**
+* Convert a relative file path to a safe patch filename.
+* e.g., "agent/build.md" -> "agent-build.md.patch"
+*/
+function pathToPatchFilename(relativePath) {
+	return `${relativePath.replace(/\//g, "-")}.patch`;
+}
+/**
+* Get the patches directory path.
+*/
+function getPatchesDir(opencodeDir) {
+	return join(opencodeDir, PATCHES_DIR);
+}
+/**
+* Get the template root directory (from dist/template or dev mode).
+*/
+function getTemplateRoot$1() {
+	const __dirname = dirname(fileURLToPath(import.meta.url));
+	const possiblePaths = [
+		join(__dirname, "template"),
+		join(__dirname, "..", "..", ".opencode"),
+		join(__dirname, "..", "template")
+	];
+	for (const path of possiblePaths) {
+		if (existsSync(join(path, ".opencode"))) return path;
+		if (existsSync(join(path, "opencode.json"))) return dirname(path);
+	}
+	return null;
+}
+/**
+* Load patch metadata from .patches.json.
+*/
+function loadPatchMetadata(opencodeDir) {
+	const metadataPath = join(getPatchesDir(opencodeDir), PATCHES_JSON);
+	if (!existsSync(metadataPath)) return {
+		version: METADATA_VERSION,
+		patches: {}
+	};
+	try {
+		const content = readFileSync(metadataPath, "utf-8");
+		return JSON.parse(content);
+	} catch {
+		return {
+			version: METADATA_VERSION,
+			patches: {}
+		};
+	}
+}
+/**
+* Save patch metadata to .patches.json.
+*/
+function savePatchMetadata(opencodeDir, metadata) {
+	const patchesDir = getPatchesDir(opencodeDir);
+	if (!existsSync(patchesDir)) mkdirSync(patchesDir, { recursive: true });
+	writeFileSync(join(patchesDir, PATCHES_JSON), JSON.stringify(metadata, null, 2));
+}
+/**
+* Get the current OpenCodeKit version from package.json.
+*/
+function getPackageVersion$1() {
+	const __dirname = dirname(fileURLToPath(import.meta.url));
+	const pkgPaths = [join(__dirname, "..", "..", "package.json"), join(__dirname, "..", "package.json")];
+	for (const pkgPath of pkgPaths) if (existsSync(pkgPath)) try {
+		return JSON.parse(readFileSync(pkgPath, "utf-8")).version || "unknown";
+	} catch {}
+	return "unknown";
+}
+/**
+* Generate a unified diff patch between template and user file.
+*/
+function generatePatch(templateContent, userContent, relativePath) {
+	return createPatch(relativePath, templateContent, userContent, "template", "modified");
+}
+/**
+* Save a patch for a modified template file.
+* @returns The patch entry that was saved.
+*/
+function savePatch(opencodeDir, relativePath, templateContent, userContent) {
+	const metadata = loadPatchMetadata(opencodeDir);
+	const patchesDir = getPatchesDir(opencodeDir);
+	if (!existsSync(patchesDir)) mkdirSync(patchesDir, { recursive: true });
+	const patchContent = generatePatch(templateContent, userContent, relativePath);
+	const patchFilename = pathToPatchFilename(relativePath);
+	writeFileSync(join(patchesDir, patchFilename), patchContent);
+	const entry = {
+		originalHash: calculateHash(templateContent),
+		currentHash: calculateHash(userContent),
+		patchFile: patchFilename,
+		createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+		templateVersion: getPackageVersion$1()
+	};
+	metadata.patches[relativePath] = entry;
+	savePatchMetadata(opencodeDir, metadata);
+	return entry;
+}
+/**
+* Remove a patch for a file.
+*/
+function removePatch(opencodeDir, relativePath) {
+	const metadata = loadPatchMetadata(opencodeDir);
+	const entry = metadata.patches[relativePath];
+	if (!entry) return false;
+	const patchPath = join(getPatchesDir(opencodeDir), entry.patchFile);
+	if (existsSync(patchPath)) {
+		const { rmSync } = __require("node:fs");
+		rmSync(patchPath);
+	}
+	delete metadata.patches[relativePath];
+	savePatchMetadata(opencodeDir, metadata);
+	return true;
+}
+/**
+* Apply a patch to file content.
+* @returns The patched content, or null if patch failed.
+*/
+function applyPatch$1(originalContent, patchContent) {
+	return applyPatch(originalContent, patchContent);
+}
+/**
+* Apply all saved patches after an upgrade.
+*/
+function applyAllPatches(opencodeDir) {
+	const metadata = loadPatchMetadata(opencodeDir);
+	const patchesDir = getPatchesDir(opencodeDir);
+	const results = [];
+	for (const [relativePath, entry] of Object.entries(metadata.patches)) {
+		if (entry.disabled) {
+			results.push({
+				success: true,
+				file: relativePath,
+				message: "Skipped (disabled)"
+			});
+			continue;
+		}
+		const filePath = join(opencodeDir, relativePath);
+		const patchPath = join(patchesDir, entry.patchFile);
+		if (!existsSync(filePath)) {
+			results.push({
+				success: false,
+				file: relativePath,
+				message: "File no longer exists"
+			});
+			continue;
+		}
+		if (!existsSync(patchPath)) {
+			results.push({
+				success: false,
+				file: relativePath,
+				message: "Patch file missing"
+			});
+			continue;
+		}
+		const currentContent = readFileSync(filePath, "utf-8");
+		const patchContent = readFileSync(patchPath, "utf-8");
+		const patched = applyPatch$1(currentContent, patchContent);
+		if (patched === false) {
+			writeFileSync(`${patchPath}.rej`, patchContent);
+			results.push({
+				success: false,
+				file: relativePath,
+				message: "Patch conflict - saved to .rej file",
+				conflict: true
+			});
+		} else {
+			writeFileSync(filePath, patched);
+			metadata.patches[relativePath].currentHash = calculateHash(patched);
+			savePatchMetadata(opencodeDir, metadata);
+			results.push({
+				success: true,
+				file: relativePath,
+				message: "Patch applied successfully"
+			});
+		}
+	}
+	return results;
+}
+/**
+* Check the status of all patches.
+*/
+function checkPatchStatus(opencodeDir, templateRoot) {
+	const metadata = loadPatchMetadata(opencodeDir);
+	const statuses = [];
+	for (const [relativePath, entry] of Object.entries(metadata.patches)) {
+		if (!existsSync(join(opencodeDir, relativePath))) {
+			statuses.push({
+				relativePath,
+				entry,
+				status: "missing",
+				message: "User file no longer exists"
+			});
+			continue;
+		}
+		if (templateRoot) {
+			const templateFilePath = join(templateRoot, ".opencode", relativePath);
+			if (existsSync(templateFilePath)) {
+				const templateContent = readFileSync(templateFilePath, "utf-8");
+				if (calculateHash(templateContent) !== entry.originalHash) {
+					const patchPath = join(getPatchesDir(opencodeDir), entry.patchFile);
+					if (existsSync(patchPath)) if (applyPatch$1(templateContent, readFileSync(patchPath, "utf-8")) === false) statuses.push({
+						relativePath,
+						entry,
+						status: "conflict",
+						message: "Template changed and patch cannot apply cleanly"
+					});
+					else statuses.push({
+						relativePath,
+						entry,
+						status: "stale",
+						message: "Template changed but patch can still apply"
+					});
+					else statuses.push({
+						relativePath,
+						entry,
+						status: "missing",
+						message: "Patch file missing"
+					});
+					continue;
+				}
+			}
+		}
+		statuses.push({
+			relativePath,
+			entry,
+			status: "clean",
+			message: "Patch is up to date"
+		});
+	}
+	return statuses;
+}
+
 //#endregion
 //#region src/commands/upgrade.ts
 const PRESERVE_FILES = ["opencode.json", ".env"];
@@ -4532,7 +4071,7 @@ function listPatches(opencodeDir) {
 		showEmpty("patches", "ock patch create <file>");
 		return;
 	}
-	const statuses = checkPatchStatus(opencodeDir, getTemplateRoot$2());
+	const statuses = checkPatchStatus(opencodeDir, getTemplateRoot$1());
 	const statusMap = new Map(statuses.map((s) => [s.relativePath, s]));
 	p.intro(color.bgCyan(color.black(` ${entries.length} patch${entries.length === 1 ? "" : "es"} `)));
 	for (const [relativePath, entry] of entries) {
@@ -4566,7 +4105,7 @@ async function createPatch$1(opencodeDir) {
 		notFound("file", relativePath);
 		return;
 	}
-	const templateRoot = getTemplateRoot$2();
+	const templateRoot = getTemplateRoot$1();
 	if (!templateRoot) {
 		p.log.error("Cannot find template root — unable to compute diff");
 		p.log.info(color.dim("Make sure ock is installed correctly"));
@@ -5922,7 +5461,7 @@ async function ensureLicenseFor(commandName) {
 cli.option("--verbose", "Enable verbose logging");
 cli.option("--quiet", "Suppress all output");
 cli.version(`${packageVersion}`);
-cli.command("init", "Initialize OpenCodeKit in current directory").option("--force", "Reinitialize even if already exists").option("--global", "Install to global OpenCode config (~/.config/opencode/)").option("--free", "Use free models (default)").option("--recommend", "Use recommended premium models").option("-y, --yes", "Skip prompts, use defaults (for CI)").option("--backup", "Backup existing .opencode before overwriting").option("--prune", "Manually select orphan files to delete").option("--prune-all", "Auto-delete all orphan files").option("--project-only", "Only init project-scope files (skip if global config has agents/skills/commands/tools)").action(async (options) => {
+cli.command("init", "Initialize OpenCodeKit in current directory").option("--force", "Reinitialize even if already exists").option("--global", "Install to global OpenCode config (~/.config/opencode/)").option("-y, --yes", "Skip prompts, use defaults (for CI)").action(async (options) => {
 	if (!await ensureLicenseFor("init")) return;
 	await initCommand(options);
 });
@@ -5932,17 +5471,6 @@ cli.command("activate [key]", "Activate paid license key").action(async (key) =>
 cli.command("license [action]", "Manage license (status, deactivate)").action(async (action) => {
 	await licenseCommand(action);
 });
-cli.command("agent [action]", "Manage agents (list, add, view)").action(async (action) => {
-	if (!action) {
-		console.log("\nUsage: ock agent <action>\n");
-		console.log("Actions:");
-		console.log("  list    List all agents");
-		console.log("  add     Create a new agent");
-		console.log("  view    View agent details\n");
-		return;
-	}
-	await agentCommand(action);
-});
 cli.command("command [action]", "Manage slash commands (list, create, show, delete)").action(async (action) => {
 	if (!action) {
 		console.log("\nUsage: ock command <action>\n");
@@ -5955,14 +5483,15 @@ cli.command("command [action]", "Manage slash commands (list, create, show, dele
 	}
 	await commandCommand(action);
 });
-cli.command("agent [action]", "Manage agents (list, create, view, remove)").action(async (action) => {
+cli.command("agent [action]", "Manage agents (list, create, show, delete, edit)").action(async (action) => {
 	if (!action) {
 		console.log("\nUsage: ock agent <action>\n");
 		console.log("Actions:");
 		console.log("  list    List all agents");
 		console.log("  create  Create a new agent");
-		console.log("  view    View agent details");
-		console.log("  remove  Remove an agent\n");
+		console.log("  show    View agent details");
+		console.log("  delete  Remove an agent");
+		console.log("  edit    Edit an agent\n");
 		return;
 	}
 	await agentCommand(action);