Replace `confirmCloseAllTabs` with `confirmOnClose` by carlos-zamora · Pull Request #20055 · microsoft/terminal

carlos-zamora · 2026-04-03T00:34:15Z

Summary of the Pull Request

Replaces the warning.confirmCloseAllTabs setting with a warning.confirmOnClose enum setting that accepts the following:

never: don't present a warning dialog when closing a session
automatic: present a warning dialog when closing multiple tabs/panes at once
always: present a warning dialog when closing any session

The confirmation dialog contains a "don't ask me again" checkbox. When checked, we update the setting to never.

This setting also affects the following actions:

"close other tabs"
"close tabs after"
"close other panes"
"quit"
The appropriate confirmation dialog is shown in these scenarios. We also present an aggregate dialog instead of prompting the user once per tab/pane. If there are no other tabs/panes, we don't present a dialog and treat the key binding as unhandled (passing the key through).

References and Relevant Issues

Iteration of #19944

Validation Steps Performed

closing a tab:
- ✅ 1 pane --> no dialog
- ✅ 2 panes --> dialog
- ✅ action and middle clicking tab trigger same flow
close all other tabs:
- ✅ no other tabs --> no dialog
- ✅ 1 other tab --> dialog
close all other panes:
- ✅ 1 pane --> no dialog
- ✅ 2 panes --> dialog
close all tabs after the current tab:
- ✅ no tabs after --> no dialog (even if tabs before)
- ✅ 1 tab after --> dialog
close window:
- ✅ 2 tabs --> dialog
- ✅ 2 panes --> dialog
- ✅ 1 tab with one pane --> no dialog
Quit the Terminal:
- ✅ 3 windows --> dialog
- ✅1 window --> dialog
✅ "don't ask me again" checkbox checked --> setting changed to "never"
✅ "never" --> no dialog for scenarios above
✅ "always" --> dialog always appears, even when closing a single pane

PR Checklist

Closes #5301
Closes #6641
"don't ask me again" checkbox is also mentioned in #10000

Co-authored by @zadjii-msft

carlos-zamora · 2026-04-03T00:37:39Z

Demo

Settings UI:

Dialog UI:

Here's all the possible strings for the dialog:

Hlsgs · 2026-04-03T19:41:57Z

Apologies if this is not the proper place for this question: is it possible to implement a fourth setting that would mean "present a warning dialog when closing multiple tabs/panes at once AND at least one background tab is in Running State"?

carlos-zamora · 2026-04-07T21:47:40Z

Feedback from bug bash (4/7):

I would like more explanatory messages inside the dialog content, like "Quitting Terminal will close all windows." (this one is probably fine) "Closing this window will close all tabs and panes inside it." "Closing this tab will close all panes inside it."

carlos-zamora · 2026-04-08T21:40:25Z

Note to self: also figure out #20083

(sorry for the back and forth Hlsg!)

lhecker

Found 1 2? bugs, otherwise LGTM.

lhecker · 2026-04-21T22:50:50Z

            _RemoveTabs(tabsToRemove);

-            actionArgs.Handled(true);
+            actionArgs.Handled(!tabsToRemove.empty());


Is this just a change on technical correctness or is there a common situation where tabsToRemove ends up being empty?

This makes it so that if there aren't any tabs to remove, we don't mark the event as handled. We disable the option in the context menu, but a user can still call the appropriate action via a key binding. Marking it as unhandled means that we'll let the key chord pass through.

DHowett · 2026-05-04T18:14:57Z

+
+    auto FromJson(const Json::Value& json)
+    {
+        return BaseEnumMapper::FromJson(json);


curious - usually we don't need to override these...

DHowett · 2026-05-04T18:17:30Z

+
+        // BODGY: After a ContentDialog is dismissed, FindName() can no longer
+        // resolve children inside it. Use Content() to get the checkbox directly.
+        const auto checkbox = dialog.Content().as<CheckBox>();


I would rather you assign a name to the checkbox with x:Name and use it directly. That is less fragile than "treat the content as a checkbox" which will crash when we add more content.

DHowett · 2026-05-04T18:17:48Z

+        }
+        dialog.Title(winrt::box_value(title));
+        dialog.PrimaryButtonText(primary);
+        dialog.CloseButtonText(RS_(L"ConfirmCloseDialog_Cancel"));


This could be set in the resw, right

DHowett · 2026-05-04T18:22:22Z

-
-            QuitRequested.raise(nullptr, nullptr);
        }
+


does this cause a behavioral change

@zadjii-msft

