Skip to content

Commit 75c808b

Browse files
committed
fix: removed old types and function definitoins causing build error
1 parent fe509bd commit 75c808b

7 files changed

Lines changed: 41 additions & 42 deletions

File tree

src/cli/commands/create/command.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { ModelProvider, SDKFramework, TargetLanguage } from '../../../schem
33
import { getErrorMessage } from '../../errors';
44
import { COMMAND_DESCRIPTIONS } from '../../tui/copy';
55
import { CreateScreen } from '../../tui/screens/create';
6-
import { createProject, createProjectWithAgent, getDryRunInfo, type ProgressCallback } from './action';
6+
import { type ProgressCallback, createProject, createProjectWithAgent, getDryRunInfo } from './action';
77
import type { CreateOptions } from './types';
88
import { validateCreateOptions } from './validate';
99
import type { Command } from '@commander-js/extra-typings';

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

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -120,56 +120,50 @@ export function mapGenerateConfigToResources(config: GenerateConfig): GenerateCo
120120
}
121121

122122
/**
123-
* Compute the default env var name for a memory.
123+
* Compute the memory env var name for a memory resource.
124+
* Pattern: MEMORY_{NAME}_ID (matches CDK construct pattern)
124125
*/
125126
function computeMemoryEnvVarName(memoryName: string): string {
126-
return `AGENTCORE_MEMORY_${memoryName.toUpperCase()}`;
127+
return `MEMORY_${memoryName.toUpperCase()}_ID`;
127128
}
128129

