diff --git a/CITATION.cff b/CITATION.cff
index 5bcbb8da..c8e61707 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -9,8 +9,8 @@ authors:
     website: "https://erikdarling.com"
 repository-code: "https://github.com/erikdarlingdata/PerformanceStudio"
 license: MIT
-version: "1.21.0"
-date-released: "2026-08-21"
+version: "1.22.0"
+date-released: "2026-08-31"
 keywords:
   - sql-server
   - execution-plan
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 3142b1c2..17a0f0af 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -15,7 +15,7 @@
     Tests and server/ projects are outside src/ and are unaffected.
   -->
   <PropertyGroup>
-    <Version>1.21.0</Version>
+    <Version>1.22.0</Version>
     <Authors>Erik Darling</Authors>
     <Company>Darling Data LLC</Company>
     <Product>Performance Studio</Product>
diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
index 3c5f2902..37d0759c 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
@@ -32,6 +32,11 @@ public partial class QuerySessionControl : UserControl
     private readonly ICredentialService _credentialService;
     private readonly ConnectionStore _connectionStore;
 
+    /// <summary>
+    /// Full path on disk when the query was loaded from, or last saved to, a file.
+    /// </summary>
+    public string? SourceFilePath { get; set; }
+
     private ServerConnection? _serverConnection;
     private string? _connectionString;
     private string? _selectedDatabase;
diff --git a/src/PlanViewer.App/MainWindow.FileOps.cs b/src/PlanViewer.App/MainWindow.FileOps.cs
index f2909ecf..99c56d6e 100644
--- a/src/PlanViewer.App/MainWindow.FileOps.cs
+++ b/src/PlanViewer.App/MainWindow.FileOps.cs
@@ -72,6 +72,97 @@ private async void OpenFile_Click(object? sender, RoutedEventArgs e)
         }
     }
 
+    private async void OpenQuery_Click(object? sender, RoutedEventArgs e)
+    {
+        var files = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+        {
+            Title = "Open Query",
+            AllowMultiple = true,
+            FileTypeFilter = new[]
+            {
+                new FilePickerFileType("SQL Scripts")
+                {
+                    Patterns = new[] { "*.sql" }
+                },
+                FilePickerFileTypes.All
+            }
+        });
+
+        foreach (var file in files)
+        {
+            var path = file.TryGetLocalPath();
+            if (path != null)
+                LoadSqlFile(path);
+        }
+    }
+
+    private async void SaveQuery_Click(object? sender, RoutedEventArgs e)
+    {
+        await SaveQueryAsync();
+    }
+
+    /// <summary>
+    /// Writes the active query tab's text to disk. Always prompts, but defaults to the
+    /// file the query came from so saving back over it is the path of least resistance.
+    /// Silently does nothing when the active tab is a plan rather than a query - the menu
+    /// item is reachable from anywhere and there is nothing to save.
+    /// </summary>
+    private async Task SaveQueryAsync()
+    {
+        if (MainTabControl.SelectedItem is not TabItem { Content: QuerySessionControl session } tab)
+            return;
+
+        var existing = session.SourceFilePath;
+
+        var options = new FilePickerSaveOptions
+        {
+            Title = "Save Query",
+            SuggestedFileName = existing != null ? Path.GetFileName(existing) : "Query.sql",
+            DefaultExtension = "sql",
+            FileTypeChoices = new[]
+            {
+                new FilePickerFileType("SQL Scripts")
+                {
+                    Patterns = new[] { "*.sql" }
+                },
+                FilePickerFileTypes.All
+            }
+        };
+
+        if (existing != null)
+        {
+            var directory = Path.GetDirectoryName(existing);
+            if (!string.IsNullOrEmpty(directory))
+                options.SuggestedStartLocation = await StorageProvider.TryGetFolderFromPathAsync(directory);
+        }
+
+        var file = await StorageProvider.SaveFilePickerAsync(options);
+
+        var path = file?.TryGetLocalPath();
+        if (path != null)
+            SaveQueryToPath(tab, session, path);
+    }
+
+    /// <summary>
+    /// The half of saving that does not need a human: write the text, remember where it went,
+    /// and retitle the tab to match. Split out from the picker so it can be tested.
+    /// </summary>
+    internal bool SaveQueryToPath(TabItem tab, QuerySessionControl session, string path)
+    {
+        try
+        {
+            File.WriteAllText(path, session.QueryEditor.Text);
+            session.SourceFilePath = path;
+            SetTabLabel(tab, Path.GetFileName(path));
+            return true;
+        }
+        catch (Exception ex)
+        {
+            ShowFileError("Error Saving File", $"Failed to save: {Path.GetFileName(path)}", ex.Message);
+            return false;
+        }
+    }
+
     private async void PasteXml_Click(object? sender, RoutedEventArgs e)
     {
         await PasteXmlAsync();
@@ -141,7 +232,7 @@ private void OpenFileByExtension(string filePath)
             LoadPlanFile(filePath);
     }
 
-    private void LoadSqlFile(string filePath)
+    internal void LoadSqlFile(string filePath)
     {
         try
         {
@@ -151,6 +242,7 @@ private void LoadSqlFile(string filePath)
             _queryCounter++;
             var session = new QuerySessionControl(_credentialService, _connectionStore);
             session.QueryEditor.Text = text;
+            session.SourceFilePath = filePath;
 
             var tab = CreateTab(fileName, session);
             MainTabControl.Items.Add(tab);
@@ -159,33 +251,52 @@ private void LoadSqlFile(string filePath)
         }
         catch (Exception ex)
         {
-            var dialog = new Window
+            ShowFileError("Error Opening File", $"Failed to open: {Path.GetFileName(filePath)}", ex.Message);
+        }
+    }
+
+    /// <summary>
+    /// One modal for every file operation that can fail, so opening and saving report
+    /// trouble the same way.
+    ///
+    /// <para>Shown ownerless until this window is visible. Both the command-line open and the
+    /// restore of the previous session's tabs run from the constructor, so a file that is
+    /// missing or unreadable at startup reaches here before there is anything to be modal
+    /// over, and ShowDialog against a window that has not been shown throws rather than
+    /// reporting the problem it was called about.</para>
+    /// </summary>
+    private void ShowFileError(string title, string headline, string detail)
+    {
+        var dialog = new Window
+        {
+            Title = title,
+            Width = 450,
+            Height = 200,
+            WindowStartupLocation = WindowStartupLocation.CenterOwner,
+            Content = new StackPanel
             {
-                Title = "Error Opening File",
-                Width = 450,
-                Height = 200,
-                WindowStartupLocation = WindowStartupLocation.CenterOwner,
-                Content = new StackPanel
+                Margin = new Avalonia.Thickness(20),
+                Children =
                 {
-                    Margin = new Avalonia.Thickness(20),
-                    Children =
+                    new TextBlock
+                    {
+                        Text = headline,
+                        FontWeight = FontWeight.Bold,
+                        Margin = new Avalonia.Thickness(0, 0, 0, 10)
+                    },
+                    new TextBlock
                     {
-                        new TextBlock
-                        {
-                            Text = $"Failed to open: {Path.GetFileName(filePath)}",
-                            FontWeight = FontWeight.Bold,
-                            Margin = new Avalonia.Thickness(0, 0, 0, 10)
-                        },
-                        new TextBlock
-                        {
-                            Text = ex.Message,
-                            TextWrapping = TextWrapping.Wrap
-                        }
+                        Text = detail,
+                        TextWrapping = TextWrapping.Wrap
                     }
                 }
-            };
+            }
+        };
+
+        if (IsVisible)
             dialog.ShowDialog(this);
