opencodekit 0.18.4 → 0.18.6

package/dist/index.js

@@ -18,11 +18,35 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region package.json
-var version = "0.18.4";
+var version = "0.18.6";
 
 //#endregion
 //#region src/utils/errors.ts
 /**
+* Resolve the .opencode directory path.
+* Handles two 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.
+*/
+function resolveOpencodePath() {
+	const nested = join(process.cwd(), ".opencode");
+	if (existsSync(nested)) return nested;
+	if (existsSync(join(process.cwd(), "opencode.json"))) return process.cwd();
+	return null;
+}
+/**
+* Resolve opencode path or show "not initialized" error and return null.
+*/
+function requireOpencodePath() {
+	const resolved = resolveOpencodePath();
+	if (!resolved) {
+		notInitialized();
+		return null;
+	}
+	return resolved;
+}
+/**
 * Display a styled error message with optional fix suggestion
 */
 function showError(message, fix) {
@@ -79,7 +103,8 @@ const InitOptionsSchema = z.object({
 	yes: z.boolean().optional().default(false),
 	backup: z.boolean().optional().default(false),
 	prune: z.boolean().optional().default(false),
-	pruneAll: z.boolean().optional().default(false)
+	pruneAll: z.boolean().optional().default(false),
+	projectOnly: z.boolean().optional().default(false)
 });
 const UpgradeOptionsSchema = z.object({
 	force: z.boolean().optional().default(false),
@@ -153,6 +178,15 @@ const ToolActionSchema = z.enum([
 	"delete"
 ]);
 const ToolOptionsSchema = z.object({ json: z.boolean().optional().default(false) });
+const PatchActionSchema = z.enum([
+	"list",
+	"create",
+	"apply",
+	"diff",
+	"remove",
+	"disable",
+	"enable"
+]);
 const CompletionShellSchema = z.enum([
 	"bash",
 	"zsh",
@@ -183,11 +217,8 @@ function parseAction(schema, action) {
 //#region src/commands/agent.ts
 async function agentCommand(action) {
 	const validatedAction = parseAction(AgentActionSchema, action);
-	const opencodePath = join(process.cwd(), ".opencode");
-	if (!existsSync(opencodePath)) {
-		notInitialized();
-		return;
-	}
+	const opencodePath = requireOpencodePath();
+	if (!opencodePath) return;
 	const agentPath = join(opencodePath, "agent");
 	switch (validatedAction) {
 		case "list":
@@ -464,11 +495,8 @@ async function removeAgent(agentPath, agentNameArg) {
 //#region src/commands/command.ts
 async function commandCommand(action) {
 	const validatedAction = parseAction(CommandActionSchema, action);
-	const opencodePath = join(process.cwd(), ".opencode");
-	if (!existsSync(opencodePath)) {
-		notInitialized();
-		return;
-	}
+	const opencodePath = requireOpencodePath();
+	if (!opencodePath) return;
 	const commandDir = join(opencodePath, "command");
 	switch (validatedAction) {
 		case "list":
@@ -973,12 +1001,9 @@ async function getAgentsFromServer() {
 	return fetchFromServer("/agent");
 }
 async function configCommand(action) {
-	const opencodePath = join(process.cwd(), ".opencode");
+	const opencodePath = requireOpencodePath();
+	if (!opencodePath) return;
 	const configPath = join(opencodePath, "opencode.json");
-	if (!existsSync(opencodePath)) {
-		notInitialized();
-		return;
-	}
 	if (!existsSync(configPath)) {
 		showError("opencode.json not found", "ock init --force");
 		return;
@@ -2515,6 +2540,22 @@ function getPatchesDir(opencodeDir) {
 	return join(opencodeDir, PATCHES_DIR);
 }
 /**
+* Get the template root directory (from dist/template or dev mode).
+*/
+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);
+	}
+	return null;
+}
+/**
 * Load patch metadata from .patches.json.
 */
 function loadPatchMetadata(opencodeDir) {
@@ -2581,6 +2622,22 @@ function savePatch(opencodeDir, relativePath, templateContent, userContent) {
 	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.
 */
@@ -2595,6 +2652,14 @@ function applyAllPatches(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)) {
@@ -2637,6 +2702,59 @@ function applyAllPatches(opencodeDir) {
 	}
 	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
@@ -2656,6 +2774,34 @@ const EXCLUDED_FILES = [
 	"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)
@@ -2699,10 +2845,25 @@ async function copyDir(src, dest) {
 		else writeFileSync(destPath, readFileSync(srcPath, "utf-8"));
 	}
 }
-async function copyOpenCodeOnly(templateRoot, targetDir) {
+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;
 }
@@ -2998,18 +3159,36 @@ async function initCommand(rawOptions = {}) {
 		}
 		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)) {
+	if (!await copyOpenCodeOnly(templateRoot, targetDir, skipDirs)) {
 		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) {
@@ -3178,11 +3357,8 @@ async function initCommand(rawOptions = {}) {
 //#region src/commands/skill.ts
 async function skillCommand(action) {
 	const validatedAction = parseAction(SkillActionSchema, action);
-	const opencodePath = join(process.cwd(), ".opencode");
-	if (!existsSync(opencodePath)) {
-		notInitialized();
-		return;
-	}
+	const opencodePath = requireOpencodePath();
+	if (!opencodePath) return;
 	const skillDir = join(opencodePath, "skill");
 	switch (validatedAction) {
 		case "list":
@@ -3498,7 +3674,7 @@ function copyDirWithPreserve(src, dest, preserveFiles, preserveDirs, manifest, b
 		const destPath = join(dest, entry.name);
 		if (entry.isDirectory()) if (preserveDirs.includes(entry.name)) {
 			if (!existsSync(destPath)) mkdirSync(destPath, { recursive: true });
-			const subResult = copyDirPreserveExisting(srcPath, destPath, manifest, entry.name);
+			const subResult = copyDirPreserveExisting(srcPath, destPath, manifest, dest, entry.name);
 			added.push(...subResult.added);
 			updated.push(...subResult.updated);
 			preserved.push(...subResult.preserved);
@@ -3524,7 +3700,7 @@ function copyDirWithPreserve(src, dest, preserveFiles, preserveDirs, manifest, b
 		preserved
 	};
 }
-function copyDirPreserveExisting(src, dest, manifest, basePath = "") {
+function copyDirPreserveExisting(src, dest, manifest, opencodeDir, basePath = "") {
 	const added = [];
 	const updated = [];
 	const preserved = [];
@@ -3534,7 +3710,7 @@ function copyDirPreserveExisting(src, dest, manifest, basePath = "") {
 		const destPath = join(dest, entry.name);
 		if (entry.isDirectory()) {
 			if (!existsSync(destPath)) mkdirSync(destPath, { recursive: true });
-			const subResult = copyDirPreserveExisting(srcPath, destPath, manifest, join(basePath, entry.name));
+			const subResult = copyDirPreserveExisting(srcPath, destPath, manifest, opencodeDir, join(basePath, entry.name));
 			added.push(...subResult.added);
 			updated.push(...subResult.updated);
 			preserved.push(...subResult.preserved);
@@ -3546,6 +3722,9 @@ function copyDirPreserveExisting(src, dest, manifest, basePath = "") {
 			} else if (fileModificationStatus(destPath, relativePath, manifest) === "unmodified") {
 				copyFileSync(srcPath, destPath);
 				updated.push(relativePath);
+			} else if (loadPatchMetadata(opencodeDir).patches[relativePath]) {
+				copyFileSync(srcPath, destPath);
+				updated.push(relativePath);
 			} else preserved.push(relativePath);
 		}
 	}
@@ -3579,12 +3758,9 @@ function findUpgradeOrphans(installedFiles, templateFiles) {
 async function upgradeCommand(rawOptions = {}) {
 	const options = parseOptions(UpgradeOptionsSchema, rawOptions);
 	if (process.argv.includes("--quiet")) return;
-	const opencodeDir = join(process.cwd(), ".opencode");
+	const opencodeDir = requireOpencodePath();
+	if (!opencodeDir) return;
 	const manifest = loadManifest(opencodeDir);
-	if (!existsSync(opencodeDir)) {
-		notInitialized();
-		return;
-	}
 	p.intro(color.bgCyan(color.black(" Upgrade ")));
 	const versionInfo = await checkVersion(opencodeDir);
 	console.log();
@@ -3646,7 +3822,10 @@ async function upgradeCommand(rawOptions = {}) {
 	}
 	if (result.updated.length > 0) p.log.success(`Updated ${result.updated.length} files`);
 	if (result.added.length > 0) p.log.success(`Added ${result.added.length} files`);
-	if (result.preserved.length > 0) p.log.info(`Preserved ${result.preserved.length} user files`);
+	if (result.preserved.length > 0) {
+		p.log.info(`Preserved ${result.preserved.length} user files`);
+		p.log.info(color.dim("  Tip: Run 'ock patch create <file>' to save customizations as reapplyable patches"));
+	}
 	if (patchResults.success > 0) p.log.success(`Reapplied ${patchResults.success} patches`);
 	const orphans = findUpgradeOrphans(getAllFiles(opencodeDir), getAllFiles(templateOpencode));
 	if (orphans.length > 0) {
@@ -4012,11 +4191,8 @@ function displayChecks(checks) {
 async function statusCommand() {
 	if (process.argv.includes("--quiet")) return;
 	const cwd = process.cwd();
-	const opencodeDir = join(cwd, ".opencode");
-	if (!existsSync(opencodeDir)) {
-		notInitialized();
-		return;
-	}
+	const opencodeDir = requireOpencodePath();
+	if (!opencodeDir) return;
 	const projectName = basename(cwd);
 	p.intro(color.bgCyan(color.black(` ${projectName} `)));
 	const agentDir = join(opencodeDir, "agent");
@@ -4053,6 +4229,277 @@ async function statusCommand() {
 	p.outro(color.dim(".opencode/"));
 }
 
+//#endregion
+//#region src/commands/patch.ts
+function listPatches(opencodeDir) {
+	const metadata = loadPatchMetadata(opencodeDir);
+	const entries = Object.entries(metadata.patches);
+	if (entries.length === 0) {
+		showEmpty("patches", "ock patch create <file>");
+		return;
+	}
+	const statuses = checkPatchStatus(opencodeDir, getTemplateRoot$2());
+	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) {
+		const ps = statusMap.get(relativePath);
+		const statusLabel = ps ? formatStatus(ps.status) : color.dim("unknown");
+		const disabledLabel = entry.disabled ? color.yellow(" [disabled]") : "";
+		const descLabel = entry.description ? color.dim(` — ${entry.description}`) : "";
+		p.log.info(`${color.cyan(relativePath)}${disabledLabel}${descLabel}\n  Status: ${statusLabel}  Created: ${color.dim(entry.createdAt.slice(0, 10))}  Version: ${color.dim(entry.templateVersion)}`);
+	}
+	p.outro(color.dim("Use 'ock patch diff <file>' to view changes"));
+}
+function formatStatus(status) {
+	switch (status) {
+		case "clean": return color.green("clean");
+		case "stale": return color.yellow("stale");
+		case "conflict": return color.red("conflict");
+		case "missing": return color.red("missing");
+		default: return color.dim(status);
+	}
+}
+async function createPatch$1(opencodeDir) {
+	const fileArg = process.argv[4];
+	if (!fileArg) {
+		p.log.error("Usage: ock patch create <file>");
+		p.log.info(color.dim("File path is relative to .opencode/ (e.g., skill/beads/SKILL.md)"));
+		return;
+	}
+	const relativePath = fileArg;
+	const userFilePath = join(opencodeDir, relativePath);
+	if (!existsSync(userFilePath)) {
+		notFound("file", relativePath);
+		return;
+	}
+	const templateRoot = getTemplateRoot$2();
+	if (!templateRoot) {
+		p.log.error("Cannot find template root — unable to compute diff");
+		p.log.info(color.dim("Make sure ock is installed correctly"));
+		return;
+	}
+	const templateFilePath = join(templateRoot, ".opencode", relativePath);
+	if (!existsSync(templateFilePath)) {
+		p.log.error(`No template file for ${color.cyan(relativePath)}`);
+		p.log.info(color.dim("Only template-originated files can be patched"));
+		return;
+	}
+	const templateContent = readFileSync(templateFilePath, "utf-8");
+	const userContent = readFileSync(userFilePath, "utf-8");
+	if (calculateHash(templateContent) === calculateHash(userContent)) {
+		p.log.warn(`${color.cyan(relativePath)} is identical to template — nothing to patch`);
+		return;
+	}
+	if (loadPatchMetadata(opencodeDir).patches[relativePath]) {
+		const overwrite = await p.confirm({
+			message: `Patch already exists for ${color.cyan(relativePath)}. Overwrite?`,
+			initialValue: false
+		});
+		if (p.isCancel(overwrite) || !overwrite) {
+			p.cancel("Cancelled");
+			return;
+		}
+	}
+	const description = await p.text({
+		message: "Description (optional)",
+		placeholder: "e.g., Custom agent prompt for our team"
+	});
+	if (p.isCancel(description)) {
+		p.cancel("Cancelled");
+		return;
+	}
+	const entry = savePatch(opencodeDir, relativePath, templateContent, userContent);
+	if (description && typeof description === "string" && description.trim()) {
+		entry.description = description.trim();
+		const updatedMetadata = loadPatchMetadata(opencodeDir);
+		updatedMetadata.patches[relativePath] = entry;
+		savePatchMetadata(opencodeDir, updatedMetadata);
+	}
+	p.log.success(`Created patch for ${color.cyan(relativePath)}`);
+	p.log.info(color.dim(`Patch file: ${entry.patchFile}`));
+}
+function applyPatches(opencodeDir) {
+	const fileArg = process.argv[4];
+	const metadata = loadPatchMetadata(opencodeDir);
+	if (Object.entries(metadata.patches).length === 0) {
+		showEmpty("patches", "ock patch create <file>");
+		return;
+	}
+	if (fileArg) {
+		const entry = metadata.patches[fileArg];
+		if (!entry) {
+			notFound("patch", fileArg);
+			return;
+		}
+		if (entry.disabled) {
+			p.log.warn(`Patch for ${color.cyan(fileArg)} is disabled — enable it first`);
+			return;
+		}
+		applySinglePatch(opencodeDir, fileArg, entry);
+		return;
+	}
+	const results = applyAllPatches(opencodeDir);
+	const success = results.filter((r) => r.success && r.message !== "Skipped (disabled)").length;
+	const skipped = results.filter((r) => r.message === "Skipped (disabled)").length;
+	const conflicts = results.filter((r) => r.conflict).length;
+	if (success > 0) p.log.success(`Applied ${success} patch${success === 1 ? "" : "es"}`);
+	if (skipped > 0) p.log.info(color.dim(`Skipped ${skipped} disabled patch${skipped === 1 ? "" : "es"}`));
+	if (conflicts > 0) p.log.warn(`${conflicts} conflict${conflicts === 1 ? "" : "s"} — see .rej files in ${color.cyan(".opencode/patches/")}`);
+	if (success === 0 && conflicts === 0 && skipped === 0) p.log.info("No patches to apply");
+}
+function applySinglePatch(opencodeDir, relativePath, entry) {
+	const filePath = join(opencodeDir, relativePath);
+	const patchPath = join(getPatchesDir(opencodeDir), entry.patchFile);
+	if (!existsSync(filePath)) {
+		p.log.error(`Target file missing: ${color.cyan(relativePath)}`);
+		return;
+	}
+	if (!existsSync(patchPath)) {
+		p.log.error(`Patch file missing: ${color.cyan(entry.patchFile)}`);
+		return;
+	}
+	const result = applyPatch$1(readFileSync(filePath, "utf-8"), readFileSync(patchPath, "utf-8"));
+	if (result === false) {
+		p.log.error(`Conflict applying patch to ${color.cyan(relativePath)}`);
+		p.log.info(color.dim("Template may have changed — try 'ock patch create' to recreate"));
+		return;
+	}
+	writeFileSync(filePath, result, "utf-8");
+	p.log.success(`Applied patch to ${color.cyan(relativePath)}`);
+}
+function showDiff(opencodeDir) {
+	const fileArg = process.argv[4];
+	if (!fileArg) {
+		const metadata = loadPatchMetadata(opencodeDir);
+		const entries = Object.entries(metadata.patches);
+		if (entries.length === 0) {
+			showEmpty("patches", "ock patch create <file>");
+			return;
+		}
+		for (const [relativePath, entry] of entries) showSingleDiff(opencodeDir, relativePath, entry);
+		return;
+	}
+	const entry = loadPatchMetadata(opencodeDir).patches[fileArg];
+	if (!entry) {
+		notFound("patch", fileArg);
+		return;
+	}
+	showSingleDiff(opencodeDir, fileArg, entry);
+}
+function showSingleDiff(opencodeDir, relativePath, entry) {
+	const patchPath = join(getPatchesDir(opencodeDir), entry.patchFile);
+	if (!existsSync(patchPath)) {
+		p.log.error(`Patch file missing: ${color.cyan(entry.patchFile)}`);
+		return;
+	}
+	const patchContent = readFileSync(patchPath, "utf-8");
+	const disabledLabel = entry.disabled ? color.yellow(" [disabled]") : "";
+	console.log(`\n${color.bold(color.cyan(relativePath))}${disabledLabel}`);
+	if (entry.description) console.log(color.dim(`  ${entry.description}`));
+	console.log(color.dim("─".repeat(60)));
+	for (const line of patchContent.split("\n")) if (line.startsWith("+++") || line.startsWith("---")) console.log(color.bold(line));
+	else if (line.startsWith("+")) console.log(color.green(line));
+	else if (line.startsWith("-")) console.log(color.red(line));
+	else if (line.startsWith("@@")) console.log(color.cyan(line));
+	else console.log(color.dim(line));
+	console.log();
+}
+async function removePatchCmd(opencodeDir) {
+	const fileArg = process.argv[4];
+	if (!fileArg) {
+		p.log.error("Usage: ock patch remove <file>");
+		p.log.info(color.dim("Use 'ock patch list' to see available patches"));
+		return;
+	}
+	if (!loadPatchMetadata(opencodeDir).patches[fileArg]) {
+		notFound("patch", fileArg);
+		return;
+	}
+	const confirm = await p.confirm({
+		message: `Remove patch for ${color.cyan(fileArg)}?`,
+		initialValue: false
+	});
+	if (p.isCancel(confirm) || !confirm) {
+		p.cancel("Cancelled");
+		return;
+	}
+	if (removePatch(opencodeDir, fileArg)) p.log.success(`Removed patch for ${color.cyan(fileArg)}`);
+	else p.log.error(`Failed to remove patch for ${color.cyan(fileArg)}`);
+}
+function togglePatch(opencodeDir, disable) {
+	const fileArg = process.argv[4];
+	if (!fileArg) {
+		p.log.error(`Usage: ock patch ${disable ? "disable" : "enable"} <file>`);
+		p.log.info(color.dim("Use 'ock patch list' to see available patches"));
+		return;
+	}
+	const metadata = loadPatchMetadata(opencodeDir);
+	const entry = metadata.patches[fileArg];
+	if (!entry) {
+		notFound("patch", fileArg);
+		return;
+	}
+	if (disable && entry.disabled) {
+		p.log.warn(`Patch for ${color.cyan(fileArg)} is already disabled`);
+		return;
+	}
+	if (!disable && !entry.disabled) {
+		p.log.warn(`Patch for ${color.cyan(fileArg)} is already enabled`);
+		return;
+	}
+	entry.disabled = disable || void 0;
+	metadata.patches[fileArg] = entry;
+	savePatchMetadata(opencodeDir, metadata);
+	if (disable) {
+		p.log.success(`Disabled patch for ${color.cyan(fileArg)}`);
+		p.log.info(color.dim("This patch will be skipped during upgrades"));
+	} else {
+		p.log.success(`Enabled patch for ${color.cyan(fileArg)}`);
+		p.log.info(color.dim("This patch will be applied during upgrades"));
+	}
+}
+async function patchCommand(action) {
+	const opencodeDir = requireOpencodePath();
+	if (!opencodeDir) return;
+	const validatedAction = parseAction(PatchActionSchema, action);
+	if (!validatedAction) {
+		listPatches(opencodeDir);
+		return;
+	}
+	switch (validatedAction) {
+		case "list":
+			listPatches(opencodeDir);
+			break;
+		case "create":
+			await createPatch$1(opencodeDir);
+			break;
+		case "apply":
+			applyPatches(opencodeDir);
+			break;
+		case "diff":
+			showDiff(opencodeDir);
+			break;
+		case "remove":
+			await removePatchCmd(opencodeDir);
+			break;
+		case "disable":
+			togglePatch(opencodeDir, true);
+			break;
+		case "enable":
+			togglePatch(opencodeDir, false);
+			break;
+		default: unknownAction(action ?? "", [
+			"list",
+			"create",
+			"apply",
+			"diff",
+			"remove",
+			"disable",
+			"enable"
+		]);
+	}
+}
+
 //#endregion
 //#region src/tui/utils/keyboard.ts
 /**
@@ -5029,7 +5476,7 @@ function stripAnsi(str) {
 //#region src/tui/hooks/useData.ts
 function loadProjectData() {
 	const cwd = process.cwd();
-	const opencodeDir = join(cwd, ".opencode");
+	const opencodeDir = resolveOpencodePath() ?? join(cwd, ".opencode");
 	const projectName = basename(cwd);
 	const agentDir = join(opencodeDir, "agent");
 	let agents = [];
@@ -5058,9 +5505,6 @@ function loadProjectData() {
 		mcpServers
 	};
 }
-function isInitialized() {
-	return existsSync(join(process.cwd(), ".opencode"));
-}
 
 //#endregion
 //#region src/tui/index.ts
@@ -5068,10 +5512,7 @@ function isInitialized() {
 * Launch the TUI dashboard with interactive navigation.
 */
 async function launchTUI() {
-	if (!isInitialized()) {
-		notInitialized();
-		return;
-	}
+	if (!requireOpencodePath()) return;
 	await mainMenu();
 }
 async function mainMenu() {
@@ -5174,7 +5615,7 @@ const cli = cac("ock");
 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("--beads", "Also initialize .beads/ for multi-agent coordination").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").action(initCommand);
+cli.command("init", "Initialize OpenCodeKit in current directory").option("--force", "Reinitialize even if already exists").option("--beads", "Also initialize .beads/ for multi-agent coordination").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(initCommand);
 cli.command("agent [action]", "Manage agents (list, add, view)").action(async (action) => {
 	if (!action) {
 		console.log("\nUsage: ock agent <action>\n");
@@ -5218,6 +5659,9 @@ cli.command("config [action]", "Edit opencode.json (model, mcp, permission, vali
 cli.command("upgrade", "Update .opencode/ templates to latest version").option("--force", "Force upgrade even if already up to date").option("--check", "Check for updates without upgrading").option("--prune", "Manually select orphan files to delete").option("--prune-all", "Auto-delete all orphan files").action(async (options) => {
 	await upgradeCommand(options);
 });
+cli.command("patch [action]", "Manage template patches (list, create, apply, diff, remove, disable, enable)").action(async (action) => {
+	await patchCommand(action);
+});
 cli.command("completion [shell]", "Generate shell completion script (bash, zsh, fish)").action(async (shell) => {
 	await completionCommand(shell);
 });