kward 0.74.0 → 0.75.0

data/lib/kward/cli/settings.rb

@@ -12,11 +12,14 @@ module Kward
           return
         end
 
+        initial_index = 0
         loop do
-          selected = @prompt.select("Settings category", settings_category_choices, title: "Settings")
+          choices = settings_category_choices
+          selected, selected_index = select_settings_menu_item("Settings category", choices, initial_index)
           category = selected_settings_category(selected)
           break unless category
 
+          initial_index = selected_index if selected_index
           break if category == "done"
 
           handle_settings_category(category, conversation)
@@ -83,14 +86,22 @@ module Kward
       end
 
       def configure_model_settings(conversation)
-        selected = @prompt.select("Model & Reasoning", ["Provider", "Default model", "Reasoning effort", "Back"], title: "Settings")
-        case selected.to_s.downcase
-        when /\Aprovider/
-          configure_provider(conversation)
-        when /\Adefault model/
-          configure_model(conversation)
-        when /\Areasoning effort/
-          configure_reasoning(conversation)
+        initial_index = 0
+        loop do
+          selected, selected_index = select_settings_menu_item("Model & Reasoning", ["Provider", "Default model", "Reasoning effort", "Back"], initial_index)
+          break unless selected
+
+          initial_index = selected_index if selected_index
+          case selected.to_s.downcase
+          when /\Aprovider/
+            configure_provider(conversation)
+          when /\Adefault model/
+            configure_model(conversation)
+          when /\Areasoning effort/
+            configure_reasoning(conversation)
+          else
+            break
+          end
         end
       end
 
@@ -125,22 +136,30 @@ module Kward
       end
 
       def configure_account_settings
-        selected = @prompt.select("Accounts", account_setting_choices, title: "Settings")
-        case selected.to_s.downcase
-        when /\Aopenai/
-          login(provider: "openai")
-          reload_client_config
-        when /\Aanthropic/, /\Aclaude/
-          login(provider: "anthropic")
-          reload_client_config
-        when /\Agithub/
-          login(provider: "github")
-          reload_client_config
-        when /\Aopenrouter/
-          login(provider: "openrouter")
-          reload_client_config
-        when /\Astatus/
-          print_auth_status
+        initial_index = 0
+        loop do
+          selected, selected_index = select_settings_menu_item("Accounts", account_setting_choices, initial_index)
+          break unless selected
+
+          initial_index = selected_index if selected_index
+          case selected.to_s.downcase
+          when /\Aopenai/
+            login(provider: "openai")
+            reload_client_config
+          when /\Aanthropic/, /\Aclaude/
+            login(provider: "anthropic")
+            reload_client_config
+          when /\Agithub/
+            login(provider: "github")
+            reload_client_config
+          when /\Aopenrouter/
+            login(provider: "openrouter")
+            reload_client_config
+          when /\Astatus/
+            print_auth_status
+          else
+            break
+          end
         end
       end
 
@@ -163,17 +182,25 @@ module Kward
       end
 
       def configure_memory_settings(conversation)
-        selected = @prompt.select("Memory", memory_setting_choices, title: "Settings")
-        case selected.to_s.downcase
-        when /\Aenable memory/, /\Adisable memory/
-          set_memory_enabled(!memory_enabled?)
-          conversation&.refresh_system_message!
-          runtime_output("Memory #{memory_enabled? ? "enabled" : "disabled"}.")
-        when /\Aenable auto-summary/, /\Adisable auto-summary/
-          set_memory_auto_summary_enabled(!memory_auto_summary_enabled?)
-          runtime_output("Memory auto-summary #{memory_auto_summary_enabled? ? "enabled" : "disabled"}.")
-        when /\Amanage/
-          runtime_output("Use /memory enable|disable|auto-summary enable|disable|core <text>|add <text>|list|forget <id>|promote <id>|relax <id>|inspect|why|summarize.")
+        initial_index = 0
+        loop do
+          selected, selected_index = select_settings_menu_item("Memory", memory_setting_choices, initial_index)
+          break unless selected
+
+          initial_index = selected_index if selected_index
+          case selected.to_s.downcase
+          when /\Aenable memory/, /\Adisable memory/
+            set_config_flag("memory", "enabled", !memory_enabled?)
+            conversation&.refresh_system_message!
+            runtime_output("Memory #{memory_enabled? ? "enabled" : "disabled"}.")
+          when /\Aenable auto-summary/, /\Adisable auto-summary/
+            set_config_flag("memory", "auto_summary", !memory_auto_summary_enabled?)
+            runtime_output("Memory auto-summary #{memory_auto_summary_enabled? ? "enabled" : "disabled"}.")
+          when /\Amanage/
+            runtime_output("Use /memory enable|disable|auto-summary enable|disable|core <text>|add <text>|list|forget <id>|promote <id>|relax <id>|inspect|why|summarize.")
+          else
+            break
+          end
         end
       end
 
