refactor: align templates with old cli definition

src/core/project/__snapshots__/manager.test.ts.snap

@@ -17,8 +17,8 @@ exports[`FsProjectManager.create scaffolds the expected file tree into a fresh d
   "agentcore/cdk/package.json",
   "agentcore/cdk/test/cdk.test.ts",
   "agentcore/cdk/tsconfig.json",
-  "app/hello-world/README.md",
-  "app/hello-world/main.py",
-  "app/hello-world/pyproject.toml",
+  "app/hello_world/README.md",
+  "app/hello_world/main.py",
+  "app/hello_world/pyproject.toml",
 ]
 `;

src/core/project/manager.test.ts

@@ -7,7 +7,7 @@ import type { AwsDeploymentTarget } from "../../projectSchemas/aws-targets";
 import { ProjectSpecSchema } from "../../projectSchemas/project";
 import { FsProjectManager } from "./manager";
 import {
-  PROJECT_TEMPLATES,
+  RUNTIME_TEMPLATE_SHORTCUTS,
   type CreateProjectInput,
   type DeployResult,
   type Project,
@@ -16,6 +16,9 @@ import {
 import { createSilentLogger } from "../../testing";
 import type { DeployBackendInput, ProjectBackend } from "./backends/types";
 
+const HELLO_WORLD_PYTHON = RUNTIME_TEMPLATE_SHORTCUTS["hello-world-python"];
+const HELLO_WORLD_PYTHON_CONTAINER = RUNTIME_TEMPLATE_SHORTCUTS["hello-world-python-container"];
+
 const originalCwd = process.cwd();
 const tempDirectories: string[] = [];
 
@@ -71,7 +74,7 @@ describe("FsProjectManager.create", () => {
     const directory = await inTempDirectory();
     await runCreate(manager().manager, {
       name: "example",
-      template: PROJECT_TEMPLATES.HELLO_WORLD_PYTHON,
+      scaffoldRuntimeInput: HELLO_WORLD_PYTHON,
     });
 
     const projectRoot = join(directory, "example");
@@ -89,7 +92,7 @@ describe("FsProjectManager.create", () => {
     const directory = await inTempDirectory();
     await runCreate(manager().manager, {
       name: "example",
-      template: PROJECT_TEMPLATES.HELLO_WORLD_PYTHON,
+      scaffoldRuntimeInput: HELLO_WORLD_PYTHON,
     });
 
     const configDir = join(directory, "example", "agentcore");
@@ -100,7 +103,7 @@ describe("FsProjectManager.create", () => {
         name: "hello_world",
         build: "CodeZip",
         entrypoint: "main.py",
-        codeLocation: "app/hello-world",
+        codeLocation: "app/hello_world",
         runtimeVersion: "PYTHON_3_14",
       },
     ]);
@@ -111,10 +114,10 @@ describe("FsProjectManager.create", () => {
     const directory = await inTempDirectory();
     await runCreate(manager().manager, {
       name: "example",
-      template: PROJECT_TEMPLATES.HELLO_WORLD_PYTHON_CONTAINER,
+      scaffoldRuntimeInput: HELLO_WORLD_PYTHON_CONTAINER,
     });
 
-    const appDir = join(directory, "example", "app", "hello-world");
+    const appDir = join(directory, "example", "app", "hello_world");
     // dockerignore.template must render to .dockerignore (the fsTree regex fix).
     expect(await Bun.file(join(appDir, ".dockerignore")).exists()).toBe(true);
     expect(await Bun.file(join(appDir, "dockerignore.template")).exists()).toBe(false);
@@ -126,7 +129,10 @@ describe("FsProjectManager.create", () => {
 
   test("refuses to overwrite an existing project", async () => {
     await inTempDirectory();
-    const input = { name: "example", template: PROJECT_TEMPLATES.HELLO_WORLD_PYTHON };
+    const input: CreateProjectInput = {
+      name: "example",
+      scaffoldRuntimeInput: HELLO_WORLD_PYTHON,
+    };
 
     await runCreate(manager().manager, input);
     await expect(runCreate(manager().manager, input)).rejects.toBeInstanceOf(ProjectStateError);
@@ -135,12 +141,15 @@ describe("FsProjectManager.create", () => {
   test("runs npm install, uv sync, and git init after scaffolding", async () => {
     const directory = await inTempDirectory();
     const { manager: subject, commands } = manager();
-    await runCreate(subject, { name: "example", template: PROJECT_TEMPLATES.HELLO_WORLD_PYTHON });
+    await runCreate(subject, {
+      name: "example",
+      scaffoldRuntimeInput: HELLO_WORLD_PYTHON,
+    });
 
     const projectRoot = join(directory, "example");
     expect(commands).toEqual([
       { command: ["npm", "install"], cwd: join(projectRoot, "agentcore", "cdk") },
-      { command: ["uv", "sync"], cwd: join(projectRoot, "app", "hello-world") },
+      { command: ["uv", "sync"], cwd: join(projectRoot, "app", "hello_world") },
       { command: ["git", "init"], cwd: projectRoot },
     ]);
   });
@@ -150,7 +159,7 @@ describe("FsProjectManager.create", () => {
     const { manager: subject, commands } = manager();
     await runCreate(subject, {
       name: "example",
-      template: PROJECT_TEMPLATES.HELLO_WORLD_PYTHON,
+      scaffoldRuntimeInput: HELLO_WORLD_PYTHON,
       skipInstall: true,
     });
 
@@ -162,7 +171,7 @@ describe("FsProjectManager.create", () => {
     const { manager: subject, commands } = manager();
     await runCreate(subject, {
       name: "example",
-      template: PROJECT_TEMPLATES.HELLO_WORLD_PYTHON,
+      scaffoldRuntimeInput: HELLO_WORLD_PYTHON,
       skipGit: true,
     });
 
@@ -173,7 +182,7 @@ describe("FsProjectManager.create", () => {
     await inTempDirectory();
     const { events, project } = await runCreate(manager().manager, {
       name: "example",
-      template: PROJECT_TEMPLATES.HELLO_WORLD_PYTHON,
+      scaffoldRuntimeInput: HELLO_WORLD_PYTHON,
     });
 
     expect(events.map((event) => event.message)).toEqual([
@@ -198,7 +207,7 @@ describe("FsProjectManager.create", () => {
     });
 
     await expect(
-      runCreate(failing, { name: "example", template: PROJECT_TEMPLATES.HELLO_WORLD_PYTHON }),
+      runCreate(failing, { name: "example", scaffoldRuntimeInput: HELLO_WORLD_PYTHON }),
     ).rejects.toThrow("npm exploded");
     expect(await Bun.file(join(directory, "example", "agentcore", "agentcore.json")).exists()).toBe(
       true,
@@ -209,14 +218,14 @@ describe("FsProjectManager.create", () => {
     const directory = await inTempDirectory();
     await runCreate(manager().manager, {
       name: "root",
-      template: PROJECT_TEMPLATES.HELLO_WORLD_PYTHON,
+      scaffoldRuntimeInput: HELLO_WORLD_PYTHON,
     });
 
     process.chdir(join(directory, "root"));
     await expect(
       runCreate(manager().manager, {
         name: "child",
-        template: PROJECT_TEMPLATES.HELLO_WORLD_PYTHON,
+        scaffoldRuntimeInput: HELLO_WORLD_PYTHON,
       }),
     ).rejects.toBeInstanceOf(ProjectStateError);
   });
@@ -232,7 +241,7 @@ describe("FsProjectManager.build", () => {
   ): Promise<Project> {
     const { project } = await runCreate(subject, {
       name: "example",
-      template: PROJECT_TEMPLATES.HELLO_WORLD_PYTHON,
+      scaffoldRuntimeInput: HELLO_WORLD_PYTHON,
       skipInstall: true,
       skipGit: true,
     });
@@ -456,7 +465,10 @@ describe("FsProjectManager.resolve", () => {
   test("round-trips a project it just created", async () => {
     const root = await inTempDirectory();
     const subject = manager().manager;
-    await runCreate(subject, { name: "example", template: PROJECT_TEMPLATES.HELLO_WORLD_PYTHON });
+    await runCreate(subject, {
+      name: "example",
+      scaffoldRuntimeInput: HELLO_WORLD_PYTHON,
+    });
 
     // Resolve from a nested path to prove the walk-up to the project root.
     const resolved = await subject.resolve({ filePath: join(root, "example", "app") });
@@ -496,7 +508,7 @@ describe("FsProjectManager.resolve", () => {
             name: "hello_world",
             build: "CodeZip",
             entrypoint: "main.py",
-            codeLocation: "app/hello-world",
+            codeLocation: "app/hello_world",
           },
         ],
       }),

src/core/project/manager.tsx

@@ -23,7 +23,7 @@ import {
 } from "../../io";
 import { defaultSource, type AssetSource } from "./source";
 import { ENV_LOCAL_RELATIVE_PATH, EnvLocalFile } from "./envLocal";
-import { createHarnessTreeFromSpec, createProjectTreeFromTemplate, TEMPLATES } from "./templates";
+import { createHarnessTreeFromSpec, createProjectTree } from "./templates";
 import { ProjectSpecSchema, type ManagedBy } from "../../projectSchemas/project";
 import { enclosingProjectRoot } from "./fsUtils";
 import {
@@ -98,11 +98,11 @@ export class FsProjectManager implements ProjectManager {
       );
     }
 
+    const scaffoldRuntimeInput = input.scaffoldRuntimeInput;
     const destination = join(process.cwd(), input.name);
-    this.logger.debug(`scaffolding project "${input.name}" from template "${input.template}"`);
 
     yield { message: "Creating project tree" };
-    const tree = await createProjectTreeFromTemplate(input.name, input.template, this.source);
+    const tree = await createProjectTree(input.name, scaffoldRuntimeInput, this.source);
     await tree.write(destination);
 
     // A failed step leaves the scaffolded files in place; the error tells the
@@ -112,7 +112,7 @@ export class FsProjectManager implements ProjectManager {
       yield { message: "Installing CDK dependencies with npm" };
       await this.run(["npm", "install"], join(destination, "agentcore", "cdk"));
 
-      const appDir = join(destination, "app", TEMPLATES[input.template].appDir);
+      const appDir = join(destination, "app", scaffoldRuntimeInput.runtimeName);
       if (existsSync(join(appDir, "pyproject.toml"))) {
         await this.checkTool(
           "uv",

src/core/project/templates.ts

@@ -1,9 +1,12 @@
 import { ZodError, z } from "zod";
-import { PROJECT_TEMPLATES, type ProjectTemplate } from "../../handlers/project/types";
 import { HarnessSpecSchema } from "../../projectSchemas/harness";
 import { FsTreeNode } from "./fsTree";
 import type { AssetSource } from "./source";
 import { InputValidationError } from "../../errors/errors";
+import {
+  RUNTIME_TEMPLATE_SHORTCUTS,
+  type ScaffoldRuntimeInput,
+} from "../../handlers/project/types";
 
 type TemplateSpec = {
   runtimes?: unknown[];
@@ -16,25 +19,22 @@ type TemplateSpec = {
  * sections it registers in agentcore.json. Adding a template is one entry here plus its assets.
  */
 type Template = {
-  /** Directory under app/ the template code is written to. */
-  appDir: string;
   /** Asset directory relative to the asset root, expanded into the app directory. */
   assetDir: string;
   /** Resource sections this template contributes to agentcore.json. */
   spec: TemplateSpec;
 };
 
-export const TEMPLATES: Record<ProjectTemplate, Template> = {
-  [PROJECT_TEMPLATES.HELLO_WORLD_PYTHON]: {
-    appDir: "hello-world",
+const TEMPLATES: Record<string, Template> = {
+  [buildRuntimeTemplateKey(RUNTIME_TEMPLATE_SHORTCUTS["hello-world-python"])]: {
     assetDir: "templates/hello-world-python",
     spec: {
       runtimes: [
         {
           name: "hello_world",
           build: "CodeZip",
           entrypoint: "main.py",
-          codeLocation: "app/hello-world",
+          codeLocation: "app/hello_world",
           // Required for CodeZip builds: the CDK construct library rejects a
           // CodeZip runtime with no runtimeVersion, and it is what selects the
           // packager. Container builds take their version from the image.
@@ -43,45 +43,54 @@ export const TEMPLATES: Record<ProjectTemplate, Template> = {
       ],
     },
   },
-  [PROJECT_TEMPLATES.HELLO_WORLD_PYTHON_CONTAINER]: {
-    appDir: "hello-world",
+  [buildRuntimeTemplateKey(RUNTIME_TEMPLATE_SHORTCUTS["hello-world-python-container"])]: {
     assetDir: "templates/hello-world-python-container",
     spec: {
       runtimes: [
         {
           name: "hello_world",
           build: "Container",
           entrypoint: "main.py",
-          codeLocation: "app/hello-world",
+          codeLocation: "app/hello_world",
           dockerfile: "Dockerfile",
         },
       ],
     },
   },
 };
 
+function buildRuntimeTemplateKey(input: ScaffoldRuntimeInput): string {
+  return `runtime_${input.build}_${input.framework}_${input.language}_${input.memory}_${input.modelProvider}`;
+}
+
+function resolveTemplate(input: ScaffoldRuntimeInput): Template | undefined {
+  return TEMPLATES[buildRuntimeTemplateKey(input)];
+}
+
 /** Serializes a value as pretty-printed JSON with a trailing newline. */
 const json = (value: unknown): string => `${JSON.stringify(value, null, 2)}\n`;
 
 /**
  * Builds the agentcore.json spec by adding the template's resource sections to the shared base.
  * The base fields and template sections never overlap so this is a plain spread.
  */
-function agentcoreSpec(name: string, template: ProjectTemplate): unknown {
+function agentcoreSpec(name: string, template: Template): unknown {
   return {
     name,
     version: 1,
     managedBy: "CDK",
-    ...TEMPLATES[template].spec,
+    ...template.spec,
   };
 }
 
-export async function createProjectTreeFromTemplate(
+export async function createProjectTree(
   name: string,
-  template: ProjectTemplate,
+  input: ScaffoldRuntimeInput,
   src: AssetSource,
 ): Promise<FsTreeNode> {
-  const { appDir, assetDir } = TEMPLATES[template];
+  const template = resolveTemplate(input);
+  if (!template)
+    throw new InputValidationError(`unable to find template that matches given parameters`);
   return FsTreeNode.createDirectory(".", [
     FsTreeNode.createFile(".gitignore", () => src.read("templates/shared/gitignore.template")),
     FsTreeNode.createDirectory("agentcore", [
@@ -90,7 +99,10 @@ export async function createProjectTreeFromTemplate(
       FsTreeNode.createFile("aws-targets.json", async () => json([])),
       FsTreeNode.createFile(".env.local", () => src.read("templates/shared/env.local.template")),
     ]),
-    FsTreeNode.createDirectory("app", [await FsTreeNode.fromAssetSource(src, assetDir, appDir)]),
+    FsTreeNode.createDirectory("app", [
+      // TODO: replace this hardcoded "hello_world" with the runtime name once templates are more flexible.
+      await FsTreeNode.fromAssetSource(src, template.assetDir, "hello_world"),
+    ]),
   ]);
 }