spel and format?

format
spel
2026-05-17 15:36:35 +00:00 · 2026-03-05 09:28:21 -06:00 · 2026-03-05 09:10:21 -06:00 · 2026-03-05 06:52:39 -06:00 · 2026-03-04 16:39:53 -06:00 · 2026-03-03 06:39:58 -06:00
140 changed files with 1623 additions and 1291 deletions
--- a/.github/actions/spelling/expect/expect.txt
+++ b/.github/actions/spelling/expect/expect.txt
@@ -572,7 +572,6 @@ FGHIJ
 fgidx
 FGs
 FILEDESCRIPTION
-filehops
 FILESUBTYPE
 FILESYSPATH
 FILEW
@@ -1773,7 +1772,6 @@ uldash
 uldb
 ULONGLONG
 ulwave
-Unaccess
 Unadvise
 unattend
 UNCPRIORITY
--- a/build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml
@@ -56,12 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!

-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/qps-ploca/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/qps-ploca/PDP.xml
@@ -56,12 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!

-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/qps-plocm/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/qps-plocm/PDP.xml
@@ -56,12 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!

-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml
@@ -56,11 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !

-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/qps-ploca/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-ploca/PDP.xml
@@ -56,11 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !

-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/qps-plocm/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-plocm/PDP.xml
@@ -56,11 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !

-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/pgo/Terminal.PGO.props
+++ b/build/pgo/Terminal.PGO.props
@@ -9,7 +9,7 @@

  <PropertyGroup>
    <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
-    <PGOBranch>release-1.25</PGOBranch>
+    <PGOBranch>main</PGOBranch>

    <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
    <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>
--- a/build/pipelines/templates-v2/job-build-package-wpf.yml
+++ b/build/pipelines/templates-v2/job-build-package-wpf.yml
@@ -46,7 +46,6 @@ jobs:
          BuildConfiguration: ${{ config }}
  dependsOn: ${{ parameters.dependsOn }}
  variables:
-    BuildPlatform: Any CPU
    OutputBuildPlatform: AnyCPU
    Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
    JobOutputDirectory: $(Build.ArtifactStagingDirectory)\nupkg
--- a/build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml
+++ b/build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml
@@ -211,7 +211,7 @@ extends:
                  ob_createvpack_verbose: true
                  ob_createvpack_vpackdirectory: '$(JobOutputDirectory)\vpack'
                  ob_createvpack_versionAs: string
-                  ob_createvpack_version: '$(XES_PACKAGEVERSIONNUMBER)'
+                  ob_createvpack_version: '$(XES_APPXMANIFESTVERSION)'
                  ob_updateOSManifest_gitcheckinConfigPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
                  # We're skipping the 'fetch' part of the OneBranch rules, but that doesn't mean
                  # that it doesn't expect to have downloaded a manifest directly to some 'destination'
--- a/custom.props
+++ b/custom.props
@@ -5,7 +5,7 @@
    <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
    <XesBaseYearForStoreVersion>2026</XesBaseYearForStoreVersion>
    <VersionMajor>1</VersionMajor>
-    <VersionMinor>25</VersionMinor>
+    <VersionMinor>26</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
    <VersionInfoCulture>1033</VersionInfoCulture>
    <!-- The default has a spacing problem -->
--- a/doc/cascadia/profiles.schema.json
+++ b/doc/cascadia/profiles.schema.json
@@ -76,6 +76,36 @@
        }
      ]
    },
+    "OutputNotificationStyle": {
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "taskbar",
+              "audible",
+              "tab",
+              "notification"
+            ]
+          }
+        },
+        {
+          "type": "string",
+          "enum": [
+            "taskbar",
+            "audible",
+            "tab",
+            "notification",
+            "all",
+            "none"
+          ]
+        }
+      ]
+    },
    "BellSound": {
      "default": "",
      "description": "Sets the file location of the sound played when the application emits a BEL character. If the path is invalid no sound will be played. This property also accepts an array of sounds and the terminal will pick one at random.",
@@ -94,6 +124,14 @@
        }
      ]
    },
+    "AutoDetectRunningCommand": {
+      "type": "string",
+      "enum": [
+        "disabled",
+        "automatic",
+        "progress"
+      ]
+    },
    "BuiltinSuggestionSource": {
      "type": "string",
      "anyOf": [
@@ -2470,13 +2508,6 @@
          },
          "type": "array"
        },
-        "safeUriSchemes": {
-          "description": "Specifies a list of URI schemes that are considered safe. No confirmation will be required to open URIs with these schemes.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
        "rendering.graphicsAPI": {
          "description": "Direct3D 11 provides a more performant and feature-rich experience, whereas Direct2D is more stable. The default option \"Automatic\" will pick the API that best fits your graphics hardware. If you experience significant issues, consider using Direct2D.",
          "type": "string",
@@ -3181,6 +3212,21 @@
            "mingw"
          ],
          "type": "string"
+        },
+        "notifyOnInactiveOutput": {
+          "default": "none",
+          "description": "Controls how the terminal notifies you when a background pane produces output. Supported values include `taskbar`, `audible`, `tab`, and `notification`. Can be set to true (equivalent to `tab`), false/none (disabled), a single string, or an array of strings.",
+          "$ref": "#/$defs/OutputNotificationStyle"
+        },
+        "notifyOnNextPrompt": {
+          "default": "none",
+          "description": "Controls how the terminal notifies you when a running command finishes and the shell returns to a prompt. Requires shell integration. Supported values include `taskbar`, `audible`, `tab`, and `notification`. Can be set to true (equivalent to `tab`), false/none (disabled), a single string, or an array of strings.",
+          "$ref": "#/$defs/OutputNotificationStyle"
+        },
+        "autoDetectRunningCommand": {
+          "default": "disabled",
+          "description": "Controls automatic detection of running commands via shell integration marks. When set to `automatic`, an indeterminate progress indicator is shown on the tab while a command is executing. When set to `progress`, the terminal will also attempt to detect progress percentages from command output. Requires shell integration.",
+          "$ref": "#/$defs/AutoDetectRunningCommand"
        }
      }
    },
--- a/src/buffer/out/Row.cpp
+++ b/src/buffer/out/Row.cpp
@@ -1143,13 +1143,6 @@ til::CoordType ROW::GetTrailingColumnAtCharOffset(const ptrdiff_t offset) const
    return _createCharToColumnMapper(offset).GetTrailingColumnAt(offset);
 }

-uint16_t ROW::GetCharOffset(til::CoordType col) const noexcept
-{
-    const auto columns = GetReadableColumnCount();
-    const auto colBeg = clamp(col, 0, columns);
-    return _uncheckedCharOffset(gsl::narrow_cast<size_t>(colBeg));
-}
-
 DelimiterClass ROW::DelimiterClassAt(til::CoordType column, const std::wstring_view& wordDelimiters) const noexcept
 {
    const auto col = _clampedColumn(column);
--- a/src/buffer/out/Row.hpp
+++ b/src/buffer/out/Row.hpp
@@ -172,7 +172,6 @@ public:
    std::wstring_view GetText(til::CoordType columnBegin, til::CoordType columnEnd) const noexcept;
    til::CoordType GetLeadingColumnAtCharOffset(ptrdiff_t offset) const noexcept;
    til::CoordType GetTrailingColumnAtCharOffset(ptrdiff_t offset) const noexcept;
-    uint16_t GetCharOffset(til::CoordType col) const noexcept;
    DelimiterClass DelimiterClassAt(til::CoordType column, const std::wstring_view& wordDelimiters) const noexcept;

    auto AttrBegin() const noexcept { return _attr.begin(); }
--- a/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest
+++ b/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest
@@ -237,7 +237,6 @@
    <Capability Name="internetClient" />
    <rescap:Capability Name="runFullTrust" />
    <rescap:Capability Name="unvirtualizedResources" />
-    <rescap:Capability Name="appLicensing" />
  </Capabilities>

  <Extensions>
--- a/src/cascadia/CascadiaPackage/Package.appxmanifest
+++ b/src/cascadia/CascadiaPackage/Package.appxmanifest
@@ -237,7 +237,6 @@
    <Capability Name="internetClient" />
    <rescap:Capability Name="runFullTrust" />
    <rescap:Capability Name="unvirtualizedResources" />
-    <rescap:Capability Name="appLicensing" />
  </Capabilities>

  <Extensions>
--- a/src/cascadia/TerminalApp/AppActionHandlers.cpp
+++ b/src/cascadia/TerminalApp/AppActionHandlers.cpp
@@ -499,8 +499,8 @@ namespace winrt::TerminalApp::implementation
            }
            else
            {
-                const auto resizeSucceeded = _ResizePane(realArgs.ResizeDirection());
-                args.Handled(resizeSucceeded);
+                _ResizePane(realArgs.ResizeDirection());
+                args.Handled(true);
            }
        }
    }
--- a/src/cascadia/TerminalApp/BasicPaneEvents.h
+++ b/src/cascadia/TerminalApp/BasicPaneEvents.h
@@ -10,6 +10,7 @@ namespace winrt::TerminalApp::implementation
        til::typed_event<> ConnectionStateChanged;
        til::typed_event<IPaneContent> CloseRequested;
        til::typed_event<IPaneContent, winrt::TerminalApp::BellEventArgs> BellRequested;
+        til::typed_event<IPaneContent, winrt::TerminalApp::NotificationEventArgs> NotificationRequested;
        til::typed_event<IPaneContent> TitleChanged;
        til::typed_event<IPaneContent> TabColorChanged;
        til::typed_event<IPaneContent> TaskbarProgressChanged;
--- a/src/cascadia/TerminalApp/DesktopNotification.cpp
+++ b/src/cascadia/TerminalApp/DesktopNotification.cpp
@@ -0,0 +1,104 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "DesktopNotification.h"
+
+using namespace winrt::Windows::UI::Notifications;
+using namespace winrt::Windows::Data::Xml::Dom;
+
+namespace winrt::TerminalApp::implementation
+{
+    std::atomic<int64_t> DesktopNotification::_lastNotificationTime{ 0 };
+
+    bool DesktopNotification::ShouldSendNotification()
+    {
+        FILETIME ft{};
+        GetSystemTimeAsFileTime(&ft);
+        const auto now = (static_cast<int64_t>(ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
+        auto last = _lastNotificationTime.load(std::memory_order_relaxed);
+
+        if (now - last < MinNotificationIntervalTicks)
+        {
+            return false;
+        }
+
+        // Attempt to update; if another thread beat us, that's fine — we'll skip this one.
+        _lastNotificationTime.compare_exchange_strong(last, now, std::memory_order_relaxed);
+        return true;
+    }
+
+    void DesktopNotification::SendNotification(
+        const DesktopNotificationArgs& args,
+        std::function<void(uint32_t tabIndex)> activated)
+    {
+        try
+        {
+            if (!ShouldSendNotification())
+            {
+                return;
+            }
+
+            // Build the toast XML. We use a simple template with a title and body text.
+            //
+            // <toast launch="__fromToast">
+            //   <visual>
+            //     <binding template="ToastGeneric">
+            //       <text>Title</text>
+            //       <text>Message</text>
+            //     </binding>
+            //   </visual>
+            // </toast>
+            auto toastXml = ToastNotificationManager::GetTemplateContent(ToastTemplateType::ToastText02);
+            auto textNodes = toastXml.GetElementsByTagName(L"text");
+
+            // First <text> is the title
+            textNodes.Item(0).InnerText(args.Title);
+            // Second <text> is the body
+            textNodes.Item(1).InnerText(args.Message);
+
+            auto toastElement = toastXml.DocumentElement();
+
+            // When a toast is clicked, Windows launches a new instance of the app
+            // with the "launch" attribute as command-line arguments. We handle
+            // toast activation in-process via the Activated event below, so the
+            // new instance should do nothing. "__fromToast" is recognized by
+            // AppCommandlineArgs::ParseArgs as a no-op sentinel.
+            toastElement.SetAttribute(L"launch", L"__fromToast");
+
+            // Set the scenario to "reminder" to ensure the toast shows even in DND,
+            // and the group/tag to allow replacement of repeated notifications.
+            toastElement.SetAttribute(L"scenario", L"default");
+
+            auto toast = ToastNotification{ toastXml };
+
+            // Set the tag and group to enable notification replacement.
+            // Using the tab index as a tag means repeated output from the same tab
+            // replaces the previous notification rather than stacking.
+            toast.Tag(fmt::format(FMT_COMPILE(L"wt-tab-{}"), args.TabIndex));
+            toast.Group(L"WindowsTerminal");
+
+            // When the user activates (clicks) the toast, fire the callback.
+            if (activated)
+            {
+                const auto tabIndex = args.TabIndex;
+                toast.Activated([activated, tabIndex](const auto& /*sender*/, const auto& /*eventArgs*/) {
+                    activated(tabIndex);
+                });
+            }
+
+            // For packaged apps, CreateToastNotifier() uses the package identity automatically.
+            // For unpackaged apps, we need to provide an AUMID, but that case is less common
+            // and toast notifications may not be supported without additional setup.
+            auto notifier = ToastNotificationManager::CreateToastNotifier();
+            notifier.Show(toast);
+        }
+        catch (...)
+        {
+            // Toast notification is a best-effort feature. If it fails (e.g., notifications
+            // are disabled, or the app is unpackaged without proper AUMID setup), we silently
+            // ignore the error.
+            LOG_CAUGHT_EXCEPTION();
+        }
+    }
+}
--- a/src/cascadia/TerminalApp/DesktopNotification.h
+++ b/src/cascadia/TerminalApp/DesktopNotification.h
@@ -0,0 +1,52 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- DesktopNotification.h
+
+Module Description:
+- Helper for sending Windows desktop toast notifications. Used by the
+  `OutputNotificationStyle::Notification` flag to surface activity
+  and prompt-return events to the user via the Windows notification center.
+
+--*/
+
+#pragma once
+#include "pch.h"
+
+namespace winrt::TerminalApp::implementation
+{
+    struct DesktopNotificationArgs
+    {
+        winrt::hstring Title;
+        winrt::hstring Message;
+        uint32_t TabIndex{ 0 };
+    };
+
+    class DesktopNotification
+    {
+    public:
+        // Sends a toast notification with the given title and message.
+        // When the user clicks the toast, the `Activated` callback fires
+        // with the tabIndex that was passed in, so the caller can switch
+        // to the correct tab and summon the window.
+        //
+        // activated: A callback invoked on the background thread when the
+        //            toast is clicked. The uint32_t parameter is the tab index.
+        static void SendNotification(
+            const DesktopNotificationArgs& args,
+            std::function<void(uint32_t tabIndex)> activated);
+
+        // Rate-limits toast notifications so we don't spam the user.
+        // Returns true if a notification is allowed, false if too recent.
+        static bool ShouldSendNotification();
+
+    private:
+        static std::atomic<int64_t> _lastNotificationTime;
+
+        // Minimum interval between notifications, in 100ns ticks (FILETIME units).
+        // 5 seconds = 5 * 10,000,000
+        static constexpr int64_t MinNotificationIntervalTicks = 50'000'000LL;
+    };
+}
--- a/src/cascadia/TerminalApp/IPaneContent.idl
+++ b/src/cascadia/TerminalApp/IPaneContent.idl
@@ -16,6 +16,12 @@ namespace TerminalApp
        Boolean FlashTaskbar { get; };
    };

+    runtimeclass NotificationEventArgs
+    {
+        Microsoft.Terminal.Control.OutputNotificationStyle Style { get; };
+        Boolean OnlyWhenInactive { get; };
+    };
+
    interface IPaneContent
    {
        Windows.UI.Xaml.FrameworkElement GetRoot();
@@ -41,6 +47,7 @@ namespace TerminalApp

        event Windows.Foundation.TypedEventHandler<Object, Object> ConnectionStateChanged;
        event Windows.Foundation.TypedEventHandler<IPaneContent, BellEventArgs> BellRequested;
+        event Windows.Foundation.TypedEventHandler<IPaneContent, NotificationEventArgs> NotificationRequested;
        event Windows.Foundation.TypedEventHandler<IPaneContent, Object> TitleChanged;
        event Windows.Foundation.TypedEventHandler<IPaneContent, Object> TabColorChanged;
        event Windows.Foundation.TypedEventHandler<IPaneContent, Object> TaskbarProgressChanged;
--- a/src/cascadia/TerminalApp/Resources/de-DE/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/de-DE/Resources.resw
@@ -672,15 +672,9 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>Dieser Linktyp wird derzeit nicht unterstützt:</value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
    <value>Abbrechen</value>
  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Dieser Link kann zu einem unsicheren Speicherort führen. Links können ihren Computer und Ihre Daten beschädigen. Klicken Sie zum Schutz Des Computers nur auf Links aus vertrauenswürdigen Quellen.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Trotzdem öffnen</value>
-  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>Einstellungen</value>
  </data>
@@ -854,11 +848,11 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
    <value>Der aktive Bereich wurde auf die Registerkarte „{0}“ verschoben</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
    <value>Registerkarte „{0}“ wurde in das Fenster „{1}“ verschoben</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Registerkarte „{0}“ in neues Fenster verschoben</value>
@@ -870,7 +864,7 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>Der aktive Bereich wurde in das Fenster "{0}" verschoben</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Aktiver Bereich in neues Fenster verschoben</value>
--- a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
@@ -669,15 +669,9 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>This link type is currently not supported:</value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
    <value>Cancel</value>
  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>This link may lead to an unsafe location. Hyperlinks can be harmful to your computer and data. To protect your computer, only click links from trusted sources.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Open anyway</value>
-  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>Settings</value>
  </data>
@@ -929,4 +923,16 @@
  <data name="InvalidRegex" xml:space="preserve">
    <value>An invalid regular expression was found.</value>
  </data>
+  <data name="NotificationTitle" xml:space="preserve">
+    <value>Windows Terminal</value>
+    <comment>Title shown in desktop toast notifications for tab activity.</comment>
+  </data>
+  <data name="NotificationMessage_TabActivity" xml:space="preserve">
+    <value>Tab "{0}" has new activity</value>
+    <comment>{Locked="{0}"}Message shown in a desktop toast notification when a tab produces output. {0} is the tab title.</comment>
+  </data>
+  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
+    <value>Tab "{0}" in {1} has new activity</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}Message shown in a desktop toast notification when a tab produces output. {0} is the tab title. {1} is the window name.</comment>
+  </data>
 </root>
--- a/src/cascadia/TerminalApp/Resources/es-ES/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/es-ES/Resources.resw
@@ -669,15 +669,9 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>Este tipo de vínculo no se admite actualmente:</value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
    <value>Cancelar</value>
  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Este vínculo puede dar lugar a una ubicación no segura. Los hipervínculos pueden ser perjudiciales para el equipo y los datos. Para proteger el equipo, haga clic solo en vínculos de orígenes de confianza.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Abrir de todas formas</value>
-  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>Configuración</value>
  </data>
@@ -851,11 +845,11 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
    <value>Panel activo movido a la pestaña "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
    <value>La pestaña "{0}" se ha movido a la ventana "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>La pestaña "{0}" se ha movido a la nueva ventana</value>
@@ -867,7 +861,7 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>Panel activo movido a la ventana "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Panel activo movido a nueva ventana</value>
--- a/src/cascadia/TerminalApp/Resources/fr-FR/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/fr-FR/Resources.resw
@@ -669,15 +669,9 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>Ce type de lien n’est actuellement pas pris en charge :</value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
    <value>Annuler</value>
  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ce lien peut entraîner un emplacement non sécurisé. Les liens hypertexte peuvent endommager votre ordinateur et vos données. Pour protéger votre ordinateur, cliquez uniquement sur des liens provenant de sources fiables.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Ouvrir quand même</value>
-  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>Paramètres</value>
  </data>
@@ -851,11 +845,11 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
    <value>Volet actif déplacé vers l’onglet « {0} »</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
    <value>Onglet « {0} » déplacé vers la fenêtre « {1} »</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Onglet « {0} » déplacé vers une nouvelle fenêtre</value>
@@ -867,7 +861,7 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>Volet actif déplacé vers l’onglet « {0} »</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Volet actif déplacé vers une nouvelle fenêtre</value>
--- a/src/cascadia/TerminalApp/Resources/it-IT/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/it-IT/Resources.resw
@@ -669,15 +669,9 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>Questo tipo di collegamento non è al momento supportato:</value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
    <value>Annulla</value>
  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Questo collegamento potrebbe causare un percorso non sicuro. I collegamenti ipertestuali possono essere dannosi per il computer e i dati. Per proteggere il computer, fare clic solo su collegamenti da origini attendibili.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Apri comunque</value>
-  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>Impostazioni</value>
  </data>
@@ -851,11 +845,11 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
    <value>Riquadro attivo spostato nella scheda "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
    <value>Scheda "{0}" spostata nella finestra "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Scheda "{0}" spostata in una nuova finestra</value>
@@ -867,7 +861,7 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>Riquadro attivo spostato nella finestra "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Riquadro attivo spostato in una nuova finestra</value>
--- a/src/cascadia/TerminalApp/Resources/ja-JP/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/ja-JP/Resources.resw
@@ -670,15 +670,9 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>このリンクの種類は現在サポートされていません:</value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
    <value>キャンセル</value>
  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>このリンクは安全でない可能性があります。ハイパーリンクは、コンピューターやデータに問題を起こす可能性があります。コンピューターを保護するには、信頼できるソースからのリンクのみをクリックしてください。</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>開く</value>
-  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>設定</value>
  </data>
@@ -852,11 +846,11 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
    <value>アクティブなペインを [{0}] タブに移動しました</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
    <value>[{0}] タブを "{1}" ウィンドウに移動しました</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>[{0}] タブを新しいウィンドウに移動しました</value>
@@ -868,7 +862,7 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>アクティブなペインを "{0}" ウィンドウに移動しました</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>アクティブなペインを新しいウィンドウに移動しました</value>
--- a/src/cascadia/TerminalApp/Resources/ko-KR/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/ko-KR/Resources.resw
@@ -669,15 +669,9 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>이 링크 형식은 현재 지원되지 않습니다.</value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
    <value>취소</value>
  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>이 링크로 인해 안전하지 않은 위치가 발생할 수 있습니다. 하이퍼링크는 컴퓨터와 데이터를 손상시킬 수 있습니다. 컴퓨터를 보호하려면 신뢰할 수 있는 원본의 링크만 클릭하세요.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>열기</value>
-  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>설정</value>
  </data>
@@ -851,11 +845,11 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
    <value>활성 창이 "{0}" 탭으로 이동됨</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
    <value>"{0}" 탭이 "{1}" 창으로 이동됨</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>"{0}" 탭이 새 창으로 이동됨</value>
@@ -867,7 +861,7 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>활성 창이 "{0}" 창으로 이동됨</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>활성 창이 새 창으로 이동됨</value>
--- a/src/cascadia/TerminalApp/Resources/pt-BR/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/pt-BR/Resources.resw
@@ -669,15 +669,9 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>Não há suporte para este tipo de link no momento:</value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
    <value>Cancelar</value>
  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Este link pode levar a um local não seguro. Hiperlinks podem ser prejudiciais ao computador e aos dados. Para proteger o computador, clique somente em links de fontes confiáveis.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Abrir mesmo assim</value>
-  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>Configurações</value>
  </data>
@@ -851,11 +845,11 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
    <value>Painel ativo movido para a guia "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
    <value>Guia "{0}" movida para janela "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Guia "{0}" movida para nova janela</value>
@@ -867,7 +861,7 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>Painel ativo movido para a janela "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Painel ativo movido para nova janela</value>
--- a/src/cascadia/TerminalApp/Resources/qps-ploc/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/qps-ploc/Resources.resw
@@ -669,14 +669,8 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>Ťђïś łϊηќ ŧурē ιş çũґѓзⁿτľÿ ñστ şΰρρоŕŧĕđ: !!! !!! !!! !!! </value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
-    <value>Çдπсёľ !</value>
-  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úŉšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċómφύŧèґ аňδ ðáťǻ. Ţб ρгøťėçŧ ўòύг ςömφùţĕŕ, ŏŋľỳ čℓΐςķ łίŋκѕ ƒřöм ťŗμѕŧєđ śόυяčêś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Őρέй ǻпŷŵãγ !!!</value>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Сąñс℮ł !</value>
  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>Śëţťĩпğś !!</value>
@@ -851,11 +845,11 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
    <value>∆çťíνĕ рåⁿэ мôνеð ťб "{0}" ţав !!! !!! !!!</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
    <value>"{0}" ťāъ мōνęđ τŏ "{1}" шΐπδŏẅ !!! !!! !!!</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>"{0}" тąь mǿνєđ ŧσ ήèώ ẅĩŋďøẃ !!! !!! !!!</value>
@@ -867,7 +861,7 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>Λςťìνє рáиė mόνéð ťб "{0}" ŵîńđθω !!! !!! !!! </value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Αĉťįνέ ρªņз mσνёđ τǿ ήёẃ ẃîпďǿω !!! !!! !!!</value>
--- a/src/cascadia/TerminalApp/Resources/qps-ploca/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/qps-ploca/Resources.resw
@@ -669,14 +669,8 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>Ťђïś łϊηќ ŧурē ιş çũґѓзⁿτľÿ ñστ şΰρρоŕŧĕđ: !!! !!! !!! !!! </value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
-    <value>Çдπсёľ !</value>
-  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úŉšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċómφύŧèґ аňδ ðáťǻ. Ţб ρгøťėçŧ ўòύг ςömφùţĕŕ, ŏŋľỳ čℓΐςķ łίŋκѕ ƒřöм ťŗμѕŧєđ śόυяčêś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Őρέй ǻпŷŵãγ !!!</value>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Сąñс℮ł !</value>
  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>Śëţťĩпğś !!</value>
@@ -851,11 +845,11 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
    <value>∆çťíνĕ рåⁿэ мôνеð ťб "{0}" ţав !!! !!! !!!</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
    <value>"{0}" ťāъ мōνęđ τŏ "{1}" шΐπδŏẅ !!! !!! !!!</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>"{0}" тąь mǿνєđ ŧσ ήèώ ẅĩŋďøẃ !!! !!! !!!</value>
@@ -867,7 +861,7 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>Λςťìνє рáиė mόνéð ťб "{0}" ŵîńđθω !!! !!! !!! </value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Αĉťįνέ ρªņз mσνёđ τǿ ήёẃ ẃîпďǿω !!! !!! !!!</value>
--- a/src/cascadia/TerminalApp/Resources/qps-plocm/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/qps-plocm/Resources.resw
@@ -669,14 +669,8 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>Ťђïś łϊηќ ŧурē ιş çũґѓзⁿτľÿ ñστ şΰρρоŕŧĕđ: !!! !!! !!! !!! </value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
-    <value>Çдπсёľ !</value>
-  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úŉšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċómφύŧèґ аňδ ðáťǻ. Ţб ρгøťėçŧ ўòύг ςömφùţĕŕ, ŏŋľỳ čℓΐςķ łίŋκѕ ƒřöм ťŗμѕŧєđ śόυяčêś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Őρέй ǻпŷŵãγ !!!</value>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Сąñс℮ł !</value>
  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>Śëţťĩпğś !!</value>
@@ -851,11 +845,11 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
    <value>∆çťíνĕ рåⁿэ мôνеð ťб "{0}" ţав !!! !!! !!!</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
    <value>"{0}" ťāъ мōνęđ τŏ "{1}" шΐπδŏẅ !!! !!! !!!</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>"{0}" тąь mǿνєđ ŧσ ήèώ ẅĩŋďøẃ !!! !!! !!!</value>
@@ -867,7 +861,7 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>Λςťìνє рáиė mόνéð ťб "{0}" ŵîńđθω !!! !!! !!! </value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Αĉťįνέ ρªņз mσνёđ τǿ ήёẃ ẃîпďǿω !!! !!! !!!</value>
--- a/src/cascadia/TerminalApp/Resources/ru-RU/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/ru-RU/Resources.resw
@@ -669,15 +669,9 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>Этот тип связи в настоящее время не поддерживается:</value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
    <value>Отмена</value>
  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Эта ссылка может привести к небезопасному расположению. Гиперссылки могут нанести вред компьютеру и данным. Чтобы защитить компьютер, щелкните ссылки только из надежных источников.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Все равно открыть</value>
-  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>Параметры</value>
  </data>
@@ -851,11 +845,11 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
    <value>Активная область перемещена на вкладку "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
    <value>Вкладка "{0}" перемещена в окно "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Вкладка "{0}" перемещена в новое окно</value>
@@ -867,7 +861,7 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>Активная область перемещена в окно "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>Активная область перемещена в новое окно</value>
--- a/src/cascadia/TerminalApp/Resources/zh-CN/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/zh-CN/Resources.resw
@@ -669,15 +669,9 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>当前不支持此链接类型：</value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
    <value>取消</value>
  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>此链接可能会导致不安全的位置。超链接可能对你的计算机和数据有害。若要保护你的计算机，请仅单击来自受信任源的链接。</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>仍然打开</value>
-  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>设置</value>
  </data>
@@ -851,11 +845,11 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
    <value>活动窗格已移动到“{0}”选项卡</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
    <value>“{0}”选项卡已移动到“{1}”窗口</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>“{0}”选项卡已移动到新窗口</value>
@@ -867,7 +861,7 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>活动窗格已移动到“{0}”选项卡</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>活动窗格已移动到新窗口</value>
--- a/src/cascadia/TerminalApp/Resources/zh-TW/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/zh-TW/Resources.resw
@@ -669,15 +669,9 @@
  <data name="UnsupportedSchemeText" xml:space="preserve">
    <value>目前不支援此連結類型:</value>
  </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
    <value>取消</value>
  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>此連結可能通往不安全地點。超連結可能對你的電腦和資料造成傷害。為了保護你的電腦，只點擊來自可信來源的連結。</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>一律開啟</value>
-  </data>
  <data name="SettingsTab" xml:space="preserve">
    <value>設定</value>
  </data>
@@ -851,11 +845,11 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
    <value>活動窗格已移動至「{0}」索引標籤</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
    <value>「{0}」索引標籤已移至「{1}」視窗</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>「{0}」索引標籤已移至新視窗</value>
@@ -867,7 +861,7 @@
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>活動窗格已移動至「{0}」視窗</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
    <value>活動窗格已移至新視窗</value>
--- a/src/cascadia/TerminalApp/Tab.cpp
+++ b/src/cascadia/TerminalApp/Tab.cpp
@@ -123,6 +123,15 @@ namespace winrt::TerminalApp::implementation
        _bellIndicatorTimer.Stop();
    }