@@ -196,50 +223,52 @@ module Kward
         memory.is_a?(Hash) && memory["auto_summary"] == true
       end
 
-      def set_memory_enabled(enabled)
-        update_nested_config("memory", "enabled" => enabled)
-      end
-
-      def set_memory_auto_summary_enabled(enabled)
-        update_nested_config("memory", "auto_summary" => enabled)
-      end
-
       def configure_interface_settings
-        selected = @prompt.select("Interface", interface_setting_choices, title: "Settings")
-        case selected.to_s.downcase
-        when /\Aoverlay alignment/
-          settings = ConfigFiles.overlay_settings
-          alignment = choose_overlay_setting("Overlay alignment", overlay_alignment_choices(settings), ConfigFiles::OVERLAY_ALIGNMENTS)
-          return unless alignment
-
-          @prompt.update_overlay_settings(ConfigFiles.update_overlay_settings("alignment" => alignment))
-        when /\Aoverlay width/
-          settings = ConfigFiles.overlay_settings
-          width = choose_overlay_setting("Overlay width", overlay_width_choices(settings), ConfigFiles::OVERLAY_WIDTHS)
-          return unless width
-
-          @prompt.update_overlay_settings(ConfigFiles.update_overlay_settings("width" => width))
-        when /\Ashow busy help/, /\Ahide busy help/
-          set_composer_busy_help(!composer_busy_help?)
-          runtime_output("Busy help #{composer_busy_help? ? "enabled" : "disabled"}. Restart the TUI to apply this setting.")
-        when /\Atab keybindings/
-          configure_tab_keybindings
-        when /\Aeditor mode/
-          configure_editor_mode
-        when /\Aeditor line numbers/
-          configure_editor_line_numbers
-        when /\Aenable auto-close pairs/, /\Adisable auto-close pairs/
-          set_editor_auto_close_pairs_enabled(!editor_auto_close_pairs_enabled?)
-          runtime_output("Editor auto-close pairs #{editor_auto_close_pairs_enabled? ? "enabled" : "disabled"}.")
-        when /\Aenable soft-wrap/, /\Adisable soft-wrap/
-          set_editor_soft_wrap_enabled(!editor_soft_wrap_enabled?)
-          runtime_output("Editor soft-wrap #{editor_soft_wrap_enabled? ? "enabled" : "disabled"}.")
-        when /\Aenable bar cursor/, /\Adisable bar cursor/
-          set_editor_bar_cursor_enabled(!editor_bar_cursor_enabled?)
-          runtime_output("Editor bar cursor #{editor_bar_cursor_enabled? ? "enabled" : "disabled"}.")
-        when /\Aenable session auto-resume/, /\Adisable session auto-resume/
-          set_session_auto_resume_enabled(!session_auto_resume_enabled?)
-          runtime_output("Session auto-resume #{session_auto_resume_enabled? ? "enabled" : "disabled"}.")
+        initial_index = 0
+        loop do
+          selected, selected_index = select_settings_menu_item("Interface", interface_setting_choices, initial_index)
+          break unless selected
+
+          initial_index = selected_index if selected_index
+          case selected.to_s.downcase
+          when /\Aoverlay alignment/
+            settings = ConfigFiles.overlay_settings
+            alignment = choose_overlay_setting("Overlay alignment", overlay_alignment_choices(settings), ConfigFiles::OVERLAY_ALIGNMENTS)
+            next unless alignment
+
+            update_overlay_settings("alignment" => alignment)
+          when /\Aoverlay width/
+            settings = ConfigFiles.overlay_settings
+            width = choose_overlay_setting("Overlay width", overlay_width_choices(settings), ConfigFiles::OVERLAY_WIDTHS)
+            next unless width
+
+            update_overlay_settings("width" => width)
+          when /\Ashow busy help/, /\Ahide busy help/
+            set_composer_busy_help(!composer_busy_help?)
+            runtime_output("Busy help #{composer_busy_help? ? "enabled" : "disabled"}. Restart the TUI to apply this setting.")
+          when /\Atab keybindings/
+            configure_tab_keybindings
+          when /\Aeditor mode/
+            configure_editor_mode
+          when /\Aeditor line numbers/
+            configure_editor_line_numbers
+          when /\Adiff view/
+            configure_diff_view
+          when /\Aenable auto-close pairs/, /\Adisable auto-close pairs/
+            set_config_flag("editor", "auto_close_pairs", !editor_auto_close_pairs_enabled?)
+            runtime_output("Editor auto-close pairs #{editor_auto_close_pairs_enabled? ? "enabled" : "disabled"}.")
+          when /\Aenable soft-wrap/, /\Adisable soft-wrap/
+            set_config_flag("editor", "soft_wrap", !editor_soft_wrap_enabled?)
+            runtime_output("Editor soft-wrap #{editor_soft_wrap_enabled? ? "enabled" : "disabled"}.")
+          when /\Aenable bar cursor/, /\Adisable bar cursor/
+            set_config_flag("editor", "bar_cursor", !editor_bar_cursor_enabled?)
+            runtime_output("Editor bar cursor #{editor_bar_cursor_enabled? ? "enabled" : "disabled"}.")
+          when /\Aenable session auto-resume/, /\Adisable session auto-resume/
+            set_config_flag("sessions", "auto_resume", !session_auto_resume_enabled?)
+            runtime_output("Session auto-resume #{session_auto_resume_enabled? ? "enabled" : "disabled"}.")
+          else
+            break
+          end
         end
       end
 
