@aws/nx-plugin 0.34.0 → 0.35.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/nx-plugin",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/awslabs/nx-plugin-for-aws.git",

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

@@ -17,14 +17,7 @@ const addCreateWorkspaceCommandTool = (server) => {
 npx create-nx-workspace@~21.0.3 ${workspaceName} --pm=${packageManager} --preset=@aws/nx-plugin --ci=skip
 \`\`\`
 
-Note that this will create a workspace in a new directory named ${workspaceName}. If you are already working in the directory
-you would like for your workspace, you can move all the files up one level and delete the empty directory afterwards, eg:
-
-\`\`\`bash
-mv ${workspaceName}/{*,.*} ./ && rm -rf ${workspaceName}
-\`\`\`
-
-(Note that the above command will complain about moving . and .. but that is expected and ok!)
+This will create a new workspace within the ${workspaceName} directory.
   `,
             },
         ],

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,6BAAwB;AACxB,sCAAiD;AAEjD;;GAEG;AACI,MAAM,6BAA6B,GAAG,CAAC,MAAiB,EAAE,EAAE;IACjE,MAAM,CAAC,IAAI,CACT,0BAA0B,EAC1B,oEAAoE,EACpE,EAAE,aAAa,EAAE,OAAC,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;;;kCAGkB,aAAa,SAAS,cAAc;;;kEAGJ,aAAa;;;;KAI1E,aAAa,wBAAwB,aAAa;;;;GAIpD;aACM;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,6BAA6B,iCA4BxC"}
+{"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;AAEjD;;GAEG;AACI,MAAM,6BAA6B,GAAG,CAAC,MAAiB,EAAE,EAAE;IACjE,MAAM,CAAC,IAAI,CACT,0BAA0B,EAC1B,oEAAoE,EACpE,EAAE,aAAa,EAAE,OAAC,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;;;kCAGkB,aAAa,SAAS,cAAc;;;8CAGxB,aAAa;GACxD;aACM;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,6BAA6B,iCAqBxC"}

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

