feat!: merge mcp.json into agentcore.json by notgitika · Pull Request #605 · aws/agentcore-cli

notgitika · 2026-03-23T17:00:04Z

Description

Merges the separate mcp.json configuration file into agentcore.json as a breaking change. Gateway and MCP tool definitions are now stored alongside the rest of the project spec in a single file, simplifying configuration management.

CDK PR: https://github.com/aws/agentcore-l3-cdk-constructs/pull/99

Key changes:

Removed readMcpSpec() / writeMcpSpec() from ConfigIO; all reads/writes go through readProjectSpec() / writeProjectSpec()
Added agentCoreGateways and mcpRuntimeTools fields to AgentCoreProjectSpecSchema with .default([])
Added extractMcpSpec() helper for backwards-compatible MCP type extraction
Removed getMcpConfigPath() from PathResolver
Updated all primitives, operations, TUI screens, and tests to use the unified spec

Related Issue

Closes#611

Documentation PR

N/A

Type of Change

Testing

How have you tested the change?

I ran npm run test:unit and npm run test:integ
I ran npm run typecheck
I ran npm run lint
If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots

Checklist

I have read the CONTRIBUTING document
I have added any necessary tests that prove my fix is effective or my feature works
I have updated the documentation accordingly
I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
My changes generate no new warnings
Any dependent changes have been merged and published

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the
terms of your choice.

Merge upstream policyEngines feature with mcp.json→agentcore.json migration. Update PolicyEnginePrimitive to use readProjectSpec instead of readMcpSpec.

The vended CDK project reads gateway fields from agentcore.json but the published @aws/agentcore-cdk type doesn't include them yet. Use 'as any' cast for forward-compatibility.

tejaskash · 2026-03-23T23:18:17Z

Code review

Found 4 issues:

Wrong return type format: save function uses { ok: boolean; error?: string } instead of the required { success: Boolean, error?: string } format (AGENTS.md says "Wheverever there is a requirement to use something that returns a success result and an error message you must use this format { success: Boolean, error?:string}")

agentcore-cli/src/cli/tui/screens/schema/McpGuidedEditor.tsx

Lines 73 to 76 in 81e3202

// Wrap save to merge MCP fields back into the full project spec
constsave=async(mcpContent: string): Promise<{ok: boolean;error?: string}>=>{
if(!projectSpec)return{ok: false,error: 'No project spec loaded'};
constmcpData=JSON.parse(mcpContent)asAgentCoreMcpSpec;

Inline type used instead of existing type: { agentCoreGateways: typeof context.projectSpec.agentCoreGateways } should use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> or similar (AGENTS.md says "Always look for existing types before creating a new type inline.")

agentcore-cli/src/cli/commands/deploy/actions.ts

Lines 84 to 86 in 81e3202

// Read project spec for gateway information (used later for deploy step name and outputs)
letmcpSpec: {agentCoreGateways: typeofcontext.projectSpec.agentCoreGateways}|null=null;
try{

Missing uniqueBy validation on new arrays: agentCoreGateways, mcpRuntimeTools, and unassignedTargets are added without .superRefine(uniqueBy(...)), while every other resource array in the schema (agents, memories, credentials, evaluators, onlineEvalConfigs, policyEngines) has this validation. Duplicate names would pass schema validation but fail at deploy time. This same pattern gap was flagged in PR feat: add policy engine and policy support #579 for policyEngines.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

Loss of strict validation for MCP fields: AgentCoreMcpSpecSchema previously had .strict() to reject unknown fields (with a dedicated test "rejects extra fields"). The fields are now embedded in AgentCoreProjectSpecSchema which is not strict, so typos in MCP field names (e.g. agentCoreGatways) will be silently ignored instead of rejected.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

- Use SaveDocumentResult type instead of inline { ok, error } in McpGuidedEditor - Use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> instead of inline type in deploy actions - Add uniqueBy validation to agentCoreGateways, mcpRuntimeTools, unassignedTargets arrays - Add .strict() to AgentCoreProjectSpecSchema to reject unknown fields

notgitika · 2026-03-24T01:29:12Z

Fixed all 4 in ef28a16:

Swapped to SaveDocumentResult type
Using Pick<AgentCoreMcpSpec, 'agentCoreGateways'> now
Added uniqueBy validation on all three MCP arrays
Added .strict() to AgentCoreProjectSpecSchema

tejaskash

All 4 review comments addressed. The ok vs success naming in SaveDocumentResult is a pre-existing issue beyond this PR's scope — can be tracked separately.

…and types Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

…and types (#643) Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

notgitika · 2026-03-23T17:00:04Z

Description

Merges the separate mcp.json configuration file into agentcore.json as a breaking change. Gateway and MCP tool definitions are now stored alongside the rest of the project spec in a single file, simplifying configuration management.

CDK PR: https://github.com/aws/agentcore-l3-cdk-constructs/pull/99

Key changes:

Removed readMcpSpec() / writeMcpSpec() from ConfigIO; all reads/writes go through readProjectSpec() / writeProjectSpec()
Added agentCoreGateways and mcpRuntimeTools fields to AgentCoreProjectSpecSchema with .default([])
Added extractMcpSpec() helper for backwards-compatible MCP type extraction
Removed getMcpConfigPath() from PathResolver
Updated all primitives, operations, TUI screens, and tests to use the unified spec

Related Issue

Closes#611

Documentation PR

N/A

Type of Change

Testing

How have you tested the change?

I ran npm run test:unit and npm run test:integ
I ran npm run typecheck
I ran npm run lint
If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots

Checklist

I have read the CONTRIBUTING document
I have added any necessary tests that prove my fix is effective or my feature works
I have updated the documentation accordingly
I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
My changes generate no new warnings
Any dependent changes have been merged and published

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the
terms of your choice.

Merge upstream policyEngines feature with mcp.json→agentcore.json migration. Update PolicyEnginePrimitive to use readProjectSpec instead of readMcpSpec.

The vended CDK project reads gateway fields from agentcore.json but the published @aws/agentcore-cdk type doesn't include them yet. Use 'as any' cast for forward-compatibility.

tejaskash · 2026-03-23T23:18:17Z

Code review

Found 4 issues:

Wrong return type format: save function uses { ok: boolean; error?: string } instead of the required { success: Boolean, error?: string } format (AGENTS.md says "Wheverever there is a requirement to use something that returns a success result and an error message you must use this format { success: Boolean, error?:string}")

agentcore-cli/src/cli/tui/screens/schema/McpGuidedEditor.tsx

Lines 73 to 76 in 81e3202

// Wrap save to merge MCP fields back into the full project spec
constsave=async(mcpContent: string): Promise<{ok: boolean;error?: string}>=>{
if(!projectSpec)return{ok: false,error: 'No project spec loaded'};
constmcpData=JSON.parse(mcpContent)asAgentCoreMcpSpec;

Inline type used instead of existing type: { agentCoreGateways: typeof context.projectSpec.agentCoreGateways } should use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> or similar (AGENTS.md says "Always look for existing types before creating a new type inline.")

agentcore-cli/src/cli/commands/deploy/actions.ts

Lines 84 to 86 in 81e3202

// Read project spec for gateway information (used later for deploy step name and outputs)
letmcpSpec: {agentCoreGateways: typeofcontext.projectSpec.agentCoreGateways}|null=null;
try{

Missing uniqueBy validation on new arrays: agentCoreGateways, mcpRuntimeTools, and unassignedTargets are added without .superRefine(uniqueBy(...)), while every other resource array in the schema (agents, memories, credentials, evaluators, onlineEvalConfigs, policyEngines) has this validation. Duplicate names would pass schema validation but fail at deploy time. This same pattern gap was flagged in PR feat: add policy engine and policy support #579 for policyEngines.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

Loss of strict validation for MCP fields: AgentCoreMcpSpecSchema previously had .strict() to reject unknown fields (with a dedicated test "rejects extra fields"). The fields are now embedded in AgentCoreProjectSpecSchema which is not strict, so typos in MCP field names (e.g. agentCoreGatways) will be silently ignored instead of rejected.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

- Use SaveDocumentResult type instead of inline { ok, error } in McpGuidedEditor - Use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> instead of inline type in deploy actions - Add uniqueBy validation to agentCoreGateways, mcpRuntimeTools, unassignedTargets arrays - Add .strict() to AgentCoreProjectSpecSchema to reject unknown fields

notgitika · 2026-03-24T01:29:12Z

Fixed all 4 in ef28a16:

Swapped to SaveDocumentResult type
Using Pick<AgentCoreMcpSpec, 'agentCoreGateways'> now
Added uniqueBy validation on all three MCP arrays
Added .strict() to AgentCoreProjectSpecSchema

tejaskash

All 4 review comments addressed. The ok vs success naming in SaveDocumentResult is a pre-existing issue beyond this PR's scope — can be tracked separately.

…and types Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

…and types (#643) Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

notgitika · 2026-03-23T17:00:04Z

Description

Merges the separate mcp.json configuration file into agentcore.json as a breaking change. Gateway and MCP tool definitions are now stored alongside the rest of the project spec in a single file, simplifying configuration management.

CDK PR: https://github.com/aws/agentcore-l3-cdk-constructs/pull/99

Key changes:

Removed readMcpSpec() / writeMcpSpec() from ConfigIO; all reads/writes go through readProjectSpec() / writeProjectSpec()
Added agentCoreGateways and mcpRuntimeTools fields to AgentCoreProjectSpecSchema with .default([])
Added extractMcpSpec() helper for backwards-compatible MCP type extraction
Removed getMcpConfigPath() from PathResolver
Updated all primitives, operations, TUI screens, and tests to use the unified spec

Related Issue

Closes#611

Documentation PR

N/A

Type of Change

Testing

How have you tested the change?

I ran npm run test:unit and npm run test:integ
I ran npm run typecheck
I ran npm run lint
If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots

Checklist

I have read the CONTRIBUTING document
I have added any necessary tests that prove my fix is effective or my feature works
I have updated the documentation accordingly
I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
My changes generate no new warnings
Any dependent changes have been merged and published

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the
terms of your choice.

Merge upstream policyEngines feature with mcp.json→agentcore.json migration. Update PolicyEnginePrimitive to use readProjectSpec instead of readMcpSpec.

The vended CDK project reads gateway fields from agentcore.json but the published @aws/agentcore-cdk type doesn't include them yet. Use 'as any' cast for forward-compatibility.

tejaskash · 2026-03-23T23:18:17Z

Code review

Found 4 issues:

Wrong return type format: save function uses { ok: boolean; error?: string } instead of the required { success: Boolean, error?: string } format (AGENTS.md says "Wheverever there is a requirement to use something that returns a success result and an error message you must use this format { success: Boolean, error?:string}")

agentcore-cli/src/cli/tui/screens/schema/McpGuidedEditor.tsx

Lines 73 to 76 in 81e3202

// Wrap save to merge MCP fields back into the full project spec
constsave=async(mcpContent: string): Promise<{ok: boolean;error?: string}>=>{
if(!projectSpec)return{ok: false,error: 'No project spec loaded'};
constmcpData=JSON.parse(mcpContent)asAgentCoreMcpSpec;

Inline type used instead of existing type: { agentCoreGateways: typeof context.projectSpec.agentCoreGateways } should use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> or similar (AGENTS.md says "Always look for existing types before creating a new type inline.")

agentcore-cli/src/cli/commands/deploy/actions.ts

Lines 84 to 86 in 81e3202

// Read project spec for gateway information (used later for deploy step name and outputs)
letmcpSpec: {agentCoreGateways: typeofcontext.projectSpec.agentCoreGateways}|null=null;
try{

Missing uniqueBy validation on new arrays: agentCoreGateways, mcpRuntimeTools, and unassignedTargets are added without .superRefine(uniqueBy(...)), while every other resource array in the schema (agents, memories, credentials, evaluators, onlineEvalConfigs, policyEngines) has this validation. Duplicate names would pass schema validation but fail at deploy time. This same pattern gap was flagged in PR feat: add policy engine and policy support #579 for policyEngines.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

Loss of strict validation for MCP fields: AgentCoreMcpSpecSchema previously had .strict() to reject unknown fields (with a dedicated test "rejects extra fields"). The fields are now embedded in AgentCoreProjectSpecSchema which is not strict, so typos in MCP field names (e.g. agentCoreGatways) will be silently ignored instead of rejected.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

- Use SaveDocumentResult type instead of inline { ok, error } in McpGuidedEditor - Use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> instead of inline type in deploy actions - Add uniqueBy validation to agentCoreGateways, mcpRuntimeTools, unassignedTargets arrays - Add .strict() to AgentCoreProjectSpecSchema to reject unknown fields

notgitika · 2026-03-24T01:29:12Z

Fixed all 4 in ef28a16:

Swapped to SaveDocumentResult type
Using Pick<AgentCoreMcpSpec, 'agentCoreGateways'> now
Added uniqueBy validation on all three MCP arrays
Added .strict() to AgentCoreProjectSpecSchema

tejaskash

All 4 review comments addressed. The ok vs success naming in SaveDocumentResult is a pre-existing issue beyond this PR's scope — can be tracked separately.

…and types Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

…and types (#643) Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

notgitika · 2026-03-23T17:00:04Z

Description

Merges the separate mcp.json configuration file into agentcore.json as a breaking change. Gateway and MCP tool definitions are now stored alongside the rest of the project spec in a single file, simplifying configuration management.

CDK PR: https://github.com/aws/agentcore-l3-cdk-constructs/pull/99

Key changes:

Removed readMcpSpec() / writeMcpSpec() from ConfigIO; all reads/writes go through readProjectSpec() / writeProjectSpec()
Added agentCoreGateways and mcpRuntimeTools fields to AgentCoreProjectSpecSchema with .default([])
Added extractMcpSpec() helper for backwards-compatible MCP type extraction
Removed getMcpConfigPath() from PathResolver
Updated all primitives, operations, TUI screens, and tests to use the unified spec

Related Issue

Closes#611

Documentation PR

N/A

Type of Change

Testing

How have you tested the change?

I ran npm run test:unit and npm run test:integ
I ran npm run typecheck
I ran npm run lint
If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots

Checklist

I have read the CONTRIBUTING document
I have added any necessary tests that prove my fix is effective or my feature works
I have updated the documentation accordingly
I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
My changes generate no new warnings
Any dependent changes have been merged and published

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the
terms of your choice.

Merge upstream policyEngines feature with mcp.json→agentcore.json migration. Update PolicyEnginePrimitive to use readProjectSpec instead of readMcpSpec.

The vended CDK project reads gateway fields from agentcore.json but the published @aws/agentcore-cdk type doesn't include them yet. Use 'as any' cast for forward-compatibility.

tejaskash · 2026-03-23T23:18:17Z

Code review

Found 4 issues:

Wrong return type format: save function uses { ok: boolean; error?: string } instead of the required { success: Boolean, error?: string } format (AGENTS.md says "Wheverever there is a requirement to use something that returns a success result and an error message you must use this format { success: Boolean, error?:string}")

agentcore-cli/src/cli/tui/screens/schema/McpGuidedEditor.tsx

Lines 73 to 76 in 81e3202

// Wrap save to merge MCP fields back into the full project spec
constsave=async(mcpContent: string): Promise<{ok: boolean;error?: string}>=>{
if(!projectSpec)return{ok: false,error: 'No project spec loaded'};
constmcpData=JSON.parse(mcpContent)asAgentCoreMcpSpec;

Inline type used instead of existing type: { agentCoreGateways: typeof context.projectSpec.agentCoreGateways } should use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> or similar (AGENTS.md says "Always look for existing types before creating a new type inline.")

agentcore-cli/src/cli/commands/deploy/actions.ts

Lines 84 to 86 in 81e3202

// Read project spec for gateway information (used later for deploy step name and outputs)
letmcpSpec: {agentCoreGateways: typeofcontext.projectSpec.agentCoreGateways}|null=null;
try{

Missing uniqueBy validation on new arrays: agentCoreGateways, mcpRuntimeTools, and unassignedTargets are added without .superRefine(uniqueBy(...)), while every other resource array in the schema (agents, memories, credentials, evaluators, onlineEvalConfigs, policyEngines) has this validation. Duplicate names would pass schema validation but fail at deploy time. This same pattern gap was flagged in PR feat: add policy engine and policy support #579 for policyEngines.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

Loss of strict validation for MCP fields: AgentCoreMcpSpecSchema previously had .strict() to reject unknown fields (with a dedicated test "rejects extra fields"). The fields are now embedded in AgentCoreProjectSpecSchema which is not strict, so typos in MCP field names (e.g. agentCoreGatways) will be silently ignored instead of rejected.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

- Use SaveDocumentResult type instead of inline { ok, error } in McpGuidedEditor - Use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> instead of inline type in deploy actions - Add uniqueBy validation to agentCoreGateways, mcpRuntimeTools, unassignedTargets arrays - Add .strict() to AgentCoreProjectSpecSchema to reject unknown fields

notgitika · 2026-03-24T01:29:12Z

Fixed all 4 in ef28a16:

Swapped to SaveDocumentResult type
Using Pick<AgentCoreMcpSpec, 'agentCoreGateways'> now
Added uniqueBy validation on all three MCP arrays
Added .strict() to AgentCoreProjectSpecSchema

tejaskash

All 4 review comments addressed. The ok vs success naming in SaveDocumentResult is a pre-existing issue beyond this PR's scope — can be tracked separately.

…and types Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

…and types (#643) Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

notgitika · 2026-03-23T17:00:04Z

Description

Merges the separate mcp.json configuration file into agentcore.json as a breaking change. Gateway and MCP tool definitions are now stored alongside the rest of the project spec in a single file, simplifying configuration management.

CDK PR: https://github.com/aws/agentcore-l3-cdk-constructs/pull/99

Key changes:

Removed readMcpSpec() / writeMcpSpec() from ConfigIO; all reads/writes go through readProjectSpec() / writeProjectSpec()
Added agentCoreGateways and mcpRuntimeTools fields to AgentCoreProjectSpecSchema with .default([])
Added extractMcpSpec() helper for backwards-compatible MCP type extraction
Removed getMcpConfigPath() from PathResolver
Updated all primitives, operations, TUI screens, and tests to use the unified spec

Related Issue

Closes#611

Documentation PR

N/A

Type of Change

Testing

How have you tested the change?

I ran npm run test:unit and npm run test:integ
I ran npm run typecheck
I ran npm run lint
If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots

Checklist

I have read the CONTRIBUTING document
I have added any necessary tests that prove my fix is effective or my feature works
I have updated the documentation accordingly
I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
My changes generate no new warnings
Any dependent changes have been merged and published

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the
terms of your choice.

Merge upstream policyEngines feature with mcp.json→agentcore.json migration. Update PolicyEnginePrimitive to use readProjectSpec instead of readMcpSpec.

The vended CDK project reads gateway fields from agentcore.json but the published @aws/agentcore-cdk type doesn't include them yet. Use 'as any' cast for forward-compatibility.

tejaskash · 2026-03-23T23:18:17Z

Code review

Found 4 issues:

Wrong return type format: save function uses { ok: boolean; error?: string } instead of the required { success: Boolean, error?: string } format (AGENTS.md says "Wheverever there is a requirement to use something that returns a success result and an error message you must use this format { success: Boolean, error?:string}")

agentcore-cli/src/cli/tui/screens/schema/McpGuidedEditor.tsx

Lines 73 to 76 in 81e3202

// Wrap save to merge MCP fields back into the full project spec
constsave=async(mcpContent: string): Promise<{ok: boolean;error?: string}>=>{
if(!projectSpec)return{ok: false,error: 'No project spec loaded'};
constmcpData=JSON.parse(mcpContent)asAgentCoreMcpSpec;

Inline type used instead of existing type: { agentCoreGateways: typeof context.projectSpec.agentCoreGateways } should use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> or similar (AGENTS.md says "Always look for existing types before creating a new type inline.")

agentcore-cli/src/cli/commands/deploy/actions.ts

Lines 84 to 86 in 81e3202

// Read project spec for gateway information (used later for deploy step name and outputs)
letmcpSpec: {agentCoreGateways: typeofcontext.projectSpec.agentCoreGateways}|null=null;
try{

Missing uniqueBy validation on new arrays: agentCoreGateways, mcpRuntimeTools, and unassignedTargets are added without .superRefine(uniqueBy(...)), while every other resource array in the schema (agents, memories, credentials, evaluators, onlineEvalConfigs, policyEngines) has this validation. Duplicate names would pass schema validation but fail at deploy time. This same pattern gap was flagged in PR feat: add policy engine and policy support #579 for policyEngines.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

Loss of strict validation for MCP fields: AgentCoreMcpSpecSchema previously had .strict() to reject unknown fields (with a dedicated test "rejects extra fields"). The fields are now embedded in AgentCoreProjectSpecSchema which is not strict, so typos in MCP field names (e.g. agentCoreGatways) will be silently ignored instead of rejected.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

- Use SaveDocumentResult type instead of inline { ok, error } in McpGuidedEditor - Use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> instead of inline type in deploy actions - Add uniqueBy validation to agentCoreGateways, mcpRuntimeTools, unassignedTargets arrays - Add .strict() to AgentCoreProjectSpecSchema to reject unknown fields

notgitika · 2026-03-24T01:29:12Z

Fixed all 4 in ef28a16:

Swapped to SaveDocumentResult type
Using Pick<AgentCoreMcpSpec, 'agentCoreGateways'> now
Added uniqueBy validation on all three MCP arrays
Added .strict() to AgentCoreProjectSpecSchema

tejaskash

All 4 review comments addressed. The ok vs success naming in SaveDocumentResult is a pre-existing issue beyond this PR's scope — can be tracked separately.

…and types Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

…and types (#643) Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

notgitika · 2026-03-23T17:00:04Z

Description

Merges the separate mcp.json configuration file into agentcore.json as a breaking change. Gateway and MCP tool definitions are now stored alongside the rest of the project spec in a single file, simplifying configuration management.

CDK PR: https://github.com/aws/agentcore-l3-cdk-constructs/pull/99

Key changes:

Removed readMcpSpec() / writeMcpSpec() from ConfigIO; all reads/writes go through readProjectSpec() / writeProjectSpec()
Added agentCoreGateways and mcpRuntimeTools fields to AgentCoreProjectSpecSchema with .default([])
Added extractMcpSpec() helper for backwards-compatible MCP type extraction
Removed getMcpConfigPath() from PathResolver
Updated all primitives, operations, TUI screens, and tests to use the unified spec

Related Issue

Closes#611

Documentation PR

N/A

Type of Change

Testing

How have you tested the change?

I ran npm run test:unit and npm run test:integ
I ran npm run typecheck
I ran npm run lint
If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots

Checklist

I have read the CONTRIBUTING document
I have added any necessary tests that prove my fix is effective or my feature works
I have updated the documentation accordingly
I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
My changes generate no new warnings
Any dependent changes have been merged and published

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the
terms of your choice.

Merge upstream policyEngines feature with mcp.json→agentcore.json migration. Update PolicyEnginePrimitive to use readProjectSpec instead of readMcpSpec.

The vended CDK project reads gateway fields from agentcore.json but the published @aws/agentcore-cdk type doesn't include them yet. Use 'as any' cast for forward-compatibility.

tejaskash · 2026-03-23T23:18:17Z

Code review

Found 4 issues:

Wrong return type format: save function uses { ok: boolean; error?: string } instead of the required { success: Boolean, error?: string } format (AGENTS.md says "Wheverever there is a requirement to use something that returns a success result and an error message you must use this format { success: Boolean, error?:string}")

agentcore-cli/src/cli/tui/screens/schema/McpGuidedEditor.tsx

Lines 73 to 76 in 81e3202

// Wrap save to merge MCP fields back into the full project spec
constsave=async(mcpContent: string): Promise<{ok: boolean;error?: string}>=>{
if(!projectSpec)return{ok: false,error: 'No project spec loaded'};
constmcpData=JSON.parse(mcpContent)asAgentCoreMcpSpec;

Inline type used instead of existing type: { agentCoreGateways: typeof context.projectSpec.agentCoreGateways } should use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> or similar (AGENTS.md says "Always look for existing types before creating a new type inline.")

agentcore-cli/src/cli/commands/deploy/actions.ts

Lines 84 to 86 in 81e3202

// Read project spec for gateway information (used later for deploy step name and outputs)
letmcpSpec: {agentCoreGateways: typeofcontext.projectSpec.agentCoreGateways}|null=null;
try{

Missing uniqueBy validation on new arrays: agentCoreGateways, mcpRuntimeTools, and unassignedTargets are added without .superRefine(uniqueBy(...)), while every other resource array in the schema (agents, memories, credentials, evaluators, onlineEvalConfigs, policyEngines) has this validation. Duplicate names would pass schema validation but fail at deploy time. This same pattern gap was flagged in PR feat: add policy engine and policy support #579 for policyEngines.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

Loss of strict validation for MCP fields: AgentCoreMcpSpecSchema previously had .strict() to reject unknown fields (with a dedicated test "rejects extra fields"). The fields are now embedded in AgentCoreProjectSpecSchema which is not strict, so typos in MCP field names (e.g. agentCoreGatways) will be silently ignored instead of rejected.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

- Use SaveDocumentResult type instead of inline { ok, error } in McpGuidedEditor - Use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> instead of inline type in deploy actions - Add uniqueBy validation to agentCoreGateways, mcpRuntimeTools, unassignedTargets arrays - Add .strict() to AgentCoreProjectSpecSchema to reject unknown fields

notgitika · 2026-03-24T01:29:12Z

Fixed all 4 in ef28a16:

Swapped to SaveDocumentResult type
Using Pick<AgentCoreMcpSpec, 'agentCoreGateways'> now
Added uniqueBy validation on all three MCP arrays
Added .strict() to AgentCoreProjectSpecSchema

tejaskash

All 4 review comments addressed. The ok vs success naming in SaveDocumentResult is a pre-existing issue beyond this PR's scope — can be tracked separately.

…and types Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

…and types (#643) Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

notgitika · 2026-03-23T17:00:04Z

Description

Merges the separate mcp.json configuration file into agentcore.json as a breaking change. Gateway and MCP tool definitions are now stored alongside the rest of the project spec in a single file, simplifying configuration management.

CDK PR: https://github.com/aws/agentcore-l3-cdk-constructs/pull/99

Key changes:

Removed readMcpSpec() / writeMcpSpec() from ConfigIO; all reads/writes go through readProjectSpec() / writeProjectSpec()
Added agentCoreGateways and mcpRuntimeTools fields to AgentCoreProjectSpecSchema with .default([])
Added extractMcpSpec() helper for backwards-compatible MCP type extraction
Removed getMcpConfigPath() from PathResolver
Updated all primitives, operations, TUI screens, and tests to use the unified spec

Related Issue

Closes#611

Documentation PR

N/A

Type of Change

Testing

How have you tested the change?

I ran npm run test:unit and npm run test:integ
I ran npm run typecheck
I ran npm run lint
If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots

Checklist

I have read the CONTRIBUTING document
I have added any necessary tests that prove my fix is effective or my feature works
I have updated the documentation accordingly
I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
My changes generate no new warnings
Any dependent changes have been merged and published

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the
terms of your choice.

Merge upstream policyEngines feature with mcp.json→agentcore.json migration. Update PolicyEnginePrimitive to use readProjectSpec instead of readMcpSpec.

The vended CDK project reads gateway fields from agentcore.json but the published @aws/agentcore-cdk type doesn't include them yet. Use 'as any' cast for forward-compatibility.

tejaskash · 2026-03-23T23:18:17Z

Code review

Found 4 issues:

Wrong return type format: save function uses { ok: boolean; error?: string } instead of the required { success: Boolean, error?: string } format (AGENTS.md says "Wheverever there is a requirement to use something that returns a success result and an error message you must use this format { success: Boolean, error?:string}")

agentcore-cli/src/cli/tui/screens/schema/McpGuidedEditor.tsx

Lines 73 to 76 in 81e3202

// Wrap save to merge MCP fields back into the full project spec
constsave=async(mcpContent: string): Promise<{ok: boolean;error?: string}>=>{
if(!projectSpec)return{ok: false,error: 'No project spec loaded'};
constmcpData=JSON.parse(mcpContent)asAgentCoreMcpSpec;

Inline type used instead of existing type: { agentCoreGateways: typeof context.projectSpec.agentCoreGateways } should use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> or similar (AGENTS.md says "Always look for existing types before creating a new type inline.")

agentcore-cli/src/cli/commands/deploy/actions.ts

Lines 84 to 86 in 81e3202

// Read project spec for gateway information (used later for deploy step name and outputs)
letmcpSpec: {agentCoreGateways: typeofcontext.projectSpec.agentCoreGateways}|null=null;
try{

Missing uniqueBy validation on new arrays: agentCoreGateways, mcpRuntimeTools, and unassignedTargets are added without .superRefine(uniqueBy(...)), while every other resource array in the schema (agents, memories, credentials, evaluators, onlineEvalConfigs, policyEngines) has this validation. Duplicate names would pass schema validation but fail at deploy time. This same pattern gap was flagged in PR feat: add policy engine and policy support #579 for policyEngines.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

Loss of strict validation for MCP fields: AgentCoreMcpSpecSchema previously had .strict() to reject unknown fields (with a dedicated test "rejects extra fields"). The fields are now embedded in AgentCoreProjectSpecSchema which is not strict, so typos in MCP field names (e.g. agentCoreGatways) will be silently ignored instead of rejected.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

- Use SaveDocumentResult type instead of inline { ok, error } in McpGuidedEditor - Use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> instead of inline type in deploy actions - Add uniqueBy validation to agentCoreGateways, mcpRuntimeTools, unassignedTargets arrays - Add .strict() to AgentCoreProjectSpecSchema to reject unknown fields

notgitika · 2026-03-24T01:29:12Z

Fixed all 4 in ef28a16:

Swapped to SaveDocumentResult type
Using Pick<AgentCoreMcpSpec, 'agentCoreGateways'> now
Added uniqueBy validation on all three MCP arrays
Added .strict() to AgentCoreProjectSpecSchema

tejaskash

All 4 review comments addressed. The ok vs success naming in SaveDocumentResult is a pre-existing issue beyond this PR's scope — can be tracked separately.

…and types Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

…and types (#643) Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

notgitika · 2026-03-23T17:00:04Z

Description

Merges the separate mcp.json configuration file into agentcore.json as a breaking change. Gateway and MCP tool definitions are now stored alongside the rest of the project spec in a single file, simplifying configuration management.

CDK PR: https://github.com/aws/agentcore-l3-cdk-constructs/pull/99

Key changes:

Removed readMcpSpec() / writeMcpSpec() from ConfigIO; all reads/writes go through readProjectSpec() / writeProjectSpec()
Added agentCoreGateways and mcpRuntimeTools fields to AgentCoreProjectSpecSchema with .default([])
Added extractMcpSpec() helper for backwards-compatible MCP type extraction
Removed getMcpConfigPath() from PathResolver
Updated all primitives, operations, TUI screens, and tests to use the unified spec

Related Issue

Closes#611

Documentation PR

N/A

Type of Change

Testing

How have you tested the change?

I ran npm run test:unit and npm run test:integ
I ran npm run typecheck
I ran npm run lint
If I modified src/assets/, I ran npm run test:update-snapshots and committed the updated snapshots

Checklist

I have read the CONTRIBUTING document
I have added any necessary tests that prove my fix is effective or my feature works
I have updated the documentation accordingly
I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
My changes generate no new warnings
Any dependent changes have been merged and published

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the
terms of your choice.

Merge upstream policyEngines feature with mcp.json→agentcore.json migration. Update PolicyEnginePrimitive to use readProjectSpec instead of readMcpSpec.

The vended CDK project reads gateway fields from agentcore.json but the published @aws/agentcore-cdk type doesn't include them yet. Use 'as any' cast for forward-compatibility.

tejaskash · 2026-03-23T23:18:17Z

Code review

Found 4 issues:

Wrong return type format: save function uses { ok: boolean; error?: string } instead of the required { success: Boolean, error?: string } format (AGENTS.md says "Wheverever there is a requirement to use something that returns a success result and an error message you must use this format { success: Boolean, error?:string}")

agentcore-cli/src/cli/tui/screens/schema/McpGuidedEditor.tsx

Lines 73 to 76 in 81e3202

// Wrap save to merge MCP fields back into the full project spec
constsave=async(mcpContent: string): Promise<{ok: boolean;error?: string}>=>{
if(!projectSpec)return{ok: false,error: 'No project spec loaded'};
constmcpData=JSON.parse(mcpContent)asAgentCoreMcpSpec;

Inline type used instead of existing type: { agentCoreGateways: typeof context.projectSpec.agentCoreGateways } should use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> or similar (AGENTS.md says "Always look for existing types before creating a new type inline.")

agentcore-cli/src/cli/commands/deploy/actions.ts

Lines 84 to 86 in 81e3202

// Read project spec for gateway information (used later for deploy step name and outputs)
letmcpSpec: {agentCoreGateways: typeofcontext.projectSpec.agentCoreGateways}|null=null;
try{

Missing uniqueBy validation on new arrays: agentCoreGateways, mcpRuntimeTools, and unassignedTargets are added without .superRefine(uniqueBy(...)), while every other resource array in the schema (agents, memories, credentials, evaluators, onlineEvalConfigs, policyEngines) has this validation. Duplicate names would pass schema validation but fail at deploy time. This same pattern gap was flagged in PR feat: add policy engine and policy support #579 for policyEngines.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

Loss of strict validation for MCP fields: AgentCoreMcpSpecSchema previously had .strict() to reject unknown fields (with a dedicated test "rejects extra fields"). The fields are now embedded in AgentCoreProjectSpecSchema which is not strict, so typos in MCP field names (e.g. agentCoreGatways) will be silently ignored instead of rejected.

agentcore-cli/src/schema/schemas/agentcore-project.ts

Lines 209 to 215 in 81e3202

// MCP / Gateway resources (previously in mcp.json)
agentCoreGateways: z.array(AgentCoreGatewaySchema).default([]),
mcpRuntimeTools: z.array(AgentCoreMcpRuntimeToolSchema).optional(),
unassignedTargets: z.array(AgentCoreGatewayTargetSchema).optional(),

- Use SaveDocumentResult type instead of inline { ok, error } in McpGuidedEditor - Use Pick<AgentCoreMcpSpec, 'agentCoreGateways'> instead of inline type in deploy actions - Add uniqueBy validation to agentCoreGateways, mcpRuntimeTools, unassignedTargets arrays - Add .strict() to AgentCoreProjectSpecSchema to reject unknown fields

notgitika · 2026-03-24T01:29:12Z

Fixed all 4 in ef28a16:

Swapped to SaveDocumentResult type
Using Pick<AgentCoreMcpSpec, 'agentCoreGateways'> now
Added uniqueBy validation on all three MCP arrays
Added .strict() to AgentCoreProjectSpecSchema

tejaskash

All 4 review comments addressed. The ok vs success naming in SaveDocumentResult is a pre-existing issue beyond this PR's scope — can be tracked separately.

…and types Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

…and types (#643) Two fixes: 1. The create flow was dropping requestHeaderAllowlist when building the GenerateConfig from AddAgentConfig. Headers entered through the TUI Advanced settings were collected correctly but never written to agentcore.json because two GenerateConfig construction sites omitted the field. Adds the missing field to useCreateFlow.ts (TUI create path) and create/action.ts (CLI create path). 2. The tag command referenced a missing ./types module and stale readMcpSpec/writeMcpSpec methods removed in the mcp.json merge (#605). Creates the types file and updates gateway tag operations to use the project spec instead.

feat!: merge mcp.json into agentcore.json
fc83310

notgitika requested a review from a teamMarch 23, 2026 17:00

github-actionsBot added the size/xl PR size: XL label Mar 23, 2026

notgitika had a problem deploying to e2e-testing March 23, 2026 17:00 — with GitHub Actions Failure

merge: resolve conflicts with upstream/main
f479459
Merge upstream policyEngines feature with mcp.json→agentcore.json migration. Update PolicyEnginePrimitive to use readProjectSpec instead of readMcpSpec.

notgitika had a problem deploying to e2e-testing March 23, 2026 17:15 — with GitHub Actions Failure

github-actionsBot added size/xl PR size: XL and removed size/xl PR size: XL labels Mar 23, 2026

jesseturner21 marked this pull request as draft March 23, 2026 21:54

fix: use type-safe cast in vended cdk.ts for MCP fields
81e3202
The vended CDK project reads gateway fields from agentcore.json but the published @aws/agentcore-cdk type doesn't include them yet. Use 'as any' cast for forward-compatibility.

github-actionsBot added size/xl PR size: XL and removed size/xl PR size: XL labels Mar 23, 2026

notgitika temporarily deployed to e2e-testing March 23, 2026 22:40 — with GitHub Actions Inactive

notgitika marked this pull request as ready for review March 23, 2026 23:06

github-actionsBot removed the size/xl PR size: XL label Mar 24, 2026

notgitika temporarily deployed to e2e-testing March 24, 2026 01:27 — with GitHub Actions Inactive

github-actionsBot added the size/xl PR size: XL label Mar 24, 2026

tejaskash approved these changes Mar 24, 2026
View reviewed changes

notgitika merged commit 23df9fe into aws:mainMar 24, 2026
18 checks passed

tejaskash mentioned this pull request Mar 25, 2026
fix: pass requestHeaderAllowlist through create flow and fix tag command types #643
Merged
3 tasks