fix(import): address PR review feedback

- Validate entrypoint file exists inside --code directory
- Improve --code help text to clarify it points to the entrypoint folder
- Validate AWS credentials match target account via STS GetCallerIdentity
- Fix project name prefix stripping to only strip known prefix, not any underscore
- Rename sanitize() to replaceUnderscoresWithDashes() for clarity
- Use existing Dockerfile template from assets instead of hardcoded duplicate

Author: jesseturner21

src/cli/commands/import/import-runtime.ts

@@ -149,11 +149,9 @@ export async function handleImportRuntime(options: ImportResourceOptions): Promi
     // Derive local name: strip project prefix if present, or use --name override
     let localName = options.name ?? runtimeDetail.agentRuntimeName;
     // AgentCore runtime names are often prefixed with projectName_ — strip it
-    if (localName.includes('_')) {
-      const parts = localName.split('_');
-      if (parts.length > 1) {
-        localName = parts.slice(1).join('_');
-      }
+    const prefix = `${ctx.projectName}_`;
+    if (localName.startsWith(prefix)) {
+      localName = localName.slice(prefix.length);
     }
     onProgress(`Runtime: ${runtimeDetail.agentRuntimeName} → local name: ${localName}`);
     logger.endStep('success');
@@ -206,6 +204,20 @@ export async function handleImportRuntime(options: ImportResourceOptions): Promi
         logPath: logger.getRelativeLogPath(),
       };
     }
+    // Validate entrypoint file exists inside source directory
+    const entrypointPath = path.join(sourcePath, entrypoint);
+    if (!fs.existsSync(entrypointPath)) {
+      const error = `Entrypoint file '${entrypoint}' not found in ${sourcePath}. Ensure --code points to the directory containing your entrypoint file.`;
+      logger.endStep('error', error);
+      logger.finalize(false);
+      return {
+        success: false,
+        error,
+        resourceType: 'runtime',
+        resourceName: localName,
+        logPath: logger.getRelativeLogPath(),
+      };
+    }
     logger.endStep('success');
 
     // 6. Check for duplicates
@@ -448,7 +460,10 @@ export function registerImportRuntime(importCmd: Command): void {
     .command('runtime')
     .description('Import an existing AgentCore Runtime from your AWS account')
     .option('--id <runtimeId>', 'Runtime ID to import')
-    .requiredOption('--code <path>', 'Path to the agent source code directory')
+    .requiredOption(
+      '--code <path>',
+      'Path to the directory containing the entrypoint file (e.g., the folder with main.py)'
+    )
     .option('--entrypoint <file>', 'Entrypoint file (auto-detected from runtime, e.g. main.py)')
     .option('--target <target>', 'Deployment target name')
     .option('--name <name>', 'Local name for the imported runtime')

src/cli/commands/import/import-utils.ts

@@ -1,8 +1,9 @@
 import { APP_DIR, ConfigIO, findConfigRoot } from '../../../lib';
 import type { AwsDeploymentTarget } from '../../../schema';
-import { validateAwsCredentials } from '../../aws/account';
+import { detectAccount, validateAwsCredentials } from '../../aws/account';
 import { ExecLogger } from '../../logging';
 import { setupPythonProject } from '../../operations/python/setup';
+import { getTemplatePath } from '../../templates/templateRoot';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 
@@ -87,19 +88,27 @@ export async function resolveImportTarget(options: ResolveTargetOptions): Promis
   onProgress?.('Validating AWS credentials...');
   await validateAwsCredentials();
 
+  // Validate credentials match the target account
+  const callerAccount = await detectAccount();
+  if (callerAccount && target.account && callerAccount !== target.account) {
+    throw new Error(
+      `Your AWS credentials are for account ${callerAccount}, but the target "${target.name}" is configured for account ${target.account}.\nEnsure your credentials match the deployment target.`
+    );
+  }
+
   return target;
 }
 
 // ============================================================================
 // Stack Name
 // ============================================================================
 
-function sanitize(name: string): string {
+function replaceUnderscoresWithDashes(name: string): string {
   return name.replace(/_/g, '-');
 }
 
 export function toStackName(projectName: string, targetName: string): string {
-  return `AgentCore-${sanitize(projectName)}-${sanitize(targetName)}`;
+  return `AgentCore-${replaceUnderscoresWithDashes(projectName)}-${replaceUnderscoresWithDashes(targetName)}`;
 }
 
 // ============================================================================
@@ -238,36 +247,18 @@ export async function copyAgentSource(options: CopyAgentSourceOptions): Promise<
     if (build === 'Container') {
       const destDockerfile = path.join(appDir, 'Dockerfile');
       if (!fs.existsSync(destDockerfile)) {
-        onProgress?.('Generating Dockerfile for Container build');
-        const entryModule = path.basename(options.entrypoint ?? 'main.py', '.py');
-        fs.writeFileSync(
-          destDockerfile,
-          [
-            'FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim',
-            'WORKDIR /app',
-            '',
-            'ENV UV_SYSTEM_PYTHON=1 \\',
-            '    UV_COMPILE_BYTECODE=1 \\',
-            '    UV_NO_PROGRESS=1 \\',
-            '    PYTHONUNBUFFERED=1 \\',
-            '    DOCKER_CONTAINER=1',
-            '',
-            'RUN useradd -m -u 1000 bedrock_agentcore',
-            '',
-            'COPY pyproject.toml uv.lock ./',
-            'RUN uv sync --frozen --no-dev --no-install-project',
-            '',
-            'COPY --chown=bedrock_agentcore:bedrock_agentcore . .',
-            'RUN uv sync --frozen --no-dev',
-            '',
-            'USER bedrock_agentcore',
-            '',
-            'EXPOSE 8080 8000 9000',
-            '',
-            `CMD ["opentelemetry-instrument", "python", "-m", "${entryModule}"]`,
-            '',
-          ].join('\n')
-        );
+        const isPython = options.entrypoint?.endsWith('.py') ?? true;
+        if (isPython) {
+          onProgress?.('Generating Dockerfile for Container build');
+          const entryModule = path.basename(options.entrypoint ?? 'main.py', '.py');
+          const templatePath = getTemplatePath('container', 'python', 'Dockerfile');
+          const template = fs.readFileSync(templatePath, 'utf-8');
+          fs.writeFileSync(destDockerfile, template.replace('{{entrypoint}}', entryModule));
+        } else {
+          onProgress?.(
+            'No Dockerfile found. Please add a Dockerfile to the source directory for non-Python container builds.'
+          );
+        }
       }
     }
   } else {