diff --git a/runner/codegen/claude-code-runner.ts b/runner/codegen/claude-code-runner.ts
index ed742e7..5859242 100644
--- a/runner/codegen/claude-code-runner.ts
+++ b/runner/codegen/claude-code-runner.ts
@@ -11,6 +11,11 @@ import {BaseCliAgentRunner} from './base-cli-agent-runner.js';
 const MODEL_MAPPING: Record<string, string> = {
   'claude-4.0-sonnet': 'claude-sonnet-4-20250514',
   'claude-3.5-haiku': 'claude-3-5-haiku-latest',
+  'claude-4.5-sonnet': 'claude-sonnet-4-5-20250929',
+  'claude-4.0-opus': 'claude-opus-4-20250514',
+  'claude-4.5-opus': 'claude-opus-4-5-20251101',
+  'claude-4.5-haiku': 'claude-haiku-4-5-20251001',
+  'claude-4.6-opus': 'claude-opus-4-6',
 };
 
 /** Runner that generates code using the Claude Code. */
diff --git a/runner/run-cli.ts b/runner/run-cli.ts
index 2a2c608..393b33d 100644
--- a/runner/run-cli.ts
+++ b/runner/run-cli.ts
@@ -96,13 +96,13 @@ async function runApp(options: Options) {
 
   try {
     await writeResponseFiles(directory, files, environment, rootPromptDef.name);
-
+    const abortController = new AbortController();
     await serveApp(
       environment.executor.getServeCommand(),
       rootPromptDef,
       directory,
       new NoopProgressLogger(),
-      new AbortSignal(),
+      abortController.signal,
       async url => {
         console.log();
         console.log(formatTitleCard(`🎉 App is up and running at ${url}`));