diff --git a/skills/agent-runtime/scripts/agent.py b/skills/agent-runtime/scripts/agent.py
index 7f7cf37..7130b9a 100755
--- a/skills/agent-runtime/scripts/agent.py
+++ b/skills/agent-runtime/scripts/agent.py
@@ -353,7 +353,9 @@ def cmd_worktree_create(args: argparse.Namespace) -> int:
 
 
 def make_command(value: dict[str, Any]) -> str:
-    return f"make -f {value.get('makefile', 'makefile.builder')} {value['target']}"
+    # Replace the shell so terminal wait observes the make exit code instead
+    # of waiting forever on the interactive shell after make returns.
+    return f"exec make -f {value.get('makefile', 'makefile.builder')} {value['target']}"
 
 
 def cmd_run_start(args: argparse.Namespace) -> int: