From a7710d9a41ec28eb5c8b789ba6bcfd56718375b7 Mon Sep 17 00:00:00 2001
From: DDKinger <ddkingzhang@gmail.com>
Date: Mon, 7 Sep 2026 10:30:41 +0800
Subject: [PATCH 1/7] Settings polish: reorder Agent page settings

Arrange the Agent page controls so agent selection, model configuration, pane behavior, error detection, sessions, and token usage follow the intended sequence without changing their content.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: adb1aab1-e7ab-4cb3-ab56-813c33c219c2
---
 .../TerminalSettingsEditor/AIAgents.xaml      | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/AIAgents.xaml b/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
index 82f572be8..f3078cff5 100644
--- a/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
+++ b/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
@@ -381,42 +381,6 @@
                           Style="{StaticResource ComboBoxSettingStyle}" />
             </local:SettingContainer>
 
-            <!--  Global Yolo preference: asks supported providers to enable
-                their advertised ACP session mode. High-risk toggle, so it
-                is disabled outright (IsYoloModePolicyLocked) when the
-                AllowYoloMode GPO policy blocks it.  -->
-            <local:SettingContainer x:Name="AgentPaneYoloMode"
-                                    x:Uid="AIAgents_YoloMode">
-                <StackPanel>
-                    <ToggleSwitch AutomationProperties.AutomationId="AgentPaneYoloModeToggle"
-                                  IsOn="{x:Bind ViewModel.AgentPaneYoloMode, Mode=TwoWay}"
-                                  IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.IsYoloModePolicyLocked), Mode=OneWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    <TextBlock x:Uid="AIAgents_PolicyLocked"
-                               Visibility="{x:Bind ViewModel.IsYoloModePolicyLocked, Mode=OneWay}"
-                               Opacity="0.6"
-                               Margin="0,4,0,0" />
-                </StackPanel>
-            </local:SettingContainer>
-            <muxc:InfoBar x:Uid="AIAgents_YoloOpenCodeWarning"
-                          AutomationProperties.AutomationId="OpenCodeYoloCompatibilityInfoBar"
-                          HorizontalAlignment="Stretch"
-                          IsClosable="False"
-                          IsOpen="{x:Bind ViewModel.ShowOpenCodeYoloWarning, Mode=OneWay}"
-                          Margin="0,4,0,0"
-                          MaxWidth="1000"
-                          Severity="Warning"
-                          Visibility="{x:Bind ViewModel.ShowOpenCodeYoloWarning, Mode=OneWay}" />
-            <muxc:InfoBar x:Uid="AIAgents_YoloGeminiInfo"
-                          AutomationProperties.AutomationId="GeminiYoloCompatibilityInfoBar"
-                          HorizontalAlignment="Stretch"
-                          IsClosable="False"
-                          IsOpen="{x:Bind ViewModel.ShowGeminiYoloInfo, Mode=OneWay}"
-                          Margin="0,4,0,0"
-                          MaxWidth="1000"
-                          Severity="Informational"
-                          Visibility="{x:Bind ViewModel.ShowGeminiYoloInfo, Mode=OneWay}" />
-
             <local:SettingContainer x:Name="AutoErrorHandling"
                                     Style="{StaticResource AutoErrorHandlingSettingContainerStyle}">
                 <local:SettingContainer.Header>
@@ -467,6 +431,42 @@
                               IsOn="{x:Bind ViewModel.ShowTokenUsageAndCost, Mode=TwoWay}" />
             </local:SettingContainer>
 