+    // Method Description:
+    // - Called when the timer for the activity indicator in the tab header fires
+    // - Removes the activity indicator from the tab header
+    void Tab::_ActivityIndicatorTimerTick(const Windows::Foundation::IInspectable& /*sender*/, const Windows::Foundation::IInspectable& /*e*/)
+    {
+        ShowActivityIndicator(false);
+        _activityIndicatorTimer.Stop();
+    }
+
    // Method Description:
    // - Initializes a TabViewItem for this Tab instance.
    // Arguments:
@@ -329,6 +338,11 @@ namespace winrt::TerminalApp::implementation
            {
                ShowBellIndicator(false);
            }
+            // When we gain focus, remove the activity indicator if it is active
+            if (_tabStatus.ActivityIndicator())
+            {
+                ShowActivityIndicator(false);
+            }
        }
    }

@@ -459,6 +473,29 @@ namespace winrt::TerminalApp::implementation
        _bellIndicatorTimer.Start();
    }

+    void Tab::ShowActivityIndicator(const bool show)
+    {
+        ASSERT_UI_THREAD();
+
+        _tabStatus.ActivityIndicator(show);
+    }
+
+    // Method Description:
+    // - Activates the timer for the activity indicator in the tab
+    // - Called if a notification was raised when the tab already has focus
+    void Tab::ActivateActivityIndicatorTimer()
+    {
+        ASSERT_UI_THREAD();
+
+        if (!_activityIndicatorTimer)
+        {
+            _activityIndicatorTimer.Interval(std::chrono::milliseconds(2000));
+            _activityIndicatorTimer.Tick({ get_weak(), &Tab::_ActivityIndicatorTimerTick });
+        }
+
+        _activityIndicatorTimer.Start();
+    }
+
    // Method Description:
    // - Gets the title string of the last focused terminal control in our tree.
    //   Returns the empty string if there is no such control.
@@ -844,14 +881,14 @@ namespace winrt::TerminalApp::implementation
    // Arguments:
    // - direction: The direction to move the separator in.
    // Return Value:
-    // - whether a pane was resized
-    bool Tab::ResizePane(const ResizeDirection& direction)
+    // - <none>
+    void Tab::ResizePane(const ResizeDirection& direction)
    {
        ASSERT_UI_THREAD();

        // NOTE: This _must_ be called on the root pane, so that it can propagate
        // throughout the entire tree.
-        return _rootPane->ResizePane(direction);
+        _rootPane->ResizePane(direction);
    }

    // Method Description:
@@ -1068,6 +1105,7 @@ namespace winrt::TerminalApp::implementation
            dispatcher,
            til::throttled_func_options{
                .delay = std::chrono::milliseconds{ 200 },
+                .leading = true,
                .trailing = true,
            },
            [weakThis]() {
@@ -1161,6 +1199,63 @@ namespace winrt::TerminalApp::implementation
                }
            });

+        events.NotificationRequested = content.NotificationRequested(
+            winrt::auto_revoke,
+            [dispatcher, weakThis](TerminalApp::IPaneContent sender, auto notificationArgs) -> safe_void_coroutine {
+                const auto weakThisCopy = weakThis;
+                co_await wil::resume_foreground(dispatcher);
+                if (const auto tab{ weakThisCopy.get() })
+                {
+                    // For NotifyOnInactiveOutput (OnlyWhenInactive=true), suppress
+                    // ALL notification styles when the sender is the active pane.
+                    // For NotifyOnNextPrompt (OnlyWhenInactive=false), always fire.
+                    const auto activeContent = tab->GetActiveContent();
+                    const auto isActivePaneContent = activeContent && activeContent == sender;
+
+                    if (notificationArgs.OnlyWhenInactive() && isActivePaneContent &&
+                        tab->_focusState != WUX::FocusState::Unfocused)
+                    {
+                        co_return;
+                    }
+
+                    const auto style = notificationArgs.Style();
+
+                    if (WI_IsFlagSet(style, OutputNotificationStyle::Taskbar))
+                    {
+                        // Flash the taskbar button
+                        tab->TabRaiseVisualBell.raise();
+                    }
+
+                    if (WI_IsFlagSet(style, winrt::Microsoft::Terminal::Control::OutputNotificationStyle::Audible))
+                    {
+                        // Play the notification sound via the pane's bell infrastructure
+                        // (respects BellSound profile setting, uses MediaPlayer, etc.)
+                        if (const auto termContent{ sender.try_as<TerminalApp::TerminalPaneContent>() })
+                        {
+                            termContent.PlayNotificationSound();
+                        }
+                    }
+
+                    if (WI_IsFlagSet(style, winrt::Microsoft::Terminal::Control::OutputNotificationStyle::Tab))
+                    {
+                        tab->ShowActivityIndicator(true);
+
+                        if (tab->_focusState != WUX::FocusState::Unfocused)
+                        {
+                            tab->ActivateActivityIndicatorTimer();
+                        }
+                    }
+
+                    if (WI_IsFlagSet(style, winrt::Microsoft::Terminal::Control::OutputNotificationStyle::Notification))
+                    {
+                        // Request a desktop toast notification.
+                        // TerminalPage subscribes to this event and handles sending the toast
+                        // and processing its activation (summoning the window + switching tabs).
+                        tab->TabToastNotificationRequested.raise(tab->Title(), tab->TabViewIndex());
+                    }
+                }
+            });
+
        if (const auto& terminal{ content.try_as<TerminalApp::TerminalPaneContent>() })
        {
            events.RestartTerminalRequested = terminal.RestartTerminalRequested(winrt::auto_revoke, { get_weak(), &Tab::_bubbleRestartTerminalRequested });
@@ -1393,6 +1488,11 @@ namespace winrt::TerminalApp::implementation
                {
                    tab->ShowBellIndicator(false);
                }
+                // Also remove the activity indicator
+                if (tab->_tabStatus.ActivityIndicator())
+                {
+                    tab->ShowActivityIndicator(false);
+                }
            }
        });

--- a/src/cascadia/TerminalApp/Tab.h
+++ b/src/cascadia/TerminalApp/Tab.h
@@ -48,12 +48,15 @@ namespace winrt::TerminalApp::implementation
        void ShowBellIndicator(const bool show);
        void ActivateBellIndicatorTimer();

+        void ShowActivityIndicator(const bool show);
+        void ActivateActivityIndicatorTimer();
+
        float CalcSnappedDimension(const bool widthOrHeight, const float dimension) const;
        std::optional<winrt::Microsoft::Terminal::Settings::Model::SplitDirection> PreCalculateCanSplit(winrt::Microsoft::Terminal::Settings::Model::SplitDirection splitType,
                                                                                                        const float splitSize,
                                                                                                        winrt::Windows::Foundation::Size availableSpace) const;

-        bool ResizePane(const winrt::Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
+        void ResizePane(const winrt::Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
        bool NavigateFocus(const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction);
        bool SwapPane(const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction);
        bool FocusPane(const uint32_t id);
@@ -121,6 +124,7 @@ namespace winrt::TerminalApp::implementation

        til::typed_event<TerminalApp::Tab, IInspectable> ActivePaneChanged;
        til::event<winrt::delegate<>> TabRaiseVisualBell;
+        til::event<winrt::delegate<winrt::hstring /*title*/, uint32_t /*tabIndex*/>> TabToastNotificationRequested;
        til::typed_event<IInspectable, IInspectable> TaskbarProgressChanged;

        // The TabViewIndex is the index this Tab object resides in TerminalPage's _tabs vector.
@@ -176,6 +180,7 @@ namespace winrt::TerminalApp::implementation
        struct ContentEventTokens
        {
            winrt::TerminalApp::IPaneContent::BellRequested_revoker BellRequested;
+            winrt::TerminalApp::IPaneContent::NotificationRequested_revoker NotificationRequested;
            winrt::TerminalApp::IPaneContent::TitleChanged_revoker TitleChanged;
            winrt::TerminalApp::IPaneContent::TabColorChanged_revoker TabColorChanged;
            winrt::TerminalApp::IPaneContent::TaskbarProgressChanged_revoker TaskbarProgressChanged;
@@ -210,6 +215,9 @@ namespace winrt::TerminalApp::implementation
        SafeDispatcherTimer _bellIndicatorTimer;
        void _BellIndicatorTimerTick(const Windows::Foundation::IInspectable& sender, const Windows::Foundation::IInspectable& e);

+        SafeDispatcherTimer _activityIndicatorTimer;
+        void _ActivityIndicatorTimerTick(const Windows::Foundation::IInspectable& sender, const Windows::Foundation::IInspectable& e);
+
        void _UpdateHeaderControlMaxWidth();

        void _CreateContextMenu();
--- a/src/cascadia/TerminalApp/TabHeaderControl.xaml
+++ b/src/cascadia/TerminalApp/TabHeaderControl.xaml
@@ -32,6 +32,12 @@
                  FontSize="12"
                  Glyph="&#xEA8F;"
                  Visibility="{x:Bind TabStatus.BellIndicator, Mode=OneWay}" />
+        <FontIcon x:Name="HeaderActivityIndicator"
+                  Margin="0,0,8,0"
+                  FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                  FontSize="8"
+                  Glyph="&#xF127;"
+                  Visibility="{x:Bind TabStatus.ActivityIndicator, Mode=OneWay}" />
        <FontIcon x:Name="HeaderZoomIcon"
                  Margin="0,0,8,0"
                  FontFamily="{ThemeResource SymbolThemeFontFamily}"
--- a/src/cascadia/TerminalApp/TabManagement.cpp
+++ b/src/cascadia/TerminalApp/TabManagement.cpp
@@ -19,6 +19,7 @@
 #include "DebugTapConnection.h"
 #include "..\TerminalSettingsModel\FileUtils.h"
 #include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
+#include "DesktopNotification.h"

 #include <shlobj.h>

@@ -150,6 +151,15 @@ namespace winrt::TerminalApp::implementation
            }
        });

+        // When a tab requests a desktop toast notification (OutputNotificationStyle::Notification),
+        // send the toast and handle activation by summoning this window and switching to the tab.
+        newTabImpl->TabToastNotificationRequested([weakThis{ get_weak() }](const winrt::hstring& title, uint32_t tabIndex) {
+            if (const auto page{ weakThis.get() })
+            {
+                page->_SendDesktopNotification(title, tabIndex);
+            }
+        });
+
        auto tabViewItem = newTabImpl->TabViewItem();
        _tabView.TabItems().InsertAt(insertPosition, tabViewItem);

@@ -1185,4 +1195,56 @@ namespace winrt::TerminalApp::implementation
    {
        return _tabs.Size() > 1;
    }
+
+    // Method Description:
+    // - Sends a Windows desktop toast notification for a tab. When the user clicks
+    //   the toast, summon this window and switch to the specified tab.
+    // Arguments:
+    // - tabTitle: The title of the tab to display in the notification.
+    // - tabIndex: The index of the tab to switch to when the toast is activated.
+    void TerminalPage::_SendDesktopNotification(const winrt::hstring& tabTitle, uint32_t tabIndex)
+    {
+        // Build the notification message.
+        // Use the window name if available for context; otherwise just use the tab title.
+        // Use the raw WindowName (not WindowNameForDisplay) so we don't include
+        // the "<unnamed window>" placeholder in the notification body.
+        const auto windowName = _WindowProperties ? _WindowProperties.WindowName() : winrt::hstring{};
+        winrt::hstring message;
+        if (!windowName.empty())
+        {
+            message = RS_fmt(L"NotificationMessage_TabActivityInWindow", std::wstring_view{ tabTitle }, std::wstring_view{ windowName });
+        }
+        else
+        {
+            message = RS_fmt(L"NotificationMessage_TabActivity", std::wstring_view{ tabTitle });
+        }
+
+        implementation::DesktopNotificationArgs args;
+        args.Title = RS_(L"NotificationTitle");
+        args.Message = message;
+        args.TabIndex = tabIndex;
+
+        // Capture a weak ref and the dispatcher so we can marshal back to the UI thread
+        // when the toast is activated.
+        auto weakThis = get_weak();
+        auto dispatcher = Dispatcher();
+
+        implementation::DesktopNotification::SendNotification(
+            args,
+            [weakThis, dispatcher, tabIndex](uint32_t /*activatedTabIndex*/) -> void {
+                // The toast Activated callback fires on a background thread.
+                // We need to dispatch to the UI thread to summon the window and switch tabs.
+                [](auto weakThis, auto dispatcher, auto tabIndex) -> safe_void_coroutine {
+                    co_await wil::resume_foreground(dispatcher);
+                    if (const auto page{ weakThis.get() })
+                    {
+                        // Summon this window (bring to foreground)
+                        page->SummonWindowRequested.raise(nullptr, nullptr);
+
+                        // Switch to the tab that triggered the notification
+                        page->_SelectTab(tabIndex);
+                    }
+                }(weakThis, dispatcher, tabIndex);
+            });
+    }
 }
--- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
+++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
@@ -173,6 +173,7 @@
    <ClInclude Include="SettingsPaneContent.h">
      <DependentUpon>TerminalPaneContent.idl</DependentUpon>
    </ClInclude>
+    <ClInclude Include="DesktopNotification.h" />
    <ClInclude Include="Toast.h" />
    <ClInclude Include="TerminalSettingsCache.h" />
    <ClInclude Include="SuggestionsControl.h">
@@ -286,6 +287,7 @@
      <DependentUpon>TerminalPaneContent.idl</DependentUpon>
    </ClCompile>
    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
+    <ClCompile Include="DesktopNotification.cpp" />
    <ClCompile Include="Toast.cpp" />
    <ClCompile Include="TerminalSettingsCache.cpp" />
    <ClCompile Include="SuggestionsControl.cpp">
--- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters
+++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters
@@ -30,6 +30,7 @@
    <ClCompile Include="fzf/fzf.cpp">
      <Filter>fzf</Filter>
    </ClCompile>
+    <ClCompile Include="DesktopNotification.cpp" />
    <ClCompile Include="Toast.cpp" />
    <ClCompile Include="LanguageProfileNotifier.cpp" />
    <ClCompile Include="TerminalSettingsCache.cpp" />
@@ -58,6 +59,7 @@
    <ClInclude Include="fzf/fzf.h">
      <Filter>fzf</Filter>
    </ClInclude>
+    <ClInclude Include="DesktopNotification.h" />
    <ClInclude Include="Toast.h" />
    <ClInclude Include="LanguageProfileNotifier.h" />
    <ClInclude Include="WindowsPackageManagerFactory.h" />
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -2791,15 +2791,14 @@ namespace winrt::TerminalApp::implementation
    // Arguments:
    // - direction: The direction to move the separator in.
    // Return Value:
-    // - whether a pane was resized
-    bool TerminalPage::_ResizePane(const ResizeDirection& direction)
+    // - <none>
+    void TerminalPage::_ResizePane(const ResizeDirection& direction)
    {
        if (const auto tabImpl{ _GetFocusedTabImpl() })
        {
            _UnZoomIfNeeded();
-            return tabImpl->ResizePane(direction);
+            tabImpl->ResizePane(direction);
        }
-        return false;
    }

    // Method Description:
@@ -2974,11 +2973,7 @@ namespace winrt::TerminalApp::implementation
            text = winrt::hstring{ Utils::TrimPaste(text) };
        }

-        // LOAD BEARING: Send an empty bracketed paste even if the clipboard was empty.
-        // Bracketed Paste provides an application a way to know whether the
-        // user pasted, even if there was no applicable content on it. This
-        // behavior is observed in GNOME Terminal, among others.
-        if (!bracketedPaste && text.empty())
+        if (text.empty())
        {
            co_return;
        }
@@ -3087,42 +3082,18 @@ namespace winrt::TerminalApp::implementation
    }
    CATCH_LOG();

