@wootsup/yt-builder-mcp 1.12.0 → 2.0.0

package/dist/gateway/advanced-tool/execute.d.ts

@@ -1,35 +1,10 @@
-/**
- * Gateway execute-mode dispatch — handles `{ tool, arguments }`
- * invocations by validating `arguments` against the target tool's Zod
- * schema in `.strict()` mode, then invoking the captured handler with
- * the parsed args and the original SDK `extra` (so progress/elicitation/
- * AbortSignal of the target tool keep working).
- *
- * Round-2 (R2-A2-CRIT2) extracted from `gateway/advanced-tool.ts`.
- *
- * @license MIT
- */
 import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
 import type { AdvancedToolEntry } from '../capturing-server.js';
-/** Builds an error CallToolResult with structured payload (echoed into text + structuredContent). */
 export declare function errorResult(payload: {
     message: string;
     code: string;
     suggestion: string;
     details?: Record<string, unknown>;
 }): CallToolResult;
-/**
- * Executes a captured advanced tool with strict-validated arguments.
- *
- * Returns a structured `invalid_arguments` error on Zod-validation
- * failure; otherwise invokes `entry.handler` with `(parsedArgs, extra)`
- * and returns its CallToolResult verbatim.
- *
- * DISCOVERY_AUDIT-13: `gatewayName` names the gateway the call ARRIVED on
- * (`yootheme_builder_advanced` for the write gateway, `…_advanced_read` for the
- * read gateway) so the invalid_arguments suggestion points the caller back at
- * the SAME gateway they used — not always the write one. Defaults to the write
- * gateway for back-compat with any caller that predates the parameter.
- */
 export declare function executeAdvancedTool(toolName: string, entry: AdvancedToolEntry, rawArgs: Record<string, unknown>, extra: unknown, gatewayName?: string): Promise<CallToolResult>;
 //# sourceMappingURL=execute.d.ts.map

package/dist/gateway/advanced-tool/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/gateway/advanced-tool/execute.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AA8ChE,qGAAqG;AACrG,wBAAgB,WAAW,CAAC,OAAO,EAAE;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,GAAG,cAAc,CAYjB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,mBAAmB,CACrC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,KAAK,EAAE,OAAO,EACd,WAAW,GAAE,MAA6B,GAC3C,OAAO,CAAC,cAAc,CAAC,CA6BzB"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/gateway/advanced-tool/execute.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAwFhE,wBAAgB,WAAW,CAAC,OAAO,EAAE;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,GAAG,cAAc,CAYjB;AAeD,wBAAsB,mBAAmB,CACrC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,KAAK,EAAE,OAAO,EACd,WAAW,GAAE,MAA6B,GAC3C,OAAO,CAAC,cAAc,CAAC,CAmCzB"}

package/dist/gateway/advanced-tool/execute.js

@@ -1,31 +1,6 @@
-/**
- * Gateway execute-mode dispatch — handles `{ tool, arguments }`
- * invocations by validating `arguments` against the target tool's Zod
- * schema in `.strict()` mode, then invoking the captured handler with
- * the parsed args and the original SDK `extra` (so progress/elicitation/
- * AbortSignal of the target tool keep working).
- *
- * Round-2 (R2-A2-CRIT2) extracted from `gateway/advanced-tool.ts`.
- *
- * @license MIT
- */
 import { z } from 'zod';
 import { inputSchemaJson, shapeOf } from './discovery.js';
-/** The write gateway's own name — the default `gatewayName` for back-compat. */
 const DEFAULT_GATEWAY_NAME = 'yootheme_builder_advanced';
