Merge pull request #1288 from aws/fix/harness-memory-configuration

fix: align harness memory config with Smithy API model

Author: jesseturner21

src/cli/aws/agentcore-harness.ts

@@ -37,8 +37,15 @@ export interface HarnessSkill {
   path: string;
 }
 
+export interface HarnessAgentCoreMemoryConfiguration {
+  arn: string;
+  actorId?: string;
+  messagesCount?: number;
+  retrievalConfig?: Record<string, { topK?: number; relevanceScore?: number; strategyId?: string }>;
+}
+
 export interface HarnessMemoryConfiguration {
-  memoryArn?: string;
+  agentCoreMemoryConfiguration: HarnessAgentCoreMemoryConfiguration;
 }
 
 export interface HarnessTruncationConfiguration {

src/cli/operations/deploy/imperative/deployers/__tests__/harness-mapper.test.ts

@@ -380,7 +380,9 @@ describe('mapHarnessSpecToCreateOptions', () => {
       });
 
       expect(result.memory).toEqual({
-        memoryArn: 'arn:aws:bedrock-agentcore:us-east-1:123456789012:memory/mem-123',
+        agentCoreMemoryConfiguration: {
+          arn: 'arn:aws:bedrock-agentcore:us-east-1:123456789012:memory/mem-123',
+        },
       });
     });
 
@@ -391,7 +393,9 @@ describe('mapHarnessSpecToCreateOptions', () => {
       const result = await mapHarnessSpecToCreateOptions({ ...BASE_OPTIONS, harnessSpec: spec });
 
       expect(result.memory).toEqual({
-        memoryArn: 'arn:aws:bedrock-agentcore:us-east-1:123456789012:memory/custom-mem',
+        agentCoreMemoryConfiguration: {
+          arn: 'arn:aws:bedrock-agentcore:us-east-1:123456789012:memory/custom-mem',
+        },
       });
     });
 

src/cli/operations/deploy/imperative/deployers/harness-deployer.ts

@@ -192,7 +192,7 @@ export class HarnessDeployer implements ImperativeDeployer<HarnessDeployedStateM
             roleArn: executionRoleArn,
             status: finalHarness.status,
             agentRuntimeArn: extractRuntimeArn(finalHarness),
-            memoryArn: createOptions.memory?.memoryArn,
+            memoryArn: createOptions.memory?.agentCoreMemoryConfiguration?.arn,
             configHash,
           };
           notes.push(`Updated harness "${entry.name}"`);
@@ -216,7 +216,7 @@ export class HarnessDeployer implements ImperativeDeployer<HarnessDeployedStateM
             roleArn: executionRoleArn,
             status: finalHarness.status,
             agentRuntimeArn: extractRuntimeArn(finalHarness),
-            memoryArn: createOptions.memory?.memoryArn,
+            memoryArn: createOptions.memory?.agentCoreMemoryConfiguration?.arn,
             configHash,
           };
           notes.push(`Created harness "${entry.name}"`);

src/cli/operations/deploy/imperative/deployers/harness-mapper.ts

@@ -270,33 +270,37 @@ function mapMemory(
   deployedResources?: DeployedResourceState,
   cdkOutputs?: Record<string, string>
 ): HarnessMemoryConfiguration | undefined {
+  let arn: string | undefined;
+
   // Direct ARN takes precedence
   if (memory.arn) {
-    return { memoryArn: memory.arn };
-  }
-
-  // Resolve by name from deployed state or CDK outputs
-  if (memory.name) {
-    // Try deployed state first
+    arn = memory.arn;
+  } else if (memory.name) {
+    // Resolve by name from deployed state or CDK outputs
     const deployedMemory = deployedResources?.memories?.[memory.name];
     if (deployedMemory) {
-      return { memoryArn: deployedMemory.memoryArn };
+      arn = deployedMemory.memoryArn;
+    } else if (cdkOutputs) {
+      arn = resolveMemoryArnFromOutputs(memory.name, cdkOutputs);
     }
 
-    // Fall back to CDK outputs
-    if (cdkOutputs) {
-      const memoryArn = resolveMemoryArnFromOutputs(memory.name, cdkOutputs);
-      if (memoryArn) {
-        return { memoryArn };
-      }
+    if (!arn) {
+      throw new Error(
+        `Memory "${memory.name}" referenced by harness is not in deployed state. Ensure the memory is defined in agentcore.json and has been deployed.`
+      );
     }
+  }
 
-    throw new Error(
-      `Memory "${memory.name}" referenced by harness is not in deployed state. Ensure the memory is defined in agentcore.json and has been deployed.`
-    );
+  if (!arn) {
+    return undefined;
   }
 
-  return undefined;
+  return {
+    agentCoreMemoryConfiguration: {
+      arn,
+      ...(memory.actorId && { actorId: memory.actorId }),
+    },
+  };
 }
 
 /**