@@ -252,6 +281,7 @@ module Kward
           "Tab keybindings (#{composer_tab_keybindings})",
           "Editor mode (#{editor_mode})",
           "Editor line numbers (#{editor_line_numbers})",
+          "Diff view (#{diff_view_label(diff_view)})",
           "#{editor_auto_close_pairs_enabled? ? "Disable" : "Enable"} auto-close pairs (currently #{on_off(editor_auto_close_pairs_enabled?)})",
           "#{editor_soft_wrap_enabled? ? "Disable" : "Enable"} soft-wrap (currently #{on_off(editor_soft_wrap_enabled?)})",
           "#{editor_bar_cursor_enabled? ? "Disable" : "Enable"} bar cursor (currently #{on_off(editor_bar_cursor_enabled?)})",
@@ -318,28 +348,41 @@ module Kward
         %w[absolute relative].map { |value| value == current ? "#{value} (current)" : value }
       end
 
-      def editor_auto_close_pairs_enabled?
-        ConfigFiles.editor_auto_close_pairs?(safely_read_config.to_h)
+      def diff_view
+        ConfigFiles.diff_view(safely_read_config.to_h)
       end
 
-      def set_editor_auto_close_pairs_enabled(enabled)
-        update_nested_config("editor", "auto_close_pairs" => enabled)
+      def configure_diff_view
+        selected = @prompt.select("Diff view", diff_view_choices, title: "Settings")
+        value = selected.to_s.split.first.to_s.downcase.tr("-", "_")
+        return unless Kward::DiffViewMode::MODES.include?(value)
+
+        update_nested_config("editor", "diff_view" => value)
+        runtime_output("Diff view set to #{diff_view_label(value)}.")
       end
 
-      def editor_soft_wrap_enabled?
-        ConfigFiles.editor_soft_wrap?(safely_read_config.to_h)
+      def diff_view_choices
+        current = diff_view
+        Kward::DiffViewMode::MODES.map do |value|
+          label = diff_view_label(value)
+          value == current ? "#{label} (current)" : label
+        end
       end
 
-      def set_editor_soft_wrap_enabled(enabled)
-        update_nested_config("editor", "soft_wrap" => enabled)
+      def diff_view_label(value)
+        Kward::DiffViewMode.label(value)
       end
 
-      def editor_bar_cursor_enabled?
-        ConfigFiles.editor_bar_cursor?(safely_read_config.to_h)
+      def editor_auto_close_pairs_enabled?
+        ConfigFiles.editor_auto_close_pairs?(safely_read_config.to_h)
       end
 
-      def set_editor_bar_cursor_enabled(enabled)
-        update_nested_config("editor", "bar_cursor" => enabled)
+      def editor_soft_wrap_enabled?
+        ConfigFiles.editor_soft_wrap?(safely_read_config.to_h)
+      end
+
+      def editor_bar_cursor_enabled?
+        ConfigFiles.editor_bar_cursor?(safely_read_config.to_h)
       end
 
       def session_auto_resume_enabled?
@@ -347,27 +390,34 @@ module Kward
       end
 
       def set_composer_busy_help(enabled)
-        update_nested_config("composer", "busy_help" => enabled)
-      end
-
-      def set_session_auto_resume_enabled(enabled)
-        update_nested_config("sessions", "auto_resume" => enabled)
+        set_config_flag("composer", "busy_help", enabled)
       end
 
       def configure_tools_settings
