fix(config): autosave inline settings changes

Author: Aaronontheweb

openspec/changes/netclaw-config-command/tasks.md

@@ -127,19 +127,19 @@
 
 ## 16. Shared autosave config interaction
 
-- [ ] 16.1 Introduce a shared autosave interaction component/contract for
+- [x] 16.1 Introduce a shared autosave interaction component/contract for
   inline config editors.
-- [ ] 16.2 Remove explicit save-key behavior and copy from inline config
+- [x] 16.2 Remove explicit save-key behavior and copy from inline config
   editors; completed actions autosave instead.
-- [ ] 16.3 Ensure `Esc` only navigates/cancels and never persists edits.
-- [ ] 16.4 Ensure each autosave validates before writing and leaves files
+- [x] 16.3 Ensure `Esc` only navigates/cancels and never persists edits.
+- [x] 16.4 Ensure each autosave validates before writing and leaves files
   unchanged on validation failure.
-- [ ] 16.5 Ensure writes are section-preserving and field-scoped to editor
+- [x] 16.5 Ensure writes are section-preserving and field-scoped to editor
   ownership boundaries.
-- [ ] 16.6 Harden Channels persistence so provider enable/disable, add/remove,
+- [x] 16.6 Harden Channels persistence so provider enable/disable, add/remove,
   audience, allowed-user, direct-message, and credential actions autosave
   provider-granular changes without wiping unrelated providers.
-- [ ] 16.7 Add the regression: seed Slack and Discord, add a Discord channel,
+- [x] 16.7 Add the regression: seed Slack and Discord, add a Discord channel,
   disable Slack, press `Esc`, and verify only completed autosaves occurred
   with Slack dormant setup preserved.
 

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

@@ -44,12 +44,11 @@ public void Save_refuses_enablement_when_prerequisites_are_missing()
         var before = File.ReadAllText(_paths.NetclawConfigPath);
         using var vm = new BrowserAutomationConfigViewModel(_paths, new FakeProbe(false));
 
-        vm.ToggleEnabled();
-
-        Assert.False(vm.Save());
+        Assert.False(vm.ToggleEnabled());
         Assert.Equal(ConfigStatusTone.Error, vm.Status.Value.Tone);
         Assert.Contains("missing", vm.Status.Value.Text, StringComparison.OrdinalIgnoreCase);
         Assert.Equal(before, File.ReadAllText(_paths.NetclawConfigPath));
+        Assert.False(vm.Enabled.Value);
     }
 
     [Fact]

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

@@ -5,6 +5,7 @@
 // -----------------------------------------------------------------------
 using Microsoft.Extensions.DependencyInjection;
 using Netclaw.Actors.Channels;
+using Netclaw.Cli.Config;
 using Netclaw.Cli.Discord;
 using Netclaw.Cli.Tests.Tui;
 using Netclaw.Cli.Tui;
@@ -96,8 +97,8 @@ public async Task Channels_RotateCredentials_AcceptsTypedCredentialInput(Channel
         await app.RunAsync(cts.Token);
 
         var channelsVm = Assert.IsType<ChannelsConfigViewModel>(getChannelsVm());
-        AssertTypedCredentials(channelsVm, channelType);
-        Assert.Equal("Credential changes staged. Press Esc, then s to save.", channelsVm.Status.Value.Text);
+        AssertPersistedCredentials(channelType, typed: true);
+        Assert.Equal("Credential changes saved.", channelsVm.Status.Value.Text);
     }
 
     [Theory]
@@ -121,7 +122,7 @@ public async Task Channels_FirstTimeAdapterSetup_AcceptsTypedCredentialInput(Cha
         var channelsVm = Assert.IsType<ChannelsConfigViewModel>(getChannelsVm());
         Assert.Equal(ChannelsConfigScreen.ChannelPermissions, channelsVm.Screen.Value);
         Assert.Equal(channelType, channelsVm.ActiveAdapterType);
-        AssertFirstTimeSetup(channelsVm, channelType);
+        AssertFirstTimeSetupPersisted(channelsVm, channelType);
     }
 
     [Fact]
