From 75c808b44a264f75a6f4cdb09189d3277792a203 Mon Sep 17 00:00:00 2001 From: Tejas Kashinath Date: Fri, 6 Feb 2026 14:44:34 -0500 Subject: [PATCH] fix: removed old types and function definitoins causing build error --- src/cli/commands/create/command.tsx | 2 +- .../agent/generate/schema-mapper.ts | 41 ++++++++----------- src/cli/templates/types.ts | 10 +---- src/cli/tui/App.tsx | 8 +++- src/cli/tui/screens/create/CreateScreen.tsx | 6 +-- src/cli/tui/screens/mcp/AddGatewayFlow.tsx | 8 +++- src/cli/tui/screens/mcp/AddMcpToolFlow.tsx | 8 +++- 7 files changed, 41 insertions(+), 42 deletions(-) diff --git a/src/cli/commands/create/command.tsx b/src/cli/commands/create/command.tsx index 469c03a38..d09c166ac 100644 --- a/src/cli/commands/create/command.tsx +++ b/src/cli/commands/create/command.tsx @@ -3,7 +3,7 @@ import type { ModelProvider, SDKFramework, TargetLanguage } from '../../../schem import { getErrorMessage } from '../../errors'; import { COMMAND_DESCRIPTIONS } from '../../tui/copy'; import { CreateScreen } from '../../tui/screens/create'; -import { createProject, createProjectWithAgent, getDryRunInfo, type ProgressCallback } from './action'; +import { type ProgressCallback, createProject, createProjectWithAgent, getDryRunInfo } from './action'; import type { CreateOptions } from './types'; import { validateCreateOptions } from './validate'; import type { Command } from '@commander-js/extra-typings'; diff --git a/src/cli/operations/agent/generate/schema-mapper.ts b/src/cli/operations/agent/generate/schema-mapper.ts index 2affc06f2..6931129b3 100644 --- a/src/cli/operations/agent/generate/schema-mapper.ts +++ b/src/cli/operations/agent/generate/schema-mapper.ts @@ -120,56 +120,50 @@ export function mapGenerateConfigToResources(config: GenerateConfig): GenerateCo } /** - * Compute the default env var name for a memory. + * Compute the memory env var name for a memory resource. + * Pattern: MEMORY_{NAME}_ID (matches CDK construct pattern) */ function computeMemoryEnvVarName(memoryName: string): string { - return `AGENTCORE_MEMORY_${memoryName.toUpperCase()}`; + return `MEMORY_${memoryName.toUpperCase()}_ID`; } /** * Maps memory option to memory providers for template rendering. */ -function mapMemoryOptionToMemoryProviders( - memory: MemoryOption, - projectName: string -): MemoryProviderRenderConfig[] { +function mapMemoryOptionToMemoryProviders(memory: MemoryOption, projectName: string): MemoryProviderRenderConfig[] { if (memory === 'none') { return []; } const memoryName = `${projectName}Memory`; + const strategies = mapGenerateInputToMemories(memory, projectName)[0]?.strategies ?? []; + return [ { name: memoryName, envVarName: computeMemoryEnvVarName(memoryName), + strategies: strategies.map(s => s.type), }, ]; } /** - * Compute the memory env var name for a memory resource. - * Pattern: MEMORY_{NAME}_ID (matches CDK construct pattern) - */ -function computeMemoryEnvVarName(memoryName: string): string { - return `MEMORY_${memoryName.toUpperCase()}_ID`; -} - -/** - * Maps memory option to memory providers for template rendering. + * Maps model provider to identity providers for template rendering. + * Bedrock uses IAM, so no identity provider is needed. */ -function mapMemoryOptionToMemoryProviders(memory: MemoryOption, projectName: string): MemoryProviderRenderConfig[] { - if (memory === 'none') { +function mapModelProviderToIdentityProviders( + modelProvider: ModelProvider, + projectName: string +): IdentityProviderRenderConfig[] { + if (modelProvider === 'Bedrock') { return []; } - const memoryName = `${projectName}Memory`; - const strategies = mapGenerateInputToMemories(memory, projectName)[0]?.strategies ?? []; - + const credentialName = computeCredentialName(projectName, modelProvider); return [ { - name: memoryName, - envVarName: computeMemoryEnvVarName(memoryName), - strategies: strategies.map(s => s.type), + name: credentialName, + envVarName: computeDefaultCredentialEnvVarName(credentialName), }, ]; } @@ -191,6 +185,5 @@ export function mapGenerateConfigToRenderConfig(config: GenerateConfig, actualPr hasIdentity: config.modelProvider !== 'Bedrock', memoryProviders: mapMemoryOptionToMemoryProviders(config.memory, config.projectName), identityProviders: mapModelProviderToIdentityProviders(config.modelProvider, projectNameForCredentials), - memoryProviders: mapMemoryOptionToMemoryProviders(config.memory, config.projectName), }; } diff --git a/src/cli/templates/types.ts b/src/cli/templates/types.ts index e3814f907..9f0214cfd 100644 --- a/src/cli/templates/types.ts +++ b/src/cli/templates/types.ts @@ -1,12 +1,5 @@ import type { MemoryStrategyType, ModelProvider, SDKFramework, TargetLanguage } from '../../schema'; -/** - * Memory provider config for template rendering. - */ -export interface MemoryProviderRenderConfig { - name: string; - envVarName: string; -} /** * Identity provider info for template rendering. */ @@ -36,9 +29,8 @@ export interface AgentRenderConfig { modelProvider: ModelProvider; hasMemory: boolean; hasIdentity: boolean; + /** Memory providers for template rendering */ memoryProviders: MemoryProviderRenderConfig[]; /** Identity providers for template rendering (maps to credentials in schema) */ identityProviders: IdentityProviderRenderConfig[]; - /** Memory providers for template rendering */ - memoryProviders: MemoryProviderRenderConfig[]; } diff --git a/src/cli/tui/App.tsx b/src/cli/tui/App.tsx index 25c25669d..1b25b4367 100644 --- a/src/cli/tui/App.tsx +++ b/src/cli/tui/App.tsx @@ -139,7 +139,13 @@ function AppContent() { } if (route.name === 'add') { - return setRoute({ name: 'help' })} onDeploy={() => setRoute({ name: 'deploy' })} />; + return ( + setRoute({ name: 'help' })} + onDeploy={() => setRoute({ name: 'deploy' })} + /> + ); } if (route.name === 'remove') { diff --git a/src/cli/tui/screens/create/CreateScreen.tsx b/src/cli/tui/screens/create/CreateScreen.tsx index 91f295a47..b41dc7ad3 100644 --- a/src/cli/tui/screens/create/CreateScreen.tsx +++ b/src/cli/tui/screens/create/CreateScreen.tsx @@ -22,11 +22,7 @@ import { join } from 'path'; import { useCallback, useEffect } from 'react'; /** Build a text representation of the completion screen for terminal output */ -function buildExitMessage( - projectName: string, - steps: Step[], - agentConfig: AddAgentConfig | null -): string { +function buildExitMessage(projectName: string, steps: Step[], agentConfig: AddAgentConfig | null): string { const lines: string[] = []; // Title diff --git a/src/cli/tui/screens/mcp/AddGatewayFlow.tsx b/src/cli/tui/screens/mcp/AddGatewayFlow.tsx index 959e64045..0bee0228f 100644 --- a/src/cli/tui/screens/mcp/AddGatewayFlow.tsx +++ b/src/cli/tui/screens/mcp/AddGatewayFlow.tsx @@ -43,7 +43,13 @@ const MODE_OPTIONS: SelectableItem[] = [ { id: 'bind', title: 'Bind existing gateway', description: 'Attach an existing gateway to an agent' }, ]; -export function AddGatewayFlow({ isInteractive = true, availableAgents, onExit, onBack, onDeploy }: AddGatewayFlowProps) { +export function AddGatewayFlow({ + isInteractive = true, + availableAgents, + onExit, + onBack, + onDeploy, +}: AddGatewayFlowProps) { const { createGateway, reset: resetCreate } = useCreateGateway(); const { gateways: existingGateways, refresh: refreshGateways } = useExistingGateways(); const [flow, setFlow] = useState({ name: 'mode-select' }); diff --git a/src/cli/tui/screens/mcp/AddMcpToolFlow.tsx b/src/cli/tui/screens/mcp/AddMcpToolFlow.tsx index fc67475f2..ad2eb8753 100644 --- a/src/cli/tui/screens/mcp/AddMcpToolFlow.tsx +++ b/src/cli/tui/screens/mcp/AddMcpToolFlow.tsx @@ -35,7 +35,13 @@ const MODE_OPTIONS: SelectableItem[] = [ { id: 'bind', title: 'Bind existing MCP runtime', description: 'Add an agent to an existing MCP runtime' }, ]; -export function AddMcpToolFlow({ isInteractive = true, existingAgents, onExit, onBack, onDeploy }: AddMcpToolFlowProps) { +export function AddMcpToolFlow({ + isInteractive = true, + existingAgents, + onExit, + onBack, + onDeploy, +}: AddMcpToolFlowProps) { const { createTool, reset: resetCreate } = useCreateMcpTool(); const { gateways: existingGateways } = useExistingGateways(); const { toolNames: existingToolNames } = useExistingToolNames();