-        selected = @prompt.select("Tools & Search", tools_setting_choices, title: "Settings")
-        case selected.to_s.downcase
-        when /\Aenable web search/, /\Adisable web search/
-          set_web_search_enabled(!web_search_enabled?)
-          runtime_output("Web search #{web_search_enabled? ? "enabled" : "disabled"}.")
-        when /\Aweb search provider/
-          configure_web_search_provider
-        when /\Aallow model-provider/, /\Adisallow model-provider/
-          set_web_search_allow_model_providers(!web_search_allow_model_providers?)
-          runtime_output("Model-provider web search #{web_search_allow_model_providers? ? "enabled" : "disabled"}.")
-        when /\Aenable workspace guardrails/, /\Adisable workspace guardrails/
-          set_workspace_guardrails_enabled(!workspace_guardrails_enabled?)
-          runtime_output("Workspace guardrails #{workspace_guardrails_enabled? ? "enabled" : "disabled"}.")
+        initial_index = 0
+        loop do
+          selected, selected_index = select_settings_menu_item("Tools & Search", tools_setting_choices, initial_index)
+          break unless selected
+
+          initial_index = selected_index if selected_index
+          case selected.to_s.downcase
+          when /\Aenable web search/, /\Adisable web search/
+            set_config_flag("web_search", "enabled", !web_search_enabled?)
+            runtime_output("Web search #{web_search_enabled? ? "enabled" : "disabled"}.")
+          when /\Aweb search provider/
+            configure_web_search_provider
+          when /\Aallow model-provider/, /\Adisallow model-provider/
+            set_config_flag("web_search", "allow_model_providers", !web_search_allow_model_providers?)
+            runtime_output("Model-provider web search #{web_search_allow_model_providers? ? "enabled" : "disabled"}.")
+          when /\Atrust project skills/, /\Auntrust project skills/
+            set_config_flag("skills", "trust_project", !project_skills_trusted?)
+            runtime_output("Project skills #{project_skills_trusted? ? "trusted" : "untrusted"}.")
+          when /\Aenable workspace guardrails/, /\Adisable workspace guardrails/
+            set_config_flag("tools", "workspace_guardrails", !workspace_guardrails_enabled?)
+            runtime_output("Workspace guardrails #{workspace_guardrails_enabled? ? "enabled" : "disabled"}.")
+          else
+            break
+          end
         end
       end
 
@@ -376,6 +426,7 @@ module Kward
           "#{web_search_enabled? ? "Disable" : "Enable"} web search (currently #{on_off(web_search_enabled?)})",
           "Web search provider (#{web_search_provider})",
           "#{web_search_allow_model_providers? ? "Disallow" : "Allow"} model-provider web search (currently #{on_off(web_search_allow_model_providers?)})",
+          "#{project_skills_trusted? ? "Untrust" : "Trust"} project skills (currently #{on_off(project_skills_trusted?)})",
           "#{workspace_guardrails_enabled? ? "Disable" : "Enable"} workspace guardrails (currently #{on_off(workspace_guardrails_enabled?)})",
           "Back"
         ]
@@ -406,26 +457,26 @@ module Kward
         web_search_config["allow_model_providers"] == true
       end
 
-      def set_web_search_enabled(enabled)
-        update_nested_config("web_search", "enabled" => enabled)
-      end
-
-      def set_web_search_allow_model_providers(enabled)
-        update_nested_config("web_search", "allow_model_providers" => enabled)
-      end
-
-      def set_workspace_guardrails_enabled(enabled)
-        update_nested_config("tools", "workspace_guardrails" => enabled)
+      def project_skills_trusted?
+        ConfigFiles.project_skills_trusted?(safely_read_config.to_h)
       end
 
       def configure_context_settings
-        selected = @prompt.select("Context & Compaction", context_setting_choices, title: "Settings")
-        case selected.to_s.downcase
-        when /\Aenable auto-compaction/, /\Adisable auto-compaction/
-          set_compaction_enabled(!compaction_enabled?)
-          runtime_output("Auto-compaction #{compaction_enabled? ? "enabled" : "disabled"}.")
-        else
-          runtime_output(auto_compaction_status_line) if selected.to_s.downcase.start_with?("status")
+        initial_index = 0
+        loop do
+          selected, selected_index = select_settings_menu_item("Context & Compaction", context_setting_choices, initial_index)
+          break unless selected
+
+          initial_index = selected_index if selected_index
+          case selected.to_s.downcase
+          when /\Aenable auto-compaction/, /\Adisable auto-compaction/
+            set_config_flag("compaction", "enabled", !compaction_enabled?)
+            runtime_output("Auto-compaction #{compaction_enabled? ? "enabled" : "disabled"}.")
+          when /\Astatus/
+            runtime_output(auto_compaction_status_line)
+          else
+            break
+          end
         end
       end
 
