@aws/nx-plugin 0.99.1 → 0.101.0

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

@@ -9,6 +9,7 @@ exports[`ts#mcp-server generator > should match snapshot for BedrockAgentCoreRun
 "export * from './app.js';
 export * from './checkov.js';
 export * from './runtime-config.js';
+export * from './workspace.js';
 "
 `;
 
@@ -16,7 +17,6 @@ exports[`ts#mcp-server generator > should match snapshot for BedrockAgentCoreRun
 "import { Lazy, Names } from 'aws-cdk-lib';
 import { Platform } from 'aws-cdk-lib/aws-ecr-assets';
 import { Construct } from 'constructs';
-import { execSync } from 'child_process';
 import * as path from 'path';
 import * as url from 'url';
 import {
@@ -27,6 +27,7 @@ import {
 } from '@aws-cdk/aws-bedrock-agentcore-alpha';
 import { IGrantable, IPrincipal, Grant } from 'aws-cdk-lib/aws-iam';
 import { RuntimeConfig } from '../../../core/runtime-config.js';
+import { findWorkspaceRoot } from '../../../core/workspace.js';
 
 export type SnapshotBedrockServerProps = Omit<
   RuntimeProps,
@@ -49,17 +50,16 @@ export class SnapshotBedrockServer extends Construct implements IGrantable {
 
     const rc = RuntimeConfig.ensure(this);
 
-    this.dockerImage = AgentRuntimeArtifact.fromAsset(
-      path.dirname(url.fileURLToPath(new URL(import.meta.url))),
-      {
-        platform: Platform.LINUX_ARM64,
-        extraHash: execSync(
-          \`docker inspect proj-snapshot-bedrock-server:latest --format '{{.Id}}'\`,
-          { encoding: 'utf-8' },
-        ).trim(),
-      },
+    // Resolve the bundle output directory containing the Dockerfile and built artifacts
+    const bundleDir = path.join(
+      findWorkspaceRoot(url.fileURLToPath(new URL(import.meta.url))),
+      'dist/apps/test-project/bundle/mcp/snapshot-bedrock-server',
     );
 
+    this.dockerImage = AgentRuntimeArtifact.fromAsset(bundleDir, {
+      platform: Platform.LINUX_ARM64,
+    });
+
     this.agentCoreRuntime = new Runtime(this, 'SnapshotBedrockServer', {
       runtimeName: Lazy.string({
         produce: () =>

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

@@ -7,7 +7,7 @@ WORKDIR /app
 RUN npm install @aws/aws-distro-opentelemetry-node-autoinstrumentation@<%- adotVersion %>
 
 # Copy bundled streamable http server
-COPY --from=workspace <%- distDir %>/bundle/mcp/<%- name %>/index.js /app
+COPY index.js /app
 
 EXPOSE 8000
 

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

@@ -17,6 +17,7 @@ const npm_scope_1 = require("../../utils/npm-scope");
 const iac_1 = require("../../utils/iac");
 const bundle_1 = require("../../utils/bundle/bundle");
 const port_1 = require("../../utils/port");
+const fs_1 = require("../../utils/fs");
 exports.TS_MCP_SERVER_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 const tsMcpServerGenerator = async (tree, options) => {
     const project = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.project);
@@ -82,12 +83,18 @@ const tsMcpServerGenerator = async (tree, options) => {
             targetFilePath: `${targetSourceDirRelativeToProjectRoot}/http.ts`,
             bundleOutputDir: (0, devkit_1.joinPathFragments)('mcp', name),
         });
+        const dockerOutputDir = (0, devkit_1.joinPathFragments)('dist', project.root, 'bundle', 'mcp', name);
         const dockerTargetName = `${mcpTargetPrefix}-docker`;
+        const fs = new fs_1.FsCommands(tree);
         project.targets[dockerTargetName] = {
             cache: true,
             executor: 'nx:run-commands',
             options: {
-                command: `docker build --platform linux/arm64 -t ${dockerImageTag} ${targetSourceDir} --build-context workspace=.`,
+                commands: [
+                    fs.cp(`${targetSourceDir}/Dockerfile`, `${dockerOutputDir}/Dockerfile`),
+                    `docker build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`,
+                ],
+                parallel: false,
             },
             dependsOn: ['bundle'],
         };
@@ -102,6 +109,7 @@ const tsMcpServerGenerator = async (tree, options) => {
             mcpServerNameClassName,
             projectName: project.name,
             dockerImageTag,
+            dockerOutputDir,
             iacProvider,
             auth,
         });

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":";;;AAAA;;;GAGG;AACH,uCAYoB;AAEpB,uCAMwB;AACxB,iDAAsE;AACtE,+CAA0D;AAC1D,mDAAiE;AACjE,6CAA2D;AAC3D,qEAA0E;AAC1E,mGAA4F;AAE5F,qDAAoD;AACpD,yCAAqD;AACrD,sDAAsE;AACtE,2CAA8C;AAC9C,uCAA4C;AAE/B,QAAA,4BAA4B,GACvC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,oBAAoB,GAAG,KAAK,EACvC,IAAU,EACV,OAAmC,EACP,EAAE;IAC9B,MAAM,OAAO,GAAG,IAAA,wCAAmC,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC;QACnE,MAAM,IAAI,KAAK,CACb,uBAAuB,OAAO,CAAC,OAAO,wDAAwD,CAC/F,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC;IAC7E,MAAM,IAAI,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,IAAI,WAAW,CAAC,CAAC;IACpD,MAAM,sBAAsB,GAAG,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC;IACjD,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;IAC3D,MAAM,oCAAoC,GAAG,IAAA,0BAAiB,EAC5D,KAAK,EACL,eAAe,CAChB,CAAC;IACF,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,OAAO,CAAC,IAAI,EACZ,oCAAoC,CACrC,CAAC;IACF,MAAM,iBAAiB,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;IAC5E,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,yBAAyB,CAAC;IACrE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,KAAK,CAAC;IAEnC,8FAA8F;IAC9F,MAAM,sBAAsB,GAAG,IAAA,0BAAiB,EAC9C,OAAO,CAAC,IAAI,EACZ,cAAc,CACf,CAAC;IACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,EAAE,CAAC;QACzC,0CAA0C;QAC1C,IAAA,kBAAS,EAAC,IAAI,EAAE,sBAAsB,EAAE;YACtC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC;IAED,qFAAqF;IACrF,+DAA+D;IAC/D,0CAA0C;IAC1C,MAAM,GAAG,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;IAErE,+DAA+D;IAC/D,uFAAuF;IACvF,+BAA+B;IAC/B,IAAA,mBAAU,EAAC,IAAI,EAAE,sBAAsB,EAAE,CAAC,GAAG,EAAE,EAAE;QAC/C,GAAG,CAAC,GAAG,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,iBAAiB,WAAW,CAAC;QAChD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,0BAA0B;IAC1B,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,eAAe,EACf;QACE,IAAI;QACJ,GAAG;QACH,OAAO;QACP,WAAW,EACT,sBAAW,CAAC,wDAAwD,CAAC;KACxE,EACD,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IAEF,mBAAmB;IACnB,MAAM,IAAI,GAAG,IAAA,uBAAY,EAAC;QACxB,2BAA2B;QAC3B,KAAK;QACL,SAAS;QACT,mCAAmC;QACnC,+BAA+B;KAChC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,IAAA,uBAAY,EAAC;QAC3B,KAAK;QACL,gBAAgB;QAChB,iCAAiC;KAClC,CAAC,CAAC;IAEH,oCAAoC;IACpC,IAAI,WAAW,KAAK,yBAAyB,EAAE,CAAC;QAC9C,MAAM,cAAc,GAAG,GAAG,IAAA,uBAAW,EAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC;QAE7D,oBAAoB;QACpB,MAAM,IAAA,kCAAyB,EAAC,IAAI,EAAE,OAAO,EAAE;YAC7C,cAAc,EAAE,GAAG,oCAAoC,UAAU;YACjE,eAAe,EAAE,IAAA,0BAAiB,EAAC,KAAK,EAAE,IAAI,CAAC;SAChD,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,MAAM,EACN,OAAO,CAAC,IAAI,EACZ,QAAQ,EACR,KAAK,EACL,IAAI,CACL,CAAC;QACF,MAAM,gBAAgB,GAAG,GAAG,eAAe,SAAS,CAAC;QAErD,MAAM,EAAE,GAAG,IAAI,eAAU,CAAC,IAAI,CAAC,CAAC;QAChC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG;YAClC,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,iBAAiB;YAC3B,OAAO,EAAE;gBACP,QAAQ,EAAE;oBACR,EAAE,CAAC,EAAE,CACH,GAAG,eAAe,aAAa,EAC/B,GAAG,eAAe,aAAa,CAChC;oBACD,0CAA0C,cAAc,IAAI,eAAe,EAAE;iBAC9E;gBACD,QAAQ,EAAE,KAAK;aAChB;YACD,SAAS,EAAE,CAAC,QAAQ,CAAC;SACtB,CAAC;QAEF,IAAA,sCAAiC,EAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QACvE,IAAA,sCAAiC,EAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE9D,wBAAwB;QACxB,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACxE,MAAM,IAAA,6CAAyB,EAAC,IAAI,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QAEvD,6CAA6C;QAC7C,MAAM,IAAA,yCAAiB,EAAC,IAAI,EAAE;YAC5B,sBAAsB,EAAE,IAAI;YAC5B,sBAAsB;YACtB,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,cAAc;YACd,eAAe;YACf,WAAW;YACX,IAAI;SACL,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,0CAA0C;QAC1C,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,IAAA,qCAA4B,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAClD,IAAA,qCAA4B,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC;IAE1E,MAAM,YAAY,GAAG,IAAA,iBAAU,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAErD,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;QAC7C,GAAG,OAAO;QACV,OAAO,EAAE;YACP,GAAG,OAAO,CAAC,OAAO;YAClB,yCAAyC;YACzC,CAAC,GAAG,eAAe,cAAc,CAAC,EAAE;gBAClC,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE;oBACP,QAAQ,EAAE,CAAC,eAAe,iBAAiB,WAAW,CAAC;oBACvD,GAAG,EAAE,eAAe;iBACrB;gBACD,UAAU,EAAE,IAAI;aACjB;YACD,CAAC,GAAG,eAAe,QAAQ,CAAC,EAAE;gBAC5B,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE;oBACP,QAAQ,EAAE,CAAC,eAAe,iBAAiB,UAAU,CAAC;oBACtD,GAAG,EAAE,eAAe;oBACpB,GAAG,EAAE;wBACH,IAAI,EAAE,GAAG,YAAY,EAAE;qBACxB;iBACF;gBACD,UAAU,EAAE,IAAI;aACjB;YACD,CAAC,GAAG,eAAe,cAAc,CAAC,EAAE;gBAClC,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE;oBACP,QAAQ,EAAE,CAAC,eAAe,iBAAiB,UAAU,CAAC;oBACtD,GAAG,EAAE,eAAe;oBACpB,GAAG,EAAE;wBACH,IAAI,EAAE,GAAG,YAAY,EAAE;wBACvB,WAAW,EAAE,MAAM;qBACpB;iBACF;gBACD,UAAU,EAAE,IAAI;aACjB;YACD,CAAC,GAAG,eAAe,UAAU,CAAC,EAAE;gBAC9B,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,gCAAgC,iBAAiB,WAAW;qBAC7D;oBACD,GAAG,EAAE,eAAe;iBACrB;gBACD,UAAU,EAAE,IAAI;aACjB;SACF;KACF,CAAC,CAAC;IAEH,IAAA,kCAA6B,EAC3B,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,oCAA4B,EAC5B,oCAAoC,EACpC,eAAe,EACf;QACE,IAAI,EAAE,YAAY;QAClB,EAAE,EAAE,sBAAsB;QAC1B,IAAI;KACL,CACF,CAAC;IAEF,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,CAAC;AAzNW,QAAA,oBAAoB,wBAyN/B;AAEF,kBAAe,4BAAoB,CAAC"}

package/src/ts/react-website/agui/files/src/components/AguiProvider.tsx.template

@@ -0,0 +1,19 @@
+import { CopilotKitProvider } from '@copilotkit/react-core/v2';
+import '@copilotkit/react-core/v2/styles.css';
+import { type FC, type PropsWithChildren, useMemo } from 'react';
+import type { AbstractAgent } from '@ag-ui/client';
+
+export const AguiProvider: FC<PropsWithChildren> = ({ children }) => {
+  const selfManagedAgents = useMemo<Record<string, AbstractAgent>>(
+    () => ({}),
+    [],
+  );
+
+  return (
+    <CopilotKitProvider selfManagedAgents={selfManagedAgents}>
+      {children}
+    </CopilotKitProvider>
+  );
+};
+
+export default AguiProvider;

package/src/ts/react-website/agui/files/src/hooks/useAgui__agentNameClassName__.tsx.template

@@ -0,0 +1,142 @@
+<%_ if (auth === 'IAM') { _%>
+import { HttpAgent } from '@ag-ui/client';
+import type { AbstractAgent, RunAgentInput } from '@ag-ui/client';
+import { Observable } from 'rxjs';
+import { useMemo } from 'react';
+import { useRuntimeConfig } from './useRuntimeConfig';
+import { useSigV4, type SigV4Client } from './useSigV4';
+<%_ } else if (auth === 'Cognito') { _%>
+import { HttpAgent } from '@ag-ui/client';
+import type { AbstractAgent, RunAgentInput } from '@ag-ui/client';
+import { useMemo } from 'react';
+import { useAuth } from 'react-oidc-context';
+import { useRuntimeConfig } from './useRuntimeConfig';
+<%_ } else { _%>
+import { HttpAgent } from '@ag-ui/client';
+import type { AbstractAgent, RunAgentInput } from '@ag-ui/client';
+import { useMemo } from 'react';
+import { useRuntimeConfig } from './useRuntimeConfig';
+<%_ } _%>
+
+function buildAgentCoreUrl(agentRuntimeArn: string): string {
+  const region = agentRuntimeArn.split(':')[3];
+  return `https://bedrock-agentcore.${region}.amazonaws.com/runtimes/${encodeURIComponent(agentRuntimeArn)}/invocations?qualifier=DEFAULT`;
+}
+
+// AgentCore session ids must be at least 33 characters.
+function agentCoreSessionId(input: RunAgentInput): string {
+  return (input.threadId ?? '').padEnd(33, '0');
+}
+
+<%_ if (auth === 'IAM') { _%>
+class SigV4HttpAgent extends HttpAgent {
+  sigV4Client: SigV4Client;
+
+  constructor(
+    config: ConstructorParameters<typeof HttpAgent>[0],
+    sigV4Client: SigV4Client,
+  ) {
+    super(config);
+    this.sigV4Client = sigV4Client;
+  }
+
+  protected override requestInit(input: RunAgentInput): RequestInit {
+    const init = super.requestInit(input);
+    init.headers = {
+      ...(init.headers as Record<string, string>),
+      'X-Amzn-Bedrock-AgentCore-Runtime-Session-Id': agentCoreSessionId(input),
+    };
+    return init;
+  }
+
+  // Remove this override once https://github.com/ag-ui-protocol/ag-ui/issues/1316 is fixed.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  override run(input: RunAgentInput): any {
+    const sigV4Fetch = this.sigV4Client.fetch as typeof window.fetch;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return new Observable<any>((subscriber) => {
+      const originalFetch = window.fetch;
+      window.fetch = sigV4Fetch;
+      const sub = super.run(input).subscribe(subscriber);
+      window.fetch = originalFetch;
+      return () => sub.unsubscribe();
+    });
+  }
+
+  override clone(): SigV4HttpAgent {
+    const cloned = super.clone() as SigV4HttpAgent;
+    cloned.sigV4Client = this.sigV4Client;
+    return cloned;
+  }
+}
+<%_ } else if (auth === 'Cognito') { _%>
+class CognitoHttpAgent extends HttpAgent {
+  getAccessToken: () => string | undefined;
+
+  constructor(
+    config: ConstructorParameters<typeof HttpAgent>[0],
+    getAccessToken: () => string | undefined,
+  ) {
+    super(config);
+    this.getAccessToken = getAccessToken;
+  }
+
+  protected override requestInit(input: RunAgentInput): RequestInit {
+    const init = super.requestInit(input);
+    const token = this.getAccessToken();
+    init.headers = {
+      ...(init.headers as Record<string, string>),
+      'X-Amzn-Bedrock-AgentCore-Runtime-Session-Id': agentCoreSessionId(input),
+      ...(token ? { Authorization: `Bearer ${token}` } : {}),
+    };
+    return init;
+  }
+
+  override clone(): CognitoHttpAgent {
+    const cloned = super.clone() as CognitoHttpAgent;
+    cloned.getAccessToken = this.getAccessToken;
+    return cloned;
+  }
+}
+<%_ } else { _%>
+class AgentCoreHttpAgent extends HttpAgent {
+  protected override requestInit(input: RunAgentInput): RequestInit {
+    const init = super.requestInit(input);
+    init.headers = {
+      ...(init.headers as Record<string, string>),
+      'X-Amzn-Bedrock-AgentCore-Runtime-Session-Id': agentCoreSessionId(input),
+    };
+    return init;
+  }
+}
+<%_ } _%>
+
+export const useAgui<%= agentNameClassName %> = (): Record<string, AbstractAgent> => {
+  const runtimeConfig = useRuntimeConfig();
+  const agentRuntimeValue = runtimeConfig.agentRuntimes.<%= agentNameClassName %>;
+  <%_ if (auth === 'IAM') { _%>
+  const sigv4 = useSigV4();
+  <%_ } else if (auth === 'Cognito') { _%>
+  const auth = useAuth();
+  <%_ } _%>
+
+  const url = useMemo(
+    () =>
+      agentRuntimeValue.startsWith('arn:')
+        ? buildAgentCoreUrl(agentRuntimeValue)
+        : agentRuntimeValue,
+    [agentRuntimeValue],
+  );
+
+  return useMemo((): Record<string, AbstractAgent> => {
+    <%_ if (auth === 'IAM') { _%>
+    const agent = new SigV4HttpAgent({ url }, sigv4);
+    <%_ } else if (auth === 'Cognito') { _%>
+    const agent = new CognitoHttpAgent({ url }, () => auth.user?.access_token);
+    <%_ } else { _%>
+    const agent = new AgentCoreHttpAgent({ url });
+    <%_ } _%>
+
+    return { '<%= agentName %>': agent };
+  }, [url<% if (auth === 'IAM') { %>, sigv4<% } else if (auth === 'Cognito') { %>, auth<% } %>]);
+};

