From f0faca3bc42f9863710392f42cc665d2efc4e8b3 Mon Sep 17 00:00:00 2001
From: Avi Alpert <aalpert@amazon.com>
Date: Thu, 25 Jun 2026 17:01:17 -0400
Subject: [PATCH 1/2] fix: --defaults flag should keep previous behavior,
 create agent project

---
 src/cli/commands/create/command.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cli/commands/create/command.tsx b/src/cli/commands/create/command.tsx
index 88e37b117..6ef8c1150 100644
--- a/src/cli/commands/create/command.tsx
+++ b/src/cli/commands/create/command.tsx
@@ -96,6 +96,7 @@ function printCreateSummary(
  * agent-only concept — harnesses use --memory-mode/--no-memory — so it routes to the agent path
  * (and conflicts with harness-only flags) rather than being silently ignored on the harness path. */
 const AGENT_PATH_FLAGS = [
+  'defaults',
   'framework',
   'language',
   'build',

From d76d7a6be68c08216447e17df8d4a5a47babd3bf Mon Sep 17 00:00:00 2001
From: Avi Alpert <aalpert@amazon.com>
Date: Thu, 25 Jun 2026 17:15:59 -0400
Subject: [PATCH 2/2] fix: tests

---
 integ-tests/create-edge-cases.test.ts            | 5 ++---
 src/cli/commands/create/__tests__/create.test.ts | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/integ-tests/create-edge-cases.test.ts b/integ-tests/create-edge-cases.test.ts
index 4e65a1157..30eb2c21d 100644
--- a/integ-tests/create-edge-cases.test.ts
+++ b/integ-tests/create-edge-cases.test.ts
@@ -141,12 +141,11 @@ describe.skipIf(!prereqs.npm || !prereqs.git)('integration: create edge cases',
       expect(json.success).toBe(true);
       expect(json.projectPath).toBeTruthy();
 
-      // No agent-path flags -> create defaults to the harness path.
+      // --defaults is an agent-path flag -> routes to the agent creation path.
       telemetry.assertMetricEmitted({
         command: 'create',
         exit_reason: 'success',
-        agent_environment: 'harness',
-        model_provider: 'bedrock',
+        agent_environment: 'runtime',
         has_agent: 'true',
       });
     });
diff --git a/src/cli/commands/create/__tests__/create.test.ts b/src/cli/commands/create/__tests__/create.test.ts
index 5264371d8..678876f93 100644
--- a/src/cli/commands/create/__tests__/create.test.ts
+++ b/src/cli/commands/create/__tests__/create.test.ts
@@ -241,14 +241,15 @@ describe('create command', () => {
   });
 
   describe('--defaults', () => {
-    it('creates project with defaults', async () => {
+    it('creates project with defaults via agent path', async () => {
       const name = `Defaults${Date.now()}`;
       const result = await runCLI(['create', '--name', name, '--defaults', '--json'], testDir);
 
       expect(result.exitCode, `stderr: ${result.stderr}`).toBe(0);
       const json = JSON.parse(result.stdout);
       expect(json.success).toBe(true);
-      expect(await exists(join(testDir, name))).toBeTruthy();
+      expect(json.agentName).toBe(name);
+      expect(await exists(join(json.projectPath, 'app', name))).toBeTruthy();
     });
   });