@@ -156,16 +157,16 @@ public async Task Channels_AddChannel_AcceptsPastedChannelInput()
         input.EnqueueKey(ConsoleKey.Enter); // Open configured Slack management.
         input.EnqueueKey(ConsoleKey.DownArrow); // Add channel.
         input.EnqueueKey(ConsoleKey.Enter);
-        input.EnqueuePaste("#pasted-channel");
+        input.EnqueuePaste("#C09");
         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());
-        Assert.Contains(channelsVm.GetChannelRows(), row => row.Id == "pasted-channel" && !row.IsAddAction);
-        Assert.Equal("Added pasted-channel. Press Esc, then s to save.", channelsVm.Status.Value.Text);
+        Assert.Contains(channelsVm.GetChannelRows(), row => row.Id == "C09" && !row.IsAddAction);
+        Assert.Equal("Added C09 and saved.", channelsVm.Status.Value.Text);
     }
 
     [Fact]
@@ -202,7 +203,7 @@ public async Task Channels_ChannelPermissions_DeleteRemovesSelectedChannel()
 
         var channelsVm = Assert.IsType<ChannelsConfigViewModel>(getChannelsVm());
         Assert.DoesNotContain(channelsVm.GetChannelRows(), row => row.Id == "C01");
-        Assert.Equal("Removed C01. Press Esc, then s to save.", channelsVm.Status.Value.Text);
+        Assert.Equal("Removed C01 and saved.", channelsVm.Status.Value.Text);
     }
 
     [Fact]
@@ -346,7 +347,7 @@ private static void TypeFirstTimeSetup(VirtualInputSource input, ChannelType cha
                 input.EnqueueKey(ConsoleKey.Enter);
                 input.EnqueueString("xapp-first-time-token");
                 input.EnqueueKey(ConsoleKey.Enter);
-                input.EnqueueString("C-first-time");
+                input.EnqueueString("C123456");
                 input.EnqueueKey(ConsoleKey.Enter);
                 SelectSecondOption(input); // Disable DMs.
                 SelectSecondOption(input); // Allow anyone in allowed channels.
@@ -381,55 +382,73 @@ private static void SelectSecondOption(VirtualInputSource input)
         input.EnqueueKey(ConsoleKey.Enter);
     }
 
-    private static void AssertTypedCredentials(ChannelsConfigViewModel vm, ChannelType channelType)
+    private void AssertPersistedCredentials(ChannelType channelType, bool typed)
     {
+        var config = ConfigFileHelper.LoadJsonDict(_paths.NetclawConfigPath);
+        var secrets = ConfigFileHelper.LoadJsonDict(_paths.SecretsPath);
         switch (channelType)
         {
             case ChannelType.Slack:
-                var slack = vm.Step.GetAdapterViewModel<SlackStepViewModel>(ChannelType.Slack);
-                Assert.Equal("xoxb-typed-token", slack.BotToken);
-                Assert.Equal("xapp-typed-token", slack.AppToken);
+                AssertSecret(secrets, "Slack.BotToken", typed ? "xoxb-typed-token" : "xoxb-first-time-token");
+                AssertSecret(secrets, "Slack.AppToken", typed ? "xapp-typed-token" : "xapp-first-time-token");
                 break;
             case ChannelType.Discord:
-                var discord = vm.Step.GetAdapterViewModel<DiscordStepViewModel>(ChannelType.Discord);
-                Assert.Equal("discord-typed-token", discord.BotToken);
+                AssertSecret(secrets, "Discord.BotToken", typed ? "discord-typed-token" : "discord-first-time-token");
                 break;
             case ChannelType.Mattermost:
-                var mattermost = vm.Step.GetAdapterViewModel<MattermostStepViewModel>(ChannelType.Mattermost);
-                Assert.Equal("https://typed-mattermost.example.com", mattermost.ServerUrl);
-                Assert.Equal("mattermost-typed-token", mattermost.BotToken);
+                Assert.True(ConfigFileHelper.TryGetPathValue(config, "Mattermost.ServerUrl", out var serverUrl));
+                Assert.Equal(typed ? "https://typed-mattermost.example.com" : "https://first-time-mattermost.example.com", serverUrl);
+                AssertSecret(secrets, "Mattermost.BotToken", typed ? "mattermost-typed-token" : "mattermost-first-time-token");
                 break;
             default:
                 throw new ArgumentOutOfRangeException(nameof(channelType), channelType, null);
         }
     }
 