-    safe_void_coroutine TerminalPage::_OpenHyperlinkHandler(const IInspectable /*sender*/, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs)
+    void TerminalPage::_OpenHyperlinkHandler(const IInspectable /*sender*/, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs)
    {
        try
        {
-            auto uriString{ eventArgs.Uri() };
-            auto parsed = winrt::Windows::Foundation::Uri(uriString);
+            auto parsed = winrt::Windows::Foundation::Uri(eventArgs.Uri());
            if (_IsUriSupported(parsed))
            {
-                bool shouldLaunch{ _IsUriConsideredSomewhatSafe(parsed) };
-
-                if (!shouldLaunch)
-                {
-                    if (auto presenter{ _dialogPresenter.get() })
-                    {
-                        // FindName needs to be called first to actually load the xaml object
-                        auto unopenedUriDialog = FindName(L"UriErrorDialog").try_as<WUX::Controls::ContentDialog>();
-
-                        // Insert the reason and the URI
-                        unopenedUriDialog.SecondaryButtonText(RS_(L"UnsafeUrlConfirmAllowAction"));
-                        CouldNotOpenUriReason().Text(RS_(L"UnsafeUrlConfirmText"));
-                        UnopenedUri().Text(uriString);
-
-                        // Show the dialog
-                        auto result = co_await presenter.ShowDialog(unopenedUriDialog);
-                        shouldLaunch = result == ContentDialogResult::Secondary;
-                    }
-                }
-
-                if (shouldLaunch)
-                {
-                    ShellExecuteW(nullptr, L"open", uriString.c_str(), nullptr, nullptr, SW_SHOWNORMAL);
-                }
+                ShellExecute(nullptr, L"open", eventArgs.Uri().c_str(), nullptr, nullptr, SW_SHOWNORMAL);
            }
            else
            {
-                _ShowCouldNotOpenDialog(RS_(L"UnsupportedSchemeText"), uriString);
+                _ShowCouldNotOpenDialog(RS_(L"UnsupportedSchemeText"), eventArgs.Uri());
            }
        }
        catch (...)
@@ -3142,10 +3113,9 @@ namespace winrt::TerminalApp::implementation
        if (auto presenter{ _dialogPresenter.get() })
        {
            // FindName needs to be called first to actually load the xaml object
-            auto unopenedUriDialog = FindName(L"UriErrorDialog").try_as<WUX::Controls::ContentDialog>();
+            auto unopenedUriDialog = FindName(L"CouldNotOpenUriDialog").try_as<WUX::Controls::ContentDialog>();

            // Insert the reason and the URI
-            unopenedUriDialog.SecondaryButtonText({});
            CouldNotOpenUriReason().Text(reason);
            UnopenedUri().Text(uri);

@@ -3198,42 +3168,6 @@ namespace winrt::TerminalApp::implementation
        return true;
    }

-    bool TerminalPage::_IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri) const
-    {
-        const auto& schemeName = parsedUri.SchemeName();
-
-        if (schemeName == L"http" || schemeName == L"https")
-        {
-            return true;
-        }
-        if (schemeName == L"file")
-        {
-            static const auto pathext{ wil::TryGetEnvironmentVariableW<std::wstring>(L"PATHEXT") };
-            const auto filename = parsedUri.Path();
-            for (const auto& e : til::split_iterator{ std::wstring_view{ pathext }, L';' })
-            {
-                if (til::ends_with_insensitive_ascii(filename, e))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-        if (const auto& safeSchemes = _settings.GlobalSettings().SafeUriSchemes())
-        {
-            for (const auto& scheme : safeSchemes)
-            {
-                if (til::equals_insensitive_ascii(schemeName, scheme))
-                {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
    // Important! Don't take this eventArgs by reference, we need to extend the
    // lifetime of it to the other side of the co_await!
    safe_void_coroutine TerminalPage::_ControlNoticeRaisedHandler(const IInspectable /*sender*/,
@@ -3808,13 +3742,7 @@ namespace winrt::TerminalApp::implementation
        // for nulls
        if (const auto& connection{ _duplicateConnectionForRestart(paneContent) })
        {
-            // Reset the terminal's VT state before attaching the new connection.
-            // The previous client may have left dirty modes (e.g., bracketed
-            // paste, mouse tracking, alternate buffer, kitty keyboard) that
-            // would corrupt input/output for the new shell process.
-            const auto& termControl = paneContent.GetTermControl();
-            termControl.HardResetWithoutErase();
-            termControl.Connection(connection);
+            paneContent.GetTermControl().Connection(connection);
            connection.Start();
        }
    }
--- a/src/cascadia/TerminalApp/TerminalPage.h
+++ b/src/cascadia/TerminalApp/TerminalPage.h
@@ -412,7 +412,7 @@ namespace winrt::TerminalApp::implementation
                        const Microsoft::Terminal::Settings::Model::SplitDirection splitType,
                        const float splitSize,
                        std::shared_ptr<Pane> newPane);
-        bool _ResizePane(const Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
+        void _ResizePane(const Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
        void _ToggleSplitOrientation();

        void _ScrollPage(ScrollDirection scrollDirection);
@@ -422,9 +422,8 @@ namespace winrt::TerminalApp::implementation
        safe_void_coroutine _PasteFromClipboardHandler(const IInspectable sender,
                                                       const Microsoft::Terminal::Control::PasteFromClipboardEventArgs eventArgs);

-        safe_void_coroutine _OpenHyperlinkHandler(const IInspectable sender, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs);
-        static bool _IsUriSupported(const winrt::Windows::Foundation::Uri& parsedUri);
-        bool _IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri) const;
+        void _OpenHyperlinkHandler(const IInspectable sender, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs);
+        bool _IsUriSupported(const winrt::Windows::Foundation::Uri& parsedUri);

        void _ShowCouldNotOpenDialog(winrt::hstring reason, winrt::hstring uri);
        bool _CopyText(bool dismissSelection, bool singleLine, bool withControlSequences, Microsoft::Terminal::Control::CopyFormat formats);
@@ -571,6 +570,8 @@ namespace winrt::TerminalApp::implementation
        void _activePaneChanged(winrt::TerminalApp::Tab tab, Windows::Foundation::IInspectable args);
        safe_void_coroutine _doHandleSuggestions(Microsoft::Terminal::Settings::Model::SuggestionsArgs realArgs);

+        void _SendDesktopNotification(const winrt::hstring& tabTitle, uint32_t tabIndex);
+
 #pragma region ActionHandlers
        // These are all defined in AppActionHandlers.cpp
 #define ON_ALL_ACTIONS(action) DECLARE_ACTION_HANDLER(action);
--- a/src/cascadia/TerminalApp/TerminalPage.xaml
+++ b/src/cascadia/TerminalApp/TerminalPage.xaml
@@ -144,17 +144,17 @@
            </TextBlock>
        </ContentDialog>

-        <ContentDialog x:Name="UriErrorDialog"
-                       x:Uid="UriErrorDialog"
+        <ContentDialog x:Name="CouldNotOpenUriDialog"
+                       x:Uid="CouldNotOpenUriDialog"
                       Grid.Row="2"
                       x:Load="False"
-                       DefaultButton="Close">
+                       DefaultButton="Primary">
            <TextBlock IsTextSelectionEnabled="True"
                       TextWrapping="WrapWholeWords">
                <TextBlock.ContextFlyout>
                    <mtu:TextMenuFlyout />
                </TextBlock.ContextFlyout>
-                <Run x:Name="CouldNotOpenUriReason" /> <LineBreak /> <LineBreak />
+                <Run x:Name="CouldNotOpenUriReason" /> <LineBreak />
                <Run x:Name="UnopenedUri"
                     FontFamily="Cascadia Mono" />
            </TextBlock>
--- a/src/cascadia/TerminalApp/TerminalPaneContent.cpp
+++ b/src/cascadia/TerminalApp/TerminalPaneContent.cpp
@@ -10,6 +10,7 @@
 #include "../../types/inc/utils.hpp"

 #include "BellEventArgs.g.cpp"
+#include "NotificationEventArgs.g.cpp"
 #include "TerminalPaneContent.g.cpp"

 using namespace winrt::Windows::Foundation;
@@ -34,8 +35,11 @@ namespace winrt::TerminalApp::implementation
    {
        _controlEvents._ConnectionStateChanged = _control.ConnectionStateChanged(winrt::auto_revoke, { this, &TerminalPaneContent::_controlConnectionStateChangedHandler });
        _controlEvents._WarningBell = _control.WarningBell(winrt::auto_revoke, { get_weak(), &TerminalPaneContent::_controlWarningBellHandler });
+        _controlEvents._PromptStarted = _control.PromptStarted(winrt::auto_revoke, { get_weak(), &TerminalPaneContent::_controlPromptStartedHandler });
+        _controlEvents._OutputStarted = _control.OutputStarted(winrt::auto_revoke, { get_weak(), &TerminalPaneContent::_controlOutputStartedHandler });
        _controlEvents._CloseTerminalRequested = _control.CloseTerminalRequested(winrt::auto_revoke, { get_weak(), &TerminalPaneContent::_closeTerminalRequestedHandler });
        _controlEvents._RestartTerminalRequested = _control.RestartTerminalRequested(winrt::auto_revoke, { get_weak(), &TerminalPaneContent::_restartTerminalRequestedHandler });
+        _controlEvents._OutputIdle = _control.OutputIdle(winrt::auto_revoke, { get_weak(), &TerminalPaneContent::_controlOutputIdleHandler });

        _controlEvents._TitleChanged = _control.TitleChanged(winrt::auto_revoke, { get_weak(), &TerminalPaneContent::_controlTitleChanged });
        _controlEvents._TabColorChanged = _control.TabColorChanged(winrt::auto_revoke, { get_weak(), &TerminalPaneContent::_controlTabColorChanged });
@@ -261,6 +265,30 @@ namespace winrt::TerminalApp::implementation
    //   has the 'visual' flag set
    // Arguments:
    // - <unused>
+    // Method Description:
+    // - Plays the notification sound using the profile's BellSound setting if
+    //   configured; otherwise falls back to the system "Critical Stop" sound.
+    //   Reused by the warning bell handler, NotifyOnNextPrompt, and
+    //   NotifyOnInactiveOutput (called from Tab after the active-pane check).
+    void TerminalPaneContent::PlayNotificationSound()
+    {
+        if (_profile)
+        {
+            auto sounds{ _profile.BellSound() };
+            if (sounds && sounds.Size() > 0)
+            {
+                winrt::hstring soundPath{ sounds.GetAt(rand() % sounds.Size()).Resolved() };
+                winrt::Windows::Foundation::Uri uri{ soundPath };
+                _playBellSound(uri);
+            }
+            else
+            {
+                const auto soundAlias = reinterpret_cast<LPCTSTR>(SND_ALIAS_SYSTEMHAND);
+                PlaySound(soundAlias, NULL, SND_ALIAS_ID | SND_ASYNC | SND_SENTRY);
+            }
+        }
+    }
+
    void TerminalPaneContent::_controlWarningBellHandler(const winrt::Windows::Foundation::IInspectable& /*sender*/,
                                                         const winrt::Windows::Foundation::IInspectable& /*eventArgs*/)
    {
@@ -271,19 +299,7 @@ namespace winrt::TerminalApp::implementation
            {
                if (WI_IsFlagSet(_profile.BellStyle(), winrt::Microsoft::Terminal::Settings::Model::BellStyle::Audible))
                {
-                    // Audible is set, play the sound
-                    auto sounds{ _profile.BellSound() };
-                    if (sounds && sounds.Size() > 0)
-                    {
-                        winrt::hstring soundPath{ sounds.GetAt(rand() % sounds.Size()).Resolved() };
-                        winrt::Windows::Foundation::Uri uri{ soundPath };
-                        _playBellSound(uri);
-                    }
-                    else
-                    {
-                        const auto soundAlias = reinterpret_cast<LPCTSTR>(SND_ALIAS_SYSTEMHAND);
-                        PlaySound(soundAlias, NULL, SND_ALIAS_ID | SND_ASYNC | SND_SENTRY);
-                    }
+                    PlayNotificationSound();
                }

                if (WI_IsFlagSet(_profile.BellStyle(), winrt::Microsoft::Terminal::Settings::Model::BellStyle::Window))
@@ -298,6 +314,107 @@ namespace winrt::TerminalApp::implementation
        }
    }

+    // Method Description:
+    // - Returns the taskbar state, accounting for auto-detected running command progress.
+    //   VT-set progress (OSC 9;4) takes precedence over auto-detected progress.
+    uint64_t TerminalPaneContent::TaskbarState()
+    {
+        const auto vtState = _control.TaskbarState();
+        // VT-set progress takes precedence over auto-detected progress
+        if (vtState != 0)
+        {
+            return vtState;
+        }
+        // Auto-detected indeterminate progress (between command start and prompt return)
+        if (_autoDetectActive)
+        {
+            return 3; // TaskbarState::Indeterminate
+        }
+        return 0;
+    }
+
+    // Method Description:
+    // - Returns the taskbar progress, accounting for auto-detected running command progress.
+    uint64_t TerminalPaneContent::TaskbarProgress()
+    {
+        const auto vtState = _control.TaskbarState();
+        // VT-set progress takes precedence
+        if (vtState != 0)
+        {
+            return _control.TaskbarProgress();
+        }
+        return 0;
+    }
+
+    // Method Description:
+    // - Raised when a shell integration prompt mark (133;A) is received, indicating
+    //   the command has finished and we're back at a prompt.
+    // - Checks NotifyOnNextPrompt setting and raises NotificationRequested.
+    // - If autoDetectRunningCommand is enabled, clears the indeterminate progress ring.
+    void TerminalPaneContent::_controlPromptStartedHandler(const winrt::Windows::Foundation::IInspectable& /*sender*/,
+                                                           const winrt::Windows::Foundation::IInspectable& /*eventArgs*/)
+    {
+        if (_profile)
+        {
+            // Check NotifyOnNextPrompt setting and raise a notification.
+            // Pass OnlyWhenInactive=true so Tab suppresses notifications when
+            // this pane is active in a focused tab.
+            const auto notifyStyle = _profile.NotifyOnNextPrompt();
+            if (static_cast<int>(notifyStyle) != 0)
+            {
+                NotificationRequested.raise(*this,
+                                            *winrt::make_self<TerminalApp::implementation::NotificationEventArgs>(notifyStyle, true));
+            }
+
+            // If autoDetectRunningCommand is enabled, clear the progress ring
+            const auto autoDetect = _profile.AutoDetectRunningCommand();
+            if (autoDetect != AutoDetectRunningCommand::Disabled && _autoDetectActive)
+            {
+                _autoDetectActive = false;
+                TaskbarProgressChanged.raise(*this, nullptr);
+            }
+        }
+    }
+
+    // Method Description:
+    // - Raised when a shell integration command output mark (133;C) is received,
+    //   indicating a command has started executing.
+    // - If autoDetectRunningCommand is enabled, shows an indeterminate progress ring.
+    void TerminalPaneContent::_controlOutputStartedHandler(const winrt::Windows::Foundation::IInspectable& /*sender*/,
+                                                           const winrt::Windows::Foundation::IInspectable& /*eventArgs*/)
+    {
+        if (_profile)
+        {
+            const auto autoDetect = _profile.AutoDetectRunningCommand();
+            if (autoDetect != AutoDetectRunningCommand::Disabled && !_autoDetectActive)
+            {
+                _autoDetectActive = true;
+                TaskbarProgressChanged.raise(*this, nullptr);
+            }
+        }
+    }
+
+    // Method Description:
+    // - Raised when output stops being produced for ~100ms (debounced).
+    //   Used to detect output in inactive panes for NotifyOnInactiveOutput.
+    // - Raises NotificationRequested so Tab can show activity indicators.
+    void TerminalPaneContent::_controlOutputIdleHandler(const winrt::Windows::Foundation::IInspectable& /*sender*/,
+                                                        const winrt::Windows::Foundation::IInspectable& /*eventArgs*/)
+    {
+        if (_profile)
+        {
+            const auto notifyStyle = _profile.NotifyOnInactiveOutput();
+            if (static_cast<int>(notifyStyle) != 0)
+            {
+                // Raise NotificationRequested so Tab can handle Taskbar/Tab/Audible flags.
+                // Pass OnlyWhenInactive=true so Tab skips notifications for the active pane.
+                // Note: Audible is handled by Tab (not here) so it can be gated on active state.
+                NotificationRequested.raise(*this,
+                                            *winrt::make_self<TerminalApp::implementation::NotificationEventArgs>(notifyStyle, true));
+            }
+        }
+    }
+
    safe_void_coroutine TerminalPaneContent::_playBellSound(winrt::Windows::Foundation::Uri uri)
    {
        auto weakThis{ get_weak() };
--- a/src/cascadia/TerminalApp/TerminalPaneContent.h
+++ b/src/cascadia/TerminalApp/TerminalPaneContent.h
@@ -4,6 +4,7 @@
 #pragma once
 #include "TerminalPaneContent.g.h"
 #include "BellEventArgs.g.h"
+#include "NotificationEventArgs.g.h"
 #include "BasicPaneEvents.h"

 namespace winrt::TerminalApp::implementation
@@ -19,6 +20,16 @@ namespace winrt::TerminalApp::implementation
        til::property<bool> FlashTaskbar;
    };

+    struct NotificationEventArgs : public NotificationEventArgsT<NotificationEventArgs>
+    {
+    public:
+        NotificationEventArgs(winrt::Microsoft::Terminal::Control::OutputNotificationStyle style, bool onlyWhenInactive = false) :
+            Style(style), OnlyWhenInactive(onlyWhenInactive) {}
+
+        til::property<winrt::Microsoft::Terminal::Control::OutputNotificationStyle> Style;
+        til::property<bool> OnlyWhenInactive;
+    };
+
    struct TerminalPaneContent : TerminalPaneContentT<TerminalPaneContent>, BasicPaneEvents
    {
        TerminalPaneContent(const winrt::Microsoft::Terminal::Settings::Model::Profile& profile,
@@ -36,6 +47,7 @@ namespace winrt::TerminalApp::implementation
        void UpdateSettings(const winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings& settings);

        void MarkAsDefterm();
+        void PlayNotificationSound();

        winrt::Microsoft::Terminal::Settings::Model::Profile GetProfile() const
        {
@@ -43,8 +55,8 @@ namespace winrt::TerminalApp::implementation
        }

        winrt::hstring Title() { return _control.Title(); }
-        uint64_t TaskbarState() { return _control.TaskbarState(); }
-        uint64_t TaskbarProgress() { return _control.TaskbarProgress(); }
+        uint64_t TaskbarState();
+        uint64_t TaskbarProgress();
        bool ReadOnly() { return _control.ReadOnly(); }
        winrt::hstring Icon() const;
        Windows::Foundation::IReference<winrt::Windows::UI::Color> TabColor() const noexcept;
@@ -66,11 +78,15 @@ namespace winrt::TerminalApp::implementation

        winrt::Windows::Media::Playback::MediaPlayer _bellPlayer{ nullptr };
        bool _bellPlayerCreated{ false };
+        std::atomic<bool> _autoDetectActive{ false };

        struct ControlEventTokens
        {
            winrt::Microsoft::Terminal::Control::TermControl::ConnectionStateChanged_revoker _ConnectionStateChanged;
            winrt::Microsoft::Terminal::Control::TermControl::WarningBell_revoker _WarningBell;
+            winrt::Microsoft::Terminal::Control::TermControl::PromptStarted_revoker _PromptStarted;
+            winrt::Microsoft::Terminal::Control::TermControl::OutputStarted_revoker _OutputStarted;
+            winrt::Microsoft::Terminal::Control::TermControl::OutputIdle_revoker _OutputIdle;
            winrt::Microsoft::Terminal::Control::TermControl::CloseTerminalRequested_revoker _CloseTerminalRequested;
            winrt::Microsoft::Terminal::Control::TermControl::RestartTerminalRequested_revoker _RestartTerminalRequested;

@@ -89,6 +105,12 @@ namespace winrt::TerminalApp::implementation
        safe_void_coroutine _controlConnectionStateChangedHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& /*args*/);
        void _controlWarningBellHandler(const winrt::Windows::Foundation::IInspectable& sender,
                                        const winrt::Windows::Foundation::IInspectable& e);
+        void _controlPromptStartedHandler(const winrt::Windows::Foundation::IInspectable& sender,
+                                          const winrt::Windows::Foundation::IInspectable& e);
+        void _controlOutputStartedHandler(const winrt::Windows::Foundation::IInspectable& sender,
+                                          const winrt::Windows::Foundation::IInspectable& e);
+        void _controlOutputIdleHandler(const winrt::Windows::Foundation::IInspectable& sender,
+                                       const winrt::Windows::Foundation::IInspectable& e);
        void _controlReadOnlyChangedHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& e);

        void _controlTitleChanged(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args);
--- a/src/cascadia/TerminalApp/TerminalPaneContent.idl
+++ b/src/cascadia/TerminalApp/TerminalPaneContent.idl
@@ -11,6 +11,7 @@ namespace TerminalApp
        Microsoft.Terminal.Control.TermControl GetTermControl();

        void MarkAsDefterm();
+        void PlayNotificationSound();

        Microsoft.Terminal.Settings.Model.Profile GetProfile();

--- a/src/cascadia/TerminalApp/TerminalTabStatus.h
+++ b/src/cascadia/TerminalApp/TerminalTabStatus.h
@@ -17,6 +17,7 @@ namespace winrt::TerminalApp::implementation
        WINRT_OBSERVABLE_PROPERTY(bool, IsProgressRingActive, PropertyChanged.raise);
        WINRT_OBSERVABLE_PROPERTY(bool, IsProgressRingIndeterminate, PropertyChanged.raise);
        WINRT_OBSERVABLE_PROPERTY(bool, BellIndicator, PropertyChanged.raise);
+        WINRT_OBSERVABLE_PROPERTY(bool, ActivityIndicator, PropertyChanged.raise);
        WINRT_OBSERVABLE_PROPERTY(bool, IsReadOnlyActive, PropertyChanged.raise);
        WINRT_OBSERVABLE_PROPERTY(uint32_t, ProgressValue, PropertyChanged.raise);
        WINRT_OBSERVABLE_PROPERTY(bool, IsInputBroadcastActive, PropertyChanged.raise);
--- a/src/cascadia/TerminalApp/TerminalTabStatus.idl
+++ b/src/cascadia/TerminalApp/TerminalTabStatus.idl
@@ -12,6 +12,7 @@ namespace TerminalApp
        Boolean IsProgressRingActive { get; set; };
        Boolean IsProgressRingIndeterminate { get; set; };
        Boolean BellIndicator { get; set; };
+        Boolean ActivityIndicator { get; set; };
        UInt32 ProgressValue { get; set; };
        Boolean IsReadOnlyActive { get; set; };
        Boolean IsInputBroadcastActive { get; set; };
--- a/src/cascadia/TerminalApp/pch.h
+++ b/src/cascadia/TerminalApp/pch.h
@@ -54,6 +54,9 @@
 #include <winrt/Windows.Media.Playback.h>
 #include <winrt/Windows.Management.Deployment.h>

+#include <winrt/Windows.UI.Notifications.h>
+#include <winrt/Windows.Data.Xml.Dom.h>
+
 #include <winrt/Microsoft.UI.Xaml.Controls.h>
 #include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
 #include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
--- a/src/cascadia/TerminalControl/ControlCore.cpp
+++ b/src/cascadia/TerminalControl/ControlCore.cpp
@@ -118,6 +118,12 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        auto pfnWarningBell = [this] { _terminalWarningBell(); };
        _terminal->SetWarningBellCallback(pfnWarningBell);

+        auto pfnPromptStarted = [this] { _terminalPromptStarted(); };
+        _terminal->SetPromptStartedCallback(pfnPromptStarted);
+
+        auto pfnOutputStarted = [this] { _terminalOutputStarted(); };
+        _terminal->SetOutputStartedCallback(pfnOutputStarted);
+
        auto pfnTitleChanged = [this](auto&& PH1) { _terminalTitleChanged(std::forward<decltype(PH1)>(PH1)); };
        _terminal->SetTitleChangedCallback(pfnTitleChanged);

@@ -355,12 +361,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        }
    }

-    void ControlCore::HardResetWithoutErase()
-    {
-        const auto lock = _terminal->LockForWriting();
-        _terminal->HardResetWithoutErase();
-    }
-
    bool ControlCore::Initialize(const float actualWidth,
                                 const float actualHeight,
                                 const float compositionScale)
@@ -1596,9 +1596,37 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        // Since this can only ever be triggered by output from the connection,
        // then the Terminal already has the write lock when calling this
        // callback.
+        if (_restoring)
+        {
+            return;
+        }
        WarningBell.raise(*this, nullptr);
    }

+    void ControlCore::_terminalPromptStarted()
+    {
+        // Since this can only ever be triggered by output from the connection,
+        // then the Terminal already has the write lock when calling this
+        // callback.
+        if (_restoring)
+        {
+            return;
+        }
+        PromptStarted.raise(*this, nullptr);
+    }
+
+    void ControlCore::_terminalOutputStarted()
+    {
+        // Since this can only ever be triggered by output from the connection,
+        // then the Terminal already has the write lock when calling this
+        // callback.
+        if (_restoring)
+        {
+            return;
+        }
+        OutputStarted.raise(*this, nullptr);
+    }
+
    // Method Description:
    // - Called for the Terminal's TitleChanged callback. This will re-raise
    //   a new winrt TypedEvent that can be listened to.
@@ -1656,6 +1684,10 @@ namespace winrt::Microsoft::Terminal::Control::implementation

    void ControlCore::_terminalTaskbarProgressChanged()
    {
+        if (_restoring)
+        {
+            return;
+        }
        TaskbarProgressChanged.raise(*this, nullptr);
    }

@@ -1673,6 +1705,10 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    // - duration - How long the note should be sustained (in microseconds).
    void ControlCore::_terminalPlayMidiNote(const int noteNumber, const int velocity, const std::chrono::microseconds duration)
    {
+        if (_restoring)
+        {
+            return;
+        }
        // The UI thread might try to acquire the console lock from time to time.
        // --> Unlock it, so the UI doesn't hang while we're busy.
        const auto suspension = _terminal->SuspendLock();
@@ -1845,8 +1881,15 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        _terminal->SerializeMainBuffer(handle);
    }

-    void ControlCore::RestoreFromPath(const wchar_t* path) const
+    void ControlCore::RestoreFromPath(const wchar_t* path)
    {
+        // Suppress notifications (bells, prompt-returned, command-started, etc.)
+        // while we replay persisted buffer content. Without this, restoring a
+        // session fires the same events that live output would, producing
+        // unwanted audible bells, tab activity indicators, and taskbar flashes.
+        _restoring = true;
+        const auto restoreComplete = wil::scope_exit([&] { _restoring = false; });
+
        wil::unique_handle file{ CreateFileW(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, nullptr) };

        // This block of code exists temporarily to fix buffer dumps that were
@@ -2081,10 +2124,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        //   the selection (we need to reset selection on double-click or
        //   triple-click, so it captures the word or the line, rather than
        //   extending the selection)
-        // - GH#9608: VT mouse mode is enabled. In this mode, Shift is used
-        //   to override mouse input, so Shift+Click should start a fresh
-        //   selection rather than extending the previous one.
-        if (_terminal->IsSelectionActive() && (!shiftEnabled || isOnOriginalPosition || _terminal->IsTrackingMouseInput()))
+        if (_terminal->IsSelectionActive() && (!shiftEnabled || isOnOriginalPosition))
        {
            // Reset the selection
            _terminal->ClearSelection();
--- a/src/cascadia/TerminalControl/ControlCore.h
+++ b/src/cascadia/TerminalControl/ControlCore.h
@@ -154,7 +154,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation

        void Close();
        void PersistTo(HANDLE handle) const;
-        void RestoreFromPath(const wchar_t* path) const;
+        void RestoreFromPath(const wchar_t* path);

        void ClearQuickFix();

@@ -257,7 +257,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation

        TerminalConnection::ITerminalConnection Connection();
        void Connection(const TerminalConnection::ITerminalConnection& connection);
-        void HardResetWithoutErase();

        void AnchorContextMenu(til::point viewportRelativeCharacterPosition);

@@ -277,6 +276,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        til::typed_event<IInspectable, Control::TitleChangedEventArgs> TitleChanged;
        til::typed_event<IInspectable, Control::WriteToClipboardEventArgs> WriteToClipboard;
        til::typed_event<> WarningBell;
+        til::typed_event<> PromptStarted;
+        til::typed_event<> OutputStarted;
        til::typed_event<> TabColorChanged;
        til::typed_event<> BackgroundColorChanged;
        til::typed_event<IInspectable, Control::ScrollPositionChangedArgs> ScrollPositionChanged;
@@ -325,6 +326,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation

 #pragma region TerminalCoreCallbacks
        void _terminalWarningBell();
+        void _terminalPromptStarted();
+        void _terminalOutputStarted();
        void _terminalTitleChanged(std::wstring_view wstr);
        void _terminalScrollPositionChanged(const int viewTop,
                                            const int viewHeight,
@@ -421,6 +424,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        std::optional<til::point> _lastHoveredCell;
        uint16_t _lastHoveredId{ 0 };
        std::atomic<bool> _initializedTerminal{ false };
+        std::atomic<bool> _restoring{ false };
        bool _isReadOnly{ false };
        bool _closing{ false };

--- a/src/cascadia/TerminalControl/ControlCore.idl
+++ b/src/cascadia/TerminalControl/ControlCore.idl
@@ -98,7 +98,6 @@ namespace Microsoft.Terminal.Control
        void ApplyAppearance(Boolean focused);

        Microsoft.Terminal.TerminalConnection.ITerminalConnection Connection;
-        void HardResetWithoutErase();

        IControlSettings Settings { get; };
        IControlAppearance FocusedAppearance { get; };
@@ -192,6 +191,8 @@ namespace Microsoft.Terminal.Control
        event Windows.Foundation.TypedEventHandler<Object, TitleChangedEventArgs> TitleChanged;
        event Windows.Foundation.TypedEventHandler<Object, WriteToClipboardEventArgs> WriteToClipboard;
        event Windows.Foundation.TypedEventHandler<Object, Object> WarningBell;
+        event Windows.Foundation.TypedEventHandler<Object, Object> PromptStarted;
+        event Windows.Foundation.TypedEventHandler<Object, Object> OutputStarted;
        event Windows.Foundation.TypedEventHandler<Object, Object> TabColorChanged;
        event Windows.Foundation.TypedEventHandler<Object, Object> BackgroundColorChanged;
        event Windows.Foundation.TypedEventHandler<Object, Object> TaskbarProgressChanged;
--- a/src/cascadia/TerminalControl/ControlInteractivity.cpp
+++ b/src/cascadia/TerminalControl/ControlInteractivity.cpp
@@ -54,20 +54,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                self->Attached.raise(*self, nullptr);
            }
        });
-
-        // GH#14464: Mark mode and quick-edit (shift+arrow) selections update
-        // the selection through ControlCore, bypassing SetEndSelectionPoint.
-        // Listen for selection changes so _selectionNeedsToBeCopied is set
-        // for ALL selection types, not just mouse drag.
-        _core->UpdateSelectionMarkers([weakThis = get_weak()](auto&&, auto&&) {
-            if (auto self{ weakThis.get() })
-            {
-                if (self->_core->HasSelection())
-                {
-                    self->_selectionNeedsToBeCopied = true;
-                }
-            }
-        });
    }

    uint64_t ControlInteractivity::Id()
@@ -299,12 +285,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
            }
            const auto isOnOriginalPosition = _lastMouseClickPosNoSelection == pixelPosition;

-            // Rounded coordinates for text selection.
-            // Don't round in VT mouse mode; cell-level precision matters more.
-            // Only round for single-click: for double/triple-click, rounding
-            // can push the position to the next cell, selecting the wrong word.
-            const auto round = multiClickMapper == 1 && !_core->IsVtMouseModeEnabled();
-            _core->LeftClickOnTerminal(_getTerminalPosition(til::point{ pixelPosition }, round),
+            // Rounded coordinates for text selection
+            _core->LeftClickOnTerminal(_getTerminalPosition(til::point{ pixelPosition }, true),
                                       multiClickMapper,
                                       altEnabled,
                                       shiftEnabled,
@@ -314,15 +296,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
            if (_core->HasSelection())
            {
                // GH#9787: if selection is active we don't want to track the touchdown position
-                // so that dragging the mouse will extend the selection rather than starting the new one.
-                // In VT mouse mode, keep tracking the touchdown point so that PointerMoved
-                // can re-anchor the selection based on drag direction (the dx < 0 adjustment).
-                // Without this, dragging left wouldn't include the initially clicked cell
-                // because floored coordinates place the anchor on the cell's left edge.
-                if (!_core->IsVtMouseModeEnabled())
-                {
-                    _singleClickTouchdownPos = std::nullopt;
-                }
+                // so that dragging the mouse will extend the selection rather than starting the new one
+                _singleClickTouchdownPos = std::nullopt;
            }
        }
        else if (WI_IsFlagSet(buttonState, MouseButtonState::IsRightButtonDown))
@@ -339,18 +314,13 @@ namespace winrt::Microsoft::Terminal::Control::implementation
            }
            else
            {
-                // GH#19942, GH#14464: Don't re-copy a selection that was
-                // already copied via copyOnSelect on mouse-up. But DO copy
-                // if the selection was made via mark mode or modified with
-                // quick-edit keys (shift+arrow), since those paths never
-                // triggered an automatic copy.
-                const auto copied = (_selectionNeedsToBeCopied || !_core->CopyOnSelect()) &&
-                                    CopySelectionToClipboard(shiftEnabled, false, _core->Settings().CopyFormatting());
+                // Try to copy the text and clear the selection
+                const auto successfulCopy = CopySelectionToClipboard(shiftEnabled, false, _core->Settings().CopyFormatting());
                _core->ClearSelection();
-                if (_core->CopyOnSelect() || !copied)
+                if (_core->CopyOnSelect() || !successfulCopy)
                {
-                    // CopyOnSelect: right-click always pastes.
-                    // Otherwise: no selection → paste.
+                    // CopyOnSelect: right click always pastes!
+                    // Otherwise: no selection --> paste
                    RequestPasteTextFromClipboard();
                }
            }
@@ -712,9 +682,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    // - cursorPosition: in pixels, relative to the origin of the control
    void ControlInteractivity::SetEndSelectionPoint(const Core::Point pixelPosition)
    {
-        // Don't round in VT mouse mode; cell-level precision matters more
-        const auto round = !_core->IsVtMouseModeEnabled();
-        _core->SetEndSelectionPoint(_getTerminalPosition(til::point{ pixelPosition }, round));
+        _core->SetEndSelectionPoint(_getTerminalPosition(til::point{ pixelPosition }, true));
        _selectionNeedsToBeCopied = true;
    }

--- a/src/cascadia/TerminalControl/IControlSettings.idl
+++ b/src/cascadia/TerminalControl/IControlSettings.idl
@@ -29,6 +29,23 @@ namespace Microsoft.Terminal.Control
        MinGW,
    };

+    [flags]
+    enum OutputNotificationStyle
+    {
+        Taskbar = 0x1,
+        Audible = 0x2,
+        Tab = 0x4,
+        Notification = 0x8,
+        All = 0xffffffff
+    };
+
+    enum AutoDetectRunningCommand
+    {
+        Disabled,
+        Automatic,
+        Progress
+    };
+
    // Class Description:
    // TerminalSettings encapsulates all settings that control the
    //      TermControl's behavior. In these settings there is both the entirety
@@ -77,6 +94,10 @@ namespace Microsoft.Terminal.Control

        PathTranslationStyle PathTranslationStyle { get; };

+        OutputNotificationStyle NotifyOnInactiveOutput { get; };
+        OutputNotificationStyle NotifyOnNextPrompt { get; };
+        AutoDetectRunningCommand AutoDetectRunningCommand { get; };
+
        // NOTE! When adding something here, make sure to update ControlProperties.h too!
    };
 }
