refactor(settings): regroup acceptance toggles under Writing, split General behavior

Cotabby/UI/Settings/Panes/GeneralPaneView.swift

@@ -45,7 +45,11 @@ struct GeneralPaneView: View {
                 }
             }
 
-            Section("Behavior") {
+            // Split from the old catch-all "Behavior" group: what the model is allowed to read
+            // (Context) reads differently from what a suggestion may contain (Suggestions). The
+            // acceptance toggles that used to live here now sit with Writing, next to the other
+            // controls that shape inserted text.
+            Section("Context") {
                 Toggle(isOn: clipboardContextEnabledBinding) {
                     SettingsRowLabel(
                         title: "Include Clipboard Context",
@@ -61,7 +65,9 @@ struct GeneralPaneView: View {
                         systemImage: "macwindow"
                     )
                 }
+            }
 
+            Section("Suggestions") {
                 Toggle(isOn: multiLineEnabledBinding) {
                     SettingsRowLabel(
                         title: "Allow Multi-line Suggestions",
@@ -70,24 +76,6 @@ struct GeneralPaneView: View {
                     )
                 }
 
-                Toggle(isOn: autoAcceptTrailingPunctuationBinding) {
-                    SettingsRowLabel(
-                        title: "Accept Punctuation With Word",
-                        description: "When you accept a word, also accept the punctuation that follows it " +
-                            "(commas, periods) so you don't have to type it.",
-                        systemImage: "textformat.abc"
-                    )
-                }
-
-                Toggle(isOn: addSpaceAfterAcceptBinding) {
-                    SettingsRowLabel(
-                        title: "Add Space After Accepting",
-                        description: "When accepting a suggestion finishes a word, also add a space so you can " +
-                            "keep typing. Skipped when it already ends in punctuation or a space.",
-                        systemImage: "space"
-                    )
-                }
-
                 Toggle(isOn: macroExpansionEnabledBinding) {
                     SettingsRowLabel(
                         title: "Inline Macros",
@@ -199,20 +187,6 @@ struct GeneralPaneView: View {
         )
     }
 
-    private var autoAcceptTrailingPunctuationBinding: Binding<Bool> {
-        Binding(
-            get: { suggestionSettings.autoAcceptTrailingPunctuation },
-            set: { suggestionSettings.setAutoAcceptTrailingPunctuation($0) }
-        )
-    }
-
-    private var addSpaceAfterAcceptBinding: Binding<Bool> {
-        Binding(
-            get: { suggestionSettings.addSpaceAfterAccept },
-            set: { suggestionSettings.setAddSpaceAfterAccept($0) }
-        )
-    }
-
     private var macroExpansionEnabledBinding: Binding<Bool> {
         Binding(
             get: { suggestionSettings.isMacroExpansionEnabled },

Cotabby/UI/Settings/Panes/WritingPaneView.swift

@@ -45,6 +45,28 @@ struct WritingPaneView: View {
                 }
             }
 
+            // What an accept inserts beyond the bare word. These shape the written output, so they sit
+            // with Writing rather than General; the accept keys themselves live in the Shortcuts pane.
+            Section("Acceptance") {
+                Toggle(isOn: autoAcceptTrailingPunctuationBinding) {
+                    SettingsRowLabel(
+                        title: "Accept Punctuation With Word",
+                        description: "When you accept a word, also accept the punctuation that follows it " +
+                            "(commas, periods) so you don't have to type it.",
+                        systemImage: "textformat.abc"
+                    )
+                }
+
+                Toggle(isOn: addSpaceAfterAcceptBinding) {
+                    SettingsRowLabel(
+                        title: "Add Space After Accepting",
+                        description: "When accepting a suggestion finishes a word, also add a space so you can " +
+                            "keep typing. Skipped when it already ends in punctuation or a space.",
+                        systemImage: "space"
+                    )
+                }
+            }
+
             Section("Corrections") {
                 Toggle(isOn: suppressCompletionsOnTypoBinding) {
                     SettingsRowLabel(
@@ -128,6 +150,20 @@ struct WritingPaneView: View {
         )
     }
 
+    private var autoAcceptTrailingPunctuationBinding: Binding<Bool> {
+        Binding(
+            get: { suggestionSettings.autoAcceptTrailingPunctuation },
+            set: { suggestionSettings.setAutoAcceptTrailingPunctuation($0) }
+        )
+    }
+
+    private var addSpaceAfterAcceptBinding: Binding<Bool> {
+        Binding(
+            get: { suggestionSettings.addSpaceAfterAccept },
+            set: { suggestionSettings.setAddSpaceAfterAccept($0) }
+        )
+    }
+
     private var suppressCompletionsOnTypoBinding: Binding<Bool> {
         Binding(
             get: { suggestionSettings.suppressCompletionsOnTypo },

Cotabby/UI/Settings/SettingsIndex.swift

@@ -16,8 +16,6 @@ enum SettingsItem: String, CaseIterable, Identifiable {
     case includeClipboardContext
     case includeAppContext
     case allowMultiLine
-    case acceptPunctuation
-    case addSpaceAfterAccept
     case inlineMacros
     case onboarding
     // Appearance
@@ -36,6 +34,8 @@ enum SettingsItem: String, CaseIterable, Identifiable {
     case emojiHistory
     // Writing
     case length
+    case acceptPunctuation
+    case addSpaceAfterAccept
     case name
     case languages
     case customRules
@@ -222,14 +222,14 @@ enum SettingsItem: String, CaseIterable, Identifiable {
     var category: SettingsCategory {
         switch self {
         case .enableGlobally, .fastMode, .openAtLogin, .includeClipboardContext, .includeAppContext,
-             .allowMultiLine, .acceptPunctuation, .addSpaceAfterAccept, .inlineMacros, .onboarding:
+             .allowMultiLine, .inlineMacros, .onboarding:
             return .general
         case .suggestionDisplay, .streamWhileGenerating, .showFieldIndicator, .showWordCount, .showKeyHint,
              .ghostTextColor, .ghostTextOpacity, .ghostTextSize:
             return .appearance
         case .emojiPicker, .emojiSkinTone, .emojiPeopleStyle, .emojiHistory:
             return .emoji
-        case .length, .name, .languages, .customRules,
+        case .length, .acceptPunctuation, .addSpaceAfterAccept, .name, .languages, .customRules,
              .hideSuggestionsOnTypo, .offerTypoCorrections, .spellingDictionaries, .automaticallyFixTypos:
             return .writing
         case .extendedContext, .contextLivePreview: