@oobe-protocol-labs/sap-mcp-server 0.9.1 → 0.9.3

package/dist/adapters/mcp/index.js

@@ -1,5 +1,11 @@
 /**
- * MCP adapter barrel export
+ * @name adapters/mcp/index
+ * @description Barrel export for the MCP adapter subsystem.
+ *
+ * Re-exports tool response helpers, resource response helpers,
+ * prompt response helpers, and the MCP error class.
+ *
+ * @module adapters/mcp/index
  */
 export { createTextResponse, createJsonResponse, createErrorResponse } from './tool-response.js';
 export { createResourceResponse } from './resource-response.js';

package/dist/adapters/mcp/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/mcp/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACjG,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/mcp/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACjG,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC"}

package/dist/adapters/mcp/prompt-response.d.ts

@@ -1,5 +1,17 @@
 /**
- * MCP prompt response helper.
+ * @name adapters/mcp/prompt-response
+ * @description Helper for constructing MCP prompt responses.
+ *
+ * @module adapters/mcp/prompt-response
+ */
+/**
+ * @name createPromptResponse
+ * @description Wraps an array of role/content message objects into an MCP prompt response.
+ *
+ * @param messages — Array of message objects with `role` and `content` string fields.
+ * @returns An MCP prompt response containing the provided messages.
+ *
+ * @usedBy MCP prompt handlers
  */
 export declare function createPromptResponse(messages: Array<{
     role: string;

package/dist/adapters/mcp/prompt-response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-response.d.ts","sourceRoot":"","sources":["../../../src/adapters/mcp/prompt-response.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG;IAAE,QAAQ,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAE/I"}
+{"version":3,"file":"prompt-response.d.ts","sourceRoot":"","sources":["../../../src/adapters/mcp/prompt-response.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG;IAAE,QAAQ,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAE/I"}

package/dist/adapters/mcp/prompt-response.js

@@ -1,5 +1,17 @@
 /**
- * MCP prompt response helper.
+ * @name adapters/mcp/prompt-response
+ * @description Helper for constructing MCP prompt responses.
+ *
+ * @module adapters/mcp/prompt-response
+ */
+/**
+ * @name createPromptResponse
+ * @description Wraps an array of role/content message objects into an MCP prompt response.
+ *
+ * @param messages — Array of message objects with `role` and `content` string fields.
+ * @returns An MCP prompt response containing the provided messages.
+ *
+ * @usedBy MCP prompt handlers
  */
 export function createPromptResponse(messages) {
     return { messages };

package/dist/adapters/mcp/prompt-response.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-response.js","sourceRoot":"","sources":["../../../src/adapters/mcp/prompt-response.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,UAAU,oBAAoB,CAAC,QAAkD;IACrF,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC"}
+{"version":3,"file":"prompt-response.js","sourceRoot":"","sources":["../../../src/adapters/mcp/prompt-response.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAAC,QAAkD;IACrF,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC"}

package/dist/adapters/mcp/resource-response.d.ts

@@ -1,5 +1,18 @@
 /**
- * MCP resource response helper.
+ * @name adapters/mcp/resource-response
+ * @description Helper for constructing MCP resource responses.
+ *
+ * @module adapters/mcp/resource-response
+ */
+/**
+ * @name createResourceResponse
+ * @description Wraps a URI and text payload into an MCP resource response.
+ *
+ * @param uri  — The resource URI to return.
+ * @param data — The text content to embed in the response.
+ * @returns An MCP resource response with `uri` and `text` fields.
+ *
+ * @usedBy MCP resource handlers
  */
 export declare function createResourceResponse(uri: string, data: string): {
     uri: string;

package/dist/adapters/mcp/resource-response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource-response.d.ts","sourceRoot":"","sources":["../../../src/adapters/mcp/resource-response.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAE/F"}
+{"version":3,"file":"resource-response.d.ts","sourceRoot":"","sources":["../../../src/adapters/mcp/resource-response.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAE/F"}

package/dist/adapters/mcp/resource-response.js

@@ -1,5 +1,18 @@
 /**
- * MCP resource response helper.
+ * @name adapters/mcp/resource-response
+ * @description Helper for constructing MCP resource responses.
+ *
+ * @module adapters/mcp/resource-response
+ */
+/**
+ * @name createResourceResponse
+ * @description Wraps a URI and text payload into an MCP resource response.
+ *
+ * @param uri  — The resource URI to return.
+ * @param data — The text content to embed in the response.
+ * @returns An MCP resource response with `uri` and `text` fields.
+ *
+ * @usedBy MCP resource handlers
  */
 export function createResourceResponse(uri, data) {
     return { uri, text: data };

package/dist/adapters/mcp/resource-response.js.map

@@ -1 +1 @@
-{"version":3,"file":"resource-response.js","sourceRoot":"","sources":["../../../src/adapters/mcp/resource-response.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,UAAU,sBAAsB,CAAC,GAAW,EAAE,IAAY;IAC9D,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"resource-response.js","sourceRoot":"","sources":["../../../src/adapters/mcp/resource-response.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CAAC,GAAW,EAAE,IAAY;IAC9D,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AAC7B,CAAC"}

package/dist/adapters/mcp/sdk-compat.d.ts

@@ -18,6 +18,14 @@ import type { SapMcpContext } from '../../core/types.js';
 type ResourceHandler = () => Promise<unknown>;
 type ResourceTemplateHandler = (uri: string, args: Record<string, unknown>) => Promise<unknown>;
 type PromptHandler = (args: Record<string, unknown>) => Promise<unknown>;
+type ResourceTemplateMatch = {
+    args: Record<string, string>;
+};
+/**
+ * @name matchResourceTemplateUri
+ * @description Matches MCP resource URI templates without converting attacker-controlled text into a regular expression.
+ */
+export declare function matchResourceTemplateUri(uriTemplate: string, resourceUri: string): ResourceTemplateMatch | undefined;
 /**
  * Associates runtime context with an MCP server so tool calls can enforce policy and key-safety guards.
  */
@@ -78,7 +86,7 @@ export declare function registerTool<TInput = unknown>(server: Server, name: str
  *
  * Registers a resource and ensures JSON-RPC handlers are set up for resources/list and resources/read
  */
-export declare function registerResource(server: Server, uri: string, schema: unknown, definition: {
+export declare function registerResource(server: Server, uri: string, _schema: unknown, definition: {
     name: string;
     description?: string;
     mimeType?: string;
@@ -109,7 +117,7 @@ export declare function registerResource(server: Server, uri: string, schema: un
  *
  * Registers a resource template and ensures JSON-RPC handlers are set up
  */
-export declare function registerResourceTemplate(server: Server, uriTemplate: string, schema: unknown, definition: {
+export declare function registerResourceTemplate(server: Server, uriTemplate: string, _schema: unknown, definition: {
     name: string;
     description?: string;
     mimeType?: string;
@@ -139,7 +147,7 @@ export declare function registerResourceTemplate(server: Server, uriTemplate: st
  *
  * Registers a prompt and ensures JSON-RPC handlers are set up for prompts/list and prompts/get
  */
-export declare function registerPrompt(server: Server, name: string, schema: unknown, definition: {
+export declare function registerPrompt(server: Server, name: string, _schema: unknown, definition: {
     description: string;
     arguments?: Array<{
         name: string;

package/dist/adapters/mcp/sdk-compat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-compat.d.ts","sourceRoot":"","sources":["../../../src/adapters/mcp/sdk-compat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sdk-compat.d.ts","sourceRoot":"","sources":["../../../src/adapters/mcp/sdk-compat.ts"],"names":[],"mappings":"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"}

package/dist/adapters/mcp/sdk-compat.js

@@ -14,6 +14,8 @@
  */
 import { ListToolsRequestSchema, CallToolRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, ListResourceTemplatesRequestSchema, ListPromptsRequestSchema, GetPromptRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
 import { logger } from '../../core/logger.js';
+import { isHostedAccountlessBlockedTool } from '../../payments/hosted-tool-eligibility.js';
+import { classifyTool } from '../../payments/pricing.js';
 import { checkToolPermissions, privateKeyGuard } from '../../security/index.js';
 import { canonicalizeToolName } from '../../tools/tool-aliases.js';
 // Track which handlers have been registered to avoid duplicates
@@ -28,6 +30,53 @@ const executionContexts = new WeakMap();
 function withRegistrationStore(server) {
     return server;
 }
+/**
+ * @name matchResourceTemplateUri
+ * @description Matches MCP resource URI templates without converting attacker-controlled text into a regular expression.
+ */
+export function matchResourceTemplateUri(uriTemplate, resourceUri) {
+    const args = {};
+    let templateIndex = 0;
+    let resourceIndex = 0;
+    while (templateIndex < uriTemplate.length) {
+        const openBrace = uriTemplate.indexOf('{', templateIndex);
+        if (openBrace === -1) {
+            const literal = uriTemplate.slice(templateIndex);
+            return resourceUri.slice(resourceIndex) === literal ? { args } : undefined;
+        }
+        const literal = uriTemplate.slice(templateIndex, openBrace);
+        if (!resourceUri.startsWith(literal, resourceIndex)) {
+            return undefined;
+        }
+        resourceIndex += literal.length;
+        const closeBrace = uriTemplate.indexOf('}', openBrace + 1);
+        if (closeBrace === -1) {
+            return undefined;
+        }
+        const argName = uriTemplate.slice(openBrace + 1, closeBrace);
+        if (!argName) {
+            return undefined;
+        }
+        const nextLiteralStart = closeBrace + 1;
+        const nextOpenBrace = uriTemplate.indexOf('{', nextLiteralStart);
+        const nextLiteral = uriTemplate.slice(nextLiteralStart, nextOpenBrace === -1 ? uriTemplate.length : nextOpenBrace);
+        const nextSlash = resourceUri.indexOf('/', resourceIndex);
+        const segmentEnd = nextLiteral
+            ? resourceUri.indexOf(nextLiteral, resourceIndex)
+            : (nextSlash === -1 ? resourceUri.length : nextSlash);
+        if (segmentEnd === -1 || segmentEnd === resourceIndex) {
+            return undefined;
+        }
+        const argValue = resourceUri.slice(resourceIndex, segmentEnd);
+        if (argValue.includes('/')) {
+            return undefined;
+        }
+        args[argName] = argValue;
+        resourceIndex = segmentEnd;
+        templateIndex = closeBrace + 1;
+    }
+    return resourceIndex === resourceUri.length ? { args } : undefined;
+}
 /**
  * @name isResourceReadResult
  * @description Detects handlers that already return an MCP resources/read result.
@@ -76,14 +125,34 @@ function isToolCallResult(value) {
  * @name toToolCallResult
  * @description Normalizes legacy tool handler returns and native MCP tool results.
  */
-function toToolCallResult(result) {
+function parseSingleJsonTextContent(content) {
+    if (content.length !== 1 || content[0].type !== 'text' || typeof content[0].text !== 'string') {
+        return undefined;
+    }
+    try {
+        const parsed = JSON.parse(content[0].text);
+        return isPlainObject(parsed) ? parsed : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function toToolCallResult(result, hasExplicitOutputSchema = false) {
     if (isToolCallResult(result)) {
+        const inferredStructuredContent = hasExplicitOutputSchema && result.isError !== true
+            ? parseSingleJsonTextContent(result.content)
+            : undefined;
+        const structuredContent = result.structuredContent
+            ?? inferredStructuredContent
+            ?? (hasExplicitOutputSchema
+                ? undefined
+                : {
+                    content: result.content,
+                    isError: result.isError,
+                });
         return {
             ...result,
-            structuredContent: result.structuredContent ?? {
-                content: result.content,
-                isError: result.isError,
-            },
+            ...(structuredContent === undefined ? {} : { structuredContent }),
         };
     }
     const content = [
@@ -92,9 +161,12 @@ function toToolCallResult(result) {
             text: typeof result === 'string' ? result : JSON.stringify(result, null, 2),
         },
     ];
+    const structuredContent = hasExplicitOutputSchema
+        ? (isPlainObject(result) ? result : undefined)
+        : { content };
     return {
         content,
-        structuredContent: { content },
+        ...(structuredContent === undefined ? {} : { structuredContent }),
     };
 }
 /**
@@ -216,6 +288,45 @@ function formatParameterLabel(name) {
 function inferParameterDescription(toolTitle, parameterName) {
     const lower = parameterName.toLowerCase();
     const label = formatParameterLabel(parameterName);
+    if (lower === 'toolname' || lower === 'tool') {
+        return `${label} to inspect or execute. Use the exact MCP name from tools/list; do not rewrite hyphenated names.`;
+    }
+    if (lower === 'arguments' || lower === 'args') {
+        return `${label} object passed to the target tool. Match the target tool schema exactly; do not include wallet/keypair secret bytes.`;
+    }
+    if (lower === 'maxpriceusd') {
+        return `${label} safety cap in USD for one x402 payment. Estimate with sap_estimate_tool_cost first and abort if the challenge exceeds this cap.`;
+    }
+    if (lower === 'maxtotalusd') {
+        return `${label} total USD safety cap for a batch x402 workflow. Abort before any call that would exceed this budget.`;
+    }
+    if (lower === 'confirmaction' || lower === 'confirm') {
+        return `${label} flag required before local signing, payment, or write execution. Set true only after the user approves the preview/cost.`;
+    }
+    if (lower === 'agenturi' || lower === 'metadatauri') {
+        return `${label} public HTTPS/IPFS/Arweave metadata URI for the SAP agent profile. Desktop file paths are invalid for on-chain metadata.`;
+    }
+    if (lower === 'x402endpoint') {
+        return `${label} public x402 discovery endpoint for this agent or provider, usually a .well-known/x402 URL.`;
+    }
+    if (lower === 'capabilities') {
+        return `${label} array describing agent/tool capabilities. Use stable IDs, protocol labels, and human-readable descriptions; validate category values before writes.`;
+    }
+    if (lower === 'protocols') {
+        return `${label} array of protocol identifiers such as sap, mcp, jupiter, pyth, metaplex, sns, or x402.`;
+    }
+    if (lower === 'pricing') {
+        return `${label} array of x402/pay.sh pricing tiers for the registered agent or tool. Amounts should be denominated explicitly in USDC smallest units when applicable.`;
+    }
+    if (lower === 'transactionbase64' || lower === 'transaction') {
+        return `${label} unsigned or signed transaction payload. Preview and finalize with sap_payments_finalize_transaction; never create ad-hoc signing scripts or read keypair JSON.`;
+    }
+    if (lower === 'submit') {
+        return `${label} flag controlling whether a locally signed transaction is submitted after preview/signing. Use submit:true only after user approval.`;
+    }
+    if (lower === 'submitviarelay' || lower === 'submitrelayurl') {
+        return `${label} for routing already-signed transaction bytes through the OOBE hosted relay/RPC path. The relay never receives private keys.`;
+    }
     if (lower.includes('wallet') || lower.includes('owner')) {
         return `${label} address used by ${toolTitle}.`;
     }
@@ -280,6 +391,11 @@ function enrichSchemaDescriptions(schema, toolTitle) {
         if (isPlainObject(enriched.items)) {
             enriched.items = enrichProperty(propertyName, enriched.items);
         }
+        for (const compositionKey of ['oneOf', 'anyOf', 'allOf']) {
+            if (Array.isArray(enriched[compositionKey])) {
+                enriched[compositionKey] = enriched[compositionKey].map((candidate) => (isPlainObject(candidate) ? enrichProperty(propertyName, candidate) : candidate));
+            }
+        }
         return enriched;
     };
     const properties = isPlainObject(schema.properties)
@@ -293,6 +409,103 @@ function enrichSchemaDescriptions(schema, toolTitle) {
         properties,
     };
 }
+function priceHintForTier(tier) {
+    switch (tier) {
+        case 'free':
+            return 'free; call directly without x402';
+        case 'read-premium':
+            return 'paid read-premium; estimate first, then use sap_payments_call_paid_tool when the runtime cannot replay x402 natively';
+        case 'builder':
+            return 'paid builder; estimate first, then pay/build and finalize unsigned transactions locally when returned';
+        case 'value-action':
+            return 'paid value-action; preview cost and transaction effects before user confirmation';
+        case 'batch':
+            return 'paid batch; enforce maxPriceUsd and maxTotalUsd caps';
+        default:
+            return 'priced by hosted x402 challenge';
+    }
+}
+function localSignerEquivalent(toolName) {
+    const equivalents = {
+        sap_register_agent: 'sap_payments_register_agent',
+        sap_update_agent: 'sap_payments_update_agent',
+        sap_sign_transaction: 'sap_payments_finalize_transaction',
+    };
+    if (equivalents[toolName])
+        return equivalents[toolName];
+    if (toolName.startsWith('sap_escrow_build_'))
+        return 'sap_payments_finalize_transaction';
+    if (toolName.startsWith('sap_sns_build_'))
+        return 'sap_payments_finalize_transaction';
+    if (toolName.startsWith('sap_x402_build_'))
+        return 'sap_payments_finalize_transaction';
+    return undefined;
+}
+function classifyToolIntent(toolName) {
+    if (toolName.startsWith('sap_payments_') || toolName === 'sap_x402_paid_call') {
+        return 'local non-custodial payment/signing bridge';
+    }
+    if (toolName.startsWith('sap_agent_') || toolName.startsWith('sap_runtime_') || toolName.startsWith('sap_skills_')) {
+        return 'agent bootstrap, routing, skills, or repair guidance';
+    }
+    if (toolName.includes('_build_') || toolName.startsWith('sap_escrow_build_') || toolName.startsWith('sap_sns_build_')) {
+        return 'hosted unsigned transaction builder';
+    }
+    if (toolName.includes('swap') || toolName.includes('trade') || toolName.includes('buy') || toolName.includes('sell')) {
+        return 'Solana value-action or trading workflow';
+    }
+    if (toolName.includes('register') || toolName.includes('update') || toolName.includes('mint') || toolName.includes('transfer')) {
+        return 'local-signer write workflow';
+    }
+    if (toolName.includes('list') || toolName.includes('get') || toolName.includes('fetch') || toolName.includes('discover') || toolName.includes('search')) {
+        return 'read/discovery workflow';
+    }
+    return 'SAP MCP tool workflow';
+}
+function buildToolIntentGuidance(toolName, title) {
+    const tier = classifyTool(toolName);
+    const intent = classifyToolIntent(toolName);
+    const localEquivalent = localSignerEquivalent(toolName);
+    const hostedBlocked = isHostedAccountlessBlockedTool(toolName);
+    const routing = hostedBlocked
+        ? `Routing: hosted accountless write is blocked; do not call this as a paid hosted write and no x402 payment should be charged. Use ${localEquivalent ?? 'the local sap_payments bridge or a hosted unsigned builder'} when user signing is required.`
+        : toolName.startsWith('sap_payments_')
+            ? 'Routing: local sap_payments bridge. It may sign x402 payment payloads or user-approved transactions locally, and must never expose keypair bytes.'
+            : localEquivalent && toolName.includes('_build_')
+                ? `Routing: hosted-safe builder. If a transaction is returned, preview/sign/submit with ${localEquivalent}; never create temporary signing scripts.`
+                : tier === 'free'
+                    ? 'Routing: free hosted call; call directly and keep it small/exact when possible.'
+                    : 'Routing: paid hosted call; call sap_estimate_tool_cost first, then use sap_payments_call_paid_tool if the runtime cannot handle x402 natively.';
+    const safety = toolName.startsWith('sap_payments_') || hostedBlocked || localEquivalent
+        ? 'Signer boundary: user-controlled local profile or external signer; OOBE hosted MCP remains non-custodial.'
+        : 'Signer boundary: hosted reads/builders never receive keypair bytes; value-moving results must be finalized locally when signing is required.';
+    const descriptionSuffix = [
+        `Intent: ${intent}.`,
+        `Pricing: ${priceHintForTier(tier)}.`,
+        routing,
+        safety,
+    ].join(' ');
+    return {
+        descriptionSuffix,
+        schemaDescription: `${title} input schema. ${descriptionSuffix} Use exact field names from this schema; do not guess aliases or include private key material.`,
+    };
+}
+function enrichToolDefinition(name, title, description, inputSchema) {
+    const guidance = buildToolIntentGuidance(name, title);
+    const suffix = `\n\nSAP MCP execution guidance: ${guidance.descriptionSuffix}`;
+    const enrichedDescription = description.includes('SAP MCP execution guidance:')
+        ? description
+        : `${description}${suffix}`;
+    return {
+        description: enrichedDescription,
+        inputSchema: {
+            ...inputSchema,
+            description: typeof inputSchema.description === 'string'
+                ? `${inputSchema.description} ${guidance.schemaDescription}`
+                : guidance.schemaDescription,
+        },
+    };
+}
 /**
  * Associates runtime context with an MCP server so tool calls can enforce policy and key-safety guards.
  */
@@ -530,12 +743,14 @@ export function registerTool(server, name, definition, handler) {
     logger.debug('Registering tool', { name });
     const store = withRegistrationStore(server);
     const title = definition.title ?? formatToolTitle(name);
+    const inputSchema = enrichSchemaDescriptions(normalizeInputSchema(definition.inputSchema), title);
+    const enriched = enrichToolDefinition(name, title, definition.description, inputSchema);
     // Store tool definition
     const tool = {
         name,
         title,
-        description: definition.description,
-        inputSchema: enrichSchemaDescriptions(normalizeInputSchema(definition.inputSchema), title),
+        description: enriched.description,
+        inputSchema: enriched.inputSchema,
         outputSchema: normalizeOutputSchema(definition.outputSchema),
         annotations: {
             ...inferToolAnnotations(name, title),
@@ -545,8 +760,10 @@ export function registerTool(server, name, definition, handler) {
     // Initialize server storage if needed
     store.toolHandlers = store.toolHandlers || {};
     store.tools = store.tools || [];
+    store.toolHasExplicitOutputSchema = store.toolHasExplicitOutputSchema || {};
     // Store handler and tool definition
     store.toolHandlers[name] = (input) => handler(input);
+    store.toolHasExplicitOutputSchema[name] = definition.outputSchema !== undefined;
     store.tools.push(tool);
     // Register JSON-RPC handlers if not already done
     const registry = ensureHandlerRegistry(server);
@@ -593,7 +810,8 @@ export function registerTool(server, name, definition, handler) {
                 }
                 const result = await handler(args || {});
                 logger.debug('Tool call completed', { tool: canonicalToolName, requestedTool: toolName });
-                return toToolCallResult(result);
+                const hasExplicitOutputSchema = Boolean(withRegistrationStore(server).toolHasExplicitOutputSchema?.[canonicalToolName]);
+                return toToolCallResult(result, hasExplicitOutputSchema);
             }
             catch (error) {
                 logger.error('Tool call failed', { tool: canonicalToolName, requestedTool: toolName, error });
@@ -610,7 +828,7 @@ export function registerTool(server, name, definition, handler) {
  *
  * Registers a resource and ensures JSON-RPC handlers are set up for resources/list and resources/read
  */
-export function registerResource(server, uri, schema, definition, handler) {
+export function registerResource(server, uri, _schema, definition, handler) {
     logger.debug('Registering resource', { uri });
     const store = withRegistrationStore(server);
     const resource = {
@@ -664,7 +882,7 @@ export function registerResource(server, uri, schema, definition, handler) {
  *
  * Registers a resource template and ensures JSON-RPC handlers are set up
  */
-export function registerResourceTemplate(server, uriTemplate, schema, definition, handler) {
+export function registerResourceTemplate(server, uriTemplate, _schema, definition, handler) {
     logger.debug('Registering resource template', { uriTemplate });
     const store = withRegistrationStore(server);
     const template = {
@@ -719,21 +937,10 @@ export function registerResourceTemplate(server, uriTemplate, schema, definition
                 const handler = templateHandlers[tmpl.uriTemplate];
                 if (!handler)
                     continue;
-                // Simple template matching: sap://memory/{agent} matches sap://memory/abc123
-                const pattern = tmpl.uriTemplate.replace(/\{[^}]+\}/g, '([^/]+)');
-                const regex = new RegExp(`^${pattern}$`);
-                const match = resourceUri.match(regex);
+                const match = matchResourceTemplateUri(tmpl.uriTemplate, resourceUri);
                 if (match) {
-                    // Extract template arguments from URI
-                    const argNames = tmpl.uriTemplate.match(/\{([^}]+)\}/g)?.map((s) => s.slice(1, -1)) || [];
-                    const args = {};
-                    match.slice(1).forEach((value, i) => {
-                        if (argNames[i]) {
-                            args[argNames[i]] = value;
-                        }
-                    });
                     try {
-                        const result = await handler(resourceUri, args);
+                        const result = await handler(resourceUri, match.args);
                         return toResourceReadResult(result, resourceUri, tmpl.mimeType || 'application/json');
                     }
                     catch (error) {
@@ -755,7 +962,7 @@ export function registerResourceTemplate(server, uriTemplate, schema, definition
  *
  * Registers a prompt and ensures JSON-RPC handlers are set up for prompts/list and prompts/get
  */
-export function registerPrompt(server, name, schema, definition, handler) {
+export function registerPrompt(server, name, _schema, definition, handler) {
     logger.debug('Registering prompt', { name });
     const store = withRegistrationStore(server);
     const prompt = {