-        }
+        else
+            dialog.Show();
     }
 
     internal void LoadPlanFile(string filePath)
diff --git a/src/PlanViewer.App/MainWindow.Tabs.cs b/src/PlanViewer.App/MainWindow.Tabs.cs
index 3c642e08..029e8549 100644
--- a/src/PlanViewer.App/MainWindow.Tabs.cs
+++ b/src/PlanViewer.App/MainWindow.Tabs.cs
@@ -177,6 +177,16 @@ private void TabContextMenu_Click(object? sender, RoutedEventArgs e)
         }
     }
 
+    /// <summary>
+    /// Retitles a tab. The header is a StackPanel whose first child carries the text,
+    /// which is also what StartRename edits.
+    /// </summary>
+    private static void SetTabLabel(TabItem tab, string label)
+    {
+        if (tab.Header is StackPanel header && header.Children.Count > 0 && header.Children[0] is TextBlock text)
+            text.Text = label;
+    }
+
     private static string? GetTabFilePath(TabItem tab)
     {
         // Plans opened from file are wrapped in a DockPanel with the viewer as the last child
diff --git a/src/PlanViewer.App/MainWindow.axaml b/src/PlanViewer.App/MainWindow.axaml
index 19e16032..fc63ed8e 100644
--- a/src/PlanViewer.App/MainWindow.axaml
+++ b/src/PlanViewer.App/MainWindow.axaml
@@ -16,6 +16,11 @@
             <MenuItem Header="_File">
                 <MenuItem Header="New _Query" Click="NewQuery_Click"
                           InputGesture="Ctrl+N"/>
+                <MenuItem Header="Open Q_uery..." Click="OpenQuery_Click"
+                          InputGesture="Ctrl+Shift+O"/>
+                <MenuItem Header="_Save Query..." Click="SaveQuery_Click"
+                          InputGesture="Ctrl+S"/>
+                <Separator/>
                 <MenuItem Header="_Open .sqlplan..." Click="OpenFile_Click"
                           InputGesture="Ctrl+O"/>
                 <MenuItem Header="_Paste Plan XML" Click="PasteXml_Click"
diff --git a/src/PlanViewer.App/MainWindow.axaml.cs b/src/PlanViewer.App/MainWindow.axaml.cs
index f8cfe6de..154cd728 100644
--- a/src/PlanViewer.App/MainWindow.axaml.cs
+++ b/src/PlanViewer.App/MainWindow.axaml.cs
@@ -98,6 +98,10 @@ refresh that has to be remembered at sixteen call sites is one that gets forgott
                         OpenFile_Click(this, new RoutedEventArgs());
                         e.Handled = true;
                         break;
+                    case Key.S:
+                        _ = SaveQueryAsync();
+                        e.Handled = true;
+                        break;
                     case Key.W:
                         if (MainTabControl.SelectedItem is TabItem selected)
                         {
@@ -124,6 +128,11 @@ refresh that has to be remembered at sixteen call sites is one that gets forgott
                         break;
                 }
             }
+            else if (e.KeyModifiers == (KeyModifiers.Control | KeyModifiers.Shift) && e.Key == Key.O)
+            {
+                OpenQuery_Click(this, new RoutedEventArgs());
+                e.Handled = true;
+            }
             else if (e.KeyModifiers == (KeyModifiers.Control | KeyModifiers.Shift) && e.Key == Key.Tab)
             {
                 var tabCount = MainTabControl.Items.Count;
diff --git a/src/PlanViewer.App/PlanViewer.App.csproj b/src/PlanViewer.App/PlanViewer.App.csproj
index 652ea8b2..b49d227b 100644
--- a/src/PlanViewer.App/PlanViewer.App.csproj
+++ b/src/PlanViewer.App/PlanViewer.App.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="ModelContextProtocol" Version="2.2.0" />
     <PackageReference Include="ModelContextProtocol.AspNetCore" Version="2.2.0" />
     <PackageReference Include="TextMateSharp.Grammars" Version="2.0.4" />
-    <PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="180.78.1" />
+    <PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="180.102.0" />
     <PackageReference Include="Velopack" Version="1.2.0" />
 
     <!-- Pin SkiaSharp native assets to match SkiaSharp 3.119.0.
diff --git a/src/PlanViewer.Core/Output/ResultMapper.cs b/src/PlanViewer.Core/Output/ResultMapper.cs
index 83ac5fd4..13436886 100644
--- a/src/PlanViewer.Core/Output/ResultMapper.cs
+++ b/src/PlanViewer.Core/Output/ResultMapper.cs
@@ -24,14 +24,13 @@ internal static AnalysisResult MapCancellable(
             SqlServerBuild = plan.Build
         };
 
-        foreach (var batch in plan.Batches)
+        /* #455: includes statements nested inside a stored procedure or UDF body. Without this the
+           summary counted the EXEC and nothing else, so a procedure carrying dozens of statement
+           plans reported total_statements 1 and max_estimated_cost 0. */
+        foreach (var stmt in PlanStatements.EnumerateAll(plan))
         {
             cancellationToken.ThrowIfCancellationRequested();
-            foreach (var stmt in batch.Statements)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                result.Statements.Add(MapStatement(stmt, cancellationToken));
-            }
+            result.Statements.Add(MapStatement(stmt, cancellationToken));
         }
 
         result.Summary = BuildSummary(result, cancellationToken);
diff --git a/src/PlanViewer.Core/PlanViewer.Core.csproj b/src/PlanViewer.Core/PlanViewer.Core.csproj
index af11bd6a..d53d9101 100644
--- a/src/PlanViewer.Core/PlanViewer.Core.csproj
+++ b/src/PlanViewer.Core/PlanViewer.Core.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.2" />
     <PackageReference Include="Meziantou.Framework.Win32.CredentialManager" Version="3.0.1" />
     <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Azure" Version="7.0.2" />