-    private static void AssertFirstTimeSetup(ChannelsConfigViewModel vm, ChannelType channelType)
+    private void AssertFirstTimeSetupPersisted(ChannelsConfigViewModel vm, ChannelType channelType)
     {
+        AssertPersistedCredentials(channelType, typed: false);
+        var config = ConfigFileHelper.LoadJsonDict(_paths.NetclawConfigPath);
         switch (channelType)
         {
             case ChannelType.Slack:
                 var slack = vm.Step.GetAdapterViewModel<SlackStepViewModel>(ChannelType.Slack);
-                Assert.Equal("xoxb-first-time-token", slack.BotToken);
-                Assert.Equal("xapp-first-time-token", slack.AppToken);
-                Assert.Equal("C-first-time", slack.ChannelNamesInput);
+                Assert.True(slack.HasPersistedBotToken);
+                Assert.True(slack.HasPersistedAppToken);
+                Assert.True(ConfigFileHelper.TryGetPathValue(config, "Slack.AllowedChannelIds", out var slackChannelsRaw));
+                Assert.Equal(["C123456"], ToStringArray(slackChannelsRaw));
                 break;
             case ChannelType.Discord:
                 var discord = vm.Step.GetAdapterViewModel<DiscordStepViewModel>(ChannelType.Discord);
-                Assert.Equal("discord-first-time-token", discord.BotToken);
-                Assert.Equal("123456789012345678", discord.ChannelIdsInput);
+                Assert.True(discord.HasPersistedBotToken);
+                Assert.True(ConfigFileHelper.TryGetPathValue(config, "Discord.AllowedChannelIds", out var discordChannelsRaw));
+                Assert.Equal(["123456789012345678"], ToStringArray(discordChannelsRaw));
                 break;
             case ChannelType.Mattermost:
                 var mattermost = vm.Step.GetAdapterViewModel<MattermostStepViewModel>(ChannelType.Mattermost);
-                Assert.Equal("https://first-time-mattermost.example.com", mattermost.ServerUrl);
-                Assert.Equal("mattermost-first-time-token", mattermost.BotToken);
-                Assert.Equal("town-square", mattermost.ChannelIdsInput);
+                Assert.True(mattermost.HasPersistedBotToken);
+                Assert.True(ConfigFileHelper.TryGetPathValue(config, "Mattermost.AllowedChannelIds", out var mattermostChannelsRaw));
+                Assert.Equal(["town-square"], ToStringArray(mattermostChannelsRaw));
                 break;
             default:
                 throw new ArgumentOutOfRangeException(nameof(channelType), channelType, null);
         }
     }
 
