fix: prefix HTTP gateway names with project name to prevent cross-project collisions

src/cli/operations/deploy/__tests__/post-deploy-http-gateways.test.ts

@@ -139,13 +139,13 @@ describe('setupHttpGateways', () => {
 
  expect(mockCreateHttpGateway).toHaveBeenCalledWith({
  region: 'us-east-1',
- name: 'MyHttpGw',
+ name: 'TestProject-MyHttpGw',
  roleArn: 'arn:aws:iam::123456789012:role/ExistingRole',
  });
  expect(mockCreateHttpGatewayTarget).toHaveBeenCalledWith({
  region: 'us-east-1',
  gatewayId: 'gw-001',
- targetName: 'my-agent',
+ targetName: 'TestProject-my-agent',
  runtimeArn: 'arn:aws:bedrock-agentcore:us-east-1:123456789012:runtime/rt-123',
  });
  });
@@ -175,7 +175,7 @@ describe('setupHttpGateways', () => {
 
  it('finds gateway by name via list (state loss recovery)', async () => {
  mockListAllHttpGateways.mockResolvedValue([
- { name: 'MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
+ { name: 'TestProject-MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
  ]);
 
  const result = await setupHttpGateways({
@@ -190,6 +190,39 @@ describe('setupHttpGateways', () => {
  expect(mockCreateHttpGateway).not.toHaveBeenCalled();
  });
 
+ it('recovers state using legacy (pre-migration) gateway name when prefixed name not found', async () => {
+ // First call: prefixed name "TestProject-MyHttpGw" → not found
+ // Second call: unprefixed legacy name "MyHttpGw" → found
+ mockListAllHttpGateways
+ .mockResolvedValueOnce([])
+ .mockResolvedValueOnce([{ name: 'MyHttpGw', gatewayId: 'gw-legacy', gatewayArn: 'arn:httpgw:legacy' }]);
+
+ const warnSpy = vi.spyOn(console, 'warn').mockReturnValue(undefined);
+
+ const result = await setupHttpGateways({
+ region: 'us-east-1',
+ projectName: 'TestProject',
+ projectSpec: makeProjectSpec([sampleHttpGateway]),
+ deployedResources: sampleDeployedResources,
+ });
+
+ // findHttpGatewayByName was called twice: once for prefixed, once for unprefixed name
+ expect(mockListAllHttpGateways).toHaveBeenCalledTimes(2);
+
+ // Gateway result is skipped (not created)
+ expect(result.results[0]!.status).toBe('skipped');
+ expect(result.results[0]!.gatewayId).toBe('gw-legacy');
+ expect(result.httpGateways.MyHttpGw!.gatewayId).toBe('gw-legacy');
+
+ // createHttpGateway was NOT called
+ expect(mockCreateHttpGateway).not.toHaveBeenCalled();
+
+ // console.warn was called with the pre-migration warning text
+ expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('pre-migration name'));
+
+ warnSpy.mockRestore();
+ });
+
  it('reports error on missing runtime ref', async () => {
  const emptyDeployedResources = {} as unknown as DeployedResourceState;
 

src/cli/operations/deploy/__tests__/preflight.test.ts

@@ -126,6 +126,51 @@ describe('validateProject', () => {
  expect(result.projectSpec.name).toBe('test-project');
  expect(result.isTeardownDeploy).toBe(false);
  });
+
+ it('rejects gateway target name that exceeds 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (39) = 49 > 48
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(39), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ await expect(validateProject()).rejects.toThrow(
+ 'HTTP gateway target "' + 'a'.repeat(39) + '" in gateway "gw" would exceed the 48-character AWS limit'
+ );
+ });
+
+ it('accepts gateway target name within 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (38) = 48 == limit
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(38), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ const result = await validateProject();
+ expect(result.projectSpec.name).toBe('myproject');
+ });
 });
 
 describe('formatError', () => {

src/cli/operations/deploy/post-deploy-ab-tests.ts

@@ -142,7 +142,7 @@ export async function setupABTests(options: SetupABTestsOptions): Promise<SetupA
  const existingTest = existingABTests?.[testSpec.name];
 
  // Resolve ARN references from deployed state
- const resolvedVariants = resolveVariants(testSpec.variants, deployedResources);
+ const resolvedVariants = resolveVariants(testSpec.variants, projectSpec.name, deployedResources);
  const resolvedGatewayArn = resolveGatewayArn(testSpec.gatewayRef, deployedResources);
  if (!resolvedGatewayArn.startsWith('arn:') || resolvedGatewayArn.split(':').length < 6) {
  results.push({
@@ -409,7 +409,8 @@ async function findABTestByName(
 /**
  * Resolve variant config bundle references.
  * If bundleArn is a name (not an ARN), look it up in deployed config bundles.
- * Target-based variants are passed through as-is.
+ * Target-based variants have their target name prefixed with projectName to match
+ * what post-deploy-http-gateways.ts creates on AWS (e.g. `${projectName}-${tgt.name}`).
  */
 function resolveVariants(
  variants: {
@@ -420,6 +421,7 @@ function resolveVariants(
  target?: { targetName: string };
  };
  }[],
+ projectName: string,
  deployedResources?: DeployedResourceState
 ): ABTestVariant[] {
  return variants.map(v => {
@@ -436,12 +438,15 @@ function resolveVariants(
  },
  };
  }
- // Target-based variant — pass through
+ // Target-based variant — prepend projectName to match the AWS-side name created by
+ // post-deploy-http-gateways.ts: `${projectName}-${tgt.name}`
  return {
  name: v.name,
  weight: v.weight,
  variantConfiguration: {
- ...(v.variantConfiguration.target && { target: { name: v.variantConfiguration.target.targetName } }),
+ ...(v.variantConfiguration.target && {
+ target: { name: resolveTargetName(v.variantConfiguration.target.targetName, projectName) },
+ }),
  },
  };
  });
@@ -475,6 +480,18 @@ function resolveConfigBundleVersion(
  return versionRef;
 }
 
+/**
+ * Resolve a variant target name, applying the project prefix if not already present.
+ * This handles legacy configs that were created before the prefix requirement.
+ */
+function resolveTargetName(targetName: string, projectName: string): string {
+ // If the target name already starts with the project prefix, use as-is to avoid double-prefixing
+ if (targetName.startsWith(`${projectName}-`)) {
+ return targetName;
+ }
+ return `${projectName}-${targetName}`;
+}
+
 function resolveGatewayArn(ref: string, deployedResources?: DeployedResourceState): string {
  if (ref.startsWith('arn:')) return ref;
 

src/cli/operations/deploy/post-deploy-http-gateways.ts

@@ -101,7 +101,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  for (const tgt of gwSpec.targets) {
- const existingTarget = existingTargetsByName.get(tgt.name);
+ const existingTarget = existingTargetsByName.get(`${projectName}-${tgt.name}`);
  if (existingTarget) {
  // Target exists by name — check if qualifier matches
  try {
@@ -143,7 +143,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: existingGateway.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });
@@ -170,7 +170,8 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  // Try to find by name via list (handles re-creation after state loss)
- const existingByName = await findHttpGatewayByName(region, gwSpec.name);
+ const prefixedGatewayName = `${projectName}-${gwSpec.name}`;
+ const existingByName = await findHttpGatewayByName(region, prefixedGatewayName);
  if (existingByName) {
  console.warn(
  `Warning: HTTP gateway "${gwSpec.name}" found by name but local state was lost. Target and role state may be incomplete — consider re-deploying.`
@@ -189,6 +190,29 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  continue;
  }
 
+ // Migration fallback: try unprefixed name for pre-PR gateways (Comment 3 fix)
+ const existingByLegacyName = await findHttpGatewayByName(region, gwSpec.name);
+ if (existingByLegacyName) {
+ console.warn(
+ `Warning: HTTP gateway "${gwSpec.name}" was found using its pre-migration name. ` +
+ `This CLI version uses the naming convention "${prefixedGatewayName}". ` +
+ `The gateway has been recovered from state loss. ` +
+ `You may want to rename "${gwSpec.name}" to "${prefixedGatewayName}" on AWS to match the new convention.`
+ );
+ httpGateways[gwSpec.name] = {
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ // targetId, roleArn, roleCreatedByCli unknown after state-loss recovery
+ };
+ results.push({
+ gatewayName: gwSpec.name,
+ status: 'skipped',
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ });
+ continue;
+ }
+
  // Resolve runtime ARN from deployed state
  const runtimeState = deployedResources?.runtimes?.[gwSpec.runtimeRef];
  if (!runtimeState) {
@@ -216,7 +240,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  // Creating HTTP gateway for runtime
  const createResult = await createHttpGateway({
  region,
- name: gwSpec.name,
+ name: `${projectName}-${gwSpec.name}`,
  roleArn: resolvedRoleArn,
  });
 
@@ -231,7 +255,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const targetResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: gwSpec.runtimeRef,
+ targetName: `${projectName}-${gwSpec.runtimeRef}`,
  runtimeArn,
  });
 
@@ -288,7 +312,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });

src/cli/operations/deploy/preflight.ts

@@ -59,6 +59,7 @@ export function formatError(err: unknown): string {
  * Returns the project context needed for subsequent steps.
  */
 const MAX_RUNTIME_NAME_LENGTH = 48;
+const MAX_GATEWAY_COMBINED_NAME_LENGTH = 48;
 
 export async function validateProject(): Promise<PreflightContext> {
  // Find the agentcore config directory, walking up from cwd if needed
@@ -108,6 +109,9 @@ export async function validateProject(): Promise<PreflightContext> {
  // Validate runtime names don't exceed AWS limits
  validateRuntimeNames(projectSpec);
 
+ // Validate HTTP gateway names don't exceed AWS limits when combined with project name
+ validateHttpGatewayNames(projectSpec);
+
  // Validate Container agents have Dockerfiles
  validateContainerAgents(projectSpec, configRoot);
 
@@ -140,6 +144,36 @@ function validateRuntimeNames(projectSpec: AgentCoreProjectSpec): void {
  }
 }
 
+/**
+ * Validates that combined HTTP gateway names (projectName-gatewayName) don't exceed AWS limits.
+ */
+function validateHttpGatewayNames(projectSpec: AgentCoreProjectSpec): void {
+ const projectName = projectSpec.name;
+ for (const gateway of projectSpec.httpGateways ?? []) {
+ const gwName = gateway.name;
+ if (gwName) {
+ const combinedName = `${projectName}-${gwName}`;
+ if (combinedName.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ throw new Error(
+ `HTTP gateway name too long: "${combinedName}" (${combinedName.length} chars). ` +
+ `AWS limits gateway names to ${MAX_GATEWAY_COMBINED_NAME_LENGTH} characters. ` +
+ `Shorten the project name or gateway name in agentcore.json.`
+ );
+ }
+ }
+ for (const target of gateway.targets ?? []) {
+ const combined = `${projectName}-${target.name}`;
+ if (combined.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ const maxTargetLen = MAX_GATEWAY_COMBINED_NAME_LENGTH - projectName.length - 1;
+ throw new Error(
+ `HTTP gateway target "${target.name}" in gateway "${gwName}" would exceed the ${MAX_GATEWAY_COMBINED_NAME_LENGTH}-character AWS limit when prefixed with project name "${projectName}-" (total: ${combined.length} chars). ` +
+ `Shorten the target name to ${maxTargetLen} characters or fewer.`
+ );
+ }
+ }
+ }
+}
+
 /**
  * Validates that Container agents have required Dockerfiles.
  */

src/schema/schemas/primitives/__tests__/http-gateway.test.ts

@@ -22,12 +22,12 @@ describe('HttpGatewayNameSchema', () => {
  expect(HttpGatewayNameSchema.safeParse('my_gateway').success).toBe(false);
  });
 
- it('rejects name over 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(49)).success).toBe(false);
+ it('accepts name longer than 24 chars', () => {
+ expect(HttpGatewayNameSchema.safeParse('a'.repeat(25)).success).toBe(true);
  });
 
- it('accepts name at 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(48)).success).toBe(true);
+ it('accepts name at 47 chars (room for 1-char project name + hyphen)', () => {
+ expect(HttpGatewayNameSchema.safeParse('a' + 'b'.repeat(46)).success).toBe(true);
  });
 });
 
@@ -60,8 +60,8 @@ describe('HttpGatewaySchema', () => {
  expect(HttpGatewaySchema.safeParse(withoutRuntimeRef).success).toBe(false);
  });
 
- it('rejects name too long (>48 chars)', () => {
- expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a'.repeat(49) }).success).toBe(false);
+ it('accepts name longer than 24 chars (no standalone max cap)', () => {
+ expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a' + 'b'.repeat(30) }).success).toBe(true);
  });
 
  it('rejects name starting with number', () => {

src/schema/schemas/primitives/http-gateway.ts

@@ -7,10 +7,9 @@ import { z } from 'zod';
 export const HttpGatewayNameSchema = z
  .string()
  .min(1, 'Name is required')
- .max(48)
  .regex(
- /^[a-zA-Z][a-zA-Z0-9-]{0,47}$/,
- 'Must begin with a letter and contain only alphanumeric characters and hyphens (max 48 chars)'
+ /^[a-zA-Z][a-zA-Z0-9-]*$/,
+ 'Gateway name must start with a letter and contain only alphanumeric characters or hyphens (combined with project name must fit 48-char AWS limit)'
  );
 
 export const HttpGatewayTargetSchema = z.object({

src/cli/operations/deploy/__tests__/post-deploy-http-gateways.test.ts

@@ -139,13 +139,13 @@ describe('setupHttpGateways', () => {
 
  expect(mockCreateHttpGateway).toHaveBeenCalledWith({
  region: 'us-east-1',
- name: 'MyHttpGw',
+ name: 'TestProject-MyHttpGw',
  roleArn: 'arn:aws:iam::123456789012:role/ExistingRole',
  });
  expect(mockCreateHttpGatewayTarget).toHaveBeenCalledWith({
  region: 'us-east-1',
  gatewayId: 'gw-001',
- targetName: 'my-agent',
+ targetName: 'TestProject-my-agent',
  runtimeArn: 'arn:aws:bedrock-agentcore:us-east-1:123456789012:runtime/rt-123',
  });
  });
@@ -175,7 +175,7 @@ describe('setupHttpGateways', () => {
 
  it('finds gateway by name via list (state loss recovery)', async () => {
  mockListAllHttpGateways.mockResolvedValue([
- { name: 'MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
+ { name: 'TestProject-MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
  ]);
 
  const result = await setupHttpGateways({
@@ -190,6 +190,39 @@ describe('setupHttpGateways', () => {
  expect(mockCreateHttpGateway).not.toHaveBeenCalled();
  });
 
+ it('recovers state using legacy (pre-migration) gateway name when prefixed name not found', async () => {
+ // First call: prefixed name "TestProject-MyHttpGw" → not found
+ // Second call: unprefixed legacy name "MyHttpGw" → found
+ mockListAllHttpGateways
+ .mockResolvedValueOnce([])
+ .mockResolvedValueOnce([{ name: 'MyHttpGw', gatewayId: 'gw-legacy', gatewayArn: 'arn:httpgw:legacy' }]);
+
+ const warnSpy = vi.spyOn(console, 'warn').mockReturnValue(undefined);
+
+ const result = await setupHttpGateways({
+ region: 'us-east-1',
+ projectName: 'TestProject',
+ projectSpec: makeProjectSpec([sampleHttpGateway]),
+ deployedResources: sampleDeployedResources,
+ });
+
+ // findHttpGatewayByName was called twice: once for prefixed, once for unprefixed name
+ expect(mockListAllHttpGateways).toHaveBeenCalledTimes(2);
+
+ // Gateway result is skipped (not created)
+ expect(result.results[0]!.status).toBe('skipped');
+ expect(result.results[0]!.gatewayId).toBe('gw-legacy');
+ expect(result.httpGateways.MyHttpGw!.gatewayId).toBe('gw-legacy');
+
+ // createHttpGateway was NOT called
+ expect(mockCreateHttpGateway).not.toHaveBeenCalled();
+
+ // console.warn was called with the pre-migration warning text
+ expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('pre-migration name'));
+
+ warnSpy.mockRestore();
+ });
+
  it('reports error on missing runtime ref', async () => {
  const emptyDeployedResources = {} as unknown as DeployedResourceState;
 

src/cli/operations/deploy/__tests__/preflight.test.ts

@@ -126,6 +126,51 @@ describe('validateProject', () => {
  expect(result.projectSpec.name).toBe('test-project');
  expect(result.isTeardownDeploy).toBe(false);
  });
+
+ it('rejects gateway target name that exceeds 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (39) = 49 > 48
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(39), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ await expect(validateProject()).rejects.toThrow(
+ 'HTTP gateway target "' + 'a'.repeat(39) + '" in gateway "gw" would exceed the 48-character AWS limit'
+ );
+ });
+
+ it('accepts gateway target name within 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (38) = 48 == limit
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(38), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ const result = await validateProject();
+ expect(result.projectSpec.name).toBe('myproject');
+ });
 });
 
 describe('formatError', () => {

src/cli/operations/deploy/post-deploy-ab-tests.ts

@@ -142,7 +142,7 @@ export async function setupABTests(options: SetupABTestsOptions): Promise<SetupA
  const existingTest = existingABTests?.[testSpec.name];
 
  // Resolve ARN references from deployed state
- const resolvedVariants = resolveVariants(testSpec.variants, deployedResources);
+ const resolvedVariants = resolveVariants(testSpec.variants, projectSpec.name, deployedResources);
  const resolvedGatewayArn = resolveGatewayArn(testSpec.gatewayRef, deployedResources);
  if (!resolvedGatewayArn.startsWith('arn:') || resolvedGatewayArn.split(':').length < 6) {
  results.push({
@@ -409,7 +409,8 @@ async function findABTestByName(
 /**
  * Resolve variant config bundle references.
  * If bundleArn is a name (not an ARN), look it up in deployed config bundles.
- * Target-based variants are passed through as-is.
+ * Target-based variants have their target name prefixed with projectName to match
+ * what post-deploy-http-gateways.ts creates on AWS (e.g. `${projectName}-${tgt.name}`).
  */
 function resolveVariants(
  variants: {
@@ -420,6 +421,7 @@ function resolveVariants(
  target?: { targetName: string };
  };
  }[],
+ projectName: string,
  deployedResources?: DeployedResourceState
 ): ABTestVariant[] {
  return variants.map(v => {
@@ -436,12 +438,15 @@ function resolveVariants(
  },
  };
  }
- // Target-based variant — pass through
+ // Target-based variant — prepend projectName to match the AWS-side name created by
+ // post-deploy-http-gateways.ts: `${projectName}-${tgt.name}`
  return {
  name: v.name,
  weight: v.weight,
  variantConfiguration: {
- ...(v.variantConfiguration.target && { target: { name: v.variantConfiguration.target.targetName } }),
+ ...(v.variantConfiguration.target && {
+ target: { name: resolveTargetName(v.variantConfiguration.target.targetName, projectName) },
+ }),
  },
  };
  });
@@ -475,6 +480,18 @@ function resolveConfigBundleVersion(
  return versionRef;
 }
 
+/**
+ * Resolve a variant target name, applying the project prefix if not already present.
+ * This handles legacy configs that were created before the prefix requirement.
+ */
+function resolveTargetName(targetName: string, projectName: string): string {
+ // If the target name already starts with the project prefix, use as-is to avoid double-prefixing
+ if (targetName.startsWith(`${projectName}-`)) {
+ return targetName;
+ }
+ return `${projectName}-${targetName}`;
+}
+
 function resolveGatewayArn(ref: string, deployedResources?: DeployedResourceState): string {
  if (ref.startsWith('arn:')) return ref;
 

src/cli/operations/deploy/post-deploy-http-gateways.ts

@@ -101,7 +101,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  for (const tgt of gwSpec.targets) {
- const existingTarget = existingTargetsByName.get(tgt.name);
+ const existingTarget = existingTargetsByName.get(`${projectName}-${tgt.name}`);
  if (existingTarget) {
  // Target exists by name — check if qualifier matches
  try {
@@ -143,7 +143,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: existingGateway.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });
@@ -170,7 +170,8 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  // Try to find by name via list (handles re-creation after state loss)
- const existingByName = await findHttpGatewayByName(region, gwSpec.name);
+ const prefixedGatewayName = `${projectName}-${gwSpec.name}`;
+ const existingByName = await findHttpGatewayByName(region, prefixedGatewayName);
  if (existingByName) {
  console.warn(
  `Warning: HTTP gateway "${gwSpec.name}" found by name but local state was lost. Target and role state may be incomplete — consider re-deploying.`
@@ -189,6 +190,29 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  continue;
  }
 
+ // Migration fallback: try unprefixed name for pre-PR gateways (Comment 3 fix)
+ const existingByLegacyName = await findHttpGatewayByName(region, gwSpec.name);
+ if (existingByLegacyName) {
+ console.warn(
+ `Warning: HTTP gateway "${gwSpec.name}" was found using its pre-migration name. ` +
+ `This CLI version uses the naming convention "${prefixedGatewayName}". ` +
+ `The gateway has been recovered from state loss. ` +
+ `You may want to rename "${gwSpec.name}" to "${prefixedGatewayName}" on AWS to match the new convention.`
+ );
+ httpGateways[gwSpec.name] = {
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ // targetId, roleArn, roleCreatedByCli unknown after state-loss recovery
+ };
+ results.push({
+ gatewayName: gwSpec.name,
+ status: 'skipped',
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ });
+ continue;
+ }
+
  // Resolve runtime ARN from deployed state
  const runtimeState = deployedResources?.runtimes?.[gwSpec.runtimeRef];
  if (!runtimeState) {
@@ -216,7 +240,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  // Creating HTTP gateway for runtime
  const createResult = await createHttpGateway({
  region,
- name: gwSpec.name,
+ name: `${projectName}-${gwSpec.name}`,
  roleArn: resolvedRoleArn,
  });
 
@@ -231,7 +255,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const targetResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: gwSpec.runtimeRef,
+ targetName: `${projectName}-${gwSpec.runtimeRef}`,
  runtimeArn,
  });
 
@@ -288,7 +312,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });

src/cli/operations/deploy/preflight.ts

@@ -59,6 +59,7 @@ export function formatError(err: unknown): string {
  * Returns the project context needed for subsequent steps.
  */
 const MAX_RUNTIME_NAME_LENGTH = 48;
+const MAX_GATEWAY_COMBINED_NAME_LENGTH = 48;
 
 export async function validateProject(): Promise<PreflightContext> {
  // Find the agentcore config directory, walking up from cwd if needed
@@ -108,6 +109,9 @@ export async function validateProject(): Promise<PreflightContext> {
  // Validate runtime names don't exceed AWS limits
  validateRuntimeNames(projectSpec);
 
+ // Validate HTTP gateway names don't exceed AWS limits when combined with project name
+ validateHttpGatewayNames(projectSpec);
+
  // Validate Container agents have Dockerfiles
  validateContainerAgents(projectSpec, configRoot);
 
@@ -140,6 +144,36 @@ function validateRuntimeNames(projectSpec: AgentCoreProjectSpec): void {
  }
 }
 
+/**
+ * Validates that combined HTTP gateway names (projectName-gatewayName) don't exceed AWS limits.
+ */
+function validateHttpGatewayNames(projectSpec: AgentCoreProjectSpec): void {
+ const projectName = projectSpec.name;
+ for (const gateway of projectSpec.httpGateways ?? []) {
+ const gwName = gateway.name;
+ if (gwName) {
+ const combinedName = `${projectName}-${gwName}`;
+ if (combinedName.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ throw new Error(
+ `HTTP gateway name too long: "${combinedName}" (${combinedName.length} chars). ` +
+ `AWS limits gateway names to ${MAX_GATEWAY_COMBINED_NAME_LENGTH} characters. ` +
+ `Shorten the project name or gateway name in agentcore.json.`
+ );
+ }
+ }
+ for (const target of gateway.targets ?? []) {
+ const combined = `${projectName}-${target.name}`;
+ if (combined.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ const maxTargetLen = MAX_GATEWAY_COMBINED_NAME_LENGTH - projectName.length - 1;
+ throw new Error(
+ `HTTP gateway target "${target.name}" in gateway "${gwName}" would exceed the ${MAX_GATEWAY_COMBINED_NAME_LENGTH}-character AWS limit when prefixed with project name "${projectName}-" (total: ${combined.length} chars). ` +
+ `Shorten the target name to ${maxTargetLen} characters or fewer.`
+ );
+ }
+ }
+ }
+}
+
 /**
  * Validates that Container agents have required Dockerfiles.
  */

src/schema/schemas/primitives/__tests__/http-gateway.test.ts

@@ -22,12 +22,12 @@ describe('HttpGatewayNameSchema', () => {
  expect(HttpGatewayNameSchema.safeParse('my_gateway').success).toBe(false);
  });
 
- it('rejects name over 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(49)).success).toBe(false);
+ it('accepts name longer than 24 chars', () => {
+ expect(HttpGatewayNameSchema.safeParse('a'.repeat(25)).success).toBe(true);
  });
 
- it('accepts name at 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(48)).success).toBe(true);
+ it('accepts name at 47 chars (room for 1-char project name + hyphen)', () => {
+ expect(HttpGatewayNameSchema.safeParse('a' + 'b'.repeat(46)).success).toBe(true);
  });
 });
 
@@ -60,8 +60,8 @@ describe('HttpGatewaySchema', () => {
  expect(HttpGatewaySchema.safeParse(withoutRuntimeRef).success).toBe(false);
  });
 
- it('rejects name too long (>48 chars)', () => {
- expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a'.repeat(49) }).success).toBe(false);
+ it('accepts name longer than 24 chars (no standalone max cap)', () => {
+ expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a' + 'b'.repeat(30) }).success).toBe(true);
  });
 
  it('rejects name starting with number', () => {

src/schema/schemas/primitives/http-gateway.ts

@@ -7,10 +7,9 @@ import { z } from 'zod';
 export const HttpGatewayNameSchema = z
  .string()
  .min(1, 'Name is required')
- .max(48)
  .regex(
- /^[a-zA-Z][a-zA-Z0-9-]{0,47}$/,
- 'Must begin with a letter and contain only alphanumeric characters and hyphens (max 48 chars)'
+ /^[a-zA-Z][a-zA-Z0-9-]*$/,
+ 'Gateway name must start with a letter and contain only alphanumeric characters or hyphens (combined with project name must fit 48-char AWS limit)'
  );
 
 export const HttpGatewayTargetSchema = z.object({

src/cli/operations/deploy/__tests__/post-deploy-http-gateways.test.ts

@@ -139,13 +139,13 @@ describe('setupHttpGateways', () => {
 
  expect(mockCreateHttpGateway).toHaveBeenCalledWith({
  region: 'us-east-1',
- name: 'MyHttpGw',
+ name: 'TestProject-MyHttpGw',
  roleArn: 'arn:aws:iam::123456789012:role/ExistingRole',
  });
  expect(mockCreateHttpGatewayTarget).toHaveBeenCalledWith({
  region: 'us-east-1',
  gatewayId: 'gw-001',
- targetName: 'my-agent',
+ targetName: 'TestProject-my-agent',
  runtimeArn: 'arn:aws:bedrock-agentcore:us-east-1:123456789012:runtime/rt-123',
  });
  });
@@ -175,7 +175,7 @@ describe('setupHttpGateways', () => {
 
  it('finds gateway by name via list (state loss recovery)', async () => {
  mockListAllHttpGateways.mockResolvedValue([
- { name: 'MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
+ { name: 'TestProject-MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
  ]);
 
  const result = await setupHttpGateways({
@@ -190,6 +190,39 @@ describe('setupHttpGateways', () => {
  expect(mockCreateHttpGateway).not.toHaveBeenCalled();
  });
 
+ it('recovers state using legacy (pre-migration) gateway name when prefixed name not found', async () => {
+ // First call: prefixed name "TestProject-MyHttpGw" → not found
+ // Second call: unprefixed legacy name "MyHttpGw" → found
+ mockListAllHttpGateways
+ .mockResolvedValueOnce([])
+ .mockResolvedValueOnce([{ name: 'MyHttpGw', gatewayId: 'gw-legacy', gatewayArn: 'arn:httpgw:legacy' }]);
+
+ const warnSpy = vi.spyOn(console, 'warn').mockReturnValue(undefined);
+
+ const result = await setupHttpGateways({
+ region: 'us-east-1',
+ projectName: 'TestProject',
+ projectSpec: makeProjectSpec([sampleHttpGateway]),
+ deployedResources: sampleDeployedResources,
+ });
+
+ // findHttpGatewayByName was called twice: once for prefixed, once for unprefixed name
+ expect(mockListAllHttpGateways).toHaveBeenCalledTimes(2);
+
+ // Gateway result is skipped (not created)
+ expect(result.results[0]!.status).toBe('skipped');
+ expect(result.results[0]!.gatewayId).toBe('gw-legacy');
+ expect(result.httpGateways.MyHttpGw!.gatewayId).toBe('gw-legacy');
+
+ // createHttpGateway was NOT called
+ expect(mockCreateHttpGateway).not.toHaveBeenCalled();
+
+ // console.warn was called with the pre-migration warning text
+ expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('pre-migration name'));
+
+ warnSpy.mockRestore();
+ });
+
  it('reports error on missing runtime ref', async () => {
  const emptyDeployedResources = {} as unknown as DeployedResourceState;
 

src/cli/operations/deploy/__tests__/preflight.test.ts

@@ -126,6 +126,51 @@ describe('validateProject', () => {
  expect(result.projectSpec.name).toBe('test-project');
  expect(result.isTeardownDeploy).toBe(false);
  });
+
+ it('rejects gateway target name that exceeds 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (39) = 49 > 48
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(39), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ await expect(validateProject()).rejects.toThrow(
+ 'HTTP gateway target "' + 'a'.repeat(39) + '" in gateway "gw" would exceed the 48-character AWS limit'
+ );
+ });
+
+ it('accepts gateway target name within 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (38) = 48 == limit
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(38), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ const result = await validateProject();
+ expect(result.projectSpec.name).toBe('myproject');
+ });
 });
 
 describe('formatError', () => {

src/cli/operations/deploy/post-deploy-ab-tests.ts

@@ -142,7 +142,7 @@ export async function setupABTests(options: SetupABTestsOptions): Promise<SetupA
  const existingTest = existingABTests?.[testSpec.name];
 
  // Resolve ARN references from deployed state
- const resolvedVariants = resolveVariants(testSpec.variants, deployedResources);
+ const resolvedVariants = resolveVariants(testSpec.variants, projectSpec.name, deployedResources);
  const resolvedGatewayArn = resolveGatewayArn(testSpec.gatewayRef, deployedResources);
  if (!resolvedGatewayArn.startsWith('arn:') || resolvedGatewayArn.split(':').length < 6) {
  results.push({
@@ -409,7 +409,8 @@ async function findABTestByName(
 /**
  * Resolve variant config bundle references.
  * If bundleArn is a name (not an ARN), look it up in deployed config bundles.
- * Target-based variants are passed through as-is.
+ * Target-based variants have their target name prefixed with projectName to match
+ * what post-deploy-http-gateways.ts creates on AWS (e.g. `${projectName}-${tgt.name}`).
  */
 function resolveVariants(
  variants: {
@@ -420,6 +421,7 @@ function resolveVariants(
  target?: { targetName: string };
  };
  }[],
+ projectName: string,
  deployedResources?: DeployedResourceState
 ): ABTestVariant[] {
  return variants.map(v => {
@@ -436,12 +438,15 @@ function resolveVariants(
  },
  };
  }
- // Target-based variant — pass through
+ // Target-based variant — prepend projectName to match the AWS-side name created by
+ // post-deploy-http-gateways.ts: `${projectName}-${tgt.name}`
  return {
  name: v.name,
  weight: v.weight,
  variantConfiguration: {
- ...(v.variantConfiguration.target && { target: { name: v.variantConfiguration.target.targetName } }),
+ ...(v.variantConfiguration.target && {
+ target: { name: resolveTargetName(v.variantConfiguration.target.targetName, projectName) },
+ }),
  },
  };
  });
@@ -475,6 +480,18 @@ function resolveConfigBundleVersion(
  return versionRef;
 }
 
+/**
+ * Resolve a variant target name, applying the project prefix if not already present.
+ * This handles legacy configs that were created before the prefix requirement.
+ */
+function resolveTargetName(targetName: string, projectName: string): string {
+ // If the target name already starts with the project prefix, use as-is to avoid double-prefixing
+ if (targetName.startsWith(`${projectName}-`)) {
+ return targetName;
+ }
+ return `${projectName}-${targetName}`;
+}
+
 function resolveGatewayArn(ref: string, deployedResources?: DeployedResourceState): string {
  if (ref.startsWith('arn:')) return ref;
 

src/cli/operations/deploy/post-deploy-http-gateways.ts

@@ -101,7 +101,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  for (const tgt of gwSpec.targets) {
- const existingTarget = existingTargetsByName.get(tgt.name);
+ const existingTarget = existingTargetsByName.get(`${projectName}-${tgt.name}`);
  if (existingTarget) {
  // Target exists by name — check if qualifier matches
  try {
@@ -143,7 +143,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: existingGateway.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });
@@ -170,7 +170,8 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  // Try to find by name via list (handles re-creation after state loss)
- const existingByName = await findHttpGatewayByName(region, gwSpec.name);
+ const prefixedGatewayName = `${projectName}-${gwSpec.name}`;
+ const existingByName = await findHttpGatewayByName(region, prefixedGatewayName);
  if (existingByName) {
  console.warn(
  `Warning: HTTP gateway "${gwSpec.name}" found by name but local state was lost. Target and role state may be incomplete — consider re-deploying.`
@@ -189,6 +190,29 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  continue;
  }
 
+ // Migration fallback: try unprefixed name for pre-PR gateways (Comment 3 fix)
+ const existingByLegacyName = await findHttpGatewayByName(region, gwSpec.name);
+ if (existingByLegacyName) {
+ console.warn(
+ `Warning: HTTP gateway "${gwSpec.name}" was found using its pre-migration name. ` +
+ `This CLI version uses the naming convention "${prefixedGatewayName}". ` +
+ `The gateway has been recovered from state loss. ` +
+ `You may want to rename "${gwSpec.name}" to "${prefixedGatewayName}" on AWS to match the new convention.`
+ );
+ httpGateways[gwSpec.name] = {
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ // targetId, roleArn, roleCreatedByCli unknown after state-loss recovery
+ };
+ results.push({
+ gatewayName: gwSpec.name,
+ status: 'skipped',
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ });
+ continue;
+ }
+
  // Resolve runtime ARN from deployed state
  const runtimeState = deployedResources?.runtimes?.[gwSpec.runtimeRef];
  if (!runtimeState) {
@@ -216,7 +240,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  // Creating HTTP gateway for runtime
  const createResult = await createHttpGateway({
  region,
- name: gwSpec.name,
+ name: `${projectName}-${gwSpec.name}`,
  roleArn: resolvedRoleArn,
  });
 
@@ -231,7 +255,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const targetResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: gwSpec.runtimeRef,
+ targetName: `${projectName}-${gwSpec.runtimeRef}`,
  runtimeArn,
  });
 
@@ -288,7 +312,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });

src/cli/operations/deploy/preflight.ts

@@ -59,6 +59,7 @@ export function formatError(err: unknown): string {
  * Returns the project context needed for subsequent steps.
  */
 const MAX_RUNTIME_NAME_LENGTH = 48;
+const MAX_GATEWAY_COMBINED_NAME_LENGTH = 48;
 
 export async function validateProject(): Promise<PreflightContext> {
  // Find the agentcore config directory, walking up from cwd if needed
@@ -108,6 +109,9 @@ export async function validateProject(): Promise<PreflightContext> {
  // Validate runtime names don't exceed AWS limits
  validateRuntimeNames(projectSpec);
 
+ // Validate HTTP gateway names don't exceed AWS limits when combined with project name
+ validateHttpGatewayNames(projectSpec);
+
  // Validate Container agents have Dockerfiles
  validateContainerAgents(projectSpec, configRoot);
 
@@ -140,6 +144,36 @@ function validateRuntimeNames(projectSpec: AgentCoreProjectSpec): void {
  }
 }
 
+/**
+ * Validates that combined HTTP gateway names (projectName-gatewayName) don't exceed AWS limits.
+ */
+function validateHttpGatewayNames(projectSpec: AgentCoreProjectSpec): void {
+ const projectName = projectSpec.name;
+ for (const gateway of projectSpec.httpGateways ?? []) {
+ const gwName = gateway.name;
+ if (gwName) {
+ const combinedName = `${projectName}-${gwName}`;
+ if (combinedName.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ throw new Error(
+ `HTTP gateway name too long: "${combinedName}" (${combinedName.length} chars). ` +
+ `AWS limits gateway names to ${MAX_GATEWAY_COMBINED_NAME_LENGTH} characters. ` +
+ `Shorten the project name or gateway name in agentcore.json.`
+ );
+ }
+ }
+ for (const target of gateway.targets ?? []) {
+ const combined = `${projectName}-${target.name}`;
+ if (combined.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ const maxTargetLen = MAX_GATEWAY_COMBINED_NAME_LENGTH - projectName.length - 1;
+ throw new Error(
+ `HTTP gateway target "${target.name}" in gateway "${gwName}" would exceed the ${MAX_GATEWAY_COMBINED_NAME_LENGTH}-character AWS limit when prefixed with project name "${projectName}-" (total: ${combined.length} chars). ` +
+ `Shorten the target name to ${maxTargetLen} characters or fewer.`
+ );
+ }
+ }
+ }
+}
+
 /**
  * Validates that Container agents have required Dockerfiles.
  */

src/schema/schemas/primitives/__tests__/http-gateway.test.ts

@@ -22,12 +22,12 @@ describe('HttpGatewayNameSchema', () => {
  expect(HttpGatewayNameSchema.safeParse('my_gateway').success).toBe(false);
  });
 
- it('rejects name over 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(49)).success).toBe(false);
+ it('accepts name longer than 24 chars', () => {
+ expect(HttpGatewayNameSchema.safeParse('a'.repeat(25)).success).toBe(true);
  });
 
- it('accepts name at 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(48)).success).toBe(true);
+ it('accepts name at 47 chars (room for 1-char project name + hyphen)', () => {
+ expect(HttpGatewayNameSchema.safeParse('a' + 'b'.repeat(46)).success).toBe(true);
  });
 });
 
@@ -60,8 +60,8 @@ describe('HttpGatewaySchema', () => {
  expect(HttpGatewaySchema.safeParse(withoutRuntimeRef).success).toBe(false);
  });
 
- it('rejects name too long (>48 chars)', () => {
- expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a'.repeat(49) }).success).toBe(false);
+ it('accepts name longer than 24 chars (no standalone max cap)', () => {
+ expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a' + 'b'.repeat(30) }).success).toBe(true);
  });
 
  it('rejects name starting with number', () => {

src/schema/schemas/primitives/http-gateway.ts

@@ -7,10 +7,9 @@ import { z } from 'zod';
 export const HttpGatewayNameSchema = z
  .string()
  .min(1, 'Name is required')
- .max(48)
  .regex(
- /^[a-zA-Z][a-zA-Z0-9-]{0,47}$/,
- 'Must begin with a letter and contain only alphanumeric characters and hyphens (max 48 chars)'
+ /^[a-zA-Z][a-zA-Z0-9-]*$/,
+ 'Gateway name must start with a letter and contain only alphanumeric characters or hyphens (combined with project name must fit 48-char AWS limit)'
  );
 
 export const HttpGatewayTargetSchema = z.object({

src/cli/operations/deploy/__tests__/post-deploy-http-gateways.test.ts

@@ -139,13 +139,13 @@ describe('setupHttpGateways', () => {
 
  expect(mockCreateHttpGateway).toHaveBeenCalledWith({
  region: 'us-east-1',
- name: 'MyHttpGw',
+ name: 'TestProject-MyHttpGw',
  roleArn: 'arn:aws:iam::123456789012:role/ExistingRole',
  });
  expect(mockCreateHttpGatewayTarget).toHaveBeenCalledWith({
  region: 'us-east-1',
  gatewayId: 'gw-001',
- targetName: 'my-agent',
+ targetName: 'TestProject-my-agent',
  runtimeArn: 'arn:aws:bedrock-agentcore:us-east-1:123456789012:runtime/rt-123',
  });
  });
@@ -175,7 +175,7 @@ describe('setupHttpGateways', () => {
 
  it('finds gateway by name via list (state loss recovery)', async () => {
  mockListAllHttpGateways.mockResolvedValue([
- { name: 'MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
+ { name: 'TestProject-MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
  ]);
 
  const result = await setupHttpGateways({
@@ -190,6 +190,39 @@ describe('setupHttpGateways', () => {
  expect(mockCreateHttpGateway).not.toHaveBeenCalled();
  });
 
+ it('recovers state using legacy (pre-migration) gateway name when prefixed name not found', async () => {
+ // First call: prefixed name "TestProject-MyHttpGw" → not found
+ // Second call: unprefixed legacy name "MyHttpGw" → found
+ mockListAllHttpGateways
+ .mockResolvedValueOnce([])
+ .mockResolvedValueOnce([{ name: 'MyHttpGw', gatewayId: 'gw-legacy', gatewayArn: 'arn:httpgw:legacy' }]);
+
+ const warnSpy = vi.spyOn(console, 'warn').mockReturnValue(undefined);
+
+ const result = await setupHttpGateways({
+ region: 'us-east-1',
+ projectName: 'TestProject',
+ projectSpec: makeProjectSpec([sampleHttpGateway]),
+ deployedResources: sampleDeployedResources,
+ });
+
+ // findHttpGatewayByName was called twice: once for prefixed, once for unprefixed name
+ expect(mockListAllHttpGateways).toHaveBeenCalledTimes(2);
+
+ // Gateway result is skipped (not created)
+ expect(result.results[0]!.status).toBe('skipped');
+ expect(result.results[0]!.gatewayId).toBe('gw-legacy');
+ expect(result.httpGateways.MyHttpGw!.gatewayId).toBe('gw-legacy');
+
+ // createHttpGateway was NOT called
+ expect(mockCreateHttpGateway).not.toHaveBeenCalled();
+
+ // console.warn was called with the pre-migration warning text
+ expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('pre-migration name'));
+
+ warnSpy.mockRestore();
+ });
+
  it('reports error on missing runtime ref', async () => {
  const emptyDeployedResources = {} as unknown as DeployedResourceState;
 

src/cli/operations/deploy/__tests__/preflight.test.ts

@@ -126,6 +126,51 @@ describe('validateProject', () => {
  expect(result.projectSpec.name).toBe('test-project');
  expect(result.isTeardownDeploy).toBe(false);
  });
+
+ it('rejects gateway target name that exceeds 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (39) = 49 > 48
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(39), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ await expect(validateProject()).rejects.toThrow(
+ 'HTTP gateway target "' + 'a'.repeat(39) + '" in gateway "gw" would exceed the 48-character AWS limit'
+ );
+ });
+
+ it('accepts gateway target name within 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (38) = 48 == limit
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(38), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ const result = await validateProject();
+ expect(result.projectSpec.name).toBe('myproject');
+ });
 });
 
 describe('formatError', () => {

src/cli/operations/deploy/post-deploy-ab-tests.ts

@@ -142,7 +142,7 @@ export async function setupABTests(options: SetupABTestsOptions): Promise<SetupA
  const existingTest = existingABTests?.[testSpec.name];
 
  // Resolve ARN references from deployed state
- const resolvedVariants = resolveVariants(testSpec.variants, deployedResources);
+ const resolvedVariants = resolveVariants(testSpec.variants, projectSpec.name, deployedResources);
  const resolvedGatewayArn = resolveGatewayArn(testSpec.gatewayRef, deployedResources);
  if (!resolvedGatewayArn.startsWith('arn:') || resolvedGatewayArn.split(':').length < 6) {
  results.push({
@@ -409,7 +409,8 @@ async function findABTestByName(
 /**
  * Resolve variant config bundle references.
  * If bundleArn is a name (not an ARN), look it up in deployed config bundles.
- * Target-based variants are passed through as-is.
+ * Target-based variants have their target name prefixed with projectName to match
+ * what post-deploy-http-gateways.ts creates on AWS (e.g. `${projectName}-${tgt.name}`).
  */
 function resolveVariants(
  variants: {
@@ -420,6 +421,7 @@ function resolveVariants(
  target?: { targetName: string };
  };
  }[],
+ projectName: string,
  deployedResources?: DeployedResourceState
 ): ABTestVariant[] {
  return variants.map(v => {
@@ -436,12 +438,15 @@ function resolveVariants(
  },
  };
  }
- // Target-based variant — pass through
+ // Target-based variant — prepend projectName to match the AWS-side name created by
+ // post-deploy-http-gateways.ts: `${projectName}-${tgt.name}`
  return {
  name: v.name,
  weight: v.weight,
  variantConfiguration: {
- ...(v.variantConfiguration.target && { target: { name: v.variantConfiguration.target.targetName } }),
+ ...(v.variantConfiguration.target && {
+ target: { name: resolveTargetName(v.variantConfiguration.target.targetName, projectName) },
+ }),
  },
  };
  });
@@ -475,6 +480,18 @@ function resolveConfigBundleVersion(
  return versionRef;
 }
 
+/**
+ * Resolve a variant target name, applying the project prefix if not already present.
+ * This handles legacy configs that were created before the prefix requirement.
+ */
+function resolveTargetName(targetName: string, projectName: string): string {
+ // If the target name already starts with the project prefix, use as-is to avoid double-prefixing
+ if (targetName.startsWith(`${projectName}-`)) {
+ return targetName;
+ }
+ return `${projectName}-${targetName}`;
+}
+
 function resolveGatewayArn(ref: string, deployedResources?: DeployedResourceState): string {
  if (ref.startsWith('arn:')) return ref;
 

src/cli/operations/deploy/post-deploy-http-gateways.ts

@@ -101,7 +101,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  for (const tgt of gwSpec.targets) {
- const existingTarget = existingTargetsByName.get(tgt.name);
+ const existingTarget = existingTargetsByName.get(`${projectName}-${tgt.name}`);
  if (existingTarget) {
  // Target exists by name — check if qualifier matches
  try {
@@ -143,7 +143,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: existingGateway.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });
@@ -170,7 +170,8 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  // Try to find by name via list (handles re-creation after state loss)
- const existingByName = await findHttpGatewayByName(region, gwSpec.name);
+ const prefixedGatewayName = `${projectName}-${gwSpec.name}`;
+ const existingByName = await findHttpGatewayByName(region, prefixedGatewayName);
  if (existingByName) {
  console.warn(
  `Warning: HTTP gateway "${gwSpec.name}" found by name but local state was lost. Target and role state may be incomplete — consider re-deploying.`
@@ -189,6 +190,29 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  continue;
  }
 
+ // Migration fallback: try unprefixed name for pre-PR gateways (Comment 3 fix)
+ const existingByLegacyName = await findHttpGatewayByName(region, gwSpec.name);
+ if (existingByLegacyName) {
+ console.warn(
+ `Warning: HTTP gateway "${gwSpec.name}" was found using its pre-migration name. ` +
+ `This CLI version uses the naming convention "${prefixedGatewayName}". ` +
+ `The gateway has been recovered from state loss. ` +
+ `You may want to rename "${gwSpec.name}" to "${prefixedGatewayName}" on AWS to match the new convention.`
+ );
+ httpGateways[gwSpec.name] = {
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ // targetId, roleArn, roleCreatedByCli unknown after state-loss recovery
+ };
+ results.push({
+ gatewayName: gwSpec.name,
+ status: 'skipped',
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ });
+ continue;
+ }
+
  // Resolve runtime ARN from deployed state
  const runtimeState = deployedResources?.runtimes?.[gwSpec.runtimeRef];
  if (!runtimeState) {
@@ -216,7 +240,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  // Creating HTTP gateway for runtime
  const createResult = await createHttpGateway({
  region,
- name: gwSpec.name,
+ name: `${projectName}-${gwSpec.name}`,
  roleArn: resolvedRoleArn,
  });
 
@@ -231,7 +255,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const targetResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: gwSpec.runtimeRef,
+ targetName: `${projectName}-${gwSpec.runtimeRef}`,
  runtimeArn,
  });
 
@@ -288,7 +312,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });

src/cli/operations/deploy/preflight.ts

@@ -59,6 +59,7 @@ export function formatError(err: unknown): string {
  * Returns the project context needed for subsequent steps.
  */
 const MAX_RUNTIME_NAME_LENGTH = 48;
+const MAX_GATEWAY_COMBINED_NAME_LENGTH = 48;
 
 export async function validateProject(): Promise<PreflightContext> {
  // Find the agentcore config directory, walking up from cwd if needed
@@ -108,6 +109,9 @@ export async function validateProject(): Promise<PreflightContext> {
  // Validate runtime names don't exceed AWS limits
  validateRuntimeNames(projectSpec);
 
+ // Validate HTTP gateway names don't exceed AWS limits when combined with project name
+ validateHttpGatewayNames(projectSpec);
+
  // Validate Container agents have Dockerfiles
  validateContainerAgents(projectSpec, configRoot);
 
@@ -140,6 +144,36 @@ function validateRuntimeNames(projectSpec: AgentCoreProjectSpec): void {
  }
 }
 
+/**
+ * Validates that combined HTTP gateway names (projectName-gatewayName) don't exceed AWS limits.
+ */
+function validateHttpGatewayNames(projectSpec: AgentCoreProjectSpec): void {
+ const projectName = projectSpec.name;
+ for (const gateway of projectSpec.httpGateways ?? []) {
+ const gwName = gateway.name;
+ if (gwName) {
+ const combinedName = `${projectName}-${gwName}`;
+ if (combinedName.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ throw new Error(
+ `HTTP gateway name too long: "${combinedName}" (${combinedName.length} chars). ` +
+ `AWS limits gateway names to ${MAX_GATEWAY_COMBINED_NAME_LENGTH} characters. ` +
+ `Shorten the project name or gateway name in agentcore.json.`
+ );
+ }
+ }
+ for (const target of gateway.targets ?? []) {
+ const combined = `${projectName}-${target.name}`;
+ if (combined.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ const maxTargetLen = MAX_GATEWAY_COMBINED_NAME_LENGTH - projectName.length - 1;
+ throw new Error(
+ `HTTP gateway target "${target.name}" in gateway "${gwName}" would exceed the ${MAX_GATEWAY_COMBINED_NAME_LENGTH}-character AWS limit when prefixed with project name "${projectName}-" (total: ${combined.length} chars). ` +
+ `Shorten the target name to ${maxTargetLen} characters or fewer.`
+ );
+ }
+ }
+ }
+}
+
 /**
  * Validates that Container agents have required Dockerfiles.
  */

src/schema/schemas/primitives/__tests__/http-gateway.test.ts

@@ -22,12 +22,12 @@ describe('HttpGatewayNameSchema', () => {
  expect(HttpGatewayNameSchema.safeParse('my_gateway').success).toBe(false);
  });
 
- it('rejects name over 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(49)).success).toBe(false);
+ it('accepts name longer than 24 chars', () => {
+ expect(HttpGatewayNameSchema.safeParse('a'.repeat(25)).success).toBe(true);
  });
 
- it('accepts name at 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(48)).success).toBe(true);
+ it('accepts name at 47 chars (room for 1-char project name + hyphen)', () => {
+ expect(HttpGatewayNameSchema.safeParse('a' + 'b'.repeat(46)).success).toBe(true);
  });
 });
 
@@ -60,8 +60,8 @@ describe('HttpGatewaySchema', () => {
  expect(HttpGatewaySchema.safeParse(withoutRuntimeRef).success).toBe(false);
  });
 
- it('rejects name too long (>48 chars)', () => {
- expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a'.repeat(49) }).success).toBe(false);
+ it('accepts name longer than 24 chars (no standalone max cap)', () => {
+ expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a' + 'b'.repeat(30) }).success).toBe(true);
  });
 
  it('rejects name starting with number', () => {

src/schema/schemas/primitives/http-gateway.ts

@@ -7,10 +7,9 @@ import { z } from 'zod';
 export const HttpGatewayNameSchema = z
  .string()
  .min(1, 'Name is required')
- .max(48)
  .regex(
- /^[a-zA-Z][a-zA-Z0-9-]{0,47}$/,
- 'Must begin with a letter and contain only alphanumeric characters and hyphens (max 48 chars)'
+ /^[a-zA-Z][a-zA-Z0-9-]*$/,
+ 'Gateway name must start with a letter and contain only alphanumeric characters or hyphens (combined with project name must fit 48-char AWS limit)'
  );
 
 export const HttpGatewayTargetSchema = z.object({

src/cli/operations/deploy/__tests__/post-deploy-http-gateways.test.ts

@@ -139,13 +139,13 @@ describe('setupHttpGateways', () => {
 
  expect(mockCreateHttpGateway).toHaveBeenCalledWith({
  region: 'us-east-1',
- name: 'MyHttpGw',
+ name: 'TestProject-MyHttpGw',
  roleArn: 'arn:aws:iam::123456789012:role/ExistingRole',
  });
  expect(mockCreateHttpGatewayTarget).toHaveBeenCalledWith({
  region: 'us-east-1',
  gatewayId: 'gw-001',
- targetName: 'my-agent',
+ targetName: 'TestProject-my-agent',
  runtimeArn: 'arn:aws:bedrock-agentcore:us-east-1:123456789012:runtime/rt-123',
  });
  });
@@ -175,7 +175,7 @@ describe('setupHttpGateways', () => {
 
  it('finds gateway by name via list (state loss recovery)', async () => {
  mockListAllHttpGateways.mockResolvedValue([
- { name: 'MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
+ { name: 'TestProject-MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
  ]);
 
  const result = await setupHttpGateways({
@@ -190,6 +190,39 @@ describe('setupHttpGateways', () => {
  expect(mockCreateHttpGateway).not.toHaveBeenCalled();
  });
 
+ it('recovers state using legacy (pre-migration) gateway name when prefixed name not found', async () => {
+ // First call: prefixed name "TestProject-MyHttpGw" → not found
+ // Second call: unprefixed legacy name "MyHttpGw" → found
+ mockListAllHttpGateways
+ .mockResolvedValueOnce([])
+ .mockResolvedValueOnce([{ name: 'MyHttpGw', gatewayId: 'gw-legacy', gatewayArn: 'arn:httpgw:legacy' }]);
+
+ const warnSpy = vi.spyOn(console, 'warn').mockReturnValue(undefined);
+
+ const result = await setupHttpGateways({
+ region: 'us-east-1',
+ projectName: 'TestProject',
+ projectSpec: makeProjectSpec([sampleHttpGateway]),
+ deployedResources: sampleDeployedResources,
+ });
+
+ // findHttpGatewayByName was called twice: once for prefixed, once for unprefixed name
+ expect(mockListAllHttpGateways).toHaveBeenCalledTimes(2);
+
+ // Gateway result is skipped (not created)
+ expect(result.results[0]!.status).toBe('skipped');
+ expect(result.results[0]!.gatewayId).toBe('gw-legacy');
+ expect(result.httpGateways.MyHttpGw!.gatewayId).toBe('gw-legacy');
+
+ // createHttpGateway was NOT called
+ expect(mockCreateHttpGateway).not.toHaveBeenCalled();
+
+ // console.warn was called with the pre-migration warning text
+ expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('pre-migration name'));
+
+ warnSpy.mockRestore();
+ });
+
  it('reports error on missing runtime ref', async () => {
  const emptyDeployedResources = {} as unknown as DeployedResourceState;
 

src/cli/operations/deploy/__tests__/preflight.test.ts

@@ -126,6 +126,51 @@ describe('validateProject', () => {
  expect(result.projectSpec.name).toBe('test-project');
  expect(result.isTeardownDeploy).toBe(false);
  });
+
+ it('rejects gateway target name that exceeds 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (39) = 49 > 48
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(39), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ await expect(validateProject()).rejects.toThrow(
+ 'HTTP gateway target "' + 'a'.repeat(39) + '" in gateway "gw" would exceed the 48-character AWS limit'
+ );
+ });
+
+ it('accepts gateway target name within 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (38) = 48 == limit
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(38), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ const result = await validateProject();
+ expect(result.projectSpec.name).toBe('myproject');
+ });
 });
 
 describe('formatError', () => {

src/cli/operations/deploy/post-deploy-ab-tests.ts

@@ -142,7 +142,7 @@ export async function setupABTests(options: SetupABTestsOptions): Promise<SetupA
  const existingTest = existingABTests?.[testSpec.name];
 
  // Resolve ARN references from deployed state
- const resolvedVariants = resolveVariants(testSpec.variants, deployedResources);
+ const resolvedVariants = resolveVariants(testSpec.variants, projectSpec.name, deployedResources);
  const resolvedGatewayArn = resolveGatewayArn(testSpec.gatewayRef, deployedResources);
  if (!resolvedGatewayArn.startsWith('arn:') || resolvedGatewayArn.split(':').length < 6) {
  results.push({
@@ -409,7 +409,8 @@ async function findABTestByName(
 /**
  * Resolve variant config bundle references.
  * If bundleArn is a name (not an ARN), look it up in deployed config bundles.
- * Target-based variants are passed through as-is.
+ * Target-based variants have their target name prefixed with projectName to match
+ * what post-deploy-http-gateways.ts creates on AWS (e.g. `${projectName}-${tgt.name}`).
  */
 function resolveVariants(
  variants: {
@@ -420,6 +421,7 @@ function resolveVariants(
  target?: { targetName: string };
  };
  }[],
+ projectName: string,
  deployedResources?: DeployedResourceState
 ): ABTestVariant[] {
  return variants.map(v => {
@@ -436,12 +438,15 @@ function resolveVariants(
  },
  };
  }
- // Target-based variant — pass through
+ // Target-based variant — prepend projectName to match the AWS-side name created by
+ // post-deploy-http-gateways.ts: `${projectName}-${tgt.name}`
  return {
  name: v.name,
  weight: v.weight,
  variantConfiguration: {
- ...(v.variantConfiguration.target && { target: { name: v.variantConfiguration.target.targetName } }),
+ ...(v.variantConfiguration.target && {
+ target: { name: resolveTargetName(v.variantConfiguration.target.targetName, projectName) },
+ }),
  },
  };
  });
@@ -475,6 +480,18 @@ function resolveConfigBundleVersion(
  return versionRef;
 }
 
+/**
+ * Resolve a variant target name, applying the project prefix if not already present.
+ * This handles legacy configs that were created before the prefix requirement.
+ */
+function resolveTargetName(targetName: string, projectName: string): string {
+ // If the target name already starts with the project prefix, use as-is to avoid double-prefixing
+ if (targetName.startsWith(`${projectName}-`)) {
+ return targetName;
+ }
+ return `${projectName}-${targetName}`;
+}
+
 function resolveGatewayArn(ref: string, deployedResources?: DeployedResourceState): string {
  if (ref.startsWith('arn:')) return ref;
 

src/cli/operations/deploy/post-deploy-http-gateways.ts

@@ -101,7 +101,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  for (const tgt of gwSpec.targets) {
- const existingTarget = existingTargetsByName.get(tgt.name);
+ const existingTarget = existingTargetsByName.get(`${projectName}-${tgt.name}`);
  if (existingTarget) {
  // Target exists by name — check if qualifier matches
  try {
@@ -143,7 +143,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: existingGateway.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });
@@ -170,7 +170,8 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  // Try to find by name via list (handles re-creation after state loss)
- const existingByName = await findHttpGatewayByName(region, gwSpec.name);
+ const prefixedGatewayName = `${projectName}-${gwSpec.name}`;
+ const existingByName = await findHttpGatewayByName(region, prefixedGatewayName);
  if (existingByName) {
  console.warn(
  `Warning: HTTP gateway "${gwSpec.name}" found by name but local state was lost. Target and role state may be incomplete — consider re-deploying.`
@@ -189,6 +190,29 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  continue;
  }
 
+ // Migration fallback: try unprefixed name for pre-PR gateways (Comment 3 fix)
+ const existingByLegacyName = await findHttpGatewayByName(region, gwSpec.name);
+ if (existingByLegacyName) {
+ console.warn(
+ `Warning: HTTP gateway "${gwSpec.name}" was found using its pre-migration name. ` +
+ `This CLI version uses the naming convention "${prefixedGatewayName}". ` +
+ `The gateway has been recovered from state loss. ` +
+ `You may want to rename "${gwSpec.name}" to "${prefixedGatewayName}" on AWS to match the new convention.`
+ );
+ httpGateways[gwSpec.name] = {
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ // targetId, roleArn, roleCreatedByCli unknown after state-loss recovery
+ };
+ results.push({
+ gatewayName: gwSpec.name,
+ status: 'skipped',
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ });
+ continue;
+ }
+
  // Resolve runtime ARN from deployed state
  const runtimeState = deployedResources?.runtimes?.[gwSpec.runtimeRef];
  if (!runtimeState) {
@@ -216,7 +240,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  // Creating HTTP gateway for runtime
  const createResult = await createHttpGateway({
  region,
- name: gwSpec.name,
+ name: `${projectName}-${gwSpec.name}`,
  roleArn: resolvedRoleArn,
  });
 
@@ -231,7 +255,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const targetResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: gwSpec.runtimeRef,
+ targetName: `${projectName}-${gwSpec.runtimeRef}`,
  runtimeArn,
  });
 
@@ -288,7 +312,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });

src/cli/operations/deploy/preflight.ts

@@ -59,6 +59,7 @@ export function formatError(err: unknown): string {
  * Returns the project context needed for subsequent steps.
  */
 const MAX_RUNTIME_NAME_LENGTH = 48;
+const MAX_GATEWAY_COMBINED_NAME_LENGTH = 48;
 
 export async function validateProject(): Promise<PreflightContext> {
  // Find the agentcore config directory, walking up from cwd if needed
@@ -108,6 +109,9 @@ export async function validateProject(): Promise<PreflightContext> {
  // Validate runtime names don't exceed AWS limits
  validateRuntimeNames(projectSpec);
 
+ // Validate HTTP gateway names don't exceed AWS limits when combined with project name
+ validateHttpGatewayNames(projectSpec);
+
  // Validate Container agents have Dockerfiles
  validateContainerAgents(projectSpec, configRoot);
 
@@ -140,6 +144,36 @@ function validateRuntimeNames(projectSpec: AgentCoreProjectSpec): void {
  }
 }
 
+/**
+ * Validates that combined HTTP gateway names (projectName-gatewayName) don't exceed AWS limits.
+ */
+function validateHttpGatewayNames(projectSpec: AgentCoreProjectSpec): void {
+ const projectName = projectSpec.name;
+ for (const gateway of projectSpec.httpGateways ?? []) {
+ const gwName = gateway.name;
+ if (gwName) {
+ const combinedName = `${projectName}-${gwName}`;
+ if (combinedName.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ throw new Error(
+ `HTTP gateway name too long: "${combinedName}" (${combinedName.length} chars). ` +
+ `AWS limits gateway names to ${MAX_GATEWAY_COMBINED_NAME_LENGTH} characters. ` +
+ `Shorten the project name or gateway name in agentcore.json.`
+ );
+ }
+ }
+ for (const target of gateway.targets ?? []) {
+ const combined = `${projectName}-${target.name}`;
+ if (combined.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ const maxTargetLen = MAX_GATEWAY_COMBINED_NAME_LENGTH - projectName.length - 1;
+ throw new Error(
+ `HTTP gateway target "${target.name}" in gateway "${gwName}" would exceed the ${MAX_GATEWAY_COMBINED_NAME_LENGTH}-character AWS limit when prefixed with project name "${projectName}-" (total: ${combined.length} chars). ` +
+ `Shorten the target name to ${maxTargetLen} characters or fewer.`
+ );
+ }
+ }
+ }
+}
+
 /**
  * Validates that Container agents have required Dockerfiles.
  */

src/schema/schemas/primitives/__tests__/http-gateway.test.ts

@@ -22,12 +22,12 @@ describe('HttpGatewayNameSchema', () => {
  expect(HttpGatewayNameSchema.safeParse('my_gateway').success).toBe(false);
  });
 
- it('rejects name over 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(49)).success).toBe(false);
+ it('accepts name longer than 24 chars', () => {
+ expect(HttpGatewayNameSchema.safeParse('a'.repeat(25)).success).toBe(true);
  });
 
- it('accepts name at 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(48)).success).toBe(true);
+ it('accepts name at 47 chars (room for 1-char project name + hyphen)', () => {
+ expect(HttpGatewayNameSchema.safeParse('a' + 'b'.repeat(46)).success).toBe(true);
  });
 });
 
@@ -60,8 +60,8 @@ describe('HttpGatewaySchema', () => {
  expect(HttpGatewaySchema.safeParse(withoutRuntimeRef).success).toBe(false);
  });
 
- it('rejects name too long (>48 chars)', () => {
- expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a'.repeat(49) }).success).toBe(false);
+ it('accepts name longer than 24 chars (no standalone max cap)', () => {
+ expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a' + 'b'.repeat(30) }).success).toBe(true);
  });
 
  it('rejects name starting with number', () => {

src/schema/schemas/primitives/http-gateway.ts

@@ -7,10 +7,9 @@ import { z } from 'zod';
 export const HttpGatewayNameSchema = z
  .string()
  .min(1, 'Name is required')
- .max(48)
  .regex(
- /^[a-zA-Z][a-zA-Z0-9-]{0,47}$/,
- 'Must begin with a letter and contain only alphanumeric characters and hyphens (max 48 chars)'
+ /^[a-zA-Z][a-zA-Z0-9-]*$/,
+ 'Gateway name must start with a letter and contain only alphanumeric characters or hyphens (combined with project name must fit 48-char AWS limit)'
  );
 
 export const HttpGatewayTargetSchema = z.object({

src/cli/operations/deploy/__tests__/post-deploy-http-gateways.test.ts

@@ -139,13 +139,13 @@ describe('setupHttpGateways', () => {
 
  expect(mockCreateHttpGateway).toHaveBeenCalledWith({
  region: 'us-east-1',
- name: 'MyHttpGw',
+ name: 'TestProject-MyHttpGw',
  roleArn: 'arn:aws:iam::123456789012:role/ExistingRole',
  });
  expect(mockCreateHttpGatewayTarget).toHaveBeenCalledWith({
  region: 'us-east-1',
  gatewayId: 'gw-001',
- targetName: 'my-agent',
+ targetName: 'TestProject-my-agent',
  runtimeArn: 'arn:aws:bedrock-agentcore:us-east-1:123456789012:runtime/rt-123',
  });
  });
@@ -175,7 +175,7 @@ describe('setupHttpGateways', () => {
 
  it('finds gateway by name via list (state loss recovery)', async () => {
  mockListAllHttpGateways.mockResolvedValue([
- { name: 'MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
+ { name: 'TestProject-MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
  ]);
 
  const result = await setupHttpGateways({
@@ -190,6 +190,39 @@ describe('setupHttpGateways', () => {
  expect(mockCreateHttpGateway).not.toHaveBeenCalled();
  });
 
+ it('recovers state using legacy (pre-migration) gateway name when prefixed name not found', async () => {
+ // First call: prefixed name "TestProject-MyHttpGw" → not found
+ // Second call: unprefixed legacy name "MyHttpGw" → found
+ mockListAllHttpGateways
+ .mockResolvedValueOnce([])
+ .mockResolvedValueOnce([{ name: 'MyHttpGw', gatewayId: 'gw-legacy', gatewayArn: 'arn:httpgw:legacy' }]);
+
+ const warnSpy = vi.spyOn(console, 'warn').mockReturnValue(undefined);
+
+ const result = await setupHttpGateways({
+ region: 'us-east-1',
+ projectName: 'TestProject',
+ projectSpec: makeProjectSpec([sampleHttpGateway]),
+ deployedResources: sampleDeployedResources,
+ });
+
+ // findHttpGatewayByName was called twice: once for prefixed, once for unprefixed name
+ expect(mockListAllHttpGateways).toHaveBeenCalledTimes(2);
+
+ // Gateway result is skipped (not created)
+ expect(result.results[0]!.status).toBe('skipped');
+ expect(result.results[0]!.gatewayId).toBe('gw-legacy');
+ expect(result.httpGateways.MyHttpGw!.gatewayId).toBe('gw-legacy');
+
+ // createHttpGateway was NOT called
+ expect(mockCreateHttpGateway).not.toHaveBeenCalled();
+
+ // console.warn was called with the pre-migration warning text
+ expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('pre-migration name'));
+
+ warnSpy.mockRestore();
+ });
+
  it('reports error on missing runtime ref', async () => {
  const emptyDeployedResources = {} as unknown as DeployedResourceState;
 

src/cli/operations/deploy/__tests__/preflight.test.ts

@@ -126,6 +126,51 @@ describe('validateProject', () => {
  expect(result.projectSpec.name).toBe('test-project');
  expect(result.isTeardownDeploy).toBe(false);
  });
+
+ it('rejects gateway target name that exceeds 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (39) = 49 > 48
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(39), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ await expect(validateProject()).rejects.toThrow(
+ 'HTTP gateway target "' + 'a'.repeat(39) + '" in gateway "gw" would exceed the 48-character AWS limit'
+ );
+ });
+
+ it('accepts gateway target name within 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (38) = 48 == limit
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(38), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ const result = await validateProject();
+ expect(result.projectSpec.name).toBe('myproject');
+ });
 });
 
 describe('formatError', () => {

src/cli/operations/deploy/post-deploy-ab-tests.ts

@@ -142,7 +142,7 @@ export async function setupABTests(options: SetupABTestsOptions): Promise<SetupA
  const existingTest = existingABTests?.[testSpec.name];
 
  // Resolve ARN references from deployed state
- const resolvedVariants = resolveVariants(testSpec.variants, deployedResources);
+ const resolvedVariants = resolveVariants(testSpec.variants, projectSpec.name, deployedResources);
  const resolvedGatewayArn = resolveGatewayArn(testSpec.gatewayRef, deployedResources);
  if (!resolvedGatewayArn.startsWith('arn:') || resolvedGatewayArn.split(':').length < 6) {
  results.push({
@@ -409,7 +409,8 @@ async function findABTestByName(
 /**
  * Resolve variant config bundle references.
  * If bundleArn is a name (not an ARN), look it up in deployed config bundles.
- * Target-based variants are passed through as-is.
+ * Target-based variants have their target name prefixed with projectName to match
+ * what post-deploy-http-gateways.ts creates on AWS (e.g. `${projectName}-${tgt.name}`).
  */
 function resolveVariants(
  variants: {
@@ -420,6 +421,7 @@ function resolveVariants(
  target?: { targetName: string };
  };
  }[],
+ projectName: string,
  deployedResources?: DeployedResourceState
 ): ABTestVariant[] {
  return variants.map(v => {
@@ -436,12 +438,15 @@ function resolveVariants(
  },
  };
  }
- // Target-based variant — pass through
+ // Target-based variant — prepend projectName to match the AWS-side name created by
+ // post-deploy-http-gateways.ts: `${projectName}-${tgt.name}`
  return {
  name: v.name,
  weight: v.weight,
  variantConfiguration: {
- ...(v.variantConfiguration.target && { target: { name: v.variantConfiguration.target.targetName } }),
+ ...(v.variantConfiguration.target && {
+ target: { name: resolveTargetName(v.variantConfiguration.target.targetName, projectName) },
+ }),
  },
  };
  });
@@ -475,6 +480,18 @@ function resolveConfigBundleVersion(
  return versionRef;
 }
 
+/**
+ * Resolve a variant target name, applying the project prefix if not already present.
+ * This handles legacy configs that were created before the prefix requirement.
+ */
+function resolveTargetName(targetName: string, projectName: string): string {
+ // If the target name already starts with the project prefix, use as-is to avoid double-prefixing
+ if (targetName.startsWith(`${projectName}-`)) {
+ return targetName;
+ }
+ return `${projectName}-${targetName}`;
+}
+
 function resolveGatewayArn(ref: string, deployedResources?: DeployedResourceState): string {
  if (ref.startsWith('arn:')) return ref;
 

src/cli/operations/deploy/post-deploy-http-gateways.ts

@@ -101,7 +101,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  for (const tgt of gwSpec.targets) {
- const existingTarget = existingTargetsByName.get(tgt.name);
+ const existingTarget = existingTargetsByName.get(`${projectName}-${tgt.name}`);
  if (existingTarget) {
  // Target exists by name — check if qualifier matches
  try {
@@ -143,7 +143,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: existingGateway.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });
@@ -170,7 +170,8 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  // Try to find by name via list (handles re-creation after state loss)
- const existingByName = await findHttpGatewayByName(region, gwSpec.name);
+ const prefixedGatewayName = `${projectName}-${gwSpec.name}`;
+ const existingByName = await findHttpGatewayByName(region, prefixedGatewayName);
  if (existingByName) {
  console.warn(
  `Warning: HTTP gateway "${gwSpec.name}" found by name but local state was lost. Target and role state may be incomplete — consider re-deploying.`
@@ -189,6 +190,29 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  continue;
  }
 
+ // Migration fallback: try unprefixed name for pre-PR gateways (Comment 3 fix)
+ const existingByLegacyName = await findHttpGatewayByName(region, gwSpec.name);
+ if (existingByLegacyName) {
+ console.warn(
+ `Warning: HTTP gateway "${gwSpec.name}" was found using its pre-migration name. ` +
+ `This CLI version uses the naming convention "${prefixedGatewayName}". ` +
+ `The gateway has been recovered from state loss. ` +
+ `You may want to rename "${gwSpec.name}" to "${prefixedGatewayName}" on AWS to match the new convention.`
+ );
+ httpGateways[gwSpec.name] = {
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ // targetId, roleArn, roleCreatedByCli unknown after state-loss recovery
+ };
+ results.push({
+ gatewayName: gwSpec.name,
+ status: 'skipped',
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ });
+ continue;
+ }
+
  // Resolve runtime ARN from deployed state
  const runtimeState = deployedResources?.runtimes?.[gwSpec.runtimeRef];
  if (!runtimeState) {
@@ -216,7 +240,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  // Creating HTTP gateway for runtime
  const createResult = await createHttpGateway({
  region,
- name: gwSpec.name,
+ name: `${projectName}-${gwSpec.name}`,
  roleArn: resolvedRoleArn,
  });
 
@@ -231,7 +255,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const targetResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: gwSpec.runtimeRef,
+ targetName: `${projectName}-${gwSpec.runtimeRef}`,
  runtimeArn,
  });
 
@@ -288,7 +312,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });

src/cli/operations/deploy/preflight.ts

@@ -59,6 +59,7 @@ export function formatError(err: unknown): string {
  * Returns the project context needed for subsequent steps.
  */
 const MAX_RUNTIME_NAME_LENGTH = 48;
+const MAX_GATEWAY_COMBINED_NAME_LENGTH = 48;
 
 export async function validateProject(): Promise<PreflightContext> {
  // Find the agentcore config directory, walking up from cwd if needed
@@ -108,6 +109,9 @@ export async function validateProject(): Promise<PreflightContext> {
  // Validate runtime names don't exceed AWS limits
  validateRuntimeNames(projectSpec);
 
+ // Validate HTTP gateway names don't exceed AWS limits when combined with project name
+ validateHttpGatewayNames(projectSpec);
+
  // Validate Container agents have Dockerfiles
  validateContainerAgents(projectSpec, configRoot);
 
@@ -140,6 +144,36 @@ function validateRuntimeNames(projectSpec: AgentCoreProjectSpec): void {
  }
 }
 
+/**
+ * Validates that combined HTTP gateway names (projectName-gatewayName) don't exceed AWS limits.
+ */
+function validateHttpGatewayNames(projectSpec: AgentCoreProjectSpec): void {
+ const projectName = projectSpec.name;
+ for (const gateway of projectSpec.httpGateways ?? []) {
+ const gwName = gateway.name;
+ if (gwName) {
+ const combinedName = `${projectName}-${gwName}`;
+ if (combinedName.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ throw new Error(
+ `HTTP gateway name too long: "${combinedName}" (${combinedName.length} chars). ` +
+ `AWS limits gateway names to ${MAX_GATEWAY_COMBINED_NAME_LENGTH} characters. ` +
+ `Shorten the project name or gateway name in agentcore.json.`
+ );
+ }
+ }
+ for (const target of gateway.targets ?? []) {
+ const combined = `${projectName}-${target.name}`;
+ if (combined.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ const maxTargetLen = MAX_GATEWAY_COMBINED_NAME_LENGTH - projectName.length - 1;
+ throw new Error(
+ `HTTP gateway target "${target.name}" in gateway "${gwName}" would exceed the ${MAX_GATEWAY_COMBINED_NAME_LENGTH}-character AWS limit when prefixed with project name "${projectName}-" (total: ${combined.length} chars). ` +
+ `Shorten the target name to ${maxTargetLen} characters or fewer.`
+ );
+ }
+ }
+ }
+}
+
 /**
  * Validates that Container agents have required Dockerfiles.
  */

src/schema/schemas/primitives/__tests__/http-gateway.test.ts

@@ -22,12 +22,12 @@ describe('HttpGatewayNameSchema', () => {
  expect(HttpGatewayNameSchema.safeParse('my_gateway').success).toBe(false);
  });
 
- it('rejects name over 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(49)).success).toBe(false);
+ it('accepts name longer than 24 chars', () => {
+ expect(HttpGatewayNameSchema.safeParse('a'.repeat(25)).success).toBe(true);
  });
 
- it('accepts name at 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(48)).success).toBe(true);
+ it('accepts name at 47 chars (room for 1-char project name + hyphen)', () => {
+ expect(HttpGatewayNameSchema.safeParse('a' + 'b'.repeat(46)).success).toBe(true);
  });
 });
 
@@ -60,8 +60,8 @@ describe('HttpGatewaySchema', () => {
  expect(HttpGatewaySchema.safeParse(withoutRuntimeRef).success).toBe(false);
  });
 
- it('rejects name too long (>48 chars)', () => {
- expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a'.repeat(49) }).success).toBe(false);
+ it('accepts name longer than 24 chars (no standalone max cap)', () => {
+ expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a' + 'b'.repeat(30) }).success).toBe(true);
  });
 
  it('rejects name starting with number', () => {

src/schema/schemas/primitives/http-gateway.ts

@@ -7,10 +7,9 @@ import { z } from 'zod';
 export const HttpGatewayNameSchema = z
  .string()
  .min(1, 'Name is required')
- .max(48)
  .regex(
- /^[a-zA-Z][a-zA-Z0-9-]{0,47}$/,
- 'Must begin with a letter and contain only alphanumeric characters and hyphens (max 48 chars)'
+ /^[a-zA-Z][a-zA-Z0-9-]*$/,
+ 'Gateway name must start with a letter and contain only alphanumeric characters or hyphens (combined with project name must fit 48-char AWS limit)'
  );
 
 export const HttpGatewayTargetSchema = z.object({

src/cli/operations/deploy/__tests__/post-deploy-http-gateways.test.ts

@@ -139,13 +139,13 @@ describe('setupHttpGateways', () => {
 
  expect(mockCreateHttpGateway).toHaveBeenCalledWith({
  region: 'us-east-1',
- name: 'MyHttpGw',
+ name: 'TestProject-MyHttpGw',
  roleArn: 'arn:aws:iam::123456789012:role/ExistingRole',
  });
  expect(mockCreateHttpGatewayTarget).toHaveBeenCalledWith({
  region: 'us-east-1',
  gatewayId: 'gw-001',
- targetName: 'my-agent',
+ targetName: 'TestProject-my-agent',
  runtimeArn: 'arn:aws:bedrock-agentcore:us-east-1:123456789012:runtime/rt-123',
  });
  });
@@ -175,7 +175,7 @@ describe('setupHttpGateways', () => {
 
  it('finds gateway by name via list (state loss recovery)', async () => {
  mockListAllHttpGateways.mockResolvedValue([
- { name: 'MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
+ { name: 'TestProject-MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
  ]);
 
  const result = await setupHttpGateways({
@@ -190,6 +190,39 @@ describe('setupHttpGateways', () => {
  expect(mockCreateHttpGateway).not.toHaveBeenCalled();
  });
 
+ it('recovers state using legacy (pre-migration) gateway name when prefixed name not found', async () => {
+ // First call: prefixed name "TestProject-MyHttpGw" → not found
+ // Second call: unprefixed legacy name "MyHttpGw" → found
+ mockListAllHttpGateways
+ .mockResolvedValueOnce([])
+ .mockResolvedValueOnce([{ name: 'MyHttpGw', gatewayId: 'gw-legacy', gatewayArn: 'arn:httpgw:legacy' }]);
+
+ const warnSpy = vi.spyOn(console, 'warn').mockReturnValue(undefined);
+
+ const result = await setupHttpGateways({
+ region: 'us-east-1',
+ projectName: 'TestProject',
+ projectSpec: makeProjectSpec([sampleHttpGateway]),
+ deployedResources: sampleDeployedResources,
+ });
+
+ // findHttpGatewayByName was called twice: once for prefixed, once for unprefixed name
+ expect(mockListAllHttpGateways).toHaveBeenCalledTimes(2);
+
+ // Gateway result is skipped (not created)
+ expect(result.results[0]!.status).toBe('skipped');
+ expect(result.results[0]!.gatewayId).toBe('gw-legacy');
+ expect(result.httpGateways.MyHttpGw!.gatewayId).toBe('gw-legacy');
+
+ // createHttpGateway was NOT called
+ expect(mockCreateHttpGateway).not.toHaveBeenCalled();
+
+ // console.warn was called with the pre-migration warning text
+ expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('pre-migration name'));
+
+ warnSpy.mockRestore();
+ });
+
  it('reports error on missing runtime ref', async () => {
  const emptyDeployedResources = {} as unknown as DeployedResourceState;
 

src/cli/operations/deploy/__tests__/preflight.test.ts

@@ -126,6 +126,51 @@ describe('validateProject', () => {
  expect(result.projectSpec.name).toBe('test-project');
  expect(result.isTeardownDeploy).toBe(false);
  });
+
+ it('rejects gateway target name that exceeds 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (39) = 49 > 48
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(39), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ await expect(validateProject()).rejects.toThrow(
+ 'HTTP gateway target "' + 'a'.repeat(39) + '" in gateway "gw" would exceed the 48-character AWS limit'
+ );
+ });
+
+ it('accepts gateway target name within 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (38) = 48 == limit
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(38), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ const result = await validateProject();
+ expect(result.projectSpec.name).toBe('myproject');
+ });
 });
 
 describe('formatError', () => {

src/cli/operations/deploy/post-deploy-ab-tests.ts

@@ -142,7 +142,7 @@ export async function setupABTests(options: SetupABTestsOptions): Promise<SetupA
  const existingTest = existingABTests?.[testSpec.name];
 
  // Resolve ARN references from deployed state
- const resolvedVariants = resolveVariants(testSpec.variants, deployedResources);
+ const resolvedVariants = resolveVariants(testSpec.variants, projectSpec.name, deployedResources);
  const resolvedGatewayArn = resolveGatewayArn(testSpec.gatewayRef, deployedResources);
  if (!resolvedGatewayArn.startsWith('arn:') || resolvedGatewayArn.split(':').length < 6) {
  results.push({
@@ -409,7 +409,8 @@ async function findABTestByName(
 /**
  * Resolve variant config bundle references.
  * If bundleArn is a name (not an ARN), look it up in deployed config bundles.
- * Target-based variants are passed through as-is.
+ * Target-based variants have their target name prefixed with projectName to match
+ * what post-deploy-http-gateways.ts creates on AWS (e.g. `${projectName}-${tgt.name}`).
  */
 function resolveVariants(
  variants: {
@@ -420,6 +421,7 @@ function resolveVariants(
  target?: { targetName: string };
  };
  }[],
+ projectName: string,
  deployedResources?: DeployedResourceState
 ): ABTestVariant[] {
  return variants.map(v => {
@@ -436,12 +438,15 @@ function resolveVariants(
  },
  };
  }
- // Target-based variant — pass through
+ // Target-based variant — prepend projectName to match the AWS-side name created by
+ // post-deploy-http-gateways.ts: `${projectName}-${tgt.name}`
  return {
  name: v.name,
  weight: v.weight,
  variantConfiguration: {
- ...(v.variantConfiguration.target && { target: { name: v.variantConfiguration.target.targetName } }),
+ ...(v.variantConfiguration.target && {
+ target: { name: resolveTargetName(v.variantConfiguration.target.targetName, projectName) },
+ }),
  },
  };
  });
@@ -475,6 +480,18 @@ function resolveConfigBundleVersion(
  return versionRef;
 }
 
+/**
+ * Resolve a variant target name, applying the project prefix if not already present.
+ * This handles legacy configs that were created before the prefix requirement.
+ */
+function resolveTargetName(targetName: string, projectName: string): string {
+ // If the target name already starts with the project prefix, use as-is to avoid double-prefixing
+ if (targetName.startsWith(`${projectName}-`)) {
+ return targetName;
+ }
+ return `${projectName}-${targetName}`;
+}
+
 function resolveGatewayArn(ref: string, deployedResources?: DeployedResourceState): string {
  if (ref.startsWith('arn:')) return ref;
 

src/cli/operations/deploy/post-deploy-http-gateways.ts

@@ -101,7 +101,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  for (const tgt of gwSpec.targets) {
- const existingTarget = existingTargetsByName.get(tgt.name);
+ const existingTarget = existingTargetsByName.get(`${projectName}-${tgt.name}`);
  if (existingTarget) {
  // Target exists by name — check if qualifier matches
  try {
@@ -143,7 +143,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: existingGateway.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });
@@ -170,7 +170,8 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  // Try to find by name via list (handles re-creation after state loss)
- const existingByName = await findHttpGatewayByName(region, gwSpec.name);
+ const prefixedGatewayName = `${projectName}-${gwSpec.name}`;
+ const existingByName = await findHttpGatewayByName(region, prefixedGatewayName);
  if (existingByName) {
  console.warn(
  `Warning: HTTP gateway "${gwSpec.name}" found by name but local state was lost. Target and role state may be incomplete — consider re-deploying.`
@@ -189,6 +190,29 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  continue;
  }
 
+ // Migration fallback: try unprefixed name for pre-PR gateways (Comment 3 fix)
+ const existingByLegacyName = await findHttpGatewayByName(region, gwSpec.name);
+ if (existingByLegacyName) {
+ console.warn(
+ `Warning: HTTP gateway "${gwSpec.name}" was found using its pre-migration name. ` +
+ `This CLI version uses the naming convention "${prefixedGatewayName}". ` +
+ `The gateway has been recovered from state loss. ` +
+ `You may want to rename "${gwSpec.name}" to "${prefixedGatewayName}" on AWS to match the new convention.`
+ );
+ httpGateways[gwSpec.name] = {
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ // targetId, roleArn, roleCreatedByCli unknown after state-loss recovery
+ };
+ results.push({
+ gatewayName: gwSpec.name,
+ status: 'skipped',
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ });
+ continue;
+ }
+
  // Resolve runtime ARN from deployed state
  const runtimeState = deployedResources?.runtimes?.[gwSpec.runtimeRef];
  if (!runtimeState) {
@@ -216,7 +240,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  // Creating HTTP gateway for runtime
  const createResult = await createHttpGateway({
  region,
- name: gwSpec.name,
+ name: `${projectName}-${gwSpec.name}`,
  roleArn: resolvedRoleArn,
  });
 
@@ -231,7 +255,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const targetResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: gwSpec.runtimeRef,
+ targetName: `${projectName}-${gwSpec.runtimeRef}`,
  runtimeArn,
  });
 
@@ -288,7 +312,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });

src/cli/operations/deploy/preflight.ts

@@ -59,6 +59,7 @@ export function formatError(err: unknown): string {
  * Returns the project context needed for subsequent steps.
  */
 const MAX_RUNTIME_NAME_LENGTH = 48;
+const MAX_GATEWAY_COMBINED_NAME_LENGTH = 48;
 
 export async function validateProject(): Promise<PreflightContext> {
  // Find the agentcore config directory, walking up from cwd if needed
@@ -108,6 +109,9 @@ export async function validateProject(): Promise<PreflightContext> {
  // Validate runtime names don't exceed AWS limits
  validateRuntimeNames(projectSpec);
 
+ // Validate HTTP gateway names don't exceed AWS limits when combined with project name
+ validateHttpGatewayNames(projectSpec);
+
  // Validate Container agents have Dockerfiles
  validateContainerAgents(projectSpec, configRoot);
 
@@ -140,6 +144,36 @@ function validateRuntimeNames(projectSpec: AgentCoreProjectSpec): void {
  }
 }
 
+/**
+ * Validates that combined HTTP gateway names (projectName-gatewayName) don't exceed AWS limits.
+ */
+function validateHttpGatewayNames(projectSpec: AgentCoreProjectSpec): void {
+ const projectName = projectSpec.name;
+ for (const gateway of projectSpec.httpGateways ?? []) {
+ const gwName = gateway.name;
+ if (gwName) {
+ const combinedName = `${projectName}-${gwName}`;
+ if (combinedName.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ throw new Error(
+ `HTTP gateway name too long: "${combinedName}" (${combinedName.length} chars). ` +
+ `AWS limits gateway names to ${MAX_GATEWAY_COMBINED_NAME_LENGTH} characters. ` +
+ `Shorten the project name or gateway name in agentcore.json.`
+ );
+ }
+ }
+ for (const target of gateway.targets ?? []) {
+ const combined = `${projectName}-${target.name}`;
+ if (combined.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ const maxTargetLen = MAX_GATEWAY_COMBINED_NAME_LENGTH - projectName.length - 1;
+ throw new Error(
+ `HTTP gateway target "${target.name}" in gateway "${gwName}" would exceed the ${MAX_GATEWAY_COMBINED_NAME_LENGTH}-character AWS limit when prefixed with project name "${projectName}-" (total: ${combined.length} chars). ` +
+ `Shorten the target name to ${maxTargetLen} characters or fewer.`
+ );
+ }
+ }
+ }
+}
+
 /**
  * Validates that Container agents have required Dockerfiles.
  */

src/schema/schemas/primitives/__tests__/http-gateway.test.ts

@@ -22,12 +22,12 @@ describe('HttpGatewayNameSchema', () => {
  expect(HttpGatewayNameSchema.safeParse('my_gateway').success).toBe(false);
  });
 
- it('rejects name over 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(49)).success).toBe(false);
+ it('accepts name longer than 24 chars', () => {
+ expect(HttpGatewayNameSchema.safeParse('a'.repeat(25)).success).toBe(true);
  });
 
- it('accepts name at 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(48)).success).toBe(true);
+ it('accepts name at 47 chars (room for 1-char project name + hyphen)', () => {
+ expect(HttpGatewayNameSchema.safeParse('a' + 'b'.repeat(46)).success).toBe(true);
  });
 });
 
@@ -60,8 +60,8 @@ describe('HttpGatewaySchema', () => {
  expect(HttpGatewaySchema.safeParse(withoutRuntimeRef).success).toBe(false);
  });
 
- it('rejects name too long (>48 chars)', () => {
- expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a'.repeat(49) }).success).toBe(false);
+ it('accepts name longer than 24 chars (no standalone max cap)', () => {
+ expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a' + 'b'.repeat(30) }).success).toBe(true);
  });
 
  it('rejects name starting with number', () => {

src/schema/schemas/primitives/http-gateway.ts

@@ -7,10 +7,9 @@ import { z } from 'zod';
 export const HttpGatewayNameSchema = z
  .string()
  .min(1, 'Name is required')
- .max(48)
  .regex(
- /^[a-zA-Z][a-zA-Z0-9-]{0,47}$/,
- 'Must begin with a letter and contain only alphanumeric characters and hyphens (max 48 chars)'
+ /^[a-zA-Z][a-zA-Z0-9-]*$/,
+ 'Gateway name must start with a letter and contain only alphanumeric characters or hyphens (combined with project name must fit 48-char AWS limit)'
  );
 
 export const HttpGatewayTargetSchema = z.object({

src/cli/operations/deploy/__tests__/post-deploy-http-gateways.test.ts

@@ -139,13 +139,13 @@ describe('setupHttpGateways', () => {
 
  expect(mockCreateHttpGateway).toHaveBeenCalledWith({
  region: 'us-east-1',
- name: 'MyHttpGw',
+ name: 'TestProject-MyHttpGw',
  roleArn: 'arn:aws:iam::123456789012:role/ExistingRole',
  });
  expect(mockCreateHttpGatewayTarget).toHaveBeenCalledWith({
  region: 'us-east-1',
  gatewayId: 'gw-001',
- targetName: 'my-agent',
+ targetName: 'TestProject-my-agent',
  runtimeArn: 'arn:aws:bedrock-agentcore:us-east-1:123456789012:runtime/rt-123',
  });
  });
@@ -175,7 +175,7 @@ describe('setupHttpGateways', () => {
 
  it('finds gateway by name via list (state loss recovery)', async () => {
  mockListAllHttpGateways.mockResolvedValue([
- { name: 'MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
+ { name: 'TestProject-MyHttpGw', gatewayId: 'gw-api', gatewayArn: 'arn:httpgw:api' },
  ]);
 
  const result = await setupHttpGateways({
@@ -190,6 +190,39 @@ describe('setupHttpGateways', () => {
  expect(mockCreateHttpGateway).not.toHaveBeenCalled();
  });
 
+ it('recovers state using legacy (pre-migration) gateway name when prefixed name not found', async () => {
+ // First call: prefixed name "TestProject-MyHttpGw" → not found
+ // Second call: unprefixed legacy name "MyHttpGw" → found
+ mockListAllHttpGateways
+ .mockResolvedValueOnce([])
+ .mockResolvedValueOnce([{ name: 'MyHttpGw', gatewayId: 'gw-legacy', gatewayArn: 'arn:httpgw:legacy' }]);
+
+ const warnSpy = vi.spyOn(console, 'warn').mockReturnValue(undefined);
+
+ const result = await setupHttpGateways({
+ region: 'us-east-1',
+ projectName: 'TestProject',
+ projectSpec: makeProjectSpec([sampleHttpGateway]),
+ deployedResources: sampleDeployedResources,
+ });
+
+ // findHttpGatewayByName was called twice: once for prefixed, once for unprefixed name
+ expect(mockListAllHttpGateways).toHaveBeenCalledTimes(2);
+
+ // Gateway result is skipped (not created)
+ expect(result.results[0]!.status).toBe('skipped');
+ expect(result.results[0]!.gatewayId).toBe('gw-legacy');
+ expect(result.httpGateways.MyHttpGw!.gatewayId).toBe('gw-legacy');
+
+ // createHttpGateway was NOT called
+ expect(mockCreateHttpGateway).not.toHaveBeenCalled();
+
+ // console.warn was called with the pre-migration warning text
+ expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('pre-migration name'));
+
+ warnSpy.mockRestore();
+ });
+
  it('reports error on missing runtime ref', async () => {
  const emptyDeployedResources = {} as unknown as DeployedResourceState;
 

src/cli/operations/deploy/__tests__/preflight.test.ts

@@ -126,6 +126,51 @@ describe('validateProject', () => {
  expect(result.projectSpec.name).toBe('test-project');
  expect(result.isTeardownDeploy).toBe(false);
  });
+
+ it('rejects gateway target name that exceeds 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (39) = 49 > 48
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(39), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ await expect(validateProject()).rejects.toThrow(
+ 'HTTP gateway target "' + 'a'.repeat(39) + '" in gateway "gw" would exceed the 48-character AWS limit'
+ );
+ });
+
+ it('accepts gateway target name within 48 chars when prefixed with project name', async () => {
+ mockRequireConfigRoot.mockReturnValue('/project/agentcore');
+ mockValidate.mockReturnValue(undefined);
+ // projectName "myproject" (9) + "-" (1) + targetName (38) = 48 == limit
+ mockReadProjectSpec.mockResolvedValue({
+ name: 'myproject',
+ runtimes: [],
+ httpGateways: [
+ {
+ name: 'gw',
+ targets: [{ name: 'a'.repeat(38), runtimeRef: 'rt', qualifier: 'DEFAULT' }],
+ },
+ ],
+ agentCoreGateways: [{ name: 'gw' }],
+ });
+ mockReadAWSDeploymentTargets.mockResolvedValue([]);
+ mockValidateAwsCredentials.mockResolvedValue(undefined);
+
+ const result = await validateProject();
+ expect(result.projectSpec.name).toBe('myproject');
+ });
 });
 
 describe('formatError', () => {

src/cli/operations/deploy/post-deploy-ab-tests.ts

@@ -142,7 +142,7 @@ export async function setupABTests(options: SetupABTestsOptions): Promise<SetupA
  const existingTest = existingABTests?.[testSpec.name];
 
  // Resolve ARN references from deployed state
- const resolvedVariants = resolveVariants(testSpec.variants, deployedResources);
+ const resolvedVariants = resolveVariants(testSpec.variants, projectSpec.name, deployedResources);
  const resolvedGatewayArn = resolveGatewayArn(testSpec.gatewayRef, deployedResources);
  if (!resolvedGatewayArn.startsWith('arn:') || resolvedGatewayArn.split(':').length < 6) {
  results.push({
@@ -409,7 +409,8 @@ async function findABTestByName(
 /**
  * Resolve variant config bundle references.
  * If bundleArn is a name (not an ARN), look it up in deployed config bundles.
- * Target-based variants are passed through as-is.
+ * Target-based variants have their target name prefixed with projectName to match
+ * what post-deploy-http-gateways.ts creates on AWS (e.g. `${projectName}-${tgt.name}`).
  */
 function resolveVariants(
  variants: {
@@ -420,6 +421,7 @@ function resolveVariants(
  target?: { targetName: string };
  };
  }[],
+ projectName: string,
  deployedResources?: DeployedResourceState
 ): ABTestVariant[] {
  return variants.map(v => {
@@ -436,12 +438,15 @@ function resolveVariants(
  },
  };
  }
- // Target-based variant — pass through
+ // Target-based variant — prepend projectName to match the AWS-side name created by
+ // post-deploy-http-gateways.ts: `${projectName}-${tgt.name}`
  return {
  name: v.name,
  weight: v.weight,
  variantConfiguration: {
- ...(v.variantConfiguration.target && { target: { name: v.variantConfiguration.target.targetName } }),
+ ...(v.variantConfiguration.target && {
+ target: { name: resolveTargetName(v.variantConfiguration.target.targetName, projectName) },
+ }),
  },
  };
  });
@@ -475,6 +480,18 @@ function resolveConfigBundleVersion(
  return versionRef;
 }
 
+/**
+ * Resolve a variant target name, applying the project prefix if not already present.
+ * This handles legacy configs that were created before the prefix requirement.
+ */
+function resolveTargetName(targetName: string, projectName: string): string {
+ // If the target name already starts with the project prefix, use as-is to avoid double-prefixing
+ if (targetName.startsWith(`${projectName}-`)) {
+ return targetName;
+ }
+ return `${projectName}-${targetName}`;
+}
+
 function resolveGatewayArn(ref: string, deployedResources?: DeployedResourceState): string {
  if (ref.startsWith('arn:')) return ref;
 

src/cli/operations/deploy/post-deploy-http-gateways.ts

@@ -101,7 +101,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  for (const tgt of gwSpec.targets) {
- const existingTarget = existingTargetsByName.get(tgt.name);
+ const existingTarget = existingTargetsByName.get(`${projectName}-${tgt.name}`);
  if (existingTarget) {
  // Target exists by name — check if qualifier matches
  try {
@@ -143,7 +143,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: existingGateway.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });
@@ -170,7 +170,8 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  }
 
  // Try to find by name via list (handles re-creation after state loss)
- const existingByName = await findHttpGatewayByName(region, gwSpec.name);
+ const prefixedGatewayName = `${projectName}-${gwSpec.name}`;
+ const existingByName = await findHttpGatewayByName(region, prefixedGatewayName);
  if (existingByName) {
  console.warn(
  `Warning: HTTP gateway "${gwSpec.name}" found by name but local state was lost. Target and role state may be incomplete — consider re-deploying.`
@@ -189,6 +190,29 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  continue;
  }
 
+ // Migration fallback: try unprefixed name for pre-PR gateways (Comment 3 fix)
+ const existingByLegacyName = await findHttpGatewayByName(region, gwSpec.name);
+ if (existingByLegacyName) {
+ console.warn(
+ `Warning: HTTP gateway "${gwSpec.name}" was found using its pre-migration name. ` +
+ `This CLI version uses the naming convention "${prefixedGatewayName}". ` +
+ `The gateway has been recovered from state loss. ` +
+ `You may want to rename "${gwSpec.name}" to "${prefixedGatewayName}" on AWS to match the new convention.`
+ );
+ httpGateways[gwSpec.name] = {
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ // targetId, roleArn, roleCreatedByCli unknown after state-loss recovery
+ };
+ results.push({
+ gatewayName: gwSpec.name,
+ status: 'skipped',
+ gatewayId: existingByLegacyName.gatewayId,
+ gatewayArn: existingByLegacyName.gatewayArn,
+ });
+ continue;
+ }
+
  // Resolve runtime ARN from deployed state
  const runtimeState = deployedResources?.runtimes?.[gwSpec.runtimeRef];
  if (!runtimeState) {
@@ -216,7 +240,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  // Creating HTTP gateway for runtime
  const createResult = await createHttpGateway({
  region,
- name: gwSpec.name,
+ name: `${projectName}-${gwSpec.name}`,
  roleArn: resolvedRoleArn,
  });
 
@@ -231,7 +255,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const targetResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: gwSpec.runtimeRef,
+ targetName: `${projectName}-${gwSpec.runtimeRef}`,
  runtimeArn,
  });
 
@@ -288,7 +312,7 @@ export async function setupHttpGateways(options: SetupHttpGatewaysOptions): Prom
  const tgtResult = await createHttpGatewayTarget({
  region,
  gatewayId: createResult.gatewayId,
- targetName: tgt.name,
+ targetName: `${projectName}-${tgt.name}`,
  runtimeArn: tgtRuntime.runtimeArn,
  qualifier: tgt.qualifier,
  });

src/cli/operations/deploy/preflight.ts

@@ -59,6 +59,7 @@ export function formatError(err: unknown): string {
  * Returns the project context needed for subsequent steps.
  */
 const MAX_RUNTIME_NAME_LENGTH = 48;
+const MAX_GATEWAY_COMBINED_NAME_LENGTH = 48;
 
 export async function validateProject(): Promise<PreflightContext> {
  // Find the agentcore config directory, walking up from cwd if needed
@@ -108,6 +109,9 @@ export async function validateProject(): Promise<PreflightContext> {
  // Validate runtime names don't exceed AWS limits
  validateRuntimeNames(projectSpec);
 
+ // Validate HTTP gateway names don't exceed AWS limits when combined with project name
+ validateHttpGatewayNames(projectSpec);
+
  // Validate Container agents have Dockerfiles
  validateContainerAgents(projectSpec, configRoot);
 
@@ -140,6 +144,36 @@ function validateRuntimeNames(projectSpec: AgentCoreProjectSpec): void {
  }
 }
 
+/**
+ * Validates that combined HTTP gateway names (projectName-gatewayName) don't exceed AWS limits.
+ */
+function validateHttpGatewayNames(projectSpec: AgentCoreProjectSpec): void {
+ const projectName = projectSpec.name;
+ for (const gateway of projectSpec.httpGateways ?? []) {
+ const gwName = gateway.name;
+ if (gwName) {
+ const combinedName = `${projectName}-${gwName}`;
+ if (combinedName.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ throw new Error(
+ `HTTP gateway name too long: "${combinedName}" (${combinedName.length} chars). ` +
+ `AWS limits gateway names to ${MAX_GATEWAY_COMBINED_NAME_LENGTH} characters. ` +
+ `Shorten the project name or gateway name in agentcore.json.`
+ );
+ }
+ }
+ for (const target of gateway.targets ?? []) {
+ const combined = `${projectName}-${target.name}`;
+ if (combined.length > MAX_GATEWAY_COMBINED_NAME_LENGTH) {
+ const maxTargetLen = MAX_GATEWAY_COMBINED_NAME_LENGTH - projectName.length - 1;
+ throw new Error(
+ `HTTP gateway target "${target.name}" in gateway "${gwName}" would exceed the ${MAX_GATEWAY_COMBINED_NAME_LENGTH}-character AWS limit when prefixed with project name "${projectName}-" (total: ${combined.length} chars). ` +
+ `Shorten the target name to ${maxTargetLen} characters or fewer.`
+ );
+ }
+ }
+ }
+}
+
 /**
  * Validates that Container agents have required Dockerfiles.
  */

src/schema/schemas/primitives/__tests__/http-gateway.test.ts

@@ -22,12 +22,12 @@ describe('HttpGatewayNameSchema', () => {
  expect(HttpGatewayNameSchema.safeParse('my_gateway').success).toBe(false);
  });
 
- it('rejects name over 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(49)).success).toBe(false);
+ it('accepts name longer than 24 chars', () => {
+ expect(HttpGatewayNameSchema.safeParse('a'.repeat(25)).success).toBe(true);
  });
 
- it('accepts name at 48 chars', () => {
- expect(HttpGatewayNameSchema.safeParse('a'.repeat(48)).success).toBe(true);
+ it('accepts name at 47 chars (room for 1-char project name + hyphen)', () => {
+ expect(HttpGatewayNameSchema.safeParse('a' + 'b'.repeat(46)).success).toBe(true);
  });
 });
 
@@ -60,8 +60,8 @@ describe('HttpGatewaySchema', () => {
  expect(HttpGatewaySchema.safeParse(withoutRuntimeRef).success).toBe(false);
  });
 
- it('rejects name too long (>48 chars)', () => {
- expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a'.repeat(49) }).success).toBe(false);
+ it('accepts name longer than 24 chars (no standalone max cap)', () => {
+ expect(HttpGatewaySchema.safeParse({ ...validHttpGateway, name: 'a' + 'b'.repeat(30) }).success).toBe(true);
  });
 
  it('rejects name starting with number', () => {

src/schema/schemas/primitives/http-gateway.ts

@@ -7,10 +7,9 @@ import { z } from 'zod';
 export const HttpGatewayNameSchema = z
  .string()
  .min(1, 'Name is required')
- .max(48)
  .regex(
- /^[a-zA-Z][a-zA-Z0-9-]{0,47}$/,
- 'Must begin with a letter and contain only alphanumeric characters and hyphens (max 48 chars)'
+ /^[a-zA-Z][a-zA-Z0-9-]*$/,
+ 'Gateway name must start with a letter and contain only alphanumeric characters or hyphens (combined with project name must fit 48-char AWS limit)'
  );
 
 export const HttpGatewayTargetSchema = z.object({