@tryaura/aura-cli 0.3.1 → 0.4.0

package/dist/{run.boundary-NVWIwGgg.js → run.boundary-fZhCH0bP.js}

@@ -1,4 +1,4 @@
-import { A as displayPath, C as isRecord$4, D as SHARED_INSTRUCTIONS_TEMPLATE, E as AuraManifestError, S as errorMessage$1, T as resolveAuraManifestPath, _ as assertAuraManifestWritable, a as planDesiredMcpConvergence, b as parseAuraManifest, c as rememberMcpConvergence, d as sharedSkillsRoot, g as hashContent, h as stripLegacyManagedBlock, k as pluralize, m as planSharedSkillTreeUpdate, n as appendInstructionFragments, p as managedContentRevisionStatus, r as forgetMcpPlans, t as planSharedInstructionLink, u as planSkillDeployment, v as createAuraManifestWriteOperation, w as AURA_MANIFEST_PATH, x as errorCode, y as createEmptyAuraManifest } from "./shared-link-plan-AcSkw9bO.js";
+import { A as displayPath, C as isRecord$4, D as SHARED_INSTRUCTIONS_TEMPLATE, E as AuraManifestError, S as errorMessage$1, T as resolveAuraManifestPath, _ as assertAuraManifestWritable, a as planDesiredMcpConvergence, b as parseAuraManifest, c as rememberMcpConvergence, d as sharedSkillsRoot, g as hashContent, h as stripLegacyManagedBlock, k as pluralize, m as planSharedSkillTreeUpdate, n as appendInstructionFragments, p as managedContentRevisionStatus, r as forgetMcpPlans, t as planSharedInstructionLink, u as planSkillDeployment, v as createAuraManifestWriteOperation, w as AURA_MANIFEST_PATH, x as errorCode, y as createEmptyAuraManifest } from "./shared-link-plan-DMijyUdG.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, McpWriteError, NOT_EXECUTABLE_EXIT_CODE, OUTPUT_LIMIT_EXIT_CODE, SHARED_INSTRUCTIONS_TEMPLATE_TOKEN, TIMEOUT_EXIT_CODE, defineOwnProperty, detectExecutable, hasMcpRedaction, jsonPropertyPath, mcpEnvironmentVariableNames, mcpServerNameProblem, normalizeMcpServerDefinition, parseMcpServerDefinition, parseMcpServerManifest, parseMcpServerManifestValue, 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";
@@ -931,25 +931,21 @@ function backupRoot(homeDir) {
 /**
 * Determines where a plan may write.
 *
-* The workspace is always one root. The rest are derived from what the detected adapters declared
-* as global-scope configuration, so the writable surface of the home directory is exactly the
+* Roots are derived only from Aura's shared home directory and what detected adapters declared as
+* global-scope configuration, so the writable surface of the home directory is exactly the
 * applications Aura found rather than a hardcoded guess. A declared file contributes its own
 * directory — `~/.claude/CLAUDE.md` yields `~/.claude`, not `~` — which keeps an adapter that reads
 * something under a shared directory such as `~/.config/<app>` from opening `~/.config` wholesale.
 */
-function resolveAllowedRoots(model, managedHomeRoots) {
+function resolveAllowedRoots(model) {
 	const homeDir = resolve(model.homeDir);
 	const roots = /* @__PURE__ */ new Map();
-	add(roots, {
-		exact: false,
-		path: resolve(model.projectRoot ?? model.cwd)
-	});
 	const sharedDirectory = dirname(resolve(model.sharedInstructions.path));
 	if (isStrictDescendant(homeDir, sharedDirectory)) add(roots, {
 		exact: false,
 		path: sharedDirectory
 	});
-	for (const root of managedHomeRoots === void 0 ? deriveManagedHomeRoots(model, homeDir) : validateManagedHomeRoots(managedHomeRoots, homeDir)) add(roots, root);
+	for (const root of deriveManagedHomeRoots(model, homeDir)) add(roots, root);
 	return Object.freeze([...roots.values()]);
 }
 /**
@@ -1002,17 +998,6 @@ function rootsForSpec(spec, homeDir) {
 		path
 	}];
 }
-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(homeDir, path)) throw new FixPlanError("invalid-options", `managedHomeRoots must sit strictly inside ${homeDir}: ${candidate}`, { path: candidate });
-		return {
-			exact: false,
-			path
-		};
-	});
-}
 function add(roots, root) {
 	const existing = roots.get(root.path);
 	if (existing === void 0 || existing.exact && !root.exact) roots.set(root.path, root);
@@ -1109,12 +1094,12 @@ async function mapWithConcurrency(items, limit, run) {
 //#endregion
 //#region ../core/src/fix-plan/path-policy.ts
 /** Resolves the roots and filesystem traits a plan is validated against. */
-async function createPathPolicy(model, managedHomeRoots) {
+async function createPathPolicy(model) {
 	const sensitivity = await detectCaseSensitivity(resolve(model.projectRoot ?? model.cwd));
 	return {
 		caseInsensitive: sensitivity !== "sensitive",
 		reservedRoots: Object.freeze([backupRoot(model.homeDir)]),
-		roots: resolveAllowedRoots(model, managedHomeRoots),
+		roots: resolveAllowedRoots(model),
 		rootsCaseInsensitive: sensitivity === "insensitive"
 	};
 }
@@ -2878,7 +2863,7 @@ function decodeUtf8(content) {
 //#endregion
 //#region ../core/src/fix-plan/prepare.ts
 async function prepareOperations(options) {
-	const policy = await createPathPolicy(options.model, options.managedHomeRoots);
+	const policy = await createPathPolicy(options.model);
 	const validated = await validatePlanPaths(options.plan, policy);
 	const budget = { remaining: MAX_RETAINED_PLAN_BYTES };
 	const operations = [];
@@ -3397,7 +3382,7 @@ async function undoFixPlan(options) {
 		if (options.backupId !== void 0) throw new FixPlanError("backup-error", `no undo journal entry named ${options.backupId}`);
 		return Object.freeze({ status: "nothing-to-undo" });
 	}
-	const policy = await createPathPolicy(options.model, options.managedHomeRoots);
+	const policy = await createPathPolicy(options.model);
 	return withJournalLock(root, options.now, async () => {
 		const selection = await select(root, options);
 		if (selection === void 0) return Object.freeze({ status: "nothing-to-undo" });
@@ -3748,50 +3733,32 @@ function portableSkillFilePathKey(path) {
 //#endregion
 //#region ../core/src/workspace/shared-links.ts
 const GLOBAL_PREFIX = "~/";
-const PROJECT_PREFIX = "./";
 const SHARED_INSTRUCTIONS_SEGMENTS = Object.freeze(["agents", "AGENTS.md"]);
 const SHARED_INSTRUCTIONS_HOME_REFERENCE = "~/agents/AGENTS.md";
-const PROJECT_SHARED_INSTRUCTIONS_FILE = "AGENTS.md";
 const SHARED_LINK_KINDS = /* @__PURE__ */ new Set([
 	"import-line",
 	"native-copy",
 	"symlink"
 ]);
-const GLOBAL_SLOT = Object.freeze({
-	name: "sharedLink",
-	scope: "global"
-});
-const PROJECT_SLOT = Object.freeze({
-	name: "projectSharedLink",
-	scope: "project"
-});
+/** The one adapter field a shared-link declaration can come from. */
+const SLOT_NAME = "sharedLink";
 /** Canonical shared-instruction path for one captured environment. */
 function sharedInstructionsPath(environment) {
 	return join(environment.homeDir, ...SHARED_INSTRUCTIONS_SEGMENTS);
 }
 /**
-* Canonical project shared-instruction path for one checkout.
+* Returns every declarative problem in a shared-link contribution.
 *
-* Exported because the setup wizard has to name the same file core links adapters to. Two packages
-* each spelling out `AGENTS.md` is how a link ends up pointing at a file setup never wrote.
+* The `~/` prefix is required rather than merely accepted. A declaration naming `./something` is
+* what let a home-scoped check demand a file inside whichever repository the user was standing in,
+* written with their home directory spelled out absolutely; Aura links only the home entry now, so
+* the prefix is the whole statement of where the file lives.
 */
-function projectSharedInstructionsPath(projectRoot, cwd) {
-	return join(projectRoot ?? cwd, PROJECT_SHARED_INSTRUCTIONS_FILE);
-}
-/**
-* Returns every declarative problem in a shared-link contribution to the given scope.
-*
-* The prefix is checked against the slot rather than merely being one of the two: a global
-* declaration naming `./something` is what let a home-scoped check demand a file inside whichever
-* repository the user was standing in, written with their home directory spelled out absolutely.
-* Which slot an adapter fills is the whole statement of where the file lives.
-*/
-function sharedLinkViolations(link, scope) {
+function sharedLinkViolations(link) {
 	const violations = [];
 	if (!SHARED_LINK_KINDS.has(link.kind)) violations.push(`kind "${String(link.kind)}" is not supported`);
-	const prefix = entryPrefix(scope);
-	const relative = typeof link.entryPath === "string" && link.entryPath.startsWith(prefix) ? link.entryPath.slice(prefix.length) : void 0;
-	if (relative === void 0) violations.push(`entryPath must begin with "${prefix}" at ${scope} scope`);
+	const relative = typeof link.entryPath === "string" && link.entryPath.startsWith(GLOBAL_PREFIX) ? link.entryPath.slice(2) : void 0;
+	if (relative === void 0) violations.push(`entryPath must begin with "${GLOBAL_PREFIX}"`);
 	else if (relative.length === 0 || relative.includes("\\") || relative.includes("\0") || relative.split("/").some((segment) => segment.length === 0 || segment === "." || segment === "..")) violations.push("entryPath must be a normalized portable path without traversal");
 	if (link.kind === "symlink") {
 		if (link.lineTemplate !== void 0) violations.push("symlink declarations must not provide lineTemplate");
@@ -3802,51 +3769,36 @@ function sharedLinkViolations(link, scope) {
 }
 /** Resolves and verifies one adapter's shared-link declaration against its read-side files. */
 function resolveAdapterSharedLink(adapter, environment, files) {
-	return resolveSharedLink(adapter.sharedLink, GLOBAL_SLOT, environment, files, () => SHARED_INSTRUCTIONS_HOME_REFERENCE);
-}
-function resolveAdapterProjectSharedLink(adapter, environment, files, projectRoot) {
-	const target = projectSharedInstructionsPath(projectRoot, environment.cwd);
-	return resolveSharedLink(adapter.projectSharedLink, PROJECT_SLOT, environment, files, (entryPath) => portableRelativePath(entryPath, target));
+	return resolveSharedLink(adapter.sharedLink, environment, files);
 }
 /**
-* Resolves one declaration, naming the shared source the way its own scope can survive.
+* Resolves one declaration, naming the shared source the way a home entry can survive.
 *
-* A home entry names the source through `~`, which is the same string on every machine the user
-* owns. A project entry names it relative to itself, so the file it produces is one the whole team
-* can commit. Nothing here can write a machine-specific absolute path into a repository, because
-* the slot decides both halves at once.
+* The entry names the source through `~`, which is the same string on every machine the user owns.
 */
-function resolveSharedLink(declaration, slot, environment, files, targetReference) {
+function resolveSharedLink(declaration, environment, files) {
 	if (declaration === void 0) return;
-	const entryPath = resolveSharedEntry(declaration, slot, environment, files);
+	const entryPath = resolveSharedEntry(declaration, environment, files);
 	if (declaration.kind === "symlink") return {
 		entryPath,
 		kind: declaration.kind,
-		scope: slot.scope
+		scope: "global"
 	};
 	return {
-		content: declaration.lineTemplate?.replace(SHARED_INSTRUCTIONS_TEMPLATE_TOKEN, targetReference(entryPath)),
+		content: declaration.lineTemplate?.replace(SHARED_INSTRUCTIONS_TEMPLATE_TOKEN, SHARED_INSTRUCTIONS_HOME_REFERENCE),
 		entryPath,
 		kind: declaration.kind,
-		scope: slot.scope
+		scope: "global"
 	};
 }
-function resolveSharedEntry(declaration, slot, environment, files) {
-	const violations = sharedLinkViolations(declaration, slot.scope);
-	if (violations.length > 0) throw new Error(`declares an invalid ${slot.name}: ${violations.join("; ")}`);
-	const global = slot.scope === "global";
-	const relative = declaration.entryPath.slice(entryPrefix(slot.scope).length);
-	const entryPath = join(global ? environment.homeDir : environment.cwd, ...relative.split("/"));
-	if (![...files.values()].some((file) => resolve(file.spec.path) === resolve(entryPath) && file.spec.scope === slot.scope)) throw new Error(`declares ${slot.name} entry ${entryPath}, but its files() result did not declare that path at ${slot.scope} scope`);
+function resolveSharedEntry(declaration, environment, files) {
+	const violations = sharedLinkViolations(declaration);
+	if (violations.length > 0) throw new Error(`declares an invalid ${SLOT_NAME}: ${violations.join("; ")}`);
+	const relative = declaration.entryPath.slice(2);
+	const entryPath = join(environment.homeDir, ...relative.split("/"));
+	if (![...files.values()].some((file) => resolve(file.spec.path) === resolve(entryPath) && file.spec.scope === "global")) throw new Error(`declares ${SLOT_NAME} entry ${entryPath}, but its files() result did not declare that path at global scope`);
 	return entryPath;
 }
-function portableRelativePath(entryPath, targetPath) {
-	const path = relative(dirname(entryPath), targetPath).replaceAll("\\", "/");
-	return path.startsWith(".") ? path : `./${path}`;
-}
-function entryPrefix(scope) {
-	return scope === "global" ? GLOBAL_PREFIX : PROJECT_PREFIX;
-}
 function countToken(template) {
 	return template.split(SHARED_INSTRUCTIONS_TEMPLATE_TOKEN).length - 1;
 }
@@ -3866,6 +3818,41 @@ function toSharedInstructions(path, contents) {
 		problem
 	};
 }
+//#endregion
+//#region ../core/src/plugin-validation-links.ts
+/**
+* Validates an adapter's shared-instruction link declaration.
+*
+* Two rules, because the contract removed one field and constrained the other. A plugin built
+* against the previous contract still carries `projectSharedLink`; `apiVersion` already refuses
+* that plugin, and naming the property is what tells its author which one to delete.
+*/
+function collectSharedLinkDeclarationViolations(state, adapter, pluginLabel) {
+	if ("projectSharedLink" in adapter) state.violations.push(`${pluginLabel} adapter "${adapter.id}" declares removed projectSharedLink; Aura manages only global shared-instruction links. Remove this property.`);
+	if (adapter.sharedLink === void 0) return;
+	for (const violation of sharedLinkViolations(adapter.sharedLink)) state.violations.push(`${pluginLabel} adapter "${adapter.id}" declares invalid sharedLink: ${violation}.`);
+}
+//#endregion
+//#region ../core/src/plugin-validation-skills.ts
+/** Rejects skill destinations that are empty, duplicated, or outside the user's home directory. */
+function collectSkillDirectoryViolations(state, adapter, pluginLabel) {
+	const directories = adapter.capabilities?.skills?.directories;
+	if (directories === void 0) return;
+	if (directories.length === 0) {
+		state.violations.push(`${pluginLabel} adapter "${adapter.id}" declares Agent Skills support without a global skills directory.`);
+		return;
+	}
+	const ids = /* @__PURE__ */ new Set();
+	for (const directory of directories) {
+		if (ids.has(directory.id)) state.violations.push(`${pluginLabel} adapter "${adapter.id}" declares duplicate skills directory ID "${directory.id}".`);
+		ids.add(directory.id);
+		if (!isGlobalSkillPath(directory.entryPath)) state.violations.push(`${pluginLabel} adapter "${adapter.id}" declares invalid global skills directory ${directory.entryPath}.`);
+	}
+}
+function isGlobalSkillPath(entryPath) {
+	const relative = entryPath.startsWith("~/") ? entryPath.slice(2) : void 0;
+	return relative !== void 0 && relative.length > 0 && !relative.includes("\\") && !relative.includes("\0") && relative.split("/").every((segment) => segment.length > 0 && segment !== "." && segment !== "..");
+}
 /** Plugin ids become id namespaces, so `/` and anything shell- or path-surprising is refused. */
 const PLUGIN_ID_PATTERN = /^[a-z0-9][a-z0-9._-]*$/;
 function createRegistryState() {
@@ -3875,7 +3862,7 @@ function createRegistryState() {
 	};
 }
 function isSupportedPlugin(candidate) {
-	return candidate.apiVersion === 1;
+	return candidate.apiVersion === 2;
 }
 /** Validates each contribution's namespace and collects the ones that claimed their id. */
 function collectNamespaced(state, kind, contributions, plugin, collected) {
@@ -3913,15 +3900,8 @@ function collectAdapterViolations(state, adapters, plugin) {
 	for (const adapter of adapters ?? []) {
 		if (!PLUGIN_ID_PATTERN.test(adapter.id)) state.violations.push(`${formatPlugin(plugin)} contributes adapter ID "${adapter.id}", which is not a usable adapter ID; expected lowercase letters, digits, ".", "-", or "_", starting with a letter or digit.`);
 		collectSharedLinkCapabilityViolations(state, adapter, plugin);
-		for (const [name, scope, link] of [[
-			"sharedLink",
-			"global",
-			adapter.sharedLink
-		], [
-			"projectSharedLink",
-			"project",
-			adapter.projectSharedLink
-		]]) if (link !== void 0) for (const violation of sharedLinkViolations(link, scope)) state.violations.push(`${formatPlugin(plugin)} adapter "${adapter.id}" declares invalid ${name}: ${violation}.`);
+		collectSkillDirectoryViolations(state, adapter, formatPlugin(plugin));
+		collectSharedLinkDeclarationViolations(state, adapter, formatPlugin(plugin));
 	}
 }
 function collectSharedLinkCapabilityViolations(state, adapter, plugin) {
@@ -3954,8 +3934,8 @@ function claimId(state, kind, id, plugin) {
 	return true;
 }
 function formatApiVersionViolation(candidate) {
-	const remedy = candidate.apiVersion > 1 ? "Upgrade Aura, or install a plugin release built against" : "Upgrade the plugin to a release built against";
-	return `${formatPlugin(candidate)} uses unsupported apiVersion ${candidate.apiVersion}; this Aura build supports apiVersion 1. ${remedy} apiVersion 1.`;
+	const remedy = candidate.apiVersion > 2 ? "Upgrade Aura, or install a plugin release built against" : "Upgrade the plugin to a release built against";
+	return `${formatPlugin(candidate)} uses unsupported apiVersion ${candidate.apiVersion}; this Aura build supports apiVersion 2. ${remedy} apiVersion 2.`;
 }
 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");
@@ -5164,9 +5144,8 @@ function normalizeVersion(version) {
 /**
 * Splits desired servers into the ones Aura may write and the collisions a person has to settle.
 *
-* Scope is part of identity here. A server named `docs` in a project `.mcp.json` is not the `docs`
-* the manifest wants in user-level configuration, and treating them as one either blocks a write
-* that would not have collided or skips one that never happened.
+* Desired servers are global-only. A server named `docs` in a project `.mcp.json` remains a
+* read-only observation and cannot collide with the global entry Aura manages.
 */
 function classifyDesired(desired, ledgerNames, state) {
 	const ledger = new Set(ledgerNames);
@@ -5185,11 +5164,11 @@ function classifyDesired(desired, ledgerNames, state) {
 /** `owned` to write it, a blocker to refuse, `undefined` when the config already satisfies it. */
 function collisionBlocker(entry, ledger, state) {
 	if (ledger.has(entry.name)) return "owned";
-	const sameName = (candidate) => candidate.name === entry.name && candidate.scope === entry.scope;
+	const sameName = (candidate) => candidate.name === entry.name && candidate.scope === "global";
 	const unusable = state.unusable.find(sameName);
 	if (unusable !== void 0) return {
-		message: unusable.reason === "disabled" ? `MCP server ${entry.name} is already declared in this application's ${entry.scope} configuration but is turned off there. Remove or enable it, then run the fix again.` : `MCP server ${entry.name} is already declared in this application's ${entry.scope} configuration in a form Aura does not recognize, so Aura left it unchanged.`,
-		scope: entry.scope,
+		message: unusable.reason === "disabled" ? `MCP server ${entry.name} is already declared in this application's global configuration but is turned off there. Remove or enable it, then run the fix again.` : `MCP server ${entry.name} is already declared in this application's global configuration in a form Aura does not recognize, so Aura left it unchanged.`,
+		scope: "global",
 		sourceId: unusable.sourceId
 	};
 	const existing = state.servers.filter(sameName);
@@ -5198,7 +5177,7 @@ function collisionBlocker(entry, ledger, state) {
 	if ("message" in normalized) return normalized;
 	return existing.every((server) => isDeepStrictEqual(server.transport, normalized.transport)) ? void 0 : {
 		message: `MCP server ${entry.name} already exists outside Aura's ownership ledger and differs from the manifest.`,
-		scope: entry.scope
+		scope: "global"
 	};
 }
 /**
@@ -5213,7 +5192,7 @@ function normalizeDesired(entry) {
 	} catch (error) {
 		return {
 			message: error instanceof McpWriteError ? `MCP server ${entry.name} cannot be written as the manifest defines it: ${error.message}` : `MCP server ${entry.name} has a manifest definition Aura cannot represent.`,
-			scope: entry.scope
+			scope: "global"
 		};
 	}
 }
@@ -5227,28 +5206,25 @@ function createAppMcpConvergence(adapter, files, state) {
 		const targets = [...files.values()].filter((file) => file.spec.kind === "mcp");
 		const classified = classifyDesired(desired, ledgerNames, state);
 		if (classified.blockers.length > 0) return blocked(classified.blockers);
-		const scopes = ["global", "project"].map((scope) => planScope$1(adapter, writer, targets, classified.owned, ledgerNames, scope, state.secretSightings));
-		const blockers = scopes.flatMap((result) => result.blockers);
-		const operations = scopes.flatMap((result) => result.operations);
-		return blockers.length > 0 ? blocked(blockers) : {
+		const planned = planGlobalTarget(adapter, writer, targets, classified.owned, ledgerNames, state.secretSightings);
+		return planned.blockers.length > 0 ? blocked(planned.blockers) : {
 			blockers: [],
-			operations,
+			operations: planned.operations,
 			ownedNames: [...new Set(classified.owned.map((entry) => entry.name))].sort()
 		};
 	};
 }
-function planScope$1(adapter, writer, targets, desired, ledgerNames, scope, sightings) {
-	const scopedDesired = desired.filter((entry) => entry.scope === scope);
-	const scopedTargets = targets.filter((target) => target.spec.scope === scope);
-	if (scopedDesired.length > 0 && scopedTargets.length === 0) return blockedScope(`${adapter.displayName} has no ${scope}-scope MCP configuration target.`, scope);
-	if (scopedTargets.length > 1) return blockedScope(`${adapter.displayName} declares more than one ${scope}-scope MCP write target.`, scope);
-	const target = scopedTargets[0];
+function planGlobalTarget(adapter, writer, targets, desired, ledgerNames, sightings) {
+	const globalTargets = targets.filter((target) => target.spec.scope === "global");
+	if (desired.length > 0 && globalTargets.length === 0) return blockedScope(`${adapter.displayName} has no global MCP configuration target.`, "global");
+	if (globalTargets.length > 1) return blockedScope(`${adapter.displayName} declares more than one global MCP write target.`, "global");
+	const target = globalTargets[0];
 	return target === void 0 ? {
 		blockers: [],
 		operations: []
-	} : writeScopeTarget(adapter, writer, target, scopedDesired, ledgerNames, scope, sightings);
+	} : writeGlobalTarget(adapter, writer, target, desired, ledgerNames, sightings);
 }
-function writeScopeTarget(adapter, writer, target, desired, ledgerNames, scope, sightings) {
+function writeGlobalTarget(adapter, writer, target, desired, ledgerNames, sightings) {
 	if (!needsTargetWrite(target, desired, ledgerNames)) return {
 		blockers: [],
 		operations: []
@@ -5257,7 +5233,7 @@ function writeScopeTarget(adapter, writer, target, desired, ledgerNames, scope,
 	if (unwritable !== void 0) return {
 		blockers: [{
 			...unwritable,
-			scope,
+			scope: "global",
 			sourceId: target.spec.id
 		}],
 		operations: []
@@ -5267,7 +5243,7 @@ function writeScopeTarget(adapter, writer, target, desired, ledgerNames, scope,
 		blockers: [{
 			message: written.refusal,
 			path: target.spec.path,
-			scope,
+			scope: "global",
 			sourceId: target.spec.id
 		}],
 		operations: []
@@ -5276,14 +5252,14 @@ function writeScopeTarget(adapter, writer, target, desired, ledgerNames, scope,
 		blockers: [{
 			message: `${adapter.displayName}'s MCP configuration at ${target.spec.path} is larger than Aura will rewrite in one operation, so Aura left it unchanged.`,
 			path: target.spec.path,
-			scope,
+			scope: "global",
 			sourceId: target.spec.id
 		}],
 		operations: []
 	};
 	const operation = {
 		content: written.content,
-		mode: scope === "global" ? 384 : 420,
+		mode: 384,
 		path: target.spec.path,
 		precondition: targetPrecondition(target),
 		type: "write"
@@ -5526,11 +5502,9 @@ async function scanAdapter(adapter, context) {
 		return { diagnostics: [failure$2(adapter, "files", error)] };
 	}
 	diagnostics.push(...discovery.diagnostics);
-	let projectSharedLink;
 	let sharedLink;
 	try {
 		sharedLink = resolveAdapterSharedLink(adapter, context.environment, discovery.files);
-		projectSharedLink = resolveAdapterProjectSharedLink(adapter, context.environment, discovery.files, await context.projectRoot);
 	} catch (error) {
 		diagnostics.push(failure$2(adapter, "files", error));
 	}
@@ -5554,9 +5528,8 @@ async function scanAdapter(adapter, context) {
 		mcpServers,
 		metadata: snapshot.metadata,
 		skills: snapshot.skills,
-		skillDirectories: (adapter.capabilities?.skills?.directories ?? []).map((directory) => resolveSkillDirectory(directory, context.environment.homeDir, context.environment.cwd)),
+		skillDirectories: (adapter.capabilities?.skills?.directories ?? []).map((directory) => resolveSkillDirectory(directory, context.environment.homeDir)),
 		sourceFiles: [...discovery.files.values()].filter((file) => file.spec.kind !== "probe").map(toStatus),
-		...projectSharedLink === void 0 ? {} : { projectSharedLink },
 		...sharedLink === void 0 ? {} : { sharedLink },
 		support: evaluateSupport(adapter.supportedRange, detection.version),
 		...adapter.synthetic === void 0 ? {} : { synthetic: adapter.synthetic },
@@ -9389,7 +9362,7 @@ function applyRequiredMcpServers(model, config) {
 		model
 	};
 	const manifest = model.manifest.value;
-	const configured = new Set(manifest.mcpServers.map((server) => `${server.scope}\0${server.name}`));
+	const configured = new Set(manifest.mcpServers.map((server) => server.name));
 	const configuredCatalogIds = new Set(manifest.mcpServers.flatMap((server) => server.catalogId === void 0 ? [] : [server.catalogId]));
 	const diagnostics = [];
 	const required = [];
@@ -9410,7 +9383,7 @@ function applyRequiredMcpServers(model, config) {
 			continue;
 		}
 		const name = catalog.manifest.serverName;
-		if (configured.has(`global\0${name}`)) {
+		if (configured.has(name)) {
 			diagnostics.push(note(`is already configured as "${name}", so your own settings were kept`, catalog.id, selection));
 			continue;
 		}
@@ -9424,7 +9397,6 @@ function applyRequiredMcpServers(model, config) {
 			catalogId: catalog.id,
 			name,
 			requiredBy: selection.provenance.label,
-			scope: "global",
 			transport: catalog.manifest.transportTemplate
 		}));
 	}
@@ -9704,10 +9676,7 @@ function isBundledSkillSelection(skill) {
 /** Final instruction handling only; paths, sources, and duplicate choices stop here. */
 function instructionActions(selections) {
 	if (selections === void 0) return [];
-	return [selections.global, ...selections.project === void 0 ? [] : [selections.project]].map(({ action, scope }) => ({
-		action,
-		scope
-	}));
+	return [{ action: selections.global.action }];
 }
 /**
 * Per-check state and severity counts for every executed check, ordered by check ID.
@@ -13876,7 +13845,7 @@ function planLinks$1(context, scopeSelections, archived, ownership, manualSteps)
 }
 function planAppLinks(context, app, scopeSelections, archived, ownership, manualSteps) {
 	return scopeSelections.flatMap((selection) => {
-		const link = selection.scope === "global" ? app.sharedLink : app.projectSharedLink;
+		const link = app.sharedLink;
 		if (link === void 0) return [];
 		const outcome = planSharedInstructionLink(app, context.model, {
 			link,
@@ -13903,12 +13872,12 @@ function planAppLinks(context, app, scopeSelections, archived, ownership, manual
 * only once that entry is merged here and archived. The wizard does not offer an entry already
 * pointing at the target, so leaving this to the selection strands the app on every run.
 */
-function mandatoryEntryPaths(context, scope) {
+function mandatoryEntryPaths(context) {
 	const managedIds = new Set(managedAppIdList(context));
 	const paths = /* @__PURE__ */ new Set();
 	for (const app of context.model.apps) {
 		if (app.synthetic === true || !managedIds.has(app.adapterId)) continue;
-		const link = scope === "global" ? app.sharedLink : app.projectSharedLink;
+		const link = app.sharedLink;
 		if (link?.kind === "symlink") paths.add(resolve(link.entryPath));
 	}
 	return paths;
@@ -13920,7 +13889,7 @@ function mandatoryEntryPaths(context, scope) {
 * archives them.
 */
 function requiredEntries(context, selection, inventory) {
-	const required = mandatoryEntryPaths(context, selection.scope);
+	const required = mandatoryEntryPaths(context);
 	return inventory.filter((source) => source.scope === selection.scope && required.has(resolve(source.path)));
 }
 /** Folds the required entries into the selection, so the merge and the archive both see them. */
@@ -13955,7 +13924,7 @@ function canonicalSourcePath(document) {
 */
 function isAuraArtifact(document, model) {
 	const path = resolve(document.path);
-	return model.apps.some((app) => [app.sharedLink, app.projectSharedLink].some((link) => link !== void 0 && resolve(link.entryPath) === path && matchesLink(document, link)));
+	return model.apps.some((app) => app.sharedLink !== void 0 && resolve(app.sharedLink.entryPath) === path && matchesLink(document, app.sharedLink));
 }
 function matchesLink(document, link) {
 	if (link.kind === "native-copy") return document.content === link.content;
@@ -13969,7 +13938,7 @@ function matchesLink(document, link) {
 * would otherwise re-walk every application to rediscover the same handful of links.
 */
 function importLineLinks(model) {
-	return model.apps.flatMap((app) => [app.sharedLink, app.projectSharedLink]).filter((link) => link?.kind === "import-line" && link.content !== void 0);
+	return model.apps.map((app) => app.sharedLink).filter((link) => link?.kind === "import-line" && link.content !== void 0);
 }
 /** Removes legacy marked links and a plain import Aura appended at the declared entry path. */
 function stripAuraInstructionArtifacts(content, path, links) {
@@ -14105,17 +14074,14 @@ function removeRanges(content, ranges) {
 //#endregion
 //#region src/setup/instructions.ts
 function instructionTargets(model) {
-	return {
-		global: resolve(model.sharedInstructions.path),
-		project: resolve(projectSharedInstructionsPath(model.projectRoot, model.cwd))
-	};
+	return { global: resolve(model.sharedInstructions.path) };
 }
 function instructionInventory(model) {
 	const targets = instructionTargets(model);
 	const owned = new Set(model.manifest.status === "ready" ? Object.values(model.manifest.value.ownership).flatMap((entry) => entry.files.map((path) => resolve(path))) : []);
 	const documents = /* @__PURE__ */ new Map();
 	for (const document of model.instructionFiles) {
-		if ([resolve(document.path), canonicalSourcePath(document)].some((candidate) => candidate === targets.global || candidate === targets.project || owned.has(candidate)) || isAuraArtifact(document, model)) continue;
+		if ([resolve(document.path), canonicalSourcePath(document)].some((candidate) => candidate === targets.global || owned.has(candidate)) || isAuraArtifact(document, model)) continue;
 		const key = canonicalSourcePath(document);
 		const current = documents.get(key);
 		if (current === void 0 || document.content.length > current.content.length) documents.set(key, document);
@@ -14216,10 +14182,8 @@ function planInstructions(context) {
 	const ownership = /* @__PURE__ */ new Map();
 	const inventory = instructionInventory(context.model);
 	const clusters = duplicateClusters(context.findings ?? []);
-	const scopeSelections = [selections.global, selections.project].filter((selection) => selection !== void 0 && selection.action !== "blocked" && selection.action !== "skip");
-	const linked = [];
-	for (const selection of scopeSelections) if (planScope(context, selection, inventory, clusters, state)) linked.push(selection);
-	const linkOperations = planLinks$1(context, linked, state.archived, ownership, state.manualSteps);
+	const selection = selections.global;
+	const linkOperations = planLinks$1(context, selection.action !== "blocked" && planScope(context, selection, inventory, clusters, state) ? [selection] : [], state.archived, ownership, state.manualSteps);
 	for (const [path, archive] of state.archived) {
 		const linkIndex = linkOperations.findIndex((operation) => resolve(primaryPath(operation)) === path);
 		const link = linkIndex === -1 ? void 0 : linkOperations.splice(linkIndex, 1)[0];
@@ -14261,14 +14225,10 @@ function planScope(context, requested, inventory, clusters, state) {
 	if (selection.action !== "consolidate") return true;
 	const content = composeConsolidatedInstructions(chosen, selection, clusters, context.model, existing);
 	if (content.trim().length === 0) {
-		if (selection.scope === "global") {
-			state.blockers.push({
-				path: selection.targetPath,
-				reason: "No selected instruction content is available to consolidate. Select a source, or choose the starter template."
-			});
-			return false;
-		}
-		state.manualSteps.push(`Configure ${selection.targetPath} on the next run: select at least one project source to consolidate, or choose the starter template. Aura wrote nothing there.`);
+		state.blockers.push({
+			path: selection.targetPath,
+			reason: "No selected instruction content is available to consolidate. Select a source, or choose the starter template."
+		});
 		return false;
 	}
 	planConsolidatedTarget(context, selection, existing, content, state);
@@ -14452,7 +14412,7 @@ function withRequiredOverrides(manifest, requiredIds, overriddenIds) {
 * was available to receive it.
 */
 function unconfiguredRequirement(context, id) {
-	return context.interactive ? `Required MCP catalog entry ${id} could not be selected for a managed compatible application.` : `Required MCP catalog entry ${id} is not configured yet. Run setup interactively to choose its name, scope, and applications; later non-interactive runs re-apply what the manifest records.`;
+	return context.interactive ? `Required MCP catalog entry ${id} could not be selected for a managed compatible application.` : `Required MCP catalog entry ${id} is not configured yet. Run setup interactively to choose its name and applications; later non-interactive runs re-apply what the manifest records globally.`;
 }
 function withMcpOwnership(manifest, appId, names) {
 	const previous = manifest.ownership[appId];
@@ -16603,7 +16563,6 @@ function excerpt(sources, path, startLine, endLine) {
 //#region src/setup/steps/instruction-stages.ts
 const TEMPLATE_VALUE = "template";
 const CONSOLIDATE_VALUE = "consolidate";
-const SKIP_VALUE = "skip";
 /**
 * The target's current text when this scope has nothing left to decide, otherwise undefined.
 *
@@ -16634,13 +16593,13 @@ function scopeStages(input) {
 	return [
 		{
 			isApplicable: () => !input.blocked,
-			label: input.scope === "global" ? "Global" : "Project",
+			label: "Personal",
 			apply: (state, answers) => update(state, { action: settled(answers[actionId], offered, fallback) }),
 			questions: (state) => input.blocked ? void 0 : [{
 				id: actionId,
 				initial: [draft(state).action ?? fallback],
 				kind: "select",
-				label: input.scope === "global" ? "Global" : "Project",
+				label: "Personal",
 				options,
 				prompt: `How should Aura configure ${input.targetPath}?`
 			}]
@@ -16659,7 +16618,7 @@ function scopeStages(input) {
 					label: source.path,
 					value: source.path
 				})),
-				prompt: `Which ${input.scope} instruction files should Aura consolidate?`
+				prompt: "Which personal instruction files should Aura consolidate?"
 			}] : void 0
 		},
 		{
@@ -16696,10 +16655,8 @@ function settled(answer, offered, fallback) {
 * advice, the mark and the cursor on row `1.` together, and leaves the rest of the menu in the
 * order it was built. A scope with nothing to combine recommends nothing and keeps that order.
 *
-* The opt-out is offered on the project scope only. Declining the global scope would leave INS-001
-* and INS-002 firing at error severity, so setup could not end on green — an answer the wizard
-* offers should not be one the closing checklist then fails the run over. The project tier has no
-* error-severity counterpart, so a declined project scope still ends green.
+* Personal instructions cannot be skipped because setup must leave applications connected to the
+* global shared source.
 */
 function actionOptions(input) {
 	const options = [];
@@ -16719,11 +16676,6 @@ function actionOptions(input) {
 		label: "Use starter template",
 		value: TEMPLATE_VALUE
 	});
-	if (input.scope === "project") options.push({
-		description: hasTargetContent(input) ? `Aura writes nothing here and adds no project-level link; ${basename(input.targetPath)} and anything already linking to it stay as they are.` : "Aura writes nothing here and adds no project-level link.",
-		label: "Skip project instructions",
-		value: SKIP_VALUE
-	});
 	return recommendedFirst(options);
 }
 function hasTargetContent(input) {
@@ -16732,7 +16684,7 @@ function hasTargetContent(input) {
 //#endregion
 //#region src/setup/steps/instructions.ts
 /**
-* The instructions step: one back-navigable chain of forms across both scopes.
+* The instructions step: one back-navigable chain of forms for personal instructions.
 *
 * Each scope contributes action → sources → duplicate review stages; a stage whose precondition no
 * longer holds (a non-consolidate action, no duplicated paragraphs left) simply disappears from
@@ -16742,9 +16694,8 @@ function hasTargetContent(input) {
 const instructionsStep = {
 	gather: async (context, io) => {
 		const inputs = scopeInputs(context);
-		const scopes = scopeList(inputs);
-		if (context.revisited !== true) for (const input of scopes) emitScopeNotes(input, io);
-		const stages = scopes.flatMap(scopeStages);
+		if (context.revisited !== true) emitScopeNotes(inputs.global, io);
+		const stages = scopeStages(inputs.global);
 		const result = await runFormChain(stages, initialState(context), io, {
 			entry: context.enteredBackward === true ? "end" : "start",
 			flow: context.flow
@@ -16758,55 +16709,34 @@ const instructionsStep = {
 	telemetryCategory: "instructions",
 	title: "Instructions"
 };
-/** Both scopes in flow order, which is the order notes are emitted and stages are chained in. */
-function scopeList(inputs) {
-	return inputs.project === void 0 ? [inputs.global] : [inputs.global, inputs.project];
-}
-/** Folds both scopes' drafts into the step's selections, unoffered when it asked nothing to do it. */
+/** Folds the personal draft into the step's selections, unoffered when it asked nothing to do it. */
 function settle(context, inputs, result, unoffered) {
-	const project = inputs.project === void 0 ? void 0 : scopeSelection(inputs.project, result.project);
 	const selections = {
 		...context.selections,
-		instructions: {
-			global: scopeSelection(inputs.global, result.global),
-			...project === void 0 ? {} : { project }
-		}
+		instructions: { global: scopeSelection(inputs.global, result.global) }
 	};
 	return unoffered ? {
 		selections,
 		unoffered: true
 	} : selections;
 }
-/** Everything both scopes need from the workspace; project is absent when it has nothing to do. */
+/** Everything personal instruction setup needs from the workspace. */
 function scopeInputs(context) {
 	const inventory = instructionInventory(context.model);
 	const targets = instructionTargets(context.model);
 	const clusters = duplicateClusters(context.findings ?? []);
-	const global = {
+	return { global: {
 		blocked: context.model.sharedInstructions.problem !== void 0,
 		clusters,
 		scope: "global",
 		sources: inventory.filter((source) => source.scope === "global"),
 		targetContentValue: instructionTargetContent(context.model, "global", targets.global),
 		targetPath: targets.global
-	};
-	const projectSources = inventory.filter((source) => source.scope === "project");
-	const projectContent = instructionTargetContent(context.model, "project", targets.project);
-	return {
-		global,
-		project: projectSources.length === 0 && projectContent === void 0 ? void 0 : {
-			blocked: false,
-			clusters,
-			scope: "project",
-			sources: projectSources,
-			targetContentValue: projectContent,
-			targetPath: targets.project
-		}
-	};
+	} };
 }
 function scopeSelection(input, draft) {
 	if (input.blocked) return inactiveSelection(input, "blocked");
-	if (draft.action !== "consolidate") return inactiveSelection(input, inactiveAction(draft.action, input.scope));
+	if (draft.action !== "consolidate") return inactiveSelection(input, inactiveAction(draft.action));
 	const selectedSources = draft.selectedSources ?? [];
 	const relevant = relevantDuplicateClusters(selectedSources, input.clusters);
 	return {
@@ -16824,9 +16754,9 @@ function scopeSelection(input, draft) {
 * INS-002 firing at error severity, so the action menu never offers it there; this mapping is the
 * second half of that rule, keeping an action off the menu from becoming one the planner obeys.
 */
-function inactiveAction(action, scope) {
+function inactiveAction(action) {
 	if (action === "template") return "template";
-	return action === "skip" && scope === "project" ? "skip" : "keep";
+	return "keep";
 }
 function inactiveSelection(input, action) {
 	return {
@@ -16840,10 +16770,7 @@ function inactiveSelection(input, action) {
 /** A re-entered step resumes from what this run already decided, not from cold-start defaults. */
 function initialState(context) {
 	const existing = context.selections.instructions;
-	return {
-		global: toDraft(existing?.global),
-		project: toDraft(existing?.project)
-	};
+	return { global: toDraft(existing?.global) };
 }
 function toDraft(selection) {
 	if (selection === void 0 || selection.action === "blocked") return {};
@@ -16865,10 +16792,10 @@ function emitScopeNotes(input, io) {
 			path: input.targetPath,
 			scope: input.scope
 		});
-		io.note(`${input.scope === "global" ? "Global" : "Project"} instructions already live in ${input.targetPath} (${size}); Aura found nothing else to consolidate and leaves the file as it is.`);
+		io.note(`Personal instructions already live in ${input.targetPath} (${size}); Aura found nothing else to consolidate and leaves the file as it is.`);
 		return;
 	}
-	if (input.sources.length > 0) io.note(`Found ${describeSources(input.sources)} for ${input.scope} consolidation.`);
+	if (input.sources.length > 0) io.note(`Found ${describeSources(input.sources)} for personal consolidation.`);
 }
 function describeSources(sources) {
 	return sources.map((source) => `${basename(source.path)} (${describeInstructionSource(source)})`).join(" and ");
@@ -17057,47 +16984,27 @@ async function configureEntry(context, entry, taken, io) {
 		return SETUP_BACK;
 	}
 	const defaultName = seed?.name ?? catalog?.serverName ?? "custom";
-	const defaultScope = seed?.scope ?? (entry.repo === true ? "project" : "global");
 	const apps = appChoices(context, catalog?.supportedApps, seed?.apps ?? []);
 	if (apps.eligible.length === 0 && (seed?.apps.length ?? 0) === 0) {
 		io.note("No detected, managed, compatible application can receive this MCP server.");
 		return;
 	}
 	let name = defaultName;
-	let scope = defaultScope;
 	let selectedApps = seed === void 0 || seed.apps.length === 0 ? apps.eligible : seed.apps;
 	for (;;) {
-		const result = await io.ask([
-			textQuestion("mcp-name", "Name", "Configuration name", name),
-			{
-				id: "mcp-scope",
-				initial: [scope],
-				kind: "select",
-				label: "Scope",
-				options: [{
-					label: "Global",
-					value: "global"
-				}, {
-					label: "Project",
-					value: "project"
-				}],
-				prompt: "Where should applications configure this server?"
-			},
-			{
-				id: "mcp-apps",
-				initial: selectedApps,
-				kind: "multiselect",
-				label: "Applications",
-				options: apps.options,
-				prompt: "Which applications should enable this server?"
-			}
-		]);
+		const result = await io.ask([textQuestion("mcp-name", "Name", "Configuration name", name), {
+			id: "mcp-apps",
+			initial: selectedApps,
+			kind: "multiselect",
+			label: "Applications",
+			options: apps.options,
+			prompt: "Which applications should enable this server?"
+		}]);
 		if (result === "aborted") return SETUP_ABORTED;
 		if (result === "back") return SETUP_BACK;
 		name = answerText(result["mcp-name"]);
-		scope = selectedValues(result["mcp-scope"])[0] === "project" ? "project" : "global";
 		selectedApps = selectedValues(result["mcp-apps"]);
-		const problem = entryProblem(name, scope, selectedApps, taken);
+		const problem = entryProblem(name, selectedApps, taken);
 		if (problem !== void 0) {
 			io.note(problem);
 			if (!context.interactive) return SETUP_ABORTED;
@@ -17107,7 +17014,6 @@ async function configureEntry(context, entry, taken, io) {
 			apps: Object.freeze([...new Set(selectedApps)]),
 			...catalog === void 0 ? {} : { catalogId: catalog.id },
 			name,
-			scope,
 			transport
 		});
 	}
@@ -17120,12 +17026,12 @@ async function configureEntry(context, entry, taken, io) {
 * the form that is one line to re-type; caught at serialization it would end the run after every
 * question had been answered.
 */
-function entryProblem(name, scope, apps, taken) {
+function entryProblem(name, apps, taken) {
 	const nameProblem = mcpServerNameProblem(name);
 	if (nameProblem !== void 0) return `MCP server $.name ${nameProblem}.`;
 	if (apps.length === 0) return "MCP server $.apps must select at least one application.";
 	const selected = new Set(apps);
-	return taken.some((server) => server.name === name && server.scope === scope && server.apps.some((app) => selected.has(app))) ? `MCP server $.name ${name} is already configured at ${scope} scope for an application selected here. Choose another name.` : void 0;
+	return taken.some((server) => server.name === name && server.apps.some((app) => selected.has(app))) ? `MCP server $.name ${name} is already configured globally for an application selected here. Choose another name.` : void 0;
 }
 function appChoices(context, supportedApps, existingApps) {
 	const managed = new Set(managedAppIdList(context));
@@ -17186,7 +17092,7 @@ function workingEntries(context) {
 }
 function matchesEntry(server, entry) {
 	const existing = entry.existing;
-	if (existing !== void 0) return existing.catalogId === server.catalogId && existing.name === server.name && existing.scope === server.scope;
+	if (existing !== void 0) return existing.catalogId === server.catalogId && existing.name === server.name;
 	return entry.catalog?.id === server.catalogId;
 }
 function nextCustomKey(entries) {
@@ -17197,7 +17103,7 @@ function nextCustomKey(entries) {
 /**
 * A default name no other row has taken.
 *
-* Two servers cannot share one name in one application and scope — the manifest refuses to record
+* Two servers cannot share one name in one application — the manifest refuses to record
 * it — so seeding every custom server with `custom` would turn "add two, accept the defaults" into
 * a plan the manifest declines to hold.
 */
@@ -17259,7 +17165,6 @@ async function gatherMcp(context, io) {
 			const server = {
 				apps: [],
 				name: nextCustomName(entries),
-				scope: "global",
 				transport
 			};
 			entries.push({