refactor(schema): rename agentName to runtimeName in MCP bindings and make type optional

- Rename `agentName` to `runtimeName` in McpRuntimeBindingSchema and
  all consuming code (attach.ts, llm-compacted types, JSON schema)
- Make `type: "AgentCoreRuntime"` optional on AgentEnvSpec for backward
  compatibility; stop emitting it in new runtime configs
- Update tests to match new schema shape

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: jesseturner21

schemas/agentcore.schema.v1.json

@@ -1256,7 +1256,7 @@
             "items": {
               "type": "object",
               "properties": {
-                "agentName": {
+                "runtimeName": {
                   "type": "string",
                   "minLength": 1
                 },
@@ -1267,7 +1267,7 @@
                   "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
                 }
               },
-              "required": ["agentName", "envVarName"],
+              "required": ["runtimeName", "envVarName"],
               "additionalProperties": false
             }
           }

src/cli/operations/agent/generate/__tests__/schema-mapper.test.ts

@@ -101,7 +101,7 @@ describe('mapModelProviderToCredentials', () => {
 });
 
 describe('mapGenerateConfigToAgent', () => {
-  it('creates AgentCoreRuntime agent spec', () => {
+  it('creates agent spec', () => {
     const result = mapGenerateConfigToAgent(baseConfig);
     expect(result.name).toBe('TestProject');
     expect(result.build).toBe('CodeZip');

src/cli/operations/attach.ts

@@ -76,7 +76,7 @@ export async function getGateways(): Promise<string[]> {
 // ─────────────────────────────────────────────────────────────────────────────
 
 export interface BindMcpRuntimeConfig {
-  agentName: string;
+  runtimeName: string;
   envVarName: string;
 }
 
@@ -87,11 +87,11 @@ export interface BindMcpRuntimeConfig {
 export async function bindMcpRuntimeToAgent(mcpRuntimeName: string, config: BindMcpRuntimeConfig): Promise<void> {
   const configIO = new ConfigIO();
 
-  // Validate the agent exists
+  // Validate the runtime exists
   const project = await configIO.readProjectSpec();
-  const agent = project.runtimes.find(a => a.name === config.agentName);
+  const agent = project.runtimes.find(a => a.name === config.runtimeName);
   if (!agent) {
-    throw new Error(`Agent "${config.agentName}" not found.`);
+    throw new Error(`Runtime "${config.runtimeName}" not found.`);
   }
 
   // Find the MCP runtime tool
@@ -104,12 +104,12 @@ export async function bindMcpRuntimeToAgent(mcpRuntimeName: string, config: Bind
   runtimeTool.bindings ??= [];
 
   // Check if already bound
-  if (runtimeTool.bindings.some(b => b.agentName === config.agentName)) {
-    throw new Error(`Agent "${config.agentName}" is already bound to MCP runtime "${mcpRuntimeName}".`);
+  if (runtimeTool.bindings.some(b => b.runtimeName === config.runtimeName)) {
+    throw new Error(`Runtime "${config.runtimeName}" is already bound to MCP runtime "${mcpRuntimeName}".`);
   }
 
   const binding: McpRuntimeBinding = {
-    agentName: config.agentName,
+    runtimeName: config.runtimeName,
     envVarName: config.envVarName,
   };
 

src/schema/llm-compacted/mcp.ts

@@ -85,12 +85,12 @@ interface AgentCoreMcpRuntimeTool {
 }
 
 /**
- * Binding from an MCP runtime tool to an agent.
+ * Binding from an MCP runtime tool to a runtime.
  * When present, the agent is granted InvokeAgentRuntime permission
  * and receives the runtime ARN in the specified environment variable.
  */
 interface McpRuntimeBinding {
-  agentName: string; // @min 1 - name of the agent from spec.runtimes array
+  runtimeName: string; // @min 1 - name of the runtime from spec.runtimes array
   envVarName: string; // @regex ^[A-Za-z_][A-Za-z0-9_]*$ @max 255 - env var for runtime ARN
 }
 

src/schema/schemas/__tests__/mcp.test.ts

@@ -508,7 +508,7 @@ describe('AgentCoreMcpRuntimeToolSchema', () => {
   it('accepts tool with bindings', () => {
     const result = AgentCoreMcpRuntimeToolSchema.safeParse({
       ...validTool,
-      bindings: [{ agentName: 'Agent1', envVarName: 'TOOL_ARN' }],
+      bindings: [{ runtimeName: 'Agent1', envVarName: 'TOOL_ARN' }],
     });
     expect(result.success).toBe(true);
   });

src/schema/schemas/mcp.ts

@@ -616,13 +616,13 @@ export type AgentCoreGateway = z.infer<typeof AgentCoreGatewaySchema>;
 // ============================================================================
 
 /**
- * Binding from an MCP runtime tool to an agent.
- * When present, the agent is granted InvokeAgentRuntime permission
+ * Binding from an MCP runtime tool to a runtime.
+ * When present, the runtime is granted InvokeAgentRuntime permission
  * and receives the runtime ARN in the specified environment variable.
  */
 export const McpRuntimeBindingSchema = z
   .object({
-    agentName: z.string().min(1),
+    runtimeName: z.string().min(1),
     envVarName: EnvVarNameSchema,
   })
   .strict();