refine(config): keep search save flow in context

Return Esc from the saved state to the Search backend list instead of exiting the editor. Clarify the provider markers so active and configured backends are visually distinct.

Author: Aaronontheweb

src/Netclaw.Cli.Tests/Tui/Config/SearchConfigEditorPageTests.cs

@@ -0,0 +1,101 @@
+// -----------------------------------------------------------------------
+// <copyright file="SearchConfigEditorPageTests.cs" company="Petabridge, LLC">
+//      Copyright (C) 2026 - 2026 Petabridge, LLC <https://petabridge.com>
+// </copyright>
+// -----------------------------------------------------------------------
+using Microsoft.Extensions.DependencyInjection;
+using Netclaw.Cli.Tui.Config;
+using Netclaw.Configuration;
+using Netclaw.Tests.Utilities;
+using Termina;
+using Termina.Hosting;
+using Termina.Input;
+using Termina.Terminal;
+using Xunit;
+
+namespace Netclaw.Cli.Tests.Tui.Config;
+
+public sealed class SearchConfigEditorPageTests : IDisposable
+{
+    private readonly DisposableTempDir _dir = new();
+    private readonly NetclawPaths _paths;
+
+    public SearchConfigEditorPageTests()
+    {
+        _paths = new NetclawPaths(_dir.Path);
+        _paths.EnsureDirectoriesExist();
+        File.WriteAllText(_paths.NetclawConfigPath, """
+            {
+              "configVersion": 1,
+              "Search": {
+                "Backend": "duckduckgo"
+              }
+            }
+            """);
+    }
+
+    public void Dispose() => _dir.Dispose();
+
+    [Fact]
+    public async Task ProviderSelection_RendersActiveAndConfiguredLegend()
+    {
+        var (terminal, app, _) = CreateHeadlessApp(out var input);
+        input.EnqueueKey(ConsoleKey.Q, false, false, true);
+
+        using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
+        await app.RunAsync(cts.Token);
+
+        Assert.True(terminal.Contains("(*) active backend"),
+            $"Expected active-backend legend in terminal output. Screen:\n{terminal}");
+        Assert.True(terminal.Contains("backend has saved setup"),
+            $"Expected configured-backend legend in terminal output. Screen:\n{terminal}");
+    }
+
+    [Fact]
+    public async Task SavedScreen_EscapeReturnsToProviderSelection()
+    {
+        var (terminal, app, vm) = CreateHeadlessApp(out var input);
+
+        vm.SaveWithoutProbeOverride();
+
+        input.EnqueueKey(ConsoleKey.Escape);
+        input.EnqueueKey(ConsoleKey.Q, false, false, true);
+
+        using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
+        await app.RunAsync(cts.Token);
+
+        Assert.Equal(SearchConfigEditorScreen.ProviderSelection, vm.CurrentScreen.Value);
+        Assert.True(terminal.Contains("Choose the backend Netclaw uses for web search."),
+            $"Expected provider selection screen after Esc from saved state. Screen:\n{terminal}");
+    }
+
+    private (VirtualTerminal Terminal, TerminaApplication App, SearchConfigEditorViewModel Vm)
+        CreateHeadlessApp(out VirtualInputSource input)
+    {
+        var terminal = new VirtualTerminal(120, 40);
+        var virtualInput = new VirtualInputSource();
+        input = virtualInput;
+
+        SearchConfigEditorViewModel? capturedVm = null;
+
+        var services = new ServiceCollection();
+        services.AddSingleton<IAnsiTerminal>(terminal);
+        services.AddTerminaVirtualInput(virtualInput);
+        services.AddTermina("/search", builder =>
+        {
+            builder.RegisterRoute<SearchConfigEditorPage, SearchConfigEditorViewModel>(
+                "/search",
+                _ => new SearchConfigEditorPage(),
+                _ =>
+                {
+                    capturedVm = new SearchConfigEditorViewModel(_paths);
+                    return capturedVm;
+                });
+        });
+
+        var sp = services.BuildServiceProvider();
+        var app = sp.GetRequiredService<TerminaApplication>();
+
+        return (terminal, app, capturedVm!);
+    }
+}

src/Netclaw.Cli/Tui/Config/SearchConfigEditorPage.cs

@@ -94,6 +94,7 @@ private ILayoutNode BuildProviderSelectionScreen()
             .WithSpacing(1)
             .WithChild(new TextNode("  Choose the backend Netclaw uses for web search.").WithForeground(Color.White))
             .WithChild(BuildProviderList())
+            .WithChild(new TextNode("  (*) active backend   ✓ backend has saved setup").WithForeground(Color.Gray))
             .WithChild(new TextNode($"  {GetProviderDescription(ViewModel.BackendOptions[_providerIndex].Value)}").WithForeground(Color.Gray));
     }
 
@@ -136,7 +137,7 @@ private ILayoutNode BuildSavedScreen()
         => Layouts.Vertical()
             .WithSpacing(1)
             .WithChild(new TextNode($"  \u2714 {ViewModel.CurrentBackendLabel} validated and saved.").WithForeground(Color.Green))
-            .WithChild(new TextNode("  Press Esc to return to Settings Areas or Up/Down to review providers.")
+            .WithChild(new TextNode("  Press Esc to return to Search backends or Up/Down to review providers.")
                 .WithForeground(Color.Gray));
 
     private ILayoutNode BuildProviderList()
@@ -238,9 +239,6 @@ private LayoutNode BuildKeyBindings()
 
     public override bool HandlePageInput(ConsoleKeyInfo keyInfo)
     {
-        if (base.HandlePageInput(keyInfo))
-            return true;
-
         if (keyInfo.Key == ConsoleKey.Q && keyInfo.Modifiers.HasFlag(ConsoleModifiers.Control))
         {
             ViewModel.RequestQuit();
@@ -262,10 +260,19 @@ public override bool HandlePageInput(ConsoleKeyInfo keyInfo)
                 return true;
             }
 
+            if (ViewModel.CurrentScreen.Value == SearchConfigEditorScreen.Saved)
+            {
+                BeginProviderSelection();
+                return true;
+            }
+
             ViewModel.NavigateBack();
             return true;
         }
 
+        if (base.HandlePageInput(keyInfo))
+            return true;
+
         if (ViewModel.ActiveDialog.Value == SearchConfigEditorDialog.ProbeWarning)
         {
             _dialogList?.HandleInput(keyInfo);

tests/smoke/tapes/config-search.tape

@@ -52,9 +52,11 @@ Down 2
 Enter
 Wait+Screen@10s /validated and saved/
 Escape
-Wait+Screen@10s /Settings Areas/
+Wait+Screen@10s /Choose the backend Netclaw uses for web search/
 
 # ─── Back out to shell ────────────────────────────────────────────────────
+Escape
+Wait+Screen@10s /Settings Areas/
 Ctrl+Q
 Wait+Screen@10s /TAPE\$/