package/src/ts/react-website/agui/generator.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ProjectConfiguration, Tree } from '@nx/devkit';
+export type AgUiAuth = 'IAM' | 'Cognito' | 'None';
+export interface AgUiReactConnectionOptions {
+    /** The React website project to connect FROM */
+    frontendProjectConfig: ProjectConfiguration;
+    /** The AG-UI agent's exposed name (used as CopilotKit's agent key) */
+    agentName: string;
+    /** PascalCase class name used for component names and runtime config keys */
+    agentNameClassName: string;
+    /** Auth scheme used by the agent */
+    auth: AgUiAuth;
+}
+/**
+ * Wires a React website up to an AG-UI agent using CopilotKit and
+ * @ag-ui/client's HttpAgent. Agent-server-language agnostic.
+ *
+ * On first invocation creates a shared `AguiProvider` component (with an empty
+ * `selfManagedAgents` registry) and wraps `<App />` in it. Each invocation
+ * AST-patches `AguiProvider` to register one more agent hook — running the
+ * generator multiple times is idempotent and additive.
+ */
+export declare const addAgUiReactConnection: (tree: Tree, options: AgUiReactConnectionOptions) => Promise<void>;

package/src/ts/react-website/agui/generator.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addAgUiReactConnection = void 0;
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const devkit_1 = require("@nx/devkit");
+const generator_1 = require("../runtime-config/generator");
+const versions_1 = require("../../../utils/versions");
+const ast_1 = require("../../../utils/ast");
+const agent_runtime_config_1 = require("../../../connection/agent-runtime-config");
+const names_1 = require("../../../utils/names");
+/**
+ * Wires a React website up to an AG-UI agent using CopilotKit and
+ * @ag-ui/client's HttpAgent. Agent-server-language agnostic.
+ *
+ * On first invocation creates a shared `AguiProvider` component (with an empty
+ * `selfManagedAgents` registry) and wraps `<App />` in it. Each invocation
+ * AST-patches `AguiProvider` to register one more agent hook — running the
+ * generator multiple times is idempotent and additive.
+ */
+const addAgUiReactConnection = async (tree, options) => {
+    const { frontendProjectConfig, agentName, agentNameClassName, auth } = options;
+    // Generates `src/components/AguiProvider.tsx` (if absent) and
+    // `src/hooks/useAgui<AgentName>.tsx`. Existing files are kept so re-running
+    // the generator is idempotent.
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), frontendProjectConfig.root, { agentName, agentNameClassName, auth }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    if (auth === 'IAM') {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../../../utils/files/website/hooks/sigv4'), (0, devkit_1.joinPathFragments)(frontendProjectConfig.sourceRoot, 'hooks'), {}, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    }
+    await (0, generator_1.runtimeConfigGenerator)(tree, {
+        project: frontendProjectConfig.name,
+    });
+    // AST-patch AguiProvider to register this agent's hook
+    await registerAgentHookInProvider(tree, frontendProjectConfig, agentNameClassName);
+    // Wrap <App /> in <AguiProvider> in main.tsx (idempotent)
+    const mainTsxPath = (0, devkit_1.joinPathFragments)(frontendProjectConfig.sourceRoot, 'main.tsx');
+    await (0, ast_1.addSingleImport)(tree, mainTsxPath, 'AguiProvider', './components/AguiProvider');
+    await (0, ast_1.applyGritQL)(tree, mainTsxPath, `\`<App />\` => \`<AguiProvider><App /></AguiProvider>\` where { $program <: not contains \`<AguiProvider>$_</AguiProvider>\` }`);
+    (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
+        '@copilotkit/react-core',
+        '@ag-ui/client',
+        ...(auth === 'IAM'
+            ? [
+                'oidc-client-ts',
+                'aws4fetch',
+                '@aws-sdk/credential-providers',
+                'react-oidc-context',
+                'rxjs',
+            ]
+            : []),
+        ...(auth === 'Cognito' ? ['react-oidc-context'] : []),
+    ]), (0, versions_1.withVersions)([...(auth === 'IAM' ? ['@smithy/types'] : [])]));
+    // Agents only publish their runtime ARN to the 'agentcore' namespace by
+    // default, which isn't exposed to the website. Patch the agent's CDK/TF
+    // construct to also publish under 'connection' so the browser can read it
+    // from runtime-config.json.
+    await (0, agent_runtime_config_1.addAgentRuntimeToConnectionNamespace)(tree, {
+        agentNameKebabCase: (0, names_1.kebabCase)(agentNameClassName),
+        agentNameClassName,
+    });
+};
+exports.addAgUiReactConnection = addAgUiReactConnection;
+/**
+ * Register this agent's hook in the shared `AguiProvider` using GritQL AST
+ * patches. The provider starts out with an empty `selfManagedAgents` registry
+ * (from the template); each call appends:
+ *   - `import { useAgui<Name> } from '../hooks/useAgui<Name>';`
+ *   - `const <varName> = useAgui<Name>();` before the `useMemo` call
+ *   - `...<varName>` into the memoised object literal
+ *   - `<varName>` into the `useMemo` deps array
+ *
+ * All steps are guarded so re-running produces byte-identical output.
+ */
+const registerAgentHookInProvider = async (tree, frontendProjectConfig, agentNameClassName) => {
+    const providerPath = (0, devkit_1.joinPathFragments)(frontendProjectConfig.sourceRoot, 'components', 'AguiProvider.tsx');
+    const hookName = `useAgui${agentNameClassName}`;
+    // useAguiStoryAgent -> storyAgentAgents
+    const varName = `${agentNameClassName.charAt(0).toLowerCase()}${agentNameClassName.slice(1)}Agents`;
+    // 1. Add the hook import
+    await (0, ast_1.addDestructuredImport)(tree, providerPath, [hookName], `../hooks/${hookName}`);
+    // 2. Insert `const <varName> = <hookName>();` before the useMemo declaration
+    await (0, ast_1.applyGritQL)(tree, providerPath, `\`const selfManagedAgents = useMemo<Record<string, AbstractAgent>>($body, $deps);\` => ` +
+        `\`const ${varName} = ${hookName}();\nconst selfManagedAgents = useMemo<Record<string, AbstractAgent>>($body, $deps);\` ` +
+        `where { $program <: not contains \`const ${varName} = ${hookName}()\` }`);
+    // 3. Spread `...<varName>` into the memoised object and add `<varName>` to
+    //    the deps array. Branches on `{}`/`[]` vs populated so both the
+    //    first-agent and nth-agent cases produce clean output.
+    await (0, ast_1.applyGritQL)(tree, providerPath, `\`useMemo<Record<string, AbstractAgent>>(() => ($obj), $deps)\` where {` +
+        ` $obj <: not contains \`...${varName}\`,` +
+        ` if ($obj <: \`{}\`) { $obj => \`{ ...${varName} }\` }` +
+        ` else { $obj <: \`{$items}\` where { $items += \`, ...${varName}\` } },` +
+        ` if ($deps <: \`[]\`) { $deps => \`[${varName}]\` }` +
+        ` else { $deps <: \`[$dd]\` where { $dd += \`, ${varName}\` } }` +
+        ` }`);
+};
+//# sourceMappingURL=generator.js.map

