fix(import): paginate listings, auto-select single result, and preserve runtime config

jesseturner21 · jesseturner21 · commit e4d2027f6def · 2026-04-01T14:31:59.000Z
Three import bugs fixed:

1. listAgentRuntimes/listMemories only fetched one page (max 100).
   Added listAllAgentRuntimes/listAllMemories that paginate via nextToken.

2. Single-result listing incorrectly showed "Multiple found" error.
   Now auto-selects when exactly one runtime/memory exists.

3. toAgentEnvSpec dropped env vars, tags, lifecycle config, and request
   header allowlist. Extended AgentRuntimeDetail and getAgentRuntimeDetail
   to extract these fields (including ListTagsForResource call for tags),
   and mapped them in toAgentEnvSpec.

Confidence: high
Scope-risk: moderate
Not-tested: pagination with &gt;100 real resources (no integration test account available)
diff --git a/src/cli/aws/agentcore-control.ts b/src/cli/aws/agentcore-control.ts
@@ -100,6 +100,22 @@ export async function listAgentRuntimes(options: ListAgentRuntimesOptions): Prom
   };
 }
 
+/**
+ * List all AgentCore Runtimes in the given region, paginating through all pages.
+ */
+export async function listAllAgentRuntimes(options: { region: string }): Promise<AgentRuntimeSummary[]> {
+  const runtimes: AgentRuntimeSummary[] = [];
+  let nextToken: string | undefined;
+
+  do {
+    const result = await listAgentRuntimes({ region: options.region, maxResults: 100, nextToken });
+    runtimes.push(...result.runtimes);
+    nextToken = result.nextToken;
+  } while (nextToken);
+
+  return runtimes;
+}
+
 export interface GetAgentRuntimeOptions {
   region: string;
   runtimeId: string;
@@ -127,6 +143,10 @@ export interface AgentRuntimeDetail {
       allowedScopes?: string[];
     };
   };