129130
/**
130131
* Maps memory option to memory providers for template rendering.
131132
*/
132-
function mapMemoryOptionToMemoryProviders(
133-
memory: MemoryOption,
134-
projectName: string
135-
): MemoryProviderRenderConfig[] {
133+
function mapMemoryOptionToMemoryProviders(memory: MemoryOption, projectName: string): MemoryProviderRenderConfig[] {
136134
if (memory === 'none') {
137135
return [];
138136
}
139137

140138
const memoryName = `${projectName}Memory`;
139+
const strategies = mapGenerateInputToMemories(memory, projectName)[0]?.strategies ?? [];
140+
141141
return [
142142
{
143143
name: memoryName,
144144
envVarName: computeMemoryEnvVarName(memoryName),
145+
strategies: strategies.map(s => s.type),
145146
},
146147
];
147148
}
148149

149150
/**
150-
* Compute the memory env var name for a memory resource.
151-
* Pattern: MEMORY_{NAME}_ID (matches CDK construct pattern)
152-
*/
153-
function computeMemoryEnvVarName(memoryName: string): string {
154-
return `MEMORY_${memoryName.toUpperCase()}_ID`;
155-
}
156-
157-
/**
158-
* Maps memory option to memory providers for template rendering.
151+
* Maps model provider to identity providers for template rendering.
152+
* Bedrock uses IAM, so no identity provider is needed.
159153
*/
160-
function mapMemoryOptionToMemoryProviders(memory: MemoryOption, projectName: string): MemoryProviderRenderConfig[] {
161-
if (memory === 'none') {
154+
function mapModelProviderToIdentityProviders(
155+
modelProvider: ModelProvider,
156+
projectName: string
157+
): IdentityProviderRenderConfig[] {
158+
if (modelProvider === 'Bedrock') {
162159
return [];
163160
}
164161

165-
const memoryName = `${projectName}Memory`;
166-
const strategies = mapGenerateInputToMemories(memory, projectName)[0]?.strategies ?? [];
167-
162+
const credentialName = computeCredentialName(projectName, modelProvider);
168163
return [
169164
{
170-
name: memoryName,
171-
envVarName: computeMemoryEnvVarName(memoryName),
172-
strategies: strategies.map(s => s.type),
165+
name: credentialName,
166+
envVarName: computeDefaultCredentialEnvVarName(credentialName),
173167
},
174168
];
175169
}
@@ -191,6 +185,5 @@ export function mapGenerateConfigToRenderConfig(config: GenerateConfig, actualPr
191185
hasIdentity: config.modelProvider !== 'Bedrock',
192186
memoryProviders: mapMemoryOptionToMemoryProviders(config.memory, config.projectName),
193187
identityProviders: mapModelProviderToIdentityProviders(config.modelProvider, projectNameForCredentials),
194-
memoryProviders: mapMemoryOptionToMemoryProviders(config.memory, config.projectName),
195188
};
196189
}

src/cli/templates/types.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
import type { MemoryStrategyType, ModelProvider, SDKFramework, TargetLanguage } from '../../schema';
22

3-
/**
4-
* Memory provider config for template rendering.
5-
*/
6-
export interface MemoryProviderRenderConfig {
7-
name: string;
8-
envVarName: string;
9-
}
103
/**
114
* Identity provider info for template rendering.
125
*/
@@ -36,9 +29,8 @@ export interface AgentRenderConfig {
3629
modelProvider: ModelProvider;
3730
hasMemory: boolean;
3831
hasIdentity: boolean;
32+
/** Memory providers for template rendering */
3933
memoryProviders: MemoryProviderRenderConfig[];
4034
/** Identity providers for template rendering (maps to credentials in schema) */
4135
identityProviders: IdentityProviderRenderConfig[];
42-
/** Memory providers for template rendering */
43-
memoryProviders: MemoryProviderRenderConfig[];
4436
}

src/cli/tui/App.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,13 @@ function AppContent() {
139139
}
140140

141141
if (route.name === 'add') {
142-
return <AddFlow isInteractive={true} onExit={() => setRoute({ name: 'help' })} onDeploy={() => setRoute({ name: 'deploy' })} />;
142+
return (
143+
<AddFlow
144+
isInteractive={true}
145+
onExit={() => setRoute({ name: 'help' })}
146+
onDeploy={() => setRoute({ name: 'deploy' })}
147+
/>
148+
);
143149
}
144150

145151
if (route.name === 'remove') {

src/cli/tui/screens/create/CreateScreen.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ import { join } from 'path';
2222
import { useCallback, useEffect } from 'react';
2323

2424
/** Build a text representation of the completion screen for terminal output */
25-
function buildExitMessage(
26-
projectName: string,
27-
steps: Step[],
28-
agentConfig: AddAgentConfig | null
29-
): string {
25+
function buildExitMessage(projectName: string, steps: Step[], agentConfig: AddAgentConfig | null): string {
3026
const lines: string[] = [];
3127

3228
// Title

src/cli/tui/screens/mcp/AddGatewayFlow.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ const MODE_OPTIONS: SelectableItem[] = [
4343
{ id: 'bind', title: 'Bind existing gateway', description: 'Attach an existing gateway to an agent' },
4444
];
4545

46-
export function AddGatewayFlow({ isInteractive = true, availableAgents, onExit, onBack, onDeploy }: AddGatewayFlowProps) {
46+
export function AddGatewayFlow({
47+
isInteractive = true,
48+
availableAgents,
49+
onExit,
50+
onBack,
51+
onDeploy,
52+
}: AddGatewayFlowProps) {
4753
const { createGateway, reset: resetCreate } = useCreateGateway();
4854
const { gateways: existingGateways, refresh: refreshGateways } = useExistingGateways();
4955
const [flow, setFlow] = useState<FlowState>({ name: 'mode-select' });

src/cli/tui/screens/mcp/AddMcpToolFlow.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@ const MODE_OPTIONS: SelectableItem[] = [
3535
{ id: 'bind', title: 'Bind existing MCP runtime', description: 'Add an agent to an existing MCP runtime' },
3636
];
3737

38-
export function AddMcpToolFlow({ isInteractive = true, existingAgents, onExit, onBack, onDeploy }: AddMcpToolFlowProps) {
38+
export function AddMcpToolFlow({
39+
isInteractive = true,
40+
existingAgents,
41+
onExit,
42+
onBack,
43+
onDeploy,
44+
}: AddMcpToolFlowProps) {
3945
const { createTool, reset: resetCreate } = useCreateMcpTool();
4046
const { gateways: existingGateways } = useExistingGateways();
4147
const { toolNames: existingToolNames } = useExistingToolNames();

0 commit comments

Comments
 (0)