--- a/src/cascadia/TerminalControl/InteractivityAutomationPeer.cpp
+++ b/src/cascadia/TerminalControl/InteractivityAutomationPeer.cpp
@@ -49,10 +49,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation

    void InteractivityAutomationPeer::ParentProvider(AutomationPeer parentProvider)
    {
-        // LOAD-BEARING: use _parentProvider->ProviderFromPeer(_parentProvider) instead of this->ProviderFromPeer(*this).
-        // Since we split the automation peer into TermControlAutomationPeer and InteractivityAutomationPeer,
-        // using "this" returns null. This can cause issues with some UIA Client scenarios like any navigation in Narrator.
-        _parentProvider = parentProvider ? parentProvider.as<IAutomationPeerProtected>().ProviderFromPeer(parentProvider) : nullptr;
+        _parentProvider = parentProvider;
    }

    // Method Description:
@@ -184,11 +181,15 @@ namespace winrt::Microsoft::Terminal::Control::implementation

    XamlAutomation::ITextRangeProvider InteractivityAutomationPeer::_CreateXamlUiaTextRange(UIA::ITextRangeProvider* returnVal) const
    {
-        if (!_parentProvider)
+        // LOAD-BEARING: use _parentProvider->ProviderFromPeer(_parentProvider) instead of this->ProviderFromPeer(*this).
+        // Since we split the automation peer into TermControlAutomationPeer and InteractivityAutomationPeer,
+        // using "this" returns null. This can cause issues with some UIA Client scenarios like any navigation in Narrator.
+        const auto parent{ _parentProvider.get() };
+        if (!parent)
        {
            return nullptr;
        }
-        const auto xutr = winrt::make_self<XamlUiaTextRange>(returnVal, _parentProvider);
+        const auto xutr = winrt::make_self<XamlUiaTextRange>(returnVal, parent.as<IAutomationPeerProtected>().ProviderFromPeer(parent));
        return xutr.as<XamlAutomation::ITextRangeProvider>();
    };

@@ -200,24 +201,22 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    // - com_array of Xaml Wrapped UiaTextRange (ITextRangeProviders)
    com_array<XamlAutomation::ITextRangeProvider> InteractivityAutomationPeer::WrapArrayOfTextRangeProviders(SAFEARRAY* textRanges)
    {
-        if (!_parentProvider)
-        {
-            return {};
-        }
-
        // transfer ownership of UiaTextRanges to this new vector
        auto providers = SafeArrayToOwningVector<::Microsoft::Terminal::TermControlUiaTextRange>(textRanges);
-        const auto len = gsl::narrow<uint32_t>(providers.size());
-        com_array<XamlAutomation::ITextRangeProvider> result{ len };
+        auto count = gsl::narrow<int>(providers.size());

-        for (uint32_t i = 0; i < len; ++i)
+        std::vector<XamlAutomation::ITextRangeProvider> vec;
+        vec.reserve(count);
+        for (auto i = 0; i < count; i++)
        {
            if (auto xutr = _CreateXamlUiaTextRange(providers[i].detach()))
            {
-                result[i] = std::move(xutr);
+                vec.emplace_back(std::move(xutr));
            }
        }

+        com_array<XamlAutomation::ITextRangeProvider> result{ vec };
+
        return result;
    }
 }
--- a/src/cascadia/TerminalControl/InteractivityAutomationPeer.h
+++ b/src/cascadia/TerminalControl/InteractivityAutomationPeer.h
@@ -80,7 +80,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation

        ::Microsoft::WRL::ComPtr<::Microsoft::Terminal::TermControlUiaProvider> _uiaProvider;
        winrt::Microsoft::Terminal::Control::implementation::ControlInteractivity* _interactivity;
-        winrt::Windows::UI::Xaml::Automation::Provider::IRawElementProviderSimple _parentProvider{ nullptr };
+        weak_ref<Windows::UI::Xaml::Automation::Peers::AutomationPeer> _parentProvider;

        til::rect _controlBounds{};
        til::rect _controlPadding{};
--- a/src/cascadia/TerminalControl/InteractivityAutomationPeer.idl
+++ b/src/cascadia/TerminalControl/InteractivityAutomationPeer.idl
@@ -3,7 +3,7 @@
 namespace Microsoft.Terminal.Control
 {
    [default_interface] runtimeclass InteractivityAutomationPeer :
-        Windows.UI.Xaml.Automation.Peers.FrameworkElementAutomationPeer,
+        Windows.UI.Xaml.Automation.Peers.AutomationPeer,
        Windows.UI.Xaml.Automation.Provider.ITextProvider
    {

--- a/src/cascadia/TerminalControl/TermControl.cpp
+++ b/src/cascadia/TerminalControl/TermControl.cpp
@@ -393,6 +393,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        // attached content before we set up the throttled func, and that'll A/V
        _revokers.coreScrollPositionChanged = _core.ScrollPositionChanged(winrt::auto_revoke, { get_weak(), &TermControl::_ScrollPositionChanged });
        _revokers.WarningBell = _core.WarningBell(winrt::auto_revoke, { get_weak(), &TermControl::_coreWarningBell });
+        _revokers.PromptStarted = _core.PromptStarted(winrt::auto_revoke, { get_weak(), &TermControl::_corePromptStarted });
+        _revokers.OutputStarted = _core.OutputStarted(winrt::auto_revoke, { get_weak(), &TermControl::_coreOutputStarted });

        static constexpr auto AutoScrollUpdateInterval = std::chrono::microseconds(static_cast<int>(1.0 / 30.0 * 1000000));
        _autoScrollTimer.Interval(AutoScrollUpdateInterval);
@@ -532,11 +534,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        _core.Connection(newConnection);
    }

-    void TermControl::HardResetWithoutErase()
-    {
-        _core.HardResetWithoutErase();
-    }
-
    void TermControl::_throttledUpdateScrollbar(const ScrollBarUpdate& update)
    {
        if (!_initializedTerminal)
@@ -1795,16 +1792,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
            return true;
        }

-        // While TSF has an active composition, key events must not be forwarded
-        // to the PTY directly. The IME re-injects navigation/confirmation keys
-        // after composition ends, at which point HasActiveComposition() == false
-        // and they are forwarded normally. This mirrors conhost v1 behavior in
-        // src/interactivity/win32/windowio.cpp.
-        if (GetTSFHandle().HasActiveComposition())
-        {
-            return true;
-        }
-
        if (_TrySendKeyEvent(vkey, scanCode, modifiers, keyDown))
        {
            return true;
@@ -1935,6 +1922,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    // - args: event data
    void TermControl::_TappedHandler(const IInspectable& /*sender*/, const TappedRoutedEventArgs& e)
    {
+        Focus(FocusState::Pointer);
+
        if (e.PointerDeviceType() == Windows::Devices::Input::PointerDeviceType::Touch)
        {
            // Normally TSF would be responsible for showing the touch keyboard, but it's buggy for us:
@@ -1968,13 +1957,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        const auto point = args.GetCurrentPoint(*this);
        const auto type = ptr.PointerDeviceType();

-        // GH#19908: _focused can be true even when the search box has
-        // keyboard focus, because GotFocus bubbles from the search box
-        // child and _GotFocusHandler sets _focused=true. If the user
-        // click-drags in the terminal while the search box is focused,
-        // we need to explicitly call Focus() to move keyboard focus back
-        // to the terminal so that Ctrl+C copies the selection.
-        if (!_focused || (_searchBox && _searchBox->ContainsFocus()))
+        if (!_focused)
        {
            Focus(FocusState::Pointer);
        }
@@ -2520,9 +2503,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation

        _updateScrollBar->Run(update);

-        // If we have a selection with markers (exposed via selection mode),
-        //   update the position of the markers
-        if (_core.HasSelection() && _core.SelectionMode() >= SelectionInteractionMode::Keyboard)
+        // if a selection marker is already visible,
+        // update the position of those markers
+        if (SelectionStartMarker().Visibility() == Visibility::Visible || SelectionEndMarker().Visibility() == Visibility::Visible)
        {
            _updateSelectionMarkers(nullptr, winrt::make<UpdateSelectionMarkersEventArgs>(false));
        }
@@ -3086,11 +3069,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
            co_return;
        }

-        if (const auto hwnd = reinterpret_cast<HWND>(OwningHwnd()))
-        {
-            SetForegroundWindow(hwnd);
-        }
-
        const auto weak = get_weak();

        if (e.DataView().Contains(StandardDataFormats::ApplicationLink()))
@@ -3723,6 +3701,16 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        _playWarningBell->Run();
    }

+    void TermControl::_corePromptStarted(const IInspectable& /*sender*/, const IInspectable& /*args*/)
+    {
+        PromptStarted.raise(*this, nullptr);
+    }
+
+    void TermControl::_coreOutputStarted(const IInspectable& /*sender*/, const IInspectable& /*args*/)
+    {
+        OutputStarted.raise(*this, nullptr);
+    }
+
    hstring TermControl::ReadEntireBuffer() const
    {
        return _core.ReadEntireBuffer();
@@ -3844,6 +3832,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    void TermControl::_coreOutputIdle(const IInspectable& /*sender*/, const IInspectable& /*args*/)
    {
        _refreshSearch();
+        OutputIdle.raise(*this, nullptr);
    }

    void TermControl::OwningHwnd(uint64_t owner)
--- a/src/cascadia/TerminalControl/TermControl.h
+++ b/src/cascadia/TerminalControl/TermControl.h
@@ -192,7 +192,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation

        TerminalConnection::ITerminalConnection Connection();
        void Connection(const TerminalConnection::ITerminalConnection& connection);
-        void HardResetWithoutErase();

        Control::CursorDisplayState CursorVisibility() const noexcept;
        void CursorVisibility(Control::CursorDisplayState cursorVisibility);
@@ -213,6 +212,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        til::typed_event<IInspectable, IInspectable> FocusFollowMouseRequested;
        til::typed_event<Control::TermControl, Windows::UI::Xaml::RoutedEventArgs> Initialized;
        til::typed_event<> WarningBell;
+        til::typed_event<> PromptStarted;
+        til::typed_event<> OutputStarted;
+        til::typed_event<> OutputIdle;
        til::typed_event<IInspectable, Control::KeySentEventArgs> KeySent;
        til::typed_event<IInspectable, Control::CharSentEventArgs> CharSent;
        til::typed_event<IInspectable, Control::StringSentEventArgs> StringSent;
@@ -426,6 +428,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        void _coreTransparencyChanged(IInspectable sender, Control::TransparencyChangedEventArgs args);
        void _coreRaisedNotice(const IInspectable& s, const Control::NoticeEventArgs& args);
        void _coreWarningBell(const IInspectable& sender, const IInspectable& args);
+        void _corePromptStarted(const IInspectable& sender, const IInspectable& args);
+        void _coreOutputStarted(const IInspectable& sender, const IInspectable& args);
        void _coreOutputIdle(const IInspectable& sender, const IInspectable& args);

        winrt::Windows::Foundation::Point _toPosInDips(const Core::Point terminalCellPos);
@@ -451,6 +455,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        {
            Control::ControlCore::ScrollPositionChanged_revoker coreScrollPositionChanged;
            Control::ControlCore::WarningBell_revoker WarningBell;
+            Control::ControlCore::PromptStarted_revoker PromptStarted;
+            Control::ControlCore::OutputStarted_revoker OutputStarted;
            Control::ControlCore::RendererEnteredErrorState_revoker RendererEnteredErrorState;
            Control::ControlCore::BackgroundColorChanged_revoker BackgroundColorChanged;
            Control::ControlCore::FontSizeChanged_revoker FontSizeChanged;
--- a/src/cascadia/TerminalControl/TermControl.idl
+++ b/src/cascadia/TerminalControl/TermControl.idl
@@ -53,7 +53,6 @@ namespace Microsoft.Terminal.Control
        void SetOverrideColorScheme(Microsoft.Terminal.Core.ICoreScheme scheme);

        Microsoft.Terminal.TerminalConnection.ITerminalConnection Connection;
-        void HardResetWithoutErase();

        UInt64 ContentId{ get; };

@@ -69,6 +68,9 @@ namespace Microsoft.Terminal.Control
        event Windows.Foundation.TypedEventHandler<Object, Object> SetTaskbarProgress;
        event Windows.Foundation.TypedEventHandler<Object, NoticeEventArgs> RaiseNotice;
        event Windows.Foundation.TypedEventHandler<Object, Object> WarningBell;
+        event Windows.Foundation.TypedEventHandler<Object, Object> PromptStarted;
+        event Windows.Foundation.TypedEventHandler<Object, Object> OutputStarted;
+        event Windows.Foundation.TypedEventHandler<Object, Object> OutputIdle;
        event Windows.Foundation.TypedEventHandler<Object, Object> HidePointerCursor;
        event Windows.Foundation.TypedEventHandler<Object, Object> RestorePointerCursor;
        event Windows.Foundation.TypedEventHandler<Object, Object> TabColorChanged;
--- a/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp
+++ b/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp
@@ -121,9 +121,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        // GH#13978: If the TermControl has already been removed from the UI tree, XAML might run into weird bugs.
        // This will prevent the `dispatcher.RunAsync` calls below from raising UIA events on the main thread.
        _termControl = {};
-
-        // Solve the circular reference between us and the content automation peer.
-        _contentAutomationPeer.ParentProvider(nullptr);
    }

    // Method Description:
--- a/src/cascadia/TerminalCore/Terminal.cpp
+++ b/src/cascadia/TerminalCore/Terminal.cpp
@@ -55,18 +55,6 @@ void Terminal::Create(til::size viewportSize, til::CoordType scrollbackLines, Re
    _stateMachine = std::make_unique<StateMachine>(std::move(engine));
 }

-// Method Description:
-// - Resets all VT state to defaults without clearing the buffer content.
-// Called when a connection is restarted so that any dirty modes left
-// behind by a crashed application don't affect the new connection.
-void Terminal::HardResetWithoutErase()
-{
-    _assertLocked();
-    _stateMachine->ResetState();
-    auto& engine = reinterpret_cast<OutputStateMachineEngine&>(_stateMachine->Engine());
-    engine.Dispatch().HardReset(false);
-}
-
 // Method Description:
 // - Initializes the Terminal from the given set of settings.
 // Arguments:
@@ -98,6 +86,7 @@ void Terminal::UpdateSettings(ICoreSettings settings)
    _answerbackMessage = settings.AnswerbackMessage();
    _wordDelimiters = settings.WordDelimiters();
    _suppressApplicationTitle = settings.SuppressApplicationTitle();
+    _startingTitle = settings.StartingTitle();
    _trimBlockSelection = settings.TrimBlockSelection();
    _autoMarkPrompts = settings.AutoMarkPrompts();
    _rainbowSuggestions = settings.RainbowSuggestions();
@@ -123,11 +112,6 @@ void Terminal::UpdateSettings(ICoreSettings settings)
    // Save the changes made above and in UpdateAppearance as the new default render settings.
    GetRenderSettings().SaveDefaultSettings();

-    if (!_startingTitle)
-    {
-        _startingTitle = settings.StartingTitle();
-    }
-
    if (!_startingTabColor && settings.StartingTabColor())
    {
        _startingTabColor = settings.StartingTabColor().Value();
@@ -767,6 +751,11 @@ TerminalInput::OutputType Terminal::SendCharEvent(const wchar_t ch, const WORD s
                // This changed the scrollbar marks - raise a notification to update them
                _NotifyScrollEvent();
            }
+            // regardless, start notify that we started command output
+            if (_pfnOutputStarted)
+            {
+                _pfnOutputStarted();
+            }
        }
    }

@@ -1281,6 +1270,16 @@ void Microsoft::Terminal::Core::Terminal::SetClearQuickFixCallback(std::function
    _pfnClearQuickFix.swap(pfn);
 }

+void Terminal::SetPromptStartedCallback(std::function<void()> pfn) noexcept
+{
+    _pfnPromptStarted.swap(pfn);
+}
+
+void Terminal::SetOutputStartedCallback(std::function<void()> pfn) noexcept
+{
+    _pfnOutputStarted.swap(pfn);
+}
+
 // Method Description:
 // - Stores the search highlighted regions in the terminal
 void Terminal::SetSearchHighlights(const std::vector<til::point_span>& highlights) noexcept
@@ -1538,10 +1537,6 @@ void Terminal::SerializeMainBuffer(HANDLE handle) const
    _mainBuffer->SerializeTo(handle);
 }

-void Terminal::UnknownSequence() noexcept
-{
-}
-
 void Terminal::ColorSelection(const TextAttribute& attr, winrt::Microsoft::Terminal::Core::MatchMode matchMode)
 {
    const auto colorSelection = [this](const til::point coordStartInclusive, const til::point coordEndExclusive, const TextAttribute& attr) {
--- a/src/cascadia/TerminalCore/Terminal.hpp
+++ b/src/cascadia/TerminalCore/Terminal.hpp
@@ -85,7 +85,6 @@ public:
    void Create(til::size viewportSize,
                til::CoordType scrollbackLines,
                Microsoft::Console::Render::Renderer& renderer);
-    void HardResetWithoutErase();

    void CreateFromSettings(winrt::Microsoft::Terminal::Core::ICoreSettings settings,
                            Microsoft::Console::Render::Renderer& renderer);
@@ -132,9 +131,7 @@ public:

 #pragma region ITerminalApi
    // These methods are defined in TerminalApi.cpp
-    void UnknownSequence() noexcept override;
    void ReturnResponse(const std::wstring_view response) override;
-    bool IsConPTY() const noexcept override;
    Microsoft::Console::VirtualTerminal::StateMachine& GetStateMachine() noexcept override;
    BufferState GetBufferAndViewport() noexcept override;
    void SetViewportPosition(const til::point position) noexcept override;
@@ -159,7 +156,7 @@ public:

    bool IsVtInputEnabled() const noexcept override;
    void NotifyBufferRotation(const int delta) override;
-    void NotifyShellIntegrationMark() override;
+    void NotifyShellIntegrationMark(ShellIntegrationMark mark) override;

    void InvokeCompletions(std::wstring_view menuJson, unsigned int replaceLength) override;

@@ -235,6 +232,8 @@ public:
    void SetSearchMissingCommandCallback(std::function<void(std::wstring_view, const til::CoordType)> pfn) noexcept;
    void SetClearQuickFixCallback(std::function<void()> pfn) noexcept;
    void SetWindowSizeChangedCallback(std::function<void(int32_t, int32_t)> pfn) noexcept;
+    void SetPromptStartedCallback(std::function<void()> pfn) noexcept;
+    void SetOutputStartedCallback(std::function<void()> pfn) noexcept;
    void SetSearchHighlights(const std::vector<til::point_span>& highlights) noexcept;
    void SetSearchHighlightFocused(size_t focusedIdx) noexcept;
    void ScrollToSearchHighlight(til::CoordType searchScrollOffset);
@@ -343,13 +342,15 @@ private:
    std::function<void(std::wstring_view, const til::CoordType)> _pfnSearchMissingCommand;
    std::function<void()> _pfnClearQuickFix;
    std::function<void(int32_t, int32_t)> _pfnWindowSizeChanged;
+    std::function<void()> _pfnPromptStarted;
+    std::function<void()> _pfnOutputStarted;

    RenderSettings _renderSettings;
    std::unique_ptr<::Microsoft::Console::VirtualTerminal::StateMachine> _stateMachine;
    ::Microsoft::Console::VirtualTerminal::TerminalInput _terminalInput;

    std::optional<std::wstring> _title;
-    std::optional<std::wstring> _startingTitle;
+    std::wstring _startingTitle;
    std::optional<til::color> _startingTabColor;

    std::vector<til::point_span> _searchHighlights;
--- a/src/cascadia/TerminalCore/TerminalApi.cpp
+++ b/src/cascadia/TerminalCore/TerminalApi.cpp
@@ -28,11 +28,6 @@ void Terminal::ReturnResponse(const std::wstring_view response)
    }
 }

-bool Terminal::IsConPTY() const noexcept
-{
-    return false;
-}
-
 Microsoft::Console::VirtualTerminal::StateMachine& Terminal::GetStateMachine() noexcept
 {
    return *_stateMachine;
@@ -91,12 +86,8 @@ void Terminal::SetWindowTitle(const std::wstring_view title)
    _assertLocked();
    if (!_suppressApplicationTitle)
    {
-        _title.reset();
-        if (!title.empty())
-        {
-            _title.emplace(title);
-        }
-        _pfnTitleChanged(GetConsoleTitle());
+        _title.emplace(title.empty() ? _startingTitle : title);
+        _pfnTitleChanged(_title.value());
    }
 }

@@ -116,13 +107,6 @@ bool Terminal::ResizeWindow(const til::CoordType width, const til::CoordType hei
        return false;
    }

-    const auto currentDimensions = _GetMutableViewport().Dimensions();
-
-    if (width == currentDimensions.width && height == currentDimensions.height)
-    {
-        return false;
-    }
-
    if (_pfnWindowSizeChanged)
    {
        _pfnWindowSizeChanged(width, height);
@@ -416,8 +400,26 @@ void Terminal::NotifyBufferRotation(const int delta)
    }
 }

