@happyvertical/smrt-core 0.44.0 → 0.45.0

package/dist/vite-plugin/index.js

@@ -1,4 +1,5 @@
 import { DETERMINISTIC_GENERATED_AT } from "../scanner/types.js";
+import { resolveCustomActionNames } from "../generators/custom-action.js";
 import { findCliApiCoherenceViolations, generateSvelteKitRoutes, methodNameToKebab, resolveApiActionRouteConfig, resolveApiActionSet, validateCliIncludeAgainstApi } from "./sveltekit-generator.js";
 import { buildWebCollectionDefinition, buildWebMcpToolDefinitions, buildWebToolDescriptors, computeWebManifestHash, selectWebCollectionEntries } from "./web-collections.js";
 import { buildDomainKnowledgeManifest } from "../knowledge.js";
@@ -136,12 +137,25 @@ function smrtPlugin(options = {}) {
 	* so an in-flight decorator edit doesn't kill the dev server. Uses the same
 	* remediation text as the strict build-time gate (`validateCliIncludeAgainstApi`)
 	* so the dev-server message is as actionable as the build failure.
+	*
+	* `findCliApiCoherenceViolations` (#2638) now reports a violation for any
+	* `cli` config shape, including a bare `cli: true`/`cli: {}` default, but
+	* `validateCliIncludeAgainstApi` only THROWS for a class with a non-empty,
+	* explicit `cli.include` (see that function's doc comment for why: the
+	* broader default-surface population is real but unrelated pre-existing
+	* over-exposure this repo hasn't triaged, not a #2638 defect). So this
+	* warning must not unconditionally claim the build will fail — only an
+	* explicit `cli.include` naming the action makes that true today.
 	*/
 	function warnCliApiCoherenceViolations(m) {
 		if (!validateCliApiCoherence) return;
 		const violations = findCliApiCoherenceViolations(m);
 		if (violations.length === 0) return;
-		for (const { className, unreachable } of violations) for (const action of unreachable) console.warn(`[smrt] ${className}.${action} is declared in cli.include but is not exposed via the api. Build will fail until this is resolved.\n  Either:\n    - Add '${action}' to api.include, or\n    - Remove '${action}' from cli.include.\n  The CLI invokes methods over HTTP; methods without API routes are unreachable.\n  If this CLI is intentionally invoked in-process (no HTTP), set\n  \`cli: { skipApiCheck: true }\` on the @smrt() decorator to acknowledge.`);
+		for (const { className, unreachable } of violations) {
+			const cliConfig = m.objects[className]?.decoratorConfig?.cli;
+			const isEnforced = typeof cliConfig === "object" && Array.isArray(cliConfig.include) && cliConfig.include.length > 0;
+			for (const action of unreachable) console.warn(`[smrt] ${className}.${action} is exposed as a CLI command but is not exposed via the api.` + (isEnforced ? " Build will fail until this is resolved.\n" : " (Not yet build-blocking for this cli:true/{} class -- see #2638.)\n") + `  Either:\n    - Add '${action}' to api.include, or\n    - Remove '${action}' from cli.include / add it to cli.exclude.\n  The CLI invokes methods over HTTP; methods without API routes are unreachable.\n  If this CLI is intentionally invoked in-process (no HTTP), set\n  \`cli: { skipApiCheck: true }\` on the @smrt() decorator to acknowledge.`);
+		}
 	}
 	let server;
 	let manifest = null;
@@ -744,7 +758,7 @@ async function generateMCPModule(manifest) {
 
 import { SmrtMCPServer } from '@happyvertical/smrt-core/runtime';
 
-export const tools = ${new ManifestGenerator().generateMCPTools(manifest)};
+export const tools = ${new ManifestGenerator().generateMCPToolsCode(manifest)};
 
 export function createMCPServer(options = {}) {
   const server = new SmrtMCPServer({
@@ -753,12 +767,19 @@ export function createMCPServer(options = {}) {
     ...options
   });
 
-  // Add all generated tools to the server
+  // Add all generated tools to the server. A handler supplied through the
+  // documented \`createMCPServer({ handlers })\` option wins; the throwing
+  // placeholder is only for tools the application did not wire up (#2631).
+  const handlers = options.handlers || {};
   for (const tool of tools) {
-    server.addTool(tool, async (params) => {
-      // Tool execution will be handled by the application
-      throw new Error(\`Tool '\${tool.name}' handler must be provided by application\`);
-    });
+    const handler = handlers[tool.name];
+    server.addTool(
+      tool,
+      handler ||
+        (async () => {
+          throw new Error(\`Tool '\${tool.name}' handler must be provided by application\`);
+        }),
+    );
   }
 
   return server;
@@ -787,7 +808,8 @@ export function createMCPServer(options = {}) {
 */
 function generateClientModeTypes(manifest) {
 	const typeDefinitions = [];
-	for (const [objectName, objectMeta] of Object.entries(manifest.objects)) {
+	for (const objectMeta of Object.values(manifest.objects)) {
+		const interfaceName = objectMeta.className;
 		const fields = objectMeta.fields || {};
 		const propertyLines = [];
 		for (const [fieldName, fieldDef] of Object.entries(fields)) {
@@ -818,7 +840,7 @@ function generateClientModeTypes(manifest) {
 			propertyLines.push(`  ${fieldName}${optional}: ${type};`);
 		}
 		propertyLines.unshift("  id?: string;", "  created_at?: string;", "  updated_at?: string;");
-		const interfaceDef = `export interface ${objectName}Data {\n${propertyLines.join("\n")}\n}`;
+		const interfaceDef = `export interface ${interfaceName}Data {\n${propertyLines.join("\n")}\n}`;
 		typeDefinitions.push(interfaceDef);
 	}
 	return typeDefinitions.join("\n\n");
@@ -1327,29 +1349,32 @@ async function generateCLIModule(manifest) {
 				return true;
 			};
 			const collectionName = objectDef.collection;
-			const commandName = (objectDef.className || className).toLowerCase();
-			objectImports.push(`// Import ${className} and ${className}Collection for CLI operations`);
+			const simpleClassName = objectDef.className || className;
+			const commandName = simpleClassName.toLowerCase();
+			objectImports.push(`// Import ${simpleClassName} for CLI operations`);
 			const availableCommands = [];
 			if (shouldInclude("list")) availableCommands.push(`'${commandName}:list'`);
 			if (shouldInclude("get")) availableCommands.push(`'${commandName}:get'`);
 			if (shouldInclude("create")) availableCommands.push(`'${commandName}:create'`);
 			if (shouldInclude("update")) availableCommands.push(`'${commandName}:update'`);
 			if (shouldInclude("delete")) availableCommands.push(`'${commandName}:delete'`);
-			for (const [methodName, _method] of Object.entries(objectDef.methods)) {
-				if (methodName.startsWith("_") || [
-					"list",
-					"get",
-					"create",
-					"update",
-					"delete",
-					"save"
-				].includes(methodName)) continue;
+			for (const methodName of resolveCustomActionNames(Object.entries(objectDef.methods), {
+				include: included ?? void 0,
+				exclude: excluded
+			}, [
+				"list",
+				"get",
+				"create",
+				"update",
+				"delete"
+			])) {
+				if (methodName.startsWith("_")) continue;
 				if (shouldInclude(methodName)) availableCommands.push(`'${commandName}:${methodName}'`);
 			}
 			if (availableCommands.length > 0) commands.push(`
-  // ${className} commands
-  ${className}: {
-    collection: '${collectionName}',
+  // ${simpleClassName} commands
+  ${JSON.stringify(simpleClassName)}: {
+    collection: ${JSON.stringify(collectionName)},
     commands: [${availableCommands.join(", ")}]
   }`);
 		}