+            <!--  Global Yolo preference: asks supported providers to enable
+                their advertised ACP session mode. High-risk toggle, so it
+                is disabled outright (IsYoloModePolicyLocked) when the
+                AllowYoloMode GPO policy blocks it.  -->
+            <local:SettingContainer x:Name="AgentPaneYoloMode"
+                                    x:Uid="AIAgents_YoloMode">
+                <StackPanel>
+                    <ToggleSwitch AutomationProperties.AutomationId="AgentPaneYoloModeToggle"
+                                  IsOn="{x:Bind ViewModel.AgentPaneYoloMode, Mode=TwoWay}"
+                                  IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.IsYoloModePolicyLocked), Mode=OneWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                    <TextBlock x:Uid="AIAgents_PolicyLocked"
+                               Visibility="{x:Bind ViewModel.IsYoloModePolicyLocked, Mode=OneWay}"
+                               Opacity="0.6"
+                               Margin="0,4,0,0" />
+                </StackPanel>
+            </local:SettingContainer>
+            <muxc:InfoBar x:Uid="AIAgents_YoloOpenCodeWarning"
+                          AutomationProperties.AutomationId="OpenCodeYoloCompatibilityInfoBar"
+                          HorizontalAlignment="Stretch"
+                          IsClosable="False"
+                          IsOpen="{x:Bind ViewModel.ShowOpenCodeYoloWarning, Mode=OneWay}"
+                          Margin="0,4,0,0"
+                          MaxWidth="1000"
+                          Severity="Warning"
+                          Visibility="{x:Bind ViewModel.ShowOpenCodeYoloWarning, Mode=OneWay}" />
+            <muxc:InfoBar x:Uid="AIAgents_YoloGeminiInfo"
+                          AutomationProperties.AutomationId="GeminiYoloCompatibilityInfoBar"
+                          HorizontalAlignment="Stretch"
+                          IsClosable="False"
+                          IsOpen="{x:Bind ViewModel.ShowGeminiYoloInfo, Mode=OneWay}"
+                          Margin="0,4,0,0"
+                          MaxWidth="1000"
+                          Severity="Informational"
+                          Visibility="{x:Bind ViewModel.ShowGeminiYoloInfo, Mode=OneWay}" />
+
             <!--  ═══ Command palette group ═══  -->
             <TextBlock x:Uid="AIAgents_DelegateGroupHeader"
                        Style="{StaticResource TextBlockSubHeaderStyle}" />

From d9c63257c363eecc9c6ae2d55f9be66c2b008689 Mon Sep 17 00:00:00 2001
From: DDKinger <ddkingzhang@gmail.com>
Date: Mon, 7 Sep 2026 10:49:11 +0800
Subject: [PATCH 2/7] Settings polish: align the Yolo mode toggle

Use the same standard toggle layout as Sessions and Token usage so the On/Off label and switch align consistently on the right.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: adb1aab1-e7ab-4cb3-ab56-813c33c219c2
---
 src/cascadia/TerminalSettingsEditor/AIAgents.xaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/AIAgents.xaml b/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
index f3078cff5..5b1e2e1f5 100644
--- a/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
+++ b/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
@@ -439,9 +439,10 @@
                                     x:Uid="AIAgents_YoloMode">
                 <StackPanel>
                     <ToggleSwitch AutomationProperties.AutomationId="AgentPaneYoloModeToggle"
+                                  AutomationProperties.AccessibilityView="Content"
+                                  MinWidth="0"
                                   IsOn="{x:Bind ViewModel.AgentPaneYoloMode, Mode=TwoWay}"
-                                  IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.IsYoloModePolicyLocked), Mode=OneWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                                  IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.IsYoloModePolicyLocked), Mode=OneWay}" />
                     <TextBlock x:Uid="AIAgents_PolicyLocked"
                                Visibility="{x:Bind ViewModel.IsYoloModePolicyLocked, Mode=OneWay}"
                                Opacity="0.6"

From 2d415afd3235316515323d615eebef49265cc956 Mon Sep 17 00:00:00 2001
From: DDKinger <ddkingzhang@gmail.com>
Date: Mon, 7 Sep 2026 10:52:43 +0800
Subject: [PATCH 3/7] Settings polish: align custom model actions

Place Add New in the same right-side action column as Remove and give both buttons the same minimum width.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: adb1aab1-e7ab-4cb3-ab56-813c33c219c2
---
 src/cascadia/TerminalSettingsEditor/AIAgents.xaml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/AIAgents.xaml b/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
