Skip to content

Commit f479459

Browse files
committed
merge: resolve conflicts with upstream/main
Merge upstream policyEngines feature with mcp.json→agentcore.json migration. Update PolicyEnginePrimitive to use readProjectSpec instead of readMcpSpec.
2 parents fc83310 + 4da709b commit f479459

68 files changed

Lines changed: 4603 additions & 1860 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 35 additions & 0 deletions
Loading
Lines changed: 26 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)