@aws/nx-plugin 1.0.0-rc.9 → 1.0.0-rc.90

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

@@ -16,9 +16,15 @@ export interface FilterableOption {
     description?: string;
 }
 /**
- * Pull out every enum-valued property as a `FilterableOption`. Shared between
- * the MCP server (deriving options from a generator's schema) and the docs
- * filter bar (mapping user-referenced keys onto their enum values).
+ * The values an option can be filtered on: its enum values, or true/false
+ * for booleans. Returns undefined for non-filterable options.
+ */
+export declare const filterableValuesForProperty: (prop: SchemaProperty) => string[] | undefined;
+/**
+ * Pull out every filterable property (enum or boolean valued) as a
+ * `FilterableOption`. Shared between the MCP server (deriving options from a
+ * generator's schema) and the docs filter bar (mapping user-referenced keys
+ * onto their values).
  */
 export declare const filterableOptionsFromSchema: (schema: GeneratorSchema | undefined) => FilterableOption[];
 /**

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

@@ -1,79 +1,82 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSchemaLookup = exports.resolveGeneratorsJson = exports.filterableOptionsFromSchema = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
+ */ import fs from "node:fs";
+import path from "node:path";
 /**
- * Pull out every enum-valued property as a `FilterableOption`. Shared between
- * the MCP server (deriving options from a generator's schema) and the docs
- * filter bar (mapping user-referenced keys onto their enum values).
- */
-const filterableOptionsFromSchema = (schema) => {
+ * The values an option can be filtered on: its enum values, or true/false
+ * for booleans. Returns undefined for non-filterable options.
+ */ export const filterableValuesForProperty = (prop)=>{
+    if (Array.isArray(prop.enum) && prop.enum.length > 0) {
+        return prop.enum.map((v)=>String(v));
+    }
+    if (prop.type === 'boolean') {
+        return [
+            'true',
+            'false'
+        ];
+    }
+    return undefined;
+};
+/**
+ * Pull out every filterable property (enum or boolean valued) as a
+ * `FilterableOption`. Shared between the MCP server (deriving options from a
+ * generator's schema) and the docs filter bar (mapping user-referenced keys
+ * onto their values).
+ */ export const filterableOptionsFromSchema = (schema)=>{
     const props = schema?.properties ?? {};
     const out = [];
-    for (const [key, prop] of Object.entries(props)) {
-        if (!Array.isArray(prop.enum) || prop.enum.length === 0)
-            continue;
+    for (const [key, prop] of Object.entries(props)){
+        const values = filterableValuesForProperty(prop);
+        if (!values) continue;
         out.push({
             key,
-            enum: prop.enum.map((v) => String(v)),
+            enum: values,
             default: prop.default !== undefined ? String(prop.default) : undefined,
-            description: prop.description,
+            description: prop.description
         });
     }
     return out;
 };
-exports.filterableOptionsFromSchema = filterableOptionsFromSchema;
 /**
  * Locate the monorepo's `packages/nx-plugin/generators.json` by walking
  * upward from the caller's directory. Used by the docs filter bar and
  * remark-option-filter; the MCP server resolves schema paths per-generator
  * via `NxGeneratorInfo.resolvedSchemaPath` instead.
- */
-const resolveGeneratorsJson = (fromDir) => {
+ */ export const resolveGeneratorsJson = (fromDir)=>{
     let dir = fromDir;
-    while (true) {
-        const candidate = node_path_1.default.join(dir, 'packages', 'nx-plugin', 'generators.json');
-        if (node_fs_1.default.existsSync(candidate))
-            return candidate;
-        const parent = node_path_1.default.dirname(dir);
-        if (parent === dir)
-            return undefined;
+    while(true){
+        const candidate = path.join(dir, 'packages', 'nx-plugin', 'generators.json');
+        if (fs.existsSync(candidate)) return candidate;
+        const parent = path.dirname(dir);
+        if (parent === dir) return undefined;
         dir = parent;
     }
 };
-exports.resolveGeneratorsJson = resolveGeneratorsJson;
 /**
  * Resolve a generator's schema path against a `generators.json` registry,
  * parse the schema file, and cache the result per-process.
- */
-const createSchemaLookup = (generatorsJsonPath) => {
-    const packageDir = node_path_1.default.dirname(generatorsJsonPath);
+ */ export const createSchemaLookup = (generatorsJsonPath)=>{
+    const packageDir = path.dirname(generatorsJsonPath);
     let registry;
     const cache = new Map();
-    const loadRegistry = () => {
+    const loadRegistry = ()=>{
         if (!registry) {
-            registry = JSON.parse(node_fs_1.default.readFileSync(generatorsJsonPath, 'utf-8'));
+            registry = JSON.parse(fs.readFileSync(generatorsJsonPath, 'utf-8'));
         }
         return registry;
     };
-    return (generatorId) => {
+    return (generatorId)=>{
         const cached = cache.get(generatorId);
-        if (cached)
-            return cached;
+        if (cached) return cached;
         const entry = loadRegistry().generators[generatorId];
         if (!entry) {
             throw new Error(`Unknown generator id '${generatorId}'`);
         }
-        const schema = JSON.parse(node_fs_1.default.readFileSync(node_path_1.default.resolve(packageDir, entry.schema), 'utf-8'));
+        const schema = JSON.parse(fs.readFileSync(path.resolve(packageDir, entry.schema), 'utf-8'));
         cache.set(generatorId, schema);
         return schema;
     };
 };
-exports.createSchemaLookup = createSchemaLookup;
+
 //# sourceMappingURL=schema-registry.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema-registry.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/mcp-server/schema-registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/mcp-server/schema-registry.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport fs from 'node:fs';\nimport path from 'node:path';\n\n/** A JSON-schema property narrowed to the bits we care about. */\ninterface SchemaProperty {\n  type?: string;\n  enum?: unknown[];\n  default?: unknown;\n  description?: string;\n}\n\nexport interface GeneratorSchema {\n  properties?: Record<string, SchemaProperty>;\n  required?: string[];\n}\n\nexport interface FilterableOption {\n  key: string;\n  enum: string[];\n  default?: string;\n  description?: string;\n}\n\ninterface GeneratorsJson {\n  generators: Record<string, { schema: string }>;\n}\n\n/**\n * The values an option can be filtered on: its enum values, or true/false\n * for booleans. Returns undefined for non-filterable options.\n */\nexport const filterableValuesForProperty = (\n  prop: SchemaProperty,\n): string[] | undefined => {\n  if (Array.isArray(prop.enum) && prop.enum.length > 0) {\n    return prop.enum.map((v) => String(v));\n  }\n  if (prop.type === 'boolean') {\n    return ['true', 'false'];\n  }\n  return undefined;\n};\n\n/**\n * Pull out every filterable property (enum or boolean valued) as a\n * `FilterableOption`. Shared between the MCP server (deriving options from a\n * generator's schema) and the docs filter bar (mapping user-referenced keys\n * onto their values).\n */\nexport const filterableOptionsFromSchema = (\n  schema: GeneratorSchema | undefined,\n): FilterableOption[] => {\n  const props = schema?.properties ?? {};\n  const out: FilterableOption[] = [];\n  for (const [key, prop] of Object.entries(props)) {\n    const values = filterableValuesForProperty(prop);\n    if (!values) continue;\n    out.push({\n      key,\n      enum: values,\n      default: prop.default !== undefined ? String(prop.default) : undefined,\n      description: prop.description,\n    });\n  }\n  return out;\n};\n\n/**\n * Locate the monorepo's `packages/nx-plugin/generators.json` by walking\n * upward from the caller's directory. Used by the docs filter bar and\n * remark-option-filter; the MCP server resolves schema paths per-generator\n * via `NxGeneratorInfo.resolvedSchemaPath` instead.\n */\nexport const resolveGeneratorsJson = (fromDir: string): string | undefined => {\n  let dir = fromDir;\n  while (true) {\n    const candidate = path.join(\n      dir,\n      'packages',\n      'nx-plugin',\n      'generators.json',\n    );\n    if (fs.existsSync(candidate)) return candidate;\n    const parent = path.dirname(dir);\n    if (parent === dir) return undefined;\n    dir = parent;\n  }\n};\n\n/**\n * Resolve a generator's schema path against a `generators.json` registry,\n * parse the schema file, and cache the result per-process.\n */\nexport const createSchemaLookup = (generatorsJsonPath: string) => {\n  const packageDir = path.dirname(generatorsJsonPath);\n  let registry: GeneratorsJson | undefined;\n  const cache = new Map<string, GeneratorSchema>();\n\n  const loadRegistry = (): GeneratorsJson => {\n    if (!registry) {\n      registry = JSON.parse(\n        fs.readFileSync(generatorsJsonPath, 'utf-8'),\n      ) as GeneratorsJson;\n    }\n    return registry;\n  };\n\n  return (generatorId: string): GeneratorSchema => {\n    const cached = cache.get(generatorId);\n    if (cached) return cached;\n    const entry = loadRegistry().generators[generatorId];\n    if (!entry) {\n      throw new Error(`Unknown generator id '${generatorId}'`);\n    }\n    const schema = JSON.parse(\n      fs.readFileSync(path.resolve(packageDir, entry.schema), 'utf-8'),\n    ) as GeneratorSchema;\n    cache.set(generatorId, schema);\n    return schema;\n  };\n};\n"],"names":["fs","path","filterableValuesForProperty","prop","Array","isArray","enum","length","map","v","String","type","undefined","filterableOptionsFromSchema","schema","props","properties","out","key","Object","entries","values","push","default","description","resolveGeneratorsJson","fromDir","dir","candidate","join","existsSync","parent","dirname","createSchemaLookup","generatorsJsonPath","packageDir","registry","cache","Map","loadRegistry","JSON","parse","readFileSync","generatorId","cached","get","entry","generators","Error","resolve","set"],"mappings":"AAAA;;;CAGC,GACD,OAAOA,QAAQ,UAAU;AACzB,OAAOC,UAAU,YAAY;AA0B7B;;;CAGC,GACD,OAAO,MAAMC,8BAA8B,CACzCC;IAEA,IAAIC,MAAMC,OAAO,CAACF,KAAKG,IAAI,KAAKH,KAAKG,IAAI,CAACC,MAAM,GAAG,GAAG;QACpD,OAAOJ,KAAKG,IAAI,CAACE,GAAG,CAAC,CAACC,IAAMC,OAAOD;IACrC;IACA,IAAIN,KAAKQ,IAAI,KAAK,WAAW;QAC3B,OAAO;YAAC;YAAQ;SAAQ;IAC1B;IACA,OAAOC;AACT,EAAE;AAEF;;;;;CAKC,GACD,OAAO,MAAMC,8BAA8B,CACzCC;IAEA,MAAMC,QAAQD,QAAQE,cAAc,CAAC;IACrC,MAAMC,MAA0B,EAAE;IAClC,KAAK,MAAM,CAACC,KAAKf,KAAK,IAAIgB,OAAOC,OAAO,CAACL,OAAQ;QAC/C,MAAMM,SAASnB,4BAA4BC;QAC3C,IAAI,CAACkB,QAAQ;QACbJ,IAAIK,IAAI,CAAC;YACPJ;YACAZ,MAAMe;YACNE,SAASpB,KAAKoB,OAAO,KAAKX,YAAYF,OAAOP,KAAKoB,OAAO,IAAIX;YAC7DY,aAAarB,KAAKqB,WAAW;QAC/B;IACF;IACA,OAAOP;AACT,EAAE;AAEF;;;;;CAKC,GACD,OAAO,MAAMQ,wBAAwB,CAACC;IACpC,IAAIC,MAAMD;IACV,MAAO,KAAM;QACX,MAAME,YAAY3B,KAAK4B,IAAI,CACzBF,KACA,YACA,aACA;QAEF,IAAI3B,GAAG8B,UAAU,CAACF,YAAY,OAAOA;QACrC,MAAMG,SAAS9B,KAAK+B,OAAO,CAACL;QAC5B,IAAII,WAAWJ,KAAK,OAAOf;QAC3Be,MAAMI;IACR;AACF,EAAE;AAEF;;;CAGC,GACD,OAAO,MAAME,qBAAqB,CAACC;IACjC,MAAMC,aAAalC,KAAK+B,OAAO,CAACE;IAChC,IAAIE;IACJ,MAAMC,QAAQ,IAAIC;IAElB,MAAMC,eAAe;QACnB,IAAI,CAACH,UAAU;YACbA,WAAWI,KAAKC,KAAK,CACnBzC,GAAG0C,YAAY,CAACR,oBAAoB;QAExC;QACA,OAAOE;IACT;IAEA,OAAO,CAACO;QACN,MAAMC,SAASP,MAAMQ,GAAG,CAACF;QACzB,IAAIC,QAAQ,OAAOA;QACnB,MAAME,QAAQP,eAAeQ,UAAU,CAACJ,YAAY;QACpD,IAAI,CAACG,OAAO;YACV,MAAM,IAAIE,MAAM,CAAC,sBAAsB,EAAEL,YAAY,CAAC,CAAC;QACzD;QACA,MAAM7B,SAAS0B,KAAKC,KAAK,CACvBzC,GAAG0C,YAAY,CAACzC,KAAKgD,OAAO,CAACd,YAAYW,MAAMhC,MAAM,GAAG;QAE1DuB,MAAMa,GAAG,CAACP,aAAa7B;QACvB,OAAOA;IACT;AACF,EAAE"}

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

@@ -6,7 +6,7 @@ import { z } from 'zod';
 export declare const PACKAGE_MANAGERS: readonly ["pnpm", "yarn", "npm", "bun"];
 export declare const PackageManagerSchema: z.ZodEnum<{
     npm: "npm";
-    pnpm: "pnpm";
     yarn: "yarn";
+    pnpm: "pnpm";
     bun: "bun";
 }>;

package/src/mcp-server/schema.js

@@ -1,11 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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_1 = require("zod");
-exports.PACKAGE_MANAGERS = ['pnpm', 'yarn', 'npm', 'bun'];
-exports.PackageManagerSchema = zod_1.z.enum(exports.PACKAGE_MANAGERS);
+ */ import { z } from "zod";
+export const PACKAGE_MANAGERS = [
+    'pnpm',
+    'yarn',
+    'npm',
+    'bun'
+];
+export const PackageManagerSchema = z.enum(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,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"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/mcp-server/schema.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { z } from 'zod';\n\nexport const PACKAGE_MANAGERS = ['pnpm', 'yarn', 'npm', 'bun'] as const;\nexport const PackageManagerSchema = z.enum(PACKAGE_MANAGERS);\n"],"names":["z","PACKAGE_MANAGERS","PackageManagerSchema","enum"],"mappings":"AAAA;;;CAGC,GACD,SAASA,CAAC,QAAQ,MAAM;AAExB,OAAO,MAAMC,mBAAmB;IAAC;IAAQ;IAAQ;IAAO;CAAM,CAAU;AACxE,OAAO,MAAMC,uBAAuBF,EAAEG,IAAI,CAACF,kBAAkB"}

package/src/mcp-server/server.js

@@ -1,26 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServer = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
-const package_json_1 = tslib_1.__importDefault(require("../../package.json"));
-const nx_1 = require("../utils/nx");
-const create_workspace_command_1 = require("./tools/create-workspace-command");
-const general_guidance_1 = require("./tools/general-guidance");
-const generator_guide_1 = require("./tools/generator-guide");
-const list_generators_1 = require("./tools/list-generators");
+ */ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import PackageJson from "../../package.json" with {
+    type: 'json'
+};
+import { listGenerators } from "../utils/nx.js";
+import { addToExistingProjectTool } from "./tools/add-to-existing-project.js";
+import { addCreateWorkspaceCommandTool } from "./tools/create-workspace-command.js";
+import { addGeneralGuidanceTool, TOOL_SELECTION_GUIDE } from "./tools/general-guidance.js";
+import { addGeneratorGuideTool } from "./tools/generator-guide.js";
+import { addListGeneratorsTool } from "./tools/list-generators.js";
+import { addUpgradeWorkspaceTool } from "./tools/upgrade-workspace.js";
 /**
  * Create the MCP Server
- */
-const createServer = () => {
-    const generators = (0, nx_1.listGenerators)();
-    const server = new mcp_js_1.McpServer({
+ */ export const createServer = ()=>{
+    const generators = listGenerators();
+    const server = new McpServer({
         name: 'nx-plugin-for-aws',
-        version: package_json_1.default.version,
+        version: PackageJson.version
     }, {
         instructions: `# Nx Plugin for AWS MCP Server
 
@@ -29,14 +27,16 @@ This server provides resources and tools for quickly scaffolding AWS projects wi
 The Nx Plugin for AWS provides "generators" to add projects or functionality to your workspace. Use this to build the foundations of any project you are building
 on AWS, if the generators apply to your use case.
 
-${general_guidance_1.TOOL_SELECTION_GUIDE}
-`,
+${TOOL_SELECTION_GUIDE}
+`
     });
-    (0, general_guidance_1.addGeneralGuidanceTool)(server, generators);
-    (0, create_workspace_command_1.addCreateWorkspaceCommandTool)(server);
-    (0, list_generators_1.addListGeneratorsTool)(server, generators);
-    (0, generator_guide_1.addGeneratorGuideTool)(server, generators);
+    addGeneralGuidanceTool(server, generators);
+    addCreateWorkspaceCommandTool(server);
+    addListGeneratorsTool(server, generators);
+    addGeneratorGuideTool(server, generators);
+    addToExistingProjectTool(server, generators);
+    addUpgradeWorkspaceTool(server, generators);
     return server;
 };
-exports.createServer = createServer;
+
 //# sourceMappingURL=server.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/mcp-server/server.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,oEAAoE;AACpE,8EAA6C;AAC7C,oCAA6C;AAC7C,+EAAiF;AACjF,+DAGkC;AAClC,6DAAgE;AAChE,6DAAgE;AAEhE;;GAEG;AACI,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,MAAM,UAAU,GAAG,IAAA,mBAAc,GAAE,CAAC;IAEpC,MAAM,MAAM,GAAG,IAAI,kBAAS,CAC1B;QACE,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,sBAAW,CAAC,OAAO;KAC7B,EACD;QACE,YAAY,EAAE;;;;;;;EAOlB,uCAAoB;CACrB;KACI,CACF,CAAC;IAEF,IAAA,yCAAsB,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC3C,IAAA,wDAA6B,EAAC,MAAM,CAAC,CAAC;IACtC,IAAA,uCAAqB,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC1C,IAAA,uCAAqB,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE1C,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA3BW,QAAA,YAAY,gBA2BvB"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/mcp-server/server.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';\nimport PackageJson from '../../package.json' with { type: 'json' };\nimport { listGenerators } from '../utils/nx.js';\nimport { addToExistingProjectTool } from './tools/add-to-existing-project.js';\nimport { addCreateWorkspaceCommandTool } from './tools/create-workspace-command.js';\nimport {\n  addGeneralGuidanceTool,\n  TOOL_SELECTION_GUIDE,\n} from './tools/general-guidance.js';\nimport { addGeneratorGuideTool } from './tools/generator-guide.js';\nimport { addListGeneratorsTool } from './tools/list-generators.js';\nimport { addUpgradeWorkspaceTool } from './tools/upgrade-workspace.js';\n\n/**\n * Create the MCP Server\n */\nexport const createServer = () => {\n  const generators = listGenerators();\n\n  const server = new McpServer(\n    {\n      name: 'nx-plugin-for-aws',\n      version: PackageJson.version,\n    },\n    {\n      instructions: `# Nx Plugin for AWS MCP Server\n\nThis server provides resources and tools for quickly scaffolding AWS projects within an Nx workspace (monorepo), using the Nx Plugin for AWS (@aws/nx-plugin).\n\nThe Nx Plugin for AWS provides \"generators\" to add projects or functionality to your workspace. Use this to build the foundations of any project you are building\non AWS, if the generators apply to your use case.\n\n${TOOL_SELECTION_GUIDE}\n`,\n    },\n  );\n\n  addGeneralGuidanceTool(server, generators);\n  addCreateWorkspaceCommandTool(server);\n  addListGeneratorsTool(server, generators);\n  addGeneratorGuideTool(server, generators);\n  addToExistingProjectTool(server, generators);\n  addUpgradeWorkspaceTool(server, generators);\n\n  return server;\n};\n"],"names":["McpServer","PackageJson","type","listGenerators","addToExistingProjectTool","addCreateWorkspaceCommandTool","addGeneralGuidanceTool","TOOL_SELECTION_GUIDE","addGeneratorGuideTool","addListGeneratorsTool","addUpgradeWorkspaceTool","createServer","generators","server","name","version","instructions"],"mappings":"AAAA;;;CAGC,GACD,SAASA,SAAS,QAAQ,0CAA0C;AACpE,OAAOC,iBAAiB,0BAA0B;IAAEC,MAAM;AAAO,EAAE;AACnE,SAASC,cAAc,QAAQ,iBAAiB;AAChD,SAASC,wBAAwB,QAAQ,qCAAqC;AAC9E,SAASC,6BAA6B,QAAQ,sCAAsC;AACpF,SACEC,sBAAsB,EACtBC,oBAAoB,QACf,8BAA8B;AACrC,SAASC,qBAAqB,QAAQ,6BAA6B;AACnE,SAASC,qBAAqB,QAAQ,6BAA6B;AACnE,SAASC,uBAAuB,QAAQ,+BAA+B;AAEvE;;CAEC,GACD,OAAO,MAAMC,eAAe;IAC1B,MAAMC,aAAaT;IAEnB,MAAMU,SAAS,IAAIb,UACjB;QACEc,MAAM;QACNC,SAASd,YAAYc,OAAO;IAC9B,GACA;QACEC,cAAc,CAAC;;;;;;;AAOrB,EAAET,qBAAqB;AACvB,CAAC;IACG;IAGFD,uBAAuBO,QAAQD;IAC/BP,8BAA8BQ;IAC9BJ,sBAAsBI,QAAQD;IAC9BJ,sBAAsBK,QAAQD;IAC9BR,yBAAyBS,QAAQD;IACjCF,wBAAwBG,QAAQD;IAEhC,OAAOC;AACT,EAAE"}

package/src/mcp-server/tools/add-to-existing-project.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { NxGeneratorInfo } from '../../utils/generators.js';
+/**
+ * Add a tool which guides an agent through adding @aws/nx-plugin to an
+ * existing Nx or non-Nx workspace. Returns the `existing-project` docs page,
+ * which includes the full adoption steps and troubleshooting reference.
+ */
+export declare const addToExistingProjectTool: (server: McpServer, generators: NxGeneratorInfo[]) => void;

package/src/mcp-server/tools/add-to-existing-project.js

@@ -0,0 +1,36 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { fetchGuidePages } from "../generator-info.js";
+import { PackageManagerSchema } from "../schema.js";
+/**
+ * The guide page (under `get_started/`) that backs this tool, so the tool and
+ * the published docs never drift.
+ */ const EXISTING_PROJECT_GUIDE = 'existing-project';
+/**
+ * Add a tool which guides an agent through adding @aws/nx-plugin to an
+ * existing Nx or non-Nx workspace. Returns the `existing-project` docs page,
+ * which includes the full adoption steps and troubleshooting reference.
+ */ export const addToExistingProjectTool = (server, generators)=>{
+    server.registerTool('add-to-existing-project', {
+        title: 'Add to Existing Project',
+        description: 'Tool for adding the Nx Plugin for AWS to an existing Nx workspace or non-Nx monorepo. Use this when a user wants to adopt @aws/nx-plugin in a project that was not created with the plugin preset, or hits configuration errors when running generators in such a workspace.',
+        inputSchema: {
+            packageManager: PackageManagerSchema.optional()
+        }
+    }, async ({ packageManager })=>{
+        const guide = await fetchGuidePages([
+            EXISTING_PROJECT_GUIDE
+        ], generators, packageManager);
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: guide
+                }
+            ]
+        };
+    });
+};
+
+//# sourceMappingURL=add-to-existing-project.js.map

package/src/mcp-server/tools/add-to-existing-project.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/add-to-existing-project.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';\nimport type { NxGeneratorInfo } from '../../utils/generators.js';\nimport { fetchGuidePages } from '../generator-info.js';\nimport { PackageManagerSchema } from '../schema.js';\n\n/**\n * The guide page (under `get_started/`) that backs this tool, so the tool and\n * the published docs never drift.\n */\nconst EXISTING_PROJECT_GUIDE = 'existing-project';\n\n/**\n * Add a tool which guides an agent through adding @aws/nx-plugin to an\n * existing Nx or non-Nx workspace. Returns the `existing-project` docs page,\n * which includes the full adoption steps and troubleshooting reference.\n */\nexport const addToExistingProjectTool = (\n  server: McpServer,\n  generators: NxGeneratorInfo[],\n) => {\n  server.registerTool(\n    'add-to-existing-project',\n    {\n      title: 'Add to Existing Project',\n      description:\n        'Tool for adding the Nx Plugin for AWS to an existing Nx workspace or non-Nx monorepo. Use this when a user wants to adopt @aws/nx-plugin in a project that was not created with the plugin preset, or hits configuration errors when running generators in such a workspace.',\n      inputSchema: {\n        packageManager: PackageManagerSchema.optional(),\n      },\n    },\n    async ({ packageManager }) => {\n      const guide = await fetchGuidePages(\n        [EXISTING_PROJECT_GUIDE],\n        generators,\n        packageManager,\n      );\n      return {\n        content: [\n          {\n            type: 'text' as const,\n            text: guide,\n          },\n        ],\n      };\n    },\n  );\n};\n"],"names":["fetchGuidePages","PackageManagerSchema","EXISTING_PROJECT_GUIDE","addToExistingProjectTool","server","generators","registerTool","title","description","inputSchema","packageManager","optional","guide","content","type","text"],"mappings":"AAAA;;;CAGC,GAGD,SAASA,eAAe,QAAQ,uBAAuB;AACvD,SAASC,oBAAoB,QAAQ,eAAe;AAEpD;;;CAGC,GACD,MAAMC,yBAAyB;AAE/B;;;;CAIC,GACD,OAAO,MAAMC,2BAA2B,CACtCC,QACAC;IAEAD,OAAOE,YAAY,CACjB,2BACA;QACEC,OAAO;QACPC,aACE;QACFC,aAAa;YACXC,gBAAgBT,qBAAqBU,QAAQ;QAC/C;IACF,GACA,OAAO,EAAED,cAAc,EAAE;QACvB,MAAME,QAAQ,MAAMZ,gBAClB;YAACE;SAAuB,EACxBG,YACAK;QAEF,OAAO;YACLG,SAAS;gBACP;oBACEC,MAAM;oBACNC,MAAMH;gBACR;aACD;QACH;IACF;AAEJ,EAAE"}

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

@@ -1,26 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addCreateWorkspaceCommandTool = void 0;
-const commands_1 = require("../../utils/commands");
-const iac_providers_1 = require("../../utils/iac-providers");
-const schema_1 = require("../schema");
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { buildCreateNxWorkspaceCommand } from "../../utils/commands.js";
+import { IAC_PROVIDERS } from "../../utils/iac-providers.js";
+import { PackageManagerSchema } from "../schema.js";
 /**
  * Add a tool which tells a model how to create an Nx workspace
- */
-const addCreateWorkspaceCommandTool = (server) => {
+ */ export const addCreateWorkspaceCommandTool = (server)=>{
     server.registerTool('create-workspace-command', {
         description: 'Tool to discover how to create a workspace to start a new project.',
         inputSchema: {
-            packageManager: schema_1.PackageManagerSchema,
-        },
-    }, ({ packageManager }) => ({
-        content: [
-            {
-                type: 'text',
-                text: `Run the following command to create a workspace:
+            packageManager: PackageManagerSchema
+        }
+    }, ({ packageManager })=>({
+            content: [
+                {
+                    type: 'text',
+                    text: `Run the following command to create a workspace:
 
 \`\`\`bash
-${(0, commands_1.buildCreateNxWorkspaceCommand)(packageManager, '<workspace-name>', undefined, 'next')} --no-interactive
+${buildCreateNxWorkspaceCommand(packageManager, '<workspace-name>')} --no-interactive
 \`\`\`
 
 This will create a new workspace within the \`<workspace-name>\` directory.
@@ -28,20 +27,20 @@ This will create a new workspace within the \`<workspace-name>\` directory.
 If you are already inside an empty directory intended for this project, you can pass \`.\` as the workspace name to create the workspace in the current directory:
 
 \`\`\`bash
-${(0, commands_1.buildCreateNxWorkspaceCommand)(packageManager, '.', undefined, 'next')} --no-interactive
+${buildCreateNxWorkspaceCommand(packageManager, '.')} --no-interactive
 \`\`\`
 
-Note that this will prompt for an Infrastructure as Code provider (${iac_providers_1.IAC_PROVIDERS.join(', ')}).
-If you know the preferred option, pass ${iac_providers_1.IAC_PROVIDERS.map((iac) => `\`--iac=${iac}\``).join(' or ')} to the above command to skip the prompt.
+Note that this will prompt for an Infrastructure as Code provider (${IAC_PROVIDERS.join(', ')}).
+If you know the preferred option, pass ${IAC_PROVIDERS.map((iac)=>`\`--iac=${iac}\``).join(' or ')} to the above command to skip the prompt.
 
 Additional options:
 - \`--no-gitSecrets\`: Opt out of the default git-secrets pre-commit hook (prevents committing AWS credentials)
 
 Refer to the \`general-guidance\` tool for full workspace documentation including structure, common commands, and configuration.
-  `,
-            },
-        ],
-    }));
+  `
+                }
+            ]
+        }));
 };
-exports.addCreateWorkspaceCommandTool = addCreateWorkspaceCommandTool;
+
 //# sourceMappingURL=create-workspace-command.js.map

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,mDAAqE;AACrE,6DAA0D;AAC1D,sCAAiD;AAEjD;;GAEG;AACI,MAAM,6BAA6B,GAAG,CAAC,MAAiB,EAAE,EAAE;IACjE,MAAM,CAAC,YAAY,CACjB,0BAA0B,EAC1B;QACE,WAAW,EACT,oEAAoE;QACtE,WAAW,EAAE;YACX,cAAc,EAAE,6BAAoB;SACrC;KACF,EACD,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;QACvB,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAe;gBACrB,IAAI,EAAE;;;EAGd,IAAA,wCAA6B,EAAC,cAAc,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,CAAC;;;;;;;;EAQpF,IAAA,wCAA6B,EAAC,cAAc,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC;;;qEAGF,6BAAa,CAAC,IAAI,CAAC,IAAI,CAAC;yCACpD,6BAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;;;;;;GAMjG;aACM;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAxCW,QAAA,6BAA6B,iCAwCxC"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/create-workspace-command.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';\nimport { buildCreateNxWorkspaceCommand } from '../../utils/commands.js';\nimport { IAC_PROVIDERS } from '../../utils/iac-providers.js';\nimport { PackageManagerSchema } from '../schema.js';\n\n/**\n * Add a tool which tells a model how to create an Nx workspace\n */\nexport const addCreateWorkspaceCommandTool = (server: McpServer) => {\n  server.registerTool(\n    'create-workspace-command',\n    {\n      description:\n        'Tool to discover how to create a workspace to start a new project.',\n      inputSchema: {\n        packageManager: PackageManagerSchema,\n      },\n    },\n    ({ packageManager }) => ({\n      content: [\n        {\n          type: 'text' as const,\n          text: `Run the following command to create a workspace:\n\n\\`\\`\\`bash\n${buildCreateNxWorkspaceCommand(packageManager, '<workspace-name>')} --no-interactive\n\\`\\`\\`\n\nThis will create a new workspace within the \\`<workspace-name>\\` directory.\n\nIf you are already inside an empty directory intended for this project, you can pass \\`.\\` as the workspace name to create the workspace in the current directory:\n\n\\`\\`\\`bash\n${buildCreateNxWorkspaceCommand(packageManager, '.')} --no-interactive\n\\`\\`\\`\n\nNote that this will prompt for an Infrastructure as Code provider (${IAC_PROVIDERS.join(', ')}).\nIf you know the preferred option, pass ${IAC_PROVIDERS.map((iac) => `\\`--iac=${iac}\\``).join(' or ')} to the above command to skip the prompt.\n\nAdditional options:\n- \\`--no-gitSecrets\\`: Opt out of the default git-secrets pre-commit hook (prevents committing AWS credentials)\n\nRefer to the \\`general-guidance\\` tool for full workspace documentation including structure, common commands, and configuration.\n  `,\n        },\n      ],\n    }),\n  );\n};\n"],"names":["buildCreateNxWorkspaceCommand","IAC_PROVIDERS","PackageManagerSchema","addCreateWorkspaceCommandTool","server","registerTool","description","inputSchema","packageManager","content","type","text","join","map","iac"],"mappings":"AAAA;;;CAGC,GAED,SAASA,6BAA6B,QAAQ,0BAA0B;AACxE,SAASC,aAAa,QAAQ,+BAA+B;AAC7D,SAASC,oBAAoB,QAAQ,eAAe;AAEpD;;CAEC,GACD,OAAO,MAAMC,gCAAgC,CAACC;IAC5CA,OAAOC,YAAY,CACjB,4BACA;QACEC,aACE;QACFC,aAAa;YACXC,gBAAgBN;QAClB;IACF,GACA,CAAC,EAAEM,cAAc,EAAE,GAAM,CAAA;YACvBC,SAAS;gBACP;oBACEC,MAAM;oBACNC,MAAM,CAAC;;;AAGjB,EAAEX,8BAA8BQ,gBAAgB,oBAAoB;;;;;;;;AAQpE,EAAER,8BAA8BQ,gBAAgB,KAAK;;;mEAGc,EAAEP,cAAcW,IAAI,CAAC,MAAM;uCACvD,EAAEX,cAAcY,GAAG,CAAC,CAACC,MAAQ,CAAC,QAAQ,EAAEA,IAAI,EAAE,CAAC,EAAEF,IAAI,CAAC,QAAQ;;;;;;EAMnG,CAAC;gBACK;aACD;QACH,CAAA;AAEJ,EAAE"}

package/src/mcp-server/tools/general-guidance.d.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import type { NxGeneratorInfo } from '../../utils/generators';
-export declare const TOOL_SELECTION_GUIDE = "## Tool Selection Guide\n\n- Use the `general-guidance` tool for guidance and best practices for working with Nx and the Nx Plugin for AWS.\n- Use the `create-workspace-command` tool to discover how to create a workspace to start a new project.\n- Use the `list-generators` tool to discover the available generators and how to run them.\n- Use the `generator-guide` tool to retrieve detailed information about a specific generator.";
+import type { NxGeneratorInfo } from '../../utils/generators.js';
+export declare const TOOL_SELECTION_GUIDE = "## Tool Selection Guide\n\n- Use the `general-guidance` tool for guidance and best practices for working with Nx and the Nx Plugin for AWS.\n- Use the `create-workspace-command` tool to discover how to create a workspace to start a new project.\n- Use the `add-to-existing-project` tool when adding the plugin to an existing Nx workspace or non-Nx monorepo, or when troubleshooting configuration errors in such a workspace.\n- Use the `upgrade-workspace` tool when upgrading Nx or the Nx Plugin for AWS to a newer version.\n- Use the `list-generators` tool to discover the available generators and how to run them.\n- Use the `generator-guide` tool to retrieve detailed information about a specific generator.";
 /**
  * Add a tool which provides general guidance for using Nx and the Nx Plugin for AWS
  */

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

@@ -1,55 +1,56 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addGeneralGuidanceTool = exports.TOOL_SELECTION_GUIDE = void 0;
-const iac_providers_1 = require("../../utils/iac-providers");
-const generator_info_1 = require("../generator-info");
-const schema_1 = require("../schema");
-exports.TOOL_SELECTION_GUIDE = `## Tool Selection Guide
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { IAC_PROVIDERS } from "../../utils/iac-providers.js";
+import { buildNxCommand, fetchGuidePages } from "../generator-info.js";
+import { PACKAGE_MANAGERS } from "../schema.js";
+export const TOOL_SELECTION_GUIDE = `## Tool Selection Guide
 
 - Use the \`general-guidance\` tool for guidance and best practices for working with Nx and the Nx Plugin for AWS.
 - Use the \`create-workspace-command\` tool to discover how to create a workspace to start a new project.
+- Use the \`add-to-existing-project\` tool when adding the plugin to an existing Nx workspace or non-Nx monorepo, or when troubleshooting configuration errors in such a workspace.
+- Use the \`upgrade-workspace\` tool when upgrading Nx or the Nx Plugin for AWS to a newer version.
 - Use the \`list-generators\` tool to discover the available generators and how to run them.
 - Use the \`generator-guide\` tool to retrieve detailed information about a specific generator.`;
 /**
  * Add a tool which provides general guidance for using Nx and the Nx Plugin for AWS
- */
-const addGeneralGuidanceTool = (server, generators) => {
+ */ export const addGeneralGuidanceTool = (server, generators)=>{
     server.registerTool('general-guidance', {
         title: 'General Guidance',
-        description: 'Tool for guidance and best practices for working with Nx and the Nx Plugin for AWS',
-    }, async () => ({
-        content: [
-            {
-                type: 'text',
-                text: `# Nx Plugin for AWS Guidance
+        description: 'Tool for guidance and best practices for working with Nx and the Nx Plugin for AWS'
+    }, async ()=>({
+            content: [
+                {
+                    type: 'text',
+                    text: `# Nx Plugin for AWS Guidance
 
-${exports.TOOL_SELECTION_GUIDE}
+${TOOL_SELECTION_GUIDE}
 
 ## Getting Started
 
-- Choose a package manager first. You can choose between ${schema_1.PACKAGE_MANAGERS.join(', ')}. It's recommended to use "pnpm" if the user has no preference
-- Choose an infrastructure as code (IaC) provider next. You can choose between ${iac_providers_1.IAC_PROVIDERS.join(', ')}. It's recommended to use CDK if the user has no preference
+- Choose a package manager first. You can choose between ${PACKAGE_MANAGERS.join(', ')}. It's recommended to use "pnpm" if the user has no preference
+- Choose an infrastructure as code (IaC) provider next. You can choose between ${IAC_PROVIDERS.join(', ')}. It's recommended to use CDK if the user has no preference
 - Next, you must create an Nx workspace. Use the \`create-workspace-command\` tool for more details, and provide it with your chosen package manager
 - After this, you can start scaffolding the main components of your application using generators. Use the \`list-generators\` tool to discover available generators, and the \`generator-guide\` tool for more detailed information about a specific generator
 
 ## Nx Primer
 
 - Prefix nx commands with the appropriate prefix for your package manager, for example:
-${schema_1.PACKAGE_MANAGERS.map((pm) => (0, generator_info_1.buildNxCommand)('<options>', pm)).join(' - \n')}
+${PACKAGE_MANAGERS.map((pm)=>buildNxCommand('<options>', pm)).join(' - \n')}
 - Each project in your workspace has a file named \`project.json\` which contains important project information such as its name, and defines the "targets" which can be run for that project, for example building or testing the project
 - Use the command \`nx reset\` to reset the Nx daemon when unexpected issues arise
 - After adding dependencies between TypeScript projects, use \`nx sync\` to ensure project references are set up correctly
 
 ## General Instructions
 
-- Workspaces contain a single \`package.json\` file at the root which defines the dependencies for all projects. Therefore when installing dependencies, you must add these to the root workspace using the appropriate command for your package manager:
-  - pnpm add -w -D <package>
-  - yarn add -D <package>
-  - npm install --legacy-peer-deps -D <package>
-  - bun install -D <package>
-  - (Omit -D for production dependencies)
+- Each project declares the third-party runtime dependencies its source imports in its own \`package.json\`; shared build/test tooling (test runners, bundlers, etc.) is declared in the root \`package.json\` \`devDependencies\`. Versions follow a single version policy, recorded in the package manager's dependency catalog where supported (referenced as \`catalog:\`). Install with the appropriate command for your package manager:
+  - Add a project runtime dependency: \`pnpm add <package> --filter <project>\` / \`yarn workspace <project> add <package>\` / \`npm install <package> -w <project>\` / \`bun add <package> --cwd <project-directory>\`
+  - Add a shared dev tool at the root: \`pnpm add -Dw <package>\` / \`yarn add -D <package>\` / \`npm install --legacy-peer-deps -D <package>\` / \`bun install -D <package>\`
+- The \`noUndeclaredDependencies\` lint rule enforces that a project's source only imports packages declared in its own \`package.json\`
+- Projects in the same workspace can import one another directly by package name (eg \`@workspace-name/project-name\`) without declaring a dependency in \`package.json\` — TypeScript path aliases in \`tsconfig.base.json\` resolve these imports
 - When specifying project names as arguments to generators, prefer the _fully qualified_ project name, for example \`@workspace-name/project-name\`. Check the \`project.json\` file for the specific package to find its fully qualified name
 - When no generator exists for a specific framework required, use the base \`ts#project\` and \`py#project\` generators and build on top.
+- Leave the \`--infra\` option at its default value unless the user has explicitly instructed otherwise. Generators choose a sensible default type of infrastructure to deploy the project with, so only override \`--infra\` when the user has specified a particular requirement.
 
 ## Useful Commands
 
@@ -63,18 +64,40 @@ ${schema_1.PACKAGE_MANAGERS.map((pm) => (0, generator_info_1.buildNxCommand)('<o
 - Carefully examine the files that have been generated and always refer back to the generator guide when working in a generated project
 - Generate all projects into the \`packages/\` directory
 - After making changes to your projects, fix linting issues, then run a full build
-- When it's time to start testing a project, suggest to the user that infrastructure is deployed to AWS. For websites, if a runtime-config.json is needed, use the load:runtime-config target after a deployment to point a local website at a sandbox stack.
+- When it's time to start testing a project, suggest to the user that infrastructure is deployed to AWS. For websites, if a runtime-config.json is needed, use the load-runtime-config target after a deployment to point a local website at a sandbox stack.
+- For CDK infrastructure projects, deploy the sandbox stage with the \`deploy-sandbox\` target (eg \`nx deploy-sandbox infra\`) rather than passing a stage pattern to \`deploy\` — it already targets the sandbox stage declared in \`main.ts\`. Likewise \`destroy-sandbox\` tears that stage back down.
+
+## Batching Generators
+
+When scaffolding several projects in one go, chain generators to avoid a slow dependency install after every generator:
+
+- **Chain generators** with \`&&\` in a single command. Pass \`--prefer-install-dependencies=false\` on each generator except the last so dependencies install once at the end, for example:
+
+${PACKAGE_MANAGERS.map((pm)=>`  \`\`\`bash
+  ${buildNxCommand('g @aws/nx-plugin:ts#trpc-api --no-interactive --name=my-app-api --auth=iam --prefer-install-dependencies=false', pm)} && \\
+    ${buildNxCommand('g @aws/nx-plugin:ts#react-website --no-interactive --name=my-app-website --prefer-install-dependencies=false', pm)} && \\
+    ${buildNxCommand('g @aws/nx-plugin:connection --no-interactive --sourceProject=@my-app/my-app-website --targetProject=@my-app/my-app-api --prefer-install-dependencies=false', pm)} && \\
+    ${buildNxCommand('g @aws/nx-plugin:ts#infra --no-interactive --name=infra', pm)} && \\
+    ${buildNxCommand('sync', pm)}
+  \`\`\``).join('\n')}
+
+- **\`--prefer-install-dependencies=false\`** asks a generator to defer its dependency install so the batch installs once at the end (the final generator above omits the flag and installs everything).
+- **\`nx sync\`** is required before building — generators modify TypeScript project references.
 
 ## Detailed Guides
 
 Please refer to the below documentation for important details regarding workspaces and working with TypeScript or Python projects.
 
-${await (0, generator_info_1.fetchGuidePages)(['workspace', 'typescript-project', 'python-project'], generators)}
+${await fetchGuidePages([
+                        'workspace',
+                        'typescript-project',
+                        'python-project'
+                    ], generators)}
 
-    `,
-            },
-        ],
-    }));
+    `
+                }
+            ]
+        }));
 };
-exports.addGeneralGuidanceTool = addGeneralGuidanceTool;
+
 //# sourceMappingURL=general-guidance.js.map