+  environmentVariables?: Record<string, string>;
+  tags?: Record<string, string>;
+  lifecycleConfiguration?: { idleRuntimeSessionTimeout?: number; maxLifetime?: number };
+  requestHeaderAllowlist?: string[];
 }
 
 /**
@@ -171,6 +191,42 @@ export async function getAgentRuntimeDetail(options: GetAgentRuntimeOptions): Pr
     };
   }
 
+  // Extract environment variables
+  const environmentVariables =
+    response.environmentVariables && Object.keys(response.environmentVariables).length > 0
+      ? response.environmentVariables
+      : undefined;
+
+  // Extract lifecycle configuration
+  const lifecycleConfiguration = response.lifecycleConfiguration
+    ? {
+        idleRuntimeSessionTimeout: response.lifecycleConfiguration.idleRuntimeSessionTimeout,
+        maxLifetime: response.lifecycleConfiguration.maxLifetime,
+      }
+    : undefined;
+
+  // Extract request header allowlist from the union type
+  let requestHeaderAllowlist: string[] | undefined;
+  if (response.requestHeaderConfiguration && 'requestHeaderAllowlist' in response.requestHeaderConfiguration) {
+    const allowlist = response.requestHeaderConfiguration.requestHeaderAllowlist;
+    if (allowlist && allowlist.length > 0) {
+      requestHeaderAllowlist = allowlist;
+    }
+  }
+
+  // Fetch tags via separate API call (same pattern as getMemoryDetail)
+  let tags: Record<string, string> | undefined;
+  if (response.agentRuntimeArn) {
+    try {
+      const tagsResponse = await client.send(new ListTagsForResourceCommand({ resourceArn: response.agentRuntimeArn }));
+      if (tagsResponse.tags && Object.keys(tagsResponse.tags).length > 0) {
+        tags = tagsResponse.tags;
+      }
+    } catch {
+      // Tags are optional — continue without them if the call fails
+    }
+  }
+
   return {
     agentRuntimeId: response.agentRuntimeId ?? '',
     agentRuntimeArn: response.agentRuntimeArn ?? '',
@@ -186,6 +242,10 @@ export async function getAgentRuntimeDetail(options: GetAgentRuntimeOptions): Pr
     build: isContainer ? 'Container' : 'CodeZip',
     authorizerType,
     authorizerConfiguration,
+    environmentVariables,
+    tags,
+    lifecycleConfiguration,
+    requestHeaderAllowlist,
   };
 }
 
@@ -240,6 +300,22 @@ export async function listMemories(options: ListMemoriesOptions): Promise<ListMe
   };
 }
 
+/**
+ * List all AgentCore Memories in the given region, paginating through all pages.
+ */
+export async function listAllMemories(options: { region: string }): Promise<MemorySummary[]> {
+  const memories: MemorySummary[] = [];
+  let nextToken: string | undefined;
+
+  do {
+    const result = await listMemories({ region: options.region, maxResults: 100, nextToken });
+    memories.push(...result.memories);
+    nextToken = result.nextToken;
+  } while (nextToken);
+
+  return memories;
+}
+
 export interface GetMemoryOptions {
   region: string;
   memoryId: string;
diff --git a/src/cli/commands/import/import-memory.ts b/src/cli/commands/import/import-memory.ts
@@ -1,6 +1,6 @@
 import type { Memory } from '../../../schema';
 import type { MemoryDetail } from '../../aws/agentcore-control';
-import { getMemoryDetail, listMemories } from '../../aws/agentcore-control';
+import { getMemoryDetail, listAllMemories } from '../../aws/agentcore-control';
 import { LocalCdkProject } from '../../cdk/local-cdk-project';
 import { silentIoHost } from '../../cdk/toolkit-lib';
 import { ExecLogger } from '../../logging';
@@ -106,9 +106,9 @@ export async function handleImportMemory(options: ImportResourceOptions): Promis
     } else {
       // List memories and show to user
       onProgress('Listing memories in your account...');
-      const listResult = await listMemories({ region: target.region, maxResults: 100 });
+      const memories = await listAllMemories({ region: target.region });
 
-      if (listResult.memories.length === 0) {
+      if (memories.length === 0) {
         const error = 'No memories found in your account.';
         logger.endStep('error', error);
         logger.finalize(false);
@@ -121,18 +121,30 @@ export async function handleImportMemory(options: ImportResourceOptions): Promis
         };
       }
 
-      // Display list
-      console.log(`\nFound ${listResult.memories.length} memory(ies):\n`);
-      for (let i = 0; i < listResult.memories.length; i++) {
-        const m = listResult.memories[i]!;
-        console.log(`  ${dim}[${i + 1}]${reset} ${m.memoryId} — ${m.status}`);
-      }
-      console.log('');
+      if (memories.length === 1) {
+        // Auto-select the only memory
+        memoryId = memories[0]!.memoryId;
+        onProgress(`Found 1 memory: ${memoryId}. Auto-selecting.`);
+      } else {
+        // Display list
+        console.log(`\nFound ${memories.length} memory(ies):\n`);
+        for (let i = 0; i < memories.length; i++) {
+          const m = memories[i]!;
+          console.log(`  ${dim}[${i + 1}]${reset} ${m.memoryId} — ${m.status}`);
+        }
+        console.log('');
 
-      const error = 'Multiple memories found. Use --arn <memoryArn> to specify which memory to import.';
-      logger.endStep('error', error);
-      logger.finalize(false);
-      return { success: false, error, resourceType: 'memory', resourceName: '', logPath: logger.getRelativeLogPath() };
+        const error = 'Multiple memories found. Use --arn <memoryArn> to specify which memory to import.';
+        logger.endStep('error', error);
+        logger.finalize(false);
+        return {
+          success: false,
+          error,
+          resourceType: 'memory',
+          resourceName: '',
+          logPath: logger.getRelativeLogPath(),
+        };
+      }
     }
 
     onProgress(`Fetching memory details for ${memoryId}...`);
diff --git a/src/cli/commands/import/import-runtime.ts b/src/cli/commands/import/import-runtime.ts
@@ -1,6 +1,6 @@
 import type { AgentEnvSpec } from '../../../schema';
 import type { AgentRuntimeDetail } from '../../aws/agentcore-control';