-/**
- * DISCOVERY_AUDIT-12 — reduce a full input JSON-schema to ONLY the top-level
- * property subtrees the failing Zod issues actually touch.
- *
- * A single-token typo (e.g. `checks:['accessibility']`) used to attach the
- * WHOLE nested `expected_schema` (measured 3737 bytes for one bad enum value).
- * The full schema is one discovery call away ({tool} with no arguments), so the
- * error only needs the offending subtree(s). We collect `issue.path[0]` (the
- * top-level property each issue lives under) and pick just those properties off
- * the full schema. Returns `null` when nothing can be narrowed (no property
- * paths, or the schema is not the expected object shape) so the caller can fall
- * back to the discovery pointer instead of a full dump.
- */
 function offendingSchemaSubtree(fullSchema, issues) {
     if (fullSchema === null || typeof fullSchema !== 'object' || Array.isArray(fullSchema)) {
         return null;
@@ -50,7 +25,16 @@ function offendingSchemaSubtree(fullSchema, issues) {
     }
     return { type: 'object', properties: picked };
 }
-/** Builds an error CallToolResult with structured payload (echoed into text + structuredContent). */
+function confirmInsteadOfDryRunHint(entry, issues) {
+    const rejectedDryRun = issues.some((issue) => issue.code === 'unrecognized_keys' && issue.path.length === 0 && (issue.keys ?? []).includes('dry_run'));
+    if (!rejectedDryRun)
+        return null;
+    const shape = shapeOf(entry);
+    if (!('confirm' in shape) || 'dry_run' in shape)
+        return null;
+    return ('This tool takes `confirm` (default false), not `dry_run` — deleting is a confirmed ' +
+        'action, not a preview, so the two guards are deliberately never aliased.');
+}
 export function errorResult(payload) {
     const body = {
         error: payload.message,
@@ -64,39 +48,19 @@ export function errorResult(payload) {
         isError: true,
     };
 }
-/**
- * Executes a captured advanced tool with strict-validated arguments.
- *
- * Returns a structured `invalid_arguments` error on Zod-validation
- * failure; otherwise invokes `entry.handler` with `(parsedArgs, extra)`
- * and returns its CallToolResult verbatim.
- *
- * DISCOVERY_AUDIT-13: `gatewayName` names the gateway the call ARRIVED on
- * (`yootheme_builder_advanced` for the write gateway, `…_advanced_read` for the
- * read gateway) so the invalid_arguments suggestion points the caller back at
- * the SAME gateway they used — not always the write one. Defaults to the write
- * gateway for back-compat with any caller that predates the parameter.
- */
 export async function executeAdvancedTool(toolName, entry, rawArgs, extra, gatewayName = DEFAULT_GATEWAY_NAME) {
-    // strict() surfaces unknown keys as Zod issues rather than silently
-    // dropping them, so callers can self-correct when they pass schema-
-    // extra keys.
     const parsed = z.object(shapeOf(entry)).strict().safeParse(rawArgs);
     if (!parsed.success) {
-        // DISCOVERY_AUDIT-12: attach ONLY the offending property subtree(s), not
-        // the whole nested schema (a single typo dumped ~3.7 KB). The full schema
-        // is one discovery call away — named in the suggestion below.
         const offending = offendingSchemaSubtree(inputSchemaJson(entry), parsed.error.issues);
+        const confirmHint = confirmInsteadOfDryRunHint(entry, parsed.error.issues);
         return errorResult({
             message: `Invalid arguments for "${toolName}".`,
             code: 'invalid_arguments',
-            suggestion: `Call ${gatewayName} with { tool: "${toolName}" } to see ` +
+            suggestion: (confirmHint !== null ? `${confirmHint} ` : '') +
+                `Call ${gatewayName} with { tool: "${toolName}" } to see ` +
                 'the full expected schema, then retry with corrected arguments.',
             details: {
                 issues: parsed.error.issues,
-                // The narrowed subtree when we could isolate the offending
-                // properties; otherwise a pointer to the discovery call rather
-                // than the full dump.
                 ...(offending !== null
                     ? { offending_schema: offending }
                     : { schema_hint: `Omit \`arguments\` on ${gatewayName}({ tool: "${toolName}" }) for the full schema.` }),

package/dist/gateway/advanced-tool/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/gateway/advanced-tool/execute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/gateway/advanced-tool/execute.ts"],"names":[],"mappings":"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"}

package/dist/gateway/advanced-tool/index.d.ts

@@ -1,35 +1,4 @@
-/**
- * `yootheme_builder_advanced` gateway tool — Wave G.1 / Design-Doc §3.1.1.
- *
- * Single entry-point to every L2 (non-essential, non-direct) tool. Cursor
- * caps MCP servers at ~40 tools; routing 12 advanced tools through one
- * gateway keeps `tools/list` at 10 (7 L1 + 2 L3 + 1 gateway).
- *
- * Two modes:
- *   { tool }              → discovery: returns the target's description,
- *                           a JSON-schema derived from its Zod inputSchema,
- *                           and its annotation flags. The target handler
- *                           is NOT invoked.
- *   { tool, arguments }   → execution: `arguments` is validated against
- *                           the target's Zod inputSchema in `.strict()`
- *                           mode (unknown keys surface as Zod issues), then
- *                           the target handler is invoked with the parsed
- *                           args and the same `extra` object — so the
- *                           target tool's progress, elicitation and
- *                           AbortSignal keep working.
- *
- * Errors are structured ({ error, code, suggestion, details }). The gateway
- * cannot route to itself: `yootheme_builder_advanced` is never in the
- * advanced registry (the CapturingServer never sees its name — it's
- * registered after the CapturingServer hands off).
- *
- * Round-2 (R2-A2-CRIT2): split into 5 files under `advanced-tool/`
- * (this barrel + `domains.ts` + `discovery.ts` + `execute.ts` +
- * `register.ts`) to keep each file ≤ 100 LoC per Architecture §11.
- *
- * @license MIT
- */
-export { DOMAIN_ORDER, DOMAIN_PREFIX_MAP, TOOL_PREFIX, buildDescription, domainOf, groupByDomain, renderGroupedList, } from './domains.js';
+export { DOMAIN_ORDER, DOMAIN_PREFIX_MAP, TOOL_PREFIX, buildDescription, domainOf, groupByDomain, renderGroupedList, resolveShortToolName, } from './domains.js';
 export { discoveryResult, inputSchemaJson, shapeOf } from './discovery.js';
 export { errorResult, executeAdvancedTool } from './execute.js';
 export { registerAdvancedTool } from './register.js';

package/dist/gateway/advanced-tool/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/gateway/advanced-tool/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAKH,OAAO,EACH,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACb,iBAAiB,GACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/gateway/advanced-tool/index.ts"],"names":[],"mappings":"AAoCA,OAAO,EACH,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACb,iBAAiB,EACjB,oBAAoB,GACvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC"}

package/dist/gateway/advanced-tool/index.js

@@ -1,38 +1,4 @@
-/**
- * `yootheme_builder_advanced` gateway tool — Wave G.1 / Design-Doc §3.1.1.
- *
- * Single entry-point to every L2 (non-essential, non-direct) tool. Cursor
- * caps MCP servers at ~40 tools; routing 12 advanced tools through one
- * gateway keeps `tools/list` at 10 (7 L1 + 2 L3 + 1 gateway).
- *
- * Two modes:
- *   { tool }              → discovery: returns the target's description,
- *                           a JSON-schema derived from its Zod inputSchema,
- *                           and its annotation flags. The target handler
- *                           is NOT invoked.
- *   { tool, arguments }   → execution: `arguments` is validated against
- *                           the target's Zod inputSchema in `.strict()`
- *                           mode (unknown keys surface as Zod issues), then
- *                           the target handler is invoked with the parsed
- *                           args and the same `extra` object — so the
- *                           target tool's progress, elicitation and
- *                           AbortSignal keep working.
- *
- * Errors are structured ({ error, code, suggestion, details }). The gateway
- * cannot route to itself: `yootheme_builder_advanced` is never in the
- * advanced registry (the CapturingServer never sees its name — it's
- * registered after the CapturingServer hands off).
- *
- * Round-2 (R2-A2-CRIT2): split into 5 files under `advanced-tool/`
- * (this barrel + `domains.ts` + `discovery.ts` + `execute.ts` +
- * `register.ts`) to keep each file ≤ 100 LoC per Architecture §11.
- *
- * @license MIT
- */
-// Re-exports — keep the public surface that `advanced-tool.ts` exposed
-// before the split, so downstream importers keep working through the
-// `./advanced-tool.js` backward-compat shim.
-export { DOMAIN_ORDER, DOMAIN_PREFIX_MAP, TOOL_PREFIX, buildDescription, domainOf, groupByDomain, renderGroupedList, } from './domains.js';
+export { DOMAIN_ORDER, DOMAIN_PREFIX_MAP, TOOL_PREFIX, buildDescription, domainOf, groupByDomain, renderGroupedList, resolveShortToolName, } from './domains.js';
 export { discoveryResult, inputSchemaJson, shapeOf } from './discovery.js';
 export { errorResult, executeAdvancedTool } from './execute.js';
 export { registerAdvancedTool } from './register.js';

package/dist/gateway/advanced-tool/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/gateway/advanced-tool/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,uEAAuE;AACvE,qEAAqE;AACrE,6CAA6C;AAC7C,OAAO,EACH,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACb,iBAAiB,GACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/gateway/advanced-tool/index.ts"],"names":[],"mappings":"AAoCA,OAAO,EACH,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACb,iBAAiB,EACjB,oBAAoB,GACvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC"}

package/dist/gateway/advanced-tool/register.d.ts

@@ -1,18 +1,4 @@
-/**
- * Gateway tool registration — wires `yootheme_builder_advanced` onto the
- * real McpServer, with discovery-mode + execute-mode dispatch.
- *
- * Round-2 (R2-A2-CRIT2) extracted from `gateway/advanced-tool.ts`.
- *
- * @license MIT
- */
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { AdvancedToolEntry } from '../capturing-server.js';
-/**
- * Registers `yootheme_builder_advanced` on the real McpServer.
- *
- * @param realServer       the McpServer that exposes the gateway tool
- * @param advancedRegistry the captured non-essential tools (from CapturingServer)
- */
 export declare function registerAdvancedTool(realServer: McpServer, advancedRegistry: Map<string, AdvancedToolEntry>): void;
 //# sourceMappingURL=register.d.ts.map

package/dist/gateway/advanced-tool/register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../src/gateway/advanced-tool/register.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAIzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AA0ChE;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,SAAS,EACrB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GACjD,IAAI,CAyDN"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../src/gateway/advanced-tool/register.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAIzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAiDhE,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,SAAS,EACrB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GACjD,IAAI,CAoFN"}

package/dist/gateway/advanced-tool/register.js

@@ -1,63 +1,28 @@
-/**
- * Gateway tool registration — wires `yootheme_builder_advanced` onto the
- * real McpServer, with discovery-mode + execute-mode dispatch.
- *
- * Round-2 (R2-A2-CRIT2) extracted from `gateway/advanced-tool.ts`.
- *
- * @license MIT
- */
 import { z } from 'zod';
 import { isEssential, isDirectTopLevel } from '../essentials.js';
-import { buildDescription, renderGroupedList } from './domains.js';
-import { discoveryResult } from './discovery.js';
+import { strictInputObject } from '../../tools/strict-input.js';
+import { buildDescription, FIRST_CLASS_NOT_ABSENT_HINT, renderGroupedList, resolveShortToolName } from './domains.js';
+import { discoveryResult, requiredArgsFromRegistry } from './discovery.js';
 import { errorResult, executeAdvancedTool } from './execute.js';
-/**
- * Builds the gateway tool's Zod inputSchema.
- *
- * F205 (P2): `tool` is a free z.string(), NOT a z.enum of the advanced names.
- * The MCP SDK validates the gateway inputSchema BEFORE our handler runs; an
- * enum rejected every first-class tool name (yootheme_builder_health,
- * yootheme_builder_template_summary, ...) with a raw McpError -32602, so the
- * handler's unknown_tool / first_class_tool steering never ran. A plain string
- * lets every name reach the handler. renderGroupedList in the description stays
- * the load-bearing discovery surface.
- */
 function gatewayInputSchema() {
     return {
-        tool: z.string().describe('Advanced tool to route to (e.g. "yootheme_builder_page_get_schema"). ' +
+        tool: z.string().describe('Advanced tool to route to (e.g. "yootheme_builder_pages_audit"). ' +
             'Must be one of the advanced tools listed in this description — ' +
             'first-class tools (yootheme_builder_health, ...) are called ' +
             'DIRECTLY, not through this gateway. ' +
             'Omit `arguments` to discover its schema first.'),
         arguments: z.record(z.string(), z.unknown()).optional().describe('Arguments for the target tool. Omit for discovery mode ' +
             "(returns the tool's schema + annotations)."),
-        // `input` is a tolerated ALIAS for `arguments`. Some agents (and older
-        // skill docs) pass the target arguments under `input:`. Without this the
-        // key would be dropped by the SDK's zod validation, leaving `arguments`
-        // undefined → the gateway silently fell into discovery mode and never
-        // executed the write (F107). Accepting it keeps verbatim callers working;
-        // `arguments` still wins when both are present.
         input: z.record(z.string(), z.unknown()).optional().describe('Alias for `arguments` (tolerated for back-compat). Prefer `arguments`.'),
     };
 }
-/**
- * Registers `yootheme_builder_advanced` on the real McpServer.
- *
- * @param realServer       the McpServer that exposes the gateway tool
- * @param advancedRegistry the captured non-essential tools (from CapturingServer)
- */
 export function registerAdvancedTool(realServer, advancedRegistry) {
     const advancedNames = [...advancedRegistry.keys()].sort();
+    const requiredArgs = requiredArgsFromRegistry(advancedRegistry);
     realServer.registerTool('yootheme_builder_advanced', {
         title: 'Advanced Tool Gateway',
-        description: buildDescription(advancedNames),
-        inputSchema: gatewayInputSchema(),
-        // Stream D3 T3: gateway is the only L1 tool that retains
-        // `openWorldHint:true` — its effective behaviour is
-        // dynamic (target tool decided at call-time). Conservative
-        // spec-default marks it destructive because it can route
-        // into delete/unbind handlers; the destination tool's own
-        // confirm-guard still gates the actual mutation.
+        description: buildDescription(advancedNames, requiredArgs),
+        inputSchema: strictInputObject('yootheme_builder_advanced', gatewayInputSchema()),
         annotations: {
             title: 'Advanced Tool Gateway',
             readOnlyHint: false,
@@ -66,20 +31,20 @@ export function registerAdvancedTool(realServer, advancedRegistry) {
             openWorldHint: true,
         },
     }, async (args, extra) => {
-        const entry = advancedRegistry.get(args.tool);
+        const tool = resolveShortToolName(args.tool, (candidate) => advancedRegistry.has(candidate) || isEssential(candidate) || isDirectTopLevel(candidate));
+        const entry = advancedRegistry.get(tool);
         if (!entry) {
-            // F205: a name that is a first-class tool (L1 essential or L3
-            // direct top-level) is a different error than a typo — steer the
-            // caller to call it DIRECTLY instead of routing it through the
-            // gateway.
-            if (isEssential(args.tool) || isDirectTopLevel(args.tool)) {
+            if (isEssential(tool) || isDirectTopLevel(tool)) {
                 return errorResult({
-                    message: `"${args.tool}" is a FIRST-CLASS tool — it appears directly in tools/list.`,
+                    message: `"${tool}" is not routed through this gateway: it is registered as a ` +
+                        'standalone tool, so your client can grant or withhold it on its own.',
                     code: 'first_class_tool',
-                    suggestion: `Call "${args.tool}" directly instead of routing it through ` +
-                        'yootheme_builder_advanced. This gateway only routes the advanced ' +
-                        'tools listed in its description.',
-                    details: { tool: args.tool },
+                    suggestion: `If you can see "${tool}" in your tool list, call it directly. If you ` +
+                        'do not see it, your client has not granted it — this gateway cannot ' +
+                        "route around that; enable the tool in your client's settings. This " +
+                        'gateway only routes the advanced tools listed in its description. ' +
+                        FIRST_CLASS_NOT_ABSENT_HINT,
+                    details: { tool },
                 });
             }
             return errorResult({
@@ -87,15 +52,14 @@ export function registerAdvancedTool(realServer, advancedRegistry) {
                 code: 'unknown_tool',
                 suggestion: 'Pick one of the valid advanced tool names below, or call ' +
                     'yootheme_builder_health to verify connectivity.\n\n' +
-                    `Valid advanced tools by domain:\n${renderGroupedList(advancedNames)}`,
-                details: { valid_tools_by_domain: renderGroupedList(advancedNames) },
+                    `Valid advanced tools by domain (needs \u2026 = required arguments):\n${renderGroupedList(advancedNames, requiredArgs)}`,
+                details: { valid_tools_by_domain: renderGroupedList(advancedNames, requiredArgs) },
             });
         }
-        // `arguments` is canonical; `input` is a tolerated alias (F107).
         const callArgs = args.arguments ?? args.input;
         if (callArgs === undefined)
-            return discoveryResult(args.tool, entry);
-        return executeAdvancedTool(args.tool, entry, callArgs, extra);
+            return discoveryResult(tool, entry);
+        return executeAdvancedTool(tool, entry, callArgs, extra);
     });
 }
 //# sourceMappingURL=register.js.map

package/dist/gateway/advanced-tool/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../src/gateway/advanced-tool/register.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../src/gateway/advanced-tool/register.ts"],"names":[],"mappings":"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"}

package/dist/gateway/advanced-tool.d.ts

@@ -1,13 +1,2 @@
-/**
- * Backward-compat shim for `gateway/advanced-tool.ts`.
- *
- * The original 283-LoC module was split into `gateway/advanced-tool/`
- * (4 files, each ≤ 100 LoC) per Architecture §11 cap (Round-2
- * R2-A2-CRIT2 audit fix). This shim preserves the public import path
- * (`from '../gateway/advanced-tool.js'`) so server.ts, src/index.ts,
- * and the test suite keep working unchanged.
- *
- * @license MIT
- */
 export * from './advanced-tool/index.js';
 //# sourceMappingURL=advanced-tool.d.ts.map

package/dist/gateway/advanced-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"advanced-tool.d.ts","sourceRoot":"","sources":["../../src/gateway/advanced-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"advanced-tool.d.ts","sourceRoot":"","sources":["../../src/gateway/advanced-tool.ts"],"names":[],"mappings":"AAYA,cAAc,0BAA0B,CAAC"}

package/dist/gateway/advanced-tool.js

@@ -1,13 +1,2 @@
-/**
- * Backward-compat shim for `gateway/advanced-tool.ts`.
- *
- * The original 283-LoC module was split into `gateway/advanced-tool/`
- * (4 files, each ≤ 100 LoC) per Architecture §11 cap (Round-2
- * R2-A2-CRIT2 audit fix). This shim preserves the public import path
- * (`from '../gateway/advanced-tool.js'`) so server.ts, src/index.ts,
- * and the test suite keep working unchanged.
- *
- * @license MIT
- */
 export * from './advanced-tool/index.js';
 //# sourceMappingURL=advanced-tool.js.map

package/dist/gateway/advanced-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"advanced-tool.js","sourceRoot":"","sources":["../../src/gateway/advanced-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"advanced-tool.js","sourceRoot":"","sources":["../../src/gateway/advanced-tool.ts"],"names":[],"mappings":"AAYA,cAAc,0BAA0B,CAAC"}

package/dist/gateway/capturing-server.d.ts

@@ -1,52 +1,8 @@
-/**
- * CapturingServer — registration interceptor wrapping a real McpServer.
- *
- * Tool routing (Wave G.1 / Design-Doc §3.1.1):
- *   - L3 direct (yootheme_builder_health, yootheme_builder_diagnose):
- *     skipped — no forward, no capture. These tools must already be
- *     registered directly on the real server BEFORE the CapturingServer
- *     wraps it, so the SDK never sees a duplicate name.
- *   - L1 essential (ESSENTIAL_TOOLS): forwarded to the real server as a
- *     first-class MCP tool reachable from `tools/list`.
- *   - L2 advanced (everything else): captured into the in-process
- *     advanced registry, reachable through the single
- *     `yootheme_builder_advanced` gateway tool.
- *
- * This is a typed wrapper, NOT a JS Proxy — TypeScript stays strict.
- *
- * Typing approach (mirrors the reference apimapper-mcp implementation):
- *   `ToolRegistrar` is the McpServer subsurface modules consume:
- *   `registerTool` + `registerResource`. `registerTool` is a hand-written
- *   generic mirroring the SDK signature EXCEPT its return type is `void`
- *   — captured tools have no live `RegisteredTool`, and no module reads
- *   the return value. A real `McpServer` is still assignable to
- *   `ToolRegistrar` (return-type bivariance for `void`), so every
- *   call-site accepts both shapes cast-free.
- *
- * Casts in this file (each documented + justified inline):
- *   1. forwarded-essential — erases the handler's `InputArgs` generic to
- *      the SDK default when `config` is the erased `CapturedToolConfig`.
- *   2. registry storage — erases the generic handler to the homogeneous
- *      `CapturedToolHandler` shape so one Map type fits all entries.
- *   3. `registerResource` field — the SDK declares two overloads; a
- *      single spread-arg arrow cannot re-express the pair.
- *
- * @license MIT
- */
 import type { McpServer, ToolCallback } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { AnySchema, ZodRawShapeCompat } from '@modelcontextprotocol/sdk/server/zod-compat.js';
 import type { CallToolResult, ToolAnnotations } from '@modelcontextprotocol/sdk/types.js';
-/**
- * The input-schema constraint the SDK's `registerTool` accepts — a raw Zod
- * shape, a Zod schema, or `undefined` (zero-arg tools). Reused so the
- * `ToolRegistrar.registerTool` generic stays in lockstep with `ToolCallback`.
- */
 type ToolInputArgs = undefined | ZodRawShapeCompat | AnySchema;
-/**
- * The config object accepted by `registerTool` — mirrors the SDK's 2nd arg.
- * `inputSchema` is generic so per-tool handler args stay strongly inferred.
- */
-interface RegisterToolConfig<InputArgs extends ToolInputArgs> {
+export interface RegisterToolConfig<InputArgs extends ToolInputArgs> {
     title?: string;
     description?: string;
     inputSchema?: InputArgs;
@@ -54,63 +10,22 @@ interface RegisterToolConfig<InputArgs extends ToolInputArgs> {
     annotations?: ToolAnnotations;
     _meta?: Record<string, unknown>;
 }
-/**
- * The McpServer subsurface our `registerXTools` builders consume.
- *
- * `registerTool` is a hand-written generic mirroring the SDK signature with a
- * `void` return type. A real `McpServer` (whose method returns
- * `RegisteredTool`) is still assignable here because a value-returning method
- * satisfies a `void`-returning member. The `InputArgs` generic preserves
- * per-tool `ToolCallback` argument inference at every call-site.
- */
 export interface ToolRegistrar {
     registerTool<InputArgs extends ToolInputArgs = undefined>(name: string, config: RegisterToolConfig<InputArgs>, cb: ToolCallback<InputArgs>): void;
     registerResource: McpServer['registerResource'];
 }
-/** Config object passed to `registerTool` (the SDK's 2nd arg). */
-export type CapturedToolConfig = Parameters<McpServer['registerTool']>[1];
-/**
- * Captured-handler shape. The SDK's `registerTool` is generic over the input
- * shape, so a captured handler is stored with its args erased to
- * `Record<string, unknown>`. The gateway validates `arguments` against the
- * tool's Zod schema before calling the handler, so the runtime contract holds.
- */
+export type CapturedToolConfig = RegisterToolConfig<ToolInputArgs>;
 export type CapturedToolHandler = (args: Record<string, unknown>, extra: unknown) => CallToolResult | Promise<CallToolResult>;
-/** A captured advanced tool: its registration config and its handler. */
 export interface AdvancedToolEntry {
     config: CapturedToolConfig;
     handler: CapturedToolHandler;
 }
-/**
- * Wraps a real McpServer. Forwards L1 essentials (and all resources) to it,
- * captures L2 non-essentials into an in-process registry, and silently
- * skips L3 direct top-level names that must already be on the real server.
- */
 export declare class CapturingServer implements ToolRegistrar {
     private readonly realServer;
     private readonly advancedRegistry;
     constructor(realServer: McpServer);
-    /**
-     * Routes a tool registration by name. Returns `void`: captured tools
-     * have no `RegisteredTool` and no `registerXTools` module reads the
-     * return value.
-     *
-     * Routing order matters: the L3-direct check is FIRST so a caller
-     * cannot accidentally re-route a direct-registered name through the
-     * gateway just by re-naming a future tool builder.
-     */
-    registerTool<InputArgs extends ToolInputArgs = undefined>(name: string, config: CapturedToolConfig, handler: ToolCallback<InputArgs>): void;
-    /**
-     * Resources are always forwarded — they are not part of the tool cap.
-     *
-     * Cast: the SDK declares `registerResource` as two overloads; a single
-     * spread `(...args: RegisterResourceArgs)` arrow cannot re-express that
-     * overload pair, so the field is asserted to the SDK's exact member
-     * type. The spread forwards every argument verbatim, so the runtime
-     * contract is unchanged.
-     */
+    registerTool<InputArgs extends ToolInputArgs = undefined>(name: string, config: RegisterToolConfig<InputArgs>, handler: ToolCallback<InputArgs>): void;
     registerResource: McpServer['registerResource'];
-    /** The captured non-essential tools, keyed by tool name. */
     getAdvancedRegistry(): Map<string, AdvancedToolEntry>;
 }
 export {};

package/dist/gateway/capturing-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"capturing-server.d.ts","sourceRoot":"","sources":["../../src/gateway/capturing-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnG,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAI1F;;;;GAIG;AACH,KAAK,aAAa,GAAG,SAAS,GAAG,iBAAiB,GAAG,SAAS,CAAC;AAE/D;;;GAGG;AACH,UAAU,kBAAkB,CAAC,SAAS,SAAS,aAAa;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,YAAY,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC7C,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,aAAa;IAC1B,YAAY,CAAC,SAAS,SAAS,aAAa,GAAG,SAAS,EACpD,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,kBAAkB,CAAC,SAAS,CAAC,EACrC,EAAE,EAAE,YAAY,CAAC,SAAS,CAAC,GAC5B,IAAI,CAAC;IACR,gBAAgB,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;CACnD;AAED,kEAAkE;AAClE,MAAM,MAAM,kBAAkB,GAAG,UAAU,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAI1E;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,OAAO,KACb,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE9C,yEAAyE;AACzE,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,OAAO,EAAE,mBAAmB,CAAC;CAChC;AAED;;;;GAIG;AACH,qBAAa,eAAgB,YAAW,aAAa;IACjD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAwC;gBAE7D,UAAU,EAAE,SAAS;IAIjC;;;;;;;;OAQG;IACH,YAAY,CAAC,SAAS,SAAS,aAAa,GAAG,SAAS,EACpD,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,kBAAkB,EAC1B,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,GACjC,IAAI;IAkCP;;;;;;;;OAQG;IACH,gBAAgB,EAAE,SAAS,CAAC,kBAAkB,CAAC,CACiC;IAEhF,4DAA4D;IAC5D,mBAAmB,IAAI,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC;CAGxD"}
+{"version":3,"file":"capturing-server.d.ts","sourceRoot":"","sources":["../../src/gateway/capturing-server.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnG,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAS1F,KAAK,aAAa,GAAG,SAAS,GAAG,iBAAiB,GAAG,SAAS,CAAC;AAM/D,MAAM,WAAW,kBAAkB,CAAC,SAAS,SAAS,aAAa;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,YAAY,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC7C,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAWD,MAAM,WAAW,aAAa;IAC1B,YAAY,CAAC,SAAS,SAAS,aAAa,GAAG,SAAS,EACpD,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,kBAAkB,CAAC,SAAS,CAAC,EACrC,EAAE,EAAE,YAAY,CAAC,SAAS,CAAC,GAC5B,IAAI,CAAC;IACR,gBAAgB,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;CACnD;AAkBD,MAAM,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;AAUnE,MAAM,MAAM,mBAAmB,GAAG,CAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,OAAO,KACb,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAG9C,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,OAAO,EAAE,mBAAmB,CAAC;CAChC;AAOD,qBAAa,eAAgB,YAAW,aAAa;IACjD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAwC;gBAE7D,UAAU,EAAE,SAAS;IAuBjC,YAAY,CAAC,SAAS,SAAS,aAAa,GAAG,SAAS,EACpD,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,kBAAkB,CAAC,SAAS,CAAC,EACrC,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,GACjC,IAAI;IAgDP,gBAAgB,EAAE,SAAS,CAAC,kBAAkB,CAAC,CACiC;IAGhF,mBAAmB,IAAI,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC;CAGxD"}