@decaf-ts/mcp-server 0.4.9 → 0.4.16

package/lib/esm/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/esm/builders/prompt-builder.js

@@ -7,10 +7,20 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { required } from "@decaf-ts/decorator-validation";
+import { list, minlength, Model, required, } from "@decaf-ts/decorator-validation";
+import { z, ZodObject } from "zod";
 import { UsableBuilder } from "./builder.js";
-import { Logging } from "@decaf-ts/logging";
+import { ensureZodObject, extractShape } from "./../jira/schema-utils.js";
+import { inject } from "@decaf-ts/injectable-decorators";
+import { Metadata } from "@decaf-ts/decoration";
+import { AssetReader } from "./../utils/assets.js";
+import { InternalError, ValidationError } from "@decaf-ts/db-decorators";
+import { prop } from "@decaf-ts/decoration";
+import { sf } from "@decaf-ts/logging";
 export class PromptBuilder extends UsableBuilder {
+    constructor(arg) {
+        super(arg);
+    }
     setCb(value) {
         this.cb = value;
         return this;
@@ -19,27 +29,50 @@ export class PromptBuilder extends 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 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 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 ValidationError(errs.toString());
         try {
+            // Enforce canonical ZodObject for argsSchema when provided and
+            // extract the raw shape for the MCP registerPrompt API.
+            if (this.argsSchema)
+                ensureZodObject(this.argsSchema, "argsSchema");
+            const argsShape = 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: {
@@ -50,23 +83,149 @@ export class PromptBuilder extends 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.for(this).error(`Failed to register prompt ${this.name}`, e);
+            log.error(`Failed to register prompt ${this.name || this.constructor.name}`, e);
             throw e;
         }
     }
 }
+__decorate([
+    inject(AssetReader),
+    __metadata("design:type", AssetReader)
+], PromptBuilder.prototype, "assets", void 0);
 __decorate([
     required(),
     __metadata("design:type", Object)
 ], PromptBuilder.prototype, "cb", void 0);
 __decorate([
     required(),
-    __metadata("design:type", Object)
+    __metadata("design:type", ZodObject)
 ], PromptBuilder.prototype, "argsSchema", void 0);
+__decorate([
+    prop(),
+    __metadata("design:type", Object)
+], PromptBuilder.prototype, "placeholders", void 0);
+export 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 = (Metadata.properties(NamedPromptBuilder) || []).filter((k) => !["assets", "promptCategory", "prefixes", "suffixes"].includes(k));
+        const errs = this.hasErrors(...toIgnoreProps);
+        if (errs)
+            throw new ValidationError(errs.toString());
+        const promptDef = this.assets.getPrompt(this.name, this.promptCategory);
+        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] = z
+                .string()
+                .describe(`The description for ${el}`);
+            return acc;
+        }, {});
+        this.setArgsSchema(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 InternalError(`Named prompt builders don't require callback`);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    setEffort(value) {
+        throw new InternalError(`Named prompt builders don't require callback`);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    setCost(value) {
+        throw new InternalError(`Named prompt builders don't require callback`);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    setDescription(value) {
+        throw new InternalError(`Named prompt builders don't require callback`);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    setTitle(value) {
+        throw new InternalError(`Named prompt builders don't require callback`);
+    }
+    static get builder() {
+        return new NamedPromptBuilder();
+    }
+}
+__decorate([
+    required(),
+    __metadata("design:type", String)
+], NamedPromptBuilder.prototype, "promptCategory", void 0);
+__decorate([
+    list(String),
+    minlength(1),
+    __metadata("design:type", Array)
+], NamedPromptBuilder.prototype, "prefixes", void 0);
+__decorate([
+    minlength(1),
+    list(String),
+    __metadata("design:type", Array)
+], NamedPromptBuilder.prototype, "suffixes", void 0);
 //# sourceMappingURL=prompt-builder.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"prompt-builder.js","sourceRoot":"","sources":["../../../src/builders/prompt-builder.ts"],"names":[],"mappings":";;;;;;;;;AAKA,OAAO,EAAY,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,aAAa,EAAE,qBAAkB;AAO1C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,MAAM,OAAO,aAAc,SAAQ,aAA+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,OAAO,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;AAnEW;IADT,QAAQ,EAAE;;yCACwB;AAEzB;IADT,QAAQ,EAAE;;iDACwB"}
+{"version":3,"file":"prompt-builder.js","sourceRoot":"","sources":["../../../src/builders/prompt-builder.ts"],"names":[],"mappings":"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"}

package/lib/esm/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/esm/builders/resource-builder.js

@@ -7,8 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { UriTemplate } from "@modelcontextprotocol/sdk/shared/uriTemplate";
-import { ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp";
+import { UriTemplate } from "@modelcontextprotocol/sdk/shared/uriTemplate.js";
+import { ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { required } from "@decaf-ts/decorator-validation";
 import { Builder } from "./builder.js";
 import { Logging } from "@decaf-ts/logging";
@@ -49,7 +49,7 @@ export class ResourceBuilder extends 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/esm/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":";;;;;;;;;AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAiB,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,qBAAkB;AAQpC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,MAAM,OAAO,eAAgB,SAAQ,OAEpC;IAQC,KAAK,CAAC,KAA2B;QAC/B,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,KAAqC;QAC7C,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,gBAAgB,CAAC,KAAa;QAC5B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAoB,GAA+B;QACjD,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IAED,MAAM,KAAK,OAAO;QAChB,OAAO,IAAI,eAAe,EAAE,CAAC;IAC/B,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,uEAAuE;YACvE,uEAAuE;YACvE,4BAA4B;YAC5B,MAAM,gBAAgB,GACpB,OAAO,IAAI,CAAC,aAAa,KAAK,QAAQ;gBACtC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAC9B,CAAC,CAAC,IAAI,gBAAgB,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;oBACxD,IAAI,EAAE,SAAS;iBAChB,CAAC;gBACJ,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;YAEzB,uCAAuC;YACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;YAE3D,iEAAiE;YACjE,MAAM,MAAM,GAAG,KAAK,EAClB,GAAQ,EACR,KAA6D,EAChC,EAAE;gBAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC/B,GAAG,CAAC,OAAO,CAAC,uBAAuB,IAAI,CAAC,IAAI,SAAS,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACvE,MAAM,MAAM,GAAuB,MAAM,OAAO,CAAC,OAAO,CACtD,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,CACpB,CAAC;gBACF,GAAG,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,IAAI,0BAA0B,CAAC,CAAC;gBAC7D,GAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACtE,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC;YAEF,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;gBACzC,OAAO,MAAM,CAAC,QAAQ,CACpB,IAAI,CAAC,IAAI,EACT,gBAAgB,EAChB,QAAQ,EACR,MAAa,CACd,CAAC;YACJ,CAAC;YAED,OAAO,MAAM,CAAC,QAAQ,CACpB,IAAI,CAAC,IAAI,EACT,gBAAgB,EAChB,QAAQ,EACR,MAAa,CACd,CAAC;QACJ,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,OAAO,CAAC,GAAG,CAAC,IAAW,CAAC,CAAC,KAAK,CAC5B,8BAA8B,IAAI,CAAC,IAAI,EAAE,EACzC,CAAQ,CACT,CAAC;YACF,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;CACF;AArFW;IADT,QAAQ,EAAE;;sDACsB;AAEjC;IADC,QAAQ,EAAE;;2CACe;AAEhB;IADT,QAAQ,EAAE;;+CACuC"}

package/lib/esm/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/esm/builders/tool-builder.js

@@ -7,9 +7,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { required, type } from "@decaf-ts/decorator-validation";
+import { required } from "@decaf-ts/decorator-validation";
 import { UsableBuilder } from "./builder.js";
 import { Logging } from "@decaf-ts/logging";
+import { ensureZodObject, extractShape } from "./../jira/schema-utils.js";
 export class ToolBuilder extends UsableBuilder {
     setAnnotations(annotations) {
         this.annotations = Object.assign(this.annotations, annotations);
@@ -44,11 +45,22 @@ export class ToolBuilder extends 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)
+                ensureZodObject(this.inputSchema, "inputSchema");
+            if (this.outputSchema)
+                ensureZodObject(this.outputSchema, "outputSchema");
+            const inputShape = extractShape(this.inputSchema);
+            const outputShape = 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: {
@@ -58,7 +70,7 @@ export class ToolBuilder extends 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: {
@@ -75,6 +87,17 @@ export class ToolBuilder extends 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.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.for(this).error(`Error building tool`, e);
             throw e;
         }
@@ -89,12 +112,7 @@ __decorate([
     __metadata("design:type", Object)
 ], ToolBuilder.prototype, "cb", void 0);
 __decorate([
-    type(Object.name),
     required(),
-    __metadata("design:type", Object)
+    __metadata("design:type", Function)
 ], ToolBuilder.prototype, "inputSchema", void 0);
-__decorate([
-    type(Object.name),
-    __metadata("design:type", Object)
-], ToolBuilder.prototype, "outputSchema", void 0);
 //# sourceMappingURL=tool-builder.js.map

package/lib/esm/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/esm/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/esm/builders/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

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

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

package/lib/esm/index.d.ts

@@ -1,3 +1 @@
-export * from "./builders";
 export * from "./mcp-server";
-export * from "./version";

package/lib/esm/index.js

@@ -1,4 +1,5 @@
-export * from "./builders/index.js";
+// Central exports for the package. Module-level `registerAll` helpers were
+// removed in favor of centralized registration performed by `McpServer.load()`.
+// export * from './modules/jira';
 export * from "./mcp-server.js";
-export * from "./version.js";
 //# sourceMappingURL=index.js.map

package/lib/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,oCAA2B;AAC3B,gCAA6B;AAC7B,6BAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,gFAAgF;AAChF,kCAAkC;AAClC,gCAA6B"}

package/lib/esm/jira/errors.js

@@ -0,0 +1,42 @@
+"use strict";
+// /**
+//  * Error normalization utilities for Jira -> MCP error shape.
+//  *
+//  * Normalize Jira REST errors (errorCollection, messages, HTTP status) into a
+//  * consistent MCP error object: { code, message, details }
+//  */
+//
+// export type MCPError = {
+//   code: string;
+//   message: string;
+//   details?: Record<string, any>;
+// };
+//
+// export function normalizeJiraError(err: any): MCPError {
+//   if (!err) return { code: 'unknown_error', message: 'Unknown error' };
+//
+//   // HTTP response shape from Jira often includes statusCode, body with errorMessages or errorCollection
+//   const status = err.status || err.statusCode || (err.response && err.response.status) || null;
+//   const body = err.body || err.response?.body || err.data || null;
+//
+//   const messages: string[] = [];
+//   if (body) {
+//     if (Array.isArray(body.errorMessages)) messages.push(...body.errorMessages);
+//     if (body.errorMessage) messages.push(body.errorMessage);
+//     if (body.errorCollection && Array.isArray(body.errorCollection.errors)) messages.push(...body.errorCollection.errors.map((e: any) => e.message || String(e)));
+//   }
+//
+//   if (err.message) messages.push(err.message);
+//
+//   const message = messages.length ? messages.join(' | ') : 'Jira API error';
+//
+//   return {
+//     code: `jira_${status || 'error'}`,
+//     message,
+//     details: {
+//       httpStatus: status,
+//       raw: body ?? err,
+//     },
+//   };
+// }
+//# sourceMappingURL=errors.js.map

package/lib/esm/jira/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/jira/errors.ts"],"names":[],"mappings":";AAAA,MAAM;AACN,gEAAgE;AAChE,KAAK;AACL,gFAAgF;AAChF,6DAA6D;AAC7D,MAAM;AACN,EAAE;AACF,2BAA2B;AAC3B,kBAAkB;AAClB,qBAAqB;AACrB,mCAAmC;AACnC,KAAK;AACL,EAAE;AACF,2DAA2D;AAC3D,0EAA0E;AAC1E,EAAE;AACF,2GAA2G;AAC3G,kGAAkG;AAClG,qEAAqE;AACrE,EAAE;AACF,mCAAmC;AACnC,gBAAgB;AAChB,mFAAmF;AACnF,+DAA+D;AAC/D,qKAAqK;AACrK,MAAM;AACN,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,+EAA+E;AAC/E,EAAE;AACF,aAAa;AACb,yCAAyC;AACzC,eAAe;AACf,iBAAiB;AACjB,4BAA4B;AAC5B,0BAA0B;AAC1B,SAAS;AACT,OAAO;AACP,IAAI"}

package/lib/esm/jira/jira-client-factory.js

@@ -0,0 +1,74 @@
+"use strict";
+// /**
+//  * makeJiraClient (Version3-only)
+//  *
+//  * This factory now always constructs the official `Version3Client` from
+//  * `jira.js`. The codebase is standardized on the v3 client shape and higher
+//  * level helpers (issues, project, search, board) are exposed via a small
+//  * adapter to keep compatibility with existing callers.
+//  */
+// import { Version3Client } from 'jira.js';
+//
+// export type JiraAuthConfig =
+//   | { type: 'apiToken'; host: string; email: string; apiToken: string }
+//   | { type: 'oauth2'; host: string; clientId: string; clientSecret: string; redirectUri?: string };
+//
+// export type MakeJiraClientConfig = {
+//   auth: JiraAuthConfig;
+//   retry?: { retries?: number; factor?: number; minTimeoutMs?: number };
+// };
+//
+// export type JiraClient = any; // keep loose to avoid tight compile-time coupling
+//
+// export function makeJiraClient(config: MakeJiraClientConfig): JiraClient {
+//   if (!config || !config.auth) throw new Error('makeJiraClient: missing auth config');
+//
+//   const { auth } = config;
+//
+//   if (auth.type === 'oauth2') {
+//     // For simplicity, oauth2 flows must already be exchanged; this factory
+//     // expects a usable token flow. Consumers can extend this if needed.
+//     throw new Error('OAuth2 auth not implemented in makeJiraClient; use apiToken for now');
+//   }
+//
+//   const { host, email, apiToken } = auth as any;
+//
+//   const jira = new Version3Client({
+//     host,
+//     authentication: { basic: { email, apiToken } },
+//   });
+//
+//   const adapter = {
+//     __raw: jira,
+//     issues: {
+//       async create(params: any) {
+//         return jira.issues.create(params);
+//       },
+//       async createIssue(params: any) {
+//         return adapter.issues.create(params);
+//       },
+//     },
+//     project: {
+//       async search(params: any) {
+//         return jira.project.search(params);
+//       },
+//     },
+//     search: {
+//       async search(params: any) {
+//         return jira.search.search(params);
+//       },
+//     },
+//     board: {
+//       async getBoards(params: any) {
+//         // includes the newer agile endpoints under jira.board
+//         return jira.board.getBoards(params);
+//       },
+//     },
+//   } as any;
+//
+//   // Attach a small metadata bag
+//   adapter.__mcp_config = { retry: config.retry ?? { retries: 3, factor: 2, minTimeoutMs: 500 } };
+//
+//   return adapter;
+// }
+//# sourceMappingURL=jira-client-factory.js.map

package/lib/esm/jira/jira-client-factory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jira-client-factory.js","sourceRoot":"","sources":["../../../src/jira/jira-client-factory.ts"],"names":[],"mappings":";AAAA,MAAM;AACN,oCAAoC;AACpC,KAAK;AACL,2EAA2E;AAC3E,+EAA+E;AAC/E,4EAA4E;AAC5E,0DAA0D;AAC1D,MAAM;AACN,4CAA4C;AAC5C,EAAE;AACF,+BAA+B;AAC/B,0EAA0E;AAC1E,sGAAsG;AACtG,EAAE;AACF,uCAAuC;AACvC,0BAA0B;AAC1B,0EAA0E;AAC1E,KAAK;AACL,EAAE;AACF,mFAAmF;AACnF,EAAE;AACF,6EAA6E;AAC7E,yFAAyF;AACzF,EAAE;AACF,6BAA6B;AAC7B,EAAE;AACF,kCAAkC;AAClC,8EAA8E;AAC9E,2EAA2E;AAC3E,8FAA8F;AAC9F,MAAM;AACN,EAAE;AACF,mDAAmD;AACnD,EAAE;AACF,sCAAsC;AACtC,YAAY;AACZ,sDAAsD;AACtD,QAAQ;AACR,EAAE;AACF,sBAAsB;AACtB,mBAAmB;AACnB,gBAAgB;AAChB,oCAAoC;AACpC,6CAA6C;AAC7C,WAAW;AACX,yCAAyC;AACzC,gDAAgD;AAChD,WAAW;AACX,SAAS;AACT,iBAAiB;AACjB,oCAAoC;AACpC,8CAA8C;AAC9C,WAAW;AACX,SAAS;AACT,gBAAgB;AAChB,oCAAoC;AACpC,6CAA6C;AAC7C,WAAW;AACX,SAAS;AACT,eAAe;AACf,uCAAuC;AACvC,iEAAiE;AACjE,+CAA+C;AAC/C,WAAW;AACX,SAAS;AACT,cAAc;AACd,EAAE;AACF,mCAAmC;AACnC,oGAAoG;AACpG,EAAE;AACF,oBAAoB;AACpB,IAAI"}