@aws/nx-plugin 0.62.0 → 0.62.2

package/LICENSE-THIRD-PARTY

@@ -3878,7 +3878,7 @@ THE SOFTWARE.
 
 ---
 
-The following software may be included in this product: @modelcontextprotocol/sdk (1.21.0)
+The following software may be included in this product: @modelcontextprotocol/sdk (1.24.1)
 This software contains the following license and notice below:
 
 MIT License
@@ -15822,6 +15822,33 @@ SOFTWARE.
 
 ---
 
+The following software may be included in this product: jose (6.1.3)
+This software contains the following license and notice below:
+
+The MIT License (MIT)
+
+Copyright (c) 2018 Filip Skokan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+---
+
 The following software may be included in this product: js-tokens (4.0.0)
 This software contains the following license and notice below:
 
@@ -27276,7 +27303,7 @@ SOFTWARE.
 
 ---
 
-The following software may be included in this product: ts-node (10.9.1)
+The following software may be included in this product: ts-node (10.9.2)
 This software contains the following license and notice below:
 
 The MIT License (MIT)
@@ -31481,7 +31508,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ---
 
-The following software may be included in this product: zod (3.25.76)
+The following software may be included in this product: zod (4.1.13)
 This software contains the following license and notice below:
 
 MIT License

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/nx-plugin",
-  "version": "0.62.0",
+  "version": "0.62.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/awslabs/nx-plugin-for-aws.git",
@@ -26,7 +26,7 @@
     "@apidevtools/swagger-parser": "^10.1.1",
     "@hey-api/openapi-ts": "0.64.13",
     "@iarna/toml": "^2.2.5",
-    "@modelcontextprotocol/sdk": "^1.21.0",
+    "@modelcontextprotocol/sdk": "^1.24.0",
     "@nx/devkit": "~22.1.3",
     "@nx/eslint": "~22.1.3",
     "@nx/js": "~22.1.3",
@@ -48,8 +48,7 @@
     "typescript": "~5.9.3",
     "vite": "^7.2.4",
     "vitest": "^4.0.14",
-    "zod": "^4.1.13",
-    "zod-v3": "npm:zod@^3.25.76"
+    "zod": "^4.1.13"
   },
   "types": "./src/index.d.ts"
 }

package/src/infra/app/__snapshots__/generator.spec.ts.snap