+    private void AssertSecret(Dictionary<string, object> secrets, string path, string expected)
+    {
+        Assert.True(ConfigFileHelper.TryGetPathValue(secrets, path, out var raw));
+        Assert.Equal(expected, ConfigFileHelper.DecryptIfEncrypted(_paths, raw?.ToString()));
+    }
+
+    private static string[] ToStringArray(object? raw)
+        => Assert.IsType<object[]>(raw).Select(static value => value switch
+        {
+            string text => text,
+            System.Text.Json.JsonElement { ValueKind: System.Text.Json.JsonValueKind.String } element => element.GetString()!,
+            _ => throw new InvalidOperationException("Expected string array value.")
+        }).ToArray();
+
     private void WriteEmptyChannelFiles()
     {
         File.WriteAllText(_paths.NetclawConfigPath,

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

@@ -248,7 +248,7 @@ public void Save_blocks_invalid_mattermost_url_before_probe()
     }
 
     [Fact]
-    public void Back_from_saved_returns_to_channel_picker()
+    public void Back_from_saved_picker_returns_to_dashboard_or_quits()
     {
         WriteChannelConfig();
         WriteChannelSecrets();
@@ -257,8 +257,67 @@ public void Back_from_saved_returns_to_channel_picker()
 
         vm.GoBack();
 
-        Assert.False(vm.IsSaved.Value);
-        Assert.False(vm.ShutdownRequestedForTest);
+        Assert.True(vm.IsSaved.Value);
+        Assert.True(vm.ShutdownRequestedForTest);
+    }
+
+    [Fact]
+    public void Esc_from_incomplete_add_channel_draft_writes_nothing()
+    {
+        WriteAllChannelConfig();
+        WriteAllChannelSecrets();
+        var configBefore = File.ReadAllText(_paths.NetclawConfigPath);
+        var secretsBefore = File.ReadAllText(_paths.SecretsPath);
+        using var vm = CreateViewModel();
+        vm.OpenAdapterManagement(ChannelType.Slack);
+        vm.BeginAddChannel();
+        vm.AddChannelInput = "C99";
+
+        vm.GoBack();
+
+        Assert.Equal(ChannelsConfigScreen.ChannelPermissions, vm.Screen.Value);
+        Assert.Equal(configBefore, File.ReadAllText(_paths.NetclawConfigPath));
+        Assert.Equal(secretsBefore, File.ReadAllText(_paths.SecretsPath));
+    }
+
+    [Fact]
+    public void Discord_add_then_slack_disable_then_escape_preserves_provider_config()
+    {
+        WriteAllChannelConfig();
+        WriteAllChannelSecrets();
+        using var vm = CreateViewModel();
+        vm.OpenAdapterManagement(ChannelType.Discord);
+        vm.BeginAddChannel();
+        vm.AddChannelInput = "987654321";
+
+        vm.ApplyAddChannel();
+        vm.OpenAdapterManagement(ChannelType.Slack);
+        MoveToManagementAction(vm, ChannelsManagementAction.ToggleEnabled);
+        vm.ActivateManagementMenuItem();
+        vm.GoBack();
+
+        var config = ConfigFileHelper.LoadJsonDict(_paths.NetclawConfigPath);
+        Assert.True(ConfigFileHelper.TryGetPathValue(config, "Slack.Enabled", out var slackEnabled));
+        Assert.False(Assert.IsType<bool>(slackEnabled));
+        Assert.True(ConfigFileHelper.TryGetPathValue(config, "Slack.AllowedChannelIds", out var slackChannelsRaw));
+        Assert.Equal(["C01"], ToStringArray(slackChannelsRaw));
+        Assert.True(ConfigFileHelper.TryGetPathValue(config, "Slack.ChannelAudiences", out var slackAudiencesRaw));
+        Assert.Equal("team", ToStringDictionary(slackAudiencesRaw)["C01"]);
+
+        Assert.True(ConfigFileHelper.TryGetPathValue(config, "Discord.Enabled", out var discordEnabled));
+        Assert.True(Assert.IsType<bool>(discordEnabled));
+        Assert.True(ConfigFileHelper.TryGetPathValue(config, "Discord.AllowedChannelIds", out var discordChannelsRaw));
+        Assert.Equal(["123456789", "987654321"], ToStringArray(discordChannelsRaw));
+        Assert.True(ConfigFileHelper.TryGetPathValue(config, "Discord.ChannelAudiences", out var discordAudiencesRaw));
+        var discordAudiences = ToStringDictionary(discordAudiencesRaw);
+        Assert.Equal("team", discordAudiences["123456789"]);
+        Assert.Equal("team", discordAudiences["987654321"]);
+
+        var secrets = ConfigFileHelper.LoadJsonDict(_paths.SecretsPath);
+        Assert.True(ConfigFileHelper.TryGetPathValue(secrets, "Slack.BotToken", out var slackBotToken));
+        Assert.Equal("xoxb-test", ConfigFileHelper.DecryptIfEncrypted(_paths, slackBotToken?.ToString()));
+        Assert.True(ConfigFileHelper.TryGetPathValue(secrets, "Discord.BotToken", out var discordBotToken));
+        Assert.Equal("discord-token", ConfigFileHelper.DecryptIfEncrypted(_paths, discordBotToken?.ToString()));
     }
 
     [Fact]
@@ -503,7 +562,6 @@ public void Save_rejects_unresolved_slack_channel_name()
         vm.AddChannelInput = "fart";
 
         vm.ApplyAddChannel();
-        vm.Save();
 
         Assert.False(vm.IsSaved.Value);
         Assert.Equal("Slack channel not found: #fart", vm.Status.Value.Text);
@@ -707,6 +765,16 @@ private static void ConfirmReset(ChannelsConfigViewModel vm, ChannelType type)
         vm.ApplyResetConfirmation();
     }
 