index 5b1e2e1f5..307b256a4 100644
--- a/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
+++ b/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
@@ -304,10 +304,17 @@
 
                     <Border Padding="0,4"
                             Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.IsAddingCustomModelProvider), Mode=OneWay}">
-                        <Button x:Uid="AIAgents_CustomProviderAdd"
-                                HorizontalAlignment="Right"
-                                Click="{x:Bind ViewModel.AddCustomModelProvider}"
-                                Style="{StaticResource AccentButtonStyle}" />
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Button Grid.Column="1"
+                                    x:Uid="AIAgents_CustomProviderAdd"
+                                    Click="{x:Bind ViewModel.AddCustomModelProvider}"
+                                    MinWidth="120"
+                                    Style="{StaticResource AccentButtonStyle}" />
+                        </Grid>
                     </Border>
 
                     <Border Padding="0,8,0,16"

From 31717eea9dde6d44bc459f821e2044a39f19d463 Mon Sep 17 00:00:00 2001
From: DDKinger <ddkingzhang@gmail.com>
Date: Mon, 7 Sep 2026 11:08:15 +0800
Subject: [PATCH 4/7] Settings polish: keep custom model actions equal width

Use the same fixed width for Add New and Remove so localized labels cannot make their independent action columns diverge.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: adb1aab1-e7ab-4cb3-ab56-813c33c219c2
---
 src/cascadia/TerminalSettingsEditor/AIAgents.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/AIAgents.xaml b/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
index 307b256a4..e22d0636e 100644
--- a/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
+++ b/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
@@ -287,7 +287,7 @@
                                                 x:Uid="AIAgents_CustomProviderRemove"
                                                 VerticalAlignment="Center"
                                                 Click="{x:Bind Remove}"
-                                                MinWidth="120" />
+                                                Width="120" />
                                         <muxc:InfoBar Grid.Row="1"
                                                       Grid.ColumnSpan="2"
                                                       Margin="0,12,0,0"
@@ -312,7 +312,7 @@
                             <Button Grid.Column="1"
                                     x:Uid="AIAgents_CustomProviderAdd"
                                     Click="{x:Bind ViewModel.AddCustomModelProvider}"
-                                    MinWidth="120"
+                                    Width="120"
                                     Style="{StaticResource AccentButtonStyle}" />
                         </Grid>
                     </Border>

From 4099bc8bd34b043193ec241f98bf5938ccc6bea0 Mon Sep 17 00:00:00 2001
From: DDKinger <ddkingzhang@gmail.com>
Date: Mon, 7 Sep 2026 11:18:56 +0800
Subject: [PATCH 5/7] Settings polish: allow localized custom model actions

Use the standard control width for both custom model action buttons so they remain equal without truncating longer localized labels.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: adb1aab1-e7ab-4cb3-ab56-813c33c219c2
---
 src/cascadia/TerminalSettingsEditor/AIAgents.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/AIAgents.xaml b/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
index e22d0636e..91a7f22a3 100644
--- a/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
+++ b/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
@@ -287,7 +287,7 @@
                                                 x:Uid="AIAgents_CustomProviderRemove"
                                                 VerticalAlignment="Center"
                                                 Click="{x:Bind Remove}"
-                                                Width="120" />
+                                                Width="{StaticResource StandardBoxMinWidth}" />
                                         <muxc:InfoBar Grid.Row="1"
                                                       Grid.ColumnSpan="2"
                                                       Margin="0,12,0,0"
@@ -312,7 +312,7 @@
                             <Button Grid.Column="1"
                                     x:Uid="AIAgents_CustomProviderAdd"
                                     Click="{x:Bind ViewModel.AddCustomModelProvider}"
-                                    Width="120"
+                                    Width="{StaticResource StandardBoxMinWidth}"
                                     Style="{StaticResource AccentButtonStyle}" />
                         </Grid>
                     </Border>

From c35973dee0d2bcb7bc3a540ababbc4b82caae709 Mon Sep 17 00:00:00 2001
From: DDKinger <ddkingzhang@gmail.com>
Date: Mon, 7 Sep 2026 11:42:24 +0800
Subject: [PATCH 6/7] Settings polish: restore compact custom model actions

Keep Add New and Remove equal and right-aligned at the original compact 120-pixel width.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: adb1aab1-e7ab-4cb3-ab56-813c33c219c2
---
 src/cascadia/TerminalSettingsEditor/AIAgents.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/AIAgents.xaml b/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
index 91a7f22a3..e22d0636e 100644
--- a/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
+++ b/src/cascadia/TerminalSettingsEditor/AIAgents.xaml
@@ -287,7 +287,7 @@
                                                 x:Uid="AIAgents_CustomProviderRemove"
                                                 VerticalAlignment="Center"
                                                 Click="{x:Bind Remove}"
-                                                Width="{StaticResource StandardBoxMinWidth}" />
+                                                Width="120" />
                                         <muxc:InfoBar Grid.Row="1"
                                                       Grid.ColumnSpan="2"
                                                       Margin="0,12,0,0"
@@ -312,7 +312,7 @@
                             <Button Grid.Column="1"
                                     x:Uid="AIAgents_CustomProviderAdd"
                                     Click="{x:Bind ViewModel.AddCustomModelProvider}"
-                                    Width="{StaticResource StandardBoxMinWidth}"
+                                    Width="120"
                                     Style="{StaticResource AccentButtonStyle}" />
                         </Grid>
                     </Border>

From b3dec77dca7adb599c80f361b59097932dfcdf0d Mon Sep 17 00:00:00 2001
From: DDKinger <ddkingzhang@gmail.com>
Date: Mon, 7 Sep 2026 11:44:51 +0800
Subject: [PATCH 7/7] Settings polish: rename the custom endpoint action

Rename the English Add New action to Add endpoint and keep localized resource comments aligned with the updated label.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: adb1aab1-e7ab-4cb3-ab56-813c33c219c2
---
 .../TerminalSettingsEditor/Resources/de-DE/Resources.resw     | 2 +-
 .../TerminalSettingsEditor/Resources/en-US/Resources.resw     | 4 ++--
 .../TerminalSettingsEditor/Resources/es-ES/Resources.resw     | 2 +-
 .../TerminalSettingsEditor/Resources/fr-FR/Resources.resw     | 2 +-
 .../TerminalSettingsEditor/Resources/it-IT/Resources.resw     | 2 +-
 .../TerminalSettingsEditor/Resources/ja-JP/Resources.resw     | 2 +-
 .../TerminalSettingsEditor/Resources/ko-KR/Resources.resw     | 2 +-
 .../TerminalSettingsEditor/Resources/pt-BR/Resources.resw     | 2 +-
 .../TerminalSettingsEditor/Resources/qps-ploc/Resources.resw  | 4 ++--
 .../TerminalSettingsEditor/Resources/qps-ploca/Resources.resw | 4 ++--
 .../TerminalSettingsEditor/Resources/qps-plocm/Resources.resw | 4 ++--
 .../TerminalSettingsEditor/Resources/ru-RU/Resources.resw     | 2 +-
 .../Resources/sr-Cyrl-RS/Resources.resw                       | 2 +-
 .../TerminalSettingsEditor/Resources/uk-UA/Resources.resw     | 2 +-
 .../TerminalSettingsEditor/Resources/zh-CN/Resources.resw     | 2 +-
 .../TerminalSettingsEditor/Resources/zh-TW/Resources.resw     | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw
index 1961b2292..bd66ba012 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw
@@ -2977,7 +2977,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>Abbrechen</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index 05e2a9ed2..dfb2c856f 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -3053,7 +3053,7 @@ In this context, "agent" refers to an AI agent (e.g. Copilot, Claude, Gemini), n
     <comment>{Locked="API"} Hint below the optional custom provider credential input. Use the established localized product name for Windows Credential Manager.</comment>
   </data>
   <data name="AIAgents_CustomProviderAdd.Content" xml:space="preserve">