@@ -3,7 +3,7 @@
 exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `
 {
   "aws-cdk": "2.1033.0",
-  "aws-cdk-lib": "2.229.1",
+  "aws-cdk-lib": "2.230.0",
   "constructs": "10.4.3",
   "esbuild": "0.27.0",
   "source-map-support": "0.5.21",
@@ -40,7 +40,7 @@ exports[`infra generator > should add required dependencies to package.json > pa
 {
   "dependencies": {
     "aws-cdk": "2.1033.0",
-    "aws-cdk-lib": "2.229.1",
+    "aws-cdk-lib": "2.230.0",
     "constructs": "10.4.3",
     "esbuild": "0.27.0",
     "source-map-support": "0.5.21",

package/src/mcp-server/schema.d.ts

@@ -2,6 +2,11 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { z } from 'zod-v3';
+import { z } from 'zod';
 export declare const PACKAGE_MANAGERS: readonly ["pnpm", "yarn", "npm", "bun"];
-export declare const PackageManagerSchema: z.ZodEnum<["pnpm", "yarn", "npm", "bun"]>;
+export declare const PackageManagerSchema: z.ZodEnum<{
+    yarn: "yarn";
+    pnpm: "pnpm";
+    npm: "npm";
+    bun: "bun";
+}>;

package/src/mcp-server/schema.js

@@ -5,7 +5,7 @@ exports.PackageManagerSchema = exports.PACKAGE_MANAGERS = void 0;
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-const zod_v3_1 = require("zod-v3");
+const zod_1 = require("zod");
 exports.PACKAGE_MANAGERS = ['pnpm', 'yarn', 'npm', 'bun'];
-exports.PackageManagerSchema = zod_v3_1.z.enum(exports.PACKAGE_MANAGERS);
+exports.PackageManagerSchema = zod_1.z.enum(exports.PACKAGE_MANAGERS);
 //# sourceMappingURL=schema.js.map

package/src/mcp-server/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/mcp-server/schema.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,mCAA2B;AAEd,QAAA,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAU,CAAC;AAC3D,QAAA,oBAAoB,GAAG,UAAC,CAAC,IAAI,CAAC,wBAAgB,CAAC,CAAC"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/mcp-server/schema.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,6BAAwB;AAEX,QAAA,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAU,CAAC;AAC3D,QAAA,oBAAoB,GAAG,OAAC,CAAC,IAAI,CAAC,wBAAgB,CAAC,CAAC"}

package/src/mcp-server/tools/create-workspace-command.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addCreateWorkspaceCommandTool = void 0;
-const zod_v3_1 = require("zod-v3");
+const zod_1 = require("zod");
 const schema_1 = require("../schema");
 const iac_1 = require("../../utils/iac");
 const versions_1 = require("../../utils/versions");
@@ -9,7 +9,13 @@ const versions_1 = require("../../utils/versions");
  * Add a tool which tells a model how to create an Nx workspace
  */
 const addCreateWorkspaceCommandTool = (server) => {
-    server.tool('create-workspace-command', 'Tool to discover how to create a workspace to start a new project.', { workspaceName: zod_v3_1.z.string(), packageManager: schema_1.PackageManagerSchema }, ({ workspaceName, packageManager }) => ({
+    server.registerTool('create-workspace-command', {
+        description: 'Tool to discover how to create a workspace to start a new project.',
+        inputSchema: {
+            workspaceName: zod_1.z.string(),
+            packageManager: schema_1.PackageManagerSchema,
+        },
+    }, ({ workspaceName, packageManager }) => ({
         content: [
             {
                 type: 'text',

package/src/mcp-server/tools/create-workspace-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-workspace-command.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/create-workspace-command.ts"],"names":[],"mappings":";;;AAKA,mCAA2B;AAC3B,sCAAiD;AACjD,yCAAgD;AAChD,mDAAmD;AAEnD;;GAEG;AACI,MAAM,6BAA6B,GAAG,CAAC,MAAiB,EAAE,EAAE;IACjE,MAAM,CAAC,IAAI,CACT,0BAA0B,EAC1B,oEAAoE,EACpE,EAAE,aAAa,EAAE,UAAC,CAAC,MAAM,EAAE,EAAE,cAAc,EAAE,6BAAoB,EAAE,EACnE,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;QACtC,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE;;;0BAGU,sBAAW,CAAC,qBAAqB,CAAC,IAAI,aAAa,SAAS,cAAc;;;8CAGtD,aAAa;;qEAEU,mBAAa,CAAC,IAAI,CAAC,IAAI,CAAC;yCACpD,mBAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;GACzG;aACM;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,6BAA6B,iCAwBxC"}
+{"version":3,"file":"create-workspace-command.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/create-workspace-command.ts"],"names":[],"mappings":";;;AAKA,6BAAwB;AACxB,sCAAiD;AACjD,yCAAgD;AAChD,mDAAmD;AAEnD;;GAEG;AACI,MAAM,6BAA6B,GAAG,CAAC,MAAiB,EAAE,EAAE;IACjE,MAAM,CAAC,YAAY,CACjB,0BAA0B,EAC1B;QACE,WAAW,EACT,oEAAoE;QACtE,WAAW,EAAE;YACX,aAAa,EAAE,OAAC,CAAC,MAAM,EAAE;YACzB,cAAc,EAAE,6BAAoB;SACrC;KACF,EACD,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;QACtC,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAe;gBACrB,IAAI,EAAE;;;0BAGU,sBAAW,CAAC,qBAAqB,CAAC,IAAI,aAAa,SAAS,cAAc;;;8CAGtD,aAAa;;qEAEU,mBAAa,CAAC,IAAI,CAAC,IAAI,CAAC;yCACpD,mBAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;GACzG;aACM;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,6BAA6B,iCA8BxC"}

package/src/mcp-server/tools/general-guidance.js

@@ -15,7 +15,10 @@ exports.TOOL_SELECTION_GUIDE = `## Tool Selection Guide
  * Add a tool which provides general guidance for using Nx and the Nx Plugin for AWS
  */
 const addGeneralGuidanceTool = (server, generators) => {
-    server.tool('general-guidance', 'Tool for guidance and best practices for working with Nx and the Nx Plugin for AWS', () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    server.registerTool('general-guidance', {
+        title: 'General Guidance',
+        description: 'Tool for guidance and best practices for working with Nx and the Nx Plugin for AWS',
+    }, () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         return ({
             content: [
                 {

package/src/mcp-server/tools/general-guidance.js.map

@@ -1 +1 @@
-{"version":3,"file":"general-guidance.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/general-guidance.ts"],"names":[],"mappings":";;;;AAMA,sCAA6C;AAC7C,sDAAoE;AACpE,yCAAgD;AAEnC,QAAA,oBAAoB,GAAG;;;;;gGAK4D,CAAC;AAEjG;;GAEG;AACI,MAAM,sBAAsB,GAAG,CACpC,MAAiB,EACjB,UAA6B,EAC7B,EAAE;IACF,MAAM,CAAC,IAAI,CACT,kBAAkB,EAClB,oFAAoF,EACpF,GAAS,EAAE;QAAC,OAAA,CAAC;YACX,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE;;EAEd,4BAAoB;;;;2DAIqC,yBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;iFACL,mBAAa,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;;EAOvG,yBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,+BAAc,EAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkC3E,MAAM,IAAA,gCAAe,EAAC,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,EAAE,UAAU,CAAC;;KAExE;iBACI;aACF;SACF,CAAC,CAAA;MAAA,CACH,CAAC;AACJ,CAAC,CAAC;AAlEW,QAAA,sBAAsB,0BAkEjC"}
+{"version":3,"file":"general-guidance.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/general-guidance.ts"],"names":[],"mappings":";;;;AAMA,sCAA6C;AAC7C,sDAAoE;AACpE,yCAAgD;AAEnC,QAAA,oBAAoB,GAAG;;;;;gGAK4D,CAAC;AAEjG;;GAEG;AACI,MAAM,sBAAsB,GAAG,CACpC,MAAiB,EACjB,UAA6B,EAC7B,EAAE;IACF,MAAM,CAAC,YAAY,CACjB,kBAAkB,EAClB;QACE,KAAK,EAAE,kBAAkB;QACzB,WAAW,EACT,oFAAoF;KACvF,EACD,GAAS,EAAE;QAAC,OAAA,CAAC;YACX,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAe;oBACrB,IAAI,EAAE;;EAEd,4BAAoB;;;;2DAIqC,yBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;iFACL,mBAAa,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;;EAOvG,yBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,+BAAc,EAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkC3E,MAAM,IAAA,gCAAe,EAAC,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,EAAE,UAAU,CAAC;;KAExE;iBACI;aACF;SACF,CAAC,CAAA;MAAA,CACH,CAAC;AACJ,CAAC,CAAC;AAtEW,QAAA,sBAAsB,0BAsEjC"}

package/src/mcp-server/tools/generator-guide.js

@@ -2,16 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addGeneratorGuideTool = void 0;
 const tslib_1 = require("tslib");
-const zod_v3_1 = require("zod-v3");
+const zod_1 = require("zod");
 const generator_info_1 = require("../generator-info");
 const schema_1 = require("../schema");
 /**
  * Add a tool which provides a detailed guide for an individual generator
  */
 const addGeneratorGuideTool = (server, generators) => {
-    server.tool('generator-guide', 'Tool to retrieve detailed information about a specific generator.', {
-        packageManager: schema_1.PackageManagerSchema,
-        generator: zod_v3_1.z.custom((v) => typeof v === 'string' && generators.map((g) => g.id).includes(v)),
+    server.registerTool('generator-guide', {
+        description: 'Tool to retrieve detailed information about a specific generator.',
+        inputSchema: {
+            packageManager: schema_1.PackageManagerSchema,
+            generator: zod_1.z.enum(generators.map((g) => g.id)),
+        },
     }, (_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ packageManager, generator: generatorId }) {
         const generator = generators.find((g) => g.id === generatorId);
         if (!generator) {

package/src/mcp-server/tools/generator-guide.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator-guide.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/generator-guide.ts"],"names":[],"mappings":";;;;AAMA,mCAA2B;AAC3B,sDAG2B;AAC3B,sCAAiD;AAEjD;;GAEG;AACI,MAAM,qBAAqB,GAAG,CACnC,MAAiB,EACjB,UAA6B,EAC7B,EAAE;IACF,MAAM,CAAC,IAAI,CACT,iBAAiB,EACjB,mEAAmE,EACnE;QACE,cAAc,EAAE,6BAAoB;QACpC,SAAS,EAAE,UAAC,CAAC,MAAM,CACjB,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CACxE;KACF,EACD,KAAmD,EAAE,oDAA9C,EAAE,cAAc,EAAE,SAAS,EAAE,WAAW,EAAE;QAC/C,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,8BAA8B,WAAW,2BAA2B,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC7G,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,MAAM,IAAA,oCAAmB,EAAC,cAAc,EAAE,SAAS,CAAC;;;;EAIpE,MAAM,IAAA,4CAA2B,EAAC,SAAS,EAAE,UAAU,EAAE,cAAc,CAAC;CACzE;iBACU;aACF;SACF,CAAC;IACJ,CAAC,CAAA,CACF,CAAC;AACJ,CAAC,CAAC;AApCW,QAAA,qBAAqB,yBAoChC"}
+{"version":3,"file":"generator-guide.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/generator-guide.ts"],"names":[],"mappings":";;;;AAMA,6BAAwB;AACxB,sDAG2B;AAC3B,sCAAiD;AAEjD;;GAEG;AACI,MAAM,qBAAqB,GAAG,CACnC,MAAiB,EACjB,UAA6B,EAC7B,EAAE;IACF,MAAM,CAAC,YAAY,CACjB,iBAAiB,EACjB;QACE,WAAW,EACT,mEAAmE;QACrE,WAAW,EAAE;YACX,cAAc,EAAE,6BAAoB;YACpC,SAAS,EAAE,OAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAC/C;KACF,EACD,KAAmD,EAAE,oDAA9C,EAAE,cAAc,EAAE,SAAS,EAAE,WAAW,EAAE;QAC/C,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,8BAA8B,WAAW,2BAA2B,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC7G,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAe;oBACrB,IAAI,EAAE,MAAM,IAAA,oCAAmB,EAAC,cAAc,EAAE,SAAS,CAAC;;;;EAIpE,MAAM,IAAA,4CAA2B,EAAC,SAAS,EAAE,UAAU,EAAE,cAAc,CAAC;CACzE;iBACU;aACF;SACF,CAAC;IACJ,CAAC,CAAA,CACF,CAAC;AACJ,CAAC,CAAC;AArCW,QAAA,qBAAqB,yBAqChC"}

package/src/mcp-server/tools/list-generators.js

@@ -7,7 +7,10 @@ const generator_info_1 = require("../generator-info");
  * Adds a tool which lists details about the available generators
  */
 const addListGeneratorsTool = (server, generators) => {
-    server.tool('list-generators', 'Tool to discover the available generators and how to run them.', { packageManager: schema_1.PackageManagerSchema }, ({ packageManager }) => ({
+    server.registerTool('list-generators', {
+        description: 'Tool to discover the available generators and how to run them.',
+        inputSchema: { packageManager: schema_1.PackageManagerSchema },
+    }, ({ packageManager }) => ({
         content: [
             {
                 type: 'text',

package/src/mcp-server/tools/list-generators.js.map

@@ -1 +1 @@
-{"version":3,"file":"list-generators.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/list-generators.ts"],"names":[],"mappings":";;;AAKA,sCAAiD;AACjD,sDAAwD;AAGxD;;GAEG;AACI,MAAM,qBAAqB,GAAG,CACnC,MAAiB,EACjB,UAA6B,EAC7B,EAAE;IACF,MAAM,CAAC,IAAI,CACT,iBAAiB,EACjB,gEAAgE,EAChE,EAAE,cAAc,EAAE,6BAAoB,EAAE,EACxC,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;QACvB,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE;;IAEZ,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,IAAA,oCAAmB,EAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;GACpF;aACM;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,qBAAqB,yBAoBhC"}
+{"version":3,"file":"list-generators.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/list-generators.ts"],"names":[],"mappings":";;;AAKA,sCAAiD;AACjD,sDAAwD;AAGxD;;GAEG;AACI,MAAM,qBAAqB,GAAG,CACnC,MAAiB,EACjB,UAA6B,EAC7B,EAAE;IACF,MAAM,CAAC,YAAY,CACjB,iBAAiB,EACjB;QACE,WAAW,EACT,gEAAgE;QAClE,WAAW,EAAE,EAAE,cAAc,EAAE,6BAAoB,EAAE;KACtD,EACD,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;QACvB,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAe;gBACrB,IAAI,EAAE;;IAEZ,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,IAAA,oCAAmB,EAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;GACpF;aACM;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,qBAAqB,yBAuBhC"}

package/src/py/mcp-server/__snapshots__/generator.spec.ts.snap

@@ -546,7 +546,7 @@ name = "proj.test_project"
 version = "0.1.0"
 dependencies = [
   "mcp==1.22.0",
-  "boto3==1.41.5",
+  "boto3==1.42.0",
   "aws-opentelemetry-distro==0.14.0"
 ]
 

package/src/py/strands-agent/__snapshots__/generator.spec.ts.snap

@@ -590,7 +590,7 @@ dependencies = [
   "aws-opentelemetry-distro==0.14.0",
   "bedrock-agentcore==0.1.7",
   "fastapi==0.123.0",
-  "boto3==1.41.5",
+  "boto3==1.42.0",
   "mcp==1.22.0",
   "strands-agents==1.18.0",
   "strands-agents-tools==0.2.16",

package/src/ts/mcp-server/__snapshots__/generator.spec.ts.snap

@@ -640,9 +640,9 @@ exports[`ts#mcp-server generator > should match snapshot for generated files > u
     "snapshot-server": "./src/snapshot-server/stdio.js"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "1.21.0",
+    "@modelcontextprotocol/sdk": "1.24.0",
     "express": "5.1.0",
-    "zod-v3": "npm:zod@^3"
+    "zod": "4.1.13"
   },
   "devDependencies": {
     "@modelcontextprotocol/inspector": "0.17.2",

package/src/ts/mcp-server/files/resources/sample-guidance.ts.template

@@ -1,7 +1,7 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 
 export const registerSampleGuidanceResource = (server: McpServer) => {
-  server.resource('example-context', 'example://context', async (uri) => ({
+  server.registerResource('example-context', 'example://context', {}, async (uri) => ({
     contents: [{ uri: uri.href, text: `## Sample Guidance
 
 This is some guidance in markdown format!`}],

package/src/ts/mcp-server/files/tools/add.ts.template

@@ -1,11 +1,13 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { z } from 'zod-v3';
+import { z } from 'zod';
 
 export const registerAddTool = (server: McpServer) => {
-  server.tool("add", "adds two numbers",
-    { a: z.number(), b: z.number() },
+  server.registerTool("add", {
+    description: "adds two numbers",
+    inputSchema: { a: z.number(), b: z.number() }
+  },
     async ({ a, b }) => ({
-      content: [{ type: "text", text: String(a + b) }]
+      content: [{ type: "text" as const, text: String(a + b) }]
     })
   );
 };

package/src/ts/mcp-server/generator.js

@@ -62,11 +62,7 @@ const tsMcpServerGenerator = (tree, options) => tslib_1.__awaiter(void 0, void 0
         distDir,
     }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
     // Add dependencies
-    // Note here we depend on zod v3 (default zod is v4 for all other generators)
-    // Zod v3 is needed since the MCP SDK doesn't yet support v4 (or both v3 and v4 via standard schema)
-    // Tracking: https://github.com/modelcontextprotocol/typescript-sdk/issues/164
-    // We use a renamed dependency so that v3 and v4 can coexist in projects until the above is resolved
-    const deps = (0, versions_1.withVersions)(['@modelcontextprotocol/sdk', 'zod-v3', 'express']);
+    const deps = (0, versions_1.withVersions)(['@modelcontextprotocol/sdk', 'zod', 'express']);
     const devDeps = (0, versions_1.withVersions)([
         'tsx',
         '@types/express',

package/src/ts/mcp-server/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/mcp-server/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/mcp-server/generator.ts"],"names":[],"mappings":"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"}

package/src/ts/nx-plugin/__snapshots__/generator.spec.ts.snap

@@ -148,7 +148,7 @@ exports[`ts#nx-plugin generator > should generate MCP server files > test-plugin
 `;
 
 exports[`ts#nx-plugin generator > should generate MCP server files > test-plugin/src/mcp-server/schema.ts 1`] = `
-"import { z } from 'zod-v3';
+"import { z } from 'zod';
 
 export const PACKAGE_MANAGERS = ['pnpm', 'yarn', 'npm', 'bun'] as const;
 export const PackageManagerSchema = z.enum(PACKAGE_MANAGERS);
@@ -223,7 +223,7 @@ void (async () => {
 
 exports[`ts#nx-plugin generator > should generate MCP server files > test-plugin/src/mcp-server/tools/create-workspace-command.ts 1`] = `
 "import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { z } from 'zod-v3';
+import { z } from 'zod';
 import { PackageManagerSchema } from '../schema';
 import { buildInstallCommand, getPackageName } from '../utils';
 
@@ -231,14 +231,20 @@ import { buildInstallCommand, getPackageName } from '../utils';
  * Registers a tool which tells a model how to create an Nx workspace
  */
 export const registerCreateWorkspaceCommandTool = (server: McpServer) => {
-  server.tool(
+  server.registerTool(
     'create-workspace-command',
-    'Tool to discover how to create a workspace to start a new project.',
-    { workspaceName: z.string(), packageManager: PackageManagerSchema },
+    {
+      description:
+        'Tool to discover how to create a workspace to start a new project.',
+      inputSchema: {
+        workspaceName: z.string(),
+        packageManager: PackageManagerSchema,
+      },
+    },
     ({ workspaceName, packageManager }) => ({
       content: [
         {
-          type: 'text',
+          type: 'text' as const,
           text: \`Run the following command to create a workspace:
 
 \\\`\\\`\\\`bash
@@ -270,13 +276,16 @@ import * as path from 'path';
  * Registers a tool which provides general guidance for using Nx and this plugin
  */
 export const registerGeneralGuidanceTool = (server: McpServer) => {
-  server.tool(
+  server.registerTool(
     'general-guidance',
-    'Tool for guidance and best practices for working with Nx and this plugin',
+    {
+      description:
+        'Tool for guidance and best practices for working with Nx and this plugin',
+    },
     async () => ({
       content: [
         {
-          type: 'text',
+          type: 'text' as const,
           text: fs.readFileSync(
             path.resolve(__dirname, '../resources/GENERAL_GUIDANCE.md'),
             'utf-8',
@@ -291,7 +300,7 @@ export const registerGeneralGuidanceTool = (server: McpServer) => {
 
 exports[`ts#nx-plugin generator > should generate MCP server files > test-plugin/src/mcp-server/tools/generator-guide.ts 1`] = `
 "import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { z } from 'zod-v3';
+import { z } from 'zod';
 import { renderGeneratorInfo, listGenerators } from '../utils';
 import { PackageManagerSchema } from '../schema';
 import * as fs from 'fs';
@@ -301,15 +310,18 @@ import * as path from 'path';
  * Registers a tool which provides a detailed guide for an individual generator
  */
 export const registerGeneratorGuideTool = (server: McpServer) => {
-  server.tool(
+  const generators = listGenerators();
+  server.registerTool(
     'generator-guide',
-    'Tool to retrieve detailed information about a specific generator.',
     {
-      packageManager: PackageManagerSchema,
-      generator: z.string(),
+      description:
+        'Tool to retrieve detailed information about a specific generator.',
+      inputSchema: {
+        packageManager: PackageManagerSchema,
+        generator: z.enum(generators.map((g) => g.id)),
+      },
     },
     async ({ packageManager, generator: generatorId }) => {
-      const generators = listGenerators();
       const generator = generators.find((g) => g.id === generatorId);
       if (!generator) {
         throw new Error(
@@ -320,7 +332,7 @@ export const registerGeneratorGuideTool = (server: McpServer) => {
       return {
         content: [
           {
-            type: 'text',
+            type: 'text' as const,
             text: \`## \${renderGeneratorInfo(packageManager, generator)}
 
 # Guide
@@ -345,14 +357,17 @@ import { renderGeneratorInfo, listGenerators } from '../utils';
  * Registers a tool which lists details about the available generators
  */
 export const registerListGeneratorsTool = (server: McpServer) => {
-  server.tool(
+  server.registerTool(
     'list-generators',
-    'Tool to discover the available generators and how to run them.',
-    { packageManager: PackageManagerSchema },
+    {
+      description:
+        'Tool to discover the available generators and how to run them.',
+      inputSchema: { packageManager: PackageManagerSchema },
+    },
     ({ packageManager }) => ({
       content: [
         {
-          type: 'text',
+          type: 'text' as const,
           text: \`## Available Generators
 
   \${listGenerators()

package/src/ts/nx-plugin/files/mcp-server/schema.ts.template

@@ -1,4 +1,4 @@
-import { z } from 'zod-v3';
+import { z } from 'zod';
 
 export const PACKAGE_MANAGERS = ['pnpm', 'yarn', 'npm', 'bun'] as const;
 export const PackageManagerSchema = z.enum(PACKAGE_MANAGERS);

package/src/ts/nx-plugin/files/mcp-server/tools/create-workspace-command.ts.template

@@ -1,5 +1,5 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { z } from 'zod-v3';
+import { z } from 'zod';
 import { PackageManagerSchema } from '../schema';
 import { buildInstallCommand, getPackageName } from '../utils';
 
@@ -7,14 +7,16 @@ import { buildInstallCommand, getPackageName } from '../utils';
  * Registers a tool which tells a model how to create an Nx workspace
  */
 export const registerCreateWorkspaceCommandTool = (server: McpServer) => {
-  server.tool(
+  server.registerTool(
     'create-workspace-command',
-    'Tool to discover how to create a workspace to start a new project.',
-    { workspaceName: z.string(), packageManager: PackageManagerSchema },
+    {
+      description: 'Tool to discover how to create a workspace to start a new project.',
+      inputSchema: { workspaceName: z.string(), packageManager: PackageManagerSchema },
+    },
     ({ workspaceName, packageManager }) => ({
       content: [
         {
-          type: 'text',
+          type: 'text' as const,
           text: `Run the following command to create a workspace:
 
 \`\`\`bash

package/src/ts/nx-plugin/files/mcp-server/tools/general-guidance.ts.template

@@ -6,13 +6,15 @@ import * as path from 'path';
  * Registers a tool which provides general guidance for using Nx and this plugin
  */
 export const registerGeneralGuidanceTool = (server: McpServer) => {
-  server.tool(
+  server.registerTool(
     'general-guidance',
-    'Tool for guidance and best practices for working with Nx and this plugin',
+    {
+      description: 'Tool for guidance and best practices for working with Nx and this plugin',
+    },
     async () => ({
       content: [
         {
-          type: 'text',
+          type: 'text' as const,
           text: fs.readFileSync(
             path.resolve(__dirname, '../resources/GENERAL_GUIDANCE.md'),
             'utf-8',

package/src/ts/nx-plugin/files/mcp-server/tools/generator-guide.ts.template

@@ -1,5 +1,5 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { z } from 'zod-v3';
+import { z } from 'zod';
 import { renderGeneratorInfo, listGenerators } from '../utils';
 import { PackageManagerSchema } from '../schema';
 import * as fs from 'fs';
@@ -11,15 +11,17 @@ import * as path from 'path';
 export const registerGeneratorGuideTool = (
   server: McpServer,
 ) => {
-  server.tool(
+  const generators = listGenerators();
+  server.registerTool(
     'generator-guide',
-    'Tool to retrieve detailed information about a specific generator.',
     {
-      packageManager: PackageManagerSchema,
-      generator: z.string(),
+      description: 'Tool to retrieve detailed information about a specific generator.',
+      inputSchema: {
+        packageManager: PackageManagerSchema,
+        generator: z.enum(generators.map(g => g.id)),
+      },
     },
     async ({ packageManager, generator: generatorId }) => {
-      const generators = listGenerators();
       const generator = generators.find((g) => g.id === generatorId);
       if (!generator) {
         throw new Error(
@@ -30,7 +32,7 @@ export const registerGeneratorGuideTool = (
       return {
         content: [
           {
-            type: 'text',
+            type: 'text' as const,
             text: `## ${renderGeneratorInfo(packageManager, generator)}
 
 # Guide

package/src/ts/nx-plugin/files/mcp-server/tools/list-generators.ts.template

@@ -8,14 +8,16 @@ import { renderGeneratorInfo, listGenerators } from '../utils';
 export const registerListGeneratorsTool = (
   server: McpServer,
 ) => {
-  server.tool(
+  server.registerTool(
     'list-generators',
-    'Tool to discover the available generators and how to run them.',
-    { packageManager: PackageManagerSchema },
+    {
+      description: 'Tool to discover the available generators and how to run them.',
+      inputSchema: { packageManager: PackageManagerSchema },
+    },
     ({ packageManager }) => ({
       content: [
         {
-          type: 'text',
+          type: 'text' as const,
           text: `## Available Generators
 
   ${listGenerators().map((g) => `### ${renderGeneratorInfo(packageManager, g)}`).join('\n\n')}