@decaf-ts/mcp-server 0.4.9 → 0.4.16

package/lib/builders/prompt-builder.cjs

@@ -9,11 +9,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PromptBuilder = void 0;
+exports.NamedPromptBuilder = exports.PromptBuilder = void 0;
 const decorator_validation_1 = require("@decaf-ts/decorator-validation");
+const zod_1 = require("zod");
 const builder_1 = require("./builder.cjs");
+const schema_utils_1 = require("./../jira/schema-utils.cjs");
+const injectable_decorators_1 = require("@decaf-ts/injectable-decorators");
+const decoration_1 = require("@decaf-ts/decoration");
+const assets_1 = require("./../utils/assets.cjs");
+const db_decorators_1 = require("@decaf-ts/db-decorators");
+const decoration_2 = require("@decaf-ts/decoration");
 const logging_1 = require("@decaf-ts/logging");
 class PromptBuilder extends builder_1.UsableBuilder {
+    constructor(arg) {
+        super(arg);
+    }
     setCb(value) {
         this.cb = value;
         return this;
@@ -22,27 +32,50 @@ class PromptBuilder extends builder_1.UsableBuilder {
         this.argsSchema = value;
         return this;
     }
-    constructor(arg) {
-        super(arg);
-    }
     static get builder() {
         return new PromptBuilder();
     }
-    build(server) {
+    static patchPrompt(prompt, placeholders, replacements, log) {
+        placeholders = Array.isArray(placeholders)
+            ? placeholders
+            : Object.keys(placeholders);
+        const missing = placeholders.filter((p) => !Object.prototype.hasOwnProperty.call(replacements, p));
+        if (missing.length)
+            throw new db_decorators_1.ValidationError(`Missing replacements for placeholders: ${missing.join(", ")}`);
+        if (log) {
+            log.verbose(`Patching prompt with placeholders: ${JSON.stringify(placeholders)}`);
+            log.debug(`Values: ${JSON.stringify(replacements)}`);
+        }
+        const filteredReplacements = placeholders.reduce((acc, key) => {
+            acc[key] = replacements[key];
+            return acc;
+        }, {});
+        return (0, logging_1.sf)(prompt, filteredReplacements);
+    }
+    patchPrompt(prompt, placeholders, replacements, log) {
+        return PromptBuilder.patchPrompt(prompt, placeholders, replacements, log || this.log.for(this.patchPrompt));
+    }
+    build(server, replacements) {
+        const log = this.log.for(this.build);
         const errs = this.hasErrors();
         if (errs)
-            throw new Error(errs.toString());
+            throw new db_decorators_1.ValidationError(errs.toString());
         try {
+            // Enforce canonical ZodObject for argsSchema when provided and
+            // extract the raw shape for the MCP registerPrompt API.
+            if (this.argsSchema)
+                (0, schema_utils_1.ensureZodObject)(this.argsSchema, "argsSchema");
+            const argsShape = (0, schema_utils_1.extractShape)(this.argsSchema);
             return server.registerPrompt(this.name, {
                 title: this.title,
                 description: this.description,
-                argsSchema: this.argsSchema,
+                argsSchema: argsShape,
             }, async (args, extra) => {
-                const log = this.log(extra);
+                const log = this.logFor(extra);
                 // ensure args is an object and has a _meta container so we can safely
                 // attach usage metadata without throwing when callers pass `{}` or
                 // omit the field entirely.
-                args = args || {};
+                args = Object.assign({}, replacements, args || {});
                 log.verbose(`Executing prompt ${this.name} with args: ${JSON.stringify(args)}`);
                 args._meta = Object.assign(args._meta || {}, {
                     usage: {
@@ -53,24 +86,151 @@ class PromptBuilder extends builder_1.UsableBuilder {
                 });
                 const result = await Promise.resolve(this.cb(args, extra));
                 log.verbose(`Prompt ${this.name} executed successfully.`);
-                // result._meta = Object.assign(result._meta as any, this._meta) as any;
                 log.debug(`Prompt execution meta: ${JSON.stringify(result._meta)}`);
                 return result;
             });
         }
         catch (e) {
-            logging_1.Logging.for(this).error(`Failed to register prompt ${this.name}`, e);
+            log.error(`Failed to register prompt ${this.name || this.constructor.name}`, e);
             throw e;
         }
     }
 }
 exports.PromptBuilder = PromptBuilder;
+__decorate([
+    (0, injectable_decorators_1.inject)(assets_1.AssetReader),
+    __metadata("design:type", assets_1.AssetReader)
+], PromptBuilder.prototype, "assets", void 0);
 __decorate([
     (0, decorator_validation_1.required)(),
     __metadata("design:type", Object)
 ], PromptBuilder.prototype, "cb", void 0);
 __decorate([
     (0, decorator_validation_1.required)(),
-    __metadata("design:type", Object)
+    __metadata("design:type", zod_1.ZodObject)
 ], PromptBuilder.prototype, "argsSchema", void 0);
+__decorate([
+    (0, decoration_2.prop)(),
+    __metadata("design:type", Object)
+], PromptBuilder.prototype, "placeholders", void 0);
+class NamedPromptBuilder extends PromptBuilder {
+    setCategory(value) {
+        this.promptCategory = value;
+        return this;
+    }
+    addPrefix(value) {
+        this.prefixes = this.prefixes || [];
+        this.prefixes.push(value);
+        return this;
+    }
+    addSuffix(value) {
+        this.suffixes = this.suffixes || [];
+        this.suffixes.push(value);
+        return this;
+    }
+    constructor(arg) {
+        super(arg);
+    }
+    build(server) {
+        const toIgnoreProps = (decoration_1.Metadata.properties(NamedPromptBuilder) || []).filter((k) => !["assets", "promptCategory", "prefixes", "suffixes"].includes(k));
+        const errs = this.hasErrors(...toIgnoreProps);
+        if (errs)
+            throw new db_decorators_1.ValidationError(errs.toString());
+        const promptDef = this.assets.getPrompt(this.name, this.promptCategory);
+        decorator_validation_1.Model.fromObject(this, promptDef);
+        const prefixes = (this.prefixes || []).map((p) => this.assets.getPrompt(p, this.promptCategory));
+        const suffixes = (this.suffixes || []).map((p) => this.assets.getPrompt(p, this.promptCategory));
+        const argSchema = [
+            ...new Set([
+                ...promptDef.placeholders,
+                ...prefixes.map((p) => p.placeholders || []),
+                ...suffixes.map((p) => p.placeholders || []),
+            ].flat()),
+        ].reduce((acc, el) => {
+            acc[el] = zod_1.z
+                .string()
+                .describe(`The description for ${el}`);
+            return acc;
+        }, {});
+        this.setArgsSchema(zod_1.z.object(argSchema));
+        this.setCb((args, extra) => {
+            const log = this.logFor(extra)
+                .for(NamedPromptBuilder)
+                .for(this.promptCategory)
+                .for(this.name);
+            function parsePlaceholders(placeholders = []) {
+                return Array.isArray(placeholders)
+                    ? placeholders
+                    : Object.keys(placeholders);
+            }
+            const prefixes = (this.prefixes || []).map((p) => this.assets.getPrompt(p, this.promptCategory));
+            const suffixes = (this.suffixes || []).map((p) => this.assets.getPrompt(p, this.promptCategory));
+            const p = this.assets.getPrompt(this.name, this.promptCategory);
+            const placeholders = [
+                ...new Set([
+                    ...prefixes.map((p) => parsePlaceholders(p.placeholders)).flat(),
+                    ...suffixes.map((p) => parsePlaceholders(p.placeholders)).flat(),
+                    ...parsePlaceholders(p.placeholders).flat(),
+                ]),
+            ];
+            const prompt = this.patchPrompt([
+                ...prefixes.map((p) => p.prompt),
+                p.prompt,
+                ...suffixes.map((p) => p.prompt),
+            ].join("\n\n"), placeholders, args, log);
+            const result = {
+                messages: [
+                    {
+                        role: "user",
+                        content: {
+                            type: "text",
+                            text: prompt,
+                        },
+                    },
+                ],
+                _meta: {},
+            };
+            return result;
+        });
+        return super.build(server);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    setReasoning(value) {
+        throw new db_decorators_1.InternalError(`Named prompt builders don't require callback`);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    setEffort(value) {
+        throw new db_decorators_1.InternalError(`Named prompt builders don't require callback`);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    setCost(value) {
+        throw new db_decorators_1.InternalError(`Named prompt builders don't require callback`);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    setDescription(value) {
+        throw new db_decorators_1.InternalError(`Named prompt builders don't require callback`);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    setTitle(value) {
+        throw new db_decorators_1.InternalError(`Named prompt builders don't require callback`);
+    }
+    static get builder() {
+        return new NamedPromptBuilder();
+    }
+}
+exports.NamedPromptBuilder = NamedPromptBuilder;
+__decorate([
+    (0, decorator_validation_1.required)(),
+    __metadata("design:type", String)
+], NamedPromptBuilder.prototype, "promptCategory", void 0);
+__decorate([
+    (0, decorator_validation_1.list)(String),
+    (0, decorator_validation_1.minlength)(1),
+    __metadata("design:type", Array)
+], NamedPromptBuilder.prototype, "prefixes", void 0);
+__decorate([
+    (0, decorator_validation_1.minlength)(1),
+    (0, decorator_validation_1.list)(String),
+    __metadata("design:type", Array)
+], NamedPromptBuilder.prototype, "suffixes", void 0);
 //# sourceMappingURL=prompt-builder.js.map

package/lib/builders/prompt-builder.d.ts

@@ -1,12 +1,36 @@
-import { McpServer, type PromptCallback, RegisteredPrompt } from "@modelcontextprotocol/sdk/server/mcp";
-import type { ZodRawShape } from "zod";
+import { McpServer, type PromptCallback, RegisteredPrompt } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { ModelArg } from "@decaf-ts/decorator-validation";
+import { ZodObject } from "zod";
 import { UsableBuilder } from "./builder";
+import { AssetReader } from "../utils/assets";
+import { Logger } from "@decaf-ts/logging";
+import { Cost, EffortLevel, ReasoningLevel } from "../constants";
 export declare class PromptBuilder extends UsableBuilder<RegisteredPrompt> {
+    protected assets: AssetReader;
     protected cb: PromptCallback<any>;
-    protected argsSchema: ZodRawShape;
+    protected argsSchema: ZodObject<any>;
+    protected placeholders?: string[] | Record<string, string>;
+    constructor(arg?: ModelArg<PromptBuilder>);
     setCb(value: PromptCallback<any>): this;
-    setArgsSchema(value: ZodRawShape): this;
-    private constructor();
+    setArgsSchema(value: ZodObject<any>): this;
     static get builder(): PromptBuilder;
+    static patchPrompt(prompt: string, placeholders: string[] | Record<string, string>, replacements: Record<string, string>, log?: Logger): string;
+    protected patchPrompt(prompt: string, placeholders: string[] | Record<string, string>, replacements: Record<string, string>, log?: Logger): string;
+    build(server: McpServer, replacements?: Record<string, string>): RegisteredPrompt;
+}
+export declare class NamedPromptBuilder extends PromptBuilder {
+    protected promptCategory: string;
+    private prefixes;
+    private suffixes;
+    setCategory(value: string): this;
+    addPrefix(value: string): this;
+    addSuffix(value: string): this;
+    constructor(arg?: ModelArg<NamedPromptBuilder>);
     build(server: McpServer): RegisteredPrompt;
+    setReasoning(value: ReasoningLevel): this;
+    setEffort(value: EffortLevel): this;
+    setCost(value: Cost): this;
+    setDescription(value: string): this;
+    setTitle(value: string): this;
+    static get builder(): NamedPromptBuilder;
 }

package/lib/builders/prompt-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-builder.js","sourceRoot":"","sources":["../../src/builders/prompt-builder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,yEAAoE;AAEpE,2CAA0C;AAO1C,+CAA4C;AAE5C,MAAa,aAAc,SAAQ,uBAA+B;IAMhE,KAAK,CAAC,KAA0B;QAC9B,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,KAAkB;QAC9B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAoB,GAA6B;QAC/C,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IAED,MAAM,KAAK,OAAO;QAChB,OAAO,IAAI,aAAa,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,MAAiB;QACrB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC9B,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC;YACH,OAAO,MAAM,CAAC,cAAc,CAC1B,IAAI,CAAC,IAAI,EACT;gBACE,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;aAC5B,EACD,KAAK,EACH,IAAS,EACT,KAA6D,EACnC,EAAE;gBAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC5B,sEAAsE;gBACtE,mEAAmE;gBACnE,2BAA2B;gBAC3B,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBAClB,GAAG,CAAC,OAAO,CAAC,oBAAoB,IAAI,CAAC,IAAI,eAAe,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAChF,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE;oBAC3C,KAAK,EAAE;wBACL,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,MAAM,EAAE,IAAI,CAAC,MAAM;wBACnB,IAAI,EAAE,IAAI,CAAC,IAAI;qBAChB;iBACF,CAAC,CAAC;gBACH,MAAM,MAAM,GAAoB,MAAM,OAAO,CAAC,OAAO,CACnD,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CACrB,CAAC;gBACF,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,IAAI,yBAAyB,CAAC,CAAC;gBAC1D,wEAAwE;gBACxE,GAAG,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACpE,OAAO,MAAM,CAAC;YAChB,CAAC,CACF,CAAC;QACJ,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,iBAAO,CAAC,GAAG,CAAC,IAAW,CAAC,CAAC,KAAK,CAC5B,6BAA6B,IAAI,CAAC,IAAI,EAAE,EACxC,CAAQ,CACT,CAAC;YACF,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;CACF;AArED,sCAqEC;AAnEW;IADT,IAAA,+BAAQ,GAAE;;yCACwB;AAEzB;IADT,IAAA,+BAAQ,GAAE;;iDACwB"}
+{"version":3,"file":"prompt-builder.js","sourceRoot":"","sources":["../../src/builders/prompt-builder.ts"],"names":[],"mappings":"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"}

package/lib/builders/resource-builder.cjs

@@ -10,8 +10,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResourceBuilder = void 0;
-const uriTemplate_1 = require("@modelcontextprotocol/sdk/shared/uriTemplate");
-const mcp_1 = require("@modelcontextprotocol/sdk/server/mcp");
+const uriTemplate_js_1 = require("@modelcontextprotocol/sdk/shared/uriTemplate.js");
+const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
 const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 const builder_1 = require("./builder.cjs");
 const logging_1 = require("@decaf-ts/logging");
@@ -44,7 +44,7 @@ class ResourceBuilder extends builder_1.Builder {
             // concrete URIs against it.
             const uriOrTemplateArg = typeof this.uriOrTemplate === "string" &&
                 this.uriOrTemplate.includes("{")
-                ? new mcp_1.ResourceTemplate(new uriTemplate_1.UriTemplate(this.uriOrTemplate), {
+                ? new mcp_js_1.ResourceTemplate(new uriTemplate_js_1.UriTemplate(this.uriOrTemplate), {
                     list: undefined,
                 })
                 : this.uriOrTemplate;
@@ -52,7 +52,7 @@ class ResourceBuilder extends builder_1.Builder {
             const metadata = Object.assign(this.config, { _meta: {} });
             // Create a single read callback to be reused for both overloads.
             const readCb = async (uri, extra) => {
-                const log = this.log(extra);
+                const log = this.logFor(extra);
                 log.verbose(`Requesting resource ${this.name} from ${uri.toString()}`);
                 const result = await Promise.resolve(this.cb(uri, extra));
                 log.verbose(`Resource ${this.name} retrieved successfully.`);

package/lib/builders/resource-builder.d.ts

@@ -1,6 +1,6 @@
-import { McpServer, type ReadResourceCallback, RegisteredResource, RegisteredResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp";
+import { McpServer, type ReadResourceCallback, RegisteredResource, RegisteredResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { Builder } from "./builder";
-import { Resource } from "@modelcontextprotocol/sdk/types";
+import { Resource } from "@modelcontextprotocol/sdk/types.js";
 export declare class ResourceBuilder extends Builder<RegisteredResource | RegisteredResourceTemplate> {
     protected uriOrTemplate: string;
     cb: ReadResourceCallback;

package/lib/builders/resource-builder.js.map

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

package/lib/builders/tool-builder.cjs

@@ -13,6 +13,7 @@ exports.ToolBuilder = void 0;
 const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 const builder_1 = require("./builder.cjs");
 const logging_1 = require("@decaf-ts/logging");
+const schema_utils_1 = require("./../jira/schema-utils.cjs");
 class ToolBuilder extends builder_1.UsableBuilder {
     setAnnotations(annotations) {
         this.annotations = Object.assign(this.annotations, annotations);
@@ -47,11 +48,22 @@ class ToolBuilder extends builder_1.UsableBuilder {
         if (errs)
             throw new Error(errs.toString());
         try {
+            // Enforce canonical Zod object schemas when provided. Schemas are
+            // optional — only validate/extract if present. The MCP SDK expects
+            // a ZodRawShape at registration time, so we extract the .shape()
+            // only from an actual ZodObject. Reject anything else to avoid
+            // subtle runtime mismatches.
+            if (this.inputSchema)
+                (0, schema_utils_1.ensureZodObject)(this.inputSchema, "inputSchema");
+            if (this.outputSchema)
+                (0, schema_utils_1.ensureZodObject)(this.outputSchema, "outputSchema");
+            const inputShape = (0, schema_utils_1.extractShape)(this.inputSchema);
+            const outputShape = (0, schema_utils_1.extractShape)(this.outputSchema);
             return server.registerTool(this.name, {
                 title: this.title,
                 description: this.description,
-                inputSchema: this.inputSchema,
-                outputSchema: this.outputSchema,
+                inputSchema: inputShape,
+                outputSchema: outputShape,
                 annotations: this.annotations,
                 _meta: {
                     usage: {
@@ -61,7 +73,7 @@ class ToolBuilder extends builder_1.UsableBuilder {
                     },
                 },
             }, async (args, extra) => {
-                const log = this.log(extra);
+                const log = this.logFor(extra);
                 log.verbose(`Executing tool ${this.name} with args: ${JSON.stringify(args)}`);
                 extra._meta = Object.assign(extra._meta || {}, {
                     usage: {
@@ -78,6 +90,17 @@ class ToolBuilder extends builder_1.UsableBuilder {
             });
         }
         catch (e) {
+            // If a tool with the same name was already registered, skip and warn
+            const msg = e?.message || String(e);
+            if (typeof msg === "string" && msg.includes("already registered")) {
+                // Use the project's logging subsystem to surface duplicate-registration
+                // warnings; tests and runtime should initialize Logging early so this
+                // is safe to call.
+                logging_1.Logging.for(this).warn(`Tool ${this.name} already registered - skipping duplicate registration`);
+                // Return a lightweight placeholder to satisfy callers; the runtime
+                // MCP instance already holds the canonical registration.
+                return { name: this.name };
+            }
             logging_1.Logging.for(this).error(`Error building tool`, e);
             throw e;
         }
@@ -93,12 +116,7 @@ __decorate([
     __metadata("design:type", Object)
 ], ToolBuilder.prototype, "cb", void 0);
 __decorate([
-    (0, decorator_validation_1.type)(Object.name),
     (0, decorator_validation_1.required)(),
-    __metadata("design:type", Object)
+    __metadata("design:type", Function)
 ], ToolBuilder.prototype, "inputSchema", void 0);
-__decorate([
-    (0, decorator_validation_1.type)(Object.name),
-    __metadata("design:type", Object)
-], ToolBuilder.prototype, "outputSchema", void 0);
 //# sourceMappingURL=tool-builder.js.map

package/lib/builders/tool-builder.d.ts

@@ -1,15 +1,16 @@
-import { McpServer, RegisteredTool, type ToolCallback } from "@modelcontextprotocol/sdk/server/mcp";
-import { type ToolAnnotations } from "@modelcontextprotocol/sdk/types";
+import { McpServer, RegisteredTool, type ToolCallback } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { type ToolAnnotations } from "@modelcontextprotocol/sdk/types.js";
 import { UsableBuilder } from "./builder";
+import type { ZodObject } from "zod";
 export declare class ToolBuilder extends UsableBuilder<RegisteredTool> {
     protected annotations: Omit<ToolAnnotations, "title">;
     protected cb: ToolCallback<any>;
-    protected inputSchema: Record<string, any>;
-    protected outputSchema: Record<string, any>;
+    protected inputSchema: ZodObject<any>;
+    protected outputSchema?: ZodObject<any>;
     setAnnotations(annotations: Partial<Omit<ToolAnnotations, "title">>): this;
     setCb(cb: ToolCallback<any>): this;
-    setInputSchema(inputSchema: any): this;
-    setOutputSchema(outputSchema: any): this;
+    setInputSchema(inputSchema: ZodObject<any>): this;
+    setOutputSchema(outputSchema: ZodObject<any>): this;
     private constructor();
     static get builder(): ToolBuilder;
     build(server: McpServer): RegisteredTool;

package/lib/builders/tool-builder.js.map

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

package/lib/builders/types.cjs

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/lib/builders/types.d.ts

@@ -0,0 +1,17 @@
+import { Cost, EffortLevel, ReasoningLevel } from "../constants";
+import { z, ZodType } from "zod";
+export type PromptArgs<PB extends {
+    argsSchema?: ZodType<any, any, any> | undefined;
+}> = PB extends {
+    argsSchema: infer A extends ZodType<any, any, any>;
+} ? z.infer<A> : never;
+export type LoadedPromptDef = {
+    name: string;
+    description: string;
+    title: string;
+    effort: EffortLevel;
+    reasoning: ReasoningLevel;
+    cost: Cost;
+    placeholders: string[] | Record<string, string>;
+    prompt: string;
+};

package/lib/builders/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/builders/types.ts"],"names":[],"mappings":""}

package/lib/esm/builders/builder.d.ts

@@ -1,17 +1,27 @@
 import { Model, ModelArg } from "@decaf-ts/decorator-validation";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp";
-import { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol";
-import { ServerNotification, ServerRequest } from "@modelcontextprotocol/sdk/types";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
+import { ServerNotification, ServerRequest } from "@modelcontextprotocol/sdk/types.js";
+import { Logger } from "@decaf-ts/logging";
 import { Cost, EffortLevel, ReasoningLevel } from "../constants";
 export declare abstract class Builder<OBJ> extends Model {
     protected description: string;
     protected name: string;
     protected title: string;
+    private _log?;
+    /**
+     * @description Lazily provides a context-aware logger for the current instance.
+     * @summary This method calls {@link Logging.for} with the subclass instance to obtain a logger whose context matches the subclass name.
+     * @return {Logger} A logger that is bound to the subclass context.
+     */
+    protected get log(): Logger;
     protected constructor(arg?: ModelArg<Builder<OBJ>>);
-    protected log(extra: RequestHandlerExtra<ServerRequest, ServerNotification>): import("@decaf-ts/logging").Logger;
+    protected logFor(extra: RequestHandlerExtra<ServerRequest, ServerNotification>): Logger;
     abstract build(server: McpServer): OBJ;
     setDescription(value: string): this;
+    getDescription(): string;
     setName(value: string): this;
+    getName(): string;
     setTitle(value: string): this;
 }
 export declare abstract class UsableBuilder<OBJ> extends Builder<OBJ> {

package/lib/esm/builders/builder.js

@@ -11,17 +11,26 @@ import { Model, required } from "@decaf-ts/decorator-validation";
 import { Logging } from "@decaf-ts/logging";
 import { Cost, EffortLevel, ReasoningLevel } from "./../constants.js";
 export class Builder extends Model {
+    /**
+     * @description Lazily provides a context-aware logger for the current instance.
+     * @summary This method calls {@link Logging.for} with the subclass instance to obtain a logger whose context matches the subclass name.
+     * @return {Logger} A logger that is bound to the subclass context.
+     */
+    get log() {
+        if (!this._log)
+            this._log = Logging.for(this);
+        return this._log;
+    }
     constructor(arg) {
         super(arg);
-        Model.fromObject(this, arg);
     }
-    log(extra) {
+    logFor(extra) {
         const { sessionId, requestId, authInfo } = extra || {};
         // sessionId may be undefined for some transports or internal calls.
         // Logging.for expects either a string or an object; avoid passing undefined.
         let log = typeof sessionId === "string" && sessionId.length > 0
-            ? Logging.for(sessionId).for(this)
-            : Logging.for(this);
+            ? this.log.for(sessionId)
+            : this.log;
         if (authInfo && authInfo.clientId)
             log = log.for(authInfo.clientId);
         if (requestId)
@@ -32,10 +41,16 @@ export class Builder extends Model {
         this.description = value;
         return this;
     }
+    getDescription() {
+        return this.description;
+    }
     setName(value) {
         this.name = value;
         return this;
     }
+    getName() {
+        return this.name;
+    }
     setTitle(value) {
         this.title = value;
         return this;

package/lib/esm/builders/builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/builders/builder.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAY,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAO3E,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,0BAAqB;AAEjE,MAAM,OAAgB,OAAa,SAAQ,KAAK;IAQ9C,YAAsB,GAA4B;QAChD,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC9B,CAAC;IAES,GAAG,CAAC,KAA6D;QACzE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,KAAK,IAAI,EAAE,CAAC;QACvD,oEAAoE;QACpE,6EAA6E;QAC7E,IAAI,GAAG,GACL,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;YACnD,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,IAAW,CAAC;YACzC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAW,CAAC,CAAC;QAC/B,IAAI,QAAQ,IAAI,QAAQ,CAAC,QAAQ;YAAE,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpE,IAAI,SAAS;YAAE,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnD,OAAO,GAAG,CAAC;IACb,CAAC;IAID,cAAc,CAAC,KAAa;QAC1B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CAAC,KAAa;QACnB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAxCW;IADT,QAAQ,EAAE;;4CACoB;AAErB;IADT,QAAQ,EAAE;;qCACa;AAEd;IADT,QAAQ,EAAE;;sCACc;AAsC3B,MAAM,OAAgB,aAAmB,SAAQ,OAAY;IAU3D,YAAsB,GAA4B;QAChD,KAAK,CAAC,GAAG,CAAC,CAAC;QATH,cAAS,GAAmB,cAAc,CAAC,IAAI,CAAC;QAGhD,WAAM,GAAgB,WAAW,CAAC,IAAI,CAAC;QAGvC,SAAI,GAAS,IAAI,CAAC,IAAI,CAAC;IAIjC,CAAC;IAED,YAAY,CAAC,KAAqB;QAChC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,KAAkB;QAC1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CAAC,KAAW;QACjB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA1BW;IADT,QAAQ,EAAE;;gDAC+C;AAGhD;IADT,QAAQ,EAAE;;6CACsC;AAGvC;IADT,QAAQ,EAAE;;2CACsB"}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/builders/builder.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAY,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAO3E,OAAO,EAAE,OAAO,EAAU,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,0BAAqB;AAEjE,MAAM,OAAgB,OAAa,SAAQ,KAAK;IAU9C;;;;OAIG;IACH,IAAc,GAAG;QACf,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAW,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,YAAsB,GAA4B;QAChD,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IAES,MAAM,CACd,KAA6D;QAE7D,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,KAAK,IAAI,EAAE,CAAC;QACvD,oEAAoE;QACpE,6EAA6E;QAC7E,IAAI,GAAG,GACL,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;YACnD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC;YACzB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QACf,IAAI,QAAQ,IAAI,QAAQ,CAAC,QAAQ;YAAE,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpE,IAAI,SAAS;YAAE,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnD,OAAO,GAAG,CAAC;IACb,CAAC;IAID,cAAc,CAAC,KAAa;QAC1B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,OAAO,CAAC,KAAa;QACnB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA7DW;IADT,QAAQ,EAAE;;4CACoB;AAErB;IADT,QAAQ,EAAE;;qCACa;AAEd;IADT,QAAQ,EAAE;;sCACc;AA2D3B,MAAM,OAAgB,aAAmB,SAAQ,OAAY;IAU3D,YAAsB,GAA4B;QAChD,KAAK,CAAC,GAAG,CAAC,CAAC;QATH,cAAS,GAAmB,cAAc,CAAC,IAAI,CAAC;QAGhD,WAAM,GAAgB,WAAW,CAAC,IAAI,CAAC;QAGvC,SAAI,GAAS,IAAI,CAAC,IAAI,CAAC;IAIjC,CAAC;IAED,YAAY,CAAC,KAAqB;QAChC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,KAAkB;QAC1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CAAC,KAAW;QACjB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA1BW;IADT,QAAQ,EAAE;;gDAC+C;AAGhD;IADT,QAAQ,EAAE;;6CACsC;AAGvC;IADT,QAAQ,EAAE;;2CACsB"}

package/lib/esm/builders/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./builder";
 export * from "./prompt-builder";
-export * from "./resource-builder";
-export * from "./tool-builder";
+export * from "./types";

package/lib/esm/builders/index.js

@@ -1,5 +1,6 @@
 export * from "./builder.js";
 export * from "./prompt-builder.js";
-export * from "./resource-builder.js";
-export * from "./tool-builder.js";
+// export * from "./resource-builder";
+// export * from "./tool-builder";
+export * from "./types.js";
 //# sourceMappingURL=index.js.map

package/lib/esm/builders/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builders/index.ts"],"names":[],"mappings":"AAAA,6BAA0B;AAC1B,oCAAiC;AACjC,sCAAmC;AACnC,kCAA+B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builders/index.ts"],"names":[],"mappings":"AAAA,6BAA0B;AAC1B,oCAAiC;AACjC,sCAAsC;AACtC,kCAAkC;AAClC,2BAAwB"}