-void Terminal::NotifyShellIntegrationMark()
+void Terminal::NotifyShellIntegrationMark(ShellIntegrationMark mark)
 {
    // Notify the scrollbar that marks have been added so it can refresh the mark indicators
    _NotifyScrollEvent();
+
+    switch (mark)
+    {
+    case ShellIntegrationMark::Prompt:
+        if (_pfnPromptStarted)
+        {
+            _pfnPromptStarted();
+        }
+        break;
+    case ShellIntegrationMark::Output:
+        if (_pfnOutputStarted)
+        {
+            _pfnOutputStarted();
+        }
+        break;
+    default:
+        break;
+    }
 }
--- a/src/cascadia/TerminalCore/terminalrenderdata.cpp
+++ b/src/cascadia/TerminalCore/terminalrenderdata.cpp
@@ -184,18 +184,11 @@ void Terminal::SelectNewRegion(const til::point coordStart, const til::point coo
 std::wstring_view Terminal::GetConsoleTitle() const noexcept
 {
    _assertLocked();
-
-    if (_title)
+    if (_title.has_value())
    {
        return *_title;
    }
-
-    if (_startingTitle)
-    {
-        return *_startingTitle;
-    }
-
-    return {};
+    return _startingTitle;
 }

 // Method Description:
--- a/src/cascadia/TerminalSettingsAppAdapterLib/TerminalSettings.cpp
+++ b/src/cascadia/TerminalSettingsAppAdapterLib/TerminalSettings.cpp
@@ -353,6 +353,10 @@ namespace winrt::Microsoft::Terminal::Settings
        _AllowVtChecksumReport = profile.AllowVtChecksumReport();
        _AllowVtClipboardWrite = profile.AllowVtClipboardWrite();
        _PathTranslationStyle = profile.PathTranslationStyle();
+
+        _NotifyOnInactiveOutput = profile.NotifyOnInactiveOutput();
+        _NotifyOnNextPrompt = profile.NotifyOnNextPrompt();
+        _AutoDetectRunningCommand = profile.AutoDetectRunningCommand();
    }

    // Method Description:
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
@@ -43,8 +43,7 @@
        </local:SettingContainer>

        <!--  Ambiguous Width  -->
-        <local:SettingContainer x:Name="AmbiguousWidth"
-                                x:Uid="Globals_AmbiguousWidth">
+        <local:SettingContainer x:Uid="Globals_AmbiguousWidth">
            <ComboBox AutomationProperties.AccessibilityView="Content"
                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                      ItemsSource="{x:Bind ViewModel.AmbiguousWidthList}"
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -44,28 +44,6 @@ using namespace winrt::Windows::Foundation::Collections;

 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    // GH#19927 - Walk the visual tree of the given element to find any
-    // Popups and set the theme on their Child element. In XAML Islands,
-    // popup children render in the PopupRoot (separate from the content
-    // tree), so they don't inherit our page's RequestedTheme
-    static void _setThemeOnPopups(const winrt::Windows::UI::Xaml::DependencyObject& element,
-                                  const winrt::Windows::UI::Xaml::ElementTheme theme)
-    {
-        const auto childCount = winrt::Windows::UI::Xaml::Media::VisualTreeHelper::GetChildrenCount(element);
-        for (int32_t i = 0; i < childCount; i++)
-        {
-            const auto child = winrt::Windows::UI::Xaml::Media::VisualTreeHelper::GetChild(element, i);
-            if (const auto popup = child.try_as<winrt::Windows::UI::Xaml::Controls::Primitives::Popup>())
-            {
-                if (const auto popupChild = popup.Child().try_as<winrt::Windows::UI::Xaml::FrameworkElement>())
-                {
-                    popupChild.RequestedTheme(theme);
-                }
-            }
-            _setThemeOnPopups(child, theme);
-        }
-    }
-
    static WUX::Controls::FontIcon _fontIconForNavTag(const std::wstring_view navTag)
    {
        WUX::Controls::FontIcon icon{};
@@ -372,13 +350,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                _Navigate(tag, BreadcrumbSubPage::None);
            }
        }
-
-        // GH#19927 - Theme the search box's internal popup now that the
-        // visual tree is ready and control templates are applied
-        const auto theme = _settingsSource.GlobalSettings().CurrentTheme();
-        const auto hasThemeForSettings{ theme.Settings() != nullptr };
-        const auto requestedTheme = hasThemeForSettings ? theme.Settings().RequestedTheme() : theme.RequestedTheme();
-        _setThemeOnPopups(SettingsSearchBox(), requestedTheme);
    }

    // Function Description:
@@ -1127,17 +1098,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
            }
        }

-        const auto theme = _settingsSource.GlobalSettings().CurrentTheme();
-        const auto hasThemeForSettings{ theme.Settings() != nullptr };
-        const auto appTheme = theme.RequestedTheme();
-        const auto requestedTheme = (hasThemeForSettings) ? theme.Settings().RequestedTheme() : appTheme;
+        const auto& theme = _settingsSource.GlobalSettings().CurrentTheme();
+        const bool hasThemeForSettings{ theme.Settings() != nullptr };
+        const auto& appTheme = theme.RequestedTheme();
+        const auto& requestedTheme = (hasThemeForSettings) ? theme.Settings().RequestedTheme() : appTheme;

        RequestedTheme(requestedTheme);

-        // GH#19927 - Theme the search box's internal popup so its
-        // dropdown matches the app theme instead of the system theme
-        _setThemeOnPopups(SettingsSearchBox(), requestedTheme);
-
        // Mica gets it's appearance from the app's theme, not necessarily the
        // Page's theme. In the case of dark app, light settings, mica will be a
        // dark color, and the text will also be dark, making the UI _very_ hard
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
@@ -329,8 +329,7 @@
            </local:SettingContainer>

            <!--  Icon  -->
-            <local:SettingContainer x:Name="CurrentFolderIcon"
-                                    x:Uid="NewTabMenu_CurrentFolderIcon"
+            <local:SettingContainer x:Uid="NewTabMenu_CurrentFolderIcon"
                                    CurrentValueAccessibleName="{x:Bind ViewModel.CurrentFolderLocalizedIcon, Mode=OneWay}"
                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
                <local:SettingContainer.CurrentValue>
@@ -498,8 +497,7 @@
            </local:SettingContainer>

            <!--  Add Remaining Profiles  -->
-            <local:SettingContainer x:Name="AddRemainingProfiles"
-                                    x:Uid="NewTabMenu_AddRemainingProfiles"
+            <local:SettingContainer x:Uid="NewTabMenu_AddRemainingProfiles"
                                    FontIconGlyph="&#xE902;"
                                    Style="{StaticResource SettingContainerWithIcon}">
                <Button x:Name="AddRemainingProfilesButton"
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
@@ -40,6 +40,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        INITIALIZE_BINDABLE_ENUM_SETTING_REVERSE_ORDER(CloseOnExitMode, CloseOnExitMode, winrt::Microsoft::Terminal::Settings::Model::CloseOnExitMode, L"Profile_CloseOnExit", L"Content");
        INITIALIZE_BINDABLE_ENUM_SETTING(ScrollState, ScrollbarState, winrt::Microsoft::Terminal::Control::ScrollbarState, L"Profile_ScrollbarVisibility", L"Content");
        INITIALIZE_BINDABLE_ENUM_SETTING(PathTranslationStyle, PathTranslationStyle, winrt::Microsoft::Terminal::Control::PathTranslationStyle, L"Profile_PathTranslationStyle", L"Content");
+        INITIALIZE_BINDABLE_ENUM_SETTING(AutoDetectRunningCommand, AutoDetectRunningCommand, winrt::Microsoft::Terminal::Control::AutoDetectRunningCommand, L"Profile_AutoDetectRunningCommand", L"Content");

        _InitializeCurrentBellSounds();

@@ -640,6 +641,170 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        BellStyle(currentStyle);
    }

+    // ===================== NotifyOnInactiveOutput =====================
+
+    hstring ProfileViewModel::NotifyOnInactiveOutputPreview() const
+    {
+        using Ons = Control::OutputNotificationStyle;
+        const auto style = NotifyOnInactiveOutput();
+        if (WI_AreAllFlagsSet(style, Ons::Taskbar | Ons::Audible | Ons::Tab | Ons::Notification))
+        {
+            return RS_(L"Profile_OutputNotificationStyleAll/Content");
+        }
+        else if (style == static_cast<Ons>(0))
+        {
+            return RS_(L"Profile_OutputNotificationStyleNone/Content");
+        }
+
+        std::vector<hstring> resultList;
+        resultList.reserve(4);
+        if (WI_IsFlagSet(style, Ons::Taskbar))
+        {
+            resultList.emplace_back(RS_(L"Profile_OutputNotificationStyleTaskbar/Content"));
+        }
+        if (WI_IsFlagSet(style, Ons::Audible))
+        {
+            resultList.emplace_back(RS_(L"Profile_OutputNotificationStyleAudible/Content"));
+        }
+        if (WI_IsFlagSet(style, Ons::Tab))
+        {
+            resultList.emplace_back(RS_(L"Profile_OutputNotificationStyleTab/Content"));
+        }
+        if (WI_IsFlagSet(style, Ons::Notification))
+        {
+            resultList.emplace_back(RS_(L"Profile_OutputNotificationStyleNotification/Content"));
+        }
+
+        hstring result{};
+        for (auto&& entry : resultList)
+        {
+            if (result.empty())
+            {
+                result = entry;
+            }
+            else
+            {
+                result = result + L", " + entry;
+            }
+        }
+        return result;
+    }
+
+    bool ProfileViewModel::IsNotifyOnInactiveOutputFlagSet(const uint32_t flag)
+    {
+        return (WI_EnumValue(NotifyOnInactiveOutput()) & flag) == flag;
+    }
+
+    void ProfileViewModel::SetNotifyOnInactiveOutputTaskbar(winrt::Windows::Foundation::IReference<bool> on)
+    {
+        auto currentStyle = NotifyOnInactiveOutput();
+        WI_UpdateFlag(currentStyle, Control::OutputNotificationStyle::Taskbar, winrt::unbox_value<bool>(on));
+        NotifyOnInactiveOutput(currentStyle);
+    }
+
+    void ProfileViewModel::SetNotifyOnInactiveOutputAudible(winrt::Windows::Foundation::IReference<bool> on)
+    {
+        auto currentStyle = NotifyOnInactiveOutput();
+        WI_UpdateFlag(currentStyle, Control::OutputNotificationStyle::Audible, winrt::unbox_value<bool>(on));
+        NotifyOnInactiveOutput(currentStyle);
+    }
+
+    void ProfileViewModel::SetNotifyOnInactiveOutputTab(winrt::Windows::Foundation::IReference<bool> on)
+    {
+        auto currentStyle = NotifyOnInactiveOutput();
+        WI_UpdateFlag(currentStyle, Control::OutputNotificationStyle::Tab, winrt::unbox_value<bool>(on));
+        NotifyOnInactiveOutput(currentStyle);
+    }
+
+    void ProfileViewModel::SetNotifyOnInactiveOutputNotification(winrt::Windows::Foundation::IReference<bool> on)
+    {
+        auto currentStyle = NotifyOnInactiveOutput();
+        WI_UpdateFlag(currentStyle, Control::OutputNotificationStyle::Notification, winrt::unbox_value<bool>(on));
+        NotifyOnInactiveOutput(currentStyle);
+    }
+
+    // ===================== NotifyOnNextPrompt =====================
+
+    hstring ProfileViewModel::NotifyOnNextPromptPreview() const
+    {
+        using Ons = Control::OutputNotificationStyle;
+        const auto style = NotifyOnNextPrompt();
+        if (WI_AreAllFlagsSet(style, Ons::Taskbar | Ons::Audible | Ons::Tab | Ons::Notification))
+        {
+            return RS_(L"Profile_OutputNotificationStyleAll/Content");
+        }
+        else if (style == static_cast<Ons>(0))
+        {
+            return RS_(L"Profile_OutputNotificationStyleNone/Content");
+        }
+
+        std::vector<hstring> resultList;
+        resultList.reserve(4);
+        if (WI_IsFlagSet(style, Ons::Taskbar))
+        {
+            resultList.emplace_back(RS_(L"Profile_OutputNotificationStyleTaskbar/Content"));
+        }
+        if (WI_IsFlagSet(style, Ons::Audible))
+        {
+            resultList.emplace_back(RS_(L"Profile_OutputNotificationStyleAudible/Content"));
+        }
+        if (WI_IsFlagSet(style, Ons::Tab))
+        {
+            resultList.emplace_back(RS_(L"Profile_OutputNotificationStyleTab/Content"));
+        }
+        if (WI_IsFlagSet(style, Ons::Notification))
+        {
+            resultList.emplace_back(RS_(L"Profile_OutputNotificationStyleNotification/Content"));
+        }
+
+        hstring result{};
+        for (auto&& entry : resultList)
+        {
+            if (result.empty())
+            {
+                result = entry;
+            }
+            else
+            {
+                result = result + L", " + entry;
+            }
+        }
+        return result;
+    }
+
+    bool ProfileViewModel::IsNotifyOnNextPromptFlagSet(const uint32_t flag)
+    {
+        return (WI_EnumValue(NotifyOnNextPrompt()) & flag) == flag;
+    }
+
+    void ProfileViewModel::SetNotifyOnNextPromptTaskbar(winrt::Windows::Foundation::IReference<bool> on)
+    {
+        auto currentStyle = NotifyOnNextPrompt();
+        WI_UpdateFlag(currentStyle, Control::OutputNotificationStyle::Taskbar, winrt::unbox_value<bool>(on));
+        NotifyOnNextPrompt(currentStyle);
+    }
+
+    void ProfileViewModel::SetNotifyOnNextPromptAudible(winrt::Windows::Foundation::IReference<bool> on)
+    {
+        auto currentStyle = NotifyOnNextPrompt();
+        WI_UpdateFlag(currentStyle, Control::OutputNotificationStyle::Audible, winrt::unbox_value<bool>(on));
+        NotifyOnNextPrompt(currentStyle);
+    }
+
+    void ProfileViewModel::SetNotifyOnNextPromptTab(winrt::Windows::Foundation::IReference<bool> on)
+    {
+        auto currentStyle = NotifyOnNextPrompt();
+        WI_UpdateFlag(currentStyle, Control::OutputNotificationStyle::Tab, winrt::unbox_value<bool>(on));
+        NotifyOnNextPrompt(currentStyle);
+    }
+
+    void ProfileViewModel::SetNotifyOnNextPromptNotification(winrt::Windows::Foundation::IReference<bool> on)
+    {
+        auto currentStyle = NotifyOnNextPrompt();
+        WI_UpdateFlag(currentStyle, Control::OutputNotificationStyle::Notification, winrt::unbox_value<bool>(on));
+        NotifyOnNextPrompt(currentStyle);
+    }
+
    // Method Description:
    // - Construct _CurrentBellSounds by importing the _inherited_ value from the model
    // - Adds a PropertyChanged handler to each BellSoundViewModel to propagate changes to the model
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
@@ -47,6 +47,22 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        void SetBellStyleWindow(winrt::Windows::Foundation::IReference<bool> on);
        void SetBellStyleTaskbar(winrt::Windows::Foundation::IReference<bool> on);

