@aws/nx-plugin 0.106.0 → 0.108.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/nx-plugin",
-  "version": "0.106.0",
+  "version": "0.108.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/awslabs/nx-plugin-for-aws.git",
@@ -19,7 +19,7 @@
   },
   "generators": "./generators.json",
   "peerDependencies": {
-    "nx": "22.7.0",
+    "nx": "22.7.1",
     "prettier": "3.8.3"
   },
   "dependencies": {
@@ -28,28 +28,39 @@
     "@hey-api/openapi-ts": "0.64.13",
     "@iarna/toml": "2.2.5",
     "@modelcontextprotocol/sdk": "1.29.0",
-    "@nx/devkit": "22.7.0",
-    "@nx/eslint": "22.7.0",
-    "@nx/js": "22.7.0",
-    "@nx/react": "22.7.0",
-    "@nx/vite": "22.7.0",
+    "@nx/devkit": "22.7.1",
+    "@nx/eslint": "22.7.1",
+    "@nx/js": "22.7.1",
+    "@nx/react": "22.7.1",
+    "@nx/vite": "22.7.1",
+    "@types/estree": "1.0.8",
+    "@types/js-yaml": "4.0.9",
+    "@types/mdast": "4.0.4",
     "@nxlv/python": "22.1.3",
     "@phenomnomnominal/tsquery": "6.2.0",
     "enquirer": "2.4.1",
     "fast-glob": "3.3.3",
+    "js-yaml": "4.1.0",
     "lodash.camelcase": "4.3.0",
     "lodash.clonedeepwith": "4.5.0",
     "lodash.deburr": "4.1.0",
     "lodash.orderby": "4.18.0",
     "lodash.trim": "4.18.0",
     "lodash.uniqby": "4.7.0",
+    "mdast-util-mdx-jsx": "3.2.0",
     "minimatch": "10.2.5",
     "openapi-types": "12.1.3",
     "pip-requirements-js": "1.0.3",
+    "remark-frontmatter": "5.0.0",
+    "remark-mdx": "3.1.1",
+    "remark-parse": "11.0.0",
+    "remark-stringify": "11.0.0",
     "typescript": "6.0.3",
+    "unified": "11.0.5",
+    "unist-util-visit": "5.1.0",
     "vite": "8.0.10",
     "vitest": "4.1.5",
-    "zod": "4.3.6"
+    "zod": "4.4.1"
   },
   "types": "./src/index.d.ts"
 }

package/src/connection/serve-local.js

@@ -16,17 +16,17 @@ const names_1 = require("../utils/names");
 const addTargetToServeLocal = async (tree, sourceProjectName, targetProjectName, options) => {
     const sourceProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, sourceProjectName);
     const targetProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, targetProjectName);