@@ -1,335 +1,62 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`ts#mcp-server generator > should match snapshot > mcp-server-files 1`] = `
-{
-  "test-server/README.md": "# test-server
-
-This package defines a Model Context Protocol (MCP) Server in TypeScript.
-
-## What is MCP?
-
-The Model Context Protocol (MCP) is a standardized protocol for providing context to Large Language Models (LLMs). It allows AI assistants to access external tools and resources through a consistent interface.
-
-## Documentation
-
-- [Model Context Protocol Documentation](https://modelcontextprotocol.io/)
-- [MCP TypeScript SDK Documentation](https://github.com/modelcontextprotocol/sdk-typescript)
-
-## Developer Guide
-
-### Getting Started
-
-This MCP server is built using the MCP TypeScript SDK. Here's how to work with it:
-
-1. **Server Structure**: The main server code is in \`src/server.ts\`. This file defines the server, its tools, and resources.
-
-2. **Adding Tools**: Tools are functions that the LLM can call to perform actions. Add new tools using the \`server.tool()\` method:
-
-\`\`\`typescript
-server.tool(
-  'toolName',
-  { param1: z.string(), param2: z.number() }, // Input schema using Zod
-  async ({ param1, param2 }) => {
-    // Tool implementation
-    return {
-      content: [{ type: 'text', text: 'Result' }],
-    };
-  },
-);
-\`\`\`
-
-3. **Adding Resources**: Resources provide context to the LLM. You can add static resources from files or dynamic resources:
-
-\`\`\`typescript
-// Static resource from a file
-import resourceContent from './resources/my-resource.md';
-
-server.resource('resource-name', 'example://resource', async (uri) => ({
-  contents: [{ uri: uri.href, text: resourceContent }],
-}));
-
-// Dynamic resource
-server.resource('dynamic-resource', 'dynamic://resource', async (uri) => {
-  const data = await fetchSomeData();
-  return {
-    contents: [{ uri: uri.href, text: data }],
-  };
-});
-\`\`\`
-
-### Building the Server
-
-To build the server for use with AI assistants:
-
-\`\`\`bash
-nx run <project-name>:bundle
-\`\`\`
-
-This creates a bundled version of your server in \`dist/<project-path>/bundle/index.js\`.
-
-## Using with AI Assistants
-
-To use your MCP server with AI assistants, you need to build it first to create the bundle:
-
-\`\`\`bash
-nx run <project-name>:bundle
-\`\`\`
-
-### Configuration
-
-Most AI assistants (Amazon Q Developer CLI, Cline, Cursor, Claude Code, etc.) use a similar configuration approach. You'll need to create or update a configuration file with your MCP server details:
-
-\`\`\`json
-{
-  "mcpServers": {
-    "test-server": {
-      "command": "node",
-      "args": ["/path/to/workspace/dist/test-server/bundle/index.js"],
-      "transportType": "stdio"
-    }
-  }
-}
-\`\`\`
-
-Replace \`/path/to/workspace/dist/test-server/bundle/index.js\` with the actual path to your bundled MCP server.
-
-Note that if you receive an error due to \`node\` missing (eg \`ENOENT node\`), you might need to specify the full path to \`node\` which you can obtain by running \`which node\`.
-
-### Development Mode
-
-During development, you can use the \`dev\` target to continuously rebuild the bundle whenever you make changes:
-
-\`\`\`bash
-nx run <project-name>:dev
-\`\`\`
-
-This will watch for changes in your project files and automatically rebuild the bundle.
-
-Whenever you've made changes, you'll need to restart the MCP server in your AI assistant to test it out. The exact process depends on the assistant, but generally:
-
-1. Find your MCP server in the assistant's settings or configuration
-2. Look for a "Restart" or "Reload" option
-",
-  "test-server/eslint.config.mjs": "import baseConfig from '../eslint.config.mjs';
+exports[`ts#mcp-server generator > should match snapshot for generated files > mcp-server-index.ts 1`] = `
+"#!/usr/bin/env node
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { createServer } from './server';
+
+export const startMcpServer = async () => {
+  const transport = new StdioServerTransport();
+  await createServer().connect(transport);
+  console.error('MCP Server listening on STDIO');
+};
 