+        // notify on inactive output bits
+        hstring NotifyOnInactiveOutputPreview() const;
+        bool IsNotifyOnInactiveOutputFlagSet(const uint32_t flag);
+        void SetNotifyOnInactiveOutputTaskbar(winrt::Windows::Foundation::IReference<bool> on);
+        void SetNotifyOnInactiveOutputAudible(winrt::Windows::Foundation::IReference<bool> on);
+        void SetNotifyOnInactiveOutputTab(winrt::Windows::Foundation::IReference<bool> on);
+        void SetNotifyOnInactiveOutputNotification(winrt::Windows::Foundation::IReference<bool> on);
+
+        // notify on next prompt bits
+        hstring NotifyOnNextPromptPreview() const;
+        bool IsNotifyOnNextPromptFlagSet(const uint32_t flag);
+        void SetNotifyOnNextPromptTaskbar(winrt::Windows::Foundation::IReference<bool> on);
+        void SetNotifyOnNextPromptAudible(winrt::Windows::Foundation::IReference<bool> on);
+        void SetNotifyOnNextPromptTab(winrt::Windows::Foundation::IReference<bool> on);
+        void SetNotifyOnNextPromptNotification(winrt::Windows::Foundation::IReference<bool> on);
+
        hstring BellSoundPreview();
        void RequestAddBellSound(hstring path);
        void RequestDeleteBellSound(const Editor::BellSoundViewModel& vm);
@@ -146,12 +162,17 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        OBSERVABLE_PROJECTED_SETTING(_profile, RainbowSuggestions);
        OBSERVABLE_PROJECTED_SETTING(_profile, PathTranslationStyle);

+        OBSERVABLE_PROJECTED_SETTING(_profile, NotifyOnInactiveOutput);
+        OBSERVABLE_PROJECTED_SETTING(_profile, NotifyOnNextPrompt);
+        OBSERVABLE_PROJECTED_SETTING(_profile, AutoDetectRunningCommand);
+
        WINRT_PROPERTY(bool, IsBaseLayer, false);
        WINRT_PROPERTY(bool, FocusDeleteButton, false);
        GETSET_BINDABLE_ENUM_SETTING(AntiAliasingMode, Microsoft::Terminal::Control::TextAntialiasingMode, AntialiasingMode);
        GETSET_BINDABLE_ENUM_SETTING(CloseOnExitMode, Microsoft::Terminal::Settings::Model::CloseOnExitMode, CloseOnExit);
        GETSET_BINDABLE_ENUM_SETTING(ScrollState, Microsoft::Terminal::Control::ScrollbarState, ScrollState);
        GETSET_BINDABLE_ENUM_SETTING(PathTranslationStyle, Microsoft::Terminal::Control::PathTranslationStyle, PathTranslationStyle);
+        GETSET_BINDABLE_ENUM_SETTING(AutoDetectRunningCommand, Microsoft::Terminal::Control::AutoDetectRunningCommand, AutoDetectRunningCommand);

    private:
        Model::Profile _profile;
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
@@ -50,6 +50,23 @@ namespace Microsoft.Terminal.Settings.Editor
        void SetBellStyleWindow(Windows.Foundation.IReference<Boolean> on);
        void SetBellStyleTaskbar(Windows.Foundation.IReference<Boolean> on);

+        String NotifyOnInactiveOutputPreview { get; };
+        Boolean IsNotifyOnInactiveOutputFlagSet(UInt32 flag);
+        void SetNotifyOnInactiveOutputTaskbar(Windows.Foundation.IReference<Boolean> on);
+        void SetNotifyOnInactiveOutputAudible(Windows.Foundation.IReference<Boolean> on);
+        void SetNotifyOnInactiveOutputTab(Windows.Foundation.IReference<Boolean> on);
+        void SetNotifyOnInactiveOutputNotification(Windows.Foundation.IReference<Boolean> on);
+
+        String NotifyOnNextPromptPreview { get; };
+        Boolean IsNotifyOnNextPromptFlagSet(UInt32 flag);
+        void SetNotifyOnNextPromptTaskbar(Windows.Foundation.IReference<Boolean> on);
+        void SetNotifyOnNextPromptAudible(Windows.Foundation.IReference<Boolean> on);
+        void SetNotifyOnNextPromptTab(Windows.Foundation.IReference<Boolean> on);
+        void SetNotifyOnNextPromptNotification(Windows.Foundation.IReference<Boolean> on);
+
+        IInspectable CurrentAutoDetectRunningCommand;
+        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> AutoDetectRunningCommandList { get; };
+
        String BellSoundPreview { get; };
        Windows.Foundation.Collections.IObservableVector<BellSoundViewModel> CurrentBellSounds { get; };
        void RequestAddBellSound(String path);
@@ -140,5 +157,8 @@ namespace Microsoft.Terminal.Settings.Editor
        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, RainbowSuggestions);
        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Control.PathTranslationStyle, PathTranslationStyle);
        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AllowVtClipboardWrite);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Control.OutputNotificationStyle, NotifyOnInactiveOutput);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Control.OutputNotificationStyle, NotifyOnNextPrompt);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Control.AutoDetectRunningCommand, AutoDetectRunningCommand);
    }
 }
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
@@ -196,6 +196,59 @@
                </StackPanel>
            </local:SettingContainer>

+            <!--  Notify On Inactive Output  -->
+            <local:SettingContainer x:Name="NotifyOnInactiveOutput"
+                                    x:Uid="Profile_NotifyOnInactiveOutput"
+                                    ClearSettingValue="{x:Bind Profile.ClearNotifyOnInactiveOutput}"
+                                    CurrentValue="{x:Bind Profile.NotifyOnInactiveOutputPreview, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasNotifyOnInactiveOutput, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.NotifyOnInactiveOutputOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <StackPanel>
+                    <CheckBox x:Uid="Profile_OutputNotificationStyleTaskbar"
+                              IsChecked="{x:Bind Profile.IsNotifyOnInactiveOutputFlagSet(1), BindBack=Profile.SetNotifyOnInactiveOutputTaskbar, Mode=TwoWay}" />
+                    <CheckBox x:Uid="Profile_OutputNotificationStyleAudible"
+                              IsChecked="{x:Bind Profile.IsNotifyOnInactiveOutputFlagSet(2), BindBack=Profile.SetNotifyOnInactiveOutputAudible, Mode=TwoWay}" />
+                    <CheckBox x:Uid="Profile_OutputNotificationStyleTab"
+                              IsChecked="{x:Bind Profile.IsNotifyOnInactiveOutputFlagSet(4), BindBack=Profile.SetNotifyOnInactiveOutputTab, Mode=TwoWay}" />
+                    <CheckBox x:Uid="Profile_OutputNotificationStyleNotification"
+                              IsChecked="{x:Bind Profile.IsNotifyOnInactiveOutputFlagSet(8), BindBack=Profile.SetNotifyOnInactiveOutputNotification, Mode=TwoWay}" />
+                </StackPanel>
+            </local:SettingContainer>
+
+            <!--  Notify On Next Prompt  -->
+            <local:SettingContainer x:Name="NotifyOnNextPrompt"
+                                    x:Uid="Profile_NotifyOnNextPrompt"
+                                    ClearSettingValue="{x:Bind Profile.ClearNotifyOnNextPrompt}"
+                                    CurrentValue="{x:Bind Profile.NotifyOnNextPromptPreview, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasNotifyOnNextPrompt, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.NotifyOnNextPromptOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <StackPanel>
+                    <CheckBox x:Uid="Profile_OutputNotificationStyleTaskbar"
+                              IsChecked="{x:Bind Profile.IsNotifyOnNextPromptFlagSet(1), BindBack=Profile.SetNotifyOnNextPromptTaskbar, Mode=TwoWay}" />
+                    <CheckBox x:Uid="Profile_OutputNotificationStyleAudible"
+                              IsChecked="{x:Bind Profile.IsNotifyOnNextPromptFlagSet(2), BindBack=Profile.SetNotifyOnNextPromptAudible, Mode=TwoWay}" />
+                    <CheckBox x:Uid="Profile_OutputNotificationStyleTab"
+                              IsChecked="{x:Bind Profile.IsNotifyOnNextPromptFlagSet(4), BindBack=Profile.SetNotifyOnNextPromptTab, Mode=TwoWay}" />
+                    <CheckBox x:Uid="Profile_OutputNotificationStyleNotification"
+                              IsChecked="{x:Bind Profile.IsNotifyOnNextPromptFlagSet(8), BindBack=Profile.SetNotifyOnNextPromptNotification, Mode=TwoWay}" />
+                </StackPanel>
+            </local:SettingContainer>
+
+            <!--  Auto Detect Running Command  -->
+            <local:SettingContainer x:Name="AutoDetectRunningCommand"
+                                    x:Uid="Profile_AutoDetectRunningCommand"
+                                    ClearSettingValue="{x:Bind Profile.ClearAutoDetectRunningCommand}"
+                                    HasSettingValue="{x:Bind Profile.HasAutoDetectRunningCommand, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.AutoDetectRunningCommandOverrideSource, Mode=OneWay}">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind Profile.AutoDetectRunningCommandList, Mode=OneWay}"
+                          SelectedItem="{x:Bind Profile.CurrentAutoDetectRunningCommand, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
+
            <!--  RightClickContextMenu  -->
            <local:SettingContainer x:Name="RightClickContextMenu"
                                    x:Uid="Profile_RightClickContextMenu"
--- a/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw
@@ -371,21 +371,6 @@
  <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
    <value>Windows-Konsole</value>
  </data>
-  <data name="Globals_AmbiguousWidth.Header" xml:space="preserve">
-    <value>Breite von mehrdeutigen Zeichen</value>
-    <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
-    <value>Legt die Breite fest, die für ostasiatische mehrdeutige Zeichen verwendet wird. „Eng“ (Standard) priorisiert die Kompatibilität, während „Weit“ die Lesbarkeit mit vielen CJK-Schriftarten priorisiert. Im Modus „Breit“ funktionieren einige Anwendungen möglicherweise nicht ordnungsgemäß und verursachen eine erratische Cursorbewegung. Das Ändern dieser Einstellung erfordert einen Neustart von Windows-Terminal und gilt nur für Anwendungen, die von dort aus gestartet werden.</value>
-  </data>
-  <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
-    <value>Schmal</value>
-    <comment>As in "narrow width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth_Wide.Text" xml:space="preserve">
-    <value>Breit</value>
-    <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
  <data name="Globals_InitialCols.Text" xml:space="preserve">
    <value>Spalten</value>
    <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
@@ -507,7 +492,7 @@
  </data>
  <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
    <value>Titelleiste ausblenden (Neustart erforderlich)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
  </data>
  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
    <value>Wenn diese Option deaktiviert ist, wird die Titelleiste über den Registerkarten angezeigt.</value>
@@ -1195,15 +1180,15 @@
  </data>
  <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Startverzeichnis</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.Header" xml:space="preserve">
    <value>Startverzeichnis</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Startverzeichnis</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
    <value>Das Verzeichnis, in dem das Profil gestartet wird, wenn es geladen wird.</value>
@@ -1742,7 +1727,7 @@
    <comment>A supplementary setting to the "font face" setting. Toggling this control updates the font face control to show all of the fonts installed.</comment>
  </data>
  <data name="Profile_FontFaceShowAllFonts.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Wenn diese Option aktiviert ist, werden alle installierten Schriftarten in der Liste oben angezeigt. Andernfalls wird nur die Liste der Schriftarten mit fester Breite angezeigt.</value>
+    <value>Wenn diese Option aktiviert ist, werden alle installierten Schriftarten in der Liste oben angezeigt. Andernfalls wird nur die Liste der Festbreitenschriftarten angezeigt.</value>
    <comment>A description for what the supplementary "show all fonts" setting does. Presented near "Profile_FontFaceShowAllFonts".</comment>
  </data>
  <data name="Profile_CreateUnfocusedAppearanceButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@@ -2147,7 +2132,7 @@
  </data>
  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Verknüpfung</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
  </data>
  <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
    <value>Textformatierung</value>
@@ -2606,19 +2591,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -2610,19 +2610,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
@@ -2748,4 +2748,92 @@
    <value>Type to filter icons</value>
    <comment>Placeholder text for a text box to filter and select an icon.</comment>
  </data>
+  <!-- OutputNotificationStyle shared checkbox labels -->
+  <data name="Profile_OutputNotificationStyleTaskbar.Content" xml:space="preserve">
+    <value>Flash taskbar</value>
+    <comment>An option to choose from for a notification style setting. When selected, the taskbar is flashed.</comment>
+  </data>
+  <data name="Profile_OutputNotificationStyleAudible.Content" xml:space="preserve">
+    <value>Audible</value>
+    <comment>An option to choose from for a notification style setting. When selected, an audible cue is played.</comment>
+  </data>
+  <data name="Profile_OutputNotificationStyleTab.Content" xml:space="preserve">
+    <value>Tab indicator</value>
+    <comment>An option to choose from for a notification style setting. When selected, an activity indicator is shown on the tab.</comment>
+  </data>
+  <data name="Profile_OutputNotificationStyleNotification.Content" xml:space="preserve">
+    <value>Desktop notification</value>
+    <comment>An option to choose from for a notification style setting. When selected, a desktop toast notification is sent.</comment>
+  </data>
+  <data name="Profile_OutputNotificationStyleAll/Content" xml:space="preserve">
+    <value>All</value>
+    <comment>An option label for notification style. Shown when all notification styles are enabled.</comment>
+  </data>
+  <data name="Profile_OutputNotificationStyleNone/Content" xml:space="preserve">
+    <value>None</value>
+    <comment>An option label for notification style. Shown when no notification styles are enabled.</comment>
+  </data>
+  <!-- NotifyOnInactiveOutput -->
+  <data name="Profile_NotifyOnInactiveOutput.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Notify on inactive output</value>
+    <comment>Name for a control to select how the app notifies the user when an inactive pane produces output.</comment>
+  </data>
+  <data name="Profile_NotifyOnInactiveOutput.Header" xml:space="preserve">
+    <value>Notify on inactive output</value>
+    <comment>Header for a control to select how the app notifies the user when an inactive pane produces output.</comment>
+  </data>
+  <data name="Profile_NotifyOnInactiveOutput.HelpText" xml:space="preserve">
+    <value>Controls how you are notified when a background pane produces new output.</value>
+    <comment>A description for what the "notify on inactive output" setting does.</comment>
+  </data>
+  <!-- NotifyOnNextPrompt -->
+  <data name="Profile_NotifyOnNextPrompt.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Notify on next prompt</value>
+    <comment>Name for a control to select how the app notifies the user when a command finishes and the shell returns to a prompt.</comment>
+  </data>
+  <data name="Profile_NotifyOnNextPrompt.Header" xml:space="preserve">
+    <value>Notify on next prompt</value>
+    <comment>Header for a control to select how the app notifies the user when a command finishes and the shell returns to a prompt.</comment>
+  </data>
+  <data name="Profile_NotifyOnNextPrompt.HelpText" xml:space="preserve">
+    <value>Controls how you are notified when a running command finishes and the shell returns to a prompt. Requires shell integration.</value>
+    <comment>A description for what the "notify on next prompt" setting does.</comment>
+  </data>
+  <!-- AutoDetectRunningCommand -->
+  <data name="Profile_AutoDetectRunningCommand.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Auto-detect running command</value>
+    <comment>Name for a control to select how the app detects and indicates a running command.</comment>
+  </data>
+  <data name="Profile_AutoDetectRunningCommand.Header" xml:space="preserve">
+    <value>Auto-detect running command</value>
+    <comment>Header for a control to select how the app detects and indicates a running command.</comment>
+  </data>
+  <data name="Profile_AutoDetectRunningCommand.HelpText" xml:space="preserve">
+    <value>Controls whether and how the terminal automatically shows progress while a command is running. Requires shell integration.</value>
+    <comment>A description for what the "auto-detect running command" setting does.</comment>
+  </data>
+  <data name="Profile_AutoDetectRunningCommand_Disabled.Content" xml:space="preserve">
+    <value>Disabled</value>
+    <comment>An option to choose from for the "auto-detect running command" setting. When selected, no auto-detection occurs.</comment>
+  </data>
+  <data name="Profile_AutoDetectRunningCommand_Automatic.Content" xml:space="preserve">
+    <value>Automatic</value>
+    <comment>An option to choose from for the "auto-detect running command" setting. When selected, an indeterminate progress ring is shown while a command is running.</comment>
+  </data>
+  <data name="Profile_AutoDetectRunningCommand_Progress.Content" xml:space="preserve">
+    <value>Progress</value>
+    <comment>An option to choose from for the "auto-detect running command" setting. When selected, the terminal attempts to detect progress percentage from command output.</comment>
+  </data>
+  <data name="Profile_AutoDetectRunningCommandDisabled.Content" xml:space="preserve">
+    <value>Disabled</value>
+    <comment>An option to choose from for the "auto-detect running command" setting. When selected, no auto-detection occurs.</comment>
+  </data>
+  <data name="Profile_AutoDetectRunningCommandAutomatic.Content" xml:space="preserve">
+    <value>Automatic</value>
+    <comment>An option to choose from for the "auto-detect running command" setting. When selected, an indeterminate progress ring is shown while a command is running.</comment>
+  </data>
+  <data name="Profile_AutoDetectRunningCommandProgress.Content" xml:space="preserve">
+    <value>Progress</value>
+    <comment>An option to choose from for the "auto-detect running command" setting. When selected, the terminal attempts to detect progress percentage from command output.</comment>
+  </data>
 </root>
--- a/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw
@@ -371,21 +371,6 @@
  <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
    <value>Consola de Windows</value>
  </data>
-  <data name="Globals_AmbiguousWidth.Header" xml:space="preserve">
-    <value>Ancho de caracteres ambiguos</value>
-    <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
-    <value>Establece el ancho usado para los caracteres ambiguos de Asia Oriental. "Estrecho" (valor predeterminado) da prioridad a la compatibilidad, mientras que "Ancho" da prioridad a la legibilidad con muchas fuentes CJK. En el modo "Ancho", es posible que algunas aplicaciones no funcionen correctamente y provoquen un movimiento errático del cursor. Cambiar esta configuración requiere un reinicio de Terminal Windows y solo se aplica a las aplicaciones que se inician desde dentro de ella.</value>
-  </data>
-  <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
-    <value>Estrecho</value>
-    <comment>As in "narrow width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth_Wide.Text" xml:space="preserve">
-    <value>Anchura</value>
-    <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
  <data name="Globals_InitialCols.Text" xml:space="preserve">
    <value>Columnas</value>
    <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
@@ -507,7 +492,7 @@
  </data>
  <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
    <value>Ocultar la barra de título (requiere reiniciar)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
  </data>
  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
    <value>Cuando está deshabilitada, la barra de título aparecerá encima de las pestañas.</value>
@@ -983,11 +968,11 @@
    <comment>{Locked="‗"} An option to choose from for the "cursor shape" setting. When selected, the cursor will look like a stacked set of two underscores. The character in the parentheses is used to show what it looks like.</comment>
  </data>
  <data name="Profile_FontFace.Header" xml:space="preserve">
-    <value>Estilo tipográfico</value>
+    <value>Tipo de fuente</value>
    <comment>Header for a control to select the font for text in the app.</comment>
  </data>
  <data name="Profile_FontFaceBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Estilo tipográfico</value>
+    <value>Tipo de fuente</value>
    <comment>Name for a control to select the font for text in the app.</comment>
  </data>
  <data name="Profile_FontFace.HelpText" xml:space="preserve">
@@ -1195,15 +1180,15 @@
  </data>
  <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Directorio de inicio</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.Header" xml:space="preserve">
    <value>Directorio de inicio</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Directorio de inicio</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
    <value>El directorio en el que se inicia el perfil cuando se carga.</value>
@@ -2147,7 +2132,7 @@
  </data>
  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Acceso directo</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
  </data>
  <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
    <value>Formato de texto</value>
@@ -2606,19 +2591,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw
@@ -371,21 +371,6 @@
  <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
    <value>Console Windows</value>
  </data>
-  <data name="Globals_AmbiguousWidth.Header" xml:space="preserve">
-    <value>Largeur des caractères ambigus d’Asie de l’Est</value>
-    <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
-    <value>Définit la largeur utilisée pour les caractères ambigus d’Asie de l’Est. « Narrow » (par défaut) privilégie la compatibilité, tandis que « Wide » favorise la lisibilité avec de nombreuses polices CJK. En mode « Wide », certaines applications peuvent ne pas fonctionner correctement et provoquer un déplacement erratique du curseur. La modification de ce paramètre nécessite le redémarrage du Terminal Windows et ne s’applique qu’aux applications lancées à partir de celui-ci.</value>
-  </data>
-  <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
-    <value>Étroites</value>
-    <comment>As in "narrow width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth_Wide.Text" xml:space="preserve">
-    <value>Larges</value>
-    <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
  <data name="Globals_InitialCols.Text" xml:space="preserve">
    <value>Colonnes</value>
    <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
@@ -507,7 +492,7 @@
  </data>
  <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
    <value>Masquer la barre de titre (redémarrage nécessaire)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
  </data>
  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
    <value>Une fois désactivée, la barre de titre s’affiche au-dessus des onglets.</value>
@@ -983,11 +968,11 @@
    <comment>{Locked="‗"} An option to choose from for the "cursor shape" setting. When selected, the cursor will look like a stacked set of two underscores. The character in the parentheses is used to show what it looks like.</comment>
  </data>
  <data name="Profile_FontFace.Header" xml:space="preserve">
-    <value>Style de police</value>
+    <value>Type de police</value>
    <comment>Header for a control to select the font for text in the app.</comment>
  </data>
  <data name="Profile_FontFaceBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Style de police</value>
+    <value>Type de police</value>
    <comment>Name for a control to select the font for text in the app.</comment>
  </data>
  <data name="Profile_FontFace.HelpText" xml:space="preserve">
@@ -1195,15 +1180,15 @@
  </data>
  <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Répertoire de démarrage</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.Header" xml:space="preserve">
    <value>Répertoire de démarrage</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Répertoire de démarrage</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
    <value>Répertoire dans lequel le shell démarre lorsqu’il est chargé.</value>
@@ -2147,7 +2132,7 @@
  </data>
  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Raccourci</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
  </data>
  <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
    <value>Mise en forme du texte</value>
@@ -2606,19 +2591,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C :\ -&gt; /mnt/c)</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C :\ -&gt; /cygdrive/c)</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw
@@ -371,21 +371,6 @@
  <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
    <value>Windows Console</value>
  </data>
-  <data name="Globals_AmbiguousWidth.Header" xml:space="preserve">
-    <value>Larghezza dei caratteri ambigui</value>
-    <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
-    <value>Imposta la larghezza usata per i caratteri ambigui dell'Asia orientale. "Narrow" (impostazione predefinita) privilegia la compatibilità, mentre "Wide" privilegia la leggibilità con molti tipi di carattere CJK. In modalità "Wide", alcune applicazioni potrebbero non funzionare correttamente e causare movimenti irregolari del cursore. Per applicare questa modifica è necessario riavviare Terminale Windows e si applica solo alle applicazioni avviate all'interno.</value>
-  </data>
-  <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
-    <value>Stretti</value>
-    <comment>As in "narrow width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth_Wide.Text" xml:space="preserve">
-    <value>Ampiezza</value>
-    <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
  <data name="Globals_InitialCols.Text" xml:space="preserve">
    <value>Colonne</value>
    <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
@@ -507,7 +492,7 @@
  </data>
  <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
    <value>Nascondi la barra del titolo (sarà necessario riavviare)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
  </data>
  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
    <value>Se disabilitata, la barra del titolo verrà visualizzata sopra le schede.</value>
@@ -1195,15 +1180,15 @@
  </data>
  <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Directory iniziale</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.Header" xml:space="preserve">
    <value>Directory iniziale</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Directory iniziale</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
    <value>La directory che inizia il profilo durante il caricamento.</value>
@@ -2147,7 +2132,7 @@
  </data>
  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Collegamento</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
  </data>
  <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
    <value>Formattazione testo</value>