-    <PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="180.78.1" />
+    <PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="180.102.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/PlanViewer.Core/Services/PlanAnalyzer.cs b/src/PlanViewer.Core/Services/PlanAnalyzer.cs
index eb6a3f6c..2d064441 100644
--- a/src/PlanViewer.Core/Services/PlanAnalyzer.cs
+++ b/src/PlanViewer.Core/Services/PlanAnalyzer.cs
@@ -45,10 +45,11 @@ internal static void AnalyzeCancellable(
         CancellationToken cancellationToken)
     {
         var cfg = config ?? AnalyzerConfig.Default;
-        foreach (var batch in plan.Batches)
         {
-            cancellationToken.ThrowIfCancellationRequested();
-            foreach (var stmt in batch.Statements)
+            /* #455: every statement, including the ones inside a stored procedure or UDF body. This
+               used to walk batch.Statements alone, so an EXEC <procedure> plan analyzed as a single
+               statement with nothing to say about it. */
+            foreach (var stmt in PlanStatements.EnumerateAll(plan))
             {
                 cancellationToken.ThrowIfCancellationRequested();
                 AnalyzeStatement(stmt, cfg, serverMetadata);
diff --git a/src/PlanViewer.Core/Services/PlanStatements.cs b/src/PlanViewer.Core/Services/PlanStatements.cs
new file mode 100644
index 00000000..97390a5b
--- /dev/null
+++ b/src/PlanViewer.Core/Services/PlanStatements.cs
@@ -0,0 +1,68 @@
+using System.Collections.Generic;
+using PlanViewer.Core.Models;
+
+namespace PlanViewer.Core.Services;
+
+/// <summary>
+/// Walks every statement in a plan, including the ones nested inside a stored procedure or a
+/// user-defined function (#455).
+///
+/// <para><b>Why this exists.</b> A plan captured around <c>EXEC &lt;procedure&gt;</c> puts the
+/// procedure's statements under a <c>StoredProc</c> element, and the parser has always read them —
+/// into <see cref="PlanStatement.StoredProcPlan"/>. Nothing downstream looked there. The analyzer and
+/// the result mapper both walked <c>batch.Statements</c> only, so a plan with eighty-seven statement
+/// plans inside a procedure analyzed as one statement, zero warnings, zero cost, and exited 0. The
+/// output was well-formed and entirely wrong, which is the worst way for this to fail.</para>
+///
+/// <para>The traversal itself was not missing — <c>PlanOperations.ValidateComplexity</c> has always
+/// descended, which is how the complexity limit counted statements the analysis never saw. This puts
+/// that same walk in one place so the two cannot disagree again.</para>
+/// </summary>
+public static class PlanStatements
+{
+    /// <summary>
+    /// Every statement in the plan, outermost first, each nested body following the statement that
+    /// owns it.
+    /// </summary>
+    public static IEnumerable<PlanStatement> EnumerateAll(ParsedPlan plan)
+    {
+        foreach (var batch in plan.Batches)
+        {
+            foreach (var statement in EnumerateAll(batch.Statements))
+                yield return statement;
+        }
+    }
+
+    /// <summary>
+    /// <paramref name="statements"/> and everything nested beneath them.
+    ///
+    /// <para>An explicit stack rather than recursion, because procedure bodies nest — a procedure
+    /// calling a procedure calling a function — and #430 was a crash caused by assuming a plan's
+    /// shapes are shallow.</para>
+    /// </summary>
+    public static IEnumerable<PlanStatement> EnumerateAll(IReadOnlyList<PlanStatement> statements)
+    {
+        var pending = new Stack<PlanStatement>();
+        for (var i = statements.Count - 1; i >= 0; i--)
+            pending.Push(statements[i]);
+
+        while (pending.TryPop(out var statement))
+        {
+            yield return statement;
+
+            /* Pushed in reverse so the bodies come back out in source order, and pushed AFTER the
+               statement is yielded so a body follows the EXEC that owns it rather than preceding it. */
+            for (var i = statement.UdfPlans.Count - 1; i >= 0; i--)
+                PushAll(statement.UdfPlans[i].Statements, pending);
+
+            if (statement.StoredProcPlan is not null)
+                PushAll(statement.StoredProcPlan.Statements, pending);
+        }
+    }
+
+    private static void PushAll(IReadOnlyList<PlanStatement> statements, Stack<PlanStatement> pending)
+    {
+        for (var i = statements.Count - 1; i >= 0; i--)
+            pending.Push(statements[i]);
+    }
+}
diff --git a/src/PlanViewer.Core/Services/ShowPlanParser.cs b/src/PlanViewer.Core/Services/ShowPlanParser.cs
index 35a66f30..453d2095 100644
--- a/src/PlanViewer.Core/Services/ShowPlanParser.cs
+++ b/src/PlanViewer.Core/Services/ShowPlanParser.cs
@@ -278,6 +278,52 @@ private static List<PlanStatement> ParseStatementAndChildren(
             }
         }
 
+        /* #455: sub-plans are read BEFORE the no-QueryPlan early return below, because an
+           EXEC <procedure> statement has no QueryPlan of its own - every plan lives in the body -
+           so it took that early return and never reached this code, seventy lines further down. The
+           parser looked like it descended into procedures and in the one case that matters never
+           did. The same was true of a UDF call whose statement carries no plan of its own. */
+        // XSD gap: UDF sub-plans
+        foreach (var udfEl in stmtEl.Elements(Ns + "UDF"))
+        {
+            var udfInfo = new FunctionPlanInfo
+            {
+                ProcName = udfEl.Attribute("ProcName")?.Value ?? "",
+                IsNativelyCompiled = udfEl.Attribute("IsNativelyCompiled")?.Value is "true" or "1"
+            };
+            var udfStmts = udfEl.Element(Ns + "Statements");
+            if (udfStmts != null)
+            {
+                foreach (var childStmt in udfStmts.Elements())
+                {
+                    var parsed = ParseStatementAndChildren(childStmt, cancellationToken: cancellationToken);
+                    udfInfo.Statements.AddRange(parsed);
+                }
+            }
+            stmt.UdfPlans.Add(udfInfo);
+        }
+
+        // XSD gap: StoredProc sub-plan
+        var storedProcEl = stmtEl.Element(Ns + "StoredProc");
+        if (storedProcEl != null)
+        {
+            var spInfo = new FunctionPlanInfo
+            {
+                ProcName = storedProcEl.Attribute("ProcName")?.Value ?? "",
+                IsNativelyCompiled = storedProcEl.Attribute("IsNativelyCompiled")?.Value is "true" or "1"
+            };
+            var spStmts = storedProcEl.Element(Ns + "Statements");
+            if (spStmts != null)
+            {
+                foreach (var childStmt in spStmts.Elements())
+                {
+                    var parsed = ParseStatementAndChildren(childStmt, cancellationToken: cancellationToken);
+                    spInfo.Statements.AddRange(parsed);
+                }
+            }
+            stmt.StoredProcPlan = spInfo;
+        }
+
         if (queryPlanEl == null)
         {
             // Statements with no QueryPlan (e.g., DECLARE/ASSIGN) still get a synthetic
@@ -333,46 +379,6 @@ private static List<PlanStatement> ParseStatementAndChildren(
             stmt.RootNode = stmtNode;
         }
 
-        // XSD gap: UDF sub-plans
-        foreach (var udfEl in stmtEl.Elements(Ns + "UDF"))
-        {
-            var udfInfo = new FunctionPlanInfo
-            {
-                ProcName = udfEl.Attribute("ProcName")?.Value ?? "",
-                IsNativelyCompiled = udfEl.Attribute("IsNativelyCompiled")?.Value is "true" or "1"
-            };
-            var udfStmts = udfEl.Element(Ns + "Statements");
-            if (udfStmts != null)
-            {
-                foreach (var childStmt in udfStmts.Elements())
-                {
-                    var parsed = ParseStatementAndChildren(childStmt, cancellationToken: cancellationToken);
-                    udfInfo.Statements.AddRange(parsed);
-                }
-            }
-            stmt.UdfPlans.Add(udfInfo);
-        }
-
-        // XSD gap: StoredProc sub-plan
-        var storedProcEl = stmtEl.Element(Ns + "StoredProc");
-        if (storedProcEl != null)
-        {
-            var spInfo = new FunctionPlanInfo
-            {
-                ProcName = storedProcEl.Attribute("ProcName")?.Value ?? "",
-                IsNativelyCompiled = storedProcEl.Attribute("IsNativelyCompiled")?.Value is "true" or "1"
-            };
-            var spStmts = storedProcEl.Element(Ns + "Statements");
-            if (spStmts != null)
-            {
-                foreach (var childStmt in spStmts.Elements())
-                {
-                    var parsed = ParseStatementAndChildren(childStmt, cancellationToken: cancellationToken);
-                    spInfo.Statements.AddRange(parsed);
-                }
-            }
-            stmt.StoredProcPlan = spInfo;
-        }
 
         return stmt;
     }
diff --git a/src/PlanViewer.Ssms/Properties/AssemblyInfo.cs b/src/PlanViewer.Ssms/Properties/AssemblyInfo.cs
index 0e55fb2e..9170ad8f 100644
--- a/src/PlanViewer.Ssms/Properties/AssemblyInfo.cs
+++ b/src/PlanViewer.Ssms/Properties/AssemblyInfo.cs
@@ -7,5 +7,5 @@
 [assembly: AssemblyProduct("Performance Studio for SSMS")]
 [assembly: AssemblyCopyright("Copyright Darling Data 2026")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.21.0.0")]
-[assembly: AssemblyFileVersion("1.21.0.0")]
+[assembly: AssemblyVersion("1.22.0.0")]
+[assembly: AssemblyFileVersion("1.22.0.0")]
diff --git a/src/PlanViewer.Ssms/source.extension.vsixmanifest b/src/PlanViewer.Ssms/source.extension.vsixmanifest
index 0c2ef89b..d6b707c9 100644
--- a/src/PlanViewer.Ssms/source.extension.vsixmanifest
+++ b/src/PlanViewer.Ssms/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
                  xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
     <Identity Id="PlanViewer.Ssms.64F79022-9D9A-4463-A1AE-4B19426A0CB1"
-              Version="1.21.0"
+              Version="1.22.0"
               Language="en-US"
               Publisher="Darling Data" />
     <DisplayName>Performance Studio for SSMS</DisplayName>
diff --git a/src/PlanViewer.Web/PlanViewer.Web.csproj b/src/PlanViewer.Web/PlanViewer.Web.csproj
index dfc14a6b..9e26aeaa 100644
--- a/src/PlanViewer.Web/PlanViewer.Web.csproj
+++ b/src/PlanViewer.Web/PlanViewer.Web.csproj
@@ -23,6 +23,7 @@
     <Compile Include="..\PlanViewer.Core\Services\ShowPlanParser.Warnings.cs" Link="Core\Services\ShowPlanParser.Warnings.cs" />
     <Compile Include="..\PlanViewer.Core\Services\ShowPlanParser.Costs.cs" Link="Core\Services\ShowPlanParser.Costs.cs" />
     <Compile Include="..\PlanViewer.Core\Services\ShowPlanParser.Helpers.cs" Link="Core\Services\ShowPlanParser.Helpers.cs" />
+    <Compile Include="..\PlanViewer.Core\Services\PlanStatements.cs" Link="Core\Services\PlanStatements.cs" />
     <Compile Include="..\PlanViewer.Core\Services\PlanAnalyzer.cs" Link="Core\Services\PlanAnalyzer.cs" />
     <Compile Include="..\PlanViewer.Core\Services\PlanAnalyzer.Statement.cs" Link="Core\Services\PlanAnalyzer.Statement.cs" />
     <Compile Include="..\PlanViewer.Core\Services\PlanAnalyzer.Node.cs" Link="Core\Services\PlanAnalyzer.Node.cs" />
diff --git a/tests/PlanViewer.Core.Tests/OpenSaveQueryTests.cs b/tests/PlanViewer.Core.Tests/OpenSaveQueryTests.cs
new file mode 100644
index 00000000..0c39f9a4
--- /dev/null
+++ b/tests/PlanViewer.Core.Tests/OpenSaveQueryTests.cs
@@ -0,0 +1,151 @@
+using System.IO;
+using System.Linq;
+using Avalonia.Controls;
+using PlanViewer.App;
+using PlanViewer.App.Controls;
+
+namespace PlanViewer.Core.Tests;
+
+/// <summary>
+/// #458: a user asked for File > Open Query, not knowing the app already opened .sql files —
+/// the menu item was labelled "Open .sqlplan..." and said nothing about queries. The feature
+/// that shipped is the pair of menu items, and what has to keep working underneath is that a
+/// .sql file lands in a query session and can be written back out again.
+///
+/// These drive LoadSqlFile and SaveQueryToPath rather than the Click handlers, because the
+/// handlers exist to raise a file picker and a picker cannot be answered headlessly. The
+/// picker chooses a path; everything after that choice is what these cover.
+/// </summary>
+public class OpenSaveQueryTests
+{
+    [Fact]
+    public void OpeningASqlFileFillsAQuerySessionAndRemembersWhereItCameFrom()
+    {
+        HeadlessUi.Run(() =>
+        {
+            var path = TempSql("SELECT 1 AS opened;");
+            try
+            {
+                var window = new MainWindow();
+                window.LoadSqlFile(path);
+
+                var tab = QueryTabs(window).Last();
+                var session = (QuerySessionControl)tab.Content!;
+
+                Assert.Equal("SELECT 1 AS opened;", session.QueryEditor.Text);
+                Assert.Equal(path, session.SourceFilePath);
+                Assert.Equal(Path.GetFileName(path), TabLabel(tab));
+            }
+            finally
+            {
+                File.Delete(path);
+            }
+        });
+    }
+
+    [Fact]
+    public void SavingWritesTheEditorTextAndRetitlesTheTab()
+    {
+        HeadlessUi.Run(() =>
+        {
+            var opened = TempSql("SELECT 1;");
+            var savedAs = Path.Combine(Path.GetTempPath(), $"renamed_{Path.GetFileName(opened)}");
+            try
+            {
+                var window = new MainWindow();
+                window.LoadSqlFile(opened);
+
+                var tab = QueryTabs(window).Last();
+                var session = (QuerySessionControl)tab.Content!;
+                session.QueryEditor.Text = "SELECT 2 AS edited;";
+
+                Assert.True(window.SaveQueryToPath(tab, session, savedAs));
+
+                Assert.Equal("SELECT 2 AS edited;", File.ReadAllText(savedAs));
+                /* Save-as retargets the session: a second save has to land on the new file,
+                   not silently keep overwriting the one it was opened from. */
+                Assert.Equal(savedAs, session.SourceFilePath);
+                Assert.Equal(Path.GetFileName(savedAs), TabLabel(tab));
+                Assert.Equal("SELECT 1;", File.ReadAllText(opened));
+            }
+            finally
+            {
+                File.Delete(opened);
+                if (File.Exists(savedAs))
+                    File.Delete(savedAs);
+            }
+        });
+    }
+
+    [Fact]
+    public void ANewQuerySessionHasNoFileUntilItIsSaved()
+    {
+        HeadlessUi.Run(() =>
+        {
+            var savedAs = Path.Combine(Path.GetTempPath(), $"fresh_{Path.GetRandomFileName()}.sql");
+            try
+            {
+                var window = new MainWindow();
+                window.NewQuery_Click(window, new Avalonia.Interactivity.RoutedEventArgs());
+
+                var tab = QueryTabs(window).Last();
+                var session = (QuerySessionControl)tab.Content!;
+
+                /* Nothing to default the Save picker to, which is why it suggests Query.sql. */
+                Assert.Null(session.SourceFilePath);
+
+                session.QueryEditor.Text = "SELECT 3;";
+                Assert.True(window.SaveQueryToPath(tab, session, savedAs));
+                Assert.Equal(savedAs, session.SourceFilePath);
+            }
+            finally
+            {
+                if (File.Exists(savedAs))
+                    File.Delete(savedAs);
+            }
+        });
+    }
+
+    [Fact]
+    public void AFailedSaveLeavesTheSessionPointingAtItsOriginalFile()
+    {
+        HeadlessUi.Run(() =>
+        {
+            var opened = TempSql("SELECT 1;");
+            /* A directory that does not exist: File.WriteAllText throws, and the session must not
+               come away believing it now lives somewhere it was never written. */
+            var unwritable = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName(), "nope.sql");
+            try
+            {
+                var window = new MainWindow();
+                window.LoadSqlFile(opened);
+
+                var tab = QueryTabs(window).Last();
+                var session = (QuerySessionControl)tab.Content!;
+
+                Assert.False(window.SaveQueryToPath(tab, session, unwritable));
+                Assert.Equal(opened, session.SourceFilePath);
+                Assert.Equal(Path.GetFileName(opened), TabLabel(tab));
+            }
+            finally
+            {
+                File.Delete(opened);
+            }
+        });
+    }
+
+    private static string TempSql(string text)
+    {
+        var path = Path.Combine(Path.GetTempPath(), $"{Path.GetRandomFileName()}.sql");
+        File.WriteAllText(path, text);
+        return path;
+    }
+
+    private static System.Collections.Generic.IEnumerable<TabItem> QueryTabs(MainWindow window) =>
+        window.MainTabControl.Items.OfType<TabItem>().Where(t => t.Content is QuerySessionControl);
+
+    private static string? TabLabel(TabItem tab) =>
+        tab.Header is StackPanel header && header.Children.Count > 0 && header.Children[0] is TextBlock text
+            ? text.Text
+            : null;
+}
diff --git a/tests/PlanViewer.Core.Tests/PlanTestHelper.cs b/tests/PlanViewer.Core.Tests/PlanTestHelper.cs
index 04bfab1d..f84b86e9 100644
--- a/tests/PlanViewer.Core.Tests/PlanTestHelper.cs
+++ b/tests/PlanViewer.Core.Tests/PlanTestHelper.cs
@@ -44,15 +44,15 @@ public static List<PlanWarning> AllWarnings(ParsedPlan plan)
     {
         var warnings = new List<PlanWarning>();
 
-        foreach (var batch in plan.Batches)
+        /* #455: every statement, including the ones inside a stored procedure or UDF body. This
+           walked batch.Statements alone, exactly like the analyzer did, so the golden master could
+           not have caught the analyzer skipping procedure bodies - the two shared a blind spot. */
+        foreach (var stmt in PlanViewer.Core.Services.PlanStatements.EnumerateAll(plan))
         {
-            foreach (var stmt in batch.Statements)
-            {
-                warnings.AddRange(stmt.PlanWarnings);
+            warnings.AddRange(stmt.PlanWarnings);
 
-                if (stmt.RootNode != null)
-                    CollectNodeWarnings(stmt.RootNode, warnings);
-            }
+            if (stmt.RootNode != null)
+                CollectNodeWarnings(stmt.RootNode, warnings);
         }
 
         return warnings;
diff --git a/tests/PlanViewer.Core.Tests/Plans/exec_stored_procedure_plan.sqlplan b/tests/PlanViewer.Core.Tests/Plans/exec_stored_procedure_plan.sqlplan
new file mode 100644
index 00000000..6880f480
--- /dev/null
+++ b/tests/PlanViewer.Core.Tests/Plans/exec_stored_procedure_plan.sqlplan
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ShowPlanXML xmlns="http://schemas.microsoft.com/sqlserver/2004/07/showplan" Version="1.599" Build="17.0.4050.1"><BatchSequence><Batch><Statements><StmtSimple StatementText="EXEC dbo.ReproProc @code = N&apos;123&apos;" StatementId="1" StatementCompId="1" StatementType="EXECUTE PROC" RetrievedFromCache="false"><StoredProc ProcName="dbo.ReproProc"><Statements><StmtSimple StatementText="/* A procedure whose body carries several statements, including shapes the analyzer&#xa;   would normally have plenty to say about. */&#xa;CREATE   PROCEDURE dbo.ReproProc&#xa;    @code nvarchar(20)&#xa;AS&#xa;BEGIN&#xa;    SET NOCOUNT ON;&#xa;&#xa;    /* nvarchar parameter against a varchar column: conversion lands on the COLUMN */&#xa;    " StatementId="2" StatementCompId="3" StatementType="SET ON/OFF" RetrievedFromCache="false"></StmtSimple><StmtSimple StatementText="SELECT COUNT_BIG(*) FROM dbo.Orders WHERE Code = @code" StatementId="3" StatementCompId="4" StatementType="SELECT" RetrievedFromCache="false" StatementSubTreeCost="0.269624" StatementEstRows="1" SecurityPolicyApplied="false" StatementOptmLevel="TRIVIAL" QueryHash="0x5BFEBD7B2B3D1047" QueryPlanHash="0x0B1781D876C683F9" CardinalityEstimationModelVersion="170"><StatementSetOptions QUOTED_IDENTIFIER="false" ARITHABORT="false" CONCAT_NULL_YIELDS_NULL="true" ANSI_NULLS="true" ANSI_PADDING="true" ANSI_WARNINGS="true" NUMERIC_ROUNDABORT="false"></StatementSetOptions><QueryPlan CachedPlanSize="16" CompileTime="17" CompileCPU="16" CompileMemory="296"><MemoryGrantInfo SerialRequiredMemory="0" SerialDesiredMemory="0" GrantedMemory="0" MaxUsedMemory="0"></MemoryGrantInfo><OptimizerHardwareDependentProperties EstimatedAvailableMemoryGrant="43335" EstimatedPagesCached="40627" EstimatedAvailableDegreeOfParallelism="7" MaxCompileMemory="3755320"></OptimizerHardwareDependentProperties><OptimizerStatsUsage><StatisticsInfo LastUpdate="2026-08-22T02:25:16.85" ModificationCount="0" SamplingPercent="100" Statistics="[_WA_Sys_00000002_48CFD27E]" Table="[Orders]" Schema="[dbo]" Database="[ps455]"></StatisticsInfo></OptimizerStatsUsage><RelOp NodeId="0" PhysicalOp="Stream Aggregate" LogicalOp="Aggregate" EstimateRows="1" EstimateIO="0" EstimateCPU="1.1e-06" AvgRowSize="15" EstimatedTotalSubtreeCost="0.269624" Parallel="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row"><OutputList><ColumnReference Column="Expr1002"></ColumnReference></OutputList><StreamAggregate><DefinedValues><DefinedValue><ColumnReference Column="Expr1002"></ColumnReference><ScalarOperator ScalarString="Count(*)"><Aggregate AggType="countstar" Distinct="0"></Aggregate></ScalarOperator></DefinedValue></DefinedValues><RelOp NodeId="1" PhysicalOp="Clustered Index Scan" LogicalOp="Clustered Index Scan" EstimateRows="1" EstimatedRowsRead="20000" EstimateIO="0.243866" EstimateCPU="0.022157" AvgRowSize="15" EstimatedTotalSubtreeCost="0.266023" TableCardinality="20000" Parallel="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row"><OutputList></OutputList><IndexScan Ordered="0" ForcedIndex="0" ForceScan="0" NoExpandHint="0" Storage="RowStore"><DefinedValues></DefinedValues><Object Database="[ps455]" Schema="[dbo]" Table="[Orders]" Index="[PK__Orders__3214EC0752BE59EA]" IndexKind="Clustered" Storage="RowStore"></Object><Predicate><ScalarOperator ScalarString="CONVERT_IMPLICIT(nvarchar(20),[ps455].[dbo].[Orders].[Code],0)=[@code]"><Compare CompareOp="EQ"><ScalarOperator><Convert DataType="nvarchar" Length="40" Style="0" Implicit="1"><ScalarOperator><Identifier><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Code"></ColumnReference></Identifier></ScalarOperator></Convert></ScalarOperator><ScalarOperator><Identifier><ColumnReference Column="@code"></ColumnReference></Identifier></ScalarOperator></Compare></ScalarOperator></Predicate></IndexScan></RelOp></StreamAggregate></RelOp><ParameterList><ColumnReference Column="@code" ParameterDataType="nvarchar(20)" ParameterCompiledValue="N&apos;123&apos;"></ColumnReference></ParameterList></QueryPlan></StmtSimple><StmtSimple StatementText=";&#xa;&#xa;    /* a scan with a residual predicate */&#xa;    SELECT TOP (10) * FROM dbo.Orders WHERE Amount &gt; 0.5 ORDER BY Amount DESC" StatementId="4" StatementCompId="5" StatementType="SELECT" RetrievedFromCache="false" StatementSubTreeCost="1.589" StatementEstRows="10" SecurityPolicyApplied="false" StatementOptmLevel="FULL" QueryHash="0xF2BEA60BD06497D7" QueryPlanHash="0x6FF10C67FC5BE204" CardinalityEstimationModelVersion="170"><StatementSetOptions QUOTED_IDENTIFIER="false" ARITHABORT="false" CONCAT_NULL_YIELDS_NULL="true" ANSI_NULLS="true" ANSI_PADDING="true" ANSI_WARNINGS="true" NUMERIC_ROUNDABORT="false"></StatementSetOptions><QueryPlan CachedPlanSize="24" CompileTime="9" CompileCPU="9" CompileMemory="224"><MemoryGrantInfo SerialRequiredMemory="512" SerialDesiredMemory="6656" GrantedMemory="0" MaxUsedMemory="0"></MemoryGrantInfo><OptimizerHardwareDependentProperties EstimatedAvailableMemoryGrant="43335" EstimatedPagesCached="40627" EstimatedAvailableDegreeOfParallelism="7" MaxCompileMemory="3755320"></OptimizerHardwareDependentProperties><OptimizerStatsUsage><StatisticsInfo LastUpdate="2026-08-22T02:25:16.86" ModificationCount="0" SamplingPercent="100" Statistics="[_WA_Sys_00000003_48CFD27E]" Table="[Orders]" Schema="[dbo]" Database="[ps455]"></StatisticsInfo></OptimizerStatsUsage><RelOp NodeId="0" PhysicalOp="Top" LogicalOp="Top" EstimateRows="10" EstimateIO="0" EstimateCPU="1e-06" AvgRowSize="134" EstimatedTotalSubtreeCost="1.589" Parallel="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row"><OutputList><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Id"></ColumnReference><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Code"></ColumnReference><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Amount"></ColumnReference><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Filler"></ColumnReference></OutputList><Top RowCount="0" IsPercent="0" WithTies="0"><TopExpression><ScalarOperator ScalarString="(10)"><Const ConstValue="(10)"></Const></ScalarOperator></TopExpression><RelOp NodeId="1" PhysicalOp="Filter" LogicalOp="Filter" EstimateRows="10" EstimateRowsWithoutRowGoal="20000" EstimateIO="0" EstimateCPU="0.0096" AvgRowSize="134" EstimatedTotalSubtreeCost="1.589" Parallel="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row"><OutputList><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Id"></ColumnReference><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Code"></ColumnReference><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Amount"></ColumnReference><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Filler"></ColumnReference></OutputList><Filter StartupExpression="0"><RelOp NodeId="2" PhysicalOp="Sort" LogicalOp="Sort" EstimateRows="10" EstimateRowsWithoutRowGoal="20000" EstimateIO="0.0112613" EstimateCPU="1.31171" AvgRowSize="134" EstimatedTotalSubtreeCost="1.589" Parallel="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row"><OutputList><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Id"></ColumnReference><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Code"></ColumnReference><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Amount"></ColumnReference><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Filler"></ColumnReference></OutputList><MemoryFractions Input="1" Output="1"></MemoryFractions><Sort Distinct="0"><OrderBy><OrderByColumn Ascending="0"><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Amount"></ColumnReference></OrderByColumn></OrderBy><RelOp NodeId="3" PhysicalOp="Clustered Index Scan" LogicalOp="Clustered Index Scan" EstimateRows="20000" EstimateRowsWithoutRowGoal="20000" EstimatedRowsRead="20000" EstimateIO="0.243866" EstimateCPU="0.022157" AvgRowSize="134" EstimatedTotalSubtreeCost="0.266023" TableCardinality="20000" Parallel="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row"><OutputList><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Id"></ColumnReference><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Code"></ColumnReference><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Amount"></ColumnReference><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Filler"></ColumnReference></OutputList><IndexScan Ordered="0" ForcedIndex="0" ForceScan="0" NoExpandHint="0" Storage="RowStore"><DefinedValues><DefinedValue><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Id"></ColumnReference></DefinedValue><DefinedValue><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Code"></ColumnReference></DefinedValue><DefinedValue><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Amount"></ColumnReference></DefinedValue><DefinedValue><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Filler"></ColumnReference></DefinedValue></DefinedValues><Object Database="[ps455]" Schema="[dbo]" Table="[Orders]" Index="[PK__Orders__3214EC0752BE59EA]" IndexKind="Clustered" Storage="RowStore"></Object></IndexScan></RelOp></Sort></RelOp><Predicate><ScalarOperator ScalarString="[ps455].[dbo].[Orders].[Amount]&gt;(0.5)"><Compare CompareOp="GT"><ScalarOperator><Identifier><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Amount"></ColumnReference></Identifier></ScalarOperator><ScalarOperator><Const ConstValue="(0.5)"></Const></ScalarOperator></Compare></ScalarOperator></Predicate></Filter></RelOp></Top></RelOp></QueryPlan></StmtSimple><StmtSimple StatementText=";&#xa;&#xa;    /* a table variable, which the analyzer flags */&#xa;    DECLARE @t table (Id int);&#xa;    INSERT @t (Id) SELECT TOP (100) Id FROM dbo.Orders" StatementId="5" StatementCompId="7" StatementType="INSERT" RetrievedFromCache="false" StatementSubTreeCost="0.0146937" StatementEstRows="100" SecurityPolicyApplied="false" StatementOptmLevel="TRIVIAL" QueryHash="0xD3D9E566DCE1D7B4" QueryPlanHash="0x72419A1CB3F34B07" CardinalityEstimationModelVersion="170"><StatementSetOptions QUOTED_IDENTIFIER="false" ARITHABORT="false" CONCAT_NULL_YIELDS_NULL="true" ANSI_NULLS="true" ANSI_PADDING="true" ANSI_WARNINGS="true" NUMERIC_ROUNDABORT="false"></StatementSetOptions><QueryPlan NonParallelPlanReason="TableVariableTransactionsDoNotSupportParallelNestedTransaction" CachedPlanSize="16" CompileTime="1" CompileCPU="1" CompileMemory="152"><MemoryGrantInfo SerialRequiredMemory="0" SerialDesiredMemory="0" GrantedMemory="0" MaxUsedMemory="0"></MemoryGrantInfo><OptimizerHardwareDependentProperties EstimatedAvailableMemoryGrant="43335" EstimatedPagesCached="40627" EstimatedAvailableDegreeOfParallelism="7" MaxCompileMemory="3755320"></OptimizerHardwareDependentProperties><RelOp NodeId="0" PhysicalOp="Table Insert" LogicalOp="Insert" EstimateRows="100" EstimateIO="0.01" EstimateCPU="0.0001" AvgRowSize="9" EstimatedTotalSubtreeCost="0.0146937" Parallel="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row"><OutputList></OutputList><Update DMLRequestSort="0"><Object Table="[@t]" Storage="RowStore"></Object><SetPredicate><ScalarOperator ScalarString="[Id] = [ps455].[dbo].[Orders].[Id]"><ScalarExpressionList><ScalarOperator><MultipleAssign><Assign><ColumnReference Column="Id"></ColumnReference><ScalarOperator><Identifier><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Id"></ColumnReference></Identifier></ScalarOperator></Assign></MultipleAssign></ScalarOperator></ScalarExpressionList></ScalarOperator></SetPredicate><RelOp NodeId="1" PhysicalOp="Top" LogicalOp="Top" EstimateRows="100" EstimateIO="0" EstimateCPU="1e-05" AvgRowSize="11" EstimatedTotalSubtreeCost="0.00459373" Parallel="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row"><OutputList><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Id"></ColumnReference></OutputList><Top RowCount="0" IsPercent="0" WithTies="0"><TopExpression><ScalarOperator ScalarString="(100)"><Const ConstValue="(100)"></Const></ScalarOperator></TopExpression><RelOp NodeId="2" PhysicalOp="Clustered Index Scan" LogicalOp="Clustered Index Scan" EstimateRows="100" EstimateRowsWithoutRowGoal="20000" EstimatedRowsRead="100" EstimateIO="0.243866" EstimateCPU="0.022157" AvgRowSize="11" EstimatedTotalSubtreeCost="0.00458373" TableCardinality="20000" Parallel="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row"><OutputList><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Id"></ColumnReference></OutputList><IndexScan Ordered="0" ForcedIndex="0" ForceScan="0" NoExpandHint="0" Storage="RowStore"><DefinedValues><DefinedValue><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Column="Id"></ColumnReference></DefinedValue></DefinedValues><Object Database="[ps455]" Schema="[dbo]" Table="[Orders]" Index="[PK__Orders__3214EC0752BE59EA]" IndexKind="Clustered" Storage="RowStore"></Object></IndexScan></RelOp></Top></RelOp></Update></RelOp></QueryPlan></StmtSimple><StmtSimple StatementText=";&#xa;&#xa;    SELECT o.Id FROM dbo.Orders o JOIN @t t ON t.Id = o.Id" StatementId="6" StatementCompId="8" StatementType="SELECT" RetrievedFromCache="false" StatementSubTreeCost="0.00657086" StatementEstRows="1" SecurityPolicyApplied="false" StatementOptmLevel="FULL" QueryHash="0xFB8C249FB4684A54" QueryPlanHash="0x07EFDEB6F3008921" StatementOptmEarlyAbortReason="GoodEnoughPlanFound" CardinalityEstimationModelVersion="170"><StatementSetOptions QUOTED_IDENTIFIER="false" ARITHABORT="false" CONCAT_NULL_YIELDS_NULL="true" ANSI_NULLS="true" ANSI_PADDING="true" ANSI_WARNINGS="true" NUMERIC_ROUNDABORT="false"></StatementSetOptions><QueryPlan CachedPlanSize="24" CompileTime="3" CompileCPU="3" CompileMemory="192"><MemoryGrantInfo SerialRequiredMemory="0" SerialDesiredMemory="0" GrantedMemory="0" MaxUsedMemory="0"></MemoryGrantInfo><OptimizerHardwareDependentProperties EstimatedAvailableMemoryGrant="43335" EstimatedPagesCached="40627" EstimatedAvailableDegreeOfParallelism="7" MaxCompileMemory="3755320"></OptimizerHardwareDependentProperties><RelOp NodeId="0" PhysicalOp="Nested Loops" LogicalOp="Inner Join" EstimateRows="1" EstimateIO="0" EstimateCPU="4.18e-06" AvgRowSize="11" EstimatedTotalSubtreeCost="0.00657086" Parallel="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row"><OutputList><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Alias="[o]" Column="Id"></ColumnReference></OutputList><NestedLoops Optimized="0"><OuterReferences><ColumnReference Table="@t" Alias="[t]" Column="Id"></ColumnReference></OuterReferences><RelOp NodeId="1" PhysicalOp="Table Scan" LogicalOp="Table Scan" EstimateRows="1" EstimatedRowsRead="1" EstimateIO="0.003125" EstimateCPU="0.0001581" AvgRowSize="11" EstimatedTotalSubtreeCost="0.0032831" TableCardinality="0" Parallel="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row"><OutputList><ColumnReference Table="@t" Alias="[t]" Column="Id"></ColumnReference></OutputList><TableScan Ordered="0" ForcedIndex="0" ForceScan="0" NoExpandHint="0" Storage="RowStore"><DefinedValues><DefinedValue><ColumnReference Table="@t" Alias="[t]" Column="Id"></ColumnReference></DefinedValue></DefinedValues><Object Table="[@t]" Alias="[t]" Storage="RowStore"></Object><Predicate><ScalarOperator ScalarString="@t.[Id] as [t].[Id] IS NOT NULL"><Compare CompareOp="IS NOT"><ScalarOperator><Identifier><ColumnReference Table="@t" Alias="[t]" Column="Id"></ColumnReference></Identifier></ScalarOperator><ScalarOperator><Const ConstValue="NULL"></Const></ScalarOperator></Compare></ScalarOperator></Predicate></TableScan></RelOp><RelOp NodeId="2" PhysicalOp="Clustered Index Seek" LogicalOp="Clustered Index Seek" EstimateRows="1" EstimatedRowsRead="1" EstimateIO="0.003125" EstimateCPU="0.0001581" AvgRowSize="11" EstimatedTotalSubtreeCost="0.0032831" TableCardinality="20000" Parallel="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row"><OutputList><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Alias="[o]" Column="Id"></ColumnReference></OutputList><IndexScan Ordered="1" ScanDirection="FORWARD" ForcedIndex="0" ForceSeek="0" ForceScan="0" NoExpandHint="0" Storage="RowStore"><DefinedValues><DefinedValue><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Alias="[o]" Column="Id"></ColumnReference></DefinedValue></DefinedValues><Object Database="[ps455]" Schema="[dbo]" Table="[Orders]" Index="[PK__Orders__3214EC0752BE59EA]" Alias="[o]" IndexKind="Clustered" Storage="RowStore"></Object><SeekPredicates><SeekPredicateNew><SeekKeys><Prefix ScanType="EQ"><RangeColumns><ColumnReference Database="[ps455]" Schema="[dbo]" Table="[Orders]" Alias="[o]" Column="Id"></ColumnReference></RangeColumns><RangeExpressions><ScalarOperator ScalarString="@t.[Id] as [t].[Id]"><Identifier><ColumnReference Table="@t" Alias="[t]" Column="Id"></ColumnReference></Identifier></ScalarOperator></RangeExpressions></Prefix></SeekKeys></SeekPredicateNew></SeekPredicates></IndexScan></RelOp></NestedLoops></RelOp></QueryPlan></StmtSimple></Statements></StoredProc></StmtSimple></Statements></Batch></BatchSequence></ShowPlanXML>
diff --git a/tests/PlanViewer.Core.Tests/StoredProcedurePlanTests.cs b/tests/PlanViewer.Core.Tests/StoredProcedurePlanTests.cs
new file mode 100644
index 00000000..d4536275
--- /dev/null
+++ b/tests/PlanViewer.Core.Tests/StoredProcedurePlanTests.cs
@@ -0,0 +1,106 @@
+using System.Linq;
+using PlanViewer.Core.Output;
+using PlanViewer.Core.Services;
+
+namespace PlanViewer.Core.Tests;
+
+/// <summary>
+/// #455: a plan captured around <c>EXEC &lt;procedure&gt;</c> analyzed as one statement, zero
+/// warnings, zero cost, exit 0 — on a file containing dozens of statement plans.
+///
+/// <para>The reported diagnosis was that the parse never descended into the procedure. It is subtler
+/// than that and the distinction decides the fix: the parser had always read <c>StoredProc</c>
+/// sub-plans, but that code sat BELOW an early return taken when a statement carries no
+/// <c>QueryPlan</c> of its own — which is exactly what an <c>EXEC</c> statement is. The descent
+/// existed and was unreachable in the only case it was written for.</para>
+///
+/// <para>What made it dangerous is that the output was well-formed and plausible. Nothing said the
+/// analysis had stopped early; it looked like a clean plan with nothing to report, which invites
+/// "no warnings found" about a procedure that in fact has plenty.</para>
+/// </summary>
+public class StoredProcedurePlanTests
+{
+    /// <summary>
+    /// The three numbers from the report, asserted together. Any one alone could be innocent; the
+    /// combination — one statement, no warnings, no cost — is the signature of a parse that did not
+    /// reach the real statements.
+    /// </summary>
+    [Fact]
+    public void AnExecProcedurePlanAnalyzesTheProcedureBody()
+    {
+        var plan = PlanTestHelper.LoadAndAnalyze("exec_stored_procedure_plan.sqlplan");
+        var result = ResultMapper.Map(plan, "exec_stored_procedure_plan.sqlplan");
+
+        Assert.True(result.Summary.TotalStatements > 1,
+            $"the procedure body's statements are missing (got {result.Summary.TotalStatements})");
+        Assert.True(result.Summary.TotalWarnings > 0,
+            "a body with a non-SARGable predicate and a table variable cannot be warning-free");
+        Assert.True(result.Summary.MaxEstimatedCost > 0,
+            "every statement carrying a plan has a cost; zero means none were seen");
+    }
+
+    /// <summary>
+    /// The specific cause, pinned so a future edit cannot reintroduce it by moving sub-plan parsing
+    /// back below the early return: the EXEC statement itself has no QueryPlan, and must still
+    /// carry its body.
+    /// </summary>
+    [Fact]
+    public void TheExecStatementHasNoPlanOfItsOwnAndStillCarriesItsBody()
+    {
+        var plan = PlanTestHelper.LoadAndAnalyze("exec_stored_procedure_plan.sqlplan");
+
+        var exec = plan.Batches.SelectMany(b => b.Statements).Single();
+
+        Assert.NotNull(exec.StoredProcPlan);
+        Assert.NotEmpty(exec.StoredProcPlan!.Statements);
+    }
+
+    /// <summary>
+    /// The traversal the analyzer, the mapper and the test helper now share. They each walked
+    /// batch.Statements separately before, which is how the analyzer and the golden master came to
+    /// have the same blind spot and neither could catch the other.
+    /// </summary>
+    [Fact]
+    public void EnumerateAllReachesNestedStatements()
+    {
+        var plan = PlanTestHelper.LoadAndAnalyze("exec_stored_procedure_plan.sqlplan");
+
+        var shallow = plan.Batches.SelectMany(b => b.Statements).Count();
+        var all = PlanStatements.EnumerateAll(plan).Count();
+
+        Assert.Equal(1, shallow);
+        Assert.True(all > shallow, $"nested statements were not reached (shallow {shallow}, all {all})");
+    }
+
+    /// <summary>
+    /// The outer statement comes back before its body. Order matters for output: a reader scanning
+    /// the statement list should meet the EXEC before the statements it caused.
+    /// </summary>
+    [Fact]
+    public void TheCallingStatementComesBeforeItsBody()
+    {
+        var plan = PlanTestHelper.LoadAndAnalyze("exec_stored_procedure_plan.sqlplan");
+
+        var all = PlanStatements.EnumerateAll(plan).ToList();
+        var exec = plan.Batches.SelectMany(b => b.Statements).Single();
+
+        Assert.Same(exec, all[0]);
+    }
+
+    /// <summary>
+    /// Plans without a procedure are untouched. The fix only ever adds statements that were being
+    /// dropped, so a plain batch must enumerate exactly as it always did.
+    /// </summary>
+    [Theory]
+    [InlineData("row_goal_plan.sqlplan")]
+    [InlineData("key_lookup_plan.sqlplan")]
+    [InlineData("spill_plan.sqlplan")]
+    public void APlanWithNoProcedureEnumeratesUnchanged(string planFile)
+    {
+        var plan = PlanTestHelper.LoadAndAnalyze(planFile);
+
+        Assert.Equal(
+            plan.Batches.SelectMany(b => b.Statements).Count(),
+            PlanStatements.EnumerateAll(plan).Count());
+    }
+}
diff --git a/tests/PlanViewer.Core.Tests/WarningBaseline.txt b/tests/PlanViewer.Core.Tests/WarningBaseline.txt
index 05cef6f2..7c7ea130 100644
--- a/tests/PlanViewer.Core.Tests/WarningBaseline.txt
+++ b/tests/PlanViewer.Core.Tests/WarningBaseline.txt
@@ -75,6 +75,17 @@ Exchange Spill | Critical | Exchange spill — 5,000,000 writes to TempDB. The p
 Expensive Operator | Critical | Sort took 65,000ms (81.2% of statement elapsed) but no specific rule identified a fix. Worth investigating: is the row volume necessary? Are upstream estimates driving this operator harder than it should be?
 Bare Scan | Warning | Clustered index scan reads the full table with no predicate, outputting 1 column(s): Test.Col1. Consider a nonclustered index on the output columns (as key or INCLUDE) so SQL Server can read a narrower structure. For analytical workloads, a columnstore index may be a better fit.
 
+### exec_stored_procedure_plan.sqlplan
+Non-SARGable Predicate | Warning | Implicit conversion (CONVERT_IMPLICIT) prevents an index seek. Match the parameter or variable data type to the column data type.\nPredicate: CONVERT_IMPLICIT(nvarchar(20),[ps455].[dbo].[Orders].[Code],0)=[@code]
+Filter Operator | Warning | Filter operator discarding rows late in the plan.\nPredicate: [ps455].[dbo].[Orders].[Amount]>(0.5)
+Table Variable | Critical | This query modifies a table variable, which forces the entire plan to run single-threaded. SQL Server cannot use parallelism for modifications to table variables. Replace with a #temp table to allow parallel execution.
+Table Variable | Critical | Modifying a table variable forces the entire plan to run single-threaded. Replace with a #temp table to allow parallel execution.
+Top Above Scan | Warning | Top reads from Clustered Index Scan on ps455.dbo.Orders (Node 2). An index on the ORDER BY columns could eliminate the scan and sort entirely.
+Row Goal | Info | Row goal active: estimate reduced from 20,000 to 100 (200x reduction) due to TOP. The optimizer chose this plan shape expecting to stop reading early. If the query reads all rows anyway, the plan choice may be suboptimal.
+Table Variable | Warning | Table variable detected. Table variables lack column-level statistics, which causes bad row estimates, join choices, and memory grant decisions. Replace with a #temp table.
+Scan With Predicate | Warning | Scan with residual predicate — SQL Server is reading every row and filtering after the fact. Check that you have appropriate indexes.\nPredicate: @t.[Id] as [t].[Id] IS NOT NULL
+Table Variable | Warning | Table variable detected. Table variables lack column-level statistics, which causes bad row estimates, join choices, and memory grant decisions. Replace with a #temp table.
+
 ### implicit_convert_seek_plan.sqlplan
 Implicit Conversion | Critical | Implicit conversion prevented an index seek, forcing a scan instead. Fix the data type mismatch: ensure the parameter or variable type matches the column type exactly. Seek Plan: CONVERT_IMPLICIT(nvarchar(40),[TestDB].[dbo].[Users].[DisplayName],0)=[@d]
 Bare Scan | Warning | Clustered index scan reads the full table with no predicate, outputting 1 column(s): Users.Id. Consider a nonclustered index on the output columns (as key or INCLUDE) so SQL Server can read a narrower structure. For analytical workloads, a columnstore index may be a better fit.