-    <value>Add New</value>
+    <value>Add endpoint</value>
     <comment>Button in the final custom provider row that reveals the fields for adding another endpoint.</comment>
   </data>
   <data name="AIAgents_CustomProviderSave.Content" xml:space="preserve">
@@ -3066,7 +3066,7 @@ In this context, "agent" refers to an AI agent (e.g. Copilot, Claude, Gemini), n
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>Cancel</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw
index 23bc4c6c4..04e5c9ecf 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw
@@ -2977,7 +2977,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>Cancelar</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw
index 4af25e402..ba3f6c015 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw
@@ -2978,7 +2978,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>Annuler</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw
index 7fe68940a..62967f472 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw
@@ -2977,7 +2977,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>Annulla</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
index 55f74368e..9af4f6a44 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
@@ -2977,7 +2977,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>キャンセル</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
index d2d906ae6..6ea64cb10 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
@@ -3022,7 +3022,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>취소</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw
index 77e77e92f..8b4095752 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw
@@ -3009,7 +3009,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>Cancelar</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw
index 3ed63c9c6..ddeeba8d4 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw
@@ -2959,7 +2959,7 @@
     <comment>{Locked="API"} Hint below the optional custom provider credential input. Use the established localized product name for Windows Credential Manager.</comment>
   </data>
   <data name="AIAgents_CustomProviderAdd.Content" xml:space="preserve">
-    <value>Add New</value>
+    <value>Add endpoint</value>
     <comment>Button in the final custom provider row that reveals the fields for adding another endpoint.</comment>
   </data>
   <data name="AIAgents_CustomProviderSave.Content" xml:space="preserve">
@@ -2972,7 +2972,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>Cancel</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw
index 3ed63c9c6..ddeeba8d4 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw
@@ -2959,7 +2959,7 @@
     <comment>{Locked="API"} Hint below the optional custom provider credential input. Use the established localized product name for Windows Credential Manager.</comment>
   </data>
   <data name="AIAgents_CustomProviderAdd.Content" xml:space="preserve">
-    <value>Add New</value>
+    <value>Add endpoint</value>
     <comment>Button in the final custom provider row that reveals the fields for adding another endpoint.</comment>
   </data>
   <data name="AIAgents_CustomProviderSave.Content" xml:space="preserve">
@@ -2972,7 +2972,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>Cancel</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw
index 3ed63c9c6..ddeeba8d4 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw
@@ -2959,7 +2959,7 @@
     <comment>{Locked="API"} Hint below the optional custom provider credential input. Use the established localized product name for Windows Credential Manager.</comment>
   </data>
   <data name="AIAgents_CustomProviderAdd.Content" xml:space="preserve">
-    <value>Add New</value>
+    <value>Add endpoint</value>
     <comment>Button in the final custom provider row that reveals the fields for adding another endpoint.</comment>
   </data>
   <data name="AIAgents_CustomProviderSave.Content" xml:space="preserve">
@@ -2972,7 +2972,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>Cancel</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw
index 3f46e89dc..4fa83cad9 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw
@@ -3009,7 +3009,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>Отменить</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/sr-Cyrl-RS/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/sr-Cyrl-RS/Resources.resw
index 71d49a48d..03bb2d119 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/sr-Cyrl-RS/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/sr-Cyrl-RS/Resources.resw
@@ -3024,7 +3024,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>Откажи</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/uk-UA/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/uk-UA/Resources.resw
index d36dc37c7..b7c222d60 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/uk-UA/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/uk-UA/Resources.resw
@@ -2681,7 +2681,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>Скасувати</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw
index 3d8e9e33e..51087a5d4 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw
@@ -3022,7 +3022,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>取消</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw
index 4c78a46bf..d90b677f4 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw
@@ -2977,7 +2977,7 @@
   </data>
   <data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
     <value>取消</value>
-    <comment>Button that cancels adding a provider and restores the Add New row.</comment>
+    <comment>Button that cancels adding a provider and restores the Add endpoint row.</comment>
   </data>
   <data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
     <value>{} (BYOK)</value>