fix(config): persist channel connection resets

Author: Aaronontheweb

docs/ui/TUI-002-netclaw-config-wireframes.md

@@ -420,9 +420,8 @@ this first pass.
 
 The same menu is used for Slack, Discord, and Mattermost. Disable/enable only
 changes `<Adapter>.Enabled`; dormant channel fields and stored credentials are
-preserved. Reset stages deletion of the adapter config section and secrets,
-then returns to the picker. The deletion is written only when the operator
-saves from the picker.
+preserved. Reset is immediate: confirming reset deletes the adapter config
+section and its secrets before returning to the picker/saved screen.
 
 ### 3.3 Channels and permissions
 

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

@@ -4,9 +4,11 @@
 // </copyright>
 // -----------------------------------------------------------------------
 using Microsoft.Extensions.DependencyInjection;
+using Netclaw.Actors.Channels;
 using Netclaw.Cli.Tests.Tui;
 using Netclaw.Cli.Tui;
 using Netclaw.Cli.Tui.Config;
+using Netclaw.Cli.Tui.Wizard.Steps;
 using Netclaw.Configuration;
 using Netclaw.Tests.Utilities;
 using Termina;
@@ -57,6 +59,35 @@ public async Task Channels_Escape_ReturnsToDashboardUsingTerminaHistory()
         Assert.Equal("/config", app.CurrentPath);
     }
 