-import { getAgentRuntimeDetail, listAgentRuntimes } from '../../aws/agentcore-control';
+import { getAgentRuntimeDetail, listAllAgentRuntimes } from '../../aws/agentcore-control';
 import { LocalCdkProject } from '../../cdk/local-cdk-project';
 import { silentIoHost } from '../../cdk/toolkit-lib';
 import { ExecLogger } from '../../logging';
@@ -75,6 +75,22 @@ function toAgentEnvSpec(
     spec.authorizerConfiguration = runtime.authorizerConfiguration as AgentEnvSpec['authorizerConfiguration'];
   }
 
+  if (runtime.environmentVariables && Object.keys(runtime.environmentVariables).length > 0) {
+    spec.envVars = Object.entries(runtime.environmentVariables).map(([name, value]) => ({ name, value }));
+  }
+
+  if (runtime.tags && Object.keys(runtime.tags).length > 0) {
+    spec.tags = runtime.tags;
+  }
+
+  if (runtime.lifecycleConfiguration) {
+    spec.lifecycleConfiguration = runtime.lifecycleConfiguration;
+  }
+
+  if (runtime.requestHeaderAllowlist && runtime.requestHeaderAllowlist.length > 0) {
+    spec.requestHeaderAllowlist = runtime.requestHeaderAllowlist;
+  }
+
   return spec;
 }
 
@@ -112,9 +128,9 @@ export async function handleImportRuntime(options: ImportResourceOptions): Promi
     } else {
       // List runtimes and let user pick
       onProgress('Listing runtimes in your account...');
-      const listResult = await listAgentRuntimes({ region: target.region, maxResults: 100 });
+      const runtimes = await listAllAgentRuntimes({ region: target.region });
 
-      if (listResult.runtimes.length === 0) {
+      if (runtimes.length === 0) {
         const error = 'No runtimes found in your account. Deploy a runtime first.';
         logger.endStep('error', error);
         logger.finalize(false);
@@ -127,19 +143,31 @@ export async function handleImportRuntime(options: ImportResourceOptions): Promi
         };
       }
 
-      // Display list for user to pick
-      console.log(`\nFound ${listResult.runtimes.length} runtime(s):\n`);
-      for (let i = 0; i < listResult.runtimes.length; i++) {
-        const r = listResult.runtimes[i]!;
-        console.log(`  ${dim}[${i + 1}]${reset} ${r.agentRuntimeName} (${r.agentRuntimeId}) — ${r.status}`);
-      }
-      console.log('');
+      if (runtimes.length === 1) {
+        // Auto-select the only runtime
+        runtimeId = runtimes[0]!.agentRuntimeId;
+        onProgress(`Found 1 runtime: ${runtimes[0]!.agentRuntimeName} (${runtimeId}). Auto-selecting.`);
+      } else {
+        // Display list for user to pick
+        console.log(`\nFound ${runtimes.length} runtime(s):\n`);
+        for (let i = 0; i < runtimes.length; i++) {
+          const r = runtimes[i]!;
+          console.log(`  ${dim}[${i + 1}]${reset} ${r.agentRuntimeName} (${r.agentRuntimeId}) — ${r.status}`);
+        }
+        console.log('');
 
-      // For non-interactive mode, require --arn
-      const error = 'Multiple runtimes found. Use --arn <runtimeArn> to specify which runtime to import.';
-      logger.endStep('error', error);
-      logger.finalize(false);
-      return { success: false, error, resourceType: 'runtime', resourceName: '', logPath: logger.getRelativeLogPath() };
+        // For non-interactive mode, require --arn
+        const error = 'Multiple runtimes found. Use --arn <runtimeArn> to specify which runtime to import.';
+        logger.endStep('error', error);
+        logger.finalize(false);
+        return {
+          success: false,
+          error,
+          resourceType: 'runtime',
+          resourceName: '',
+          logPath: logger.getRelativeLogPath(),
+        };
+      }
     }
 
     onProgress(`Fetching runtime details for ${runtimeId}...`);
