2 files changed, 19 insertions, 5 deletions
diff --git a/src/Agent.App/Configuration/AgentConfiguration.cs b/src/Agent.App/Configuration/AgentConfiguration.cs
index b2f94a7..ef2eebc 100644
--- a/src/Agent.App/Configuration/AgentConfiguration.cs
+++ b/src/Agent.App/Configuration/AgentConfiguration.cs
@@ -74,7 +74,16 @@ public sealed class SandboxOptions
     public ResourceOptions Resources { get; set; } = new();
 }
 public sealed class MountOptions { public string Path { get; set; } = string.Empty; public string Access { get; set; } = "read_only"; }
-public sealed class ExecutionOptions { public List<string> Executables { get; set; } = []; public List<string> Shells { get; set; } = []; }
+public sealed class ExecutionOptions
+{
+    public List<ExecutionEntryOptions> Entries { get; set; } = [];
+}
+public sealed class ExecutionEntryOptions
+{
+    public string Alias { get; set; } = string.Empty;
+    public string Path { get; set; } = string.Empty;
+    public string? RuntimeRoot { get; set; }
+}
 public sealed class NetworkOptions
 {
     public string Access { get; set; } = "none";
diff --git a/src/Agent.App/Configuration/ConfigurationLoader.cs b/src/Agent.App/Configuration/ConfigurationLoader.cs
index 6e15904..122c499 100644
--- a/src/Agent.App/Configuration/ConfigurationLoader.cs
+++ b/src/Agent.App/Configuration/ConfigurationLoader.cs
@@ -43,7 +43,7 @@ public static partial class ConfigurationLoader
 
     public static void Validate(AgentConfiguration value, string baseDirectory)
     {
-        if (value.SchemaVersion != 1) Throw("schema_version must be 1.");
+        if (value.SchemaVersion != 2) Throw("schema_version must be 2. Version 1 is no longer supported; migrate sandbox.execution to entries and run 'agent-mcp apply'.");
         if (string.IsNullOrWhiteSpace(value.Application.Language)) Throw("application.language is required.");
         if (value.Mcp.Transport is not ("stdio" or "http")) Throw("mcp.transport must be stdio or http.");
         if (!IPAddress.TryParse(value.Mcp.Http.Host, out IPAddress? host) || !IPAddress.IsLoopback(host)) Throw("mcp.http.host must be 127.0.0.1 or ::1.");
@@ -95,10 +95,12 @@ public static partial class ConfigurationLoader
             if (sandbox.Profile == "readonly" && mount.Access != "read_only")
                 Throw("readonly sandbox.profile permits only read_only mounts.");
         }
-        string[] aliases = sandbox.Execution.Executables.Concat(sandbox.Execution.Shells).ToArray();
+        string[] aliases = sandbox.Execution.Entries.Select(static entry => entry.Alias).ToArray();
         if (aliases.Any(alias => !AliasRegex().IsMatch(alias))) Throw("Executable Alias must match ^[a-z0-9][a-z0-9._-]{0,63}$.");
         if (aliases.Distinct(StringComparer.OrdinalIgnoreCase).Count() != aliases.Length)
-            Throw("Executable Alias values must be unique across sandbox.execution.executables and shells.");
+            Throw("sandbox.execution.entries Alias values must be unique.");
+        if (sandbox.Execution.Entries.Any(static entry => string.IsNullOrWhiteSpace(entry.Path)))
+            Throw("sandbox.execution.entries requires path for every Alias.");
 
         if (sandbox.Network.Access is not ("none" or "local" or "restricted"))
             Throw("sandbox.network.access must be none, local, or restricted.");
@@ -125,7 +127,10 @@ public static partial class ConfigurationLoader
         YamlNode root = LoadRoot(yaml, "merged configuration");
         if (root is not YamlMappingNode rootMap || !TryGet(rootMap, "sandbox", out YamlNode? sandboxNode) || sandboxNode is not YamlMappingNode sandbox) return;
         if (TryGet(sandbox, "filesystem", out _) || TryGet(sandbox, "process", out _))
-            Throw("Legacy sandbox.filesystem/sandbox.process configuration is no longer supported. Migrate to sandbox.profile, workspaces, mounts, execution, network, and resources; then run 'sandbox resolve' and 'sandbox confirm'.");
+            Throw("Legacy sandbox.filesystem/sandbox.process configuration is no longer supported. Migrate to schema_version 2 and sandbox.execution.entries; then run 'agent-mcp apply'.");
+        if (TryGet(sandbox, "execution", out YamlNode? executionNode) && executionNode is YamlMappingNode execution &&
+            (TryGet(execution, "executables", out _) || TryGet(execution, "shells", out _)))
+            Throw("schema_version 1 sandbox.execution.executables/shells is no longer supported. Migrate each Alias to sandbox.execution.entries with path and optional runtime_root; then run 'agent-mcp apply'.");
     }
 
     private static bool TryGet(YamlMappingNode map, string name, out YamlNode? value)