-export default [
-  ...baseConfig,
-  {
-    files: ['**/*.json'],
-    rules: {
-      '@nx/dependency-checks': [
-        'warn',
-        {
-          ignoredFiles: [
-            '{projectRoot}/eslint.config.{js,cjs,mjs}',
-            '{projectRoot}/vite.config.{js,ts,mjs,mts}',
-          ],
-        },
-      ],
-    },
-    languageOptions: {
-      parser: await import('jsonc-eslint-parser'),
-    },
-  },
-];
-",
-  "test-server/project.json": "{
-  "name": "@proj/test-server",
-  "$schema": "../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "test-server/src",
-  "projectType": "library",
-  "tags": [],
-  "metadata": {
-    "generator": "ts#mcp-server"
-  },
-  "targets": {
-    "build": {
-      "dependsOn": ["lint", "compile", "test", "bundle"]
-    },
-    "compile": {
-      "executor": "nx:run-commands",
-      "outputs": ["{workspaceRoot}/dist/test-server/tsc"],
-      "options": {
-        "command": "tsc --build tsconfig.lib.json",
-        "cwd": "{projectRoot}"
-      }
-    },
-    "test": {
-      "executor": "@nx/vite:test",
-      "outputs": ["{options.reportsDirectory}"],
-      "options": {
-        "reportsDirectory": "../coverage/test-server"
-      }
-    },
-    "bundle": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "esbuild \\"test-server/src/index.ts\\" --bundle --platform=node --format=esm --loader:.md=text --outfile=dist/test-server/bundle/index.js"
-        ]
-      }
-    },
-    "dev": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "nx watch --projects=@proj/test-server --includeDependentProjects -- nx run @proj/test-server:bundle"
-        ]
-      }
-    }
+void (async () => {
+  try {
+    await startMcpServer();
+  } catch (e) {
+    console.error(e);
   }
-}
-",
-  "test-server/src/global.d.ts": "declare module '*.md' {
-  const content: string;
-  export default content;
-}
-",
-  "test-server/src/index.ts": "import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { createServer } from './server.js';
-
-// Start receiving messages on stdin and sending messages on stdout
-const transport = new StdioServerTransport();
-await createServer().connect(transport);
-",
-  "test-server/src/resources/example-context.md": "## Example Context
+})();
+"
+`;
 
-This is some example context in a markdown file!
-",
-  "test-server/src/server.ts": "import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { z } from 'zod';
-import exampleContext from './resources/example-context.md';
+exports[`ts#mcp-server generator > should match snapshot for generated files > mcp-server-server.ts 1`] = `
+"import { McpServer } from '@modelcontextprotocol/sdk/server/mcp';
+import { registerAddTool } from './tools/add';
+import { registerSampleGuidanceResource } from './resources/sample-guidance';
 
 /**
  * Create the MCP Server
  */
 export const createServer = () => {
   const server = new McpServer({
-    name: 'test-server',
+    name: 'snapshot-server',
     version: '1.0.0',
   });
 
-  // Add an addition tool
-  server.tool(
-    'add',
-    'adds two numbers',
-    { a: z.number(), b: z.number() },
-    async ({ a, b }) => ({
-      content: [{ type: 'text', text: String(a + b) }],
-    }),
-  );
-
-  // Add a resource which provides context from a markdown file
-  server.resource('example-context', 'example://context', async (uri) => ({
-    contents: [{ uri: uri.href, text: exampleContext }],
-  }));
+  registerAddTool(server);
+  registerSampleGuidanceResource(server);
 
   return server;
 };
-",
-  "test-server/tsconfig.json": "{
-  "extends": "../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ],
-  "compilerOptions": {}
-}
-",
-  "test-server/tsconfig.lib.json": "{
-  "extends": "../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": ".",
-    "outDir": "../dist/test-server/tsc",
-    "tsBuildInfoFile": "../dist/test-server/tsc/tsconfig.lib.tsbuildinfo",
-    "emitDeclarationOnly": false,
-    "module": "nodenext",
-    "moduleResolution": "nodenext",
-    "types": ["node"]
-  },
-  "include": ["src/**/*.ts"],
-  "references": [],
-  "exclude": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx"
-  ]
-}
-",
-  "test-server/tsconfig.spec.json": "{
-  "extends": "../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/vitest",
-    "types": [
-      "vitest/globals",
-      "vitest/importMeta",
-      "vite/client",
-      "node",
-      "vitest"
-    ],
-    "module": "nodenext",
-    "moduleResolution": "nodenext"
-  },
-  "include": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx",
-    "src/**/*.d.ts"
-  ],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
-}
-",
-  "test-server/vite.config.ts": "import { defineConfig } from 'vite';
+"
+`;
 
-export default defineConfig(() => ({
-  root: __dirname,
-  cacheDir: '../node_modules/.vite/test-server',
-  plugins: [],
-  // Uncomment this if you are using workers.
-  // worker: {
-  //  plugins: [ nxViteTsPaths() ],
-  // },
-  test: {
-    watch: false,
-    globals: true,
-    environment: 'jsdom',
-    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      reportsDirectory: './test-output/vitest/coverage',
-      provider: 'v8' as const,
-    },
-    passWithNoTests: true,
+exports[`ts#mcp-server generator > should match snapshot for generated files > updated-package.json 1`] = `
+"{
+  "name": "test-project",
+  "version": "1.0.0",
+  "bin": {
+    "snapshot-server": "./src/snapshot-server/index.js"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.11.3",
+    "zod": "^3.25.50"
   },
-}));
-",
+  "devDependencies": {
+    "tsx": "4.20.1"
+  }
 }
+"
 `;

package/src/ts/mcp-server/files/index.ts.template

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { createServer } from './server<% if (esm) { %>.js<% } %>';
+
+export const startMcpServer = async () => {
+  const transport = new StdioServerTransport();
+  await createServer().connect(transport);
+  console.error('MCP Server listening on STDIO');
+};
+
+void (async () => {
+  try {
+    await startMcpServer();
+  } catch (e) {
+    console.error(e);
+  }
+})();

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

@@ -0,0 +1,9 @@
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+
+export const registerSampleGuidanceResource = (server: McpServer) => {
+  server.resource('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/server.ts.template

@@ -0,0 +1,18 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp<% if (esm) { %>.js<% } %>";
+import { registerAddTool } from './tools/add<% if (esm) { %>.js<% } %>';
+import { registerSampleGuidanceResource } from './resources/sample-guidance<% if (esm) { %>.js<% } %>';
+
+/**
+ * Create the MCP Server
+ */
+export const createServer = () => {
+  const server = new McpServer({
+    name: "<%- name %>",
+    version: "1.0.0"
+  });
+
+  registerAddTool(server);
+  registerSampleGuidanceResource(server);
+
+  return server;
+};

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

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

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

@@ -10,47 +10,58 @@ const devkit_1 = require("@nx/devkit");
 const nx_1 = require("../../utils/nx");
 const metrics_1 = require("../../utils/metrics");
 const format_1 = require("../../utils/format");
-const generator_1 = tslib_1.__importStar(require("../lib/generator"));
 const versions_1 = require("../../utils/versions");
+const names_1 = require("../../utils/names");
 exports.TS_MCP_SERVER_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 const tsMcpServerGenerator = (tree, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d;
-    // Generate a TypeScript library
-    yield (0, generator_1.default)(tree, options);
-    const { fullyQualifiedName } = (0, generator_1.getTsLibDetails)(tree, options);
-    const project = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
+    var _a, _b;
+    const project = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.project);
+    if (!tree.exists((0, devkit_1.joinPathFragments)(project.root, 'tsconfig.json'))) {
+        throw new Error(`Unsupported project ${options.project}. Expected a TypeScript project (with a tsconfig.json)`);
+    }
+    const defaultName = `${(0, names_1.kebabCase)(project.name.split('/').pop())}-mcp-server`;
+    const name = (0, names_1.kebabCase)((_a = options.name) !== null && _a !== void 0 ? _a : defaultName);
+    const targetSourceDir = (0, devkit_1.joinPathFragments)((_b = project.sourceRoot) !== null && _b !== void 0 ? _b : `${project.root}/src`, options.name ? name : 'mcp-server');
+    const relativeSourceDir = targetSourceDir.replace(project.root + '/', './');
+    // Create a package.json if one doesn't exist, since we want to add the server as a bin target
+    const projectPackageJsonPath = (0, devkit_1.joinPathFragments)(project.root, 'package.json');
+    if (!tree.exists(projectPackageJsonPath)) {
+        // Default to esm if no package.json found
+        (0, devkit_1.writeJson)(tree, projectPackageJsonPath, {
+            name: project.name,
+            type: 'module',
+        });
+    }
+    // Generate esm if the package.json is of type module, otherwise we generate commonjs
+    // We support commonjs here because nx plugins must be commonjs
+    // https://github.com/nrwl/nx/issues/15682
+    const esm = (0, devkit_1.readJson)(tree, projectPackageJsonPath).type === 'module';
+    // Add a target for running the MCP server
+    (0, devkit_1.updateJson)(tree, projectPackageJsonPath, (pkg) => {
+        var _a;
+        (_a = pkg.bin) !== null && _a !== void 0 ? _a : (pkg.bin = {});
+        pkg.bin[name] = `${relativeSourceDir}/index.js`;
+        return pkg;
+    });
     // Add dependencies
     const deps = (0, versions_1.withVersions)(['@modelcontextprotocol/sdk', 'zod']);
-    const devDeps = (0, versions_1.withVersions)(['tsx', 'esbuild']);
+    const devDeps = (0, versions_1.withVersions)(['tsx']);
     (0, devkit_1.addDependenciesToPackageJson)(tree, deps, devDeps);
+    (0, devkit_1.addDependenciesToPackageJson)(tree, deps, devDeps, projectPackageJsonPath);
     // Generate example server
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), project.root, {
-        name: options.name,
-        dir: project.root,
-    }, { overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite });
-    // Add build targets
-    (0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, Object.assign(Object.assign({}, project), { targets: Object.assign(Object.assign({}, project === null || project === void 0 ? void 0 : project.targets), { 
-            // Bundle with esbuild
-            bundle: {
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), targetSourceDir, {
+        name,
+        esm,
+    }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    (0, devkit_1.updateProjectConfiguration)(tree, project.name, Object.assign(Object.assign({}, project), { targets: Object.assign(Object.assign({}, project.targets), { 
+            // Add target for running the MCP server
+            [`${options.name ? name : 'mcp-server'}-serve`]: {
                 executor: 'nx:run-commands',
                 options: {
-                    commands: [
-                        `esbuild "${(0, devkit_1.joinPathFragments)(project.sourceRoot, 'index.ts')}" --bundle --platform=node --format=esm --loader:.md=text --outfile=${(0, devkit_1.joinPathFragments)('dist', project.root, 'bundle', 'index.js')}`,
-                    ],
+                    commands: [`tsx --watch ${relativeSourceDir}/index.ts`],
+                    cwd: '{projectRoot}',
                 },
-            }, 
-            // Dev task for bundling whenever changes are made
-            dev: {
-                executor: 'nx:run-commands',
-                options: {
-                    commands: [
-                        `nx watch --projects=${fullyQualifiedName} --includeDependentProjects -- nx run ${fullyQualifiedName}:bundle`,
-                    ],
-                },
-            }, 
-            // Ensure bundle runs as part of build
-            build: Object.assign(Object.assign({}, (_a = project === null || project === void 0 ? void 0 : project.targets) === null || _a === void 0 ? void 0 : _a.build), { dependsOn: [...((_d = (_c = (_b = project === null || project === void 0 ? void 0 : project.targets) === null || _b === void 0 ? void 0 : _b.build) === null || _c === void 0 ? void 0 : _c.dependsOn) !== null && _d !== void 0 ? _d : []), 'bundle'] }) }) }));
-    (0, nx_1.addGeneratorMetadata)(tree, fullyQualifiedName, exports.TS_MCP_SERVER_GENERATOR_INFO);
+            } }) }));
     yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TS_MCP_SERVER_GENERATOR_INFO]);
     yield (0, format_1.formatFilesInSubtree)(tree);
     return () => {

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":";;;;AAAA;;;GAGG;AACH,uCAUoB;AAEpB,uCAIwB;AACxB,iDAAsE;AACtE,+CAA0D;AAC1D,sEAAuE;AACvE,mDAAoD;AAEvC,QAAA,4BAA4B,GACvC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,oBAAoB,GAAG,CAClC,IAAU,EACV,OAAmC,EACP,EAAE;;IAC9B,gCAAgC;IAChC,MAAM,IAAA,mBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAExC,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;IAEnE,mBAAmB;IACnB,MAAM,IAAI,GAAG,IAAA,uBAAY,EAAC,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,IAAA,uBAAY,EAAC,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IACjD,IAAA,qCAA4B,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAElD,0BAA0B;IAC1B,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,OAAO,CAAC,IAAI,EACZ;QACE,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,GAAG,EAAE,OAAO,CAAC,IAAI;KAClB,EACD,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,SAAS,EAAE,CACnD,CAAC;IAEF,oBAAoB;IACpB,IAAA,mCAA0B,EAAC,IAAI,EAAE,kBAAkB,kCAC9C,OAAO,KACV,OAAO,kCACF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO;YACnB,sBAAsB;YACtB,MAAM,EAAE;gBACN,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,YAAY,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,uEAAuE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE;qBACpM;iBACF;aACF;YACD,kDAAkD;YAClD,GAAG,EAAE;gBACH,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,uBAAuB,kBAAkB,yCAAyC,kBAAkB,SAAS;qBAC9G;iBACF;aACF;YACD,sCAAsC;YACtC,KAAK,kCACA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,KAAK,KAC1B,SAAS,EAAE,CAAC,GAAG,CAAC,MAAA,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,KAAK,0CAAE,SAAS,mCAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,UAGxE,CAAC;IAEH,IAAA,yBAAoB,EAAC,IAAI,EAAE,kBAAkB,EAAE,oCAA4B,CAAC,CAAC;IAE7E,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,oCAA4B,CAAC,CAAC,CAAC;IAE5E,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IACjC,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC,CAAA,CAAC;AAlEW,QAAA,oBAAoB,wBAkE/B;AAEF,kBAAe,4BAAoB,CAAC"}
+{"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/mcp-server/schema.d.ts

@@ -2,10 +2,12 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { TsProjectGeneratorSchema } from '../lib/schema';
 
 /**
  * TypeScript types for options defined in schema.json
  * Update this to match schema.json if you make changes.
  */
-export type TsMcpServerGeneratorSchema = TsProjectGeneratorSchema;
+export interface TsMcpServerGeneratorSchema {
+  project: string;
+  name?: string;
+}

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

@@ -2,31 +2,24 @@
   "$schema": "https://json-schema.org/schema",
   "$id": "ts#mcp-server",
   "title": "ts#mcp-server",
-  "description": "Generate a TypeScript Model Context Protocol (MCP) server for providing context to Large Language Models",
+  "description": "Add a Model Context Protocol (MCP) server to an existing TypeScript project",
   "type": "object",
   "properties": {
-    "name": {
+    "project": {
       "type": "string",
-      "description": "MCP server project name.",
+      "description": "The project to add an MCP server to",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What would you like to call your MCP server?",
-      "x-priority": "important"
-    },
-    "directory": {
-      "type": "string",
-      "description": "Parent directory where the MCP server is placed.",
-      "default": "packages",
-      "x-prompt": "Which directory do you want to create the MCP server in?",
-      "x-priority": "important"
+      "x-prompt": "Select the TypeScript project to add the MCP server to",
+      "x-dropdown": "projects"
     },
-    "subDirectory": {
+    "name": {
       "type": "string",
-      "description": "The sub directory the MCP server is placed in. By default this is the MCP server project name.",
-      "x-prompt": "Which sub directory do you want to create the MCP server in? (By default this is the MCP server project name)"
+      "description": "The name of your MCP server (default: mcp-server)",
+      "x-prompt": "What would you like to call your MCP server? (default: mcp-server)"
     }
   },
-  "required": ["name"]
+  "required": ["project"]
 }

package/src/ts/mcp-server/files/README.md.template

@@ -1,108 +0,0 @@
-# <%- name %>
-
-This package defines a Model Context Protocol (MCP) Server in TypeScript.
-
-## What is MCP?
-
-The Model Context Protocol (MCP) is a standardized protocol for providing context to Large Language Models (LLMs). It allows AI assistants to access external tools and resources through a consistent interface.
-
-## Documentation
-
-- [Model Context Protocol Documentation](https://modelcontextprotocol.io/)
-- [MCP TypeScript SDK Documentation](https://github.com/modelcontextprotocol/sdk-typescript)
-
-## Developer Guide
-
-### Getting Started
-
-This MCP server is built using the MCP TypeScript SDK. Here's how to work with it:
-
-1. **Server Structure**: The main server code is in `src/server.ts`. This file defines the server, its tools, and resources.
-
-2. **Adding Tools**: Tools are functions that the LLM can call to perform actions. Add new tools using the `server.tool()` method:
-
-```typescript
-server.tool("toolName",
-  { param1: z.string(), param2: z.number() }, // Input schema using Zod
-  async ({ param1, param2 }) => {
-    // Tool implementation
-    return {
-      content: [{ type: "text", text: "Result" }]
-    };
-  }
-);
-```
-
-3. **Adding Resources**: Resources provide context to the LLM. You can add static resources from files or dynamic resources:
-
-```typescript
-// Static resource from a file
-import resourceContent from './resources/my-resource.md';
-
-server.resource('resource-name', 'example://resource', async (uri) => ({
-  contents: [{ uri: uri.href, text: resourceContent }],
-}));
-
-// Dynamic resource
-server.resource('dynamic-resource', 'dynamic://resource', async (uri) => {
-  const data = await fetchSomeData();
-  return {
-    contents: [{ uri: uri.href, text: data }],
-  };
-});
-```
-
-### Building the Server
-
-To build the server for use with AI assistants:
-
-```bash
-nx run <project-name>:bundle
-```
-
-This creates a bundled version of your server in `dist/<project-path>/bundle/index.js`.
-
-## Using with AI Assistants
-
-To use your MCP server with AI assistants, you need to build it first to create the bundle:
-
-```bash
-nx run <project-name>:bundle
-```
-
-### Configuration
-
-Most AI assistants (Amazon Q Developer CLI, Cline, Cursor, Claude Code, etc.) use a similar configuration approach. You'll need to create or update a configuration file with your MCP server details:
-
-```json
-{
-  "mcpServers": {
-    "<%- name %>": {
-      "command": "node",
-      "args": [
-        "/path/to/workspace/dist/<%- dir %>/bundle/index.js"
-      ],
-      "transportType": "stdio"
-    }
-  }
-}
-```
-
-Replace `/path/to/workspace/dist/<%- dir %>/bundle/index.js` with the actual path to your bundled MCP server.
-
-Note that if you receive an error due to `node` missing (eg `ENOENT node`), you might need to specify the full path to `node` which you can obtain by running `which node`.
-
-### Development Mode
-
-During development, you can use the `dev` target to continuously rebuild the bundle whenever you make changes:
-
-```bash
-nx run <project-name>:dev
-```
-
-This will watch for changes in your project files and automatically rebuild the bundle.
-
-Whenever you've made changes, you'll need to restart the MCP server in your AI assistant to test it out. The exact process depends on the assistant, but generally:
-
-1. Find your MCP server in the assistant's settings or configuration
-2. Look for a "Restart" or "Reload" option

package/src/ts/mcp-server/files/src/global.d.ts.template

@@ -1,4 +0,0 @@
-declare module '*.md' {
-  const content: string;
-  export default content;
-}

package/src/ts/mcp-server/files/src/index.ts.template

@@ -1,6 +0,0 @@
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createServer } from './server.js';
-
-// Start receiving messages on stdin and sending messages on stdout
-const transport = new StdioServerTransport();
-await createServer().connect(transport);

package/src/ts/mcp-server/files/src/resources/example-context.md

@@ -1,3 +0,0 @@
-## Example Context
-
-This is some example context in a markdown file!

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

@@ -1,28 +0,0 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { z } from "zod";
-import exampleContext from './resources/example-context.md';
-
-/**
- * Create the MCP Server
- */
-export const createServer = () => {
-  const server = new McpServer({
-    name: "<%- name %>",
-    version: "1.0.0"
-  });
-
-  // Add an addition tool
-  server.tool("add", "adds two numbers",
-    { a: z.number(), b: z.number() },
-    async ({ a, b }) => ({
-      content: [{ type: "text", text: String(a + b) }]
-    })
-  );
-
-  // Add a resource which provides context from a markdown file
-  server.resource('example-context', 'example://context', async (uri) => ({
-    contents: [{ uri: uri.href, text: exampleContext }],
-  }));
-
-  return server;
-};