@@ -2606,19 +2591,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
@@ -371,21 +371,6 @@
  <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
    <value>Windows コンソール</value>
  </data>
-  <data name="Globals_AmbiguousWidth.Header" xml:space="preserve">
-    <value>あいまいな文字の幅</value>
-    <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
-    <value>東アジアのあいまいな文字に使用する幅を設定します。[幅を狭くする] (既定) は互換性を優先し、[幅を広くする] は多くの CJK フォントでの読みやすさを優先します。[幅を広くする] モードでは、一部のアプリケーションが正しく動作せず、カーソルの動きが不安定になることがあります。この設定を変更するには、Windows ターミナルの再起動が必要で、Windows ターミナル内から起動したアプリケーションにのみ適用されます。</value>
-  </data>
-  <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
-    <value>狭い</value>
-    <comment>As in "narrow width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth_Wide.Text" xml:space="preserve">
-    <value>広い</value>
-    <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
  <data name="Globals_InitialCols.Text" xml:space="preserve">
    <value>列</value>
    <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
@@ -507,7 +492,7 @@
  </data>
  <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
    <value>タイトル バーを非表示にする (再起動が必要)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
  </data>
  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
    <value>無効にすると、タイトル バーがタブの上に表示されます。</value>
@@ -983,11 +968,11 @@
    <comment>{Locked="‗"} An option to choose from for the "cursor shape" setting. When selected, the cursor will look like a stacked set of two underscores. The character in the parentheses is used to show what it looks like.</comment>
  </data>
  <data name="Profile_FontFace.Header" xml:space="preserve">
-    <value>フォント スタイル</value>
+    <value>フォント フェイス</value>
    <comment>Header for a control to select the font for text in the app.</comment>
  </data>
  <data name="Profile_FontFaceBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>フォント スタイル</value>
+    <value>フォント フェイス</value>
    <comment>Name for a control to select the font for text in the app.</comment>
  </data>
  <data name="Profile_FontFace.HelpText" xml:space="preserve">
@@ -1195,15 +1180,15 @@
  </data>
  <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>開始ディレクトリ</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.Header" xml:space="preserve">
    <value>開始ディレクトリ</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>開始ディレクトリ</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
    <value>プロファイルが読み込まれたときに開始されるディレクトリです。</value>
@@ -2147,7 +2132,7 @@
  </data>
  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>ショートカット</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
  </data>
  <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
    <value>テキストの書式設定</value>
@@ -2606,19 +2591,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
@@ -293,7 +293,7 @@
    <comment>Header for a control to set the query URL when using the "search web" action.</comment>
  </data>
  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
-    <value>자리 표시자 "%s"가 검색 쿼리로 바뀝니다.</value>
+    <value>자리 표시자 "%s" 검색 쿼리로 대체됩니다.</value>
    <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
  </data>
  <data name="Globals_TrimBlockSelection.Header" xml:space="preserve">
@@ -371,21 +371,6 @@
  <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
    <value>Windows 콘솔</value>
  </data>
-  <data name="Globals_AmbiguousWidth.Header" xml:space="preserve">
-    <value>모호한 문자 너비</value>
-    <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
-    <value>동아시아의 모호한 문자에 사용되는 너비를 설정하세요. "좁게"(기본값)는 호환성을 우선시하고, "넓게"는 많은 CJK 글꼴에서 가독성을 우선시합니다. "넓게" 모드에서는 일부 애플리케이션이 제대로 작동하지 않아 커서가 이상하게 움직일 수 있습니다. 이 설정을 변경하려면 Windows 터미널을 다시 시작해야 하며, 이 설정은 Windows 터미널 내에서 실행된 애플리케이션에만 적용됩니다.</value>
-  </data>
-  <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
-    <value>좁게</value>
-    <comment>As in "narrow width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth_Wide.Text" xml:space="preserve">
-    <value>넓게</value>
-    <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
  <data name="Globals_InitialCols.Text" xml:space="preserve">
    <value>열</value>
    <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
@@ -507,7 +492,7 @@
  </data>
  <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
    <value>제목 표시줄 숨기기(다시 시작해야 함)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
  </data>
  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
    <value>사용하지 않도록 설정하면 제목 표시줄이 탭 위에 표시됩니다.</value>
@@ -983,11 +968,11 @@
    <comment>{Locked="‗"} An option to choose from for the "cursor shape" setting. When selected, the cursor will look like a stacked set of two underscores. The character in the parentheses is used to show what it looks like.</comment>
  </data>
  <data name="Profile_FontFace.Header" xml:space="preserve">
-    <value>글꼴 스타일</value>
+    <value>글꼴</value>
    <comment>Header for a control to select the font for text in the app.</comment>
  </data>
  <data name="Profile_FontFaceBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>글꼴 스타일</value>
+    <value>글꼴</value>
    <comment>Name for a control to select the font for text in the app.</comment>
  </data>
  <data name="Profile_FontFace.HelpText" xml:space="preserve">
@@ -1195,15 +1180,15 @@
  </data>
  <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>시작 디렉터리</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.Header" xml:space="preserve">
    <value>시작 디렉터리</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>시작 디렉터리</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
    <value>프로필이 로드될 때 시작됩니다.</value>
@@ -2147,7 +2132,7 @@
  </data>
  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>바로 가기</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
  </data>
  <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
    <value>텍스트 서식 지정</value>
@@ -2606,19 +2591,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL(C:\ 🡒 /mnt/c)</value>
+    <value>WSL(C:\ -&gt; /mnt/c)</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin(C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin(C:\ -&gt; /cygdrive/c)</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2(C:\ 🡒 /c)</value>
+    <value>MSYS2(C:\ -&gt; /c)</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW(C:\ 🡒 C:/)</value>
+    <value>MinGW(C:\ -&gt; C:/)</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw
@@ -371,21 +371,6 @@
  <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
    <value>Console do Windows</value>
  </data>
-  <data name="Globals_AmbiguousWidth.Header" xml:space="preserve">
-    <value>Largura de caracteres ambíguos</value>
-    <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
-    <value>Define a largura usada para caracteres ambíguos do Leste Asiático. "Estreito" (padrão) prioriza a compatibilidade, enquanto "Amplo" prioriza a legibilidade com muitas fontes CJK. No modo "Amplo", alguns aplicativos podem não funcionar corretamente e provocar movimento irregular do cursor. Alterar essa configuração exige reiniciar o Terminal do Windows e vale só para aplicativos iniciados dentro dele.</value>
-  </data>
-  <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
-    <value>Estreita</value>
-    <comment>As in "narrow width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth_Wide.Text" xml:space="preserve">
-    <value>Largo</value>
-    <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
  <data name="Globals_InitialCols.Text" xml:space="preserve">
    <value>Colunas</value>
    <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
@@ -507,7 +492,7 @@
  </data>
  <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
    <value>Oculta a barra do título (requer reinicialização)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
  </data>
  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
    <value>Quando desabilitada, a barra de título aparecerá acima das guias.</value>
@@ -983,15 +968,15 @@
    <comment>{Locked="‗"} An option to choose from for the "cursor shape" setting. When selected, the cursor will look like a stacked set of two underscores. The character in the parentheses is used to show what it looks like.</comment>
  </data>
  <data name="Profile_FontFace.Header" xml:space="preserve">
-    <value>Variação</value>
+    <value>Tipo de fonte</value>
    <comment>Header for a control to select the font for text in the app.</comment>
  </data>
  <data name="Profile_FontFaceBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Variação</value>
+    <value>Tipo de fonte</value>
    <comment>Name for a control to select the font for text in the app.</comment>
  </data>
  <data name="Profile_FontFace.HelpText" xml:space="preserve">
-    <value>Você pode usar várias fontes, separando-as com uma vírgula ASCII.</value>
+    <value>Pode utilizar vários tipos de letra separando-os com uma vírgula ASCII.</value>
  </data>
  <data name="Profile_FontSize.Header" xml:space="preserve">
    <value>Tamanho da fonte</value>
@@ -1195,15 +1180,15 @@
  </data>
  <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Diretório inicial</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.Header" xml:space="preserve">
    <value>Diretório inicial</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Diretório inicial</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
    <value>A pasta em que o perfil começa quando é carregado.</value>
@@ -1742,7 +1727,7 @@
    <comment>A supplementary setting to the "font face" setting. Toggling this control updates the font face control to show all of the fonts installed.</comment>
  </data>
  <data name="Profile_FontFaceShowAllFonts.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Se ativado, mostra todas as fontes instaladas na lista acima. Caso contrário, mostra apenas as fontes monoespaçadas.</value>
+    <value>Se habilitado, mostrar todas as fontes instaladas na lista acima. Caso contrário, mostrar apenas a lista de fontes com espaçamento mono.</value>
    <comment>A description for what the supplementary "show all fonts" setting does. Presented near "Profile_FontFaceShowAllFonts".</comment>
  </data>
  <data name="Profile_CreateUnfocusedAppearanceButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@@ -2147,7 +2132,7 @@
  </data>
  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Atalho</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
  </data>
  <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
    <value>Formatação de Texto</value>
@@ -2606,19 +2591,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw
@@ -293,7 +293,7 @@
    <comment>Header for a control to set the query URL when using the "search web" action.</comment>
  </data>
  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
-    <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ьē ŕěρļąč℮ď ẁїτђ τђέ śеªřсħ qцегỳ. !!! !!! !!! !!! !!! !!!</value>
+    <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ѓēφŀāćεđ ẃĩτђ τђе šέªґ¢ħ qύėгў. !!! !!! !!! !!! !!! !!</value>
    <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
  </data>
  <data name="Globals_TrimBlockSelection.Header" xml:space="preserve">
@@ -371,21 +371,6 @@
  <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
    <value>Щіŋďŏшś Ĉǿŉşöℓę !!! !</value>
  </data>
-  <data name="Globals_AmbiguousWidth.Header" xml:space="preserve">
-    <value>Ẅίďτħ οƒ àmъïġũõŭś ¢ћäřаčτëŕś !!! !!! !!!</value>
-    <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
-    <value>Šеŧѕ тĥé ẃίďтн цšеď ƒθŕ Ёāѕť Дѕїāπ Δmъìĝůόųş ¢ĥǻŕǻćτєŗş. "Νǻяѓòш" (đéƒåųĺţ) ρґΐõѓіŧīźéѕ ċǿmραťĭвĭľΐτŷ, ẃђίļė "Ẁîδ℮" рŕīόŕïтϊźĕş гèáðàвіℓīτў ẁìτн мâйý ČЈК ƒблťś. Ĩл "Шϊďε" mőδє, şõmе áρφļĭĉªτιόņś мąу ⁿõт ẃóѓк çθřŕзçτłў αŋδ čäűѕє ℮ŗѓāŧíć ςŭѓşοґ mòνėmĕŋť. Ċђªŋĝϊйġ тнϊş śэттĩņģ ŕêqůįŗëš å ř℮ŝţâгŧ ōƒ Ẁίήďôωş Ţёŕмĭиàĺ ąηδ îт öŉłý ãφрŀįέѕ τő ąρрļĭсатįŏлŝ ℓаϋⁿćћ℮ð ƒřом шìтħїή îť. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
-  </data>
-  <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
-    <value>Ŋǻŕґŏш !</value>
-    <comment>As in "narrow width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth_Wide.Text" xml:space="preserve">
-    <value>Шĭðе !</value>
-    <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
  <data name="Globals_InitialCols.Text" xml:space="preserve">
    <value>Ċσŀùмñѕ !!</value>
    <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
@@ -507,7 +492,7 @@
  </data>
  <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
    <value>Ĥìđε тħê τīţĺё ъªř (ŗėqūΐŗêś яеľаϋŉčћ) !!! !!! !!! !!</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
  </data>
  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
    <value>Ẃћèп ðϊŝαъłėð, тнė ťĭτłê вąѓ ẁιĺł ąφφёǻŕ äвöνė ŧħė ťãьś. !!! !!! !!! !!! !!! !</value>
@@ -1195,15 +1180,15 @@
  </data>
  <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Ŝταяτìлĝ ðĩѓ℮ćτоŗỳ !!! !!</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.Header" xml:space="preserve">
    <value>Ѕťåřťіπġ đíгëĉţöґγ !!! !!</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Šтдřтíⁿģ đϊŕёςŧôŗў !!! !!</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
    <value>Ţћé đĭŗéçťòŕу τħе рѓøƒĩŀе śťªřťş ïή ẅћĕл îţ ίѕ ŀбдδėď. !!! !!! !!! !!! !!! !</value>
@@ -2147,7 +2132,7 @@
  </data>
  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Şħōяŧ¢цτ !!</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
  </data>
  <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
    <value>Ťĕхτ ₣ôямåτţίŉğ !!! !</value>
@@ -2610,19 +2595,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c) !!! !!!</value>
+    <value>WSL (C:\ -&gt; /mnt/c) !!! !!!</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c) !!! !!! !!</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c) !!! !!! !!</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c) !!! !!</value>
+    <value>MSYS2 (C:\ -&gt; /c) !!! !!</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/) !!! !!</value>
+    <value>MinGW (C:\ -&gt; C:/) !!! !!</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw
@@ -293,7 +293,7 @@
    <comment>Header for a control to set the query URL when using the "search web" action.</comment>
  </data>
  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
-    <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ьē ŕěρļąč℮ď ẁїτђ τђέ śеªřсħ qцегỳ. !!! !!! !!! !!! !!! !!!</value>
+    <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ѓēφŀāćεđ ẃĩτђ τђе šέªґ¢ħ qύėгў. !!! !!! !!! !!! !!! !!</value>
    <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
  </data>
  <data name="Globals_TrimBlockSelection.Header" xml:space="preserve">
@@ -371,21 +371,6 @@
  <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
    <value>Щіŋďŏшś Ĉǿŉşöℓę !!! !</value>
  </data>
-  <data name="Globals_AmbiguousWidth.Header" xml:space="preserve">
-    <value>Ẅίďτħ οƒ àmъïġũõŭś ¢ћäřаčτëŕś !!! !!! !!!</value>
-    <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
-    <value>Šеŧѕ тĥé ẃίďтн цšеď ƒθŕ Ёāѕť Дѕїāπ Δmъìĝůόųş ¢ĥǻŕǻćτєŗş. "Νǻяѓòш" (đéƒåųĺţ) ρґΐõѓіŧīźéѕ ċǿmραťĭвĭľΐτŷ, ẃђίļė "Ẁîδ℮" рŕīόŕïтϊźĕş гèáðàвіℓīτў ẁìτн мâйý ČЈК ƒблťś. Ĩл "Шϊďε" mőδє, şõmе áρφļĭĉªτιόņś мąу ⁿõт ẃóѓк çθřŕзçτłў αŋδ čäűѕє ℮ŗѓāŧíć ςŭѓşοґ mòνėmĕŋť. Ċђªŋĝϊйġ тнϊş śэттĩņģ ŕêqůįŗëš å ř℮ŝţâгŧ ōƒ Ẁίήďôωş Ţёŕмĭиàĺ ąηδ îт öŉłý ãφрŀįέѕ τő ąρрļĭсатįŏлŝ ℓаϋⁿćћ℮ð ƒřом шìтħїή îť. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
-  </data>
-  <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
-    <value>Ŋǻŕґŏш !</value>
-    <comment>As in "narrow width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth_Wide.Text" xml:space="preserve">
-    <value>Шĭðе !</value>
-    <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
  <data name="Globals_InitialCols.Text" xml:space="preserve">
    <value>Ċσŀùмñѕ !!</value>
    <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
@@ -507,7 +492,7 @@
  </data>
  <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
    <value>Ĥìđε тħê τīţĺё ъªř (ŗėqūΐŗêś яеľаϋŉčћ) !!! !!! !!! !!</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
  </data>
  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
    <value>Ẃћèп ðϊŝαъłėð, тнė ťĭτłê вąѓ ẁιĺł ąφφёǻŕ äвöνė ŧħė ťãьś. !!! !!! !!! !!! !!! !</value>
@@ -1195,15 +1180,15 @@
  </data>
  <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Ŝταяτìлĝ ðĩѓ℮ćτоŗỳ !!! !!</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.Header" xml:space="preserve">
    <value>Ѕťåřťіπġ đíгëĉţöґγ !!! !!</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Šтдřтíⁿģ đϊŕёςŧôŗў !!! !!</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
    <value>Ţћé đĭŗéçťòŕу τħе рѓøƒĩŀе śťªřťş ïή ẅћĕл îţ ίѕ ŀбдδėď. !!! !!! !!! !!! !!! !</value>
@@ -2147,7 +2132,7 @@
  </data>
  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Şħōяŧ¢цτ !!</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
  </data>
  <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
    <value>Ťĕхτ ₣ôямåτţίŉğ !!! !</value>
@@ -2610,19 +2595,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c) !!! !!!</value>
+    <value>WSL (C:\ -&gt; /mnt/c) !!! !!!</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c) !!! !!! !!</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c) !!! !!! !!</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c) !!! !!</value>
+    <value>MSYS2 (C:\ -&gt; /c) !!! !!</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/) !!! !!</value>
+    <value>MinGW (C:\ -&gt; C:/) !!! !!</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw
@@ -293,7 +293,7 @@
    <comment>Header for a control to set the query URL when using the "search web" action.</comment>
  </data>
  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
-    <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ьē ŕěρļąč℮ď ẁїτђ τђέ śеªřсħ qцегỳ. !!! !!! !!! !!! !!! !!!</value>
+    <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ѓēφŀāćεđ ẃĩτђ τђе šέªґ¢ħ qύėгў. !!! !!! !!! !!! !!! !!</value>
    <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
  </data>
  <data name="Globals_TrimBlockSelection.Header" xml:space="preserve">
@@ -371,21 +371,6 @@
  <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
    <value>Щіŋďŏшś Ĉǿŉşöℓę !!! !</value>
  </data>
-  <data name="Globals_AmbiguousWidth.Header" xml:space="preserve">
-    <value>Ẅίďτħ οƒ àmъïġũõŭś ¢ћäřаčτëŕś !!! !!! !!!</value>
-    <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
-    <value>Šеŧѕ тĥé ẃίďтн цšеď ƒθŕ Ёāѕť Дѕїāπ Δmъìĝůόųş ¢ĥǻŕǻćτєŗş. "Νǻяѓòш" (đéƒåųĺţ) ρґΐõѓіŧīźéѕ ċǿmραťĭвĭľΐτŷ, ẃђίļė "Ẁîδ℮" рŕīόŕïтϊźĕş гèáðàвіℓīτў ẁìτн мâйý ČЈК ƒблťś. Ĩл "Шϊďε" mőδє, şõmе áρφļĭĉªτιόņś мąу ⁿõт ẃóѓк çθřŕзçτłў αŋδ čäűѕє ℮ŗѓāŧíć ςŭѓşοґ mòνėmĕŋť. Ċђªŋĝϊйġ тнϊş śэттĩņģ ŕêqůįŗëš å ř℮ŝţâгŧ ōƒ Ẁίήďôωş Ţёŕмĭиàĺ ąηδ îт öŉłý ãφрŀįέѕ τő ąρрļĭсатįŏлŝ ℓаϋⁿćћ℮ð ƒřом шìтħїή îť. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
-  </data>
-  <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
-    <value>Ŋǻŕґŏш !</value>
-    <comment>As in "narrow width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth_Wide.Text" xml:space="preserve">
-    <value>Шĭðе !</value>
-    <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
  <data name="Globals_InitialCols.Text" xml:space="preserve">
    <value>Ċσŀùмñѕ !!</value>
    <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
@@ -507,7 +492,7 @@
  </data>
  <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
    <value>Ĥìđε тħê τīţĺё ъªř (ŗėqūΐŗêś яеľаϋŉčћ) !!! !!! !!! !!</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
  </data>
  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
    <value>Ẃћèп ðϊŝαъłėð, тнė ťĭτłê вąѓ ẁιĺł ąφφёǻŕ äвöνė ŧħė ťãьś. !!! !!! !!! !!! !!! !</value>
@@ -1195,15 +1180,15 @@
  </data>
  <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Ŝταяτìлĝ ðĩѓ℮ćτоŗỳ !!! !!</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.Header" xml:space="preserve">
    <value>Ѕťåřťіπġ đíгëĉţöґγ !!! !!</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Šтдřтíⁿģ đϊŕёςŧôŗў !!! !!</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
    <value>Ţћé đĭŗéçťòŕу τħе рѓøƒĩŀе śťªřťş ïή ẅћĕл îţ ίѕ ŀбдδėď. !!! !!! !!! !!! !!! !</value>
@@ -2147,7 +2132,7 @@
  </data>
  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Şħōяŧ¢цτ !!</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
  </data>
  <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
    <value>Ťĕхτ ₣ôямåτţίŉğ !!! !</value>
@@ -2610,19 +2595,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c) !!! !!!</value>
+    <value>WSL (C:\ -&gt; /mnt/c) !!! !!!</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c) !!! !!! !!</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c) !!! !!! !!</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c) !!! !!</value>
+    <value>MSYS2 (C:\ -&gt; /c) !!! !!</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/) !!! !!</value>
+    <value>MinGW (C:\ -&gt; C:/) !!! !!</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw
@@ -371,21 +371,6 @@
  <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
    <value>Консоль Windows</value>
  </data>
-  <data name="Globals_AmbiguousWidth.Header" xml:space="preserve">
-    <value>Ширина символов в пропорциональных шрифтах</value>
-    <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
-    <value>Задает ширину для символов восточноазиатских шрифтов. Значение "Узкая" (по умолчанию) обеспечивает совместимость, а "Широкая" улучшает читаемость большинства шрифтов CJK. В режиме "Широкая" некоторые приложения могут работать неправильно, что приводит к беспорядочному движению курсора. Изменение этого параметра требует перезапуска Терминала Windows и применяется только к приложениям, запущенным из него.</value>
-  </data>
-  <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
-    <value>Узкие</value>
-    <comment>As in "narrow width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth_Wide.Text" xml:space="preserve">
-    <value>Широкие</value>
-    <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
  <data name="Globals_InitialCols.Text" xml:space="preserve">
    <value>Столбцы</value>
    <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
@@ -507,7 +492,7 @@
  </data>
  <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
    <value>Скрыть заголовок окна (требуется перезапуск)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
  </data>
  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
    <value>Если этот параметр отключен, строка заголовка будет отображаться над вкладками.</value>
@@ -1195,15 +1180,15 @@
  </data>
  <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Начальный каталог</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.Header" xml:space="preserve">
    <value>Запуск каталога</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Начальный каталог</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
    <value>Каталог, запускаемый профилем при загрузке.</value>
@@ -2147,7 +2132,7 @@
  </data>
  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Сочетание клавиш</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
  </data>
  <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
    <value>Форматирование текста</value>
@@ -2606,19 +2591,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw
@@ -371,21 +371,6 @@
  <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
    <value>Windows 控制台</value>
  </data>
-  <data name="Globals_AmbiguousWidth.Header" xml:space="preserve">
-    <value>模糊字符的宽度</value>
-    <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
-    <value>设置东亚模糊字符的宽度。"窄"模式(默认)优先考虑兼容性，而"宽"模式优先考虑很多中日韩字体的可读性。在"宽"模式下，某些应用程序可能无法正常工作，并导致光标不规则移动。更改此设置需要重启 Windows 终端，而且仅适用于从终端中启动的应用程序。</value>
-  </data>
-  <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
-    <value>窄</value>
-    <comment>As in "narrow width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth_Wide.Text" xml:space="preserve">
-    <value>宽</value>
-    <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
  <data name="Globals_InitialCols.Text" xml:space="preserve">
    <value>列</value>
    <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
@@ -507,7 +492,7 @@
  </data>
  <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
    <value>隐藏标题栏（需要重新启动）</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
  </data>
  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
    <value>禁用后，标题栏将显示在选项卡上方。</value>
