@ultrakit/ultrakit 0.0.0 → 0.0.2

package/dist/index.js

@@ -1,258 +1,22 @@
 #!/usr/bin/env node
 import { createRequire } from "node:module";
-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 { 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 * as p from "@clack/prompts";
+import color from "picocolors";
 import { z } from "zod";
 import { execSync, spawn } from "node:child_process";
+import { homedir, platform } from "node:os";
 import { fileURLToPath } from "node:url";
+import { createHash } from "node:crypto";
 import { applyPatch, createPatch } from "diff";
 import * as readline from "node:readline";
 //#region \0rolldown/runtime.js
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 //#endregion
 //#region package.json
-var version = "0.21.9";
-//#endregion
-//#region src/utils/license.ts
-const { machineIdSync } = machineId;
-const LICENSE_API_BASE_URL = process.env.OCK_LICENSE_API_BASE_URL ?? "https://payments-api.ultrakit.dev";
-const LICENSE_REQUEST_TIMEOUT_MS = 1e4;
-const LICENSE_HMAC_SECRET = process.env.OCK_LICENSE_HMAC_SECRET ?? "uk-license-v1-local-integrity";
-const LICENSE_CHECK_INTERVAL_SECONDS = 10080 * 60;
-const LICENSE_OFFLINE_GRACE_SECONDS = 720 * 60 * 60;
-const LICENSE_KEY_PATTERN = /^OCK-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{4}$/;
-const StoredLicenseSchema = z.object({
-	key: z.string(),
-	activationId: z.string(),
-	machineId: z.string(),
-	machineLabel: z.string(),
-	activatedAt: z.number(),
-	lastValidatedAt: z.number(),
-	nextCheckAt: z.number(),
-	hmac: z.string()
-});
-function unixNow() {
-	return Math.floor(Date.now() / 1e3);
-}
-function getLicensePaths() {
-	const paths = envPaths("ultrakit", { suffix: "" });
-	return {
-		dir: join(paths.data, "license"),
-		file: join(paths.data, "license", "license.json")
-	};
-}
-function toSign(payload) {
-	return [
-		payload.key,
-		payload.activationId,
-		payload.machineId,
-		payload.machineLabel,
-		payload.activatedAt,
-		payload.lastValidatedAt,
-		payload.nextCheckAt
-	].join("|");
-}
-function computeHmac(payload) {
-	return createHmac("sha256", LICENSE_HMAC_SECRET).update(toSign(payload), "utf8").digest("hex");
-}
-function getMachineId() {
-	return machineIdSync(false);
-}
-function getMachineLabel() {
-	return `${hostname()} (${platform()} ${release()})`;
-}
-function getLicenseFilePath() {
-	return getLicensePaths().file;
-}
-function readStoredLicense() {
-	const { file } = getLicensePaths();
-	if (!existsSync(file)) return null;
-	try {
-		const raw = readFileSync(file, "utf8");
-		const parsed = StoredLicenseSchema.safeParse(JSON.parse(raw));
-		if (!parsed.success) return null;
-		return parsed.data;
-	} catch {
-		return null;
-	}
-}
-function deleteStoredLicense() {
-	const { file } = getLicensePaths();
-	if (!existsSync(file)) return;
-	rmSync(file, { force: true });
-}
-function isLicenseBypassEnabled() {
-	return process.env.OCK_LICENSE_BYPASS === "1";
-}
-function isLicenseKeyFormatValid(key) {
-	return LICENSE_KEY_PATTERN.test(key.trim().toUpperCase());
-}
-function isStoredLicenseIntegrityValid(stored) {
-	return computeHmac({
-		key: stored.key,
-		activationId: stored.activationId,
-		machineId: stored.machineId,
-		machineLabel: stored.machineLabel,
-		activatedAt: stored.activatedAt,
-		lastValidatedAt: stored.lastValidatedAt,
-		nextCheckAt: stored.nextCheckAt
-	}) === stored.hmac;
-}
-function writeStoredLicense(payload) {
-	const { dir, file } = getLicensePaths();
-	mkdirSync(dir, { recursive: true });
-	const stored = {
-		...payload,
-		hmac: computeHmac(payload)
-	};
-	writeFileSync(file, `${JSON.stringify(stored, null, 2)}\n`, "utf8");
-	return stored;
-}
-async function postJson(path, body) {
-	let response;
-	try {
-		response = await fetch(`${LICENSE_API_BASE_URL}${path}`, {
-			method: "POST",
-			headers: { "content-type": "application/json" },
-			body: JSON.stringify(body),
-			signal: AbortSignal.timeout(LICENSE_REQUEST_TIMEOUT_MS)
-		});
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		throw new Error(`License server request failed: ${message}`);
-	}
-	let data;
-	try {
-		data = await response.json();
-	} catch {
-		throw new Error(`License server returned invalid JSON (${response.status})`);
-	}
-	if (!response.ok) throw new Error(data?.message || `License server request failed with status ${response.status}`);
-	return data;
-}
-async function activateLicenseKey(key) {
-	const normalizedKey = key.trim().toUpperCase();
-	const machineId = getMachineId();
-	const machineLabel = getMachineLabel();
-	const now = unixNow();
-	const data = await postJson("/v1/activate", {
-		key: normalizedKey,
-		machine_id: machineId,
-		machine_label: machineLabel
-	});
-	if (!data.ok || !data.activation_id) throw new Error(data.message || data.error || "License activation failed");
-	return writeStoredLicense({
-		key: normalizedKey,
-		activationId: data.activation_id,
-		machineId,
-		machineLabel,
-		activatedAt: now,
-		lastValidatedAt: now,
-		nextCheckAt: now + LICENSE_CHECK_INTERVAL_SECONDS
-	});
-}
-async function validateLicenseOnline(stored) {
-	if (getMachineId() !== stored.machineId) throw new Error("License key is activated on a different machine");
-	const data = await postJson("/v1/validate", {
-		key: stored.key,
-		activation_id: stored.activationId,
-		machine_id: stored.machineId
-	});
-	if (!data.ok) throw new Error(data.message || data.error || "License validation failed");
-	const now = unixNow();
-	writeStoredLicense({
-		key: stored.key,
-		activationId: stored.activationId,
-		machineId: stored.machineId,
-		machineLabel: stored.machineLabel,
-		activatedAt: stored.activatedAt,
-		lastValidatedAt: now,
-		nextCheckAt: now + LICENSE_CHECK_INTERVAL_SECONDS
-	});
-}
-async function deactivateCurrentLicense(stored) {
-	const data = await postJson("/v1/deactivate", {
-		key: stored.key,
-		activation_id: stored.activationId,
-		machine_id: stored.machineId
-	});
-	if (!data.ok) throw new Error(data.message || data.error || "License deactivation failed");
-	deleteStoredLicense();
-}
-async function requireValidLicense() {
-	if (isLicenseBypassEnabled()) return {
-		mode: "bypass",
-		stored: null
-	};
-	const stored = readStoredLicense();
-	if (!stored) throw new Error("License not activated. Run: uk activate <LICENSE_KEY>");
-	if (!isStoredLicenseIntegrityValid(stored)) throw new Error(`License file integrity check failed (${dirname(getLicenseFilePath())}). Re-activate with: uk activate <LICENSE_KEY>`);
-	if (stored.machineId !== getMachineId()) throw new Error("License is tied to a different machine. Run: uk activate <LICENSE_KEY>");
-	const now = unixNow();
-	if (stored.nextCheckAt > now) return {
-		mode: "active",
-		stored
-	};
-	try {
-		await validateLicenseOnline(stored);
-		return {
-			mode: "active",
-			stored: readStoredLicense()
-		};
-	} catch (error) {
-		if (now - stored.lastValidatedAt <= LICENSE_OFFLINE_GRACE_SECONDS) return {
-			mode: "offline-grace",
-			stored
-		};
-		const message = error instanceof Error ? error.message : String(error);
-		throw new Error(`License validation failed: ${message}`);
-	}
-}
-//#endregion
-//#region src/commands/activate.ts
-async function activateCommand(keyArg) {
-	p.intro(color.bgBlue(color.black(" License Activation ")));
-	let key = keyArg?.trim();
-	if (!key) {
-		const answer = await p.text({
-			message: "Enter your license key",
-			placeholder: "OCK-XXXX-XXXX-XXXX",
-			validate: (value) => {
-				if (!value) return "License key is required";
-				if (!isLicenseKeyFormatValid(value)) return "Invalid format. Expected OCK-XXXX-XXXX-XXXX";
-			}
-		});
-		if (p.isCancel(answer)) {
-			p.cancel("Cancelled");
-			return;
-		}
-		key = String(answer);
-	}
-	if (!isLicenseKeyFormatValid(key)) {
-		p.log.error("Invalid license key format. Expected OCK-XXXX-XXXX-XXXX");
-		return;
-	}
-	const spinner = p.spinner();
-	spinner.start("Activating license");
-	try {
-		const stored = await activateLicenseKey(key);
-		spinner.stop("License activated");
-		p.log.success(`Activated ${color.cyan(stored.key)}`);
-		p.log.info(`Stored at ${color.dim(getLicenseFilePath())}`);
-		p.outro(color.green("Activation complete"));
-	} catch (error) {
-		spinner.stop("Activation failed");
-		const message = error instanceof Error ? error.message : String(error);
-		p.log.error(message);
-	}
-}
+var version = "0.0.2";
 //#endregion
 //#region src/utils/errors.ts
 /**
@@ -332,11 +96,38 @@ const InitOptionsSchema = z.object({
 	global: z.boolean().optional().default(false),
 	free: z.boolean().optional().default(false),
 	recommend: z.boolean().optional().default(false),
+	providerProfile: z.enum([
+		"existing-global",
+		"opencode-zen",
+		"openai",
+		"ollama",
+		"wafer",
+		"github-copilot",
+		"custom-openai-compatible"
+	]).optional(),
+	mcpPreset: z.enum([
+		"minimal",
+		"recommended",
+		"power",
+		"local-first"
+	]).optional(),
+	webclawMode: z.enum([
+		"auto",
+		"disabled",
+		"host-binary",
+		"docker-existing"
+	]).optional().default("auto"),
+	withSuperpowers: 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)
+	projectOnly: z.boolean().optional().default(false),
+	variant: z.enum([
+		"full",
+		"minimal",
+		"dev"
+	]).optional().default("full")
 });
 const UpgradeOptionsSchema = z.object({
 	force: z.boolean().optional().default(false),
@@ -427,13 +218,17 @@ const CompletionShellSchema = z.enum([
 z.enum(["status", "doctor"]).optional();
 /**
 * Parse and validate command options with Zod.
-* Returns validated options or logs error and returns defaults.
+* Returns validated options, defaults when provided, or throws on invalid input.
 */
 function parseOptions(schema, options, defaults) {
 	const result = schema.safeParse(options);
 	if (result.success) return result.data;
 	if (process.env.DEBUG) console.error("[Schema validation failed]", result.error.format());
-	return defaults ?? schema.parse({});
+	if (defaults !== void 0) return defaults;
+	const message = result.error.issues.map((issue) => {
+		return `${issue.path.join(".") || "options"}: ${issue.message}`;
+	}).join("; ");
+	throw new Error(`Invalid command options: ${message}`);
 }
 /**
 * Validate action parameter against allowed actions.
@@ -1027,7 +822,7 @@ _uk_completion() {
             return 0
             ;;
         init)
-            COMPREPLY=( $(compgen -W "--force" -- "\${cur}") )
+            COMPREPLY=( $(compgen -W "--force --beads --global --free --recommend --yes --backup --prune --prune-all --project-only --with-superpowers" -- "\${cur}") )
             return 0
             ;;
         upgrade)
@@ -1090,7 +885,18 @@ _uk() {
             _describe -t actions 'config action' config_actions
             ;;
         init)
-            _arguments '--force[Reinitialize even if already exists]'
+            _arguments \\
+                '--force[Reinitialize even if already exists]' \\
+                '--beads[Also initialize .beads/ for multi-agent coordination]' \\
+                '--global[Install to global OpenCode config]' \\
+                '--free[Use free models]' \\
+                '--recommend[Use recommended premium models]' \\
+                '--yes[Skip prompts, use defaults]' \\
+                '--backup[Backup existing .opencode before overwriting]' \\
+                '--prune[Manually select orphan files to delete]' \\
+                '--prune-all[Auto-delete all orphan files]' \\
+                '--project-only[Only init project-scope files]' \\
+                '--with-superpowers[Enable upstream Superpowers plugin]'
             ;;
         upgrade)
             _arguments \\
@@ -1133,6 +939,16 @@ complete -c uk -n "__fish_seen_subcommand_from config" -a "show" -d "View config
 
 # init options
 complete -c uk -n "__fish_seen_subcommand_from init" -l force -d "Reinitialize"
+complete -c uk -n "__fish_seen_subcommand_from init" -l beads -d "Initialize .beads"
+complete -c uk -n "__fish_seen_subcommand_from init" -l global -d "Install global config"
+complete -c uk -n "__fish_seen_subcommand_from init" -l free -d "Use free models"
+complete -c uk -n "__fish_seen_subcommand_from init" -l recommend -d "Use recommended models"
+complete -c uk -n "__fish_seen_subcommand_from init" -l yes -d "Skip prompts"
+complete -c uk -n "__fish_seen_subcommand_from init" -l backup -d "Backup existing config"
+complete -c uk -n "__fish_seen_subcommand_from init" -l prune -d "Select orphan files to delete"
+complete -c uk -n "__fish_seen_subcommand_from init" -l prune-all -d "Delete all orphan files"
+complete -c uk -n "__fish_seen_subcommand_from init" -l project-only -d "Only init project-scope files"
+complete -c uk -n "__fish_seen_subcommand_from init" -l with-superpowers -d "Enable upstream Superpowers plugin"
 
 # upgrade options
 complete -c uk -n "__fish_seen_subcommand_from upgrade" -l force -d "Force upgrade"
@@ -1233,7 +1049,7 @@ async function configCommand(action) {
 	if (!opencodePath) return;
 	const configPath = join(opencodePath, "opencode.json");
 	if (!existsSync(configPath)) {
-		showError("opencode.json not found", "ock init --force");
+		showError("opencode.json not found", "uk init --force");
 		return;
 	}
 	if (!action) {
@@ -2699,6 +2515,13 @@ function buildManifestFromDir(dir, skipDirs = [
 }
 /**
 * Generate and save a template manifest after installation.
+*
+* IMPORTANT: This must be called BEFORE restoreUserFiles() in init.ts.
+* Preserved user files (opencode.json, .env, memory/project/*) are restored
+* AFTER manifest generation, so they are NOT included in the manifest. This
+* means upgrade treats them as "unknown" (user-owned) rather than template-managed,
+* which is the correct behavior — user files should never be overwritten by
+* template upgrades.
 */
 function generateManifest(opencodeDir, version) {
 	const manifest = {
@@ -2747,6 +2570,7 @@ function fileModificationStatus(filePath, relativePath, manifest) {
 const PATCHES_DIR = "patches";
 const PATCHES_JSON = ".patches.json";
 const METADATA_VERSION = "1.0.0";
+const TEMPLATE_SOURCE_DIR$3 = "opencode";
 /**
 * Calculate SHA-256 hash of content.
 */
@@ -2773,13 +2597,10 @@ function getTemplateRoot$2() {
 	const __dirname = dirname(fileURLToPath(import.meta.url));
 	const possiblePaths = [
 		join(__dirname, "template"),
-		join(__dirname, "..", "..", ".opencode"),
+		join(__dirname, "..", "..", "template"),
 		join(__dirname, "..", "template")
 	];
-	for (const path of possiblePaths) {
-		if (existsSync(join(path, ".opencode"))) return path;
-		if (existsSync(join(path, "opencode.json"))) return dirname(path);
-	}
+	for (const path of possiblePaths) if (existsSync(join(path, TEMPLATE_SOURCE_DIR$3))) return path;
 	return null;
 }
 /**
@@ -2856,10 +2677,7 @@ function removePatch(opencodeDir, relativePath) {
 	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);
-	}
+	if (existsSync(patchPath)) rmSync(patchPath);
 	delete metadata.patches[relativePath];
 	savePatchMetadata(opencodeDir, metadata);
 	return true;
@@ -2946,7 +2764,7 @@ function checkPatchStatus(opencodeDir, templateRoot) {
 			continue;
 		}
 		if (templateRoot) {
-			const templateFilePath = join(templateRoot, ".opencode", relativePath);
+			const templateFilePath = join(templateRoot, TEMPLATE_SOURCE_DIR$3, relativePath);
 			if (existsSync(templateFilePath)) {
 				const templateContent = readFileSync(templateFilePath, "utf-8");
 				if (calculateHash(templateContent) !== entry.originalHash) {
@@ -2983,6 +2801,138 @@ function checkPatchStatus(opencodeDir, templateRoot) {
 	return statuses;
 }
 //#endregion
+//#region src/utils/variants.ts
+/**
+* Variant presets.
+*
+* - "full": Current behavior — all agents, commands, skills, tools.
+* - "minimal": Core agents + essential commands + no skills.
+* - "dev": Full dev workflow — all agents + dev commands + core skills.
+*/
+const VARIANT_PRESETS = {
+	full: {
+		agents: [],
+		commands: [],
+		skills: [],
+		tools: []
+	},
+	minimal: {
+		agents: [
+			"build",
+			"general",
+			"explore"
+		],
+		commands: [
+			"lfg",
+			"ship",
+			"plan",
+			"init",
+			"init-user",
+			"status"
+		],
+		skills: [],
+		tools: ["context7"]
+	},
+	dev: {
+		agents: [
+			"build",
+			"plan",
+			"review",
+			"verify",
+			"debugger",
+			"explore",
+			"general"
+		],
+		commands: [
+			"lfg",
+			"compound",
+			"create",
+			"ship",
+			"plan",
+			"resume",
+			"handoff",
+			"pr",
+			"review-codebase",
+			"research",
+			"explore",
+			"health",
+			"curate",
+			"iterate",
+			"verify",
+			"status",
+			"init",
+			"init-user",
+			"init-context",
+			"init-deep"
+		],
+		skills: [
+			"beads",
+			"brainstorming",
+			"code-search-patterns",
+			"context-engineering",
+			"context-management",
+			"deep-research",
+			"incremental-implementation",
+			"index-knowledge",
+			"memory-grounding",
+			"memory-system",
+			"prompt-leverage",
+			"skill-creator",
+			"structured-edit",
+			"subagent-driven-development",
+			"swarm-coordination",
+			"systematic-debugging",
+			"test-driven-development",
+			"testing-anti-patterns",
+			"verification-before-completion",
+			"verification-gates",
+			"writing-plans",
+			"executing-plans",
+			"code-simplification",
+			"react-best-practices",
+			"security-and-hardening",
+			"defense-in-depth",
+			"opensrc",
+			"agent-evals",
+			"requesting-code-review",
+			"receiving-code-review",
+			"finishing-a-development-branch",
+			"using-git-worktrees"
+		],
+		tools: ["context7", "grepsearch"]
+	}
+};
+/**
+* Check if a variant is "full" (no filtering needed).
+*/
+function isFullVariant(variant) {
+	return variant === "full";
+}
+/**
+* Get the filter for a variant name.
+* Returns the "full" filter (no filtering) for unknown variants.
+*/
+function getVariantFilter(variant) {
+	return VARIANT_PRESETS[variant] ?? VARIANT_PRESETS.full;
+}
+/**
+* Check if a file should be included given a variant filter.
+* If the filter list is empty, all files are included (full variant).
+*/
+function shouldIncludeFile(filename, filterList, extension) {
+	if (filterList.length === 0) return true;
+	const nameWithoutExt = filename.endsWith(extension) ? filename.slice(0, -extension.length) : filename;
+	return filterList.includes(nameWithoutExt);
+}
+/**
+* Check if a directory should be included given a variant filter.
+* If the filter list is empty, all directories are included (full variant).
+*/
+function shouldIncludeDir(dirname, filterList) {
+	if (filterList.length === 0) return true;
+	return filterList.includes(dirname);
+}
+//#endregion
 //#region src/commands/init.ts
 const EXCLUDED_DIRS = [
 	"node_modules",
@@ -3000,12 +2950,14 @@ const EXCLUDED_FILES = [
 	"pnpm-lock.yaml"
 ];
 const PRESERVE_USER_DIRS = ["memory/project", "context"];
+const PRESERVE_USER_FILES = [".env", "opencode.json"];
 const SHARED_CONFIG_DIRS = [
 	"agent",
 	"command",
 	"skill",
 	"tool"
 ];
+const TEMPLATE_SOURCE_DIR$2 = "opencode";
 /**
 * Detect if global config has any of the shared dirs populated.
 * Returns null if no global config or no shared dirs found.
@@ -3046,8 +2998,8 @@ function detectMode(targetDir) {
 }
 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;
+	const possiblePaths = [join(__dirname, "template"), join(__dirname, "..", "..", "template")];
+	for (const path of possiblePaths) if (existsSync(join(path, TEMPLATE_SOURCE_DIR$2))) return path;
 	return null;
 }
 function getPackageVersion$1() {
@@ -3071,28 +3023,69 @@ async function copyDir(src, dest) {
 		else writeFileSync(destPath, readFileSync(srcPath, "utf-8"));
 	}
 }
-async function copyOpenCodeOnly(templateRoot, targetDir, skipDirs) {
-	const opencodeSrc = join(templateRoot, ".opencode");
+/**
+* Copy a directory, but only include entries whose names (minus extension)
+* appear in the filterList. If filterList is empty, copy everything (full variant).
+* For skill directories, each entry is a subdirectory (e.g., "beads/", "cloudflare/"),
+* so we check directory names against the filterList.
+*/
+async function copyFilteredDir(src, dest, filterList, extension) {
+	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()) if (extension === "") {
+			if (shouldIncludeDir(entry.name, filterList)) await copyDir(srcPath, destPath);
+		} else await copyDir(srcPath, destPath);
+		else if (shouldIncludeFile(entry.name, filterList, extension)) writeFileSync(destPath, readFileSync(srcPath, "utf-8"));
+	}
+}
+async function copyOpenCodeOnly(templateRoot, targetDir, skipDirs, variant) {
+	const opencodeSrc = join(templateRoot, TEMPLATE_SOURCE_DIR$2);
 	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"));
-		}
+	const isFullCopy = !skipDirs?.length && (!variant || variant.agents.length === 0 && variant.commands.length === 0 && variant.skills.length === 0 && variant.tools.length === 0);
+	const effectiveVariant = variant ?? getVariantFilter("full");
+	if (isFullCopy && (!effectiveVariant || effectiveVariant.agents.length === 0 && effectiveVariant.commands.length === 0 && effectiveVariant.skills.length === 0 && effectiveVariant.tools.length === 0)) {
+		await copyDir(opencodeSrc, opencodeDest);
 		return true;
 	}
-	await copyDir(opencodeSrc, opencodeDest);
+	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()) if (entry.name === "agent") await copyFilteredDir(srcPath, destPath, effectiveVariant.agents, ".md");
+		else if (entry.name === "command") await copyFilteredDir(srcPath, destPath, effectiveVariant.commands, ".md");
+		else if (entry.name === "skill") await copyFilteredDir(srcPath, destPath, effectiveVariant.skills, "");
+		else if (entry.name === "tool") await copyFilteredDir(srcPath, destPath, effectiveVariant.tools, ".ts");
+		else await copyDir(srcPath, destPath);
+		else writeFileSync(destPath, readFileSync(srcPath, "utf-8"));
+	}
 	return true;
 }