-    // Target project must have a serve target which is continuous
-    if (!(targetProject.targets?.serve?.continuous &&
+    // Target project must have a serve-local target which is continuous
+    if (!(targetProject.targets?.['serve-local']?.continuous &&
         sourceProject.targets?.['serve-local'])) {
         return;
     }
-    // Add a dependency on the serve target
+    // Add a dependency on the serve-local target
     sourceProject.targets['serve-local'].dependsOn = [
         ...(sourceProject.targets['serve-local'].dependsOn ?? []),
         {
             projects: [targetProject.name],
-            target: 'serve',
+            target: 'serve-local',
         },
         ...(options.additionalDependencyTargets ?? []),
     ];

package/src/connection/serve-local.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve-local.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/connection/serve-local.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAIoB;AACpB,sCAA2C;AAC3C,oCAAkE;AAClE,0CAA6C;AAQ7C;;;GAGG;AACI,MAAM,qBAAqB,GAAG,KAAK,EACxC,IAAU,EACV,iBAAyB,EACzB,iBAAyB,EACzB,OAA0B,EAC1B,EAAE;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IAEF,8DAA8D;IAC9D,IACE,CAAC,CACC,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU;QACxC,aAAa,CAAC,OAAO,EAAE,CAAC,aAAa,CAAC,CACvC,EACD,CAAC;QACD,OAAO;IACT,CAAC;IAED,uCAAuC;IACvC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,SAAS,GAAG;QAC/C,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC;QACzD;YACE,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;YAC9B,MAAM,EAAE,OAAO;SAChB;QACD,GAAG,CAAC,OAAO,CAAC,2BAA2B,IAAI,EAAE,CAAC;KAC/C,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAEpE,yFAAyF;IACzF,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAC7C,aAAa,CAAC,IAAI,EAClB,KAAK,EACL,YAAY,EACZ,eAAe,EACf,WAAW,CACZ,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,qBAAqB,EACrB,sFAAsF,SAAS,OAAO,OAAO,CAAC,GAAG,sJAAsJ,SAAS,MAAM,CACvR,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AApDW,QAAA,qBAAqB,yBAoDhC"}
+{"version":3,"file":"serve-local.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/connection/serve-local.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAIoB;AACpB,sCAA2C;AAC3C,oCAAkE;AAClE,0CAA6C;AAQ7C;;;GAGG;AACI,MAAM,qBAAqB,GAAG,KAAK,EACxC,IAAU,EACV,iBAAyB,EACzB,iBAAyB,EACzB,OAA0B,EAC1B,EAAE;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IAEF,oEAAoE;IACpE,IACE,CAAC,CACC,aAAa,CAAC,OAAO,EAAE,CAAC,aAAa,CAAC,EAAE,UAAU;QAClD,aAAa,CAAC,OAAO,EAAE,CAAC,aAAa,CAAC,CACvC,EACD,CAAC;QACD,OAAO;IACT,CAAC;IAED,6CAA6C;IAC7C,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,SAAS,GAAG;QAC/C,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC;QACzD;YACE,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;YAC9B,MAAM,EAAE,aAAa;SACtB;QACD,GAAG,CAAC,OAAO,CAAC,2BAA2B,IAAI,EAAE,CAAC;KAC/C,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAEpE,yFAAyF;IACzF,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAC7C,aAAa,CAAC,IAAI,EAClB,KAAK,EACL,YAAY,EACZ,eAAe,EACf,WAAW,CACZ,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,qBAAqB,EACrB,sFAAsF,SAAS,OAAO,OAAO,CAAC,GAAG,sJAAsJ,SAAS,MAAM,CACvR,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AApDW,QAAA,qBAAqB,yBAoDhC"}

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

@@ -2,7 +2,7 @@
 
 exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `
 {
-  "aws-cdk": "2.1119.0",
+  "aws-cdk": "2.1120.0",
   "aws-cdk-lib": "2.251.0",
   "constructs": "10.6.0",
   "esbuild": "0.28.0",
@@ -13,10 +13,10 @@ exports[`infra generator > should add required dependencies to package.json > de
 exports[`infra generator > should add required dependencies to package.json > dev-dependencies 1`] = `
 {
   "@eslint/js": "^9.8.0",
-  "@nx/eslint": "22.7.0",
-  "@nx/eslint-plugin": "22.7.0",
-  "@nx/js": "22.7.0",
-  "@nx/vitest": "22.7.0",
+  "@nx/eslint": "22.7.1",
+  "@nx/eslint-plugin": "22.7.1",
+  "@nx/js": "22.7.1",
+  "@nx/vitest": "22.7.1",
   "@swc-node/register": "~1.11.1",
   "@swc/core": "~1.15.5",
   "@swc/helpers": "~0.5.18",
@@ -39,7 +39,7 @@ exports[`infra generator > should add required dependencies to package.json > de
 exports[`infra generator > should add required dependencies to package.json > package-json 1`] = `
 {
   "dependencies": {
-    "aws-cdk": "2.1119.0",
+    "aws-cdk": "2.1120.0",
     "aws-cdk-lib": "2.251.0",
     "constructs": "10.6.0",
     "esbuild": "0.28.0",
@@ -47,10 +47,10 @@ exports[`infra generator > should add required dependencies to package.json > pa
   },
   "devDependencies": {
     "@eslint/js": "^9.8.0",
-    "@nx/eslint": "22.7.0",
-    "@nx/eslint-plugin": "22.7.0",
-    "@nx/js": "22.7.0",
-    "@nx/vitest": "22.7.0",
+    "@nx/eslint": "22.7.1",
+    "@nx/eslint-plugin": "22.7.1",
+    "@nx/js": "22.7.1",
+    "@nx/vitest": "22.7.1",
     "@swc-node/register": "~1.11.1",
     "@swc/core": "~1.15.5",
     "@swc/helpers": "~0.5.18",
@@ -84,7 +84,7 @@ exports[`infra generator > should configure Checkov target correctly > checkov-t
     "{workspaceRoot}/dist/{projectRoot}/cdk.out",
   ],
   "options": {
-    "command": "uvx --from checkov==3.2.525 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+    "command": "uvx --from checkov==3.2.526 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
   },
   "outputs": [
     "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -177,7 +177,7 @@ exports[`infra generator > should configure project.json with correct targets >
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
       "options": {
-        "command": "uvx --from checkov==3.2.525 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+        "command": "uvx --from checkov==3.2.526 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -739,7 +739,7 @@ exports[`infra generator > should handle custom project names correctly > custom
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
       "options": {
-        "command": "uvx --from checkov==3.2.525 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+        "command": "uvx --from checkov==3.2.526 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",

package/src/mcp-server/generator-info.d.ts

@@ -1,31 +1,113 @@
 import { NxGeneratorInfo } from '../utils/generators';
-/**
- * Build a command to run nx
- */
-export declare const buildNxCommand: (command: string, pm?: string) => string;
+export { buildNxCommand } from './guide-render';
 /**
  * Render summary information about a generator
  */
 export declare const renderGeneratorInfo: (packageManager: string, info: NxGeneratorInfo) => string;
+export type FilterableOption = import('./schema-registry').FilterableOption;
+/**
+ * Enum properties from the generator's JSON schema — the options a user
+ * could pass on the CLI. Agents use this list to pick `options` values
+ * when calling `generator-guide`.
+ *
+ * Multi-variant generators (e.g. `connection`) layer additional keys on
+ * top via each guide page's `when:` frontmatter — merged in by
+ * `collectFrontmatterFilterableOptions` / `renderFilterableOptionsAsync`.
+ */
+export declare const loadFilterableOptionsFromSchema: (info: NxGeneratorInfo) => FilterableOption[];
+/**
+ * Render the "Filterable options" block that list-generators emits for each
+ * generator. Only keys the guide pages actually branch on are included —
+ * enum properties the schema exposes but no guide filters on are omitted
+ * so agents don't waste tokens setting options that won't affect the
+ * returned content.
+ *
+ * Keys come from two sources:
+ *   - Schema enums, intersected with keys referenced by
+ *     `<OptionFilter when>` / `<TabItem _filter>` across the generator's
+ *     guide pages.
+ *   - Per-page `when:` frontmatter blocks (multi-variant generators like
+ *     `connection`).
+ */
+export declare const renderFilterableOptionsAsync: (info: NxGeneratorInfo) => Promise<string>;
+/**
+ * A guide page after its raw MDX has been fetched and the YAML frontmatter
+ * parsed. The body excludes the frontmatter delimiter; the parsed
+ * `frontmatter.when` predicate drives guide-level filtering.
+ */
+interface FetchedGuide {
+    page: string;
+    raw: string;
+    body: string;
+    frontmatter: {
+        when?: Record<string, string[]>;
+        title?: string;
+    };
+    /** Option keys referenced by `<OptionFilter when>` / `<TabItem _filter>` in the body. */
+    referencedKeys: Set<string>;
+}
+/**
+ * Result of `fetchGuidePagesForGenerator`. When the agent's options pick
+ * a combination no variant page matches, `kind` is `'unsupported'` and
+ * `content` holds an explanatory warning the tool should surface on its
+ * own (without wrapping it in the usual `## <id>` summary). Otherwise
+ * `content` is the rendered guide text.
+ */
+export type GuideFetchResult = {
+    kind: 'ok';
+    content: string;
+} | {
+    kind: 'unsupported';
+    content: string;
+};
+/**
+ * Retrieve the markdown guide pages for a generator.
+ *
+ * Every page listed in `guidePages` (or the kebab-cased generator id when
+ * that field is absent) is fetched in parallel — local files first, GitHub
+ * fallback — and its YAML frontmatter is parsed to pick up any `when:`
+ * predicate. Pages without a `when:` are always included; pages with a
+ * `when:` are included when either:
+ *   - `options` is absent (agent hasn't narrowed yet — keep every variant),
+ *     or
+ *   - the predicate matches `options` using the same semantics as
+ *     `<OptionFilter when={{…}}>` (AND across keys, OR within a key).
+ *
+ * If the agent has supplied enough options to identify a combination and
+ * no variant page matches, the result is `{ kind: 'unsupported' }` and the
+ * caller surfaces the warning directly.
+ */
+export declare const fetchGuidePagesForGenerator: (info: NxGeneratorInfo, generators: NxGeneratorInfo[], packageManager?: string, snippetContentProvider?: SnippetContentProvider, options?: Record<string, string>) => Promise<GuideFetchResult>;
 /**
- * Retrieve the markdown guide pages for a generator from github.
- * If the generator has guidePages in generators.json we fetch all of those, otherwise we
- * try to fetch a guide with the generator name kebab-cased.
+ * Fetch every guide page referenced by a generator, in parallel, and
+ * return { page, raw, body, frontmatter } for each one. Used by both
+ * `fetchGuidePagesForGenerator` (to filter + render) and
+ * `renderFilterableOptionsAsync` (to build the filterable-options list
+ * from the union of frontmatter `when:` keys).
  */
-export declare const fetchGuidePagesForGenerator: (info: NxGeneratorInfo, generators: NxGeneratorInfo[], packageManager?: string, snippetContentProvider?: SnippetContentProvider) => Promise<string>;
+export declare const fetchGuideFrontmatters: (info: NxGeneratorInfo) => Promise<FetchedGuide[]>;
 /**
- * Fetch markdown guide pages from github
+ * Fetch markdown guide pages. Prefers local files (see `fetchLocalGuide`)
+ * and falls back to fetching from the repo on `main` when no local copy
+ * is available.
  */
-export declare const fetchGuidePages: (guidePages: string[], generators: NxGeneratorInfo[], packageManager?: string, snippetContentProvider?: SnippetContentProvider) => Promise<string>;
+export declare const fetchGuidePages: (guidePages: string[], generators: NxGeneratorInfo[], packageManager?: string, snippetContentProvider?: SnippetContentProvider, options?: Record<string, string>) => Promise<string>;
 /**
  * A function which retrieves snippet content given a snippet name.
  */
 export type SnippetContentProvider = (snippetName: string) => Promise<string> | string;
 /**
- * Fetch a snippet's content from github
+ * Fetch a snippet's content. Tries the local repo checkout first (when
+ * running under `mcp-inspect` or a linked test workspace) before falling
+ * back to the copy on `main`.
  */
 export declare const fetchSnippet: SnippetContentProvider;
 /**
- * Post-process a guide page to "inline" relevant components
+ * Post-process a guide page. Thin wrapper around the unified/remark-mdx
+ * pipeline in `guide-pipeline.ts` — the real work (snippet inlining,
+ * OptionFilter/Infrastructure/TabItem filtering, command/schema rendering)
+ * happens there. Kept under the same name so other packages
+ * (e.g. the docs site's `markdown-content.astro`) can continue importing
+ * `postProcessGuide` with the same signature.
  */
-export declare const postProcessGuide: (guide: string, generators: NxGeneratorInfo[], packageManager?: string, snippetContentProvider?: SnippetContentProvider) => Promise<string>;
+export declare const postProcessGuide: (guide: string, generators: NxGeneratorInfo[], packageManager?: string, snippetContentProvider?: SnippetContentProvider, options?: Record<string, string>) => Promise<string>;