@@ -441,17 +492,21 @@ module Kward
         Kward::Compaction::Settings.from_config(safely_read_config.to_h).enabled
       end
 
-      def set_compaction_enabled(enabled)
-        update_nested_config("compaction", "enabled" => enabled)
-      end
-
       def configure_personalization_settings(conversation)
-        selected = @prompt.select("Personalization", personalization_setting_choices(conversation), title: "Settings")
-        case selected.to_s.downcase
-        when /\Adefault persona/
-          configure_default_persona(conversation)
-        when /\Aactive instructions/
-          show_active_instructions_summary(conversation)
+        initial_index = 0
+        loop do
+          selected, selected_index = select_settings_menu_item("Personalization", personalization_setting_choices(conversation), initial_index)
+          break unless selected
+
+          initial_index = selected_index if selected_index
+          case selected.to_s.downcase
+          when /\Adefault persona/
+            configure_default_persona(conversation)
+          when /\Aactive instructions/
+            show_active_instructions_summary(conversation)
+          else
+            break
+          end
         end
       end
 
@@ -500,12 +555,18 @@ module Kward
       end
 
       def configure_logging_settings
-        selected = @prompt.select("Logging", logging_setting_choices, title: "Settings")
-        key = logging_key_for_choice(selected)
-        return unless key
+        initial_index = 0
+        loop do
+          selected, selected_index = select_settings_menu_item("Logging", logging_setting_choices, initial_index)
+          break unless selected
+
+          initial_index = selected_index if selected_index
+          key = logging_key_for_choice(selected)
+          break unless key
 
-        set_logging_value(key, !logging_enabled?(key))
-        runtime_output("Logging #{key.tr("_", " ")} #{logging_enabled?(key) ? "enabled" : "disabled"}.")
+          set_logging_value(key, !logging_enabled?(key))
+          runtime_output("Logging #{key.tr("_", " ")} #{logging_enabled?(key) ? "enabled" : "disabled"}.")
+        end
       end
 
       def logging_setting_choices
@@ -536,7 +597,7 @@ module Kward
       end
 
       def set_logging_value(key, value)
-        update_nested_config("logging", key => value)
+        set_config_flag("logging", key, value)
       end
 
       def show_advanced_settings
@@ -557,6 +618,15 @@ module Kward
         ConfigFiles.update_nested_config(section, values)
       end
 
+      def set_config_flag(section, key, enabled)
+        update_nested_config(section, key => enabled)
+      end
+
+      def select_settings_menu_item(message, choices, initial_index)
+        selected = @prompt.select(message, choices, title: "Settings", initial_index: initial_index)
+        [selected, choices.index(selected)]
+      end
+
       def on_off(value)
         value ? "on" : "off"
       end
@@ -652,7 +722,13 @@ module Kward
       end
 
       def settings_overlay_available?
-        @prompt.respond_to?(:select) && @prompt.respond_to?(:update_overlay_settings)
+        @prompt.respond_to?(:select)
+      end
+
+      def update_overlay_settings(values)
+        settings = ConfigFiles.update_overlay_settings(values)
+        @prompt.update_overlay_settings(settings) if @prompt.respond_to?(:update_overlay_settings)
+        settings
       end
 
       def choose_overlay_setting(message, choices, values)
@@ -666,15 +742,13 @@ module Kward
         current_provider = conversation.provider || (@client.respond_to?(:current_provider) ? @client.current_provider : "Codex")
         current_model = conversation.model || (@client.respond_to?(:current_model) ? @client.current_model : nil)
         current_reasoning = conversation.reasoning_effort || (@client.respond_to?(:current_reasoning_effort) ? @client.current_reasoning_effort : nil)
-        models = @client.respond_to?(:available_models) ? Array(@client.available_models) : []
-        models.map do |model|
-          ModelInfo.normalize(
-            model,
-            current_provider: current_provider,
-            current_model: current_model,
-            current_reasoning_effort: current_reasoning
-          )
-        end
+        models = @client.respond_to?(:available_models) ? @client.available_models : []
+        ModelInfo.normalize_available(
+          models,
+          current_provider: current_provider,
+          current_model: current_model,
+          current_reasoning_effort: current_reasoning
+        )
       end
 
       def model_choices(models, conversation = current_footer_conversation)