fix(scaffold): allow certain template values to be overriden by Hweinstock · Pull Request #2130 · aws/agentcore-cli

Hweinstock · 2026-08-27T20:07:55Z

Problem

Not all template fields that we'd expect to be able to overwrite are able to be overwritten. For example, in the create flow runtimeName is fixed since passing runtimeName + template is invalid.

Solution

allow all flags (except language and framework) to overwrite the template defaults.
refactor shortcuts into their own file since it no includes non-type specific logic.(likely will conflict with feat(templates): wire in memory to the runtime templates #2116 since it does the same thing).

Testing

unit tests

> agentcore project create --template strands-python --runtimeName bob --name testP 

{
  "name": "testP",
  "version": 1,
  "managedBy": "CDK",
  "runtimes": [
    {
      "name": "bob",
      "build": "CodeZip",
      "entrypoint": "main.py",
      "codeLocation": "app/bob",
      "runtimeVersion": "PYTHON_3_14",
      "protocol": "HTTP"
    }
  ]
}

> agentcore project deploy 
...

went to console and verified the name is now generated from bob with name testP_bob.

agentcore-devx-automation · 2026-08-27T20:09:52Z

Claude Security Review: no high-confidence findings. (run)

codecov-commenter · 2026-08-27T20:11:23Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 97.24%. Comparing base (059e1a5) to head (7e97992).

Additional details and impacted files

@@            Coverage Diff            @@
##           refactor    #2130   +/-   ##
=========================================
  Coverage     97.24%   97.24%           
=========================================
  Files           471      472    +1     
  Lines         28911    28954   +43     
=========================================
+ Hits          28114    28157   +43     
  Misses          797      797

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

agentcore-devx-automation

AgentCore Harness Review

Verdict: Looks good

Nice refactor. Moving RUNTIME_TEMPLATE_SHORTCUTS and the new resolveRuntimeTemplateShortcut into their own shortcuts.ts cleans up types.ts, and the "compatible flag overrides" semantics are consistent between create and add runtime.

A few things I verified while reviewing:

The --build override path spreads runtimeVersion: undefined when switching a CodeZip template to Container, which correctly clears the template's PYTHON_3_14 and satisfies ScaffoldRuntimeInputSchema.superRefine (Container must not have a runtimeVersion). Going the other way (Container template + --build CodeZip) sets PYTHON_3_14, also validated.
language and framework remain locked when a template is chosen, which is the right call since the template asset tree is keyed on ${framework}/${language} in runtime.ts.
apiKey override with a Bedrock template correctly falls through to the schema's cross-field refine, and the new test covers this.
In add/runtime, always forcing runtimeName: flags.name in the template branch is a behavior change from the previous hard-coded hello_world/strands_agent, but it matches how the resource name is already used downstream (codeLocation: app/${name}) and how the non-template branch behaves.

No new user-facing surface, so no new telemetry needed. No excessive mocking — the new tests operate on real temp directories through the handler.

Nothing blocking; feel free to merge.

Hweinstock · 2026-08-27T20:25:14Z

No new user-facing surface, so no new telemetry needed

I think we might need to adjust its prompt. I can take a look.

notgitika

Very easy to follow through PR I just added one comment about build also becoming a locked param imo lmk what you think

notgitika · 2026-08-27T21:53:03Z

+      const lockedFlag = (["language", "framework"] as const).find(
+        (flagName) => flags[flagName] !== undefined,
+      );
+      if (isTemplate && lockedFlag) {
+        throw new InputValidationError(`--${lockedFlag} cannot override a template`);
+      }

      const isCustom = presentScaffoldingFlags.length > 0;

      const source = new SourceResolver({ stdin: config.io.stdin });
      const apiKey = await source.resolveSecret("api-key", flags["api-key"]);

      const scaffoldRuntimeInput = isTemplate
-        ? RUNTIME_TEMPLATE_SHORTCUTS[flags.template!]
+        ? resolveRuntimeTemplateShortcut(flags.template!, {
+            runtimeName: flags.name,
+            ...(flags.build !== undefined && {
+              build: flags.build,
+              runtimeVersion: flags.build === "CodeZip" ? "PYTHON_3_14" : undefined,
+            }),
+            ...(flags["model-provider"] !== undefined && {
+              modelProvider: flags["model-provider"],
+            }),
+            ...(apiKey !== undefined && { apiKey }),
+            ...(flags.memory !== undefined && { memory: flags.memory }),
+          })
        : isCustom


OOS for your PR but would we see any value in making a shared component for the shared functionality b/w create and runtime?

YES! I'm hoping to come back to this.

notgitika · 2026-08-27T21:55:17Z

wait why are adding the build override? shouldn't that also belong to the "locked" param?

for eg: strands-python template can be override to container but the generated files won't contain Dockerfile, while the agentcore.json config would reference one.

The build override should work since its passed as a parameter to the template. I haven't wired up container support for the strands-python one yet, so if its not rejecting that's a bug.

Update: it is a bug, let me just fix that here.

agentcore-devx-automation · 2026-08-27T22:13:28Z

Claude Security Review: no high-confidence findings. (run)

notgitika

awesome, looks great to me!

agentcore-devx-automation · 2026-08-28T03:42:23Z

Claude Security Review: no high-confidence findings. (run)

aidandaly24

This looks good to me. Just had one readability comment.

aidandaly24 · 2026-08-28T13:56:29Z

+        ? resolveRuntimeTemplateShortcut(flags["template"]!, {
+            ...(flags["runtime-name"] !== undefined && {
+              runtimeName: flags["runtime-name"],
+            }),
+            ...(flags["build"] !== undefined && {
+              build: flags["build"],
+              runtimeVersion: flags["build"] === "CodeZip" ? "PYTHON_3_14" : undefined,
+            }),
+            ...(flags["model-provider"] !== undefined && {
+              modelProvider: flags["model-provider"],
+            }),
+            ...(apiKey !== undefined && { apiKey }),
+            ...(flags["memory"] !== undefined && { memory: flags["memory"] }),
+          })


Not saying necessarily to change this because it is correct, but this is kind of hard to read at first. To make this more readable we could move the override building logic into resolveRuntimeTemplateShortcut? Passing the optional flag values directly would make this easier to scan and keep the build/runtimeVersion relationship in one place

const scaffoldRuntimeInput = resolveRuntimeTemplateShortcut(flags["template"]!, { runtimeName: flags["runtime-name"], build: flags["build"], modelProvider: flags["model-provider"], apiKey, memory: flags["memory"], });

The resolver could ignore undefined values and own the build/runtimeVersion relationship, which would make both callers easier to scan.

I like that! I'll have to rebase #2116 on top of this anyway, so I'm going to merge and address this there.

fix(scaffold): allow certain template values to be overriden

f71c191

github-actions Bot added size/m PR size: M and removed size/m PR size: M labels Aug 27, 2026

agentcore-devx-automation Bot added agentcore-harness-reviewing AgentCore Harness review in progress claude-security-reviewing Claude Code /security-review in progress labels Aug 27, 2026

agentcore-devx-automation Bot removed the claude-security-reviewing Claude Code /security-review in progress label Aug 27, 2026

agentcore-devx-automation Bot removed the agentcore-harness-reviewing AgentCore Harness review in progress label Aug 27, 2026

agentcore-devx-automation Bot reviewed Aug 27, 2026

View reviewed changes

Hweinstock marked this pull request as ready for review August 27, 2026 20:25

notgitika reviewed Aug 27, 2026

View reviewed changes

fix(strands-python): reject container

c9761e1

github-actions Bot added size/m PR size: M and removed size/m PR size: M labels Aug 27, 2026

agentcore-devx-automation Bot added the claude-security-reviewing Claude Code /security-review in progress label Aug 27, 2026

agentcore-devx-automation Bot removed the claude-security-reviewing Claude Code /security-review in progress label Aug 27, 2026

This was referenced Aug 27, 2026

feat(templates): support Container builds in the strands-http-python template #2137

Closed

feat(templates): support Container builds in the strands-http-python template Hweinstock/agentcore-cli#6

Draft

notgitika previously approved these changes Aug 28, 2026

View reviewed changes

chore: merge in refactor

7e97992

Hweinstock dismissed notgitika’s stale review via 7e97992 August 28, 2026 03:40

github-actions Bot added size/m PR size: M and removed size/m PR size: M labels Aug 28, 2026

agentcore-devx-automation Bot added the claude-security-reviewing Claude Code /security-review in progress label Aug 28, 2026

agentcore-devx-automation Bot removed the claude-security-reviewing Claude Code /security-review in progress label Aug 28, 2026

aidandaly24 approved these changes Aug 28, 2026

View reviewed changes

Hweinstock merged commit bcac2e6 into aws:refactor Aug 28, 2026
19 of 22 checks passed

Hweinstock deleted the feat/allow-flag-overrides branch August 28, 2026 14:02

Hweinstock mentioned this pull request Aug 28, 2026

feat(templates): wire in memory to the runtime templates #2116

Merged

Uh oh!

Conversation

Hweinstock commented Aug 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Problem

Solution

Testing

Uh oh!

agentcore-devx-automation Bot commented Aug 27, 2026

Uh oh!

codecov-commenter commented Aug 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

agentcore-devx-automation Bot left a comment

Choose a reason for hiding this comment

AgentCore Harness Review

Uh oh!

Hweinstock commented Aug 27, 2026

Uh oh!

notgitika left a comment

Choose a reason for hiding this comment

Uh oh!

notgitika Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

Hweinstock Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

notgitika Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

Hweinstock Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

agentcore-devx-automation Bot commented Aug 27, 2026

Uh oh!

notgitika left a comment

Choose a reason for hiding this comment

Uh oh!

agentcore-devx-automation Bot commented Aug 28, 2026

Uh oh!

aidandaly24 left a comment

Choose a reason for hiding this comment

Uh oh!

aidandaly24 Aug 28, 2026

Choose a reason for hiding this comment

Uh oh!

Hweinstock Aug 28, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Hweinstock commented Aug 27, 2026 •

edited

Loading

codecov-commenter commented Aug 27, 2026 •

edited

Loading