## Summary of the Pull Request Replaces the `warning.confirmCloseAllTabs` setting with a `warning.confirmOnClose` enum setting that accepts the following: - `never`: don't present a warning dialog when closing a session - `automatic`: present a warning dialog when closing multiple tabs/panes at once - `always`: present a warning dialog when closing any session The confirmation dialog contains a "don't ask me again" checkbox. When checked, we update the setting to `never`. This setting also affects the following actions: - "close other tabs" - "close tabs after" - "close other panes" - "quit" The appropriate confirmation dialog is shown in these scenarios. We also present an aggregate dialog instead of prompting the user once per tab/pane. If there are no other tabs/panes, we don't present a dialog and treat the key binding as unhandled (passing the key through). ## References and Relevant Issues Iteration of microsoft#19944 ## Validation Steps Performed - closing a tab: - ✅ 1 pane --> no dialog - ✅ 2 panes --> dialog - ✅ action and middle clicking tab trigger same flow - close all other tabs: - ✅ no other tabs --> no dialog - ✅ 1 other tab --> dialog - close all other panes: - ✅ 1 pane --> no dialog - ✅ 2 panes --> dialog - close all tabs after the current tab: - ✅ no tabs after --> no dialog (even if tabs before) - ✅ 1 tab after --> dialog - close window: - ✅ 2 tabs --> dialog - ✅ 2 panes --> dialog - ✅ 1 tab with one pane --> no dialog - Quit the Terminal: - ✅ 3 windows --> dialog - ✅1 window --> dialog - ✅ "don't ask me again" checkbox checked --> setting changed to "never" - ✅ "never" --> no dialog for scenarios above - ✅ "always" --> dialog always appears, even when closing a single pane ## PR Checklist Closes microsoft#5301 Closes microsoft#6641 "don't ask me again" checkbox is also mentioned in microsoft#10000 Co-authored by @zadjii-msft

Replace confirmCloseAllTabs with confirmOnClose

fe8730a

microsoft-github-policy-service Bot added Issue-Task It's a feature request, but it doesn't really need a major design. Area-UserInterface Issues pertaining to the user interface of the Console or Terminal Priority-2 A description (P2) Product-Terminal The new Windows Terminal. labels Apr 3, 2026

carlos-zamora mentioned this pull request Apr 3, 2026

Replace confirmCloseAllTabs with confirmCloseOn #19944

Closed

carlos-zamora added the zBugBash-Consider label Apr 3, 2026

DHowett mentioned this pull request Apr 3, 2026

Allow the "Close window" keyboard shortcut to also confirm closing the window when there are multiple tabs open #20062

Open

carlos-zamora mentioned this pull request Apr 6, 2026

"Present a warning dialog when ... tab is in Running State"? #20083

Open

carlos-zamora added a commit that referenced this pull request Apr 6, 2026

PRE-MERGE #20055 Replace confirmCloseAllTabs with confirmOnClose

06a225c

carlos-zamora added a commit that referenced this pull request Apr 8, 2026

PRE-MERGE #20055 Replace confirmCloseAllTabs with confirmOnClose

70d51c5

lhecker requested changes Apr 21, 2026

View reviewed changes

microsoft-github-policy-service Bot added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Apr 21, 2026

microsoft-github-policy-service Bot added the No-Recent-Activity This issue/PR is going stale and may be auto-closed without further activity. label Apr 29, 2026

carlos-zamora removed Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something No-Recent-Activity This issue/PR is going stale and may be auto-closed without further activity. labels Apr 29, 2026

address feedback

15f688f

This comment has been minimized.

Sign in to view

Merge branch 'main' into dev/cazamor/confirmOnClose

f8ebcd2

lhecker approved these changes May 1, 2026

View reviewed changes

carlos-zamora merged commit b753e3d into main May 4, 2026
20 checks passed

carlos-zamora deleted the dev/cazamor/confirmOnClose branch May 4, 2026 17:43

DHowett reviewed May 4, 2026

View reviewed changes

Conversation

carlos-zamora commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of the Pull Request

References and Relevant Issues

Validation Steps Performed

PR Checklist

Uh oh!

carlos-zamora commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Demo

Uh oh!

Hlsgs commented Apr 3, 2026

Uh oh!

carlos-zamora commented Apr 7, 2026

Uh oh!

carlos-zamora commented Apr 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lhecker left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lhecker Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

carlos-zamora Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

DHowett May 4, 2026

Choose a reason for hiding this comment

Uh oh!

DHowett May 4, 2026

Choose a reason for hiding this comment

Uh oh!

DHowett May 4, 2026

Choose a reason for hiding this comment

Uh oh!

DHowett May 4, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

carlos-zamora commented Apr 3, 2026 •

edited

Loading

carlos-zamora commented Apr 3, 2026 •

edited

Loading

carlos-zamora commented Apr 8, 2026 •

edited

Loading