@classytic/arc 2.16.0 → 2.17.0

package/dist/{mcpPlugin-7vGV51ED.mjs → mcpPlugin-hZE00H74.mjs}

@@ -1,19 +1,44 @@
-import { p as isArcError } from "./errors-j4aJm1Wg.mjs";
-import { t as BaseController } from "./BaseController-DlCCTIxJ.mjs";
-import { L as normalizePermissionResult } from "./permissions-CTxMrreC.mjs";
+import { p as isArcError, t as ArcError } from "./errors-j4aJm1Wg.mjs";
+import { t as BaseController } from "./BaseController-Dmeh4Y_y.mjs";
+import { L as normalizePermissionResult } from "./permissions-B1Qy55fg.mjs";
 import { t as executePipeline } from "./pipe-DiCyvyPN.mjs";
-import { u as resolvePipelineSteps } from "./routerShared-CZV5aabX.mjs";
-import { r as validateAggregations } from "./validate-By96rH0r.mjs";
-import { n as executeAggregation } from "./buildHandler-BZX6zzDM.mjs";
+import { f as resolvePipelineSteps } from "./routerShared-nCyJGOKX.mjs";
+import { r as validateAggregations } from "./validate-DFIP2VrM.mjs";
+import { n as executeAggregation } from "./buildHandler-C_SkBNF3.mjs";
 import { t as pluralize } from "./pluralize-B9M8xvy-.mjs";
 import { t as resolveActionPermission } from "./actionPermissions-Bjmvn7Eb.mjs";
-import { i as shouldRejectAdditionalProperties, r as schemaIRToZodShape, t as normalizeSchemaIR } from "./schemaIR-Ctc89DSn.mjs";
+import { i as shouldRejectAdditionalProperties, r as schemaIRToZodShape, t as normalizeSchemaIR } from "./schemaIR-DAOvBWgT.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { isHttpError, toErrorContract } from "@classytic/repo-core/errors";
 import fp from "fastify-plugin";
 import { z } from "zod";
 //#region src/integrations/mcp/createMcpServer.ts
 /**
+* @classytic/arc — createMcpServer()
+*
+* Level 2 — Declarative MCP server factory.
+* Uses `server.registerTool()` / `server.registerPrompt()` (official SDK API)
+* with flat inputSchema shapes — no z.object() wrapping, no Zod version hacks.
+*
+* @example
+* ```typescript
+* import { createMcpServer, defineTool } from '@classytic/arc/mcp';
+* import { z } from 'zod';
+*
+* const server = await createMcpServer({
+*   name: 'my-api',
+*   version: '1.0.0',
+*   tools: [
+*     defineTool('greet', {
+*       description: 'Say hello',
+*       input: { name: z.string() },
+*       handler: async ({ name }) => ({ content: [{ type: 'text', text: `Hello ${name}` }] }),
+*     }),
+*   ],
+* });
+* ```
+*/
+/**
 * Create a configured MCP server from declarative config.
 *
 * @param config - Server name, version, tools, prompts
@@ -25,11 +50,70 @@ async function createMcpServer(config, authRef) {
 		name: config.name,
 		version: config.version ?? "1.0.0"
 	}, config.instructions ? { instructions: config.instructions } : void 0);
-	if (config.tools) for (const tool of config.tools) registerTool(server, tool, authRef);
+	if (config.tools) {
+		const resolved = resolveToolCollisions(config.tools);
+		for (const tool of resolved) registerTool(server, tool, authRef);
+	}
 	if (config.prompts) for (const prompt of config.prompts) registerPrompt(server, prompt);
 	return server;
 }
 /**
+* Detect and resolve duplicate MCP tool names across the assembled tool list.
+*
+* Two outcomes:
+*
+*  1. **Auto-namespace** — when one tool's `source` carries a `preset:<name>`
+*     prefix and the other doesn't, the preset tool is renamed to
+*     `<presetName>_<originalName>` (e.g. softDelete's `restore_post`
+*     becomes `softdelete_restore_post` when the user defines
+*     `actions.restore`). The user's tool wins the canonical name because
+*     it's the more-specific intent.
+*
+*  2. **Typed throw** — every other collision (two user actions, two
+*     custom routes, two presets) raises `ArcError('arc.mcp.tool_name_collision')`
+*     naming both sources so the host's stack trace points at the
+*     resource definitions, not the MCP SDK internals.
+*
+* Exported for the testing harness so collision behaviour can be exercised
+* without a full server boot.
+*/
+function resolveToolCollisions(tools) {
+	const byName = /* @__PURE__ */ new Map();
+	for (const t of tools) {
+		const list = byName.get(t.name);
+		if (list) list.push(t);
+		else byName.set(t.name, [t]);
+	}
+	const out = [];
+	for (const [name, list] of byName) {
+		const [first, second, ...rest] = list;
+		if (!first) continue;
+		if (!second) {
+			out.push(first);
+			continue;
+		}
+		if (rest.length === 0) {
+			const firstIsPreset = first.source?.startsWith("preset:") ?? false;
+			if (firstIsPreset !== (second.source?.startsWith("preset:") ?? false)) {
+				const preset = firstIsPreset ? first : second;
+				const user = firstIsPreset ? second : first;
+				const namespaced = `${(preset.source?.split(":")[1] ?? "preset").toLowerCase()}_${name}`;
+				out.push({
+					...preset,
+					name: namespaced
+				});
+				out.push(user);
+				continue;
+			}
+		}
+		throw new ArcError(`MCP tool name '${name}' is registered by ${list.length} sources: ${list.map((t) => t.source ?? "(unknown)").join(", ")}. Rename one of the sources (e.g. via 'actions.${name}' → 'actions.${name}V2', or pass 'names: { [op]: "custom_name" }' in mcpPlugin overrides) so each tool has a unique name.`, {
+			code: "arc.mcp.tool_name_collision",
+			statusCode: 500
+		});
+	}
+	return out;
+}
+/**
 * Register a ToolDefinition using `server.registerTool()`.
 *
 * The inputSchema is passed as a flat Zod shape `{ field: z.string() }` —
@@ -223,6 +307,13 @@ function expandOperatorKeys(input) {
 	}
 	return out;
 }
+/**
+* Resolve an `McpAuthResult` (or `null` for unauthenticated calls) into a
+* canonical `RequestScope`. Exported so the MCP tool helpers can build the
+* same scope when constructing the permission-check context, ensuring
+* `requireOrgMembership()` / `requireOrgRole()` see the same auth shape on
+* MCP that they see on HTTP.
+*/
 function buildScope(auth) {
 	if (!auth) return { kind: "public" };
 	if (auth.clientId && auth.organizationId) return {
@@ -264,6 +355,7 @@ async function evaluatePermission(check, session, resource, action, input) {
 		_id: session.userId,
 		...session
 	} : null;
+	const scope = buildScope(session);
 	return normalizePermissionResult(await check({
 		user,
 		request: {
@@ -271,7 +363,9 @@ async function evaluatePermission(check, session, resource, action, input) {
 			headers: {},
 			params: {},
 			query: {},
-			body: input
+			body: input,
+			scope,
+			metadata: { _scope: scope }
 		},
 		resource,
 		action,
@@ -1473,7 +1567,8 @@ function resourceToTools(resource, config = {}) {
 					allowedOperators,
 					adapterBodies
 				}),
-				handler: createCrudHandler(op, controller, resource.name, resource.permissions)
+				handler: createCrudHandler(op, controller, resource.name, resource.permissions),
+				source: `crud:${resource.name}:${op}`
 			});
 		}
 	}
@@ -1508,11 +1603,13 @@ function resourceToTools(resource, config = {}) {
 			for (const [key, val] of Object.entries(schemaIRToZodShape(ir))) if (!(key in inputShape)) inputShape[key] = val;
 		}
 		const toolName = prefix ? `${prefix}_${opName}_${resource.name}` : `${opName}_${resource.name}`;
+		const routeSource = route._presetSource ? `preset:${route._presetSource}:${resource.name}:${opName}` : `route:${resource.name}:${route.method} ${route.path}`;
 		tools.push({
 			name: toolName,
 			description: toolDescription,
 			annotations: toolAnnotations,
 			inputSchema: inputShape,
+			source: routeSource,
 			handler: mcpHandler ? createMcpHandlerPassthrough(mcpHandler) : createCustomRouteHandler({
 				handler: resolvedRouteHandler,
 				operation: route.operation,
@@ -1552,6 +1649,7 @@ function resourceToTools(resource, config = {}) {
 			description: String(description),
 			annotations,
 			inputSchema: inputShape,
+			source: `action:${resource.name}:${actionName}`,
 			handler: createActionToolHandler(actionName, handler, actionPerms, resource.name, resource.permissions, rawSchema, idLess)
 		});
 	}
@@ -1799,6 +1897,11 @@ const mcpPluginImpl = async (fastify, options) => {
 	}
 	if (options.auth && isBetterAuth(options.auth)) await registerOAuthDiscovery(fastify, options.auth);
 	const prefix = options.prefix ?? "/mcp";
+	if (options.auth === false) {
+		const toolList = allTools.map((t) => t.name).slice(0, 5).join(", ");
+		const more = allTools.length > 5 ? ` (+${allTools.length - 5} more)` : "";
+		fastify.log.warn(`[arc/mcp] MCP server registered at "${prefix}" with auth DISABLED. Anyone who can reach this URL has full access to ${allTools.length} tools across ${enabledResources.length} resources: ${toolList}${more}. Pass \`auth: betterAuthInstance\` or \`auth: async (headers) => ...\` to gate access. Safe only for stdio transports, local development, or explicitly-public read-only APIs.`);
+	}
 	fastify.get(`${prefix}/health`, async (_request, reply) => {
 		reply.send({
 			status: "ok",
@@ -2013,4 +2116,4 @@ const mcpPlugin = fp(mcpPluginImpl, {
 	fastify: "5.x"
 });
 //#endregion
-export { defaultCrudDescription as a, mcpHandlerAdapter as c, toCallToolResult as d, toCallToolSuccess as f, fieldRulesToZod as i, permissionDeniedResult as l, createMcpServer as m, mcpPlugin as n, resolveCrudDescription as o, buildRequestContext as p, resourceToTools as r, invokeController as s, filterResourcesForMcp as t, toCallToolError as u };
+export { defaultCrudDescription as a, mcpHandlerAdapter as c, toCallToolResult as d, toCallToolSuccess as f, resolveToolCollisions as h, fieldRulesToZod as i, permissionDeniedResult as l, createMcpServer as m, mcpPlugin as n, resolveCrudDescription as o, buildRequestContext as p, resourceToTools as r, invokeController as s, filterResourcesForMcp as t, toCallToolError as u };

package/dist/middleware/index.d.mts

@@ -1,4 +1,4 @@
-import { I as MiddlewareHandler, L as RequestWithExtras, Q as MiddlewareConfig } from "../index-CkW0flkU.mjs";
+import { I as MiddlewareHandler, L as RequestWithExtras, Q as MiddlewareConfig } from "../index-C1JSBan-.mjs";
 import { RouteHandlerMethod } from "fastify";
 
 //#region src/middleware/middleware.d.ts

package/dist/middleware/index.mjs

@@ -1,5 +1,5 @@
 import { t as CRUD_OPERATIONS } from "../constants-TrJVIJl0.mjs";
-import { t as multipartBody } from "../multipartBody-BOvVSVCD.mjs";
+import { t as multipartBody } from "../multipartBody-VjVWmZl8.mjs";
 //#region src/middleware/middleware.ts
 /**
 * Named Middleware — Priority-based, conditional middleware execution.

package/dist/{multipartBody-BOvVSVCD.mjs → multipartBody-VjVWmZl8.mjs}

@@ -1,3 +1,4 @@
+import sjson from "secure-json-parse";
 //#region src/middleware/multipartBody.ts
 const DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024;
 const DEFAULT_MAX_FILES = 5;
@@ -118,7 +119,7 @@ function tryParseValue(value) {
 		if (Number.isFinite(num)) return num;
 	}
 	if (value.startsWith("{") && value.endsWith("}") || value.startsWith("[") && value.endsWith("]")) try {
-		return JSON.parse(value);
+		return sjson.parse(value);
 	} catch {}
 	return value;
 }

package/dist/{openapi-34T9yNwd.mjs → openapi-DKDs9NfD.mjs}

@@ -1,8 +1,8 @@
-import { t as getUserRoles } from "./types-D57iXYb8.mjs";
+import { t as getUserRoles } from "./types-DV9WDfeg.mjs";
 import { n as convertRouteSchema } from "./schemaConverter-De34B1ZG.mjs";
 import { t as pluralize } from "./pluralize-B9M8xvy-.mjs";
 import { t as resolveActionPermission } from "./actionPermissions-Bjmvn7Eb.mjs";
-import { t as buildActionBodySchema } from "./createActionRouter-DUpN3Dd1.mjs";
+import { t as buildActionBodySchema } from "./createActionRouter-BHUMb1-y.mjs";
 import fp from "fastify-plugin";
 //#region src/docs/openapi/canonical-schemas.ts
 /**
@@ -647,13 +647,7 @@ function appendAggregationPaths(paths, resource, basePath, additionalSecurity) {
 		if (!paths[path]) paths[path] = {};
 		paths[path].get = createOperation(resource, `aggregation.${agg.name}`, agg.summary ?? `Aggregation: ${agg.name}`, {
 			description: descLines.join("\n"),
-			parameters: [{
-				name: "querystring",
-				in: "query",
-				required: false,
-				schema: querystring,
-				description: "Filter narrowing — composes with base filter + tenant scope."
-			}],
+			parameters: buildAggregationParameters(agg, querystring),
 			responses: {
 				"200": {
 					description: "Aggregation result",
@@ -701,6 +695,37 @@ function normalizeGroupByForOpenApi(groupBy) {
 	if (!groupBy) return [];
 	return typeof groupBy === "string" ? [groupBy] : groupBy;
 }
+/**
+* Build the OpenAPI `parameters` array for an aggregation route.
+*
+* Always includes the filter-narrowing `querystring` slot. When the
+* aggregation declares URL-driven paging (`defaultLimit`), adds an
+* explicit `?limit` integer parameter with the declared default +
+* maximum. Auto-generated FE clients pick the constraint up; humans
+* reading the docs see the cap without reading source.
+*/
+function buildAggregationParameters(agg, querystring) {
+	const params = [{
+		name: "querystring",
+		in: "query",
+		required: false,
+		schema: querystring,
+		description: "Filter narrowing — composes with base filter + tenant scope."
+	}];
+	if (agg.defaultLimit !== void 0) params.push({
+		name: "limit",
+		in: "query",
+		required: false,
+		schema: {
+			type: "integer",
+			minimum: 1,
+			default: agg.defaultLimit,
+			maximum: agg.maxLimit ?? 1e3
+		},
+		description: `Result row cap. Default ${agg.defaultLimit}; values above ${agg.maxLimit ?? 1e3} are capped silently. Invalid values fall back to the default.`
+	});
+	return params;
+}
 function setNestedSchemaProp(target, path, leaf) {
 	if (path.length === 1) {
 		target[path[0]] = leaf;
@@ -850,7 +875,9 @@ function appendCustomRoutePaths(paths, resource, basePath, additionalSecurity) {
 		}
 		if (routeSchema?.response) {
 			const responseSchemas = routeSchema.response;
-			for (const [statusCode, schema] of Object.entries(responseSchemas)) extras.responses[statusCode] = {
+			const responses = extras.responses ?? {};
+			extras.responses = responses;
+			for (const [statusCode, schema] of Object.entries(responseSchemas)) responses[statusCode] = {
 				description: schema.description || `Response ${statusCode}`,
 				content: { "application/json": { schema } }
 			};

package/dist/permissions/index.d.mts

@@ -1,3 +1,3 @@
-import { a as applyFieldWritePermissions, c as PermissionCheck, d as UserBase, f as getUserRoles, i as applyFieldReadPermissions, l as PermissionContext, n as FieldPermissionMap, o as fields, p as normalizeRoles, r as FieldPermissionType, s as resolveEffectiveRoles, t as FieldPermission, u as PermissionResult } from "../fields-Anj0xdih.mjs";
-import { A as requireRoles, C as allOf, D as not, E as denyAll, F as RequireAgentScopeOptions, I as RequireMandateOptions, L as requireAgentScope, M as when, N as applyPermissionResult, O as requireAuth, P as normalizePermissionResult, R as requireDPoP, S as createOrgPermissions, T as anyOf, _ as ConnectEventsOptions, a as presets_d_exports, b as PermissionEventBus, c as readOnly, d as requireOrgRole, f as requireScopeContext, g as createRoleHierarchy, h as RoleHierarchy, i as ownerWithAdminBypass, j as roles, k as requireOwnership, l as requireOrgInScope, m as requireTeamMembership, n as authenticated, o as publicRead, p as requireServiceScope, r as fullPublic, s as publicReadAdminWrite, t as adminOnly, u as requireOrgMembership, v as DynamicPermissionMatrix, w as allowPublic, x as createDynamicPermissionMatrix, y as DynamicPermissionMatrixConfig, z as requireMandate } from "../index-3oIimXQn.mjs";
+import { a as applyFieldWritePermissions, c as PermissionCheck, d as UserBase, f as getUserRoles, i as applyFieldReadPermissions, l as PermissionContext, n as FieldPermissionMap, o as fields, p as normalizeRoles, r as FieldPermissionType, s as resolveEffectiveRoles, t as FieldPermission, u as PermissionResult } from "../fields-DqZLp5d6.mjs";
+import { A as requireRoles, C as allOf, D as not, E as denyAll, F as RequireAgentScopeOptions, I as RequireMandateOptions, L as requireAgentScope, M as when, N as applyPermissionResult, O as requireAuth, P as normalizePermissionResult, R as requireDPoP, S as createOrgPermissions, T as anyOf, _ as ConnectEventsOptions, a as presets_d_exports, b as PermissionEventBus, c as readOnly, d as requireOrgRole, f as requireScopeContext, g as createRoleHierarchy, h as RoleHierarchy, i as ownerWithAdminBypass, j as roles, k as requireOwnership, l as requireOrgInScope, m as requireTeamMembership, n as authenticated, o as publicRead, p as requireServiceScope, r as fullPublic, s as publicReadAdminWrite, t as adminOnly, u as requireOrgMembership, v as DynamicPermissionMatrix, w as allowPublic, x as createDynamicPermissionMatrix, y as DynamicPermissionMatrixConfig, z as requireMandate } from "../index-3L-adFJO.mjs";
 export { ConnectEventsOptions, DynamicPermissionMatrix, DynamicPermissionMatrixConfig, FieldPermission, FieldPermissionMap, FieldPermissionType, PermissionCheck, PermissionContext, PermissionEventBus, PermissionResult, RequireAgentScopeOptions, RequireMandateOptions, RoleHierarchy, UserBase, adminOnly, allOf, allowPublic, anyOf, applyFieldReadPermissions, applyFieldWritePermissions, applyPermissionResult, authenticated, createDynamicPermissionMatrix, createOrgPermissions, createRoleHierarchy, denyAll, fields, fullPublic, getUserRoles, normalizePermissionResult, normalizeRoles, not, ownerWithAdminBypass, presets_d_exports as permissions, publicRead, publicReadAdminWrite, readOnly, requireAgentScope, requireAuth, requireDPoP, requireMandate, requireOrgInScope, requireOrgMembership, requireOrgRole, requireOwnership, requireRoles, requireScopeContext, requireServiceScope, requireTeamMembership, resolveEffectiveRoles, roles, when };

package/dist/permissions/index.mjs

@@ -1,3 +1,3 @@
-import { A as roles, C as allowPublic, D as requireAuth, E as not, F as applyPermissionResult, L as normalizePermissionResult, M as requireAgentScope, N as requireDPoP, O as requireOwnership, P as requireMandate, S as allOf, T as denyAll, _ as requireOrgMembership, a as presets_exports, b as requireServiceScope, c as readOnly, d as applyFieldWritePermissions, f as fields, g as requireOrgInScope, h as createOrgPermissions, i as ownerWithAdminBypass, j as when, k as requireRoles, l as createRoleHierarchy, m as createDynamicPermissionMatrix, n as authenticated, o as publicRead, p as resolveEffectiveRoles, r as fullPublic, s as publicReadAdminWrite, t as adminOnly, u as applyFieldReadPermissions, v as requireOrgRole, w as anyOf, x as requireTeamMembership, y as requireScopeContext } from "../permissions-CTxMrreC.mjs";
-import { n as normalizeRoles, t as getUserRoles } from "../types-D57iXYb8.mjs";
+import { A as requireMandate, C as requireAuth, D as when, E as roles, F as applyPermissionResult, L as normalizePermissionResult, M as applyFieldWritePermissions, N as fields, O as requireAgentScope, P as resolveEffectiveRoles, S as not, T as requireRoles, _ as requireTeamMembership, a as presets_exports, b as anyOf, c as readOnly, d as createOrgPermissions, f as requireOrgInScope, g as requireServiceScope, h as requireScopeContext, i as ownerWithAdminBypass, j as applyFieldReadPermissions, k as requireDPoP, l as createRoleHierarchy, m as requireOrgRole, n as authenticated, o as publicRead, p as requireOrgMembership, r as fullPublic, s as publicReadAdminWrite, t as adminOnly, u as createDynamicPermissionMatrix, v as allOf, w as requireOwnership, x as denyAll, y as allowPublic } from "../permissions-B1Qy55fg.mjs";
+import { n as normalizeRoles, t as getUserRoles } from "../types-DV9WDfeg.mjs";
 export { adminOnly, allOf, allowPublic, anyOf, applyFieldReadPermissions, applyFieldWritePermissions, applyPermissionResult, authenticated, createDynamicPermissionMatrix, createOrgPermissions, createRoleHierarchy, denyAll, fields, fullPublic, getUserRoles, normalizePermissionResult, normalizeRoles, not, ownerWithAdminBypass, presets_exports as permissions, publicRead, publicReadAdminWrite, readOnly, requireAgentScope, requireAuth, requireDPoP, requireMandate, requireOrgInScope, requireOrgMembership, requireOrgRole, requireOwnership, requireRoles, requireScopeContext, requireServiceScope, requireTeamMembership, resolveEffectiveRoles, roles, when };