@happyvertical/smrt-app-mcp 0.54.2 → 0.54.4

package/AGENTS.md

@@ -13,7 +13,12 @@ tool policy; `./sveltekit` owns the stateless Streamable HTTP transport.
 
 ## Patterns
 
-- Generate tools from core, then filter by allowed class-name prefixes.
+- Generate tools from core scoped to the allow-list (`MCPConfig.classNames`),
+  then filter by allowed class names: a duplicate tool name among registered
+  classes the app never publishes must not fail its catalog or calls (#3490).
+  `mountMcpAppRoute`/`createDefaultMcpAppServer` resolve each model
+  constructor to its registry-qualified name, so a same-named class elsewhere
+  never collides; a raw simple name two classes share fails closed.
 - Treat list/get tools as read-only; mutating tools require authentication unless the app deliberately wraps them with stronger policy.
 - Keep app policy outside generated tool schemas. The wrapper owns auth, allow-list, and workflow assertion behavior.
 - Return 404 for tools outside the app allow-list so private generated tools are not enumerated by mistake.

package/README.md

@@ -378,7 +378,14 @@ re-resolves credentials per request, refuses redirects, and forwards resource
 and tool metadata without inventing UI or extension capabilities.
 
 Generated tool allow-lists use the generator-owned original class identity, even
-when the advertised name is a canonical alias. Guards keyed by either the alias
+when the advertised name is a canonical alias. Core generates tools only for the
+allow-listed classes, so a duplicate tool name among registered classes the app
+does not publish (a consumed package's models, say) cannot fail `tools/list` or
+`tools/call`; a duplicate within the allow-list still fails closed. The
+model-based routes (`mountMcpAppRoute`, `createDefaultMcpAppServer`) allow-list
+each constructor's registry-qualified name, so an app model that shares a
+simple name with another registered class gets its own tools; a raw
+`allowedClassNames` simple name that two classes share is refused. Guards keyed by either the alias
 or original tool name run before both direct and task dispatch. Authored workflows
 retain their explicit names and effect policy; catalogs containing authored
 workflows keep private cache scope because they have no generated tenant identity.

package/dist/chunks/{protocol-BlbEg3jn.js → protocol-CoCuR_w7.js}

@@ -7141,12 +7141,21 @@ function configuredEffects(effects) {
 	if (!Array.isArray(effects) || effects.some((effect) => !MCP_TOOL_EFFECTS.includes(effect))) throw new TypeError("MCP effects must be an array of 'read', 'write' or 'destructive'.");
 	return new Set(effects);
 }
+function sameNamedClasses(simpleName) {
+	const wanted = simpleName.toLowerCase();
+	const seen = /* @__PURE__ */ new Set();
+	const matches = [];
+	for (const [key, info] of ObjectRegistry.getAllClasses()) {
+		if (seen.has(info) || (info.name || key).toLowerCase() !== wanted) continue;
+		seen.add(info);
+		matches.push([key, info]);
+	}
+	return matches;
+}
 function isTenantScopedTool(identity) {
+	if (identity.qualifiedName) return ObjectRegistry.isTenantScoped(identity.qualifiedName) || isTenantScopedClassResolved(identity.qualifiedName);
 	const objectName = identity.objectName.toLowerCase();
-	for (const [key, classInfo] of ObjectRegistry.getAllClasses()) {
-		const name = classInfo.name || key;
-		if (name.toLowerCase() === objectName) return ObjectRegistry.isTenantScoped(name) || isTenantScopedClassResolved(name);
-	}
+	for (const [key, classInfo] of ObjectRegistry.getAllClasses()) if ((classInfo.name || key).toLowerCase() === objectName && (ObjectRegistry.isTenantScoped(key) || isTenantScopedClassResolved(key))) return true;
 	return false;
 }
 function taskOwnerIdFor(principal) {
@@ -7160,6 +7169,7 @@ function createMcpAppServer(options) {
 		resources.set(resource.descriptor.uri, resource);
 	}
 	const allowedClassNames = new Set(options.allowedClassNames.map((name) => name.toLowerCase()));
+	const generatorScope = Object.freeze([...allowedClassNames]);
 	const getPublicPatterns = options.publicToolPatterns ?? (() => []);
 	const toolPolicy = options.toolPolicy;
 	const workflowAssertions = options.workflowAssertions ?? {};
@@ -7171,8 +7181,13 @@ function createMcpAppServer(options) {
 	}
 	const allowedEffects = configuredEffects(options.effects);
 	const requestedToolListCacheHint = configuredToolListCacheHint(options.toolListCache);
-	const tasksEnabled = options.allowedClassNames.some((className) => {
-		const mcp = ObjectRegistry.getConfig(className).mcp;
+	const tasksEnabled = [...ObjectRegistry.getAllClasses()].some(([key, classInfo]) => {
+		if (![
+			key,
+			classInfo.qualifiedName,
+			classInfo.name
+		].some((name) => !!name && allowedClassNames.has(name.toLowerCase()))) return false;
+		const mcp = ObjectRegistry.getConfig(key).mcp;
 		return typeof mcp === "object" && (mcp.tasks === true || Array.isArray(mcp.tasks) && mcp.tasks.length > 0);
 	});
 	function userForGenerator(principal) {
@@ -7194,7 +7209,10 @@ function createMcpAppServer(options) {
 	}
 	function makeGenerator(principal, taskStore) {
 		const user = userForGenerator(principal);
-		return new MCPGenerator(options.serverInfo, {
+		return new MCPGenerator({
+			...options.serverInfo,
+			classNames: generatorScope
+		}, {
 			...options.smrtOptions(),
 			user,
 			tenantId: principal?.tenantId,
@@ -7215,7 +7233,7 @@ function createMcpAppServer(options) {
 		const coreTools = (await generator.generateTools()).map((tool) => ({
 			tool,
 			identity: generator.getToolIdentity(tool)
-		})).filter(({ identity }) => allowedClassNames.has(identity.objectName.toLowerCase()));
+		})).filter(({ identity }) => allowedClassNames.has(identity.objectName.toLowerCase()) || !!identity.qualifiedName && allowedClassNames.has(identity.qualifiedName.toLowerCase()));
 		const names = new Set(coreTools.map(({ tool }) => tool.name));
 		for (const workflowTool of workflowTools) {
 			if (names.has(workflowTool.tool.name)) throw new Error(`Duplicate MCP tool name: ${workflowTool.tool.name}`);
@@ -7397,12 +7415,16 @@ function createMcpAppServer(options) {
 	}
 	function isTaskOrigin(identity, origin) {
 		if (identity.action.toLowerCase() !== origin.method.toLowerCase()) return false;
-		for (const [key, info] of ObjectRegistry.getAllClasses()) {
-			const name = info.name || key;
-			if (name.toLowerCase() !== identity.objectName.toLowerCase()) continue;
-			return origin.objectType === name || origin.objectType === info.qualifiedName;
+		if (identity.qualifiedName) {
+			if (origin.objectType === identity.qualifiedName) return true;
+			const info2 = ObjectRegistry.getAllClasses().get(identity.qualifiedName);
+			return !!info2?.name && origin.objectType === info2.name && sameNamedClasses(info2.name).length === 1;
 		}
-		return false;
+		const matches = sameNamedClasses(identity.objectName);
+		if (matches.length !== 1) return false;
+		const [[key, info]] = matches;
+		const name = info.name || key;
+		return origin.objectType === name || origin.objectType === info.qualifiedName;
 	}
 	async function assertTaskToolVisible(taskId, principal) {
 		const origin = await taskOrigin(taskId, principal);
@@ -7473,6 +7495,18 @@ function mcpAllowedClassNames(models) {
 	}
 	return [...names];
 }
+function mcpAllowedRegistryNames(models) {
+	if (!Array.isArray(models)) throw new TypeError("MCP models must be an explicit array.");
+	const classes = ObjectRegistry.getAllClasses();
+	const names = /* @__PURE__ */ new Set();
+	for (const model of models) {
+		const registered = typeof model === "function" ? ObjectRegistry.getClassByConstructor(model) : void 0;
+		const key = registered ? registered.qualifiedName && classes.get(registered.qualifiedName) ? registered.qualifiedName : [...classes].find(([, info]) => info === registered)?.[0] : void 0;
+		if (!registered || !key || registered.constructor !== model) throw new TypeError("MCP models must be registered @smrt() class constructors.");
+		names.add(key);
+	}
+	return [...names];
+}
 var scopePattern = /^[\x21\x23-\x5b\x5d-\x7e]+$/u;
 function snapshotStrings(values, label) {
 	if (!Array.isArray(values)) throw new TypeError(`MCP ${label} must be an explicit array.`);
@@ -7497,7 +7531,7 @@ function mcpPrincipalScopePolicy(options) {
 }
 function createDefaultMcpAppServer(options) {
 	const { models, requiredScopes, principalKinds, serverInfo, toolPolicy: narrowTool, resourcePolicy: narrowResource, taskPrincipalPolicy: narrowTask, ...rest } = options;
-	const allowedClassNames = mcpAllowedClassNames(models);
+	const allowedClassNames = mcpAllowedRegistryNames(models);
 	const base = mcpPrincipalScopePolicy({
 		requiredScopes,
 		principalKinds
@@ -7644,4 +7678,4 @@ function assertExtensionMetadata(value) {
 //#endregion
 export { McpAccessError as C, MCP_TOOL_ACCESS_DENIED_CODE as S, MCP_APP_RESOURCE_MAX_BYTES as _, createDefaultMcpAppServer as a, createMcpWorkflowTool as b, createMcpAppServer as c, isAllowedCoreTool as d, isPublicMcpTool as f, mcpToolEffect as g, matchesToolPattern as h, DEFAULT_MCP_APP_SERVER_INFO as i, MCP_TOOL_EFFECTS as l, isReadOnlyToolName as m, createMcpProtocolServer as n, mcpAllowedClassNames as o, isPublicToolName as p, createMcpProtocolServerForRequest as r, mcpPrincipalScopePolicy as s, MCP_TASKS_EXTENSION as t, classNamePrefixes as u, MCP_APP_RESOURCE_MIME as v, MCP_ORIGIN_DENIED_CODE as x, prepareMcpAppResource as y };
 
-//# sourceMappingURL=protocol-BlbEg3jn.js.map
+//# sourceMappingURL=protocol-CoCuR_w7.js.map