@tryaura/aura-cli 0.1.0 → 0.1.1

package/dist/{run-pMPxJqFQ.js → run-ZDkvqvZb.js}

@@ -1,4 +1,4 @@
-import { A as MAX_MUTABLE_FILE_BYTES, B as AuraManifestError, C as renderRedactedWriteDiff, D as renderRemoveDiff, E as renderMoveDiff, F as parseAuraManifest, I as errorCode, L as errorMessage$1, M as assertAuraManifestWritable, N as createAuraManifestWriteOperation, O as renderSymlinkDiff, P as createEmptyAuraManifest, R as isRecord$4, S as hashManagedSnippet, T as renderConflict, U as pluralize, V as SHARED_INSTRUCTIONS_TEMPLATE, _ as managedSnippetContentProblems, a as planSharedInstructionLink, b as canonicalizeManagedSnippet, d as planDesiredMcpConvergence, g as reconcileParsedManagedBlock, h as createAppMcpConvergence, j as MAX_RETAINED_PLAN_BYTES, k as FILE_MODES, l as rememberMcpSecretPlanner, m as rememberMcpConvergence, n as planSkillDeployment, s as createAppMcpSecretPlanner, v as readManagedBlock, w as renderArchiveDiff, x as hashCanonicalManagedSnippet, z as resolveAuraManifestPath } from "./skill-deployment-plan-C4GTrVSy.js";
+import { A as renderRemoveDiff, B as errorMessage$1, C as canonicalizeManagedSnippet, D as renderArchiveDiff, E as renderRedactedWriteDiff, F as assertAuraManifestWritable, H as resolveAuraManifestPath, I as createAuraManifestWriteOperation, K as pluralize, L as createEmptyAuraManifest, M as FILE_MODES, N as MAX_MUTABLE_FILE_BYTES, O as renderConflict, P as MAX_RETAINED_PLAN_BYTES, R as parseAuraManifest, S as readManagedBlock, T as hashManagedSnippet, U as AuraManifestError, V as isRecord$4, W as SHARED_INSTRUCTIONS_TEMPLATE, _ as planSharedSkillTreeUpdate, a as rememberMcpSecretPlanner, d as createAppMcpConvergence, g as managedContentRevisionStatus, j as renderSymlinkDiff, k as renderMoveDiff, m as sharedSkillsRoot, p as planSkillDeployment, r as createAppMcpSecretPlanner, s as planDesiredMcpConvergence, t as planSharedInstructionLink, u as rememberMcpConvergence, v as reconcileParsedManagedBlock, w as hashCanonicalManagedSnippet, x as managedSnippetContentProblems, y as diffManagedSnippet, z as errorCode } from "./shared-link-plan-BigeLxDX.js";
 import { COMMAND_NOT_FOUND_EXIT_CODE, DEFAULT_EXEC_TIMEOUT_MS, DEFAULT_HTTP_TIMEOUT_MS, MAX_EXEC_OUTPUT_CHARACTERS, MAX_EXEC_TIMEOUT_MS, MAX_HTTP_RESPONSE_BYTES, MAX_HTTP_TIMEOUT_MS, NOT_EXECUTABLE_EXIT_CODE, OUTPUT_LIMIT_EXIT_CODE, SHARED_INSTRUCTIONS_TEMPLATE_TOKEN, TIMEOUT_EXIT_CODE, defineOwnProperty, detectExecutable, hasMcpRedaction, jsonPropertyPath, mcpEnvironmentVariableNames, mcpServerNameProblem, parseMcpServerDefinition, parseMcpServerManifest, parseSkillFrontmatter, parseSkillReferences, resolveMcpSecretNameCollisions, resolveSkillDirectory, splitSourceLines } from "@tryaura/aura-sdk";
 import { basename, delimiter, dirname, isAbsolute, join, posix, relative, resolve, sep, win32 } from "node:path";
 import { Buffer as Buffer$1, isUtf8 } from "node:buffer";
@@ -823,7 +823,7 @@ function resolveAllowedRoots(model, managedHomeRoots) {
 		path: resolve(model.projectRoot ?? model.cwd)
 	});
 	const sharedDirectory = dirname(resolve(model.sharedInstructions.path));