package/src/ts/react-website/agui/generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/agui/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAOoB;AACpB,2DAAqE;AACrE,sDAAuD;AACvD,4CAI4B;AAC5B,mFAAgG;AAChG,gDAAiD;AAejD;;;;;;;;GAQG;AACI,MAAM,sBAAsB,GAAG,KAAK,EACzC,IAAU,EACV,OAAmC,EACnC,EAAE;IACF,MAAM,EAAE,qBAAqB,EAAE,SAAS,EAAE,kBAAkB,EAAE,IAAI,EAAE,GAClE,OAAO,CAAC;IAEV,8DAA8D;IAC9D,4EAA4E;IAC5E,+BAA+B;IAC/B,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,qBAAqB,CAAC,IAAI,EAC1B,EAAE,SAAS,EAAE,kBAAkB,EAAE,IAAI,EAAE,EACvC,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IAEF,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACnB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,0CAA0C,CAAC,EACxE,IAAA,0BAAiB,EAAC,qBAAqB,CAAC,UAAU,EAAE,OAAO,CAAC,EAC5D,EAAE,EACF,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IACJ,CAAC;IAED,MAAM,IAAA,kCAAsB,EAAC,IAAI,EAAE;QACjC,OAAO,EAAE,qBAAqB,CAAC,IAAI;KACpC,CAAC,CAAC;IAEH,uDAAuD;IACvD,MAAM,2BAA2B,CAC/B,IAAI,EACJ,qBAAqB,EACrB,kBAAkB,CACnB,CAAC;IAEF,0DAA0D;IAC1D,MAAM,WAAW,GAAG,IAAA,0BAAiB,EACnC,qBAAqB,CAAC,UAAU,EAChC,UAAU,CACX,CAAC;IACF,MAAM,IAAA,qBAAe,EACnB,IAAI,EACJ,WAAW,EACX,cAAc,EACd,2BAA2B,CAC5B,CAAC;IACF,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,WAAW,EACX,gIAAgI,CACjI,CAAC;IAEF,IAAA,qCAA4B,EAC1B,IAAI,EACJ,IAAA,uBAAY,EAAC;QACX,wBAAwB;QACxB,eAAe;QACf,GAAI,CAAC,IAAI,KAAK,KAAK;YACjB,CAAC,CAAC;gBACE,gBAAgB;gBAChB,WAAW;gBACX,+BAA+B;gBAC/B,oBAAoB;gBACpB,MAAM;aACP;YACH,CAAC,CAAC,EAAE,CAAS;QACf,GAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAS;KAC/D,CAAC,EACF,IAAA,uBAAY,EAAC,CAAC,GAAI,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAS,CAAC,CAAC,CACtE,CAAC;IAEF,wEAAwE;IACxE,wEAAwE;IACxE,0EAA0E;IAC1E,4BAA4B;IAC5B,MAAM,IAAA,2DAAoC,EAAC,IAAI,EAAE;QAC/C,kBAAkB,EAAE,IAAA,iBAAS,EAAC,kBAAkB,CAAC;QACjD,kBAAkB;KACnB,CAAC,CAAC;AACL,CAAC,CAAC;AAnFW,QAAA,sBAAsB,0BAmFjC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,2BAA2B,GAAG,KAAK,EACvC,IAAU,EACV,qBAA2C,EAC3C,kBAA0B,EAC1B,EAAE;IACF,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,qBAAqB,CAAC,UAAU,EAChC,YAAY,EACZ,kBAAkB,CACnB,CAAC;IACF,MAAM,QAAQ,GAAG,UAAU,kBAAkB,EAAE,CAAC;IAChD,wCAAwC;IACxC,MAAM,OAAO,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;IAEpG,yBAAyB;IACzB,MAAM,IAAA,2BAAqB,EACzB,IAAI,EACJ,YAAY,EACZ,CAAC,QAAQ,CAAC,EACV,YAAY,QAAQ,EAAE,CACvB,CAAC;IAEF,6EAA6E;IAC7E,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,YAAY,EACZ,yFAAyF;QACvF,WAAW,OAAO,MAAM,QAAQ,yFAAyF;QACzH,4CAA4C,OAAO,MAAM,QAAQ,QAAQ,CAC5E,CAAC;IAEF,2EAA2E;IAC3E,oEAAoE;IACpE,2DAA2D;IAC3D,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,YAAY,EACZ,yEAAyE;QACvE,8BAA8B,OAAO,KAAK;QAC1C,yCAAyC,OAAO,QAAQ;QACxD,yDAAyD,OAAO,SAAS;QACzE,uCAAuC,OAAO,OAAO;QACrD,iDAAiD,OAAO,QAAQ;QAChE,IAAI,CACP,CAAC;AACJ,CAAC,CAAC"}