+const TEMPLATE_AGENT_NAMES = [
+	"build",
+	"plan",
+	"review",
+	"verify",
+	"debugger",
+	"explore",
+	"general",
+	"vision",
+	"scout",
+	"painter"
+];
+function allAgentModels(model) {
+	return Object.fromEntries(TEMPLATE_AGENT_NAMES.map((agent) => [agent, model]));
+}
 const MODEL_PRESETS = {
 	free: {
 		model: "opencode/glm-5-free",
@@ -3100,6 +3093,8 @@ const MODEL_PRESETS = {
 			build: "opencode/minimax-m2.5-free",
 			plan: "opencode/minimax-m2.5-free",
 			review: "opencode/minimax-m2.5-free",
+			verify: "opencode/minimax-m2.5-free",
+			debugger: "opencode/minimax-m2.5-free",
 			explore: "opencode/glm-5-free",
 			general: "opencode/glm-5-free",
 			vision: "opencode/minimax-m2.5-free",
@@ -3113,14 +3108,232 @@ const MODEL_PRESETS = {
 			build: "github-copilot/gpt-5.4",
 			plan: "github-copilot/gpt-5.4",
 			review: "github-copilot/gpt-5.3-codex",
+			verify: "github-copilot/gpt-5.3-codex",
+			debugger: "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"
+			painter: "github-copilot/gemini-3.1-pro-preview"
 		}
 	}
 };
+const PROVIDER_PROFILES = {
+	"existing-global": {},
+	"opencode-zen": {
+		model: "opencode/big-pickle",
+		smallModel: "opencode/big-pickle",
+		agents: allAgentModels("opencode/big-pickle")
+	},
+	openai: {
+		model: "openai/gpt-5.1",
+		smallModel: "openai/gpt-5.1-mini",
+		agents: allAgentModels("openai/gpt-5.1")
+	},
+	ollama: {
+		model: "ollama/qwen3-coder:latest",
+		smallModel: "ollama/qwen3-coder:latest",
+		agents: allAgentModels("ollama/qwen3-coder:latest"),
+		provider: { ollama: {
+			npm: "@ai-sdk/openai-compatible",
+			name: "Ollama",
+			options: { baseURL: "http://localhost:11434/v1" },
+			models: {
+				"qwen3-coder:latest": { tool_call: true },
+				"llama3.3:latest": { tool_call: true }
+			}
+		} }
+	},
+	wafer: {
+		model: "wafer/GLM-5.1",
+		smallModel: "wafer/MiniMax-M2.7",
+		agents: allAgentModels("wafer/GLM-5.1")
+	},
+	"github-copilot": {
+		model: MODEL_PRESETS.recommend.model,
+		smallModel: "github-copilot/gpt-5.3-codex",
+		agents: MODEL_PRESETS.recommend.agents
+	},
+	"custom-openai-compatible": {
+		model: "custom/default-model",
+		smallModel: "custom/small-model",
+		agents: allAgentModels("custom/default-model"),
+		provider: { custom: {
+			npm: "@ai-sdk/openai-compatible",
+			name: "Custom OpenAI-compatible",
+			options: {
+				baseURL: "{env:CUSTOM_OPENAI_BASE_URL}",
+				apiKey: "{env:CUSTOM_OPENAI_API_KEY}"
+			},
+			models: {
+				"default-model": { tool_call: true },
+				"small-model": { tool_call: true }
+			}
+		} }
+	}
+};
+const PROFILE_PROVIDER_KEYS = new Set([
+	"github-copilot",
+	"opencode",
+	"openai",
+	"ollama",
+	"wafer",
+	"custom"
+]);
+const PROVIDER_PROFILE_OPTIONS = [
+	{
+		value: "existing-global",
+		label: "Existing global config",
+		hint: "use your global OpenCode config, no model changes"
+	},
+	{
+		value: "opencode-zen",
+		label: "OpenCode Zen",
+		hint: "curated models, /connect required"
+	},
+	{
+		value: "openai",
+		label: "OpenAI",
+		hint: "GPT models, /connect or API key"
+	},
+	{
+		value: "ollama",
+		label: "Ollama",
+		hint: "local models, no API key needed"
+	},
+	{
+		value: "wafer",
+		label: "Wafer",
+		hint: "GLM models, /connect or API key"
+	},
+	{
+		value: "github-copilot",
+		label: "GitHub Copilot",
+		hint: "OAuth device flow, subscription required"
+	},
+	{
+		value: "custom-openai-compatible",
+		label: "Custom OpenAI-compatible",
+		hint: "any OpenAI-compatible server"
+	},
+	{
+		value: "custom",
+		label: "Custom",
+		hint: "configure each agent individually"
+	},
+	{
+		value: "skip",
+		label: "Skip",
+		hint: "keep template defaults"
+	}
+];
+function applyModelProfileToConfig(config, profile) {
+	const profileConfig = PROVIDER_PROFILES[profile];
+	if (!profileConfig) return;
+	if (profile === "existing-global") {
+		delete config.model;
+		delete config.small_model;
+		if (config.provider && typeof config.provider === "object") {
+			for (const providerKey of PROFILE_PROVIDER_KEYS) delete config.provider[providerKey];
+			if (Object.keys(config.provider).length === 0) delete config.provider;
+		}
+		if (config.agent && typeof config.agent === "object") for (const agent of Object.values(config.agent)) delete agent.model;
+		return;
+	}
+	if (profileConfig.provider) config.provider = {
+		...config.provider,
+		...profileConfig.provider
+	};
+	const currentProviderKey = profileConfig.provider && typeof profileConfig.provider === "object" ? Object.keys(profileConfig.provider)[0] : profile === "github-copilot" ? "github-copilot" : profile === "opencode-zen" ? "opencode" : profile === "openai" ? "openai" : void 0;
+	if (config.provider && typeof config.provider === "object") {
+		for (const providerKey of PROFILE_PROVIDER_KEYS) if (providerKey !== currentProviderKey) delete config.provider[providerKey];
+	}
+	if (profileConfig.model) config.model = profileConfig.model;
+	if (profileConfig.smallModel) config.small_model = profileConfig.smallModel;
+	if (profileConfig.agents) {
+		config.agent = getRecord(config.agent);
+		for (const [agentName, model] of Object.entries(profileConfig.agents)) config.agent[agentName] = {
+			...getRecord(config.agent[agentName]),
+			model
+		};
+	}
+}
+function applyProviderProfileAtConfigPath(configPath, profile) {
+	if (!existsSync(configPath)) return;
+	const config = JSON.parse(readFileSync(configPath, "utf-8"));
+	applyModelProfileToConfig(config, profile);
+	writeFileSync(configPath, JSON.stringify(config, null, 2));
+}
+function getRecord(value) {
+	return value && typeof value === "object" && !Array.isArray(value) ? { ...value } : {};
+}
+function withMcpDefaults(existing, defaults) {
+	const existingRecord = getRecord(existing);
+	return {
+		...defaults,
+		...existingRecord,
+		type: defaults.type,
+		enabled: defaults.enabled
+	};
+}
+function applyProviderProfile(targetDir, profile) {
+	applyProviderProfileAtConfigPath(join(targetDir, ".opencode", "opencode.json"), profile);
+}
+function applyMcpPresetAtConfigPath(configPath, preset, webclawMode = "auto") {
+	if (!existsSync(configPath)) return;
+	const config = JSON.parse(readFileSync(configPath, "utf-8"));
+	const mcp = { ...config.mcp };
+	const context7Enabled = preset !== "minimal" && preset !== "local-first";
+	const tilthEnabled = preset !== "minimal";
+	const tilthThreads = preset === "power" ? "16" : "8";
+	const defaultTimeout = preset === "power" ? 18e4 : 12e4;
+	mcp.context7 = withMcpDefaults(mcp.context7, {
+		type: "local",
+		command: [
+			"npx",
+			"-y",
+			"@upstash/context7-mcp"
+		],
+		enabled: context7Enabled,
+		timeout: defaultTimeout
+	});
+	const existingTilth = getRecord(mcp.tilth);
+	mcp.tilth = withMcpDefaults(existingTilth, {
+		type: "local",
+		command: [
+			"npx",
+			"-y",
+			"tilth",
+			"--mcp",
+			"--edit"
+		],
+		enabled: tilthEnabled,
+		timeout: defaultTimeout,
+		environment: {
+			TILTH_THREADS: tilthThreads,
+			...getRecord(existingTilth.environment)
+		}
+	});
+	const effectiveWebclawMode = webclawMode === "auto" ? preset === "recommended" || preset === "power" ? "host-binary" : "disabled" : webclawMode;
+	const webclawCommand = effectiveWebclawMode === "docker-existing" ? [
+		"docker",
+		"exec",
+		"-i",
+		"webclaw-api",
+		"webclaw-mcp"
+	] : ["webclaw-mcp"];
+	mcp.webclaw = withMcpDefaults(mcp.webclaw, {
+		type: "local",
+		command: webclawCommand,
+		enabled: effectiveWebclawMode !== "disabled" && preset !== "minimal",
+		timeout: defaultTimeout
+	});
+	config.mcp = mcp;
+	writeFileSync(configPath, JSON.stringify(config, null, 2));
+}
+function applyMcpPreset(targetDir, preset, webclawMode = "auto") {
+	applyMcpPresetAtConfigPath(join(targetDir, ".opencode", "opencode.json"), preset, webclawMode);
+}
 function applyModelPreset(targetDir, preset) {
 	const configPath = join(targetDir, ".opencode", "opencode.json");
 	if (!existsSync(configPath)) return;
@@ -3132,26 +3345,49 @@ function applyModelPreset(targetDir, preset) {
 	}
 	writeFileSync(configPath, JSON.stringify(config, null, 2));
 }
+const SUPERPOWERS_PLUGIN = "superpowers@git+https://github.com/obra/superpowers.git#v5.1.0";
+function addPluginToConfig(config, plugin) {
+	const existingPlugins = config.plugin;
+	if (existingPlugins === void 0) return {
+		...config,
+		plugin: [plugin]
+	};
+	if (!Array.isArray(existingPlugins) || existingPlugins.some((existingPlugin) => typeof existingPlugin !== "string")) throw new Error("Invalid opencode.json: plugin must be an array of strings");
+	if (existingPlugins.includes(plugin)) return config;
+	return {
+		...config,
+		plugin: [...existingPlugins, plugin]
+	};
+}
+function enableSuperpowersPluginAtConfigPath(configPath) {
+	if (!existsSync(configPath)) return;
+	const updatedConfig = addPluginToConfig(JSON.parse(readFileSync(configPath, "utf-8")), SUPERPOWERS_PLUGIN);
+	writeFileSync(configPath, JSON.stringify(updatedConfig, null, 2));
+}
+function enableSuperpowersPlugin(targetDir) {
+	enableSuperpowersPluginAtConfigPath(join(targetDir, ".opencode", "opencode.json"));
+}
 const AGENT_DESCRIPTIONS = {
 	build: "Main coding agent (complex tasks)",
 	plan: "Planning and design agent",
-	review: "Code review and debugging",
+	review: "Correctness and security review",
+	verify: "Goal verification and completion checks",
+	debugger: "Root-cause debugging and fix paths",
 	explore: "Fast codebase search",
 	general: "Quick, simple tasks",
 	painter: "Image generation and editing",
 	vision: "Visual analysis (quality)",
-	scout: "External research/docs",
-	compaction: "Context summarization"
+	scout: "External research/docs"
 };
 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("Enter model IDs (e.g., opencode/big-pickle, openai/gpt-5.1, ollama/qwen3-coder:latest)"));
 	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",
