@tryaura/aura-cli 0.3.1 → 0.4.0

package/dist/{shared-link-plan-AcSkw9bO.js → shared-link-plan-DMijyUdG.js}

@@ -37,7 +37,7 @@ const contentSource = (path) => ({
 	url: pluginContentUrl(import.meta.url, path)
 });
 var src_default = definePlugin({
-	apiVersion: 1,
+	apiVersion: 2,
 	id: "official",
 	name: "Aura Official Content",
 	mcpCatalog: [
@@ -312,19 +312,18 @@ function mcpServer(candidate, path, claimed) {
 	const name = requiredString(server, "name", path);
 	const nameProblem = mcpServerNameProblem(name);
 	if (nameProblem !== void 0) throw invalid(`${path}.name`, nameProblem);
-	const scope = server["scope"];
-	if (scope !== "global" && scope !== "project") throw invalid(`${path}.scope`, "must be either \"global\" or \"project\"");
-	const apps = targetApps(server["apps"], `${path}.apps`, name, scope, claimed);
+	const { scope, ...rest } = server;
+	const legacyScope = typeof scope === "string" ? scope : void 0;
+	const apps = targetApps(server["apps"], `${path}.apps`, name, claimed, legacyScope);
 	const transport = parseMcpServerDefinition(server["transport"], `${path}.transport`);
 	if ("error" in transport) throw invalid(transport.error.path, transport.error.message);
 	const catalogId = server["catalogId"];
 	if (catalogId !== void 0 && (typeof catalogId !== "string" || catalogId.length === 0)) throw invalid(`${path}.catalogId`, "must be a non-empty string");
 	return Object.freeze({
-		...server,
+		...rest,
 		apps,
 		...catalogId === void 0 ? {} : { catalogId },
 		name,
-		scope,
 		transport: transport.value
 	});
 }
@@ -332,27 +331,38 @@ function mcpServer(candidate, path, claimed) {
 * Reads the applications one entry targets, refusing any that already has this server.
 *
 * `name` is the key written into each application's own configuration, so two entries claiming it
-* for the same application and scope describe two different desired states for one key. Convergence
+* for the same application describe two different desired states for one key. Convergence
 * would resolve that by writing whichever came last, which is not a decision a manifest should
 * leave to iteration order. An entry that targets nothing is refused for a plainer reason: it
 * converges nowhere, and the user who wrote it is watching for it to take effect.
 */
-function targetApps(value, path, name, scope, claimed) {
+function targetApps(value, path, name, claimed, legacyScope) {
 	const entries = stringArray(value, path);
 	if (entries.length === 0) throw invalid(path, "must name at least one application");
-	const key = `${scope}${name}`;
-	const owners = claimed.get(key) ?? /* @__PURE__ */ new Set();
-	claimed.set(key, owners);
+	const owners = claimed.get(name) ?? /* @__PURE__ */ new Set();
+	claimed.set(name, owners);
 	const seen = /* @__PURE__ */ new Set();
 	for (const [index, entry] of entries.entries()) {
 		if (entry.length === 0) throw invalid(`${path}[${String(index)}]`, "must be non-empty");
 		if (seen.has(entry)) throw invalid(`${path}[${String(index)}]`, `duplicates ${entry}`);
-		if (owners.has(entry)) throw invalid(`${path}[${String(index)}]`, `duplicates the ${scope} server "${name}" already declared for ${entry}`);
+		if (owners.has(entry)) throw invalid(`${path}[${String(index)}]`, duplicateReason(name, entry, legacyScope));
 		seen.add(entry);
 		owners.add(entry);
 	}
 	return entries;
 }
+/**
+* Why two entries claiming one name for one application cannot both stand.
+*
+* A manifest written before Aura went global-only could hold the same name twice for one
+* application, once per scope, and those two entries are the one collision a person did not
+* introduce themselves. Naming the removed property is what turns "duplicates" into something they
+* can act on, because the entries look identical once it is gone.
+*/
+function duplicateReason(name, appId, legacyScope) {
+	const duplicate = `duplicates the global server "${name}" already declared for ${appId}`;
+	return legacyScope === void 0 ? duplicate : `${duplicate}. Aura no longer separates MCP servers by scope, so a manifest holding this name at both global and project scope now declares it twice. Keep the entry you want and delete the other, along with its "scope" property`;
+}
 //#endregion
 //#region ../core/src/manifest/schema-snippets.ts
 /**
@@ -1145,7 +1155,7 @@ function convergedPlan$1(app, skillId) {
 //#endregion
 //#region ../core/src/workspace/mcp-plan-manifest.ts
 /**
-* Merges preset-required servers under the manifest's own, keyed by scope and name.
+* Merges preset-required servers under the manifest's own, keyed by name.
 *
 * The manifest is written last and wins, matching the layer precedence everywhere else. A preset
 * that requires a server the user already configured must not silently repoint its transport:
@@ -1153,9 +1163,8 @@ function convergedPlan$1(app, skillId) {
 */
 function desiredEntries(model, manifest, appId) {
 	const result = /* @__PURE__ */ new Map();
-	for (const server of [...model.requiredMcpServers ?? [], ...manifest.mcpServers]) if (server.apps.includes(appId)) result.set(`${server.scope}\0${server.name}`, {
+	for (const server of [...model.requiredMcpServers ?? [], ...manifest.mcpServers]) if (server.apps.includes(appId)) result.set(server.name, {
 		name: server.name,
-		scope: server.scope,
 		transport: server.transport
 	});
 	return Object.freeze([...result.values()]);
@@ -1179,7 +1188,7 @@ function withOwnership(manifest, appId, mcpServerNames) {
 /** Drops one application from a desired server, and the entry entirely once nobody wants it. */
 function withoutServer(manifest, server) {
 	const mcpServers = manifest.mcpServers.flatMap((entry) => {
-		if (entry.name !== server.name || entry.scope !== server.scope) return [entry];
+		if (entry.name !== server.name) return [entry];
 		const apps = entry.apps.filter((appId) => appId !== server.appId);
 		return apps.length === 0 ? [] : [{
 			...entry,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryaura/aura-cli",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "The composable Aura CLI runtime and official plugin distribution.",
   "keywords": [
     "agent",
@@ -50,18 +50,18 @@
     "toml-eslint-parser": "^1.0.3",
     "typanion": "3.14.0",
     "undici": "7.29.0",
-    "@tryaura/aura-sdk": "0.3.1"
+    "@tryaura/aura-sdk": "0.4.0"
   },
   "devDependencies": {
     "@types/node": "24.13.3",
     "ajv": "8.20.0",
     "vitest": "4.1.10",
     "@tryaura/adapter-claude-code": "0.0.0",
+    "@tryaura/adapter-codex": "0.0.0",
     "@tryaura/adapter-cursor": "0.0.0",
+    "@tryaura/checks-core": "0.0.0",
     "@tryaura/content-official": "0.0.0",
-    "@tryaura/core": "0.0.0",
-    "@tryaura/adapter-codex": "0.0.0",
-    "@tryaura/checks-core": "0.0.0"
+    "@tryaura/core": "0.0.0"
   },
   "engines": {
     "node": ">=24"