+    private static void MoveToManagementAction(ChannelsConfigViewModel vm, ChannelsManagementAction action)
+    {
+        var index = vm.GetManagementMenuItems()
+            .Select((item, itemIndex) => (item, itemIndex))
+            .Single(entry => entry.item.Action == action)
+            .itemIndex;
+
+        vm.MoveManagementMenu(index);
+    }
+
     private static int GetAdapterIndex(ChannelsConfigViewModel vm, ChannelType type)
         => vm.Step.Adapters
             .Select((adapter, index) => (adapter.Type, index))

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

@@ -76,12 +76,11 @@ public void Save_blocks_enabled_state_when_no_valid_routes_exist()
         var before = File.ReadAllText(_paths.NetclawConfigPath);
         using var vm = new InboundWebhooksConfigViewModel(_paths);
 
-        vm.ToggleEnabled();
-
-        Assert.False(vm.Save());
+        Assert.False(vm.ToggleEnabled());
         Assert.Equal(ConfigStatusTone.Error, vm.Status.Value.Tone);
         Assert.Contains("at least one valid route", vm.Status.Value.Text, StringComparison.OrdinalIgnoreCase);
         Assert.Equal(before, File.ReadAllText(_paths.NetclawConfigPath));
+        Assert.False(vm.Enabled.Value);
         Assert.Empty(Directory.EnumerateFiles(_paths.WebhooksDirectory));
     }
 

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

@@ -58,9 +58,6 @@ private LayoutNode BuildContent()
                 $"Backend                 {ViewModel.SelectedBackendLabel}",
                 $"Profile: {ViewModel.SelectedCanonicalServerName}"));
             layout = layout.WithChild(Row(2,
-                "Save                    apply MCP profile changes",
-                "Refuses enablement when local runtime prerequisites are missing."));
-            layout = layout.WithChild(Row(3,
                 "MCP permissions          open grant editor",
                 "Grant browser_automation access per audience in `netclaw mcp permissions`."));
 
@@ -97,7 +94,7 @@ private LayoutNode BuildStatusBar()
             .Height(1);
 
     private LayoutNode BuildKeyBindings()
-        => NetclawTuiChrome.BuildKeyHintLine(" [↑/↓] Navigate  [Space/Enter] Select  [←/→] Backend  [Esc] Settings Areas  [Ctrl+Q] Quit");
+        => NetclawTuiChrome.BuildKeyHintLine(" [↑/↓] Navigate  [Space/Enter] Select/Save  [←/→] Backend/Save  [Esc] Settings Areas  [Ctrl+Q] Quit");
 
     private void HandleKeyPress(KeyPressed key)
     {