+    [Fact]
+    public async Task Channels_RotateCredentials_AcceptsTypedSecretInput()
+    {
+        var app = CreateHeadlessApp(out var input, out var dashboardVm, out var getChannelsVm);
+        dashboardVm.SelectedIndex.Value = dashboardVm.Items
+            .Select((item, index) => (item, index))
+            .Single(entry => entry.item.Label == "Channels")
+            .index;
+        dashboardVm.ActivateSelected();
+
+        input.EnqueueKey(ConsoleKey.Enter); // Open configured Slack management.
+        input.EnqueueKey(ConsoleKey.DownArrow);
+        input.EnqueueKey(ConsoleKey.DownArrow);
+        input.EnqueueKey(ConsoleKey.DownArrow);
+        input.EnqueueKey(ConsoleKey.DownArrow);
+        input.EnqueueKey(ConsoleKey.Enter); // Rotate credentials.
+        input.EnqueueString("xoxb-typed-token");
+        input.EnqueueKey(ConsoleKey.Enter);
+        input.EnqueueKey(ConsoleKey.Q, false, false, true);
+
+        using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
+        await app.RunAsync(cts.Token);
+
+        var channelsVm = Assert.IsType<ChannelsConfigViewModel>(getChannelsVm());
+        var slack = channelsVm.Step.GetAdapterViewModel<SlackStepViewModel>(ChannelType.Slack);
+        Assert.Equal("xoxb-typed-token", slack.BotToken);
+        Assert.Equal("Credential changes staged. Press d to save.", channelsVm.Status.Value.Text);
+    }
+
     private TerminaApplication CreateHeadlessApp(
         out VirtualInputSource input,
         out ConfigDashboardViewModel dashboardVm,

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

@@ -20,6 +20,20 @@ public sealed class ChannelsConfigViewModelTests : IDisposable
     private readonly DisposableTempDir _dir = new();
     private readonly NetclawPaths _paths;
 
+    public static TheoryData<ChannelType, string, string[]> ResetConnectionCases { get; } = new()
+    {
+        { ChannelType.Slack, "Slack", ["Slack.BotToken", "Slack.AppToken"] },
+        { ChannelType.Discord, "Discord", ["Discord.BotToken"] },
+        { ChannelType.Mattermost, "Mattermost", ["Mattermost.BotToken"] }
+    };
+
+    public static TheoryData<ChannelType> ChannelTypes { get; } = new()
+    {
+        ChannelType.Slack,
+        ChannelType.Discord,
+        ChannelType.Mattermost
+    };
+
     public ChannelsConfigViewModelTests()
     {
         _paths = new NetclawPaths(_dir.Path);
@@ -291,29 +305,45 @@ public void Rotate_credentials_preserves_blank_secret_and_updates_nonblank_secre
         Assert.Equal("xapp-test", ConfigFileHelper.DecryptIfEncrypted(_paths, appToken?.ToString()));
     }
 
-    [Fact]
-    public void Reset_connection_deletes_config_section_and_secrets_on_save()
+    [Theory]
+    [MemberData(nameof(ResetConnectionCases))]
+    public void Reset_connection_deletes_config_section_and_secrets_immediately(
+        ChannelType type,
+        string configSection,
+        string[] secretPaths)
     {
-        WriteChannelConfig();
-        WriteChannelSecrets();
+        WriteAllChannelConfig();
+        WriteAllChannelSecrets();
         using var vm = CreateViewModel();
-        vm.OpenAdapterManagement(ChannelType.Slack);
-        var resetIndex = vm.GetManagementMenuItems()
-            .Select((item, index) => (item, index))
-            .Single(entry => entry.item.Action == ChannelsManagementAction.ResetConnection)
-            .index;
-        vm.MoveManagementMenu(resetIndex);
-        vm.ActivateManagementMenuItem();
-        vm.MoveResetConfirmation(1);
 
-        vm.ApplyResetConfirmation();
-        vm.Save();
+        ConfirmReset(vm, type);
 
         var config = ConfigFileHelper.LoadJsonDict(_paths.NetclawConfigPath);
-        Assert.False(ConfigFileHelper.TryGetPathValue(config, "Slack", out _));
+        Assert.False(ConfigFileHelper.TryGetPathValue(config, configSection, out _));
         var secrets = ConfigFileHelper.LoadJsonDict(_paths.SecretsPath);
-        Assert.False(ConfigFileHelper.TryGetPathValue(secrets, "Slack.BotToken", out _));
-        Assert.False(ConfigFileHelper.TryGetPathValue(secrets, "Slack.AppToken", out _));
+        foreach (var secretPath in secretPaths)
+            Assert.False(ConfigFileHelper.TryGetPathValue(secrets, secretPath, out _));
+        Assert.True(vm.IsSaved.Value);
+        Assert.Equal($"{type} reset saved.", vm.Status.Value.Text);
+    }
+
+    [Theory]
+    [MemberData(nameof(ChannelTypes))]
+    public void Reset_connection_survives_reopening_channels_editor_without_outer_save(
+        ChannelType type)
+    {
+        WriteAllChannelConfig();
+        WriteAllChannelSecrets();
+        using (var vm = CreateViewModel())
+        {
+            ConfirmReset(vm, type);
+        }
+
+        using var reopened = CreateViewModel();
+
+        Assert.False(reopened.Step.IsAdapterKnown(type));
+        Assert.False(reopened.Step.IsAdapterEnabled(type));
+        Assert.Null(reopened.Step.GetAdapterSummary(GetAdapterIndex(reopened, type)));
     }
 
     [Theory]
@@ -345,6 +375,25 @@ public void Add_channel_management_is_generic_for_discord_and_mattermost(
     private ChannelsConfigViewModel CreateViewModel()
         => new(_paths, new FakeSlackProbe(), new FakeDiscordProbe());
 
+    private static void ConfirmReset(ChannelsConfigViewModel vm, ChannelType type)
+    {
+        vm.OpenAdapterManagement(type);
+        var resetIndex = vm.GetManagementMenuItems()
+            .Select((item, index) => (item, index))
+            .Single(entry => entry.item.Action == ChannelsManagementAction.ResetConnection)
+            .index;
+        vm.MoveManagementMenu(resetIndex);
+        vm.ActivateManagementMenuItem();
+        vm.MoveResetConfirmation(1);
+        vm.ApplyResetConfirmation();
+    }
+
+    private static int GetAdapterIndex(ChannelsConfigViewModel vm, ChannelType type)
+        => vm.Step.Adapters
+            .Select((adapter, index) => (adapter.Type, index))
+            .Single(entry => entry.Type == type)
+            .index;
+
     private static string[] ToStringArray(object? raw)
         => Assert.IsType<object[]>(raw).Select(static value => value switch
         {

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

@@ -254,7 +254,7 @@ private ILayoutNode BuildRotateCredentials()
             var field = fields[i];
             var input = EnsureCredentialInput(field);
             if (i == ViewModel.CredentialFieldIndex)
-                input.OnFocused();
+                Focus.SetFocus(input);
 
             layout = layout
                 .WithChild(new TextNode($"  {field.Label}:").WithForeground(i == ViewModel.CredentialFieldIndex ? Color.Cyan : Color.White))
@@ -273,7 +273,7 @@ private ILayoutNode BuildResetConfirmation()
         var layout = Layouts.Vertical()
             .WithChild(Header($"  Reset {ViewModel.ActiveAdapterName} connection?"))
             .WithChild(Hint($"  This removes {ViewModel.ActiveAdapterName} credentials, allowed channels, allowed users,"))
-            .WithChild(Hint("  DM settings, and channel permission mappings after you save."))
+            .WithChild(Hint("  DM settings, and channel permission mappings immediately."))
             .WithChild(Layouts.Empty().Height(1));
 
         for (var i = 0; i < options.Length; i++)
@@ -303,7 +303,7 @@ private LayoutNode BuildHelpText()
                     ChannelsConfigScreen.AllowedUsers => "  Use comma-separated user IDs. Blank means unrestricted users in allowed channels.",
                     ChannelsConfigScreen.DirectMessages => "  Space toggles DMs. Left/right changes the DM audience.",
                     ChannelsConfigScreen.RotateCredentials => "  Blank secret fields preserve existing secrets. Tab switches fields.",
-                    ChannelsConfigScreen.ResetConfirm => "  Reset is staged until you save channel settings.",
+                    ChannelsConfigScreen.ResetConfirm => "  Reset writes immediately when confirmed.",
                     _ => string.Empty
                 };
                 return (ILayoutNode)new TextNode(help).WithForeground(Color.Gray);
@@ -623,11 +623,9 @@ private void HandleRotateCredentialsKey(ConsoleKeyInfo keyInfo)
         }
 
         var field = fields[ViewModel.CredentialFieldIndex];
-        if (_credentialInputs.TryGetValue(field.Key, out var input))
-        {
-            input.HandleInput(keyInfo);
-            StageCredentialInput(field);
-        }
+        var input = EnsureCredentialInput(field);
+        input.HandleInput(keyInfo);
+        StageCredentialInput(field);
     }
 
     private void HandleResetConfirmKey(ConsoleKeyInfo keyInfo)