package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap

@@ -1329,6 +1329,7 @@ exports[`react-website generator > Tanstack router integration > should generate
 export * from './app.js';
 export * from './checkov.js';
 export * from './runtime-config.js';
+export * from './workspace.js';
 "
 `;
 
@@ -1770,6 +1771,29 @@ export class CloudfrontWebAcl extends Stack {
 "
 `;
 
+exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/constructs/src/core/workspace.ts 1`] = `
+"import * as fs from 'fs';
+import * as path from 'path';
+
+/**
+ * Find the workspace root by walking up from the given file path
+ * until we find nx.json (the marker for an Nx workspace root).
+ */
+export const findWorkspaceRoot = (startPath: string): string => {
+  let dir = fs.statSync(startPath).isDirectory()
+    ? startPath
+    : path.dirname(startPath);
+  while (dir !== path.dirname(dir)) {
+    if (fs.existsSync(path.join(dir, 'nx.json'))) {
+      return dir;
+    }
+    dir = path.dirname(dir);
+  }
+  throw new Error(\`Could not find workspace root (nx.json) from \${startPath}\`);
+};
+"
+`;
+
 exports[`react-website generator > Tanstack router integration > should generate website with no router correctly > packages/common/constructs/src/index.ts 1`] = `
 "export * from './app/index.js';
 export * from './core/index.js';
@@ -2925,6 +2949,7 @@ exports[`react-website generator > Tanstack router integration > should generate
 export * from './app.js';
 export * from './checkov.js';
 export * from './runtime-config.js';
+export * from './workspace.js';
 "
 `;
 
@@ -3366,6 +3391,29 @@ export class CloudfrontWebAcl extends Stack {
 "
 `;
 
+exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/constructs/src/core/workspace.ts 1`] = `
+"import * as fs from 'fs';
+import * as path from 'path';
+
+/**
+ * Find the workspace root by walking up from the given file path
+ * until we find nx.json (the marker for an Nx workspace root).
+ */
+export const findWorkspaceRoot = (startPath: string): string => {
+  let dir = fs.statSync(startPath).isDirectory()
+    ? startPath
+    : path.dirname(startPath);
+  while (dir !== path.dirname(dir)) {
+    if (fs.existsSync(path.join(dir, 'nx.json'))) {
+      return dir;
+    }
+    dir = path.dirname(dir);
+  }
+  throw new Error(\`Could not find workspace root (nx.json) from \${startPath}\`);
+};
+"
+`;
+
 exports[`react-website generator > Tanstack router integration > should generate website with router correctly > packages/common/constructs/src/index.ts 1`] = `
 "export * from './app/index.js';
 export * from './core/index.js';
@@ -4588,6 +4636,7 @@ exports[`react-website generator > should generate shared constructs > common/co
 export * from './app.js';
 export * from './checkov.js';
 export * from './runtime-config.js';
+export * from './workspace.js';
 "
 `;
 

package/src/ts/react-website/cognito-auth/__snapshots__/generator.spec.ts.snap

@@ -81,6 +81,7 @@ exports[`cognito-auth generator > should generate files > identity-index 1`] = `
 export * from './app.js';
 export * from './checkov.js';
 export * from './runtime-config.js';
+export * from './workspace.js';
 "
 `;
 
@@ -295,5 +296,6 @@ exports[`cognito-auth generator > should update shared constructs index.ts > com
 export * from './app.js';
 export * from './checkov.js';
 export * from './runtime-config.js';
+export * from './workspace.js';
 "
 `;

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

@@ -10,7 +10,7 @@ WORKDIR /app
 RUN npm install @aws/aws-distro-opentelemetry-node-autoinstrumentation@0.10.0
 
 # Copy bundled agent
-COPY --from=workspace dist/apps/test-project/bundle/agent/snapshot-bedrock-agent/index.js /app
+COPY index.js /app
 
 EXPOSE 8080
 
@@ -24,7 +24,6 @@ exports[`ts#strands-agent generator > should match snapshot for BedrockAgentCore
 "import { Lazy, Names } from 'aws-cdk-lib';
 import { Platform } from 'aws-cdk-lib/aws-ecr-assets';
 import { Construct } from 'constructs';
-import { execSync } from 'child_process';
 import * as path from 'path';
 import * as url from 'url';
 import {
@@ -33,8 +32,14 @@ import {
   Runtime,
   RuntimeProps,
 } from '@aws-cdk/aws-bedrock-agentcore-alpha';
-import { IGrantable, IPrincipal, Grant } from 'aws-cdk-lib/aws-iam';
+import {
+  PolicyStatement,
+  IGrantable,
+  IPrincipal,
+  Grant,
+} from 'aws-cdk-lib/aws-iam';
 import { RuntimeConfig } from '../../../core/runtime-config.js';
+import { findWorkspaceRoot } from '../../../core/workspace.js';
 
 export type SnapshotBedrockAgentProps = Omit<
   RuntimeProps,
@@ -53,17 +58,16 @@ export class SnapshotBedrockAgent extends Construct implements IGrantable {
 
     const rc = RuntimeConfig.ensure(this);
 
-    this.dockerImage = AgentRuntimeArtifact.fromAsset(
-      path.dirname(url.fileURLToPath(new URL(import.meta.url))),
-      {
-        platform: Platform.LINUX_ARM64,
-        extraHash: execSync(
-          \`docker inspect proj-snapshot-bedrock-agent:latest --format '{{.Id}}'\`,
-          { encoding: 'utf-8' },
-        ).trim(),
-      },
+    // Resolve the bundle output directory containing the Dockerfile and built artifacts
+    const bundleDir = path.join(
+      findWorkspaceRoot(url.fileURLToPath(new URL(import.meta.url))),
+      'dist/apps/test-project/bundle/agent/snapshot-bedrock-agent',
     );
 
+    this.dockerImage = AgentRuntimeArtifact.fromAsset(bundleDir, {
+      platform: Platform.LINUX_ARM64,
+    });
+
     this.agentCoreRuntime = new Runtime(this, 'SnapshotBedrockAgent', {
       runtimeName: Lazy.string({
         produce: () =>
@@ -78,6 +82,20 @@ export class SnapshotBedrockAgent extends Construct implements IGrantable {
       },
     });
 
+    // Grant access for the agent to invoke bedrock models
+    this.agentCoreRuntime.addToRolePolicy(
+      new PolicyStatement({
+        actions: [
+          'bedrock:InvokeModel',
+          'bedrock:InvokeModelWithResponseStream',
+        ],
+        resources: [
+          'arn:aws:bedrock:*:*:foundation-model/*',
+          'arn:aws:bedrock:*:*:inference-profile/*',
+        ],
+      }),
+    );
+
     rc.grantReadAppConfig(this.agentCoreRuntime);
 
     rc.set('agentcore', 'agentRuntimes', {
@@ -128,6 +146,7 @@ exports[`ts#strands-agent generator > should match snapshot for BedrockAgentCore
 "export * from './app.js';
 export * from './checkov.js';
 export * from './runtime-config.js';
+export * from './workspace.js';
 "
 `;
 
@@ -177,6 +196,18 @@ module "agent_core_runtime" {
         "appconfig:GetLatestConfiguration"
       ]
       Resource = ["\${module.appconfig.application_arn}/*"]
+    },
+    # Grant access for the agent to invoke bedrock models
+    {
+      Effect = "Allow"
+      Action = [
+        "bedrock:InvokeModel",
+        "bedrock:InvokeModelWithResponseStream"
+      ]
+      Resource = [
+        "arn:aws:bedrock:*:*:foundation-model/*",
+        "arn:aws:bedrock:*:*:inference-profile/*"
+      ]
     }
   ], var.additional_iam_policy_statements)
   tags = var.tags

package/src/ts/strands-agent/files/deploy/Dockerfile.template

@@ -7,7 +7,7 @@ WORKDIR /app
 RUN npm install @aws/aws-distro-opentelemetry-node-autoinstrumentation@<%- adotVersion %>
 
 # Copy bundled agent
-COPY --from=workspace <%- distDir %>/bundle/agent/<%- name %>/index.js /app
+COPY index.js /app
 
 <%_ if (protocol === 'A2A') { _%>
 EXPOSE 9000