+		placeholder: config.model || "opencode/big-pickle",
 		defaultValue: config.model
 	});
 	if (p.isCancel(mainModel)) {
@@ -3195,7 +3431,7 @@ function backupOpenCode(targetDir) {
 	return backupDir;
 }
 function getTemplateFiles(templateRoot) {
-	const opencodeSrc = join(templateRoot, ".opencode");
+	const opencodeSrc = join(templateRoot, TEMPLATE_SOURCE_DIR$2);
 	if (!existsSync(opencodeSrc)) return /* @__PURE__ */ new Set();
 	return new Set(getAffectedFiles(opencodeSrc));
 }
@@ -3209,7 +3445,7 @@ function findOrphans(targetDir, templateFiles) {
 * Returns the template content if it's a modified template file, null otherwise.
 */
 function getModifiedTemplateContent(templateRoot, orphanPath) {
-	const templateFilePath = join(templateRoot, ".opencode", orphanPath);
+	const templateFilePath = join(templateRoot, TEMPLATE_SOURCE_DIR$2, orphanPath);
 	if (!existsSync(templateFilePath)) return null;
 	return readFileSync(templateFilePath, "utf-8");
 }
@@ -3268,6 +3504,11 @@ function preserveUserFiles(targetDir) {
 		if (!existsSync(dirPath)) continue;
 		collectFiles(dirPath, relDir);
 	}
+	for (const relativePath of PRESERVE_USER_FILES) {
+		const filePath = join(opencodeDir, relativePath);
+		if (!existsSync(filePath)) continue;
+		preserved.set(relativePath, readFileSync(filePath, "utf-8"));
+	}
 	return preserved;
 }
 /**
@@ -3311,14 +3552,31 @@ async function initCommand(rawOptions = {}) {
 		}
 		const s = p.spinner();
 		s.start("Copying to global config");
-		const opencodeSrc = join(templateRoot, ".opencode");
+		const opencodeSrc = join(templateRoot, TEMPLATE_SOURCE_DIR$2);
 		if (!existsSync(opencodeSrc)) {
 			s.stop("Failed");
-			p.log.error("Template .opencode/ not found");
+			p.log.error("Template opencode bundle not found");
 			p.outro(color.red("Failed"));
 			process.exit(1);
 		}
 		await copyDir(opencodeSrc, globalDir);
+		const globalConfigPath = join(globalDir, "opencode.json");
+		if (options.providerProfile === "existing-global") {
+			s.stop("Failed");
+			p.log.error("--provider-profile existing-global cannot be used with --global because global config cannot inherit model defaults");
+			p.outro(color.red("Failed"));
+			process.exit(1);
+		}
+		if (options.providerProfile) {
+			if (options.free || options.recommend) p.log.warn("--provider-profile takes precedence over --free/--recommend model presets");
+			applyProviderProfileAtConfigPath(globalConfigPath, options.providerProfile);
+			p.log.info(`Applied provider profile: ${options.providerProfile}`);
+		}
+		if (options.mcpPreset) {
+			applyMcpPresetAtConfigPath(globalConfigPath, options.mcpPreset, options.webclawMode);
+			p.log.info(`Applied MCP preset: ${options.mcpPreset}`);
+		}
+		if (options.withSuperpowers) enableSuperpowersPluginAtConfigPath(globalConfigPath);
 		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!"));
@@ -3403,65 +3661,65 @@ async function initCommand(rawOptions = {}) {
 		} 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();
+	const variantName = options.variant ?? "full";
+	const variantFilter = getVariantFilter(variantName);
 	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)) {
+	if (!await copyOpenCodeOnly(templateRoot, targetDir, skipDirs, variantFilter)) {
 		s.stop("Failed");
 		p.outro(color.red("Template copy failed"));
 		process.exit(1);
 	}
 	s.stop("Done");
+	if (!isFullVariant(variantName)) {
+		const counts = {
+			agents: variantFilter.agents.length || "all",
+			commands: variantFilter.commands.length || "all",
+			skills: variantFilter.skills.length || "all"
+		};
+		p.log.info(`Variant: ${color.bold(variantName)} — agents: ${counts.agents}, commands: ${counts.commands}, skills: ${counts.skills}`);
+	}
 	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) {
+	if (options.providerProfile) {
+		if (options.free || options.recommend) p.log.warn("--provider-profile takes precedence over --free/--recommend model presets");
+		applyProviderProfile(targetDir, options.providerProfile);
+		p.log.info(`Applied provider profile: ${options.providerProfile}`);
+	} else 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)");
+		applyProviderProfile(targetDir, "existing-global");
+		p.log.info("Applied existing-global provider profile (default for CI)");
 	} 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"
-				}
-			]
+		const selection = await p.select({
+			message: "Choose provider profile",
+			options: PROVIDER_PROFILE_OPTIONS
 		});
-		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`);
-			}
+		if (!p.isCancel(selection)) if (selection === "custom") {
+			await promptCustomModels(targetDir);
+			p.log.info("Applied custom model configuration");
+		} else if (selection === "skip") p.log.info("Keeping template defaults");
+		else {
+			applyProviderProfile(targetDir, selection);
+			p.log.info(`Applied provider profile: ${selection}`);
 		}
 	}
+	if (options.mcpPreset) {
+		applyMcpPreset(targetDir, options.mcpPreset, options.webclawMode);
+		p.log.info(`Applied MCP preset: ${options.mcpPreset}`);
+	}
+	if (options.withSuperpowers) {
+		enableSuperpowersPlugin(targetDir);
+		p.log.info("Enabled upstream Superpowers plugin");
+	}
 	if (options.beads) {
 		const beadsDir = join(targetDir, ".beads");
 		if (!existsSync(beadsDir)) {
@@ -3579,76 +3837,126 @@ async function initCommand(rawOptions = {}) {
 	p.outro(color.green("Ready to code!"));
 }
 //#endregion
-//#region src/commands/license.ts
-async function licenseCommand(action) {
-	const mode = (action ?? "status").trim();
-	if (mode === "status") {
-		await showLicenseStatus();
-		return;
-	}
-	if (mode === "deactivate") {
-		await deactivateLicense();
-		return;
-	}
-	p.log.error(`Unknown action: ${mode}`);
-	p.log.info(`Available: ${color.cyan("status")}, ${color.cyan("deactivate")}`);
+//#region src/utils/jsonc.ts
+/**
+* Parse a JSONC string into a JavaScript value.
+*
+* @param input - JSONC string (may contain // comments, block comments, and trailing commas)
+* @returns Parsed value
+* @throws SyntaxError if the result is not valid JSON after stripping
+*/
+function parseJsonc(input) {
+	const stripped = stripJsonc(input);
+	return JSON.parse(stripped);
 }
-async function showLicenseStatus() {
-	const stored = readStoredLicense();
-	if (!stored) {
-		p.log.warn("No license is currently activated");
-		p.log.info(`Run ${color.cyan("uk activate <LICENSE_KEY>")}`);
-		return;
-	}
-	p.log.info(color.bold("License Status"));
-	console.log(`  key:          ${color.cyan(stored.key)}`);
-	console.log(`  activation:   ${stored.activationId}`);
-	console.log(`  machine:      ${stored.machineLabel}`);
-	console.log(`  last check:   ${(/* @__PURE__ */ new Date(stored.lastValidatedAt * 1e3)).toISOString()}`);
-	console.log(`  next check:   ${(/* @__PURE__ */ new Date(stored.nextCheckAt * 1e3)).toISOString()}`);
-	console.log(`  file:         ${color.dim(getLicenseFilePath())}`);
-	const spinner = p.spinner();
-	spinner.start("Verifying with license server");
-	try {
-		await validateLicenseOnline(stored);
-		spinner.stop("License is valid");
-	} catch (error) {
-		spinner.stop("Validation failed");
-		const message = error instanceof Error ? error.message : String(error);
-		p.log.warn(message);
-	}
-}
-async function deactivateLicense() {
-	const stored = readStoredLicense();
-	if (!stored) {
-		p.log.warn("No license is currently activated");
-		return;
+/**
+* Strip JSONC extensions from a string, producing valid JSON.
+*
+* 1. Removes single-line comments (// ... until EOL)
+* 2. Removes block comments (/* ... *​/)
+* 3. Removes trailing commas before } or ]
+*
+* Handles edge cases:
+* - Comments inside strings are preserved
+* - Escaped quotes inside strings don't break parsing
+* - Nested brackets/braces are tracked correctly
+*/
+function stripJsonc(input) {
+	let result = "";
+	let i = 0;
+	const len = input.length;
+	while (i < len) {
+		const ch = input[i];
+		if (ch === "\"") {
+			result += ch;
+			i++;
+			while (i < len) {
+				const s = input[i];
+				result += s;
+				i++;
+				if (s === "\\") {
+					if (i < len) {
+						result += input[i];
+						i++;
+					}
+				} else if (s === "\"") break;
+			}
+			continue;
+		}
+		if (ch === "/" && i + 1 < len && input[i + 1] === "/") {
+			i += 2;
+			while (i < len && input[i] !== "\n") i++;
+			continue;
+		}
+		if (ch === "/" && i + 1 < len && input[i + 1] === "*") {
+			i += 2;
+			while (i + 1 < len && !(input[i] === "*" && input[i + 1] === "/")) {
+				if (input[i] === "\n") result += "\n";
+				i++;
+			}
+			if (i + 1 < len && input[i] === "*" && input[i + 1] === "/") i += 2;
+			else i = len;
+			continue;
+		}
+		result += ch;
+		i++;
 	}
-	const confirm = await p.confirm({
-		message: `Deactivate license ${stored.key} on this machine?`,
-		initialValue: false
-	});
-	if (p.isCancel(confirm) || !confirm) {
-		p.cancel("Cancelled");
-		return;
+	return stripTrailingCommas(result);
+}
+/**
+* Remove trailing commas before closing } or ].
+* Works on the already-comment-stripped string.
+*/
+function stripTrailingCommas(input) {
+	let result = "";
+	let i = 0;
+	const len = input.length;
+	while (i < len) {
+		const ch = input[i];
+		if (ch === "\"") {
+			result += ch;
+			i++;
+			while (i < len) {
+				const s = input[i];
+				result += s;
+				i++;
+				if (s === "\\") {
+					if (i < len) {
+						result += input[i];
+						i++;
+					}
+				} else if (s === "\"") break;
+			}
+			continue;
+		}
+		if (ch === ",") {
+			let j = i + 1;
+			while (j < len && /\s/.test(input[j])) j++;
+			if (j < len && (input[j] === "}" || input[j] === "]")) {
+				i++;
+				continue;
+			}
+		}
+		result += ch;
+		i++;
 	}
-	const spinner = p.spinner();
-	spinner.start("Deactivating license");
+	return result;
+}
+/**
+* Validate a JSONC string, returning any parse errors.
+*
+* @param input - JSONC string
+* @returns { valid: true } or { valid: false, error: string }
+*/
+function validateJsonc(input) {
 	try {
-		await deactivateCurrentLicense(stored);
-		spinner.stop("License deactivated");
-		p.outro(color.green("This machine no longer uses the license"));
-	} catch (error) {
-		spinner.stop("Deactivation failed");
-		const message = error instanceof Error ? error.message : String(error);
-		p.log.warn(`Remote deactivation failed: ${message}`);
-		const retry = await p.confirm({
-			message: "Remove local license file anyway?",
-			initialValue: false
-		});
-		if (p.isCancel(retry) || !retry) return;
-		deleteStoredLicense();
-		p.log.info(`Removed local license at ${color.dim(getLicenseFilePath())}`);
+		parseJsonc(input);
+		return { valid: true };
+	} catch (err) {
+		return {
+			valid: false,
+			error: err instanceof Error ? err.message : String(err)
+		};
 	}
 }
 //#endregion
@@ -3933,10 +4241,11 @@ const SKIP_DIRS = [
 	"dist",
 	"coverage"
 ];
+const TEMPLATE_SOURCE_DIR$1 = "opencode";
 function getTemplateRoot() {
 	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;
+	const possiblePaths = [join(__dirname, "template"), join(__dirname, "..", "..", "template")];
+	for (const path of possiblePaths) if (existsSync(join(path, TEMPLATE_SOURCE_DIR$1))) return path;
 	return null;
 }
 function getCurrentVersion(opencodeDir) {
@@ -4080,9 +4389,9 @@ async function upgradeCommand(rawOptions = {}) {
 		showError("Template not found", "Reinstall ultrakit");
 		return;
 	}
-	const templateOpencode = join(templateRoot, ".opencode");
+	const templateOpencode = join(templateRoot, TEMPLATE_SOURCE_DIR$1);
 	if (!existsSync(templateOpencode)) {
-		showError("Template .opencode not found");
+		showError("Template opencode bundle not found");
 		return;
 	}
 	if (!options.force) {
@@ -4279,7 +4588,8 @@ const KNOWN_CONFIG_PROPERTIES = new Set([
 ]);
 async function doctorCommand() {
 	if (process.argv.includes("--quiet")) return;
-	const opencodeDir = join(process.cwd(), ".opencode");
+	const cwd = process.cwd();
+	const opencodeDir = join(cwd, ".opencode");
 	p.intro(color.bgBlue(color.white(" Doctor - Health Check ")));
 	const checks = [];
 	const warnings = [];
@@ -4461,6 +4771,138 @@ async function doctorCommand() {
 	});
 	checks.push(...toolChecks);
 	displayChecks(toolChecks);
+	console.log();
+	console.log(color.bold("  Template Drift"));
+	const manifestChecks = [];
+	const manifest = loadManifest(opencodeDir);
+	if (manifest) {
+		let driftedCount = 0;
+		const totalTemplateFiles = Object.keys(manifest.files).length;
+		for (const [relPath, expectedHash] of Object.entries(manifest.files)) {
+			const fullPath = join(opencodeDir, relPath);
+			if (!existsSync(fullPath)) {
+				driftedCount++;
+				continue;
+			}
+			if (createHash("sha256").update(readFileSync(fullPath, "utf-8")).digest("hex") !== expectedHash) driftedCount++;
+		}
+		const orphanDirs = [
+			"agent",
+			"command",
+			"skill",
+			"tool"
+		];
+		let orphanCount = 0;
+		for (const dir of orphanDirs) {
+			const dirPath = join(opencodeDir, dir);
+			if (!existsSync(dirPath)) continue;
+			for (const entry of readdirSync(dirPath)) if (!(`${dir}/${entry}` in manifest.files)) orphanCount++;
+		}
+		manifestChecks.push({
+			name: `Manifest version (${manifest.version})`,
+			ok: true
+		});
+		manifestChecks.push({
+			name: `Template files (${totalTemplateFiles - driftedCount}/${totalTemplateFiles} unmodified)`,
+			ok: driftedCount === 0,
+			warn: driftedCount > 0,
+			fix: driftedCount > 0 ? `${driftedCount} file(s) modified — use 'uk upgrade' to review` : void 0
+		});
+		if (orphanCount > 0) warnings.push({
+			name: `${orphanCount} orphan file(s) not in template manifest`,
+			ok: false,
+			warn: true
+		});
+	} else manifestChecks.push({
+		name: `${MANIFEST_FILE} exists`,
+		ok: false,
+		warn: true,
+		fix: "Run 'uk init' or 'uk upgrade' to generate manifest"
+	});
+	checks.push(...manifestChecks);
+	displayChecks(manifestChecks);
+	console.log();
+	console.log(color.bold("  JSONC Config"));
+	const jsoncChecks = [];
+	for (const jsoncFile of ["dcp.jsonc", "opencodex-fast.jsonc"]) {
+		const jsoncPath = join(opencodeDir, jsoncFile);
+		if (!existsSync(jsoncPath)) continue;
+		try {
+			const validation = validateJsonc(readFileSync(jsoncPath, "utf-8"));
+			if (validation.valid) jsoncChecks.push({
+				name: `${jsoncFile} valid`,
+				ok: true
+			});
+			else jsoncChecks.push({
+				name: `${jsoncFile} parse error`,
+				ok: false,
+				fix: `Fix syntax: ${validation.error}`
+			});
+		} catch {
+			jsoncChecks.push({
+				name: `${jsoncFile} read error`,
+				ok: false,
+				fix: "Check file permissions"
+			});
+		}
+	}
+	if (jsoncChecks.length > 0) {
+		checks.push(...jsoncChecks);
+		displayChecks(jsoncChecks);
+	} else console.log(color.dim("    (no JSONC config files found)"));
+	console.log();
+	console.log(color.bold("  Preservation Safety"));
+	const preservationChecks = [];
+	const memoryProjectDir = join(opencodeDir, "memory", "project");
+	const requiredProjectFiles = [
+		"user.md",
+		"tech-stack.md",
+		"project.md"
+	];
+	const preservedProjectFiles = requiredProjectFiles.filter((f) => existsSync(join(memoryProjectDir, f)));
+	preservationChecks.push({
+		name: `memory/project/ (${preservedProjectFiles.length}/${requiredProjectFiles.length} required files)`,
+		ok: preservedProjectFiles.length === requiredProjectFiles.length,
+		warn: preservedProjectFiles.length > 0 && preservedProjectFiles.length < requiredProjectFiles.length,
+		fix: preservedProjectFiles.length < requiredProjectFiles.length ? `Missing: ${requiredProjectFiles.filter((f) => !preservedProjectFiles.includes(f)).join(", ")}` : void 0
+	});
+	preservationChecks.push({
+		name: "context/ directory",
+		ok: existsSync(join(opencodeDir, "context")),
+		warn: true,
+		fix: "Run '/init-context' to create context directory"
+	});
+	preservationChecks.push({
+		name: ".env file",
+		ok: existsSync(join(opencodeDir, ".env")),
+		warn: true,
+		fix: "Copy from .env.example and fill in secrets"
+	});
+	checks.push(...preservationChecks);
+	displayChecks(preservationChecks);
+	if ([
+		"package.json",
+		"src",
+		"tsdown.config.ts"
+	].every((f) => existsSync(join(cwd, f)))) {
+		const nestedOpencode = existsSync(join(cwd, ".opencode"));
+		const nestedBeads = existsSync(join(cwd, ".beads"));
+		if (nestedOpencode || nestedBeads) {
+			const nestedItems = [];
+			if (nestedOpencode) nestedItems.push(".opencode/");
+			if (nestedBeads) nestedItems.push(".beads/");
+			warnings.push({
+				name: `Nested state dirs in ultrakit source: ${nestedItems.join(", ")}`,
+				ok: false,
+				warn: false
+			});
+			warnings.push({
+				name: "These should be in the project root, not inside ultrakit/",
+				ok: false,
+				warn: true
+			});
+		}
+	}
 	const errors = checks.filter((c) => !c.ok && !c.warn);
 	const warningCount = warnings.length + checks.filter((c) => !c.ok && c.warn).length;
 	if (warnings.length > 0) {
@@ -4526,6 +4968,7 @@ async function statusCommand() {
 }
 //#endregion
 //#region src/commands/patch.ts
+const TEMPLATE_SOURCE_DIR = "opencode";
 function listPatches(opencodeDir) {
 	const metadata = loadPatchMetadata(opencodeDir);
 	const entries = Object.entries(metadata.patches);
@@ -4573,7 +5016,7 @@ async function createPatch$1(opencodeDir) {
 		p.log.info(color.dim("Make sure uk is installed correctly"));
 		return;
 	}
-	const templateFilePath = join(templateRoot, ".opencode", relativePath);
+	const templateFilePath = join(templateRoot, TEMPLATE_SOURCE_DIR, 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"));
@@ -5898,43 +6341,12 @@ if (process.stdout.setEncoding) process.stdout.setEncoding("utf8");
 if (process.stderr.setEncoding) process.stderr.setEncoding("utf8");
 const packageVersion = version;
 const cli = cac("uk");
-async function ensureLicenseFor(commandName) {
-	try {
-		if ((await requireValidLicense()).mode === "offline-grace") p.log.warn("License server is unreachable. Running in offline grace mode.");
-		return true;
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		p.log.error(`${commandName} requires a valid license`);
-		p.log.info(message);
-		p.log.info("Run: uk activate <LICENSE_KEY>");
-		process.exitCode = 1;
-		return false;
-	}
-}
 cli.option("--verbose", "Enable verbose logging");
 cli.option("--quiet", "Suppress all output");
 cli.version(`${packageVersion}`);
-cli.command("init", "Initialize UltraKit 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(async (options) => {
-	if (!await ensureLicenseFor("init")) return;
+cli.command("init", "Initialize UltraKit 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("--provider-profile <profile>", "Provider profile: existing-global, opencode-zen, openai, ollama, wafer, github-copilot, custom-openai-compatible").option("--mcp-preset <preset>", "MCP preset: minimal, recommended, power, local-first").option("--webclaw-mode <mode>", "Webclaw mode: disabled, host-binary, docker-existing").option("--with-superpowers", "Enable upstream Superpowers OpenCode plugin (opt-in)").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)").option("--variant <variant>", "Template variant: full (default), minimal, dev").action(async (options) => {
 	await initCommand(options);
 });
-cli.command("activate [key]", "Activate paid license key").action(async (key) => {
-	await activateCommand(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: uk 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: uk command <action>\n");
@@ -5965,7 +6377,6 @@ cli.command("config [action]", "Edit opencode.json (model, mcp, permission, vali
 	await configCommand(action);
 });
 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) => {
-	if (!await ensureLicenseFor("upgrade")) return;
 	await upgradeCommand(options);
 });
 cli.command("patch [action]", "Manage template patches (list, create, apply, diff, remove, disable, enable)").action(async (action) => {