@@ -1195,15 +1180,15 @@
  </data>
  <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>启动目录</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.Header" xml:space="preserve">
    <value>启动目录</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>正在启动目录</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
    <value>加载配置文件时启动的目录。</value>
@@ -2147,7 +2132,7 @@
  </data>
  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>快捷方式</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
  </data>
  <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
    <value>文本格式</value>
@@ -2606,19 +2591,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw
@@ -293,7 +293,7 @@
    <comment>Header for a control to set the query URL when using the "search web" action.</comment>
  </data>
  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
-    <value>預留位置 "%s" 將以搜尋查詢取代。</value>
+    <value>佔位元 "%s" 將取代為搜尋查詢。</value>
    <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
  </data>
  <data name="Globals_TrimBlockSelection.Header" xml:space="preserve">
@@ -371,21 +371,6 @@
  <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
    <value>Windows 主控台</value>
  </data>
-  <data name="Globals_AmbiguousWidth.Header" xml:space="preserve">
-    <value>模糊字元寬度</value>
-    <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
-    <value>設定東亞模糊字元的寬度。「窄」(預設) 以相容性為優先，而「寬」則以多數中日韓字型的可讀性為優先。在「寬」模式下，部分應用程式可能無法正常運作，導致游標移動異常。變更此設定後，需重新啟動 Windows 終端機，且僅適用於從 Windows 終端機內啟動的應用程式。</value>
-  </data>
-  <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
-    <value>窄</value>
-    <comment>As in "narrow width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
-  <data name="Globals_AmbiguousWidth_Wide.Text" xml:space="preserve">
-    <value>寬</value>
-    <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
-  </data>
  <data name="Globals_InitialCols.Text" xml:space="preserve">
    <value>欄</value>
    <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
@@ -507,7 +492,7 @@
  </data>
  <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
    <value>隱藏標題列 (需要重新啟動)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
  </data>
  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
    <value>停用時，標題列會出現在索引標籤上方。</value>
@@ -1195,15 +1180,15 @@
  </data>
  <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>起始目錄</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.Header" xml:space="preserve">
    <value>啟動時載入的目錄</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>起始目錄</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
  </data>
  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
    <value>載入時，設定檔起始的目錄。</value>
@@ -2147,7 +2132,7 @@
  </data>
  <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>捷徑</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
  </data>
  <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
    <value>文字格式設定</value>
@@ -2606,19 +2591,19 @@
    <comment>An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
    <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
    <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
    <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
    <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
  </data>
  <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp
@@ -647,12 +647,9 @@ void CascadiaSettings::_validateMediaResources()

    _globals->ResolveMediaResources(mediaResourceResolver);

-    if (Feature_WarnOnInvalidSettingsMediaResources::IsEnabled())
+    if (_foundInvalidUserResources)
    {
-        if (_foundInvalidUserResources)
-        {
-            _warnings.Append(SettingsLoadWarnings::InvalidMediaResource);
-        }
+        _warnings.Append(SettingsLoadWarnings::InvalidMediaResource);
    }
 }

--- a/src/cascadia/TerminalSettingsModel/EnumMappings.cpp
+++ b/src/cascadia/TerminalSettingsModel/EnumMappings.cpp
@@ -53,6 +53,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
    DEFINE_ENUM_MAP(Microsoft::Terminal::Settings::Model::IntenseStyle, IntenseTextStyle);
    DEFINE_ENUM_MAP(Microsoft::Terminal::Core::AdjustTextMode, AdjustIndistinguishableColors);
    DEFINE_ENUM_MAP(Microsoft::Terminal::Control::PathTranslationStyle, PathTranslationStyle);
+    DEFINE_ENUM_MAP(Microsoft::Terminal::Control::AutoDetectRunningCommand, AutoDetectRunningCommand);

    // Actions
    DEFINE_ENUM_MAP(Microsoft::Terminal::Settings::Model::ResizeDirection, ResizeDirection);
--- a/src/cascadia/TerminalSettingsModel/EnumMappings.h
+++ b/src/cascadia/TerminalSettingsModel/EnumMappings.h
@@ -51,6 +51,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
        static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::Microsoft::Terminal::Settings::Model::IntenseStyle> IntenseTextStyle();
        static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::Microsoft::Terminal::Core::AdjustTextMode> AdjustIndistinguishableColors();
        static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::Microsoft::Terminal::Control::PathTranslationStyle> PathTranslationStyle();
+        static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::Microsoft::Terminal::Control::AutoDetectRunningCommand> AutoDetectRunningCommand();

        // Actions
        static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::Microsoft::Terminal::Settings::Model::ResizeDirection> ResizeDirection();
--- a/src/cascadia/TerminalSettingsModel/EnumMappings.idl
+++ b/src/cascadia/TerminalSettingsModel/EnumMappings.idl
@@ -33,6 +33,7 @@ namespace Microsoft.Terminal.Settings.Model
        static Windows.Foundation.Collections.IMap<String, UInt16> FontWeight { get; };
        static Windows.Foundation.Collections.IMap<String, Microsoft.Terminal.Settings.Model.IntenseStyle> IntenseTextStyle { get; };
        static Windows.Foundation.Collections.IMap<String, Microsoft.Terminal.Control.PathTranslationStyle> PathTranslationStyle { get; };
+        static Windows.Foundation.Collections.IMap<String, Microsoft.Terminal.Control.AutoDetectRunningCommand> AutoDetectRunningCommand { get; };

        // Actions
        static Windows.Foundation.Collections.IMap<String, Microsoft.Terminal.Settings.Model.ResizeDirection> ResizeDirection { get; };
--- a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp
+++ b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp
@@ -102,14 +102,6 @@ winrt::com_ptr<GlobalAppSettings> GlobalAppSettings::Copy() const
            globals->_DisabledProfileSources->Append(src);
        }
    }
-    if (_SafeUriSchemes)
-    {
-        globals->_SafeUriSchemes = winrt::single_threaded_vector<hstring>();
-        for (const auto& src : *_SafeUriSchemes)
-        {
-            globals->_SafeUriSchemes->Append(src);
-        }
-    }

    for (const auto& parent : _parents)
    {
--- a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl
+++ b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl
@@ -107,7 +107,6 @@ namespace Microsoft.Terminal.Settings.Model
        INHERITABLE_SETTING(Boolean, EnableUnfocusedAcrylic);
        INHERITABLE_SETTING(Boolean, AllowHeadless);
        INHERITABLE_SETTING(String, SearchWebDefaultQueryUrl);
-        INHERITABLE_SETTING(IVector<String>, SafeUriSchemes);

        Windows.Foundation.Collections.IMapView<String, ColorScheme> ColorSchemes();
        void AddColorScheme(ColorScheme scheme);
--- a/src/cascadia/TerminalSettingsModel/MTSMSettings.h
+++ b/src/cascadia/TerminalSettingsModel/MTSMSettings.h
@@ -63,7 +63,6 @@ Author(s):
    X(bool, MinimizeToNotificationArea, "minimizeToNotificationArea", false)                                                                                                                          \
    X(bool, AlwaysShowNotificationIcon, "alwaysShowNotificationIcon", false)                                                                                                                          \
    X(winrt::Windows::Foundation::Collections::IVector<winrt::hstring>, DisabledProfileSources, "disabledProfileSources", nullptr)                                                                    \
-    X(winrt::Windows::Foundation::Collections::IVector<winrt::hstring>, SafeUriSchemes, "safeUriSchemes", nullptr)                                                                                    \
    X(bool, ShowAdminShield, "showAdminShield", true)                                                                                                                                                 \
    X(bool, TrimPaste, "trimPaste", true)                                                                                                                                                             \
    X(bool, EnableColorSelection, "experimental.enableColorSelection", false)                                                                                                                         \
@@ -80,36 +79,39 @@ Author(s):
 // * TerminalSettings.cpp: TerminalSettings::_ApplyProfileSettings
 // * IControlSettings.idl or ICoreSettings.idl
 // * ControlProperties.h
-#define MTSM_PROFILE_SETTINGS(X)                                                                                                                               \
-    X(int32_t, HistorySize, "historySize", DEFAULT_HISTORY_SIZE)                                                                                               \
-    X(bool, SnapOnInput, "snapOnInput", true)                                                                                                                  \
-    X(bool, AltGrAliasing, "altGrAliasing", true)                                                                                                              \
-    X(hstring, AnswerbackMessage, "answerbackMessage")                                                                                                         \
-    X(hstring, Commandline, "commandline", L"%SystemRoot%\\System32\\cmd.exe")                                                                                 \
-    X(Microsoft::Terminal::Control::ScrollbarState, ScrollState, "scrollbarState", Microsoft::Terminal::Control::ScrollbarState::Visible)                      \
-    X(Microsoft::Terminal::Control::TextAntialiasingMode, AntialiasingMode, "antialiasingMode", Microsoft::Terminal::Control::TextAntialiasingMode::Grayscale) \
-    X(hstring, StartingDirectory, "startingDirectory")                                                                                                         \
-    X(IMediaResource, Icon, "icon", implementation::MediaResource::FromString(L"\uE756"))                                                                      \
-    X(bool, SuppressApplicationTitle, "suppressApplicationTitle", false)                                                                                       \
-    X(guid, ConnectionType, "connectionType")                                                                                                                  \
-    X(CloseOnExitMode, CloseOnExit, "closeOnExit", CloseOnExitMode::Automatic)                                                                                 \
-    X(hstring, TabTitle, "tabTitle")                                                                                                                           \
-    X(Model::BellStyle, BellStyle, "bellStyle", BellStyle::Audible)                                                                                            \
-    X(IEnvironmentVariableMap, EnvironmentVariables, "environment", nullptr)                                                                                   \
-    X(bool, RightClickContextMenu, "rightClickContextMenu", false)                                                                                             \
-    X(Windows::Foundation::Collections::IVector<IMediaResource>, BellSound, "bellSound", nullptr)                                                              \
-    X(bool, Elevate, "elevate", false)                                                                                                                         \
-    X(bool, AutoMarkPrompts, "autoMarkPrompts", true)                                                                                                          \
-    X(bool, ShowMarks, "showMarksOnScrollbar", false)                                                                                                          \
-    X(bool, RepositionCursorWithMouse, "experimental.repositionCursorWithMouse", false)                                                                        \
-    X(bool, ReloadEnvironmentVariables, "compatibility.reloadEnvironmentVariables", true)                                                                      \
-    X(bool, RainbowSuggestions, "experimental.rainbowSuggestions", false)                                                                                      \
-    X(bool, ForceVTInput, "compatibility.input.forceVT", false)                                                                                                \
-    X(bool, AllowKittyKeyboardMode, "compatibility.kittyKeyboardMode", true)                                                                                   \
-    X(bool, AllowVtChecksumReport, "compatibility.allowDECRQCRA", false)                                                                                       \
-    X(bool, AllowVtClipboardWrite, "compatibility.allowOSC52", true)                                                                                           \
-    X(bool, AllowKeypadMode, "compatibility.allowDECNKM", false)                                                                                               \
-    X(Microsoft::Terminal::Control::PathTranslationStyle, PathTranslationStyle, "pathTranslationStyle", Microsoft::Terminal::Control::PathTranslationStyle::None)
+#define MTSM_PROFILE_SETTINGS(X)                                                                                                                                           \
+    X(int32_t, HistorySize, "historySize", DEFAULT_HISTORY_SIZE)                                                                                                           \
+    X(bool, SnapOnInput, "snapOnInput", true)                                                                                                                              \
+    X(bool, AltGrAliasing, "altGrAliasing", true)                                                                                                                          \
+    X(hstring, AnswerbackMessage, "answerbackMessage")                                                                                                                     \
+    X(hstring, Commandline, "commandline", L"%SystemRoot%\\System32\\cmd.exe")                                                                                             \
+    X(Microsoft::Terminal::Control::ScrollbarState, ScrollState, "scrollbarState", Microsoft::Terminal::Control::ScrollbarState::Visible)                                  \
+    X(Microsoft::Terminal::Control::TextAntialiasingMode, AntialiasingMode, "antialiasingMode", Microsoft::Terminal::Control::TextAntialiasingMode::Grayscale)             \
+    X(hstring, StartingDirectory, "startingDirectory")                                                                                                                     \
+    X(IMediaResource, Icon, "icon", implementation::MediaResource::FromString(L"\uE756"))                                                                                  \
+    X(bool, SuppressApplicationTitle, "suppressApplicationTitle", false)                                                                                                   \
+    X(guid, ConnectionType, "connectionType")                                                                                                                              \
+    X(CloseOnExitMode, CloseOnExit, "closeOnExit", CloseOnExitMode::Automatic)                                                                                             \
+    X(hstring, TabTitle, "tabTitle")                                                                                                                                       \
+    X(Model::BellStyle, BellStyle, "bellStyle", BellStyle::Audible)                                                                                                        \
+    X(IEnvironmentVariableMap, EnvironmentVariables, "environment", nullptr)                                                                                               \
+    X(bool, RightClickContextMenu, "rightClickContextMenu", false)                                                                                                         \
+    X(Windows::Foundation::Collections::IVector<IMediaResource>, BellSound, "bellSound", nullptr)                                                                          \
+    X(bool, Elevate, "elevate", false)                                                                                                                                     \
+    X(bool, AutoMarkPrompts, "autoMarkPrompts", true)                                                                                                                      \
+    X(bool, ShowMarks, "showMarksOnScrollbar", false)                                                                                                                      \
+    X(bool, RepositionCursorWithMouse, "experimental.repositionCursorWithMouse", false)                                                                                    \
+    X(bool, ReloadEnvironmentVariables, "compatibility.reloadEnvironmentVariables", true)                                                                                  \
+    X(bool, RainbowSuggestions, "experimental.rainbowSuggestions", false)                                                                                                  \
+    X(bool, ForceVTInput, "compatibility.input.forceVT", false)                                                                                                            \
+    X(bool, AllowKittyKeyboardMode, "compatibility.kittyKeyboardMode", true)                                                                                               \
+    X(bool, AllowVtChecksumReport, "compatibility.allowDECRQCRA", false)                                                                                                   \
+    X(bool, AllowVtClipboardWrite, "compatibility.allowOSC52", true)                                                                                                       \
+    X(bool, AllowKeypadMode, "compatibility.allowDECNKM", false)                                                                                                           \
+    X(Microsoft::Terminal::Control::PathTranslationStyle, PathTranslationStyle, "pathTranslationStyle", Microsoft::Terminal::Control::PathTranslationStyle::None)          \
+    X(Microsoft::Terminal::Control::OutputNotificationStyle, NotifyOnInactiveOutput, "notifyOnInactiveOutput", Microsoft::Terminal::Control::OutputNotificationStyle{ 0 }) \
+    X(Microsoft::Terminal::Control::OutputNotificationStyle, NotifyOnNextPrompt, "notifyOnNextPrompt", Microsoft::Terminal::Control::OutputNotificationStyle{ 0 })         \
+    X(Microsoft::Terminal::Control::AutoDetectRunningCommand, AutoDetectRunningCommand, "autoDetectRunningCommand", Microsoft::Terminal::Control::AutoDetectRunningCommand::Disabled)

 // Intentionally omitted Profile settings:
 // * Name
--- a/src/cascadia/TerminalSettingsModel/Profile.idl
+++ b/src/cascadia/TerminalSettingsModel/Profile.idl
@@ -94,5 +94,9 @@ namespace Microsoft.Terminal.Settings.Model
        INHERITABLE_PROFILE_SETTING(Boolean, AllowVtClipboardWrite);

        INHERITABLE_PROFILE_SETTING(Microsoft.Terminal.Control.PathTranslationStyle, PathTranslationStyle);
+
+        INHERITABLE_PROFILE_SETTING(Microsoft.Terminal.Control.OutputNotificationStyle, NotifyOnInactiveOutput);
+        INHERITABLE_PROFILE_SETTING(Microsoft.Terminal.Control.OutputNotificationStyle, NotifyOnNextPrompt);
+        INHERITABLE_PROFILE_SETTING(Microsoft.Terminal.Control.AutoDetectRunningCommand, AutoDetectRunningCommand);
    }
 }
--- a/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h
+++ b/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h
@@ -119,6 +119,46 @@ JSON_FLAG_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::BellStyle)
    }
 };

+JSON_FLAG_MAPPER(::winrt::Microsoft::Terminal::Control::OutputNotificationStyle)
+{
+    static constexpr std::array<pair_type, 6> mappings = {
+        pair_type{ "none", AllClear },
+        pair_type{ "taskbar", ValueType::Taskbar },
+        pair_type{ "audible", ValueType::Audible },
+        pair_type{ "tab", ValueType::Tab },
+        pair_type{ "notification", ValueType::Notification },
+        pair_type{ "all", AllSet },
+    };
+
+    auto FromJson(const Json::Value& json)
+    {
+        if (json.isBool())
+        {
+            return json.asBool() ? ValueType::Tab : AllClear;
+        }
+        return BaseFlagMapper::FromJson(json);
+    }
+
+    bool CanConvert(const Json::Value& json)
+    {
+        return BaseFlagMapper::CanConvert(json) || json.isBool();
+    }
+
+    Json::Value ToJson(const ::winrt::Microsoft::Terminal::Control::OutputNotificationStyle& style)
+    {
+        return BaseFlagMapper::ToJson(style);
+    }
+};
+
+JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Control::AutoDetectRunningCommand)
+{
+    JSON_MAPPINGS(3) = {
+        pair_type{ "disabled", ValueType::Disabled },
+        pair_type{ "automatic", ValueType::Automatic },
+        pair_type{ "progress", ValueType::Progress },
+    };
+};
+
 JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::ConvergedAlignment)
 {
    // reduce repetition
--- a/src/cascadia/TerminalSettingsModel/VsDevShellGenerator.cpp
+++ b/src/cascadia/TerminalSettingsModel/VsDevShellGenerator.cpp
@@ -8,16 +8,6 @@

 using namespace winrt::Microsoft::Terminal::Settings::Model;

-static bool _IsPwshAvailable()
-{
-    // Try to detect if `pwsh.exe` is available in the PATH, if so we want to use that
-    // Allow some extra space in case user put it somewhere odd
-    // We do need to allocate space for the full path even if we don't want to paste the whole thing in
-    wchar_t pwshPath[MAX_PATH] = { 0 };
-    const auto pwshExeName = L"pwsh.exe";
-    return SearchPathW(nullptr, pwshExeName, nullptr, MAX_PATH, pwshPath, nullptr);
-}
-
 void VsDevShellGenerator::GenerateProfiles(const VsSetupConfiguration::VsSetupInstance& instance, bool hidden, std::vector<winrt::com_ptr<implementation::Profile>>& profiles) const
 {
    try
@@ -31,10 +21,9 @@ void VsDevShellGenerator::GenerateProfiles(const VsSetupConfiguration::VsSetupIn
        const winrt::guid profileGuid{ ::Microsoft::Console::Utils::CreateV5Uuid(TERMINAL_PROFILE_NAMESPACE_GUID, std::as_bytes(std::span{ seed })) };
        auto profile = winrt::make_self<implementation::Profile>(profileGuid);
        profile->Name(winrt::hstring{ GetProfileName(instance) });
-        auto isPwsh = _IsPwshAvailable();
-        profile->Commandline(winrt::hstring{ GetProfileCommandLine(instance, isPwsh) });
+        profile->Commandline(winrt::hstring{ GetProfileCommandLine(instance) });
        profile->StartingDirectory(winrt::hstring{ instance.GetInstallationPath() });
-        profile->Icon(winrt::hstring{ GetProfileIconPath(isPwsh) });
+        profile->Icon(winrt::hstring{ GetProfileIconPath() });
        profile->Hidden(hidden);
        profiles.emplace_back(std::move(profile));
    }
@@ -48,15 +37,20 @@ std::wstring VsDevShellGenerator::GetProfileName(const VsSetupConfiguration::VsS
    return name;
 }

-std::wstring VsDevShellGenerator::GetProfileCommandLine(const VsSetupConfiguration::VsSetupInstance& instance, bool isPwsh) const
+std::wstring VsDevShellGenerator::GetProfileCommandLine(const VsSetupConfiguration::VsSetupInstance& instance) const
 {
    // Build this in stages, so reserve space now
    std::wstring commandLine;
    commandLine.reserve(256);

-    if (isPwsh)
+    // Try to detect if `pwsh.exe` is available in the PATH, if so we want to use that
+    // Allow some extra space in case user put it somewhere odd
+    // We do need to allocate space for the full path even if we don't want to paste the whole thing in
+    wchar_t pwshPath[MAX_PATH] = { 0 };
+    const auto pwshExeName = L"pwsh.exe";
+    if (SearchPathW(nullptr, pwshExeName, nullptr, MAX_PATH, pwshPath, nullptr))
    {
-        commandLine.append(L"pwsh.exe");
+        commandLine.append(pwshExeName);
    }
    else
    {
--- a/src/cascadia/TerminalSettingsModel/VsDevShellGenerator.h
+++ b/src/cascadia/TerminalSettingsModel/VsDevShellGenerator.h
@@ -37,14 +37,13 @@ namespace winrt::Microsoft::Terminal::Settings::Model
            return L"VsDevShell" + instance.GetInstanceId();
        }

-        std::wstring GetProfileIconPath(bool isPwsh) const
+        std::wstring GetProfileIconPath() const
        {
-            return isPwsh ? L"ms-appx:///ProfileIcons/vs-pwsh.png" :
-                            L"ms-appx:///ProfileIcons/vs-powershell.png";
+            return L"ms-appx:///ProfileIcons/vs-powershell.png";
        }

        std::wstring GetProfileName(const VsSetupConfiguration::VsSetupInstance& instance) const;
-        std::wstring GetProfileCommandLine(const VsSetupConfiguration::VsSetupInstance& instance, bool isPwsh) const;
+        std::wstring GetProfileCommandLine(const VsSetupConfiguration::VsSetupInstance& instance) const;
        std::wstring GetDevShellModulePath(const VsSetupConfiguration::VsSetupInstance& instance) const;
    };
 };
--- a/src/cascadia/UnitTests_SettingsModel/SerializationTests.cpp
+++ b/src/cascadia/UnitTests_SettingsModel/SerializationTests.cpp
@@ -461,7 +461,6 @@ namespace SettingsModelUnitTests
            "$schema" : "https://aka.ms/terminal-profiles-schema",
            "defaultProfile": "{61c54bbd-1111-5271-96e7-009a87ff44bf}",
            "disabledProfileSources": [ "Windows.Terminal.Wsl" ],
-            "safeUriSchemes": [ "vscode" ],
            "newTabMenu":
            [
                {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mike Griese	728e81f7da	spel and format?	2026-03-05 09:28:21 -06:00
Mike Griese	7be3c7b9cb	format	2026-03-05 09:10:21 -06:00
Mike Griese	ad12c5b8a3	spel	2026-03-05 06:52:39 -06:00
Mike Griese	756a1d4d6d	that's... not right	2026-03-04 16:39:53 -06:00
Mike Griese	20dcfd098b	better names	2026-03-03 06:39:58 -06:00
Mike Griese	267d379747	cleaner notification text	2026-03-03 05:43:55 -06:00
Mike Griese	8a132d6b77	cleaner	2026-03-03 05:18:22 -06:00
Mike Griese	d449c86a33	don't pling 900 times on startup	2026-03-02 14:03:42 -06:00
Mike Griese	cd8ff95c1a	notify when we automark progress	2026-03-02 13:44:22 -06:00
Mike Griese	19cfe09bda	fuck man	2026-03-02 10:10:10 -06:00
Mike Griese	e8d1933b9e	jesus what	2026-03-02 05:53:01 -06:00
Dustin L. Howett	83d0d9df14	version: bump to 1.26 on main (#19915 ) Signed-off-by: Dustin L. Howett <dustin@howett.net>	2026-02-27 17:52:43 -06:00