-	if (isStrictDescendant$1(homeDir, sharedDirectory)) add(roots, {
+	if (isStrictDescendant(homeDir, sharedDirectory)) add(roots, {
 		exact: false,
 		path: sharedDirectory
 	});
@@ -838,7 +838,7 @@ function resolveAllowedRoots(model, managedHomeRoots) {
 */
 function matchRoot(path, roots, caseInsensitive) {
 	const resolvedPath = resolve(path);
-	const directoryRoot = roots.filter((root) => !root.exact && isStrictDescendant$1(root.path, resolvedPath)).sort((left, right) => right.path.length - left.path.length)[0];
+	const directoryRoot = roots.filter((root) => !root.exact && isStrictDescendant(root.path, resolvedPath)).sort((left, right) => right.path.length - left.path.length)[0];
 	if (directoryRoot !== void 0) return directoryRoot;
 	return roots.find((root) => root.exact && comparablePath(root.path, caseInsensitive) === comparablePath(resolvedPath, caseInsensitive));
 }
@@ -847,7 +847,7 @@ function describeRoots(roots) {
 	return roots.map((root) => root.exact ? root.path : `${root.path}${sep}`).sort().join(", ");
 }
 /** Returns true when `candidate` sits strictly inside `root`. */
-function isStrictDescendant$1(root, candidate) {
+function isStrictDescendant(root, candidate) {
 	const difference = relative(root, candidate);
 	return difference.length > 0 && difference !== ".." && !difference.startsWith(`..${sep}`) && !isAbsolute(difference);
 }
@@ -858,13 +858,13 @@ function deriveManagedHomeRoots(model, homeDir) {
 function rootsForSpec(spec, homeDir) {
 	if (spec.scope !== "global" || !isAbsolute(spec.path)) return [];
 	const path = resolve(spec.path);
-	if (!isStrictDescendant$1(homeDir, path)) return [];
+	if (!isStrictDescendant(homeDir, path)) return [];
 	if (spec.kind === "skills") return [{
 		exact: false,
 		path
 	}];
 	const directory = dirname(path);
-	return isStrictDescendant$1(homeDir, directory) ? [{
+	return isStrictDescendant(homeDir, directory) ? [{
 		exact: true,
 		path
 	}, {
@@ -879,7 +879,7 @@ function validateManagedHomeRoots(managedHomeRoots, homeDir) {
 	return managedHomeRoots.map((candidate) => {
 		if (!isAbsolute(candidate)) throw new FixPlanError("invalid-options", `managedHomeRoots must contain absolute paths: ${candidate}`, { path: candidate });
 		const path = resolve(candidate);
-		if (!isStrictDescendant$1(homeDir, path)) throw new FixPlanError("invalid-options", `managedHomeRoots must sit strictly inside ${homeDir}: ${candidate}`, { path: candidate });
+		if (!isStrictDescendant(homeDir, path)) throw new FixPlanError("invalid-options", `managedHomeRoots must sit strictly inside ${homeDir}: ${candidate}`, { path: candidate });
 		return {
 			exact: false,
 			path
@@ -3198,6 +3198,35 @@ function directorySourceProblem(source) {
 	if (source.kind === "private-directory" && !TOKEN_ENV_PATTERN.test(source.tokenEnv)) return `declares token variable "${source.tokenEnv}"; expected an environment variable name of uppercase letters, digits, and underscores — a name, never a value`;
 }
 //#endregion
+//#region ../core/src/plugin-validation-version.ts
+/**
+* A version's canonical rendering, or `undefined` when it is not semver at all.
+*
+* Parsing alone is too weak for an identity field: `semver` also accepts a leading `v` and
+* surrounding whitespace, so a version declared as "v1.0.0" or "1.0.0\n" would pass and then be
+* carried around raw. Requiring the declaration to equal its canonical form refuses those while
+* still accepting "1.2.3-rc.1+build.5" as written — build metadata has to be rebuilt by hand
+* because `valid()` drops it.
+*/
+function canonicalSemver(version) {
+	const parsed = parse(version);
+	if (parsed === null) return;
+	return parsed.build.length === 0 ? parsed.version : `${parsed.version}+${parsed.build.join(".")}`;
+}
+/**
+* Why a content revision could never be compared to a recorded one, or `undefined` when it can.
+*
+* Managed snippets and skills are held at their recorded revision until a newer one is reviewed,
+* and "newer" is a semver comparison. A version semver cannot order therefore has no upgrade path
+* at all: setup would never offer it and MGD-002 would never report it, so the content would sit
+* frozen with nothing on screen explaining why. Refusing it at registry build is what keeps that
+* dead end out of a user's manifest, enforcing the SDK's documented "semver version of the content
+* itself" rather than trusting it.
+*/
+function contentVersionProblem(version) {
+	return canonicalSemver(version) === version ? void 0 : `declares version "${version}"; expected a canonical semver version such as "1.0.0", because managed content is held at its recorded revision until a newer one is reviewed`;
+}
+//#endregion
 //#region ../core/src/skills/path-guards.ts
 /**
 * Pure guards over server-supplied names and paths, run before anything derived from a fetched
@@ -3444,20 +3473,6 @@ function formatApiVersionViolation(candidate) {
 function formatViolations(violations) {
 	return [violations.length === 1 ? "Aura cannot build the plugin registry:" : `Aura cannot build the plugin registry (${violations.length} problems):`, ...violations.map((violation) => `  - ${violation}`)].join("\n");
 }
-/**
-* A version's canonical rendering, or `undefined` when it is not semver at all.
-*
-* Parsing alone is too weak for an identity field: `semver` also accepts a leading `v` and
-* surrounding whitespace, so a version declared as "v1.0.0" or "1.0.0\n" would pass and then be
-* carried around raw. Requiring the declaration to equal its canonical form refuses those while
-* still accepting "1.2.3-rc.1+build.5" as written — build metadata has to be rebuilt by hand
-* because `valid()` drops it.
-*/
-function canonicalSemver(version) {
-	const parsed = parse(version);
-	if (parsed === null) return;
-	return parsed.build.length === 0 ? parsed.version : `${parsed.version}+${parsed.build.join(".")}`;
-}
 function formatPlugin(plugin) {
 	return `Plugin "${plugin.name}" (${plugin.id})`;
 }
@@ -3517,7 +3532,17 @@ function collectCandidate(state, candidate, bareCheckIdPlugins, collected) {
 	collectSkillDirectories(state, plugin, collected.skillDirectories);
 	collectSkills$1(state, plugin, collected.skills);
 	collectNamespaced(state, "skill-source", plugin.skillSources, plugin, collected.skillSources);
-	collectNamespaced(state, "snippet", plugin.snippets, plugin, collected.snippets);
+	collectSnippets(state, plugin, collected.snippets);
+}
+/** Snippets are managed content, so their revision has to be comparable before one is installed. */
+function collectSnippets(state, plugin, collected) {
+	const claimed = [];
+	collectNamespaced(state, "snippet", plugin.snippets, plugin, claimed);
+	for (const snippet of claimed) {
+		const problem = contentVersionProblem(snippet.version);
+		if (problem === void 0) collected.push(snippet);
+		else state.violations.push(`Plugin "${plugin.name}" (${plugin.id}) snippet "${snippet.id}" ${problem}.`);
+	}
 }
 /**
 * Directory ids are global, like adapter ids: `directory:agenticskills` names a place, so two
@@ -3544,6 +3569,11 @@ function collectSkills$1(state, plugin, collected) {
 			state.violations.push(`Plugin "${plugin.name}" (${plugin.id}) contributes skill-pack ID "${skill.id}"; expected a kebab-case local skill ID of at most 64 characters.`);
 			continue;
 		}
+		const versionProblem = contentVersionProblem(skill.version);
+		if (versionProblem !== void 0) {
+			state.violations.push(`Plugin "${plugin.name}" (${plugin.id}) skill "${skill.id}" ${versionProblem}.`);
+			continue;
+		}
 		if (claimId(state, "skill-pack", `${source.id}/${skill.id}`, plugin)) collected.push({
 			skill,
 			source
@@ -4198,7 +4228,7 @@ async function discoverAdapterFiles(adapter, options) {
 			adapter,
 			projectBoundary,
 			reader,
-			sharedSkillsRoot: join(environment.homeDir, "agents", "skills")
+			sharedSkillsRoot: sharedSkillsRoot(environment.homeDir)
 		})));
 		for (const read of reads) {
 			files.set(read.file.spec.id, read.file);
@@ -5033,7 +5063,7 @@ const SKILLS_DIAGNOSTIC_ID = "core/skills";
 const SKILL_FILE$1 = "SKILL.md";
 /** Canonical shared skill root for one captured environment. */
 function sharedSkillsPath(environment) {
-	return join(environment.homeDir, "agents", "skills");
+	return sharedSkillsRoot(environment.homeDir);
 }
 /** Resolves every bundled skill pack without letting one broken pack hide the others. */
 async function resolveBundledSkills(registrations, reader) {
@@ -6723,15 +6753,26 @@ function applyRequiredMcpServers(model, config) {
 	};
 	const manifest = model.manifest.value;
 	const configured = new Set(manifest.mcpServers.map((server) => `${server.scope}\0${server.name}`));
+	const configuredCatalogIds = new Set(manifest.mcpServers.flatMap((server) => server.catalogId === void 0 ? [] : [server.catalogId]));
 	const diagnostics = [];
 	const required = [];
+	const overridden = [];
+	const overrideIds = new Set(manifest.overrides?.requiredMcpServers ?? []);
 	for (const selection of config.requiredMcpServers) {
+		if (overrideIds.has(selection.value)) {
+			overridden.push({
+				catalogId: selection.value,
+				requiredBy: selection.provenance.label
+			});
+			continue;
+		}
+		if (configuredCatalogIds.has(selection.value)) continue;
 		const catalog = model.availableMcpServers.find((candidate) => candidate.id === selection.value);
 		if (catalog === void 0) {
 			diagnostics.push(note(`is not in this run's MCP catalog, so it was skipped`, selection.value, selection));
 			continue;
 		}
-		const name = catalog.id.slice(catalog.id.lastIndexOf("/") + 1);
+		const name = catalog.manifest.serverName;
 		if (configured.has(`global\0${name}`)) {
 			diagnostics.push(note(`is already configured as "${name}", so your own settings were kept`, catalog.id, selection));
 			continue;
@@ -6752,9 +6793,10 @@ function applyRequiredMcpServers(model, config) {
 	}
 	return {
 		diagnostics: Object.freeze(diagnostics),
-		model: required.length === 0 ? model : Object.freeze({
+		model: required.length === 0 && overridden.length === 0 ? model : Object.freeze({
 			...model,
-			requiredMcpServers: Object.freeze(required)
+			...overridden.length === 0 ? {} : { overriddenRequiredMcpServers: Object.freeze(overridden) },
+			...required.length === 0 ? {} : { requiredMcpServers: Object.freeze(required) }
 		})
 	};
 }
@@ -8583,6 +8625,18 @@ function defaultAnswer(question) {
 function selectedValues(answer) {
 	return answer === void 0 || answer.kind !== "options" ? [] : answer.values;
 }
+/**
+* Folds one review form's answers back into the decisions carried by a chain's state.
+*
+* Review forms are keyed `<prefix><identity>` so a single form can carry one question per item.
+* Answers already given for items this form did not ask about are kept: a stage re-entered through
+* ← re-asks a subset, and dropping the rest would silently reset decisions the user already made.
+*/
+function foldDecisions(previous, answers, prefix, fallback) {
+	const decisions = { ...previous };
+	for (const [id, answer] of Object.entries(answers)) if (id.startsWith(prefix)) decisions[id.slice(prefix.length)] = selectedValues(answer)[0] ?? fallback;
+	return decisions;
+}
 //#endregion
 //#region src/guided-fix.ts
 async function gatherGuidedFixes(request, wizard, diagnostics) {
@@ -9808,6 +9862,51 @@ function buildAppCatalog(adapters, model, skipped) {
 	}));
 }
 //#endregion
+//#region src/setup/planner-app-steps.ts
+/**
+* Summary lines the plan cannot express as file operations: installing an app Aura does not
+* install itself, and what unchecking a previously-managed app does — the manifest flips to
+* `managed: false` while the app's own configuration stays in place (ownership cleanup is a later
+* milestone).
+*/
+function appManualSteps(context) {
+	const apps = context.selections.apps;
+	if (apps === void 0) return [];
+	return [...installSteps(context, apps.managed), ...stopManagingSteps(context, apps.managed)];
+}
+function installSteps(context, managed) {
+	const steps = [];
+	for (const id of managed) {
+		const entry = context.appCatalog.find((candidate) => catalogEntryId(candidate) === id);
+		if (entry?.kind === "undetected") steps.push(entry.installHint === void 0 ? `Install ${entry.displayName} — its adapter provides no install instructions.` : `Install ${entry.displayName}: ${entry.installHint}`);
+	}
+	return steps;
+}
+function stopManagingSteps(context, managed) {
+	const previous = context.manifest.status === "ready" ? context.manifest.value.apps : {};
+	const managedIds = new Set(managed);
+	const steps = [];
+	for (const [id, app] of Object.entries(previous)) {
+		const entry = context.appCatalog.find((candidate) => catalogEntryId(candidate) === id);
+		if (entry !== void 0 && app.managed && !managedIds.has(id)) steps.push(`Aura stops managing ${catalogEntryName(entry)}; its existing configuration is left in place.`);
+	}
+	return steps;
+}
+//#endregion
+//#region src/setup/app-ignore.ts
+/** Applies this setup pass's explicit ignored-app decisions while preserving unknown adapters. */
+function withIgnoredAppSelections(manifest, previous, apps, appCatalog) {
+	const available = new Set(appCatalog.map(catalogEntryId));
+	const managed = new Set(apps.managed);
+	const selectedIgnored = new Set(apps.ignored ?? []);
+	const ignoredApps = [.../* @__PURE__ */ new Set([...(previous.ignoredApps ?? []).filter((id) => !available.has(id)), ...appCatalog.map(catalogEntryId).filter((id) => !managed.has(id) && selectedIgnored.has(id))])];
+	const { ignoredApps: _previous, ...rest } = manifest;
+	return ignoredApps.length === 0 ? rest : {
+		...rest,
+		ignoredApps
+	};
+}
+//#endregion
 //#region src/setup/instructions.ts
 function instructionTargets(model) {
 	return {
@@ -10148,7 +10247,7 @@ function planManifestWrite(context, desired, createManifest, apps) {
 }
 /** Decides whether desired manifest bytes or their required private mode differ from disk. */
 function shouldWriteManifest(context, desired, createManifest, apps) {
-	return context.manifest.status === "ready" ? differsFromDisk(context.manifest, desired) : createManifest || answersSomethingToRecord(context.selections, apps);
+	return context.manifest.status === "ready" ? differsFromDisk(context.manifest, desired) : createManifest || context.preset?.explicit === true || answersSomethingToRecord(context.selections, apps);
 }
 function differsFromDisk(state, desired) {
 	const mode = state.mode;
@@ -10180,6 +10279,7 @@ function planSetupMcp(context, desiredManifest) {
 	const missingDefinitions = new Set(context.mcpCatalog.missingRequiredIds);
 	const selectedCatalogIds = new Set(manifest.mcpServers.flatMap((server) => server.catalogId === void 0 ? [] : [server.catalogId]));
 	const overriddenRequiredIds = new Set(context.selections.mcp.overriddenRequiredIds ?? []);
+	if (context.preset !== void 0) manifest = withRequiredOverrides(manifest, context.mcpCatalog.requiredIds, overriddenRequiredIds);
 	for (const id of context.mcpCatalog.requiredIds) if (!missingDefinitions.has(id) && !selectedCatalogIds.has(id) && !overriddenRequiredIds.has(id)) blockers.push({
 		path: presetPath,
 		reason: unconfiguredRequirement(context, id)
@@ -10202,6 +10302,19 @@ function planSetupMcp(context, desiredManifest) {
 		operations
 	};
 }
+function withRequiredOverrides(manifest, requiredIds, overriddenIds) {
+	const requiredMcpServers = [...requiredIds].filter((id) => overriddenIds.has(id));
+	const { requiredMcpServers: _previousRequired, ...extension } = manifest.overrides ?? {};
+	const overrides = requiredMcpServers.length === 0 && Object.keys(extension).length === 0 ? void 0 : {
+		...extension,
+		...requiredMcpServers.length === 0 ? {} : { requiredMcpServers }
+	};
+	const { overrides: _previousOverrides, ...rest } = manifest;
+	return overrides === void 0 ? rest : {
+		...rest,
+		overrides
+	};
+}
 /**
 * Says which of the two ways a requirement went unmet happened, because the fix differs.
 *
@@ -10236,6 +10349,24 @@ function credentialSteps(context, manifest) {
 	}));
 }
 //#endregion
+//#region src/setup/preset-policy.ts
+/**
+* The preset's own check settings, shown as read-only policy.
+*
+* The preset is named once in the group heading rather than on every line: with a preset that
+* configures a dozen checks, a repeated "(from preset acme)" is noise that hides the settings the
+* user is actually meant to read.
+*/
+function presetPolicyNotices(context) {
+	const preset = context.preset;
+	if (preset === void 0 || preset.checkSummary.length === 0) return [];
+	return preset.checkSummary.map((message, index) => ({
+		...index === 0 ? { heading: `Effective check policy from preset ${preset.name} (not copied into your manifest):` } : {},
+		kind: "policy",
+		message
+	}));
+}
+//#endregion
 //#region src/setup/snippet-planner.ts
 /** Reconcile notes the user has to see, and the heading each one belongs under. */
 const NOTICE_KINDS = Object.freeze({
@@ -10260,11 +10391,17 @@ function planSnippets(context, source) {
 	});
 	const unavailable = selectedEntries.filter((entry) => entry.status === "unavailable");
 	const pinned = selection.selected.filter((id) => previousById.get(id)?.pinned === true);
+	const held = heldRevisions(selection.selected, catalog, previousById, new Set(selection.updates));
+	const heldIds = new Set(held.map((entry) => entry.id));
 	const pinnedIds = new Set(pinned);
-	const preserved = [...unavailable.map((entry) => entry.id), ...pinned];
+	const preserved = [
+		...unavailable.map((entry) => entry.id),
+		...pinned,
+		...heldIds
+	];
 	const parsed = readManagedBlock(source);
 	const blockers = snippetBlockers(context.model.sharedInstructions.path, parsed, unavailable, pinned.filter((id) => !unavailable.some((entry) => entry.id === id)));
-	const desired = selectedEntries.flatMap((entry) => entry.status === "available" && !pinnedIds.has(entry.id) ? [{
+	const desired = selectedEntries.flatMap((entry) => entry.status === "available" && !pinnedIds.has(entry.id) && !heldIds.has(entry.id) ? [{
 		content: entry.content,
 		id: entry.id
 	}] : []);
@@ -10274,14 +10411,14 @@ function planSnippets(context, source) {
 		previousSnippetHashes: new Map(previous.map((entry) => [entry.id, entry.hash]))
 	});
 	collectReconcileBlockers(context.model.sharedInstructions.path, parsed, reconciled, blockers);
-	const manifestSnippets = desiredManifestSnippets(selection.selected, catalog, previousById);
-	const notices = reconciled.notes.flatMap((note) => {
+	const manifestSnippets = desiredManifestSnippets(selection.selected, catalog, previousById, heldIds);
+	const notices = [...reconciled.notes.flatMap((note) => {
 		const kind = NOTICE_KINDS[note.code];
 		return kind === void 0 ? [] : [{
 			kind,
 			message: note.message
 		}];
-	});
+	}), ...held.map(heldNotice)];
 	return {
 		blockers,
 		content: reconciled.content,
@@ -10290,6 +10427,39 @@ function planSnippets(context, source) {
 		updated: reconciled.status === "updated"
 	};
 }
+/**
+* The selections whose source moved but whose recorded revision this run keeps.
+*
+* Uses the same comparison the review form asks with, so "the step never offered it" and "the plan
+* never applied it" cannot drift apart: any revision the user was not asked about is held, and any
+* revision held is one the user was asked about and declined.
+*/
+function heldRevisions(selectedIds, catalog, previousById, accepted) {
+	return selectedIds.flatMap((id) => {
+		const installed = previousById.get(id);
+		const available = catalog.get(id);
+		if (installed === void 0 || installed.pinned === true || available?.status !== "available" || accepted.has(id)) return [];
+		const status = managedContentRevisionStatus(installed.version, installed.hash, available.version, hashManagedSnippet(available.content));
+		return status === "current" ? [] : [{
+			availableVersion: available.version,
+			id,
+			installedVersion: installed.version,
+			status
+		}];
+	});
+}
+/**
+* Says out loud that a snippet was left at its recorded revision.
+*
+* Holding content back is the safe default, but a run that holds silently is indistinguishable
+* from one that had nothing to do — which is exactly the reading a `--yes` run would get wrong.
+*/
+function heldNotice(held) {
+	return {
+		kind: "held",
+		message: held.status === "update" ? `${held.id} stays at ${held.installedVersion}; ${held.availableVersion} is available. Run setup interactively to review it.` : `${held.id} stays at ${held.installedVersion}; the installed plugin offers ${held.availableVersion}, which is not newer.`
+	};
+}
 function snippetBlockers(path, parsed, unavailable, pinned) {
 	const blockers = [];
 	if (parsed.status === "invalid") blockers.push({
@@ -10317,10 +10487,11 @@ function collectReconcileBlockers(path, parsed, reconciled, blockers) {
 		reason: reconciled.problems.map((problem) => problem.message).join(" ")
 	});
 }
-function desiredManifestSnippets(selectedIds, catalog, previousById) {
+function desiredManifestSnippets(selectedIds, catalog, previousById, heldUpdates) {
 	return selectedIds.flatMap((id) => {
 		const preserved = previousById.get(id);
 		if (preserved?.pinned === true) return [preserved];
+		if (heldUpdates.has(id) && preserved !== void 0) return [preserved];
 		const entry = catalog.get(id);
 		if (entry?.status === "available") return [{
 			hash: hashManagedSnippet(entry.content),
@@ -10334,7 +10505,7 @@ function desiredManifestSnippets(selectedIds, catalog, previousById) {
 //#endregion
 //#region src/setup/skill-planner-links.ts
 function sharedRoot(context) {
-	return join(context.model.homeDir, "agents", "skills");
+	return sharedSkillsRoot(context.model.homeDir);
 }
 function planLinks(id, context, state) {
 	for (const app of managedApps(context)) for (const directory of app.skillDirectories ?? []) {
@@ -10377,10 +10548,6 @@ function removeSkillEntries(entries) {
 function skillIdentity(source, id) {
 	return `${source}\0${id}`;
 }
-function isStrictDescendant(root, candidate) {
-	const difference = relative(resolve(root), resolve(candidate));
-	return difference.length > 0 && difference !== ".." && !difference.startsWith(`..${sep}`) && !difference.startsWith(sep);
-}
 //#endregion
 //#region src/setup/skill-planner-policy.ts
 /**
@@ -10400,56 +10567,28 @@ function disallowedSkillBlockers(selected, policy, sharedRoot) {
 	}));
 }
 //#endregion
-//#region src/setup/skill-planner.ts
-function planSkills(context) {
-	const previous = context.manifest.status === "ready" ? context.manifest.value.skills : [];
-	const selected = context.selections.skills?.selected ?? previous.map(toSelection);
-	const duplicate = duplicateLocalId(selected);
-	if (duplicate !== void 0) return abandoned(previous, {
-		path: sharedRoot(context),
-		reason: `Skill "${duplicate}" was selected from more than one source. Choose one source for each installed skill ID.`
-	});
-	const disallowed = disallowedSkillBlockers(selected, context.skillCatalog.policy, sharedRoot(context));
-	if (disallowed.length > 0) return {
-		blockers: disallowed,
-		manifestSkills: previous,
-		manualSteps: [],
-		operations: []
-	};
-	const state = {
-		blockers: [],
-		manifestSkills: [],
-		manualSteps: [],
-		operations: []
-	};
-	const catalog = new Map([...context.model.availableSkills ?? [], ...context.selections.skills?.resolved ?? []].map((skill) => [skillIdentity(skill.source.id, skill.id), skill]));
-	const previousByIdentity = new Map(previous.map((skill) => [skillIdentity(skill.source, skill.id), skill]));
-	const previousById = new Map(previous.map((skill) => [skill.id, skill]));
-	const sharedById = new Map((context.model.sharedSkills ?? []).map((skill) => [skill.id, skill]));
-	for (const selection of selected) reconcileSelection(selection, previousByIdentity.get(skillIdentity(selection.source, selection.id)), previousById.get(selection.id), catalog.get(skillIdentity(selection.source, selection.id)), sharedById.get(selection.id), context, state);
-	const desiredIds = new Set(selected.map((selection) => selection.id));
-	for (const skill of previous) if (!desiredIds.has(skill.id)) reconcileRemoval(skill, sharedById.get(skill.id), context, state);
-	return {
-		blockers: Object.freeze(state.blockers),
-		manifestSkills: Object.freeze(state.manifestSkills),
-		manualSteps: Object.freeze(state.manualSteps),
-		operations: Object.freeze(state.operations)
-	};
-}
-function abandoned(previous, blocker) {
+//#region src/setup/skill-planner-reconcile.ts
+/** The manifest row one resolved pack becomes. */
+function manifestSkill(skill) {
 	return {
-		blockers: [blocker],
-		manifestSkills: previous,
-		manualSteps: [],
-		operations: []
+		id: skill.id,
+		pinned: false,
+		source: skill.source.id,
+		treeHash: skill.treeHash,
+		version: skill.version
 	};
 }
-function reconcileSelection(selection, previousIdentity, previousAtId, available, shared, context, state) {
+function reconcileSelection(selection, previousIdentity, previousAtId, offered, shared, context, state) {
 	const previous = previousIdentity ?? previousAtId;
 	if (previous?.pinned === true && previousIdentity !== void 0) {
-		preserveOrRestore(previous, available, shared, context, state);
+		preserveOrRestore(previous, offered.available, shared, context, state);
 		return;
 	}
+	if (offered.held && previousIdentity !== void 0) {
+		keepRecordedRevision(previousIdentity, offered.available, shared, context, state);
+		return;
+	}
+	const available = offered.available;
 	if (available === void 0) {
 		if (previousIdentity !== void 0) preserveOrRestore(previousIdentity, void 0, shared, context, state);
 		else state.blockers.push({
@@ -10476,6 +10615,23 @@ function reconcileSelection(selection, previousIdentity, previousAtId, available
 	if (shared?.treeHash !== desired.treeHash) planTreeReplacement(shared, available, context, state.operations);
 	planLinks(selection.id, context, state);
 }
+/**
+* Keeps a skill at the revision the manifest records after its update went unreviewed.
+*
+* A missing shared tree is the one case that cannot simply be left alone: the recorded revision is
+* gone from disk and the only pack on hand is the newer one the user declined, so the step says
+* exactly that instead of reporting the skill as unavailable or as pinned.
+*/
+function keepRecordedRevision(previous, available, shared, context, state) {
+	state.manifestSkills.push(previous);
+	state.notices.push({
+		kind: "held",
+		message: `${previous.id} stays at ${previous.version}; ${available?.version ?? "a new revision"} is available. Run setup interactively to review it.`
+	});
+	if (shared === void 0) state.manualSteps.push(`Skill "${previous.id}" stays at version ${previous.version}, but its files are missing from ${join(sharedRoot(context), previous.id)}. Re-run setup and accept version ${available?.version ?? "the available revision"}, or reinstall the recorded revision from its source.`);
+	else if (shared.treeHash !== previous.treeHash) state.manualSteps.push(`Review the local edits in ${shared.path} before updating skill "${previous.id}"; Aura left its files and provenance unchanged.`);
+	planLinks(previous.id, context, state);
+}
 function preserveOrRestore(previous, available, shared, context, state) {
 	state.manifestSkills.push(previous);
 	if (shared === void 0) {
@@ -10495,13 +10651,67 @@ function reconcileRemoval(previous, shared, context, state) {
 }
 function planTreeReplacement(shared, desired, context, operations) {
 	const root = join(sharedRoot(context), desired.id);
-	const desiredPaths = new Set(desired.files.map((file) => resolve(root, ...file.path.split("/"))));
-	if (shared !== void 0) operations.push(...removeSkillEntries(shared.entries.filter((entry) => !desiredPaths.has(resolve(entry.path)) && (entry.kind !== "directory" || ![...desiredPaths].some((path) => isStrictDescendant(entry.path, path))))));
-	operations.push(...desired.files.map((file) => ({
-		content: file.content,
-		path: join(root, ...file.path.split("/")),
-		type: "write"
-	})));
+	operations.push(...planSharedSkillTreeUpdate(root, shared?.entries ?? [], desired));
+}
+//#endregion
+//#region src/setup/skill-planner.ts
+function planSkills(context) {
+	const previous = context.manifest.status === "ready" ? context.manifest.value.skills : [];
+	const selected = context.selections.skills?.selected ?? previous.map(toSelection);
+	const duplicate = duplicateLocalId(selected);
+	if (duplicate !== void 0) return abandoned(previous, {
+		path: sharedRoot(context),
+		reason: `Skill "${duplicate}" was selected from more than one source. Choose one source for each installed skill ID.`
+	});
+	const disallowed = disallowedSkillBlockers(selected, context.skillCatalog.policy, sharedRoot(context));
+	if (disallowed.length > 0) return {
+		blockers: disallowed,
+		manifestSkills: previous,
+		manualSteps: [],
+		notices: [],
+		operations: []
+	};
+	const state = {
+		blockers: [],
+		manifestSkills: [],
+		manualSteps: [],
+		notices: [],
+		operations: []
+	};
+	const catalog = new Map([...context.model.availableSkills ?? [], ...context.selections.skills?.resolved ?? []].map((skill) => [skillIdentity(skill.source.id, skill.id), skill]));
+	const previousByIdentity = new Map(previous.map((skill) => [skillIdentity(skill.source, skill.id), skill]));
+	const previousById = new Map(previous.map((skill) => [skill.id, skill]));
+	const acceptedUpdates = new Set(context.selections.skills?.updates ?? []);
+	const sharedById = new Map((context.model.sharedSkills ?? []).map((skill) => [skill.id, skill]));
+	for (const selection of selected) {
+		const identity = skillIdentity(selection.source, selection.id);
+		const previousAtIdentity = previousByIdentity.get(identity);
+		reconcileSelection(selection, previousAtIdentity, previousById.get(selection.id), offeredRevision(previousAtIdentity, catalog.get(identity), acceptedUpdates.has(identity)), sharedById.get(selection.id), context, state);
+	}
+	const desiredIds = new Set(selected.map((selection) => selection.id));
+	for (const skill of previous) if (!desiredIds.has(skill.id)) reconcileRemoval(skill, sharedById.get(skill.id), context, state);
+	return {
+		blockers: Object.freeze(state.blockers),
+		manifestSkills: Object.freeze(state.manifestSkills),
+		manualSteps: Object.freeze(state.manualSteps),
+		notices: Object.freeze(state.notices),
+		operations: Object.freeze(state.operations)
+	};
+}
+function offeredRevision(previous, available, accepted) {
+	return {
+		available,
+		held: previous !== void 0 && available !== void 0 && previous.treeHash !== available.treeHash && !accepted
+	};
+}
+function abandoned(previous, blocker) {
+	return {
+		blockers: [blocker],
+		manifestSkills: previous,
+		manualSteps: [],
+		notices: [],
+		operations: []
+	};
 }
 function duplicateLocalId(selected) {
 	const seen = /* @__PURE__ */ new Set();
@@ -10510,15 +10720,6 @@ function duplicateLocalId(selected) {
 		seen.add(skill.id);
 	}
 }
-function manifestSkill(skill) {
-	return {
-		id: skill.id,
-		pinned: false,
-		source: skill.source.id,
-		treeHash: skill.treeHash,
-		version: skill.version
-	};
-}
 function toSelection(skill) {
 	return {
 		id: skill.id,
@@ -10546,7 +10747,7 @@ function planSetup(context) {
 	blockers.push(...snippetPlan.blockers);
 	const skillPlan = planSkills(context);
 	blockers.push(...skillPlan.blockers);
-	const mcpPlan = planSetupMcp(context, desiredManifest(context.manifest, apps, context.appCatalog, instructionPlan.ownership, context.selections.snippets === void 0 ? void 0 : snippetPlan.manifestSnippets, skillPlan.manifestSkills));
+	const mcpPlan = planSetupMcp(context, desiredManifest(context.manifest, apps, context.appCatalog, instructionPlan.ownership, context.selections.snippets === void 0 ? void 0 : snippetPlan.manifestSnippets, skillPlan.manifestSkills, context));
 	blockers.push(...mcpPlan.blockers);
 	const manifest = mcpPlan.manifest;
 	const baseline = context.selections.baseline;
@@ -10566,7 +10767,11 @@ function planSetup(context) {
 	return Object.freeze({
 		blockers: Object.freeze(blockers),
 		manifest,
-		notices: snippetPlan.notices,
+		notices: [
+			...snippetPlan.notices,
+			...skillPlan.notices,
+			...presetPolicyNotices(context)
+		],
 		plan: Object.freeze({
 			manualSteps: Object.freeze([
 				...appManualSteps(context),
@@ -10579,24 +10784,28 @@ function planSetup(context) {
 		})
 	});
 }
-function desiredManifest(state, apps, appCatalog, ownershipUpdates, snippets, skills) {
+function desiredManifest(state, apps, appCatalog, ownershipUpdates, snippets, skills, context) {
 	const base = state.status === "ready" ? state.value : createEmptyAuraManifest();
 	const ownership = desiredOwnership(base, ownershipUpdates);
 	const withSkills = {
 		...apps === void 0 ? {
 			...base,
 			ownership
-		} : {
+		} : withIgnoredAppSelections({
 			...base,
 			apps: desiredApps(base, apps, appCatalog),
 			ownership
-		},
+		}, base, apps, appCatalog),
 		skills
 	};
-	return snippets === void 0 ? withSkills : {
+	const withSnippets = snippets === void 0 ? withSkills : {
 		...withSkills,
 		snippets
 	};
+	return context.preset?.explicit === true ? {
+		...withSnippets,
+		preset: context.preset.reference
+	} : withSnippets;
 }
 function planSetupSnippets(context, instructionOperations) {
 	return planSnippets(context, plannedSharedContent(instructionOperations, context.model.sharedInstructions.path) ?? context.model.sharedInstructions.content ?? "");
@@ -10659,35 +10868,6 @@ function desiredApps(base, apps, appCatalog) {
 	for (const id of managed) if (!next.has(id)) next.set(id, { managed: true });
 	return Object.fromEntries(next);
 }
-/**
-* Summary lines the plan cannot express as file operations: installing an app Aura does not
-* install itself, and what unchecking a previously-managed app does — the manifest flips to
-* `managed: false` while the app's own configuration stays in place (ownership cleanup is a later
-* milestone).
-*/
-function appManualSteps(context) {
-	const apps = context.selections.apps;
-	if (apps === void 0) return [];
-	return [...installSteps(context, apps.managed), ...stopManagingSteps(context, apps.managed)];
-}
-function installSteps(context, managed) {
-	const steps = [];
-	for (const id of managed) {
-		const entry = context.appCatalog.find((candidate) => catalogEntryId(candidate) === id);
-		if (entry?.kind === "undetected") steps.push(entry.installHint === void 0 ? `Install ${entry.displayName} — its adapter provides no install instructions.` : `Install ${entry.displayName}: ${entry.installHint}`);
-	}
-	return steps;
-}
-function stopManagingSteps(context, managed) {
-	const previous = context.manifest.status === "ready" ? context.manifest.value.apps : {};
-	const managedIds = new Set(managed);
-	const steps = [];
-	for (const [id, app] of Object.entries(previous)) {
-		const entry = context.appCatalog.find((candidate) => catalogEntryId(candidate) === id);
-		if (entry !== void 0 && app.managed && !managedIds.has(id)) steps.push(`Aura stops managing ${catalogEntryName(entry)}; its existing configuration is left in place.`);
-	}
-	return steps;
-}
 //#endregion
 //#region src/setup/summary.ts
 /** The already-converged variant of the summary: nothing to confirm, at most context to show. */
@@ -10711,14 +10891,22 @@ function renderSetupSummary(preview, blockers, notices, withDetail, output) {
 	if (!withDetail && preview.changedOperationCount > 0) output.write("\nRe-run with --detail to see the full diff of every change.\n");
 }
 const NOTICE_HEADINGS = Object.freeze({
+	held: "Managed content kept at its recorded revision:",
 	overwritten: "Hand edits Aura is replacing:",
+	policy: "Effective check policy:",
 	preserved: "Preserved content Aura does not own:"
 });
 function renderNotices(notices, output) {
-	for (const kind of ["overwritten", "preserved"]) {
+	for (const kind of [
+		"overwritten",
+		"preserved",
+		"held",
+		"policy"
+	]) {
 		const matching = notices.filter((notice) => notice.kind === kind);
 		if (matching.length === 0) continue;
-		output.write(`\n${NOTICE_HEADINGS[kind]}\n`);
+		const heading = matching.find((notice) => notice.heading !== void 0)?.heading;
+		output.write(`\n${safe(heading ?? NOTICE_HEADINGS[kind])}\n`);
 		for (const notice of matching) output.write(`  · ${safe(notice.message)}\n`);
 	}
 }
@@ -11080,13 +11268,13 @@ function requiringPreset(preset, config) {
 * rest of the run, so a plugin cannot hand us an arbitrarily large one.
 */
 const MAX_SNIPPET_BYTES = 65536;
-function createSnippetCatalog(snippets, manifest) {
+function createSnippetCatalog(snippets, manifest, presetIds = []) {
 	let resolved = [];
 	let pending;
 	return {
 		entries: () => resolved,
 		load: () => {
-			pending ??= resolveSnippetCatalog(snippets, manifest).then((entries) => {
+			pending ??= resolveSnippetCatalog(snippets, manifest, presetIds).then((entries) => {
 				resolved = entries;
 				return entries;
 			});
@@ -11095,19 +11283,32 @@ function createSnippetCatalog(snippets, manifest) {
 	};
 }
 /** Resolves every registry source once and retains manifest-only selections as unavailable rows. */
-async function resolveSnippetCatalog(snippets, manifest) {
+async function resolveSnippetCatalog(snippets, manifest, presetIds = []) {
 	const registered = new Set(snippets.map((snippet) => snippet.id));
 	const resolved = await Promise.all(snippets.map(resolveSnippet));
 	const previous = manifest.status === "ready" ? manifest.value.snippets : [];
-	return Object.freeze([...resolved, ...previous.filter((snippet) => !registered.has(snippet.id)).map((snippet) => Object.freeze({
-		category: "general",
-		description: "Previously selected, but no installed plugin currently provides it.",
-		id: snippet.id,
-		name: snippet.id,
-		reason: "The contributing plugin is unavailable.",
-		status: "unavailable",
-		version: snippet.version
-	}))]);
+	const previousIds = new Set(previous.map((snippet) => snippet.id));
+	return Object.freeze([
+		...resolved,
+		...previous.filter((snippet) => !registered.has(snippet.id)).map((snippet) => Object.freeze({
+			category: "general",
+			description: "Previously selected, but no installed plugin currently provides it.",
+			id: snippet.id,
+			name: snippet.id,
+			reason: "The contributing plugin is unavailable.",
+			status: "unavailable",
+			version: snippet.version
+		})),
+		...presetIds.filter((id) => !registered.has(id) && !previousIds.has(id)).map((id) => Object.freeze({
+			category: "general",
+			description: "Selected by the active team preset, but unavailable in this build.",
+			id,
+			name: id,
+			reason: "No installed plugin provides this preset selection.",
+			status: "unavailable",
+			version: "unknown"
+		}))
+	]);
 }
 async function resolveSnippet(snippet) {
 	const common = {
@@ -11160,7 +11361,7 @@ function errorMessage(error) {
 const appsStep = {
 	gather: async (context, io) => {
 		const catalog = context.appCatalog;
-		if (catalog.length === 0) return emptyCatalogOutcome$1(context, io);
+		if (catalog.length === 0) return emptyCatalogOutcome$2(context, io);
 		const previouslyManaged = previouslyManagedIds(context);
 		const detectedCount = detectedAppCount(catalog);
 		if (context.revisited !== true) emitBanner(catalog, detectedCount, io);
@@ -11174,21 +11375,21 @@ const appsStep = {
 			prompt: "Which applications should Aura manage?"
 		}, io, detectedCount > 0 || previouslyManaged.size > 0);
 		if (selected === SETUP_ABORTED || selected === SETUP_BACK) return selected;
-		return withApps(context, selected);
+		return withApps(context, selected, catalog);
 	},
 	compactTitle: "Apps",
 	id: "apps",
 	title: "Applications"
 };
 /** With no adapters registered there is nothing to ask; ← keeps walking, → passes through. */
-function emptyCatalogOutcome$1(context, io) {
+function emptyCatalogOutcome$2(context, io) {
 	if (context.enteredBackward === true) return SETUP_BACK;
 	if (context.revisited !== true) io.note("No agent application adapters are registered.");
 	return context.selections;
 }
 /** A re-entered step shows the answer this run already gave it, not its cold-start proposal. */
 function initialSelection(context, catalog, previouslyManaged) {
-	return context.selections.apps?.managed ?? catalog.filter((entry) => entry.kind === "detected" || previouslyManaged.has(catalogEntryId(entry))).map(catalogEntryId);
+	return context.selections.apps?.managed ?? catalog.filter((entry) => previouslyManaged.has(catalogEntryId(entry)) || entry.kind === "detected" && !ignoredAppIds(context).has(catalogEntryId(entry))).map(catalogEntryId);
 }
 function detectedAppCount(catalog) {
 	return catalog.filter((entry) => entry.kind === "detected").length;
@@ -11210,12 +11411,27 @@ async function askForSelection(question, io, mustConfirmEmpty) {
 		if (confirmation === "aborted") return SETUP_ABORTED;
 	}
 }
-function withApps(context, managed) {
+function withApps(context, managed, catalog) {
+	const selected = new Set(managed);
+	const manifestApps = context.manifest.status === "ready" ? new Set(Object.keys(context.manifest.value.apps)) : /* @__PURE__ */ new Set();
+	const preserved = ignoredAppIds(context);
+	const ignored = catalog.flatMap((entry) => {
+		const id = catalogEntryId(entry);
+		if (selected.has(id)) return [];
+		if (entry.kind === "detected" && !manifestApps.has(id)) return [id];
+		return preserved.has(id) ? [id] : [];
+	});
 	return {
 		...context.selections,
-		apps: { managed }
+		apps: ignored.length === 0 ? { managed } : {
+			ignored,
+			managed
+		}
 	};
 }
+function ignoredAppIds(context) {
+	return new Set(context.manifest.status === "ready" ? context.manifest.value.ignoredApps ?? [] : []);
+}
 function previouslyManagedIds(context) {
 	if (context.manifest.status !== "ready") return /* @__PURE__ */ new Set();
 	return new Set(Object.entries(context.manifest.value.apps).filter(([, app]) => app.managed).map(([id]) => id));
@@ -11965,7 +12181,6 @@ function appDisabledReason(entry, managed, supportedApps) {
 //#endregion
 //#region src/setup/steps/mcp.ts
 const ADD_CUSTOM = "mcp:add-custom";
-/** Selects catalog and custom MCP servers, then captures their target name, scope, and apps. */
 const mcpStep = {
 	addKind: "mcp",
 	compactTitle: "MCP",
@@ -11992,8 +12207,8 @@ async function gatherMcp(context, io) {
 			mcp: { servers: [] }
 		};
 	}
-	let selectedKeys = initialKeys(entries, context.interactive);
-	const overriddenRequiredIds = new Set(context.selections.mcp?.overriddenRequiredIds ?? []);
+	const overriddenRequiredIds = new Set(context.selections.mcp?.overriddenRequiredIds ?? (context.manifest.status === "ready" ? context.manifest.value.overrides?.requiredMcpServers ?? [] : []));
+	let selectedKeys = initialKeys(entries, context.interactive, overriddenRequiredIds);
 	for (;;) {
 		const picked = await pickServers(context, entries, selectedKeys, overriddenRequiredIds, io);
 		if (picked === SETUP_ABORTED || picked === SETUP_BACK) return picked;
@@ -12063,8 +12278,8 @@ function matchesEntry(server, entry) {
 * sight is exactly the first-configuration the skills step refuses for the same reason. Left
 * unchecked the requirement becomes a blocker naming the interactive run, never a silent skip.
 */
-function initialKeys(entries, interactive) {
-	return new Set(entries.filter((entry) => entry.selectedServer !== void 0 || entry.required && interactive).map((entry) => entry.key));
+function initialKeys(entries, interactive, overriddenRequiredIds) {
+	return new Set(entries.filter((entry) => entry.selectedServer !== void 0 || entry.required && interactive && (entry.catalog === void 0 || !overriddenRequiredIds.has(entry.catalog.id))).map((entry) => entry.key));
 }
 async function pickServers(context, entries, initial, overriddenRequiredIds, io) {
 	const question = {
@@ -12086,7 +12301,7 @@ async function pickServers(context, entries, initial, overriddenRequiredIds, io)
 		const selected = new Set(selectedValues(result["mcp-servers"]));
 		const missingRequired = reconcileRequiredOverrides(entries, selected, overriddenRequiredIds);
 		if (missingRequired.length === 0 || !context.interactive) return selected;
-		const confirmation = await io.confirm(`Override the team preset for this run and omit ${missingRequired.map(safe).join(", ")}?`);
+		const confirmation = await io.confirm(`Override the team preset on this machine and omit ${missingRequired.map(safe).join(", ")}?`);
 		if (confirmation === "accepted") {
 			for (const id of missingRequired) overriddenRequiredIds.add(id);
 			return selected;
@@ -12098,14 +12313,14 @@ function reconcileRequiredOverrides(entries, selected, overriddenRequiredIds) {
 	const requiredIds = requiredCatalogIds(entries);
 	const missing = requiredIds.filter((id) => !entries.some((entry) => entry.catalog?.id === id && selected.has(entry.key)));
 	for (const id of requiredIds) if (!missing.includes(id)) overriddenRequiredIds.delete(id);
-	return missing;
+	return missing.filter((id) => !overriddenRequiredIds.has(id));
 }
 function requiredCatalogIds(entries) {
 	return [...new Set(entries.flatMap((entry) => entry.required && entry.catalog !== void 0 ? [entry.catalog.id] : []))];
 }
 function serverOption(entry) {
 	const configured = entry.selectedServer !== void 0 || entry.existing !== void 0;
-	const tags = [...entry.required ? ["preset required"] : [], ...configured ? [entry.catalog === void 0 ? "custom" : "configured"] : []];
+	const tags = [...entry.required ? ["from preset", "required"] : [], ...configured ? [entry.catalog === void 0 ? "custom" : "configured"] : []];
 	const suffix = tags.length === 0 ? "" : ` (${tags.join(", ")})`;
 	return {
 		description: entry.sourceName === void 0 ? "Custom server" : `Plugin: ${entry.sourceName}`,
@@ -12229,6 +12444,7 @@ function pickerOptions(inputs) {
 	const unavailableById = new Map(inputs.listing.unavailableSources.map((source) => [source.id, source]));
 	const policy = inputs.catalog.policy;
 	const unsupported = !hasSkillsHome(inputs.managedApps);
+	const preset = new Set(inputs.presetSkills.map((skill) => skillIdentity(skill.source, skill.id)));
 	const entryRows = sortForDisplay(inputs.listing.entries, (entry) => [
 		entry.sourceName,
 		entry.name,
@@ -12240,7 +12456,7 @@ function pickerOptions(inputs) {
 			disabledNote: "no selected app supports skills"
 		} : {},
 		group: entry.sourceName,
-		label: entry.name,
+		label: `${entry.name}${preset.has(entry.identity) ? " (from preset)" : ""}`,
 		...entry.preview === void 0 ? {} : { preview: entry.preview },
 		value: entry.identity
 	}));
@@ -12272,17 +12488,92 @@ function pickerOptions(inputs) {
 		label: source.name,
 		value: `source:${source.id}`
 	}));
+	const represented = /* @__PURE__ */ new Set([...inputs.listing.entries.map((entry) => entry.identity), ...inputs.manifestSkills.map((skill) => skillIdentity(skill.source, skill.id))]);
+	const presetRows = inputs.presetSkills.filter((skill) => !represented.has(skillIdentity(skill.source, skill.id))).map((skill) => ({
+		description: "Selected by the active team preset, but unavailable in this run.",
+		disabled: true,
+		disabledNote: "preset selection unavailable",
+		group: skill.source,
+		label: `${skill.id} (from preset)`,
+		value: skillIdentity(skill.source, skill.id)
+	}));
 	return [
 		...entryRows,
 		...manifestRows,
+		...presetRows,
 		...sourceRows
 	];
 }
 //#endregion
+//#region src/setup/steps/skill-review.ts
+const REVIEW_PREFIX$1 = "review:";
+/**
+* Whether the source revision differs from the recorded one at all.
+*
+* A diverged revision — a rollback, or a pair this build cannot order — is reviewable for the same
+* reason an upgrade is: the planner holds the recorded revision either way, so a revision that is
+* never offered here is one the user can never resolve, and it would sit held with nothing on
+* screen naming it.
+*/
+function movedFrom(previous, available) {
+	return managedContentRevisionStatus(previous.version, previous.treeHash, available.version, available.treeHash) !== "current";
+}
+/** No review for an unchanged manifest skill or a failed fetch; both preserve the prior entry. */
+function reviewQuestion$1(identity, decisions, resolution, recorded, entry, selection) {
+	const pack = resolution.resolved.get(identity);
+	const previous = recorded.get(identity);
+	if (previous !== void 0 && (pack === void 0 || !movedFrom(previous, pack))) return [];
+	const localId = entry?.id ?? selection?.id ?? identity;
+	const change = revisionChange(previous, pack);
+	return [{
+		id: `${REVIEW_PREFIX$1}${identity}`,
+		initial: [decisions[identity] ?? "skip"],
+		kind: "select",
+		label: `Review ${localId}`,
+		options: [skipOption(change), installOption(localId, change, pack, entry, resolution.problems.get(identity))],
+		prompt: reviewPrompt$1(localId, change, pack, entry)
+	}];
+}
+const CHANGE_VERBS = Object.freeze({
+	install: "Install",
+	switch: "Switch to",
+	update: "Update to"
+});
+function revisionChange(previous, pack) {
+	if (previous === void 0) return "install";
+	if (pack === void 0) return "update";
+	return managedContentRevisionStatus(previous.version, previous.treeHash, pack.version, pack.treeHash) === "update" ? "update" : "switch";
+}
+function skipOption(change) {
+	return {
+		description: change === "install" ? "Leave this skill out of the plan." : "Keep the installed version and its manifest entry.",
+		label: change === "install" ? "Skip — do not install" : "Skip — keep the installed version",
+		value: "skip"
+	};
+}
+function reviewPrompt$1(localId, change, pack, entry) {
+	const sourceName = entry?.sourceName ?? "its directory";
+	if (pack === void 0) return `"${localId}" could not be fetched from ${sourceName}.`;
+	return `${CHANGE_VERBS[change]} "${pack.name}" ${pack.version} from ${sourceName}? Press p on the install row to read its full SKILL.md before deciding.`;
+}
+function installOption(localId, change, pack, entry, problem) {
+	if (pack === void 0) return {
+		description: problem ?? "This skill could not be fetched.",
+		disabled: true,
+		label: `Install ${localId}`,
+		value: "install"
+	};
+	return {
+		description: entry?.sourceUrl ?? entry?.sourceName ?? "",
+		label: `${CHANGE_VERBS[change]} ${localId} ${pack.version}`,
+		preview: pack.files.find((file) => file.path === "SKILL.md")?.content,
+		value: "install"
+	};
+}
+//#endregion
 //#region src/setup/steps/skill-stages.ts
-const REVIEW_PREFIX = "review:";
 function skillStages(inputs) {
-	return [pickerStage(inputs), reviewStage(inputs)];
+	return [pickerStage$1(inputs), reviewStage$1(inputs)];
 }
 /** A remote identity's install needs a fetch, and therefore the review boundary. */
 function isRemoteIdentity(identity) {
@@ -12302,15 +12593,19 @@ function selectionsByIdentity(inputs) {
 			source: skill.source
 		});
 	}
+	for (const skill of inputs.presetSkills) {
+		const identity = skillIdentity(skill.source, skill.id);
+		if (!selections.has(identity)) selections.set(identity, skill);
+	}
 	return selections;
 }
 function manifestByIdentity(manifestSkills) {
 	return new Map(manifestSkills.map((skill) => [skillIdentity(skill.source, skill.id), skill]));
 }
-function pickerStage(inputs) {
+function pickerStage$1(inputs) {
 	const supportsSkills = hasSkillsHome(inputs.managedApps);
 	const selectable = new Set(supportsSkills ? inputs.listing.entries.map((entry) => entry.identity) : []);
-	const previous = new Set(inputs.manifestSkills.map((skill) => skillIdentity(skill.source, skill.id)));
+	const previous = new Set([...inputs.manifestSkills, ...inputs.presetSkills].map((skill) => skillIdentity(skill.source, skill.id)));
 	return {
 		apply: (state, answers) => ({
 			...state,
@@ -12331,75 +12626,43 @@ function pickerStage(inputs) {
 		}
 	};
 }
-function reviewStage(inputs) {
+function reviewStage$1(inputs) {
 	const recorded = manifestByIdentity(inputs.manifestSkills);
 	const offered = selectionsByIdentity(inputs);
 	const entries = new Map(inputs.listing.entries.map((entry) => [entry.identity, entry]));
+	const bundled = bundledByIdentity(inputs.availableSkills);
+	const reviewable = (identity) => needsReview(identity, recorded, bundled);
 	return {
-		apply: (state, answers) => {
-			const decisions = { ...state.decisions };
-			for (const [id, answer] of Object.entries(answers)) if (id.startsWith(REVIEW_PREFIX)) decisions[id.slice(7)] = selectedValues(answer)[0] ?? "skip";
-			return {
-				...state,
-				decisions
-			};
-		},
+		apply: (state, answers) => ({
+			...state,
+			decisions: foldDecisions(state.decisions, answers, REVIEW_PREFIX$1, "skip")
+		}),
 		compactLabel: "Review",
-		isApplicable: (state) => state.selected.some(isRemoteIdentity),
+		isApplicable: (state) => state.selected.some(reviewable),
 		label: "Review",
 		questions: async (state) => {
 			const remote = state.selected.filter(isRemoteIdentity);
-			if (remote.length === 0) return;
 			const resolution = await inputs.catalog.resolve(remote.flatMap((identity) => {
 				const selection = offered.get(identity);
 				return selection === void 0 ? [] : [selection];
 			}), inputs.approvedPrivateSourceIds);
-			const questions = remote.flatMap((identity) => reviewQuestion(identity, state, resolution, recorded, entries.get(identity), offered.get(identity)));
+			const resolutionWithBundled = {
+				problems: resolution.problems,
+				resolved: new Map([...resolution.resolved, ...bundled])
+			};
+			const questions = state.selected.filter(reviewable).flatMap((identity) => reviewQuestion$1(identity, state.decisions, resolutionWithBundled, recorded, entries.get(identity), offered.get(identity)));
 			return questions.length === 0 ? void 0 : questions;
 		}
 	};
 }
-/** No review for an unchanged manifest skill or a failed fetch; both preserve the prior entry. */
-function reviewQuestion(identity, state, resolution, recorded, entry, selection) {
-	const pack = resolution.resolved.get(identity);
-	const previous = recorded.get(identity);
-	if (previous !== void 0 && (pack === void 0 || pack.treeHash === previous.treeHash)) return [];
-	const localId = entry?.id ?? selection?.id ?? identity;
-	const update = previous !== void 0;
-	return [{
-		id: `${REVIEW_PREFIX}${identity}`,
-		initial: [state.decisions[identity] ?? "skip"],
-		kind: "select",
-		label: `Review ${localId}`,
-		options: [skipOption(update), installOption(localId, update, pack, entry, resolution.problems.get(identity))],
-		prompt: reviewPrompt(localId, update, pack, entry)
-	}];
+function bundledByIdentity(packs) {
+	return new Map(packs.map((pack) => [skillIdentity(pack.source.id, pack.id), pack]));
 }
-function skipOption(update) {
-	return {
-		description: update ? "Keep the installed version and its manifest entry." : "Leave this skill out of the plan.",
-		label: update ? "Skip — keep the installed version" : "Skip — do not install",
-		value: "skip"
-	};
-}
-function reviewPrompt(localId, update, pack, entry) {
-	const sourceName = entry?.sourceName ?? "its directory";
-	if (pack === void 0) return `"${localId}" could not be fetched from ${sourceName}.`;
-	return `${update ? "Update" : "Install"} "${pack.name}" ${pack.version} from ${sourceName}? Press p on the install row to read its full SKILL.md before deciding.`;
-}
-function installOption(localId, update, pack, entry, problem) {
-	if (pack === void 0) return {
-		description: problem ?? "This skill could not be fetched.",
-		disabled: true,
-		label: `Install ${localId}`,
-		value: "install"
-	};
-	return {
-		description: entry?.sourceUrl ?? entry?.sourceName ?? "",
-		label: `${update ? "Update to" : "Install"} ${localId} ${pack.version}`,
-		preview: pack.files.find((file) => file.path === "SKILL.md")?.content,
-		value: "install"
-	};
+function needsReview(identity, recorded, bundled) {
+	if (isRemoteIdentity(identity)) return true;
+	const previous = recorded.get(identity);
+	const available = bundled.get(identity);
+	return previous !== void 0 && available !== void 0 && movedFrom(previous, available);
 }
 //#endregion
 //#region src/setup/steps/skill-finalize.ts
@@ -12490,13 +12753,15 @@ async function gatherApprovedSkills(context, io, approval) {
 	const listing = await context.skillCatalog.load(approvedPrivateSourceIds);
 	const manifestSkills = recordedSkills(context);
 	emitNotes(context, io, listing, manifestSkills);
-	if (isEmptyCatalog(listing, manifestSkills)) return emptyCatalogOutcome(context);
+	if (isEmptyCatalog(listing, manifestSkills)) return emptyCatalogOutcome$1(context);
 	const inputs = {
 		approvedPrivateSourceIds,
+		availableSkills: context.model.availableSkills ?? [],
 		catalog: context.skillCatalog,
 		listing,
 		managedApps: managedSkillApps(context),
-		manifestSkills
+		manifestSkills,
+		presetSkills: context.preset?.skills ?? []
 	};
 	const opening = openingSelection(context, inputs, manifestSkills);
 	noteHeldBack(inputs, io, opening.heldBack);
@@ -12505,7 +12770,7 @@ async function gatherApprovedSkills(context, io, approval) {
 		flow: context.flow
 	});
 	if (result === SETUP_ABORTED || result === SETUP_BACK) return result;
-	return completedSelections(context, approval, await finalizeSkills(result, inputs, manifestSkills), manifestSkills);
+	return completedSelections$1(context, approval, await finalizeSkills(result, inputs, manifestSkills), manifestSkills, result.decisions);
 }
 /**
 * Says out loud that a changed Apps answer cleared picks the user had already made.
@@ -12522,13 +12787,15 @@ function noteHeldBack(inputs, io, heldBack) {
 function recordedSkills(context) {
 	return context.manifest.status === "ready" ? context.manifest.value.skills : [];
 }
-function emptyCatalogOutcome(context) {
+function emptyCatalogOutcome$1(context) {
 	return context.enteredBackward === true ? SETUP_BACK : { ...context.selections };
 }
 function chainEntry(context) {
 	return context.enteredBackward === true ? "end" : "start";
 }
-function completedSelections(context, approval, skills, manifestSkills) {
+function completedSelections$1(context, approval, skills, manifestSkills, decisions) {
+	const recorded = new Set(manifestSkills.map((skill) => skillIdentity(skill.source, skill.id)));
+	const updates = Object.entries(decisions).filter(([identity, decision]) => decision === "install" && recorded.has(identity)).map(([identity]) => identity);
 	if (skills.selected.length === 0 && manifestSkills.length === 0) {
 		const { skills: _staleSkills, ...selections } = context.selections;
 		return approval.length === 0 ? selections : {
@@ -12539,10 +12806,14 @@ function completedSelections(context, approval, skills, manifestSkills) {
 			}
 		};
 	}
+	const selection = updates.length === 0 ? skills : {
+		...skills,
+		updates
+	};
 	return {
 		...context.selections,
-		skills: approval.length === 0 ? skills : {
-			...skills,
+		skills: approval.length === 0 ? selection : {
+			...selection,
 			approvedPrivateSourceIds: approval
 		}
 	};
@@ -12582,47 +12853,152 @@ function isEmptyCatalog(listing, manifestSkills) {
 /** The chain's opening state, plus whatever the current Apps answer forces it to leave out. */
 function openingSelection(context, inputs, manifestSkills) {
 	const recorded = new Set(manifestSkills.map((skill) => skillIdentity(skill.source, skill.id)));
-	const opening = initialSkillSelection(context.selections.skills?.selected.map((skill) => skillIdentity(skill.source, skill.id)) ?? [...recorded], recorded, inputs.managedApps);
+	const opening = initialSkillSelection(context.selections.skills?.selected.map((skill) => skillIdentity(skill.source, skill.id)) ?? (context.manifest.status === "ready" ? [...recorded] : inputs.presetSkills.map((skill) => skillIdentity(skill.source, skill.id))), recorded, inputs.managedApps);
 	return {
 		heldBack: opening.heldBack,
 		state: {
-			decisions: {},
+			decisions: Object.fromEntries((context.selections.skills?.updates ?? []).map((identity) => [identity, "install"])),
 			selected: opening.selected
 		}
 	};
 }
 //#endregion
+//#region src/setup/steps/snippet-stages.ts
+const REVIEW_PREFIX = "snippet-update:";
+function snippetStages(inputs) {
+	return [pickerStage(inputs), reviewStage(inputs)];
+}
+function snippetOptions(inputs) {
+	const { catalog, preset, previous } = inputs;
+	return sortForDisplay(catalog, (entry) => [
+		entry.category,
+		entry.name,
+		entry.id
+	]).map((entry) => entry.status === "available" ? {
+		description: entry.description,
+		group: entry.category,
+		label: `${entry.name}${preset.has(entry.id) ? " (from preset)" : ""}`,
+		preview: entry.content,
+		value: entry.id
+	} : {
+		description: previous.has(entry.id) ? `${entry.reason} Clear it to remove the snippet.` : `${entry.description} ${entry.reason}`,
+		disabled: true,
+		group: entry.category,
+		label: `${previous.has(entry.id) ? `${entry.name} (preserved)` : entry.name}${preset.has(entry.id) ? " (from preset)" : ""}`,
+		value: entry.id
+	});
+}
+/** The ids whose review answer accepted the available revision. */
+function acceptedUpdates(state) {
+	return state.selected.filter((id) => state.decisions[id] === "update");
+}
+function pickerStage(inputs) {
+	const options = snippetOptions(inputs);
+	const selectable = new Set(options.filter((option) => option.disabled !== true).map((option) => option.value));
+	return {
+		apply: (state, answers) => ({
+			...state,
+			selected: selectedValues(answers["snippets"]).filter((id) => selectable.has(id) || inputs.retained.has(id))
+		}),
+		label: "Snippets",
+		questions: (state) => options.length === 0 ? void 0 : [{
+			id: "snippets",
+			initial: state.selected,
+			kind: "multiselect",
+			label: "Snippets",
+			options,
+			prompt: "Which snippets should Aura add to the shared instructions?"
+		}]
+	};
+}
+function reviewStage(inputs) {
+	const installed = installedById(inputs.context);
+	const available = new Map(inputs.catalog.map((entry) => [entry.id, entry]));
+	return {
+		apply: (state, answers) => ({
+			...state,
+			decisions: foldDecisions(state.decisions, answers, REVIEW_PREFIX, "keep")
+		}),
+		compactLabel: "Review",
+		label: "Review",
+		questions: (state) => {
+			const questions = state.selected.flatMap((id) => reviewQuestion(id, state, inputs, installed.get(id), available.get(id)));
+			return questions.length === 0 ? void 0 : questions;
+		}
+	};
+}
+/**
+* The one form asking about a snippet whose source revision no longer matches the recorded one.
+*
+* A diverged revision — a rollback, or one this build cannot order — is offered too, because the
+* alternative is holding the snippet at its recorded revision forever with nothing on screen. Both
+* default to keeping what is installed, which is what makes a non-interactive run safe.
+*/
+function reviewQuestion(id, state, inputs, installed, available) {
+	if (installed === void 0 || available?.status !== "available") return [];
+	const status = managedContentRevisionStatus(installed.version, installed.hash, available.version, hashManagedSnippet(available.content));
+	if (status === "current") return [];
+	const preview = updatePreview(inputs.context, installed, available.content);
+	return [{
+		id: `${REVIEW_PREFIX}${id}`,
+		initial: [state.decisions[id] ?? "keep"],
+		kind: "select",
+		label: `Review ${id}`,
+		options: [{
+			description: `Keep installed version ${installed.version}.`,
+			label: "Keep installed version",
+			value: "keep"
+		}, {
+			...preview === void 0 ? {
+				disabled: true,
+				disabledNote: "resolve MGD-001 first"
+			} : { preview },
+			description: `Review and install version ${available.version}.`,
+			label: `${status === "update" ? "Update to" : "Switch to"} ${available.version}`,
+			value: "update"
+		}],
+		prompt: reviewPrompt(id, status, installed.version, available.version)
+	}];
+}
+function reviewPrompt(id, status, installedVersion, availableVersion) {
+	return status === "update" ? `A newer source revision is available for ${id}.` : `The installed plugin offers ${id} at version ${availableVersion}, which is not newer than the recorded version ${installedVersion}. Aura keeps the recorded revision unless you switch to it here.`;
+}
+function installedById(context) {
+	return new Map(context.manifest.status === "ready" ? context.manifest.value.snippets.map((snippet) => [snippet.id, snippet]) : []);
+}
+/** The diff shown on the update row, or nothing when local edits make it unsafe to offer. */
+function updatePreview(context, installed, availableContent) {
+	const document = context.model.sharedInstructions;
+	if (document.content === void 0) return;
+	const parsed = readManagedBlock(document.content);
+	if (parsed.status !== "present") return;
+	const snippet = parsed.block.snippets.find((candidate) => candidate.id === installed.id);
+	if (snippet === void 0 || !snippet.hashMatches || snippet.computedHash !== installed.hash) return;
+	return diffManagedSnippet(document.path, snippet.content, availableContent);
+}
+//#endregion
 //#region src/setup/steps/snippets.ts
+/**
+* The snippets step: a picker over every available snippet, then a review form per pending update.
+*
+* The two forms run as one chain so ← walks back from the review into the picker rather than out
+* of the step: leaving would discard both the boxes just ticked and every review already answered.
+* Every review defaults to keeping the installed version, which is what holds managed content at
+* its recorded revision under `--yes`.
+*/
 const snippetsStep = {
 	addKind: "snippet",
 	gather: async (context, io) => {
 		const catalog = await context.snippetCatalog.load();
-		const previous = previousSnippetIds(context);
-		const options = snippetOptions(catalog, previous);
+		const inputs = stageInputs(context, catalog);
 		if (context.revisited !== true) emitUnavailableNotes(catalog, io.note);
-		if (options.length === 0) {
-			if (context.enteredBackward === true) return SETUP_BACK;
-			if (context.revisited !== true) io.note("No snippets are available from the installed plugins.");
-			return {
-				...context.selections,
-				snippets: { selected: [] }
-			};
-		}
-		const result = await io.ask([{
-			id: "snippets",
-			initial: context.selections.snippets?.selected ?? options.filter((option) => previous.has(option.value)).map((option) => option.value),
-			kind: "multiselect",
-			label: "Snippets",
-			options,
-			prompt: "Which snippets should Aura add to the shared instructions?"
-		}]);
-		if (result === "aborted") return SETUP_ABORTED;
-		if (result === "back") return SETUP_BACK;
-		const selected = selectedSnippetIds(options, previous, selectedValues(result["snippets"]));
-		return {
-			...context.selections,
-			snippets: { selected }
-		};
+		if (snippetOptions(inputs).length === 0) return emptyCatalogOutcome(context, io);
+		const result = await runFormChain(snippetStages(inputs), openingState(context, inputs), io, {
+			entry: context.enteredBackward === true ? "end" : "start",
+			flow: context.flow
+		});
+		if (result === SETUP_ABORTED || result === SETUP_BACK) return result;
+		return completedSelections(context, result);
 	},
 	id: "snippets",
 	prerequisites: [{
@@ -12632,42 +13008,49 @@ const snippetsStep = {
 	}],
 	title: "Snippets"
 };
+function stageInputs(context, catalog) {
+	const previous = previousSnippetIds(context);
+	const preset = new Set(context.preset?.snippets ?? []);
+	return {
+		catalog,
+		context,
+		preset,
+		previous,
+		retained: context.manifest.status === "ready" ? previous : preset
+	};
+}
+/** The chain's opening state: this run's answers if it already has some, else the retained set. */
+function openingState(context, inputs) {
+	const selected = context.selections.snippets?.selected ?? snippetOptions(inputs).filter((option) => inputs.retained.has(option.value)).map((option) => option.value);
+	return {
+		decisions: Object.fromEntries((context.selections.snippets?.updates ?? []).map((id) => [id, "update"])),
+		selected
+	};
+}
+function completedSelections(context, state) {
+	const updates = acceptedUpdates(state);
+	return {
+		...context.selections,
+		snippets: updates.length === 0 ? { selected: state.selected } : {
+			selected: state.selected,
+			updates
+		}
+	};
+}
+function emptyCatalogOutcome(context, io) {
+	if (context.enteredBackward === true) return SETUP_BACK;
+	if (context.revisited !== true) io.note("No snippets are available from the installed plugins.");
+	return {
+		...context.selections,
+		snippets: { selected: [] }
+	};
+}
 function previousSnippetIds(context) {
 	return new Set(context.manifest.status === "ready" ? context.manifest.value.snippets.map((snippet) => snippet.id) : []);
 }
 function emitUnavailableNotes(catalog, note) {
 	for (const entry of catalog) if (entry.status === "unavailable") note(`Snippet ${entry.id} is unavailable: ${entry.reason}`);
 }
-/**
-* Keeps what the user answered, in the order they were offered.
-*
-* An unavailable row cannot be checked, but one carried over from a previous run stays eligible so
-* clearing it is how a user drops a snippet whose plugin is gone. Re-adding it here instead would
-* make that selection permanent.
-*/
-function selectedSnippetIds(options, previous, answered) {
-	const selectable = new Set(options.filter((option) => option.disabled !== true).map((option) => option.value));
-	return answered.filter((id) => selectable.has(id) || previous.has(id));
-}
-function snippetOptions(catalog, previous) {
-	return sortForDisplay(catalog, (entry) => [
-		entry.category,
-		entry.name,
-		entry.id
-	]).map((entry) => entry.status === "available" ? {
-		description: entry.description,
-		group: entry.category,
-		label: entry.name,
-		preview: entry.content,
-		value: entry.id
-	} : {
-		description: previous.has(entry.id) ? `${entry.reason} Clear it to remove the snippet.` : `${entry.description} ${entry.reason}`,
-		disabled: true,
-		group: entry.category,
-		label: previous.has(entry.id) ? `${entry.name} (preserved)` : entry.name,
-		value: entry.id
-	});
-}
 //#endregion
 //#region src/setup/steps/index.ts
 /**
@@ -12747,6 +13130,7 @@ async function runSetup(request) {
 		presetOrigin: configured.presetOrigin,
 		registry: request.registry
 	});
+	const preset = setupPresetContext(request, configured.config, configured.preset);
 	const stepContext = {
 		appCatalog: buildAppCatalog(request.registry.adapters, model, scan.skipped),
 		...initialFindings === void 0 ? {} : { findings: initialFindings },
@@ -12756,7 +13140,8 @@ async function runSetup(request) {
 		mcpCatalog: catalogs.mcpCatalog,
 		model: effectiveModel,
 		skillCatalog: catalogs.skillCatalog,
-		snippetCatalog: createSnippetCatalog(request.registry.snippets, model.manifest)
+		snippetCatalog: createSnippetCatalog(request.registry.snippets, model.manifest, preset?.snippets ?? []),
+		...preset === void 0 ? {} : { preset }
 	};
 	let start = {
 		index: 0,
@@ -12791,6 +13176,32 @@ async function runSetup(request) {
 		manifest: ready.manifest
 	});
 }
+function setupPresetContext(request, config, preset) {
+	const selected = config.preset;
+	if (selected === void 0 || preset === void 0) return;
+	return Object.freeze({
+		checkSummary: presetCheckSummary(config),
+		explicit: request.cliReference !== void 0,
+		name: selected.name,
+		reference: request.cliReference ?? selected.reference,
+		skills: Object.freeze([...preset.skills ?? []]),
+		snippets: Object.freeze([...preset.snippets ?? []])
+	});
+}
+function presetCheckSummary(config) {
+	const lines = [];
+	for (const [id, check] of Object.entries(config.checks)) {
+		if (check.enabled.provenance.layer === "preset") lines.push(`${id}: ${check.enabled.value ? "enabled" : "disabled"}`);
+		if (check.severity.provenance.layer === "preset") lines.push(`${id}: severity ${check.severity.value}`);
+		if (check.thresholds.provenance.layer === "preset") lines.push(`${id}: ${formatThresholds(check.thresholds.value)}`);
+	}
+	return Object.freeze(lines);
+}
+/** Thresholds read as settings, not as the JSON they happen to be stored in. */
+function formatThresholds(thresholds) {
+	const pairs = Object.entries(thresholds).map(([name, value]) => `${name}=${typeof value === "object" ? JSON.stringify(value) : String(value)}`);
+	return pairs.length === 0 ? "no thresholds" : pairs.join(", ");
+}
 //#endregion
 //#region src/setup/wizard-scripted.ts
 /**