From 3f33ce0451a0d5ce946e2cbc40a8bf234c1b2f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Almeida?=
 <57680069+zeval@users.noreply.github.com>
Date: Sat, 12 Sep 2026 14:58:49 +0200
Subject: [PATCH] feat(ui): use native mobile confirmation sheets (#3621)

---
 apps/packages/ui/src/command.tsx              |   9 +-
 apps/web/AGENTS.md                            |   2 +-
 apps/web/app/gitlab/gitlab-page-client.tsx    |  37 +--
 .../azure-devops-settings.test.tsx            |  21 +-
 .../azure-devops/azure-devops-settings.tsx    |  82 +++--
 .../azure-devops-watch-settings.tsx           |   2 +
 .../command-panel-confirmation.test.tsx       |  57 ++++
 apps/web/components/command-panel-dialog.tsx  |  23 ++
 apps/web/components/command-panel-footer.tsx  |  13 +-
 apps/web/components/confirmation/AGENTS.md    |  23 ++
 .../mobile-action-confirmation.test.tsx       | 171 ++++++++++
 .../mobile-action-confirmation.tsx            | 163 +++++++++
 .../mobile-confirmation-content.test.tsx      |  98 ++++++
 .../mobile-confirmation-content.tsx           | 131 ++++++++
 .../mobile-confirmation-host.test.tsx         | 211 ++++++++++++
 .../confirmation/mobile-confirmation-host.tsx | 163 +++++++++
 ...ved-task-view-delete-confirmation.test.tsx |  18 +-
 .../saved-task-view-delete-confirmation.tsx   |  78 ++---
 .../use-mobile-confirmation-submit.ts         |  58 ++++
 ...use-saved-task-view-delete-confirmation.ts |  29 ++
 .../github/my-github/mobile-views-picker.tsx  | 103 +++---
 .../github/my-github/presets-sidebar.test.tsx |  21 +-
 .../github/my-github/presets-sidebar.tsx      |  18 +-
 .../gitlab/my-gitlab/presets-sidebar.test.tsx |  81 +++--
 .../gitlab/my-gitlab/presets-sidebar.tsx      |  55 +++-
 .../integration-filters-sheet.tsx             |  75 +++++
 .../integrations/presets-scope-bar-base.tsx   |  49 +--
 .../presets-scope-bar-mobile.test.tsx         |  50 +++
 .../components/jira/jira-action-bar.test.tsx  |  36 ++
 apps/web/components/jira/jira-action-bar.tsx  |  83 +++--
 .../jira/jira-issue-watch-table.tsx           |   2 +
 apps/web/components/jira/jira-settings.tsx    |   1 +
 .../jira/my-jira/list-toolbar.test.tsx        |  33 +-
 .../components/jira/my-jira/list-toolbar.tsx  |  29 +-
 apps/web/components/kanban-card.tsx           |   1 +
 .../linear/linear-issue-watch-table.tsx       |   2 +
 .../linear/linear-settings.test.tsx           |  30 +-
 .../web/components/linear/linear-settings.tsx |  93 ++++--
 .../quick-chat/quick-chat-modal.test.tsx      |  29 +-
 .../quick-chat/quick-chat-modal.tsx           |  85 +++--
 .../walkthrough-discard-confirmation.tsx      |  48 +++
 .../review/walkthrough-overlay.test.tsx       |  11 +-
 .../components/review/walkthrough-overlay.tsx |  35 +-
 .../sentry/sentry-instance-card.test.tsx      |  26 +-
 .../sentry/sentry-instance-card.tsx           |  82 +++--
 .../sentry/sentry-issue-watch-table.tsx       |   2 +
 .../agent-profile-delete-dialog.test.tsx      |  20 +-
 .../settings/agent-profile-delete-dialog.tsx  |  57 ++--
 .../settings/agent-profile-page.tsx           |  24 +-
 .../agents/agent-profiles-section.tsx         |  35 +-
 ...ayout-profile-delete-confirmation.test.tsx |  51 +++
 .../layout-profile-delete-confirmation.tsx    |  63 ++--
 .../settings/plugins/plugin-detail.tsx        |   3 +-
 .../settings/plugins/plugin-row.tsx           |  67 ++--
 .../plugins/uninstall-plugin-dialog.test.tsx  |  13 +-
 .../plugins/uninstall-plugin-dialog.tsx       |  54 +--
 .../settings/prompt-delete-confirmation.tsx   |  61 ++--
 .../settings/prompt-row-actions.tsx           |  23 +-
 .../settings/prompts-settings.test.tsx        |  27 +-
 .../components/settings/prompts-settings.tsx  |  26 +-
 .../settings/secrets-delete-dialog.tsx        |  57 ++--
 .../settings/secrets-list-item-row.test.tsx   |  16 +-
 .../settings/secrets-list-item-row.tsx        |   8 +-
 .../settings/system/users-table.test.tsx      |   7 +-
 .../settings/system/users-table.tsx           |  47 ++-
 .../settings/workflow-sync-dialog.test.tsx    |  84 ++++-
 .../settings/workflow-sync-dialog.tsx         | 257 ++++++++++-----
 .../settings/workflow-sync-section.tsx        |   7 +-
 .../task/chat/chat-input-toolbar-mobile.tsx   |   5 +-
 .../task/chat/chat-input-toolbar.test.tsx     |  33 +-
 .../task/chat/reset-context-button.test.tsx   |  20 ++
 .../task/chat/reset-context-button.tsx        |  90 ++---
 .../components/task/file-browser-parts.tsx    |  17 +-
 .../task/file-browser-responsive.test.tsx     |  16 +-
 apps/web/components/task/file-browser.tsx     |   1 +
 .../task/file-context-menu.test.tsx           |  56 +++-
 .../web/components/task/file-context-menu.tsx |  86 ++++-
 .../components/task/file-delete-action.tsx    |   1 +
 .../task/layout-preset-selector.test.tsx      |  24 +-
 .../task/layout-preset-selector.tsx           |  46 ++-
 .../task/mobile/mobile-picker-sheet.tsx       |  55 +++-
 .../mobile-session-delete-confirmation.tsx    |  65 ++++
 .../mobile/mobile-sessions-section.test.tsx   |  27 ++
 .../task/mobile/mobile-sessions-section.tsx   | 108 +++---
 .../task/mobile/mobile-terminal-row.tsx       |  39 ++-
 .../task/mobile/mobile-terminals-section.tsx  |   8 +-
 .../session-task-switcher-sheet.test.tsx      |  43 +++
 .../mobile/session-task-switcher-sheet.tsx    |  19 +-
 .../task/mobile/task-switcher-drawer.tsx      |  34 ++
 .../components/task/parked-terminals-menu.tsx |   2 +
 .../task/saved-layout-delete-confirmation.tsx |  44 ++-
 .../sidebar-filter-popover.test.tsx           |  13 +-
 .../sidebar-filter/sidebar-filter-popover.tsx |  56 ++--
 .../task/sidebar-filter/view-manager.tsx      |  65 ++--
 .../task/simple/components/parent-picker.tsx  |   1 +
 .../task/task-actions-menu-dialogs.tsx        |  18 +-
 .../task/task-archive-confirm-dialog.tsx      | 119 +++++--
 .../task/task-archive-confirmation.test.tsx   |  61 +++-
 .../task/task-archive-confirmation.tsx        |  14 +-
 .../task/task-detach-confirm-dialog.test.tsx  |  36 +-
 .../task/task-detach-confirm-dialog.tsx       |  71 ++--
 ...ask-plan-revision-restore-actions.test.tsx |  80 +++++
 .../task-plan-revision-restore-actions.tsx    |  42 ++-
 .../components/task/task-plan-revisions.tsx   |  94 ++++--
 .../task-switcher-archive-confirmation.tsx    |  21 +-
 .../task/task-switcher-context-menu.test.tsx  |  18 +-
 .../task/task-switcher-context-menu.tsx       |   7 +-
 ...erminal-close-inline-confirmation.test.tsx |  78 +++++
 .../terminal-close-inline-confirmation.tsx    |  30 +-
 .../threads/threads-view-controls.test.tsx    |  19 +-
 .../threads/threads-view-controls.tsx         | 188 ++++++-----
 .../threads/threads-view-editor.tsx           |   9 +-
 .../watches/watcher-delete-action.test.tsx    |  34 ++
 .../watches/watcher-delete-action.tsx         |  98 +++---
 apps/web/e2e/helpers/mobile-confirmations.ts  |  28 ++
 .../auth/mobile-users-self-actions.spec.ts    |  14 +-
 .../mobile-reset-context-confirmation.spec.ts |  13 +-
 .../github/mobile-github-sidebar.spec.ts      |  11 +-
 .../tests/gitlab/mobile-gitlab-parity.spec.ts | 102 ++++++
 .../integrations/mobile-azure-devops.spec.ts  |   7 +-
 ...e-integration-remove-confirmations.spec.ts |  35 +-
 .../mobile-jira-saved-view.spec.ts            |  13 +-
 ...obile-watcher-delete-confirmations.spec.ts |  23 +-
 .../mobile-card-archive-confirmation.spec.ts  |  28 +-
 .../mobile-plugin-settings-row.spec.ts        |  33 +-
 .../pr/mobile-ci-automation-options.spec.ts   |   7 +-
 .../tests/review/mobile-walkthrough.spec.ts   |   3 +-
 .../tests/session/copyfiles-progress.spec.ts  |  13 +-
 .../session/mobile-session-deletion.spec.ts   |  21 +-
 .../mobile-agent-profile-delete.spec.ts       |  15 +-
 .../settings/mobile-layout-profiles.spec.ts   |   9 +-
 .../mobile-management-confirmations.spec.ts   | 124 +++++++
 .../settings/mobile-prompts-settings.spec.ts  |   9 +-
 .../settings/mobile-secrets-delete.spec.ts    |  14 +-
 .../task/confirmation-text-hierarchy.spec.ts  |  29 ++
 .../e2e/tests/task/file-tree-search.spec.ts   |   7 +-
 .../task/mobile-action-confirmations.spec.ts  | 268 +++++++++++++++
 .../task/mobile-archive-task-redirect.spec.ts |   2 +-
 ...mobile-confirmation-text-hierarchy.spec.ts |  13 +-
 .../task/mobile-content-confirmations.spec.ts |  34 ++
 .../task/mobile-file-confirmations.spec.ts    |  29 +-
 .../tests/task/mobile-plan-restore.spec.ts    |  16 +-
 .../task/mobile-sidebar-task-actions.spec.ts  |  47 ++-
 .../tests/task/mobile-sidebar-views.spec.ts   |  22 +-
 .../task/mobile-subtask-detachment.spec.ts    |  10 +-
 .../tests/task/mobile-threads-view.spec.ts    |  65 +++-
 .../terminal/mobile-terminal-close.spec.ts    |  23 +-
 ...2026-09-10-mobile-confirmation-surfaces.md |  47 +++
 docs/decisions/INDEX.md                       |   1 +
 .../plans/mobile-action-confirmations/plan.md | 210 ++++++++++++
 .../task-01-shared-mobile-surfaces.md         | 119 +++++++
 .../task-02-archive-surfaces.md               | 144 ++++++++
 .../task-03-picker-confirmations.md           | 117 +++++++
 .../task-04-content-confirmations.md          | 129 ++++++++
 .../task-05-saved-artifact-confirmations.md   | 129 ++++++++
 .../task-06-management-confirmations.md       | 164 ++++++++++
 .../mobile-confirmation-sheet-sizing/plan.md  | 278 ++++++++++++++++
 .../task-01-compact-drawer-hosts.md           | 167 ++++++++++
 .../task-02-bottom-filter-hosts.md            | 150 +++++++++
 docs/public/mobile-remote-access.md           |  37 +++
 docs/public/tasks-and-workflows.md            |   4 +
 .../system-design/archive-confirmation.md     |   9 +-
 docs/specs/ui/README.md                       |   2 +
 .../confirmation-warning-hierarchy.md         |  56 ++--
 .../mobile-action-confirmations.md            | 172 ++++++++++
 .../saved-task-view-deletion-confirmation.md  |  20 +-
 .../session-tab-delete-feedback.md            |  18 +-
 .../requirements/terminal-close-feedback.md   |  36 +-
 .../confirmation-warning-hierarchy.md         |  79 +++--
 .../mobile-action-confirmations.md            | 309 ++++++++++++++++++
 .../saved-task-view-deletion-confirmation.md  |  27 +-
 171 files changed, 7570 insertions(+), 1428 deletions(-)
 create mode 100644 apps/web/components/command-panel-confirmation.test.tsx
 create mode 100644 apps/web/components/command-panel-dialog.tsx
 create mode 100644 apps/web/components/confirmation/AGENTS.md
 create mode 100644 apps/web/components/confirmation/mobile-action-confirmation.test.tsx
 create mode 100644 apps/web/components/confirmation/mobile-action-confirmation.tsx
 create mode 100644 apps/web/components/confirmation/mobile-confirmation-content.test.tsx
 create mode 100644 apps/web/components/confirmation/mobile-confirmation-content.tsx
 create mode 100644 apps/web/components/confirmation/mobile-confirmation-host.test.tsx
 create mode 100644 apps/web/components/confirmation/mobile-confirmation-host.tsx
 create mode 100644 apps/web/components/confirmation/use-mobile-confirmation-submit.ts
 create mode 100644 apps/web/components/integrations/integration-filters-sheet.tsx
 create mode 100644 apps/web/components/integrations/presets-scope-bar-mobile.test.tsx
 create mode 100644 apps/web/components/jira/jira-action-bar.test.tsx
 create mode 100644 apps/web/components/review/walkthrough-discard-confirmation.tsx
 create mode 100644 apps/web/components/settings/layouts/layout-profile-delete-confirmation.test.tsx
 create mode 100644 apps/web/components/task/mobile/mobile-session-delete-confirmation.tsx
 create mode 100644 apps/web/components/task/mobile/task-switcher-drawer.tsx
 create mode 100644 apps/web/components/task/task-plan-revision-restore-actions.test.tsx
 create mode 100644 apps/web/components/task/terminal-close-inline-confirmation.test.tsx
 create mode 100644 apps/web/components/watches/watcher-delete-action.test.tsx
 create mode 100644 apps/web/e2e/helpers/mobile-confirmations.ts
 create mode 100644 apps/web/e2e/tests/settings/mobile-management-confirmations.spec.ts
 create mode 100644 apps/web/e2e/tests/task/mobile-action-confirmations.spec.ts
 create mode 100644 apps/web/e2e/tests/task/mobile-content-confirmations.spec.ts
 create mode 100644 docs/decisions/2026-09-10-mobile-confirmation-surfaces.md
 create mode 100644 docs/plans/mobile-action-confirmations/plan.md
 create mode 100644 docs/plans/mobile-action-confirmations/task-01-shared-mobile-surfaces.md
 create mode 100644 docs/plans/mobile-action-confirmations/task-02-archive-surfaces.md
 create mode 100644 docs/plans/mobile-action-confirmations/task-03-picker-confirmations.md
 create mode 100644 docs/plans/mobile-action-confirmations/task-04-content-confirmations.md
 create mode 100644 docs/plans/mobile-action-confirmations/task-05-saved-artifact-confirmations.md
 create mode 100644 docs/plans/mobile-action-confirmations/task-06-management-confirmations.md
 create mode 100644 docs/plans/mobile-confirmation-sheet-sizing/plan.md
 create mode 100644 docs/plans/mobile-confirmation-sheet-sizing/task-01-compact-drawer-hosts.md
 create mode 100644 docs/plans/mobile-confirmation-sheet-sizing/task-02-bottom-filter-hosts.md
 create mode 100644 docs/specs/ui/requirements/mobile-action-confirmations.md
 create mode 100644 docs/specs/ui/system-design/mobile-action-confirmations.md

diff --git a/apps/packages/ui/src/command.tsx b/apps/packages/ui/src/command.tsx
index 3b44ae1f54..b91ee96202 100644
--- a/apps/packages/ui/src/command.tsx
+++ b/apps/packages/ui/src/command.tsx
@@ -40,6 +40,7 @@ function CommandDialog({
   className,
   showCloseButton = false,
   overlayClassName,
+  contentProps,
   ...props
 }: React.ComponentProps<typeof Dialog> & {
   title?: string;
@@ -47,15 +48,21 @@ function CommandDialog({
   className?: string;
   showCloseButton?: boolean;
   overlayClassName?: string;
+  /** Optional overrides for the owning dialog, such as an application-local confirmation step. */
+  contentProps?: React.ComponentProps<typeof DialogContent>;
 }) {
   return (
     <Dialog {...props}>
       <DialogContent
+        {...contentProps}
         className={cn("rounded-xl! p-0 overflow-hidden", className)}
         showCloseButton={showCloseButton}
         overlayClassName={overlayClassName}
       >
-        <DialogHeader className="sr-only">
+        <DialogHeader
+          className="sr-only"
+          aria-hidden={contentProps?.["aria-labelledby"] ? true : undefined}
+        >
           <DialogTitle>{title}</DialogTitle>
           <DialogDescription>{description}</DialogDescription>
         </DialogHeader>
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.md
index 600e934b49..6df9c00856 100644
--- a/apps/web/AGENTS.md
+++ b/apps/web/AGENTS.md
@@ -30,7 +30,7 @@ import { Dialog } from "@kandev/ui/dialog";
 - CSS visibility classes can leave the other viewport tree mounted. Gate live effects such as polling, subscriptions, timers, and measurements with the same responsive or pointer condition, and test both initialization orders when readiness can precede or follow hydration.
 - Use `useTouchDrawer` when a hover/popover disclosure needs a coarse-pointer `Drawer` alternative. Width-based phone composition and pointer-based disclosure behavior are related but not interchangeable. Apply the 44px minimum to coarse-pointer hit areas, touch rows, and mobile controls only; keep fine-pointer desktop controls at the surrounding design-system density, using 28px for ordinary buttons, inputs, and selectors and 24px only for deliberate compact inline controls, and do not reuse a touch-sized `h-11` class as the shared visual button size. See the [sizing guide](../../.agents/skills/mobile-parity/references/control-sizing.md) for exceptions.
 - Below 640px, shared Radix DropdownMenu/ContextMenu use inset, safe-area-aware bottom sheets in `app/globals.css`. Open `mobile-menu-root` content owns one decorative positioner backdrop matching Drawer dimming and blur; fade it with the sheet's exit motion. Never mark submenus; keep the backdrop outside scrolling content and pointer-transparent so Radix owns dismissal and non-modal interaction. Reuse these primitives and cover long/nested menus instead of adding parallel mobile menus.
-- Mobile capability parity does not require desktop layout parity. Load `/mobile-parity` for the Kandev surface decision guide, mobile design contract, and verification requirements.
+- Mobile capability parity does not require desktop layout parity. Load `/mobile-parity` for the Kandev surface decision guide, mobile design contract, and verification requirements; read [confirmation guidance](components/confirmation/AGENTS.md) when adopting phone confirmation surfaces.
 - Phone listing chrome uses `KanbanHeaderMobile` and `MobileListingContext` across Kanban, List, and Threads. Threads supplies its saved-view control and inline pagination in the title slot. Phone search, tools, and plugin actions live in `MobileListingMenuActions`; keep activity/connection cues on the persistent menu button and restore the actual opener unless focus is moving into a launched surface. Tablet/desktop composition stays separate.
 
 ## Data Flow Pattern (Critical)
diff --git a/apps/web/app/gitlab/gitlab-page-client.tsx b/apps/web/app/gitlab/gitlab-page-client.tsx
index 3232085bc3..48840ab201 100644
--- a/apps/web/app/gitlab/gitlab-page-client.tsx
+++ b/apps/web/app/gitlab/gitlab-page-client.tsx
@@ -5,7 +5,6 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { IconBrandGitlab, IconMenu2 } from "@tabler/icons-react";
 import { Alert, AlertDescription } from "@kandev/ui/alert";
 import { Button } from "@kandev/ui/button";
-import { Sheet, SheetContent, SheetHeader, SheetTitle } from "@kandev/ui/sheet";
 import { PageShell } from "@/components/page-shell";
 import { fetchGitLabStatus } from "@/lib/api/domains/gitlab-api";
 import type { GitLabStatus, Issue, MR } from "@/lib/types/gitlab";
@@ -31,6 +30,7 @@ import {
 import { toGitLabTaskPreset } from "@/components/gitlab/my-gitlab/task-presets";
 import { useAppStore } from "@/components/state-provider";
 import { Trans, useTranslation } from "react-i18next";
+import { IntegrationFiltersSheet } from "@/components/integrations/integration-filters-sheet";
 
 type GitLabPageClientProps = {
   workspaceId?: string;
@@ -298,25 +298,22 @@ function GitLabPageOverlays({
   };
   return (
     <>
-      <Sheet open={mobileSidebarOpen} onOpenChange={setMobileSidebarOpen}>
-        <SheetContent
-          side="right"
-          className="w-full sm:max-w-sm overflow-y-auto p-0"
-          data-testid="gitlab-mobile-sidebar"
-        >
-          <SheetHeader className="px-4 pt-4 pb-2">
-            <SheetTitle>{t("gitlab:filters")}</SheetTitle>
-          </SheetHeader>
-          <PresetsSidebar
-            selected={state.selection}
-            onSelect={onMobileSidebarSelect}
-            savedPresets={state.savedPresets}
-            onDeleteSaved={state.onDeleteSaved}
-            canSaveCurrent={state.canSaveCurrent}
-            onSaveCurrent={onMobileSaveCurrent}
-          />
-        </SheetContent>
-      </Sheet>
+      <IntegrationFiltersSheet
+        key={workspaceId}
+        open={mobileSidebarOpen}
+        onOpenChange={setMobileSidebarOpen}
+        title={t("gitlab:filters")}
+        testId="gitlab-mobile-sidebar"
+      >
+        <PresetsSidebar
+          selected={state.selection}
+          onSelect={onMobileSidebarSelect}
+          savedPresets={state.savedPresets}
+          onDeleteSaved={state.onDeleteSaved}
+          canSaveCurrent={state.canSaveCurrent}
+          onSaveCurrent={onMobileSaveCurrent}
+        />
+      </IntegrationFiltersSheet>
       <SavePresetDialog
         open={state.saveDialogOpen}
         onOpenChange={state.setSaveDialogOpen}
diff --git a/apps/web/components/azure-devops/azure-devops-settings.test.tsx b/apps/web/components/azure-devops/azure-devops-settings.test.tsx
index 5159205b87..e14d935ecf 100644
--- a/apps/web/components/azure-devops/azure-devops-settings.test.tsx
+++ b/apps/web/components/azure-devops/azure-devops-settings.test.tsx
@@ -13,6 +13,7 @@ const mocks = vi.hoisted(() => ({
 }));
 
 let finePointer = true;
+let isMobile = false;
 
 vi.mock("@/components/toast-provider", () => ({
   useToast: () => ({ toast: mocks.toast }),
@@ -29,7 +30,7 @@ vi.mock("@/hooks/domains/azure-devops/use-azure-devops-projects", () => ({
   }),
 }));
 vi.mock("@/hooks/use-responsive-breakpoint", () => ({
-  useResponsiveBreakpoint: () => ({ isFinePointer: finePointer }),
+  useResponsiveBreakpoint: () => ({ isFinePointer: finePointer, isMobile }),
 }));
 vi.mock("@/lib/api/domains/azure-devops-api", () => ({
   deleteAzureDevOpsConfig: mocks.deleteConfig,
@@ -86,6 +87,7 @@ const config: AzureDevOpsConfig = {
 beforeEach(() => {
   vi.clearAllMocks();
   finePointer = true;
+  isMobile = false;
   mocks.getConfig.mockResolvedValue(config);
   mocks.setConfig.mockResolvedValue({
     ...config,
@@ -205,6 +207,23 @@ describe("AzureDevOpsConnectionSection", () => {
 });
 
 describe("AzureDevOpsConnectionSection removal", () => {
+  it("keeps phone removal in a sheet and restores the same button on Cancel", async () => {
+    isMobile = true;
+    finePointer = false;
+    render(
+      <SettingsSaveProvider>
+        <AzureDevOpsConnectionSection workspaceId={WORKSPACE_ID} />
+      </SettingsSaveProvider>,
+    );
+    const trigger = await screen.findByTestId(DELETE_BUTTON_TEST_ID);
+    fireEvent.click(trigger);
+    const sheet = screen.getByRole("dialog");
+    expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+    expect(trigger.isConnected).toBe(true);
+    fireEvent.click(within(sheet).getByRole("button", { name: "Cancel" }));
+    await waitFor(() => expect(document.activeElement).toBe(trigger));
+    expect(mocks.deleteConfig).not.toHaveBeenCalled();
+  });
   it("uses local fine-pointer confirmation and calls removal once after confirmation", async () => {
     const nativeConfirm = vi.fn(() => false);
     vi.stubGlobal("confirm", nativeConfirm);
diff --git a/apps/web/components/azure-devops/azure-devops-settings.tsx b/apps/web/components/azure-devops/azure-devops-settings.tsx
index 20c139c3da..b7b05cd64c 100644
--- a/apps/web/components/azure-devops/azure-devops-settings.tsx
+++ b/apps/web/components/azure-devops/azure-devops-settings.tsx
@@ -21,6 +21,7 @@ import { Separator } from "@kandev/ui/separator";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@kandev/ui/tooltip";
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
 import {
   IntegrationAuthStatusBanner,
   type IntegrationAuthHealth,
@@ -441,10 +442,11 @@ function saveButtonLabel(t: (key: string) => string, state: SettingsState): stri
 
 function ConnectionActions({ state, disabled }: { state: SettingsState; disabled: boolean }) {
   const { t } = useTranslation();
-  const { isFinePointer } = useResponsiveBreakpoint();
+  const { isFinePointer, isMobile } = useResponsiveBreakpoint();
   const [confirmingRemove, setConfirmingRemove] = useState(false);
   const removeAnchorRef = useRef<HTMLButtonElement>(null);
   const removeConfirmation = t("azuredevops:removeConfigurationConfirm");
+  const removeLabel = t("azuredevops:remove");
 
   useEffect(() => {
     if (!state.config && confirmingRemove) setConfirmingRemove(false);
@@ -473,7 +475,7 @@ function ConnectionActions({ state, disabled }: { state: SettingsState; disabled
         <IconDeviceFloppy className="h-4 w-4" />
         {saveButtonLabel(t, state)}
       </Button>
-      {state.config && (isFinePointer || !confirmingRemove) && (
+      {state.config && (isMobile || isFinePointer || !confirmingRemove) && (
         <Button
           ref={removeAnchorRef}
           type="button"
@@ -483,39 +485,53 @@ function ConnectionActions({ state, disabled }: { state: SettingsState; disabled
           data-testid="azure-devops-delete-button"
         >
           <IconTrash className="h-4 w-4" />
-          {t("azuredevops:remove")}
+          {removeLabel}
         </Button>
       )}
-      {state.config && !isFinePointer && confirmingRemove ? (
-        <InlineConfirmActions
-          density="touch"
-          testId="azure-devops-remove-inline-confirmation"
-          ariaLabel={removeConfirmation}
-          description={removeConfirmation}
-          cancelLabel={t("common:cancel")}
-          confirmLabel={t("azuredevops:remove")}
-          confirmAriaLabel={removeConfirmation}
-          confirmTestId="azure-devops-remove-confirm"
-          onCancel={() => setConfirmingRemove(false)}
-          onClose={() => setConfirmingRemove(false)}
-          onConfirm={() => void state.remove()}
-        />
-      ) : null}
-      {state.config && isFinePointer ? (
-        <ActionConfirmPopover
-          open={confirmingRemove}
-          anchorRef={removeAnchorRef}
-          title={removeConfirmation}
-          cancelLabel={t("common:cancel")}
-          confirmLabel={t("azuredevops:remove")}
-          confirmAriaLabel={removeConfirmation}
-          confirmTestId="azure-devops-remove-confirm"
-          testId="azure-devops-remove-confirm-popover"
-          onOpenChange={setConfirmingRemove}
-          onCancel={() => setConfirmingRemove(false)}
-          onConfirm={() => void state.remove()}
-        />
-      ) : null}
+      <MobileActionConfirmation
+        open={!!state.config && confirmingRemove}
+        targetKey={`${state.config?.workspaceId}:${state.config?.organizationUrl}`}
+        title={removeConfirmation}
+        subject={state.config?.organizationUrl}
+        cancelLabel={t("common:cancel")}
+        confirmLabel={removeLabel}
+        confirmAriaLabel={removeConfirmation}
+        confirmTestId="azure-devops-remove-confirm"
+        onOpenChange={setConfirmingRemove}
+        focusReturnRef={removeAnchorRef}
+        onConfirm={() => void state.remove()}
+        fallback={
+          !isFinePointer ? (
+            <InlineConfirmActions
+              density="touch"
+              testId="azure-devops-remove-inline-confirmation"
+              ariaLabel={removeConfirmation}
+              description={removeConfirmation}
+              cancelLabel={t("common:cancel")}
+              confirmLabel={removeLabel}
+              confirmAriaLabel={removeConfirmation}
+              confirmTestId="azure-devops-remove-confirm"
+              onCancel={() => setConfirmingRemove(false)}
+              onClose={() => setConfirmingRemove(false)}
+              onConfirm={() => void state.remove()}
+            />
+          ) : (
+            <ActionConfirmPopover
+              open={confirmingRemove}
+              anchorRef={removeAnchorRef}
+              title={removeConfirmation}
+              cancelLabel={t("common:cancel")}
+              confirmLabel={removeLabel}
+              confirmAriaLabel={removeConfirmation}
+              confirmTestId="azure-devops-remove-confirm"
+              testId="azure-devops-remove-confirm-popover"
+              onOpenChange={setConfirmingRemove}
+              onCancel={() => setConfirmingRemove(false)}
+              onConfirm={() => void state.remove()}
+            />
+          )
+        }
+      />
     </div>
   );
 }
diff --git a/apps/web/components/azure-devops/azure-devops-watch-settings.tsx b/apps/web/components/azure-devops/azure-devops-watch-settings.tsx
index 5ec9cfde36..96c2a31956 100644
--- a/apps/web/components/azure-devops/azure-devops-watch-settings.tsx
+++ b/apps/web/components/azure-devops/azure-devops-watch-settings.tsx
@@ -182,6 +182,8 @@ function WatchActions({
         <IconRefresh className="h-4 w-4" /> {t("common:reset")}
       </Button>
       <WatcherDeleteAction
+        targetKey={`${watch.workspaceId}:${kind}:${watch.id}`}
+        subject={"wiql" in watch ? watch.wiql : watch.projectId}
         title={t("azuredevops:deleteWatchConfirm")}
         cancelLabel={t("common:cancel")}
         confirmLabel={t("azuredevops:delete")}
diff --git a/apps/web/components/command-panel-confirmation.test.tsx b/apps/web/components/command-panel-confirmation.test.tsx
new file mode 100644
index 0000000000..56529b0a22
--- /dev/null
+++ b/apps/web/components/command-panel-confirmation.test.tsx
@@ -0,0 +1,57 @@
+import { useRef, useState } from "react";
+import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+import { afterEach, expect, it, vi } from "vitest";
+import { CommandPanelDialog } from "./command-panel-dialog";
+import { MobileActionConfirmation } from "./confirmation/mobile-action-confirmation";
+
+vi.mock("@/hooks/use-responsive-breakpoint", () => ({
+  useResponsiveBreakpoint: () => ({ isMobile: true }),
+}));
+afterEach(cleanup);
+
+it("keeps the command dialog and its query while presenting one explicit decision step", () => {
+  const onConfirm = vi.fn();
+  const onKeyDown = vi.fn();
+  function Panel() {
+    const [open, setOpen] = useState(false);
+    const trigger = useRef<HTMLButtonElement>(null);
+    return (
+      <CommandPanelDialog open>
+        <div onKeyDown={onKeyDown}>
+          <input aria-label="Query" defaultValue="archive" />
+          <button ref={trigger} onClick={() => setOpen(true)}>
+            Archive command
+          </button>
+          <MobileActionConfirmation
+            open={open}
+            onOpenChange={setOpen}
+            targetKey="task"
+            title="Archive task?"
+            subject="Selected task"
+            cancelLabel="Cancel"
+            confirmLabel="Archive"
+            variant="default"
+            onConfirm={onConfirm}
+            focusReturnRef={trigger}
+          />
+        </div>
+      </CommandPanelDialog>
+    );
+  }
+  render(<Panel />);
+  const dialog = screen.getByRole("dialog");
+  const query = screen.getByRole("textbox");
+  fireEvent.change(query, { target: { value: "my query" } });
+  fireEvent.click(screen.getByRole("button", { name: "Archive command" }));
+  expect(screen.getByRole("dialog", { name: "Archive task?" })).toBe(dialog);
+  expect(screen.getAllByRole("dialog", { hidden: true })).toHaveLength(1);
+  expect(screen.getAllByRole("heading")).toHaveLength(1);
+  expect(screen.queryByRole("textbox")).toBeNull();
+  fireEvent.keyDown(screen.getByRole("group"), { key: "Enter" });
+  expect(onConfirm).not.toHaveBeenCalled();
+  expect(onKeyDown).not.toHaveBeenCalled();
+  fireEvent.keyDown(document, { key: "Escape" });
+  expect(screen.getByRole("textbox")).toBe(query);
+  expect((query as HTMLInputElement).value).toBe("my query");
+  expect(screen.getByRole("dialog")).toBe(dialog);
+});
diff --git a/apps/web/components/command-panel-dialog.tsx b/apps/web/components/command-panel-dialog.tsx
new file mode 100644
index 0000000000..76e2f13979
--- /dev/null
+++ b/apps/web/components/command-panel-dialog.tsx
@@ -0,0 +1,23 @@
+import { CommandDialog } from "@kandev/ui/command";
+import type { ComponentProps } from "react";
+import { cn } from "@/lib/utils";
+import {
+  MobileConfirmationHost,
+  MobileConfirmationHostBody,
+} from "./confirmation/mobile-confirmation-host";
+
+export function CommandPanelDialog(props: ComponentProps<typeof CommandDialog>) {
+  return (
+    <MobileConfirmationHost open={Boolean(props.open)}>
+      {({ active, contentProps }) => (
+        <CommandDialog
+          {...props}
+          className={cn(props.className, active && "flex max-h-[calc(100dvh-2rem)] flex-col")}
+          contentProps={{ ...contentProps, enterConfirms: !active }}
+        >
+          <MobileConfirmationHostBody>{props.children}</MobileConfirmationHostBody>
+        </CommandDialog>
+      )}
+    </MobileConfirmationHost>
+  );
+}
diff --git a/apps/web/components/command-panel-footer.tsx b/apps/web/components/command-panel-footer.tsx
index a54208b18c..bfe81200d0 100644
--- a/apps/web/components/command-panel-footer.tsx
+++ b/apps/web/components/command-panel-footer.tsx
@@ -3,13 +3,8 @@
 import { useEffect, type Dispatch, type SetStateAction } from "react";
 import { useTranslation } from "react-i18next";
 import type { TFunction } from "i18next";
-import {
-  Command,
-  CommandDialog,
-  CommandEmpty,
-  CommandInput,
-  CommandList,
-} from "@kandev/ui/command";
+import { Command, CommandEmpty, CommandInput, CommandList } from "@kandev/ui/command";
+import { CommandPanelDialog } from "./command-panel-dialog";
 import { Kbd, KbdGroup } from "@kandev/ui/kbd";
 import type { CommandPanelMode, CommandItem as CommandItemType } from "@/lib/commands/types";
 import type { Task } from "@/lib/types/http";
@@ -322,7 +317,7 @@ export function CommandPanelView(props: CommandPanelViewProps) {
   };
 
   return (
-    <CommandDialog
+    <CommandPanelDialog
       open={open}
       onOpenChange={handleOpenChange}
       overlayClassName="supports-backdrop-filter:backdrop-blur-none!"
@@ -351,6 +346,6 @@ export function CommandPanelView(props: CommandPanelViewProps) {
         <CommandPanelResultList {...renderedProps} />
         <CommandPanelFooter mode={renderedProps.mode} />
       </Command>
-    </CommandDialog>
+    </CommandPanelDialog>
   );
 }
diff --git a/apps/web/components/confirmation/AGENTS.md b/apps/web/components/confirmation/AGENTS.md
new file mode 100644
index 0000000000..ba7b2581a9
--- /dev/null
+++ b/apps/web/components/confirmation/AGENTS.md
@@ -0,0 +1,23 @@
+# Confirmation surfaces
+
+Phone confirmation adapters use `mobile-action-confirmation.tsx` with an explicit
+localized title/target and a stable owner outside transient menus. Keep the
+responsive adapter mounted with its non-phone `fallback` so boundary changes
+cancel pending decisions.
+
+Opt existing drawers into `MobileConfirmationHost`/`MobileConfirmationHostBody`
+(pickers: `confirmationHost`); use `surface="drawer"` and spread its
+`contentProps` on the owning surface. Active drawer steps fit the confirmation
+content; the hidden origin keeps its measured dimensions outside layout so
+Cancel can restore its normal size and scroll. Do not override the host's
+active sizing with a fixed-height style. Centered dialog hosts omit `surface`.
+Drawer roots use `overflow: clip` so focus cannot scroll the outer shell; only
+the inner list or confirmation body owns scrolling. Initial Cancel focus uses
+`preventScroll` to keep the title and actions in view.
+A hosted step keeps the origin mounted/inert and opens no second modal. Form
+dialog hosts also disable `enterConfirms` while the step is active.
+
+Domain callbacks still own transport and error behavior. Ordinary actions close
+before dispatch. Retryable form owners explicitly use
+`completionPolicy="await-with-retry"` and reject on failure; this keeps their
+confirmation busy during the request and available for retry afterward.
diff --git a/apps/web/components/confirmation/mobile-action-confirmation.test.tsx b/apps/web/components/confirmation/mobile-action-confirmation.test.tsx
new file mode 100644
index 0000000000..f9dbf4b823
--- /dev/null
+++ b/apps/web/components/confirmation/mobile-action-confirmation.test.tsx
@@ -0,0 +1,171 @@
+import { useRef, useState } from "react";
+import { cleanup, fireEvent, render, screen, waitFor, act } from "@testing-library/react";
+import { afterEach, expect, it, vi } from "vitest";
+import { MobileActionConfirmation } from "./mobile-action-confirmation";
+
+const viewport = vi.hoisted(() => ({ isMobile: true }));
+vi.mock("@/hooks/use-responsive-breakpoint", () => ({ useResponsiveBreakpoint: () => viewport }));
+afterEach(() => {
+  cleanup();
+  viewport.isMobile = true;
+});
+
+function Harness({
+  onConfirm = vi.fn(),
+  completionPolicy,
+  targetKey = "A",
+}: {
+  onConfirm?: () => void | Promise<void>;
+  completionPolicy?: "await-with-retry";
+  targetKey?: string;
+}) {
+  const [open, setOpen] = useState(false);
+  const trigger = useRef<HTMLButtonElement>(null);
+  return (
+    <>
+      <button ref={trigger} onClick={() => setOpen(true)}>
+        Remove A
+      </button>
+      <MobileActionConfirmation
+        open={open}
+        onOpenChange={setOpen}
+        targetKey={targetKey}
+        completionPolicy={completionPolicy}
+        title="Delete item?"
+        subject="A"
+        description="This cannot be undone."
+        cancelLabel="Cancel"
+        confirmLabel="Delete"
+        onConfirm={onConfirm}
+        focusReturnRef={trigger}
+        fallback={open ? <div>Desktop confirmation</div> : null}
+      />
+    </>
+  );
+}
+
+it("uses a standalone drawer and returns focus on cancellation", async () => {
+  render(<Harness />);
+  const trigger = screen.getByRole("button", { name: "Remove A" });
+  fireEvent.click(trigger);
+  expect(screen.getByRole("dialog", { name: "Delete item?" }).getAttribute("data-slot")).toBe(
+    "drawer-content",
+  );
+  await waitFor(() =>
+    expect(document.activeElement).toBe(screen.getByRole("button", { name: "Cancel" })),
+  );
+  fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
+  await waitFor(() => expect(document.activeElement).toBe(trigger));
+});
+
+it("closes before dispatch, prevents duplicate activation, and does not reopen on rejection", async () => {
+  let reject!: (reason: Error) => void;
+  let closedAtDispatch = false;
+  const onConfirm = vi.fn(() => {
+    closedAtDispatch = screen.queryByRole("group") === null;
+    return new Promise<void>((_, fail) => {
+      reject = fail;
+    });
+  });
+  render(<Harness onConfirm={onConfirm} />);
+  fireEvent.click(screen.getByRole("button", { name: "Remove A" }));
+  const button = screen.getByRole("button", { name: "Delete" });
+  act(() => {
+    fireEvent.click(button);
+    fireEvent.click(button);
+  });
+  await waitFor(() => expect(onConfirm).toHaveBeenCalledOnce());
+  expect(closedAtDispatch).toBe(true);
+  await act(async () => {
+    reject(new Error("delete failed"));
+  });
+  expect(screen.queryByRole("group")).toBeNull();
+});
+
+it("cancels crossing the phone boundary and leaves the non-phone fallback unchanged", () => {
+  const onConfirm = vi.fn();
+  const { rerender } = render(<Harness onConfirm={onConfirm} />);
+  fireEvent.click(screen.getByRole("button", { name: "Remove A" }));
+  expect(screen.getByRole("group")).toBeTruthy();
+  viewport.isMobile = false;
+  rerender(<Harness onConfirm={onConfirm} />);
+  expect(screen.queryByRole("group")).toBeNull();
+  expect(screen.queryByText("Desktop confirmation")).toBeNull();
+  fireEvent.click(screen.getByRole("button", { name: "Remove A" }));
+  expect(screen.getByText("Desktop confirmation")).toBeTruthy();
+  expect(onConfirm).not.toHaveBeenCalled();
+});
+
+it("allows a newly opened request to supply its target after the idle state", () => {
+  function SelectedTarget() {
+    const [target, setTarget] = useState<string | null>(null);
+    return (
+      <>
+        <button onClick={() => setTarget("A")}>Choose A</button>
+        <MobileActionConfirmation
+          open={target !== null}
+          targetKey={target ?? ""}
+          onOpenChange={(open) => {
+            if (!open) setTarget(null);
+          }}
+          title="Delete item?"
+          subject={target}
+          cancelLabel="Cancel"
+          confirmLabel="Delete"
+          onConfirm={vi.fn()}
+        />
+      </>
+    );
+  }
+  render(<SelectedTarget />);
+  fireEvent.click(screen.getByRole("button", { name: "Choose A" }));
+  expect(screen.getByRole("dialog", { name: "Delete item?" })).toBeTruthy();
+});
+
+it("keeps an opted-in request busy and retries rejection without duplicate dispatch", async () => {
+  let reject!: () => void;
+  const onConfirm = vi
+    .fn()
+    .mockImplementationOnce(
+      () =>
+        new Promise<void>((_, fail) => {
+          reject = fail;
+        }),
+    )
+    .mockResolvedValue(undefined);
+  render(<Harness onConfirm={onConfirm} completionPolicy="await-with-retry" />);
+  fireEvent.click(screen.getByRole("button", { name: "Remove A" }));
+  const button = screen.getByRole("button", { name: "Delete" }) as HTMLButtonElement;
+  fireEvent.click(button);
+  fireEvent.click(button);
+  await waitFor(() => expect(onConfirm).toHaveBeenCalledTimes(1));
+  expect(screen.getByRole("dialog", { name: "Delete item?" })).toBeTruthy();
+  expect(button.disabled).toBe(true);
+  await act(async () => reject());
+  await waitFor(() => expect(button.disabled).toBe(false));
+  fireEvent.click(button);
+  await waitFor(() => expect(onConfirm).toHaveBeenCalledTimes(2));
+  expect(screen.queryByRole("group")).toBeNull();
+});
+
+it("does not let an old awaited rejection replace a newer target", async () => {
+  let reject!: () => void;
+  const onConfirm = vi.fn(
+    () =>
+      new Promise<void>((_, fail) => {
+        reject = fail;
+      }),
+  );
+  const { rerender } = render(
+    <Harness onConfirm={onConfirm} completionPolicy="await-with-retry" />,
+  );
+  fireEvent.click(screen.getByRole("button", { name: "Remove A" }));
+  fireEvent.click(screen.getByRole("button", { name: "Delete" }));
+  await waitFor(() => expect(onConfirm).toHaveBeenCalledOnce());
+  rerender(<Harness onConfirm={onConfirm} completionPolicy="await-with-retry" targetKey="B" />);
+  expect(screen.queryByRole("group")).toBeNull();
+  fireEvent.click(screen.getByRole("button", { name: "Remove A" }));
+  await act(async () => reject());
+  expect(screen.getAllByRole("group")).toHaveLength(1);
+  expect(onConfirm).toHaveBeenCalledTimes(1);
+});
diff --git a/apps/web/components/confirmation/mobile-action-confirmation.tsx b/apps/web/components/confirmation/mobile-action-confirmation.tsx
new file mode 100644
index 0000000000..3d2fbcada8
--- /dev/null
+++ b/apps/web/components/confirmation/mobile-action-confirmation.tsx
@@ -0,0 +1,163 @@
+"use client";
+
+import { useId, useLayoutEffect, useRef, useState, type ReactNode, type RefObject } from "react";
+import { createPortal } from "react-dom";
+import { Drawer, DrawerContent, DrawerTitle, DrawerDescription } from "@kandev/ui/drawer";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
+import {
+  MobileConfirmationContent,
+  type MobileConfirmationContentProps,
+} from "./mobile-confirmation-content";
+import { useMobileConfirmationHost } from "./mobile-confirmation-host";
+import {
+  useMobileConfirmationSubmit,
+  type ConfirmationCompletionPolicy,
+} from "./use-mobile-confirmation-submit";
+
+export type MobileActionConfirmationProps = Omit<
+  MobileConfirmationContentProps,
+  "onConfirm" | "onCancel"
+> & {
+  open: boolean;
+  targetKey: string;
+  onOpenChange: (open: boolean) => void;
+  onCancel?: () => void;
+  /** Local owner dismissal before dispatch, when it differs from cancellation. */
+  onClose?: () => void;
+  onConfirm: () => void | Promise<void>;
+  completionPolicy?: ConfirmationCompletionPolicy;
+  focusReturnRef?: RefObject<HTMLElement | null>;
+  fallback?: ReactNode;
+};
+
+/** Keep this adapter mounted across responsive branches so a boundary change cancels the request. */
+export function MobileActionConfirmation(props: MobileActionConfirmationProps) {
+  const { isMobile, changed } = useConfirmationBoundary(
+    props.open,
+    props.targetKey,
+    props.onOpenChange,
+  );
+  if (changed || !props.open) return null;
+  if (!isMobile) return props.fallback ?? null;
+  return <OpenMobileConfirmation {...props} />;
+}
+
+export function useConfirmationBoundary(
+  open: boolean,
+  targetKey: string,
+  onOpenChange: (open: boolean) => void,
+) {
+  const viewport = useResponsiveBreakpoint();
+  const { isMobile } = viewport;
+  const previous = useRef({ isMobile, targetKey, open });
+  const changed =
+    previous.current.open &&
+    open &&
+    (previous.current.isMobile !== isMobile || previous.current.targetKey !== targetKey);
+  useLayoutEffect(() => {
+    previous.current = { isMobile, targetKey, open };
+    if (changed && open) onOpenChange(false);
+  });
+  return { ...viewport, changed };
+}
+
+function OpenMobileConfirmation({
+  onOpenChange,
+  onCancel,
+  onClose,
+  onConfirm,
+  completionPolicy = "close-before-dispatch",
+  focusReturnRef,
+  fallback: _fallback,
+  open: _open,
+  targetKey: _targetKey,
+  ...content
+}: MobileActionConfirmationProps) {
+  const host = useMobileConfirmationHost();
+  const id = useId();
+  const token = useRef(Symbol());
+  const [closed, setClosed] = useState(false);
+  const { submit, submitted, pending } = useMobileConfirmationSubmit({
+    closed,
+    disabled: !!(content.disabled || content.confirmDisabled),
+    onConfirm,
+    completionPolicy,
+    close: () => {
+      setClosed(true);
+      if (onClose) onClose();
+      else onOpenChange(false);
+    },
+  });
+  const initialFocus = useRef(document.activeElement as HTMLElement | null);
+  const latest = useRef({ onOpenChange, onCancel, disabled: content.disabled });
+  useLayoutEffect(() => {
+    latest.current = { onOpenChange, onCancel, disabled: content.disabled };
+  });
+  const titleId = `${id}-title`;
+  const descriptionId = `${id}-description`;
+
+  const cancel = useRef((invalidated = false) => {
+    if (!invalidated && (submitted.current || latest.current.disabled)) return;
+    setClosed(true);
+    latest.current.onCancel?.();
+    latest.current.onOpenChange(false);
+    queueMicrotask(() => {
+      const target = focusReturnRef?.current ?? initialFocus.current;
+      if (host) host.restoreFocus(target);
+      else if (target?.isConnected && !target.closest("[inert]"))
+        target.focus({ preventScroll: true });
+    });
+  }).current;
+  const register = host?.register;
+  const release = host?.release;
+  useLayoutEffect(() => {
+    if (!register || !release || closed) return;
+    const requestToken = token.current;
+    register({ token: requestToken, titleId, descriptionId, cancel });
+    return () => release(requestToken);
+  }, [register, release, closed, titleId, descriptionId, cancel]);
+
+  const body = closed ? null : (
+    <MobileConfirmationContent
+      {...content}
+      disabled={content.disabled || pending}
+      titleId={titleId}
+      descriptionId={descriptionId}
+      onBack={host ? () => cancel() : undefined}
+      onCancel={() => cancel()}
+      onConfirm={submit}
+    />
+  );
+  if (host)
+    return host.outlet && host.request?.token === token.current
+      ? createPortal(body, host.outlet)
+      : null;
+  return (
+    <Drawer
+      open={!closed}
+      onOpenChange={(next) => {
+        if (!next) cancel();
+      }}
+    >
+      <DrawerContent
+        aria-labelledby={titleId}
+        aria-describedby={descriptionId}
+        className="data-[vaul-drawer-direction=bottom]:max-h-[calc(100dvh-1rem)] data-[vaul-drawer-direction=bottom]:mt-0 overflow-hidden"
+        onOpenAutoFocus={(event) => event.preventDefault()}
+        onCloseAutoFocus={(event) => event.preventDefault()}
+        onEscapeKeyDown={(event) => {
+          event.preventDefault();
+          cancel();
+        }}
+      >
+        <DrawerTitle asChild>
+          <span hidden>{content.title}</span>
+        </DrawerTitle>
+        <DrawerDescription asChild>
+          <span hidden>{content.subject ?? content.title}</span>
+        </DrawerDescription>
+        {body}
+      </DrawerContent>
+    </Drawer>
+  );
+}
diff --git a/apps/web/components/confirmation/mobile-confirmation-content.test.tsx b/apps/web/components/confirmation/mobile-confirmation-content.test.tsx
new file mode 100644
index 0000000000..6a9f6fa5e3
--- /dev/null
+++ b/apps/web/components/confirmation/mobile-confirmation-content.test.tsx
@@ -0,0 +1,98 @@
+import { act, cleanup, fireEvent, render, screen } from "@testing-library/react";
+import { afterEach, expect, it, vi } from "vitest";
+import i18n from "i18next";
+import { MobileConfirmationContent } from "./mobile-confirmation-content";
+
+afterEach(() => {
+  cleanup();
+  vi.restoreAllMocks();
+});
+
+it("isolates confirmation mouse events from row selection owners", () => {
+  const onMouseDown = vi.fn();
+  render(
+    <div onMouseDown={onMouseDown}>
+      <MobileConfirmationContent
+        title="Delete file?"
+        cancelLabel="Cancel"
+        confirmLabel="Delete"
+        onCancel={vi.fn()}
+        onConfirm={vi.fn()}
+      />
+    </div>,
+  );
+  fireEvent.mouseDown(screen.getByRole("button", { name: "Cancel" }));
+  expect(onMouseDown).not.toHaveBeenCalled();
+});
+
+it("updates Back with the active locale without reopening", async () => {
+  render(
+    <MobileConfirmationContent
+      title="Delete file?"
+      cancelLabel="Cancel"
+      confirmLabel="Delete"
+      onBack={vi.fn()}
+      onCancel={vi.fn()}
+      onConfirm={vi.fn()}
+    />,
+  );
+  const back = screen.getByRole("button", { name: "Back" });
+  try {
+    await act(async () => {
+      await i18n.changeLanguage("pt-pt");
+    });
+    expect(screen.getByRole("button", { name: "Voltar" })).toBe(back);
+  } finally {
+    await act(async () => {
+      await i18n.changeLanguage("en");
+    });
+  }
+});
+
+it("names the target, focuses Cancel, and requires explicit action activation", () => {
+  const onConfirm = vi.fn();
+  const focus = vi.spyOn(HTMLElement.prototype, "focus");
+  render(
+    <MobileConfirmationContent
+      title="Delete file?"
+      subject="notes.txt"
+      description="This file will be deleted."
+      cancelLabel="Cancel"
+      confirmLabel="Delete"
+      onCancel={vi.fn()}
+      onConfirm={onConfirm}
+    />,
+  );
+  const group = screen.getByRole("group", { name: "Delete file?" });
+  expect(screen.getByText("notes.txt")).toBeTruthy();
+  expect(group.getAttribute("aria-describedby")).toBeTruthy();
+  expect(document.activeElement).toBe(screen.getByRole("button", { name: "Cancel" }));
+  expect(focus).toHaveBeenCalledWith({ preventScroll: true });
+  fireEvent.keyDown(group, { key: "Enter" });
+  expect(onConfirm).not.toHaveBeenCalled();
+  fireEvent.click(screen.getByRole("button", { name: "Delete" }));
+  expect(onConfirm).toHaveBeenCalledOnce();
+});
+
+it("keeps cancellation available when the action is disabled", () => {
+  const onConfirm = vi.fn();
+  const onCancel = vi.fn();
+  render(
+    <MobileConfirmationContent
+      title="Archive task?"
+      subject="Task A"
+      cancelLabel="Cancel"
+      confirmLabel="Archive"
+      variant="default"
+      confirmDisabled
+      onCancel={onCancel}
+      onConfirm={onConfirm}
+    />,
+  );
+  const confirm = screen.getByRole("button", { name: "Archive" });
+  expect(confirm.getAttribute("data-variant")).toBe("default");
+  fireEvent.click(confirm);
+  expect(onConfirm).not.toHaveBeenCalled();
+  fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
+  expect(onCancel).toHaveBeenCalledOnce();
+});
diff --git a/apps/web/components/confirmation/mobile-confirmation-content.tsx b/apps/web/components/confirmation/mobile-confirmation-content.tsx
new file mode 100644
index 0000000000..8f1a439580
--- /dev/null
+++ b/apps/web/components/confirmation/mobile-confirmation-content.tsx
@@ -0,0 +1,131 @@
+"use client";
+
+import { useId, useLayoutEffect, useRef, type ReactNode, type KeyboardEvent } from "react";
+import { useTranslation } from "react-i18next";
+import { IconArrowLeft } from "@tabler/icons-react";
+import { Button } from "@kandev/ui/button";
+
+export type MobileConfirmationContentProps = {
+  title: ReactNode;
+  subject?: ReactNode;
+  description?: ReactNode;
+  children?: ReactNode;
+  titleId?: string;
+  descriptionId?: string;
+  cancelLabel: ReactNode;
+  confirmLabel: ReactNode;
+  confirmAriaLabel?: string;
+  confirmTestId?: string;
+  testId?: string;
+  variant?: "default" | "destructive";
+  disabled?: boolean;
+  confirmDisabled?: boolean;
+  onBack?: () => void;
+  onCancel: () => void;
+  onConfirm: () => void;
+};
+
+function cancelOnEscape(event: KeyboardEvent, disabled: boolean | undefined, cancel: () => void) {
+  if (event.key !== "Escape") return;
+  event.preventDefault();
+  event.stopPropagation();
+  if (!disabled) cancel();
+}
+
+export function MobileConfirmationContent({
+  title,
+  subject,
+  description,
+  children,
+  titleId,
+  descriptionId,
+  cancelLabel,
+  confirmLabel,
+  confirmAriaLabel,
+  confirmTestId,
+  testId,
+  variant = "destructive",
+  disabled,
+  confirmDisabled,
+  onBack,
+  onCancel,
+  onConfirm,
+}: MobileConfirmationContentProps) {
+  const { t } = useTranslation();
+  const id = useId();
+  const headingId = titleId ?? `${id}-title`;
+  const bodyId = descriptionId ?? `${id}-description`;
+  const cancelRef = useRef<HTMLButtonElement>(null);
+  useLayoutEffect(() => {
+    cancelRef.current?.focus({ preventScroll: true });
+  }, []);
+
+  return (
+    <section
+      role="group"
+      aria-labelledby={headingId}
+      aria-describedby={bodyId}
+      data-testid={testId ?? "mobile-action-confirmation"}
+      data-confirmation-boundary=""
+      className="flex min-h-0 min-w-0 flex-1 flex-col text-left text-sm text-foreground"
+      onPointerDown={(event) => event.stopPropagation()}
+      onMouseDown={(event) => event.stopPropagation()}
+      onClick={(event) => event.stopPropagation()}
+      onKeyDown={(event) => {
+        if (event.key === "Enter" || event.key === " ") event.stopPropagation();
+      }}
+      onKeyDownCapture={(event) => cancelOnEscape(event, disabled, onCancel)}
+    >
+      <header className="shrink-0 px-4 pb-3 pt-2">
+        {onBack && (
+          <Button
+            type="button"
+            variant="ghost"
+            disabled={disabled}
+            onClick={onBack}
+            className="-ml-3 mb-1 min-h-11 cursor-pointer px-3 text-sm"
+          >
+            <IconArrowLeft className="size-4" aria-hidden="true" />
+            {t("common:back")}
+          </Button>
+        )}
+        <h2 id={headingId} className="text-lg font-semibold [overflow-wrap:anywhere]">
+          {title}
+        </h2>
+      </header>
+      <div
+        data-testid="mobile-confirmation-body"
+        className="min-h-0 min-w-0 flex-1 space-y-4 overflow-y-auto overscroll-contain px-4 text-sm leading-6 [overflow-wrap:anywhere]"
+      >
+        <div id={bodyId} className="space-y-3">
+          {subject && <p className="font-medium">{subject}</p>}
+          {description && <div>{description}</div>}
+        </div>
+        {children}
+      </div>
+      <footer className="flex shrink-0 flex-col gap-2 px-4 pt-5 pb-[max(1rem,env(safe-area-inset-bottom))]">
+        <Button
+          type="button"
+          variant={variant}
+          disabled={disabled || confirmDisabled}
+          aria-label={confirmAriaLabel}
+          data-testid={confirmTestId}
+          onClick={onConfirm}
+          className="h-auto min-h-12 w-full cursor-pointer whitespace-normal px-4 py-3 text-sm"
+        >
+          {confirmLabel}
+        </Button>
+        <Button
+          ref={cancelRef}
+          type="button"
+          variant="outline"
+          disabled={disabled}
+          onClick={onCancel}
+          className="h-auto min-h-12 w-full cursor-pointer whitespace-normal px-4 py-3 text-sm"
+        >
+          {cancelLabel}
+        </Button>
+      </footer>
+    </section>
+  );
+}
diff --git a/apps/web/components/confirmation/mobile-confirmation-host.test.tsx b/apps/web/components/confirmation/mobile-confirmation-host.test.tsx
new file mode 100644
index 0000000000..67bb318871
--- /dev/null
+++ b/apps/web/components/confirmation/mobile-confirmation-host.test.tsx
@@ -0,0 +1,211 @@
+import { useRef, useState } from "react";
+import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { afterEach, expect, it, vi } from "vitest";
+import { MobileConfirmationHost, MobileConfirmationHostBody } from "./mobile-confirmation-host";
+import { MobileActionConfirmation } from "./mobile-action-confirmation";
+import { MobilePickerSheet } from "@/components/task/mobile/mobile-picker-sheet";
+
+vi.mock("@/hooks/use-responsive-breakpoint", () => ({
+  useResponsiveBreakpoint: () => ({ isMobile: true }),
+}));
+afterEach(cleanup);
+
+function Harness({
+  showSource = true,
+  showTrigger = true,
+  parentOpen = true,
+  target = "A",
+  onConfirm = vi.fn(),
+  disabled = false,
+  onCancel = vi.fn(),
+  surface = "dialog" as "drawer" | "dialog",
+}) {
+  const [open, setOpen] = useState(false);
+  const trigger = useRef<HTMLButtonElement>(null);
+  return (
+    <MobileConfirmationHost open={parentOpen} surface={surface}>
+      {({ contentProps }) => (
+        <div role="dialog" {...contentProps}>
+          <MobileConfirmationHostBody>
+            <input aria-label="Filter" defaultValue="unfinished draft" />
+            <div data-testid="scroll-owner" style={{ overflowY: "auto", height: 100 }}>
+              {showTrigger && (
+                <button ref={trigger} onClick={() => setOpen(true)}>
+                  Remove {target}
+                </button>
+              )}
+            </div>
+            {showSource && (
+              <MobileActionConfirmation
+                open={open}
+                disabled={disabled}
+                onCancel={onCancel}
+                onOpenChange={setOpen}
+                targetKey={target}
+                title="Delete item?"
+                subject={target}
+                description="Deletes the selected item."
+                cancelLabel="Cancel"
+                confirmLabel="Delete"
+                onConfirm={onConfirm}
+                focusReturnRef={trigger}
+              />
+            )}
+          </MobileConfirmationHostBody>
+        </div>
+      )}
+    </MobileConfirmationHost>
+  );
+}
+
+it.each(["drawer", "dialog"] as const)(
+  "%s restores the mounted draft, scroll and initiating focus",
+  async (surface) => {
+    render(<Harness surface={surface} />);
+    const input = screen.getByRole("textbox") as HTMLInputElement;
+    const scroll = screen.getByTestId("scroll-owner");
+    scroll.scrollTop = 48;
+    fireEvent.change(input, { target: { value: "my filter" } });
+    const trigger = screen.getByRole("button", { name: "Remove A" });
+    fireEvent.click(trigger);
+    expect(screen.getAllByRole("dialog")).toHaveLength(1);
+    expect(screen.getByRole("dialog").getAttribute("aria-labelledby")).toBeTruthy();
+    expect(screen.getByRole("group", { name: "Delete item?" }).closest("[inert]")).toBeNull();
+    expect(screen.queryByRole("textbox")).toBeNull();
+    expect(input.isConnected).toBe(true);
+    fireEvent.click(screen.getByRole("button", { name: "Back" }));
+    expect(screen.getByRole("textbox")).toBe(input);
+    expect(input.value).toBe("my filter");
+    expect(scroll.scrollTop).toBe(48);
+    await waitFor(() => expect(document.activeElement).toBe(trigger));
+  },
+);
+
+it("Escape cancels only the step without invoking the action", () => {
+  const outsideKey = vi.fn();
+  const onConfirm = vi.fn();
+  render(
+    <div onKeyDown={outsideKey}>
+      <Harness onConfirm={onConfirm} />
+    </div>,
+  );
+  fireEvent.click(screen.getByRole("button", { name: "Remove A" }));
+  fireEvent.keyDown(screen.getByRole("button", { name: "Cancel" }), { key: "Escape" });
+  expect(screen.queryByRole("group")).toBeNull();
+  expect(screen.getByRole("textbox")).toBeTruthy();
+  expect(outsideKey).not.toHaveBeenCalled();
+  expect(onConfirm).not.toHaveBeenCalled();
+});
+
+it("returns focus to a visible host control if its initiating control disappears", async () => {
+  const { rerender } = render(<Harness />);
+  fireEvent.click(screen.getByRole("button", { name: "Remove A" }));
+  rerender(<Harness showTrigger={false} />);
+  fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
+  await waitFor(() => expect(document.activeElement).toBe(screen.getByRole("textbox")));
+});
+
+it("invalidates the decision when its source unmounts", () => {
+  const { rerender } = render(<Harness />);
+  fireEvent.click(screen.getByRole("button", { name: "Remove A" }));
+  expect(screen.getByRole("group")).toBeTruthy();
+  rerender(<Harness showSource={false} />);
+  expect(screen.queryByRole("group")).toBeNull();
+});
+
+it("does not resurrect a decision after closing and reopening its parent", () => {
+  const { rerender } = render(<Harness />);
+  fireEvent.click(screen.getByRole("button", { name: "Remove A" }));
+  rerender(<Harness parentOpen={false} />);
+  rerender(<Harness parentOpen />);
+  expect(screen.queryByRole("group")).toBeNull();
+});
+
+it("invalidates even a disabled decision when its parent is dismissed", () => {
+  const onCancel = vi.fn();
+  const { rerender } = render(<Harness disabled onCancel={onCancel} />);
+  fireEvent.click(screen.getByRole("button", { name: "Remove A" }));
+  rerender(<Harness disabled parentOpen={false} onCancel={onCancel} />);
+  expect(onCancel).toHaveBeenCalledOnce();
+  rerender(<Harness disabled onCancel={onCancel} />);
+  expect(screen.queryByRole("group")).toBeNull();
+});
+
+it("does not redirect a pending decision to a replacement target", () => {
+  const onConfirm = vi.fn();
+  const { rerender } = render(<Harness onConfirm={onConfirm} />);
+  fireEvent.click(screen.getByRole("button", { name: "Remove A" }));
+  expect(screen.getByRole("group")).toBeTruthy();
+  rerender(<Harness target="B" onConfirm={onConfirm} />);
+  expect(screen.queryByRole("group")).toBeNull();
+  expect(onConfirm).not.toHaveBeenCalled();
+});
+
+it("lets a picker opt into one hosted step without changing its normal title or list", () => {
+  function Picker() {
+    const [open, setOpen] = useState(false);
+    return (
+      <MobilePickerSheet open onOpenChange={vi.fn()} title="Terminals" confirmationHost>
+        <button onClick={() => setOpen(true)}>Close shell</button>
+        <MobileActionConfirmation
+          open={open}
+          onOpenChange={setOpen}
+          targetKey="shell"
+          title="Close terminal?"
+          subject="Shell"
+          cancelLabel="Cancel"
+          confirmLabel="Close"
+          onConfirm={vi.fn()}
+        />
+      </MobilePickerSheet>
+    );
+  }
+  render(<Picker />);
+  const picker = screen.getByRole("dialog", { name: "Terminals" });
+  fireEvent.click(screen.getByRole("button", { name: "Close shell" }));
+  expect(screen.getAllByRole("dialog")).toHaveLength(1);
+  expect(screen.getByRole("dialog", { name: "Close terminal?" })).toBe(picker);
+  expect(screen.getAllByRole("dialog", { hidden: true })).toHaveLength(1);
+  fireEvent.keyDown(document, { key: "Escape" });
+  expect(screen.getByRole("dialog", { name: "Terminals" })).toBeTruthy();
+  expect(screen.queryByRole("group")).toBeNull();
+});
+
+it("an older request's cleanup cannot remove the replacement request", () => {
+  function Requests({ second }: { second: boolean }) {
+    const [first, setFirst] = useState(true);
+    return (
+      <MobileConfirmationHost open>
+        {({ contentProps }) => (
+          <div role="dialog" {...contentProps}>
+            <MobileConfirmationHostBody>
+              <MobileActionConfirmation
+                open={first}
+                onOpenChange={setFirst}
+                targetKey="first"
+                title="First?"
+                cancelLabel="Cancel"
+                confirmLabel="Delete"
+                onConfirm={vi.fn()}
+              />
+              <MobileActionConfirmation
+                open={second}
+                onOpenChange={vi.fn()}
+                targetKey="second"
+                title="Second?"
+                cancelLabel="Cancel"
+                confirmLabel="Delete"
+                onConfirm={vi.fn()}
+              />
+            </MobileConfirmationHostBody>
+          </div>
+        )}
+      </MobileConfirmationHost>
+    );
+  }
+  const { rerender } = render(<Requests second={false} />);
+  expect(screen.getByRole("group", { name: "First?" })).toBeTruthy();
+  rerender(<Requests second />);
+  expect(screen.getByRole("group", { name: "Second?" })).toBeTruthy();
+  expect(screen.queryByRole("group", { name: "First?" })).toBeNull();
+});
diff --git a/apps/web/components/confirmation/mobile-confirmation-host.tsx b/apps/web/components/confirmation/mobile-confirmation-host.tsx
new file mode 100644
index 0000000000..b0d898b9d8
--- /dev/null
+++ b/apps/web/components/confirmation/mobile-confirmation-host.tsx
@@ -0,0 +1,163 @@
+"use client";
+
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+  type CSSProperties,
+  type ReactNode,
+  type RefObject,
+} from "react";
+
+type Request = {
+  token: symbol;
+  titleId: string;
+  descriptionId: string;
+  cancel: (invalidated?: boolean) => void;
+};
+
+type HostContext = {
+  request: Request | null;
+  outlet: HTMLDivElement | null;
+  setOutlet: (node: HTMLDivElement | null) => void;
+  register: (request: Request) => void;
+  release: (token: symbol) => void;
+  originRef: RefObject<HTMLDivElement | null>;
+  originSize: { width: number; height: number } | null;
+  restoreFocus: (preferred: HTMLElement | null) => void;
+};
+
+const Context = createContext<HostContext | null>(null);
+export const useMobileConfirmationHost = () => useContext(Context);
+
+type HostState = {
+  active: boolean;
+  contentProps: {
+    "aria-labelledby"?: string;
+    "aria-describedby"?: string;
+    onEscapeKeyDown?: (event: KeyboardEvent) => void;
+    style?: CSSProperties;
+  };
+};
+
+/** Owns one step, not another modal. The actual Drawer/Dialog receives contentProps. */
+export function MobileConfirmationHost({
+  open,
+  surface = "dialog",
+  children,
+}: {
+  open: boolean;
+  surface?: "drawer" | "dialog";
+  children: (state: HostState) => ReactNode;
+}) {
+  const current = useRef<Request | null>(null);
+  const originRef = useRef<HTMLDivElement>(null);
+  const [request, setRequest] = useState<Request | null>(null);
+  const [outlet, setOutlet] = useState<HTMLDivElement | null>(null);
+  const [originSize, setOriginSize] = useState<HostContext["originSize"]>(null);
+  const restoreFocus = useCallback((preferred: HTMLElement | null) => {
+    if (current.current || !originRef.current?.isConnected) return;
+    if (preferred && originRef.current.contains(preferred)) {
+      preferred.focus({ preventScroll: true });
+      if (document.activeElement === preferred) return;
+    }
+    const controls = originRef.current.querySelectorAll<HTMLElement>(
+      'button:not(:disabled), input:not(:disabled), select:not(:disabled), a[href], [tabindex="0"]',
+    );
+    const fallback = Array.from(controls).find(
+      (control) => !control.closest('[hidden], [inert], [aria-hidden="true"]'),
+    );
+    fallback?.focus({ preventScroll: true });
+  }, []);
+  const release = useCallback((token: symbol) => {
+    if (current.current?.token !== token) return;
+    current.current = null;
+    setRequest(null);
+    setOriginSize(null);
+  }, []);
+  const register = useCallback(
+    (next: Request) => {
+      if (current.current?.token === next.token) return;
+      if (surface === "drawer" && originRef.current) {
+        const { width, height } = originRef.current.getBoundingClientRect();
+        setOriginSize({ width, height });
+      }
+      const previous = current.current;
+      current.current = next;
+      previous?.cancel(true);
+      setRequest(next);
+    },
+    [surface],
+  );
+  useLayoutEffect(() => {
+    if (open || !current.current) return;
+    const previous = current.current;
+    release(previous.token);
+    previous.cancel(true);
+  }, [open, request, release]);
+  const context = useMemo(
+    () => ({ request, outlet, setOutlet, register, release, originRef, originSize, restoreFocus }),
+    [request, outlet, register, release, originSize, restoreFocus],
+  );
+  // Only the inner list/body scrolls; focus must not scroll Vaul's outer shell.
+  const style: CSSProperties | undefined =
+    surface === "drawer"
+      ? {
+          overflow: "clip",
+          ...(request ? { height: "auto", maxHeight: "calc(100dvh - 1rem)", marginTop: 0 } : {}),
+        }
+      : undefined;
+  const contentProps: HostState["contentProps"] = request
+    ? {
+        "aria-labelledby": request.titleId,
+        "aria-describedby": request.descriptionId,
+        style,
+        onEscapeKeyDown: (event: KeyboardEvent) => {
+          event.preventDefault();
+          event.stopPropagation();
+          request.cancel();
+        },
+      }
+    : { style };
+  return (
+    <Context.Provider value={context}>
+      {children({ active: request !== null, contentProps })}
+    </Context.Provider>
+  );
+}
+
+/** The hidden origin retains its scroll geometry without sizing an active drawer step. */
+export function MobileConfirmationHostBody({ children }: { children: ReactNode }) {
+  const host = useMobileConfirmationHost();
+  if (!host) return children;
+  const active = host.request !== null;
+  const originStyle: CSSProperties = {};
+  if (active) {
+    originStyle.visibility = "hidden";
+    if (host.originSize) {
+      Object.assign(originStyle, host.originSize, { position: "absolute", top: 0, left: 0 });
+    }
+  }
+  return (
+    <div className="relative grid min-h-0 min-w-0 flex-1 grid-cols-1 grid-rows-1">
+      <div
+        ref={host.originRef}
+        aria-hidden={active || undefined}
+        inert={active || undefined}
+        style={originStyle}
+        className="col-start-1 row-start-1 flex min-h-0 min-w-0 flex-col"
+      >
+        {children}
+      </div>
+      <div
+        ref={host.setOutlet}
+        className="col-start-1 row-start-1 flex min-h-0 min-w-0 flex-col"
+        hidden={!active}
+      />
+    </div>
+  );
+}
diff --git a/apps/web/components/confirmation/saved-task-view-delete-confirmation.test.tsx b/apps/web/components/confirmation/saved-task-view-delete-confirmation.test.tsx
index 21655bcc05..82f68ca3b3 100644
--- a/apps/web/components/confirmation/saved-task-view-delete-confirmation.test.tsx
+++ b/apps/web/components/confirmation/saved-task-view-delete-confirmation.test.tsx
@@ -67,7 +67,23 @@ function ReplacingHarness() {
 }
 
 describe("SavedTaskViewDeleteConfirmation", () => {
-  afterEach(cleanup);
+  afterEach(() => {
+    cleanup();
+    Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
+  });
+
+  it.each(["inline", "popover"] as const)(
+    "uses a phone sheet before the %s presentation hint",
+    async (presentation) => {
+      Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+      const onConfirm = vi.fn();
+      render(<Harness presentation={presentation} onConfirm={onConfirm} />);
+      const dialog = screen.getByRole("dialog", { name: TARGET_TITLE });
+      expect(dialog.getAttribute("data-slot")).toBe("drawer-content");
+      fireEvent.click(within(dialog).getByRole("button", { name: "Delete Needs review" }));
+      await waitFor(() => expect(onConfirm).toHaveBeenCalledExactlyOnceWith(TARGET.id));
+    },
+  );
 
   it("names the target and dispatches its captured id only after fine-pointer confirmation", async () => {
     const onConfirm = vi.fn();
diff --git a/apps/web/components/confirmation/saved-task-view-delete-confirmation.tsx b/apps/web/components/confirmation/saved-task-view-delete-confirmation.tsx
index 267029df86..552cfd67a3 100644
--- a/apps/web/components/confirmation/saved-task-view-delete-confirmation.tsx
+++ b/apps/web/components/confirmation/saved-task-view-delete-confirmation.tsx
@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 
 import { ActionConfirmPopover } from "./action-confirm-popover";
 import { InlineConfirmActions } from "./inline-confirm-actions";
+import { MobileActionConfirmation } from "./mobile-action-confirmation";
 import type { SavedTaskViewDeleteTarget } from "./use-saved-task-view-delete-confirmation";
 
 export type { SavedTaskViewDeleteTarget } from "./use-saved-task-view-delete-confirmation";
@@ -38,53 +39,56 @@ export function SavedTaskViewDeleteConfirmation({
   const title = t("common:deleteSavedTaskViewTitle", { name: target.label });
   const description = t("common:deleteSavedTaskViewDescription");
 
-  if (presentation === "popover") {
-    return (
+  const actions = {
+    description,
+    cancelLabel: t("common:cancel"),
+    confirmLabel: t("common:delete"),
+    confirmAriaLabel: t("common:deleteSavedTaskViewAction", { name: target.label }),
+    confirmDisabled,
+    testId,
+    confirmTestId,
+    onConfirm: () => onConfirm(target.id),
+  };
+  const fallback =
+    presentation === "popover" ? (
       <ActionConfirmPopover
+        {...actions}
         open={open}
         anchorRef={anchorRef}
         focusBoundaryRef={focusBoundaryRef}
         title={title}
-        description={description}
-        cancelLabel={t("common:cancel")}
-        confirmLabel={t("common:delete")}
-        confirmAriaLabel={t("common:deleteSavedTaskViewAction", { name: target.label })}
-        confirmDisabled={confirmDisabled}
-        testId={testId}
-        confirmTestId={confirmTestId}
         confirmationBoundary
         onOpenChange={onOpenChange}
-        onConfirm={() => onConfirm(target.id)}
+      />
+    ) : (
+      <InlineConfirmActions
+        {...actions}
+        density="touch"
+        ariaLabel={title}
+        description={
+          <>
+            <span className="block font-medium text-foreground">{title}</span>
+            <span className="mt-1 block">{description}</span>
+          </>
+        }
+        onCancel={() => {
+          onOpenChange(false);
+          queueMicrotask(() => {
+            if (anchorRef.current?.isConnected) anchorRef.current.focus();
+          });
+        }}
+        onClose={() => onOpenChange(false)}
       />
     );
-  }
-
-  if (!open) return null;
-
   return (
-    <InlineConfirmActions
-      density="touch"
-      testId={testId}
-      ariaLabel={title}
-      description={
-        <>
-          <span className="block font-medium text-foreground">{title}</span>
-          <span className="mt-1 block">{description}</span>
-        </>
-      }
-      cancelLabel={t("common:cancel")}
-      confirmLabel={t("common:delete")}
-      confirmAriaLabel={t("common:deleteSavedTaskViewAction", { name: target.label })}
-      confirmTestId={confirmTestId}
-      confirmDisabled={confirmDisabled}
-      onCancel={() => {
-        onOpenChange(false);
-        queueMicrotask(() => {
-          if (anchorRef.current?.isConnected) anchorRef.current.focus();
-        });
-      }}
-      onClose={() => onOpenChange(false)}
-      onConfirm={() => onConfirm(target.id)}
+    <MobileActionConfirmation
+      {...actions}
+      open={open}
+      title={title}
+      targetKey={target.id}
+      focusReturnRef={anchorRef}
+      onOpenChange={onOpenChange}
+      fallback={fallback}
     />
   );
 }
diff --git a/apps/web/components/confirmation/use-mobile-confirmation-submit.ts b/apps/web/components/confirmation/use-mobile-confirmation-submit.ts
new file mode 100644
index 0000000000..99cd4b7f23
--- /dev/null
+++ b/apps/web/components/confirmation/use-mobile-confirmation-submit.ts
@@ -0,0 +1,58 @@
+"use client";
+
+import { useLayoutEffect, useRef, useState } from "react";
+
+export type ConfirmationCompletionPolicy = "close-before-dispatch" | "await-with-retry";
+
+/** Only owners with retryable forms opt into waiting; ordinary actions dismiss before dispatch. */
+export function useMobileConfirmationSubmit({
+  closed,
+  disabled,
+  close,
+  onConfirm,
+  completionPolicy,
+}: {
+  closed: boolean;
+  disabled: boolean;
+  close: () => void;
+  onConfirm: () => void | Promise<void>;
+  completionPolicy: ConfirmationCompletionPolicy;
+}) {
+  const submitted = useRef(false);
+  const live = useRef(true);
+  const [pending, setPending] = useState(false);
+  useLayoutEffect(() => {
+    live.current = !closed;
+    return () => {
+      live.current = false;
+    };
+  }, [closed]);
+
+  const submit = () => {
+    if (submitted.current || closed || disabled) return;
+    submitted.current = true;
+    if (completionPolicy === "close-before-dispatch") {
+      close();
+      queueMicrotask(() => {
+        void Promise.resolve()
+          .then(onConfirm)
+          .catch(() => undefined);
+      });
+      return;
+    }
+    setPending(true);
+    void Promise.resolve()
+      .then(onConfirm)
+      .then(
+        () => {
+          if (live.current) close();
+        },
+        () => {
+          if (!live.current) return;
+          submitted.current = false;
+          setPending(false);
+        },
+      );
+  };
+  return { submit, submitted, pending };
+}
diff --git a/apps/web/components/confirmation/use-saved-task-view-delete-confirmation.ts b/apps/web/components/confirmation/use-saved-task-view-delete-confirmation.ts
index c751716d4c..5e38d3abad 100644
--- a/apps/web/components/confirmation/use-saved-task-view-delete-confirmation.ts
+++ b/apps/web/components/confirmation/use-saved-task-view-delete-confirmation.ts
@@ -1,12 +1,40 @@
 "use client";
 
 import { useEffect, useRef, useState } from "react";
+import { useConfirmationBoundary } from "./mobile-action-confirmation";
 
 export type SavedTaskViewDeleteTarget = {
   id: string;
   label: string;
 };
 
+/** Transient menus close before a phone sheet takes focus. */
+export function useSavedTaskViewDeleteMenu<T extends HTMLElement = HTMLElement>(
+  availableTargets: ReadonlyArray<{ id: string }>,
+  isMobile: boolean,
+) {
+  const deletion = useSavedTaskViewDeleteConfirmation<T>(availableTargets);
+  const [open, setOpen] = useState(false);
+  const pendingTarget = useRef<SavedTaskViewDeleteTarget | null>(null);
+  const onOpenChange = (nextOpen: boolean) => {
+    setOpen(nextOpen);
+    if (!nextOpen) deletion.close();
+  };
+  const request = (target: SavedTaskViewDeleteTarget) => {
+    if (!isMobile) return deletion.request(target);
+    pendingTarget.current = target;
+    setOpen(false);
+  };
+  const onCloseAutoFocus = (event: Event) => {
+    const target = pendingTarget.current;
+    pendingTarget.current = null;
+    if (!target || !isMobile) return;
+    event.preventDefault();
+    deletion.request(target);
+  };
+  return { ...deletion, request, open, onOpenChange, onCloseAutoFocus };
+}
+
 export function useSavedTaskViewDeleteConfirmation<T extends HTMLElement = HTMLElement>(
   availableTargets: ReadonlyArray<{ id: string }>,
 ) {
@@ -18,6 +46,7 @@ export function useSavedTaskViewDeleteConfirmation<T extends HTMLElement = HTMLE
     requestedTarget && availableTargets.some((item) => item.id === requestedTarget.id)
       ? requestedTarget
       : null;
+  useConfirmationBoundary(Boolean(target), target?.id ?? "", () => setRequestedTarget(null));
 
   useEffect(() => {
     if (requestedTarget && !target) setRequestedTarget(null);
diff --git a/apps/web/components/github/my-github/mobile-views-picker.tsx b/apps/web/components/github/my-github/mobile-views-picker.tsx
index f5062614d8..1539e080c8 100644
--- a/apps/web/components/github/my-github/mobile-views-picker.tsx
+++ b/apps/web/components/github/my-github/mobile-views-picker.tsx
@@ -11,6 +11,10 @@ import {
   DrawerTrigger,
 } from "@kandev/ui/drawer";
 import { PresetsSidebar, type PresetsSidebarProps } from "./presets-sidebar";
+import {
+  MobileConfirmationHost,
+  MobileConfirmationHostBody,
+} from "@/components/confirmation/mobile-confirmation-host";
 
 export function MobileViewsPicker({
   title,
@@ -30,51 +34,58 @@ export function MobileViewsPicker({
     [],
   );
   return (
-    <Drawer open={open} onOpenChange={setOpen}>
-      <DrawerTrigger asChild>
-        <Button
-          variant="outline"
-          className="h-11 min-w-0 w-full justify-between gap-2 text-sm font-normal"
-          data-testid="github-mobile-menu-button"
-          aria-label={t("github:viewPicker", { view: title })}
-        >
-          <span className="min-w-0 truncate">
-            <span className="text-muted-foreground">{t("github:views")}:</span>{" "}
-            <span className="font-medium" data-testid="github-list-toolbar-title">
-              {title}
-            </span>
-          </span>
-          <IconChevronDown className="h-4 w-4 shrink-0" />
-        </Button>
-      </DrawerTrigger>
-      <DrawerContent
-        className="h-[88dvh] max-h-[88dvh] overflow-hidden pb-[max(0.5rem,env(safe-area-inset-bottom))]"
-        data-testid="github-mobile-sidebar"
-        aria-describedby={undefined}
-        onCloseAutoFocus={() => {
-          if (!saveAfterClose.current) return;
-          saveAfterClose.current = false;
-          saveFrame.current = requestAnimationFrame(onSaveCurrent);
-        }}
-      >
-        <DrawerHeader className="flex-row shrink-0 items-center justify-between px-3 py-2">
-          <DrawerTitle>{t("github:views")}</DrawerTitle>
-          <DrawerClose asChild>
-            <Button variant="ghost">{t("task:done")}</Button>
-          </DrawerClose>
-        </DrawerHeader>
-        <PresetsSidebar
-          {...props}
-          onSelect={(selection) => {
-            onSelect(selection);
-            if (selection.source !== "kind-switch") setOpen(false);
-          }}
-          onSaveCurrent={() => {
-            saveAfterClose.current = true;
-            setOpen(false);
-          }}
-        />
-      </DrawerContent>
-    </Drawer>
+    <MobileConfirmationHost open={open} surface="drawer">
+      {({ contentProps }) => (
+        <Drawer open={open} onOpenChange={setOpen}>
+          <DrawerTrigger asChild>
+            <Button
+              variant="outline"
+              className="h-11 min-w-0 w-full justify-between gap-2 text-sm font-normal"
+              data-testid="github-mobile-menu-button"
+              aria-label={t("github:viewPicker", { view: title })}
+            >
+              <span className="min-w-0 truncate">
+                <span className="text-muted-foreground">{t("github:views")}:</span>{" "}
+                <span className="font-medium" data-testid="github-list-toolbar-title">
+                  {title}
+                </span>
+              </span>
+              <IconChevronDown className="h-4 w-4 shrink-0" />
+            </Button>
+          </DrawerTrigger>
+          <DrawerContent
+            className="h-[88dvh] max-h-[88dvh] overflow-hidden pb-[max(0.5rem,env(safe-area-inset-bottom))]"
+            data-testid="github-mobile-sidebar"
+            aria-describedby={undefined}
+            {...contentProps}
+            onCloseAutoFocus={() => {
+              if (!saveAfterClose.current) return;
+              saveAfterClose.current = false;
+              saveFrame.current = requestAnimationFrame(onSaveCurrent);
+            }}
+          >
+            <MobileConfirmationHostBody>
+              <DrawerHeader className="flex-row shrink-0 items-center justify-between px-3 py-2">
+                <DrawerTitle>{t("github:views")}</DrawerTitle>
+                <DrawerClose asChild>
+                  <Button variant="ghost">{t("task:done")}</Button>
+                </DrawerClose>
+              </DrawerHeader>
+              <PresetsSidebar
+                {...props}
+                onSelect={(selection) => {
+                  onSelect(selection);
+                  if (selection.source !== "kind-switch") setOpen(false);
+                }}
+                onSaveCurrent={() => {
+                  saveAfterClose.current = true;
+                  setOpen(false);
+                }}
+              />
+            </MobileConfirmationHostBody>
+          </DrawerContent>
+        </Drawer>
+      )}
+    </MobileConfirmationHost>
   );
 }
diff --git a/apps/web/components/github/my-github/presets-sidebar.test.tsx b/apps/web/components/github/my-github/presets-sidebar.test.tsx
index c974533d5c..8bd96686ba 100644
--- a/apps/web/components/github/my-github/presets-sidebar.test.tsx
+++ b/apps/web/components/github/my-github/presets-sidebar.test.tsx
@@ -3,7 +3,10 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import type { SavedPreset } from "./saved-preset-model";
 import { PresetsSidebar } from "./presets-sidebar";
 
-afterEach(cleanup);
+afterEach(() => {
+  cleanup();
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
+});
 
 const savedPreset: SavedPreset = {
   id: "saved-pr",
@@ -15,7 +18,8 @@ const savedPreset: SavedPreset = {
   isDefault: false,
 };
 
-async function expectDeleteDoesNotSelect() {
+async function expectDeleteDoesNotSelect(phone = false) {
+  if (phone) Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
   const onSelect = vi.fn();
   const onDeleteSaved = vi.fn();
   render(
@@ -33,7 +37,14 @@ async function expectDeleteDoesNotSelect() {
     />,
   );
 
-  fireEvent.click(screen.getByRole("button", { name: "Delete Kandev PRs saved query" }));
+  const trigger = screen.getByRole("button", { name: "Delete Kandev PRs saved query" });
+  fireEvent.click(trigger);
+  if (phone) {
+    expect(trigger.isConnected).toBe(true);
+    expect(
+      screen.getByRole("dialog", { name: "Delete Kandev PRs?" }).getAttribute("data-slot"),
+    ).toBe("drawer-content");
+  }
 
   expect(onDeleteSaved).not.toHaveBeenCalled();
   expect(onSelect).not.toHaveBeenCalled();
@@ -121,5 +132,7 @@ describe("PresetsSidebar saved defaults", () => {
     expect(onSelect).not.toHaveBeenCalled();
   });
 
-  it("deletes a saved query without selecting it", expectDeleteDoesNotSelect);
+  it("deletes a saved query without selecting it", () => expectDeleteDoesNotSelect());
+  it("keeps a phone saved query row mounted during confirmation", () =>
+    expectDeleteDoesNotSelect(true));
 });
diff --git a/apps/web/components/github/my-github/presets-sidebar.tsx b/apps/web/components/github/my-github/presets-sidebar.tsx
index 9a0b5f140a..557d381e89 100644
--- a/apps/web/components/github/my-github/presets-sidebar.tsx
+++ b/apps/web/components/github/my-github/presets-sidebar.tsx
@@ -9,6 +9,7 @@ import { cn } from "@/lib/utils";
 import { PR_PRESETS, ISSUE_PRESETS, type PresetOption, type PresetGroup } from "./search-bar";
 import type { SavedPreset } from "./saved-preset-model";
 import { useTranslation } from "react-i18next";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import { SavedQueryDefaultButton } from "@/components/integrations/saved-query-default-button";
 import { SavedTaskViewDeleteConfirmation } from "@/components/confirmation/saved-task-view-delete-confirmation";
 import {
@@ -165,6 +166,7 @@ function SavedSection({
 }) {
   const { t } = useTranslation();
   const deletion = useSavedTaskViewDeleteConfirmation<HTMLButtonElement>(saved);
+  const { isMobile } = useResponsiveBreakpoint();
   const defaultMutationPending = defaultMutationPendingId !== null;
   return (
     <>
@@ -188,6 +190,19 @@ function SavedSection({
           onToggleDefault={() => void onToggleSavedDefault(preset)}
         />
       ))}
+      {isMobile && deletion.target && (
+        <SavedTaskViewDeleteConfirmation
+          target={deletion.target}
+          presentation="inline"
+          open
+          anchorRef={deletion.anchorRef}
+          confirmDisabled={defaultMutationPending}
+          onOpenChange={(open) => {
+            if (!open) deletion.close();
+          }}
+          onConfirm={onDelete}
+        />
+      )}
     </>
   );
 }
@@ -220,7 +235,8 @@ function GitHubSavedPresetEntry({
   onToggleDefault: () => void;
 }) {
   const { t } = useTranslation();
-  if (deletion.target?.id === preset.id) {
+  const { isMobile } = useResponsiveBreakpoint();
+  if (!isMobile && deletion.target?.id === preset.id) {
     return (
       <div className="mx-1 min-w-0 p-1">
         <SavedTaskViewDeleteConfirmation
diff --git a/apps/web/components/gitlab/my-gitlab/presets-sidebar.test.tsx b/apps/web/components/gitlab/my-gitlab/presets-sidebar.test.tsx
index 558b7525a7..6e2296365d 100644
--- a/apps/web/components/gitlab/my-gitlab/presets-sidebar.test.tsx
+++ b/apps/web/components/gitlab/my-gitlab/presets-sidebar.test.tsx
@@ -16,39 +16,52 @@ const SAVED: SavedPreset = {
 };
 
 describe("GitLab PresetsSidebar", () => {
-  afterEach(cleanup);
-
-  it("uses visible touch controls and deletes without selecting only after confirmation", async () => {
-    const onDeleteSaved = vi.fn();
-    const onSelect = vi.fn();
-    render(
-      <PresetsSidebar
-        selected={{ kind: "mr", source: "saved", id: SAVED.id }}
-        onSelect={onSelect}
-        savedPresets={[SAVED]}
-        onDeleteSaved={onDeleteSaved}
-        canSaveCurrent={false}
-        onSaveCurrent={vi.fn()}
-        mrPresets={[]}
-        issuePresets={[]}
-      />,
-    );
-
-    const deleteButton = screen.getByRole("button", { name: "Delete Ready MRs saved query" });
-    expect(deleteButton.className).toContain("h-12");
-    expect(deleteButton.className).not.toContain("opacity-0");
-    fireEvent.click(deleteButton);
-
-    expect(onDeleteSaved).not.toHaveBeenCalled();
-    expect(onSelect).not.toHaveBeenCalled();
-    const confirmation = screen.getByRole("group", { name: "Delete Ready MRs?" });
-    fireEvent.click(within(confirmation).getByRole("button", { name: "Cancel" }));
-
-    fireEvent.click(screen.getByRole("button", { name: "Delete Ready MRs saved query" }));
-    fireEvent.click(screen.getByRole("button", { name: "Delete Ready MRs" }));
-
-    await waitFor(() => expect(onDeleteSaved).toHaveBeenCalledWith(SAVED.id));
-    expect(onDeleteSaved).toHaveBeenCalledOnce();
-    expect(onSelect).not.toHaveBeenCalled();
+  afterEach(() => {
+    cleanup();
+    Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
   });
+
+  it.each([false, true])(
+    "uses visible controls and confirms without selecting (phone: %s)",
+    async (phone) => {
+      if (phone) Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+      const onDeleteSaved = vi.fn();
+      const onSelect = vi.fn();
+      render(
+        <PresetsSidebar
+          selected={{ kind: "mr", source: "saved", id: SAVED.id }}
+          onSelect={onSelect}
+          savedPresets={[SAVED]}
+          onDeleteSaved={onDeleteSaved}
+          canSaveCurrent={false}
+          onSaveCurrent={vi.fn()}
+          mrPresets={[]}
+          issuePresets={[]}
+        />,
+      );
+
+      const deleteButton = screen.getByRole("button", { name: "Delete Ready MRs saved query" });
+      expect(deleteButton.className).toContain("h-12");
+      expect(deleteButton.className).not.toContain("opacity-0");
+      fireEvent.click(deleteButton);
+      if (phone) {
+        expect(deleteButton.isConnected).toBe(true);
+        expect(
+          screen.getByRole("dialog", { name: "Delete Ready MRs?" }).getAttribute("data-slot"),
+        ).toBe("drawer-content");
+      }
+
+      expect(onDeleteSaved).not.toHaveBeenCalled();
+      expect(onSelect).not.toHaveBeenCalled();
+      const confirmation = screen.getByRole("group", { name: "Delete Ready MRs?" });
+      fireEvent.click(within(confirmation).getByRole("button", { name: "Cancel" }));
+
+      fireEvent.click(screen.getByRole("button", { name: "Delete Ready MRs saved query" }));
+      fireEvent.click(screen.getByRole("button", { name: "Delete Ready MRs" }));
+
+      await waitFor(() => expect(onDeleteSaved).toHaveBeenCalledWith(SAVED.id));
+      expect(onDeleteSaved).toHaveBeenCalledOnce();
+      expect(onSelect).not.toHaveBeenCalled();
+    },
+  );
 });
diff --git a/apps/web/components/gitlab/my-gitlab/presets-sidebar.tsx b/apps/web/components/gitlab/my-gitlab/presets-sidebar.tsx
index 3695ccb9b7..376a2144ba 100644
--- a/apps/web/components/gitlab/my-gitlab/presets-sidebar.tsx
+++ b/apps/web/components/gitlab/my-gitlab/presets-sidebar.tsx
@@ -6,6 +6,7 @@ import { cn } from "@/lib/utils";
 import { MR_PRESETS, ISSUE_PRESETS, type PresetOption, type PresetGroup } from "./presets";
 import type { SavedPreset } from "./use-saved-presets";
 import { useTranslation } from "react-i18next";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import { SavedTaskViewDeleteConfirmation } from "@/components/confirmation/saved-task-view-delete-confirmation";
 import { useSavedTaskViewDeleteConfirmation } from "@/components/confirmation/use-saved-task-view-delete-confirmation";
 
@@ -174,6 +175,7 @@ function SavedSection({
 }) {
   const { t } = useTranslation();
   const deletion = useSavedTaskViewDeleteConfirmation<HTMLButtonElement>(saved);
+  const { isMobile } = useResponsiveBreakpoint();
   return (
     <>
       <SectionHeader id="saved" title={t("gitlab:saved")} />
@@ -183,7 +185,7 @@ function SavedSection({
         </div>
       )}
       {saved.map((s) => {
-        if (deletion.target?.id === s.id) {
+        if (!isMobile && deletion.target?.id === s.id) {
           return (
             <div key={s.id} className="mx-1 min-w-0 p-1">
               <SavedTaskViewDeleteConfirmation
@@ -228,26 +230,45 @@ function SavedSection({
           />
         );
       })}
-      <button
-        type="button"
-        onClick={onSaveCurrent}
-        disabled={!canSaveCurrent}
-        className={cn(
-          "mx-1 mt-1 flex min-h-11 items-center gap-2 rounded-md px-2 py-1.5 text-xs transition-colors",
-          canSaveCurrent
-            ? "text-muted-foreground hover:bg-muted/50 hover:text-foreground cursor-pointer"
-            : "text-muted-foreground/50 cursor-not-allowed",
-        )}
-        title={canSaveCurrent ? t("gitlab:saveCurrentQuery") : t("gitlab:typeACustomQueryFirst")}
-        data-testid="gitlab-save-current-query"
-      >
-        <IconDeviceFloppy className="h-4 w-4 shrink-0" />
-        <span>{t("gitlab:saveCurrentQuery")}</span>
-      </button>
+      {isMobile && deletion.target && (
+        <SavedTaskViewDeleteConfirmation
+          target={deletion.target}
+          presentation="inline"
+          open
+          anchorRef={deletion.anchorRef}
+          onOpenChange={(open) => {
+            if (!open) deletion.close();
+          }}
+          onConfirm={onDelete}
+        />
+      )}
+      <SaveQueryButton enabled={canSaveCurrent} onClick={onSaveCurrent} />
     </>
   );
 }
 
+function SaveQueryButton({ enabled, onClick }: { enabled: boolean; onClick: () => void }) {
+  const { t } = useTranslation();
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      disabled={!enabled}
+      className={cn(
+        "mx-1 mt-1 flex min-h-11 items-center gap-2 rounded-md px-2 py-1.5 text-xs transition-colors",
+        enabled
+          ? "text-muted-foreground hover:bg-muted/50 hover:text-foreground cursor-pointer"
+          : "text-muted-foreground/50 cursor-not-allowed",
+      )}
+      title={enabled ? t("gitlab:saveCurrentQuery") : t("gitlab:typeACustomQueryFirst")}
+      data-testid="gitlab-save-current-query"
+    >
+      <IconDeviceFloppy className="h-4 w-4 shrink-0" />
+      <span>{t("gitlab:saveCurrentQuery")}</span>
+    </button>
+  );
+}
+
 export function PresetsSidebar({
   selected,
   onSelect,
diff --git a/apps/web/components/integrations/integration-filters-sheet.tsx b/apps/web/components/integrations/integration-filters-sheet.tsx
new file mode 100644
index 0000000000..841b4e83c4
--- /dev/null
+++ b/apps/web/components/integrations/integration-filters-sheet.tsx
@@ -0,0 +1,75 @@
+"use client";
+
+import type { ReactNode } from "react";
+import { Drawer, DrawerContent, DrawerHeader, DrawerTitle } from "@kandev/ui/drawer";
+import { Sheet, SheetContent, SheetHeader, SheetTitle } from "@kandev/ui/sheet";
+import {
+  MobileConfirmationHost,
+  MobileConfirmationHostBody,
+} from "@/components/confirmation/mobile-confirmation-host";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
+
+/** Provider state stays with the caller; this shell owns only responsive presentation. */
+export function IntegrationFiltersSheet({
+  open,
+  onOpenChange,
+  title,
+  testId,
+  children,
+}: {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  title: string;
+  testId: string;
+  children: ReactNode;
+}) {
+  const { isMobile } = useResponsiveBreakpoint();
+  return (
+    <MobileConfirmationHost open={open} surface={isMobile ? "drawer" : "dialog"}>
+      {({ active, contentProps }) =>
+        isMobile ? (
+          <Drawer open={open} onOpenChange={onOpenChange}>
+            <DrawerContent
+              className="overflow-hidden data-[vaul-drawer-direction=bottom]:max-h-[80dvh]"
+              data-testid={testId}
+              aria-describedby={undefined}
+              {...contentProps}
+            >
+              <MobileConfirmationHostBody>
+                <DrawerHeader className="shrink-0 text-left pb-2">
+                  <DrawerTitle>{title}</DrawerTitle>
+                </DrawerHeader>
+                <div
+                  data-testid="integration-filters-scroll"
+                  className="min-h-0 flex-1 overflow-y-auto overscroll-contain pb-[calc(1rem+env(safe-area-inset-bottom))]"
+                >
+                  {children}
+                </div>
+              </MobileConfirmationHostBody>
+            </DrawerContent>
+          </Drawer>
+        ) : (
+          <Sheet open={open} onOpenChange={onOpenChange}>
+            <SheetContent
+              side="right"
+              className="w-full sm:max-w-sm overflow-hidden p-0"
+              data-testid={testId}
+              showCloseButton={!active}
+              aria-describedby={undefined}
+              {...contentProps}
+            >
+              <MobileConfirmationHostBody>
+                <div className="min-h-0 flex-1 overflow-y-auto">
+                  <SheetHeader className="px-4 pt-4 pb-2">
+                    <SheetTitle>{title}</SheetTitle>
+                  </SheetHeader>
+                  {children}
+                </div>
+              </MobileConfirmationHostBody>
+            </SheetContent>
+          </Sheet>
+        )
+      }
+    </MobileConfirmationHost>
+  );
+}
diff --git a/apps/web/components/integrations/presets-scope-bar-base.tsx b/apps/web/components/integrations/presets-scope-bar-base.tsx
index a3813c774e..d81ae3cf78 100644
--- a/apps/web/components/integrations/presets-scope-bar-base.tsx
+++ b/apps/web/components/integrations/presets-scope-bar-base.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useEffect, useRef, useState, type RefObject, type ReactNode } from "react";
+import { useCallback, useEffect, useRef, type RefObject, type ReactNode } from "react";
 import { IconBookmark, IconChevronDown, IconDeviceFloppy, IconX } from "@tabler/icons-react";
 import type { Icon } from "@tabler/icons-react";
 import {
@@ -18,7 +18,7 @@ import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import { isActionConfirmationTarget } from "@/components/confirmation/action-confirm-popover";
 import { SavedTaskViewDeleteConfirmation } from "@/components/confirmation/saved-task-view-delete-confirmation";
 import {
-  useSavedTaskViewDeleteConfirmation,
+  useSavedTaskViewDeleteMenu,
   type SavedTaskViewDeleteTarget,
 } from "@/components/confirmation/use-saved-task-view-delete-confirmation";
 
@@ -124,15 +124,18 @@ function SavedMenuTrigger({
   testId,
   active,
   label,
+  triggerRef,
 }: {
   testId: string;
   active: boolean;
   label: string | null;
+  triggerRef: RefObject<HTMLButtonElement | null>;
 }) {
   const { t } = useTranslation();
   return (
     <DropdownMenuTrigger asChild>
       <button
+        ref={triggerRef}
         type="button"
         data-testid={testId}
         className={cn(PILL_BASE, active ? PILL_ACTIVE : PILL_IDLE)}
@@ -167,6 +170,10 @@ function useSavedMenuSave(onSaveCurrent: () => void) {
   };
 }
 
+function preserveConfirmationInteraction(event: Event) {
+  if (isActionConfirmationTarget(event.target)) event.preventDefault();
+}
+
 function SavedMenu<K extends string>({
   testId,
   selected,
@@ -191,34 +198,32 @@ function SavedMenu<K extends string>({
   savedStatus?: ReactNode;
 }) {
   const { t } = useTranslation();
-  const { isFinePointer } = useResponsiveBreakpoint();
-  const [menuOpen, setMenuOpen] = useState(false);
+  const { isFinePointer, isMobile } = useResponsiveBreakpoint();
+  const deletion = useSavedTaskViewDeleteMenu(saved, isMobile);
   const save = useSavedMenuSave(onSaveCurrent);
-  const deletion = useSavedTaskViewDeleteConfirmation(saved);
   const menuContentRef = useRef<HTMLDivElement>(null);
+  const triggerRef = useRef<HTMLButtonElement>(null);
   const defaultMutationPending = defaultMutationPendingId !== null;
   const activeSaved = selected.source === "saved";
   const activeLabel = activeSaved ? (saved.find((s) => s.id === selected.id)?.label ?? null) : null;
   return (
-    <DropdownMenu
-      open={menuOpen}
-      onOpenChange={(open) => {
-        setMenuOpen(open);
-        if (!open) deletion.close();
-      }}
-    >
-      <SavedMenuTrigger testId={testId} active={activeSaved} label={activeLabel} />
+    <DropdownMenu open={deletion.open} onOpenChange={deletion.onOpenChange}>
+      <SavedMenuTrigger
+        testId={testId}
+        active={activeSaved}
+        label={activeLabel}
+        triggerRef={triggerRef}
+      />
       <DropdownMenuContent
         ref={menuContentRef}
         align="end"
         className="w-56"
-        onCloseAutoFocus={save.onCloseAutoFocus}
-        onFocusOutside={(event) => {
-          if (isActionConfirmationTarget(event.target)) event.preventDefault();
-        }}
-        onInteractOutside={(event) => {
-          if (isActionConfirmationTarget(event.target)) event.preventDefault();
+        onCloseAutoFocus={(event) => {
+          deletion.onCloseAutoFocus(event);
+          save.onCloseAutoFocus();
         }}
+        onFocusOutside={preserveConfirmationInteraction}
+        onInteractOutside={preserveConfirmationInteraction}
       >
         {savedStatus}
         {saved.length === 0
@@ -229,7 +234,7 @@ function SavedMenu<K extends string>({
               <SavedMenuEntry
                 key={preset.id}
                 preset={preset}
-                isFinePointer={isFinePointer}
+                isFinePointer={!isMobile && isFinePointer}
                 deletion={deletion}
                 defaultMutationPending={defaultMutationPending}
                 defaultMutationPendingForPreset={defaultMutationPendingId === preset.id}
@@ -250,12 +255,12 @@ function SavedMenu<K extends string>({
           <span>{t("integrations:saveCurrentQuery")}</span>
         </DropdownMenuItem>
       </DropdownMenuContent>
-      {isFinePointer && deletion.target ? (
+      {(isMobile || isFinePointer) && deletion.target ? (
         <SavedTaskViewDeleteConfirmation
           target={deletion.target}
           presentation="popover"
           open
-          anchorRef={deletion.anchorRef}
+          anchorRef={isMobile ? triggerRef : deletion.anchorRef}
           focusBoundaryRef={menuContentRef}
           confirmDisabled={defaultMutationPending}
           onOpenChange={(open) => {
diff --git a/apps/web/components/integrations/presets-scope-bar-mobile.test.tsx b/apps/web/components/integrations/presets-scope-bar-mobile.test.tsx
new file mode 100644
index 0000000000..796a9c40d8
--- /dev/null
+++ b/apps/web/components/integrations/presets-scope-bar-mobile.test.tsx
@@ -0,0 +1,50 @@
+import { cleanup, fireEvent, render, screen, waitFor, within } from "@testing-library/react";
+import { afterEach, expect, it, vi } from "vitest";
+import { TooltipProvider } from "@kandev/ui/tooltip";
+import { IconInbox } from "@tabler/icons-react";
+import { IntegrationScopeBar } from "./presets-scope-bar-base";
+
+vi.mock("@/hooks/use-responsive-breakpoint", () => ({
+  useResponsiveBreakpoint: () => ({ isMobile: true, isFinePointer: false }),
+}));
+afterEach(cleanup);
+
+it("hands the real phone saved-view menu off without selecting or changing its default", async () => {
+  const onSelect = vi.fn();
+  const onDelete = vi.fn();
+  const onDefault = vi.fn();
+  render(
+    <TooltipProvider>
+      <IntegrationScopeBar
+        testId="scope"
+        savedMenuTestId="saved-menu"
+        kinds={[{ value: "issue", label: "Issues" }]}
+        selected={{ kind: "issue", source: "preset", id: "inbox" }}
+        onSelect={onSelect}
+        presetsByKind={() => [{ value: "inbox", label: "Inbox", icon: IconInbox, group: "inbox" }]}
+        savedPresets={[{ id: "saved", kind: "issue", label: "My work" }]}
+        onDeleteSaved={onDelete}
+        onToggleSavedDefault={onDefault}
+        defaultMutationPendingId={null}
+        canSaveCurrent={false}
+        onSaveCurrent={vi.fn()}
+      />
+    </TooltipProvider>,
+  );
+  const trigger = screen.getByTestId("saved-menu");
+  fireEvent.pointerDown(trigger);
+  fireEvent.click(screen.getByRole("menuitem", { name: "Delete My work saved query" }));
+  const sheet = await screen.findByRole("dialog", { name: "Delete My work?" });
+  expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+  expect(screen.queryByRole("menu")).toBeNull();
+  expect(document.querySelector('[data-slot="dropdown-menu-content"]')).toBeNull();
+  fireEvent.click(within(sheet).getByRole("button", { name: "Cancel" }));
+  await waitFor(() => expect(document.activeElement).toBe(trigger));
+  expect(onSelect).not.toHaveBeenCalled();
+  expect(onDefault).not.toHaveBeenCalled();
+  expect(onDelete).not.toHaveBeenCalled();
+  fireEvent.pointerDown(trigger);
+  fireEvent.click(screen.getByRole("menuitem", { name: "Delete My work saved query" }));
+  fireEvent.click(await screen.findByRole("button", { name: "Delete My work" }));
+  await waitFor(() => expect(onDelete).toHaveBeenCalledExactlyOnceWith("saved"));
+});
diff --git a/apps/web/components/jira/jira-action-bar.test.tsx b/apps/web/components/jira/jira-action-bar.test.tsx
new file mode 100644
index 0000000000..405ebaeb05
--- /dev/null
+++ b/apps/web/components/jira/jira-action-bar.test.tsx
@@ -0,0 +1,36 @@
+import { cleanup, fireEvent, render, screen, waitFor, within } from "@testing-library/react";
+import { afterEach, expect, it, vi } from "vitest";
+import { JiraActionBar } from "./jira-action-bar";
+
+afterEach(() => {
+  cleanup();
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
+});
+it("keeps Jira removal in a phone sheet without testing or removing on Cancel", async () => {
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+  const onDelete = vi.fn();
+  const onTest = vi.fn();
+  render(
+    <JiraActionBar
+      workspaceId="workspace-a"
+      testing={false}
+      loading={false}
+      hasConfig
+      disableTest={false}
+      onTest={onTest}
+      onDelete={onDelete}
+    />,
+  );
+  const trigger = screen.getByTestId("jira-delete-button");
+  fireEvent.click(trigger);
+  const sheet = screen.getByRole("dialog");
+  expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+  expect(trigger.isConnected).toBe(true);
+  fireEvent.click(within(sheet).getByRole("button", { name: "Cancel" }));
+  await waitFor(() => expect(document.activeElement).toBe(trigger));
+  expect(onDelete).not.toHaveBeenCalled();
+  expect(onTest).not.toHaveBeenCalled();
+  fireEvent.click(trigger);
+  fireEvent.click(screen.getByTestId("jira-remove-confirm"));
+  await waitFor(() => expect(onDelete).toHaveBeenCalledTimes(1));
+});
diff --git a/apps/web/components/jira/jira-action-bar.tsx b/apps/web/components/jira/jira-action-bar.tsx
index 1de4c3caf8..b905ab03df 100644
--- a/apps/web/components/jira/jira-action-bar.tsx
+++ b/apps/web/components/jira/jira-action-bar.tsx
@@ -6,9 +6,11 @@ import { useTranslation } from "react-i18next";
 
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
 import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 
 type JiraActionBarProps = {
+  workspaceId: string;
   testing: boolean;
   loading: boolean;
   hasConfig: boolean;
@@ -18,6 +20,7 @@ type JiraActionBarProps = {
 };
 
 export function JiraActionBar({
+  workspaceId,
   testing,
   loading,
   hasConfig,
@@ -26,10 +29,11 @@ export function JiraActionBar({
   onDelete,
 }: JiraActionBarProps) {
   const { t } = useTranslation();
-  const { isFinePointer } = useResponsiveBreakpoint();
+  const { isFinePointer, isMobile } = useResponsiveBreakpoint();
   const [confirmingDelete, setConfirmingDelete] = useState(false);
   const deleteAnchorRef = useRef<HTMLButtonElement>(null);
   const removeConfirmation = t("jira:removeJiraConfiguration");
+  const removeLabel = t("jira:removeConfiguration");
 
   useEffect(() => {
     if (!hasConfig && confirmingDelete) setConfirmingDelete(false);
@@ -48,7 +52,7 @@ export function JiraActionBar({
       >
         {testing ? t("jira:testingConnection") : t("jira:testConnection")}
       </Button>
-      {hasConfig && (isFinePointer || !confirmingDelete) && (
+      {hasConfig && (isMobile || isFinePointer || !confirmingDelete) && (
         <Button
           ref={deleteAnchorRef}
           type="button"
@@ -57,39 +61,52 @@ export function JiraActionBar({
           className="ml-auto cursor-pointer"
           data-testid="jira-delete-button"
         >
-          {t("jira:removeConfiguration")}
+          {removeLabel}
         </Button>
       )}
-      {hasConfig && !isFinePointer && confirmingDelete ? (
-        <InlineConfirmActions
-          density="touch"
-          testId="jira-remove-inline-confirmation"
-          ariaLabel={removeConfirmation}
-          description={removeConfirmation}
-          cancelLabel={t("common:cancel")}
-          confirmLabel={t("jira:removeConfiguration")}
-          confirmAriaLabel={removeConfirmation}
-          confirmTestId="jira-remove-confirm"
-          onCancel={() => setConfirmingDelete(false)}
-          onClose={() => setConfirmingDelete(false)}
-          onConfirm={onDelete}
-        />
-      ) : null}
-      {hasConfig && isFinePointer ? (
-        <ActionConfirmPopover
-          open={confirmingDelete}
-          anchorRef={deleteAnchorRef}
-          title={removeConfirmation}
-          cancelLabel={t("common:cancel")}
-          confirmLabel={t("jira:removeConfiguration")}
-          confirmAriaLabel={removeConfirmation}
-          confirmTestId="jira-remove-confirm"
-          testId="jira-remove-confirm-popover"
-          onOpenChange={setConfirmingDelete}
-          onCancel={() => setConfirmingDelete(false)}
-          onConfirm={onDelete}
-        />
-      ) : null}
+      <MobileActionConfirmation
+        open={hasConfig && confirmingDelete}
+        targetKey={workspaceId}
+        title={removeConfirmation}
+        cancelLabel={t("common:cancel")}
+        confirmLabel={removeLabel}
+        confirmAriaLabel={removeConfirmation}
+        confirmTestId="jira-remove-confirm"
+        onOpenChange={setConfirmingDelete}
+        focusReturnRef={deleteAnchorRef}
+        onConfirm={onDelete}
+        fallback={
+          !isFinePointer ? (
+            <InlineConfirmActions
+              density="touch"
+              testId="jira-remove-inline-confirmation"
+              ariaLabel={removeConfirmation}
+              description={removeConfirmation}
+              cancelLabel={t("common:cancel")}
+              confirmLabel={removeLabel}
+              confirmAriaLabel={removeConfirmation}
+              confirmTestId="jira-remove-confirm"
+              onCancel={() => setConfirmingDelete(false)}
+              onClose={() => setConfirmingDelete(false)}
+              onConfirm={onDelete}
+            />
+          ) : (
+            <ActionConfirmPopover
+              open={confirmingDelete}
+              anchorRef={deleteAnchorRef}
+              title={removeConfirmation}
+              cancelLabel={t("common:cancel")}
+              confirmLabel={removeLabel}
+              confirmAriaLabel={removeConfirmation}
+              confirmTestId="jira-remove-confirm"
+              testId="jira-remove-confirm-popover"
+              onOpenChange={setConfirmingDelete}
+              onCancel={() => setConfirmingDelete(false)}
+              onConfirm={onDelete}
+            />
+          )
+        }
+      />
     </div>
   );
 }
diff --git a/apps/web/components/jira/jira-issue-watch-table.tsx b/apps/web/components/jira/jira-issue-watch-table.tsx
index c144738722..82739888ed 100644
--- a/apps/web/components/jira/jira-issue-watch-table.tsx
+++ b/apps/web/components/jira/jira-issue-watch-table.tsx
@@ -123,6 +123,8 @@ function WatchActions({
         <TooltipContent>{t("common:reset")}</TooltipContent>
       </Tooltip>
       <WatcherDeleteAction
+        targetKey={`${watch.workspaceId}:${watch.id}`}
+        subject={watch.jql}
         title={t("jira:deleteThisJiraWatcher")}
         cancelLabel={t("common:cancel")}
         confirmLabel={t("jira:delete")}
diff --git a/apps/web/components/jira/jira-settings.tsx b/apps/web/components/jira/jira-settings.tsx
index c38efc732f..e78651bd14 100644
--- a/apps/web/components/jira/jira-settings.tsx
+++ b/apps/web/components/jira/jira-settings.tsx
@@ -521,6 +521,7 @@ export function JiraConnectionSection({ workspaceId }: { workspaceId: string })
           <TestResultAlert result={s.testResult} />
           <Separator />
           <JiraActionBar
+            workspaceId={workspaceId}
             testing={s.testing}
             loading={s.loading}
             hasConfig={!!s.config}
diff --git a/apps/web/components/jira/my-jira/list-toolbar.test.tsx b/apps/web/components/jira/my-jira/list-toolbar.test.tsx
index af633621c4..ed03d8eb89 100644
--- a/apps/web/components/jira/my-jira/list-toolbar.test.tsx
+++ b/apps/web/components/jira/my-jira/list-toolbar.test.tsx
@@ -5,7 +5,9 @@ import { DEFAULT_FILTERS } from "./filter-model";
 import type { SavedView } from "./use-saved-views";
 import { ListToolbar } from "./list-toolbar";
 
-const responsive = vi.hoisted(() => ({ isFinePointer: false }));
+const DELETE_VIEW_TITLE = "Delete view";
+
+const responsive = vi.hoisted(() => ({ isFinePointer: false, isMobile: false }));
 
 vi.mock("@/hooks/use-responsive-breakpoint", () => ({
   useResponsiveBreakpoint: () => responsive,
@@ -49,14 +51,35 @@ function renderToolbar(onDeleteView = vi.fn()) {
 }
 
 describe("Jira ListToolbar saved views", () => {
-  afterEach(cleanup);
+  afterEach(() => {
+    cleanup();
+    responsive.isMobile = false;
+  });
+
+  it("hands a phone saved view to a named sheet outside the closed picker", async () => {
+    responsive.isMobile = true;
+    const { onDeleteView } = renderToolbar();
+    const trigger = screen.getByRole("button", { name: "Sprint bugs" });
+    fireEvent.click(trigger);
+    fireEvent.click(screen.getByTitle(DELETE_VIEW_TITLE));
+    const sheet = await screen.findByRole("dialog", { name: "Delete Sprint bugs?" });
+    expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+    expect(document.querySelector('[data-slot="popover-content"]')).toBeNull();
+    fireEvent.click(within(sheet).getByRole("button", { name: "Cancel" }));
+    await waitFor(() => expect(document.activeElement).toBe(trigger));
+    expect(onDeleteView).not.toHaveBeenCalled();
+    fireEvent.click(trigger);
+    fireEvent.click(screen.getByTitle(DELETE_VIEW_TITLE));
+    fireEvent.click(await screen.findByRole("button", { name: "Delete Sprint bugs" }));
+    await waitFor(() => expect(onDeleteView).toHaveBeenCalledExactlyOnceWith(CUSTOM.id));
+  });
 
   it("keeps built-ins protected and confirms custom deletion inline on coarse pointers", async () => {
     const { onDeleteView } = renderToolbar();
     fireEvent.click(screen.getByRole("button", { name: "Sprint bugs" }));
 
-    expect(screen.getAllByTitle("Delete view")).toHaveLength(1);
-    fireEvent.click(screen.getByTitle("Delete view"));
+    expect(screen.getAllByTitle(DELETE_VIEW_TITLE)).toHaveLength(1);
+    fireEvent.click(screen.getByTitle(DELETE_VIEW_TITLE));
 
     expect(onDeleteView).not.toHaveBeenCalled();
     const confirmation = screen.getByRole("group", { name: "Delete Sprint bugs?" });
@@ -66,7 +89,7 @@ describe("Jira ListToolbar saved views", () => {
     fireEvent.click(within(confirmation).getByRole("button", { name: "Cancel" }));
     expect(onDeleteView).not.toHaveBeenCalled();
 
-    fireEvent.click(screen.getByTitle("Delete view"));
+    fireEvent.click(screen.getByTitle(DELETE_VIEW_TITLE));
     fireEvent.click(screen.getByRole("button", { name: "Delete Sprint bugs" }));
 
     await waitFor(() => expect(onDeleteView).toHaveBeenCalledWith(CUSTOM.id));
diff --git a/apps/web/components/jira/my-jira/list-toolbar.tsx b/apps/web/components/jira/my-jira/list-toolbar.tsx
index 7b95c683c2..705715cfe5 100644
--- a/apps/web/components/jira/my-jira/list-toolbar.tsx
+++ b/apps/web/components/jira/my-jira/list-toolbar.tsx
@@ -28,7 +28,7 @@ import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import { isActionConfirmationTarget } from "@/components/confirmation/action-confirm-popover";
 import { SavedTaskViewDeleteConfirmation } from "@/components/confirmation/saved-task-view-delete-confirmation";
 import {
-  useSavedTaskViewDeleteConfirmation,
+  useSavedTaskViewDeleteMenu,
   type SavedTaskViewDeleteTarget,
 } from "@/components/confirmation/use-saved-task-view-delete-confirmation";
 
@@ -179,15 +179,15 @@ function ViewsDropdown({
   activeName: string | undefined;
 }) {
   const { t } = useTranslation();
-  const { isFinePointer } = useResponsiveBreakpoint();
-  const [open, setOpen] = useState(false);
+  const { isFinePointer, isMobile } = useResponsiveBreakpoint();
   const contentRef = useRef<HTMLDivElement>(null);
+  const triggerRef = useRef<HTMLButtonElement>(null);
   const builtin = views.filter((v) => v.builtin);
   const custom = views.filter((v) => !v.builtin);
-  const deletion = useSavedTaskViewDeleteConfirmation<HTMLButtonElement>(custom);
+  const deletion = useSavedTaskViewDeleteMenu<HTMLButtonElement>(custom, isMobile);
 
   const deleteProps: ViewDeletionProps = {
-    isFinePointer,
+    isFinePointer: !isMobile && isFinePointer,
     deleteTarget: deletion.target,
     deleteAnchorRef: deletion.anchorRef,
     onDeleteOpenChange: (nextOpen) => {
@@ -199,15 +199,9 @@ function ViewsDropdown({
   };
 
   return (
-    <Popover
-      open={open}
-      onOpenChange={(nextOpen) => {
-        setOpen(nextOpen);
-        if (!nextOpen) deletion.close();
-      }}
-    >
+    <Popover open={deletion.open} onOpenChange={deletion.onOpenChange}>
       <PopoverTrigger asChild>
-        <Button variant="outline" className="cursor-pointer text-xs gap-1.5">
+        <Button ref={triggerRef} variant="outline" className="cursor-pointer text-xs gap-1.5">
           <IconBookmark className="h-3.5 w-3.5" />
           {activeName ?? t("jira:noView")}
         </Button>
@@ -216,6 +210,7 @@ function ViewsDropdown({
         ref={contentRef}
         align="start"
         className="w-60 max-w-[calc(100vw-1rem)] overflow-x-hidden p-0"
+        onCloseAutoFocus={deletion.onCloseAutoFocus}
         onFocusOutside={(event) => {
           if (isActionConfirmationTarget(event.target)) event.preventDefault();
         }}
@@ -229,7 +224,7 @@ function ViewsDropdown({
           activeViewId={activeViewId}
           onSelect={(id) => {
             onSelect(id);
-            setOpen(false);
+            deletion.onOpenChange(false);
           }}
           {...deleteProps}
         />
@@ -242,19 +237,19 @@ function ViewsDropdown({
               activeViewId={activeViewId}
               onSelect={(id) => {
                 onSelect(id);
-                setOpen(false);
+                deletion.onOpenChange(false);
               }}
               {...deleteProps}
             />
           </>
         )}
       </PopoverContent>
-      {isFinePointer && deletion.target ? (
+      {(isMobile || isFinePointer) && deletion.target ? (
         <SavedTaskViewDeleteConfirmation
           target={deletion.target}
           presentation="popover"
           open
-          anchorRef={deletion.anchorRef}
+          anchorRef={isMobile ? triggerRef : deletion.anchorRef}
           focusBoundaryRef={contentRef}
           onOpenChange={(nextOpen) => {
             if (!nextOpen) deletion.close();
diff --git a/apps/web/components/kanban-card.tsx b/apps/web/components/kanban-card.tsx
index 4d9f261407..28abada61d 100644
--- a/apps/web/components/kanban-card.tsx
+++ b/apps/web/components/kanban-card.tsx
@@ -472,6 +472,7 @@ function KanbanCardFrame({
         </KanbanCardContextMenu>
       </div>
       <TaskDetachConfirmationSurface
+        taskId={task.id}
         open={menu.showDetachConfirm}
         anchorRef={menu.detachAnchorRef}
         focusReturnRef={menu.detachFocusReturnRef}
diff --git a/apps/web/components/linear/linear-issue-watch-table.tsx b/apps/web/components/linear/linear-issue-watch-table.tsx
index 689f1f3b44..2977b3da40 100644
--- a/apps/web/components/linear/linear-issue-watch-table.tsx
+++ b/apps/web/components/linear/linear-issue-watch-table.tsx
@@ -142,6 +142,8 @@ function WatchActions({
         <TooltipContent>{t("common:reset")}</TooltipContent>
       </Tooltip>
       <WatcherDeleteAction
+        targetKey={`${watch.workspaceId}:${watch.id}`}
+        subject={summarizeFilter(watch.filter)}
         title={t("linear:deleteThisLinearWatcher")}
         cancelLabel={t("common:cancel")}
         confirmLabel={t("linear:delete")}
diff --git a/apps/web/components/linear/linear-settings.test.tsx b/apps/web/components/linear/linear-settings.test.tsx
index 70ecd9b960..cbc9d7ef71 100644
--- a/apps/web/components/linear/linear-settings.test.tsx
+++ b/apps/web/components/linear/linear-settings.test.tsx
@@ -3,6 +3,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { LinearConfig } from "@/lib/types/linear";
 import { SettingsSaveProvider } from "@/components/settings/settings-save-provider";
 
+const REMOVE_CONFIRM_TEST_ID = "linear-remove-confirm";
+
 const mocks = vi.hoisted(() => ({
   deleteConfig: vi.fn(),
   getConfig: vi.fn(),
@@ -13,6 +15,7 @@ const mocks = vi.hoisted(() => ({
 }));
 
 let finePointer = true;
+let isMobile = false;
 const DELETE_BUTTON_TEST_ID = "linear-delete-button";
 const CONFIRM_POPOVER_TEST_ID = "linear-remove-confirm-popover";
 
@@ -23,7 +26,7 @@ vi.mock("@/hooks/domains/integrations/use-integration-availability", () => ({
   INTEGRATION_STATUS_REFRESH_MS: 100_000,
 }));
 vi.mock("@/hooks/use-responsive-breakpoint", () => ({
-  useResponsiveBreakpoint: () => ({ isFinePointer: finePointer }),
+  useResponsiveBreakpoint: () => ({ isFinePointer: finePointer, isMobile }),
 }));
 vi.mock("@/components/linear/linear-enabled-control", () => ({
   LinearEnabledControl: () => null,
@@ -60,6 +63,7 @@ beforeEach(() => {
   vi.clearAllMocks();
   vi.unstubAllGlobals();
   finePointer = true;
+  isMobile = false;
   mocks.getConfig.mockResolvedValue(config);
   mocks.listTeams.mockResolvedValue({ teams: [] });
   mocks.deleteConfig.mockResolvedValue(undefined);
@@ -72,6 +76,24 @@ afterEach(() => {
 });
 
 describe("LinearConnectionSection removal", () => {
+  it("keeps the phone form controls behind a sheet and cancels locally", async () => {
+    isMobile = true;
+    finePointer = false;
+    renderSection();
+    const trigger = await screen.findByTestId(DELETE_BUTTON_TEST_ID);
+    fireEvent.click(trigger);
+    const sheet = screen.getByRole("dialog");
+    expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+    expect(trigger.isConnected).toBe(true);
+    fireEvent.click(within(sheet).getByRole("button", { name: "Cancel" }));
+    await waitFor(() => expect(document.activeElement).toBe(trigger));
+    expect(mocks.deleteConfig).not.toHaveBeenCalled();
+    fireEvent.click(trigger);
+    fireEvent.click(screen.getByTestId(REMOVE_CONFIRM_TEST_ID));
+    await waitFor(() =>
+      expect(mocks.deleteConfig).toHaveBeenCalledExactlyOnceWith({ workspaceId: "workspace-a" }),
+    );
+  });
   it("uses local fine-pointer confirmation and invokes deletion once", async () => {
     const nativeConfirm = vi.fn(() => false);
     vi.stubGlobal("confirm", nativeConfirm);
@@ -88,7 +110,7 @@ describe("LinearConnectionSection removal", () => {
 
     fireEvent.click(removeButton);
     fireEvent.click(
-      within(screen.getByTestId(CONFIRM_POPOVER_TEST_ID)).getByTestId("linear-remove-confirm"),
+      within(screen.getByTestId(CONFIRM_POPOVER_TEST_ID)).getByTestId(REMOVE_CONFIRM_TEST_ID),
     );
     await waitFor(() => expect(mocks.deleteConfig).toHaveBeenCalledTimes(1));
     expect(mocks.deleteConfig).toHaveBeenCalledWith({ workspaceId: "workspace-a" });
@@ -102,14 +124,14 @@ describe("LinearConnectionSection removal", () => {
     fireEvent.click(removeButton);
     const inline = screen.getByTestId("linear-remove-inline-confirmation");
     expect(screen.queryByTestId(CONFIRM_POPOVER_TEST_ID)).toBeNull();
-    expect(within(inline).getByTestId("linear-remove-confirm").className).toContain("h-11");
+    expect(within(inline).getByTestId(REMOVE_CONFIRM_TEST_ID).className).toContain("h-11");
 
     fireEvent.click(within(inline).getByRole("button", { name: "Cancel" }));
     expect(mocks.deleteConfig).not.toHaveBeenCalled();
     fireEvent.click(screen.getByTestId(DELETE_BUTTON_TEST_ID));
     fireEvent.click(
       within(screen.getByTestId("linear-remove-inline-confirmation")).getByTestId(
-        "linear-remove-confirm",
+        REMOVE_CONFIRM_TEST_ID,
       ),
     );
     await waitFor(() => expect(mocks.deleteConfig).toHaveBeenCalledTimes(1));
diff --git a/apps/web/components/linear/linear-settings.tsx b/apps/web/components/linear/linear-settings.tsx
index 2b17dc7095..f366890766 100644
--- a/apps/web/components/linear/linear-settings.tsx
+++ b/apps/web/components/linear/linear-settings.tsx
@@ -19,6 +19,7 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@
 import { useToast } from "@/components/toast-provider";
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
 import { SettingsSection } from "@/components/settings/settings-section";
 import { useSettingsSaveContributor } from "@/components/settings/settings-save-provider";
 import { SettingsCard } from "@/components/settings/settings-card";
@@ -191,6 +192,7 @@ function configToHealth(config: LinearConfig | null): IntegrationAuthHealth | nu
 }
 
 type ActionBarProps = {
+  workspaceId: string;
   testing: boolean;
   loading: boolean;
   hasConfig: boolean;
@@ -199,12 +201,21 @@ type ActionBarProps = {
   onDelete: () => void;
 };
 
-function ActionBar({ testing, loading, hasConfig, disableTest, onTest, onDelete }: ActionBarProps) {
+function ActionBar({
+  workspaceId,
+  testing,
+  loading,
+  hasConfig,
+  disableTest,
+  onTest,
+  onDelete,
+}: ActionBarProps) {
   const { t } = useTranslation();
-  const { isFinePointer } = useResponsiveBreakpoint();
+  const { isFinePointer, isMobile } = useResponsiveBreakpoint();
   const [confirmingDelete, setConfirmingDelete] = useState(false);
   const deleteAnchorRef = useRef<HTMLButtonElement>(null);
   const removeConfirmation = t("linear:removeLinearConfigurationConfirm");
+  const removeLabel = t("linear:removeConfiguration");
 
   useEffect(() => {
     if (!hasConfig && confirmingDelete) setConfirmingDelete(false);
@@ -223,7 +234,7 @@ function ActionBar({ testing, loading, hasConfig, disableTest, onTest, onDelete
       >
         {testing ? t("linear:testing") : t("linear:testConnection")}
       </Button>
-      {hasConfig && (isFinePointer || !confirmingDelete) && (
+      {hasConfig && (isMobile || isFinePointer || !confirmingDelete) && (
         <Button
           ref={deleteAnchorRef}
           type="button"
@@ -232,39 +243,52 @@ function ActionBar({ testing, loading, hasConfig, disableTest, onTest, onDelete
           className="ml-auto cursor-pointer"
           data-testid="linear-delete-button"
         >
-          {t("linear:removeConfiguration")}
+          {removeLabel}
         </Button>
       )}
-      {hasConfig && !isFinePointer && confirmingDelete ? (
-        <InlineConfirmActions
-          density="touch"
-          testId="linear-remove-inline-confirmation"
-          ariaLabel={removeConfirmation}
-          description={removeConfirmation}
-          cancelLabel={t("common:cancel")}
-          confirmLabel={t("linear:removeConfiguration")}
-          confirmAriaLabel={removeConfirmation}
-          confirmTestId="linear-remove-confirm"
-          onCancel={() => setConfirmingDelete(false)}
-          onClose={() => setConfirmingDelete(false)}
-          onConfirm={onDelete}
-        />
-      ) : null}
-      {hasConfig && isFinePointer ? (
-        <ActionConfirmPopover
-          open={confirmingDelete}
-          anchorRef={deleteAnchorRef}
-          title={removeConfirmation}
-          cancelLabel={t("common:cancel")}
-          confirmLabel={t("linear:removeConfiguration")}
-          confirmAriaLabel={removeConfirmation}
-          confirmTestId="linear-remove-confirm"
-          testId="linear-remove-confirm-popover"
-          onOpenChange={setConfirmingDelete}
-          onCancel={() => setConfirmingDelete(false)}
-          onConfirm={onDelete}
-        />
-      ) : null}
+      <MobileActionConfirmation
+        open={hasConfig && confirmingDelete}
+        targetKey={workspaceId}
+        title={removeConfirmation}
+        cancelLabel={t("common:cancel")}
+        confirmLabel={removeLabel}
+        confirmAriaLabel={removeConfirmation}
+        confirmTestId="linear-remove-confirm"
+        onOpenChange={setConfirmingDelete}
+        focusReturnRef={deleteAnchorRef}
+        onConfirm={onDelete}
+        fallback={
+          !isFinePointer ? (
+            <InlineConfirmActions
+              density="touch"
+              testId="linear-remove-inline-confirmation"
+              ariaLabel={removeConfirmation}
+              description={removeConfirmation}
+              cancelLabel={t("common:cancel")}
+              confirmLabel={removeLabel}
+              confirmAriaLabel={removeConfirmation}
+              confirmTestId="linear-remove-confirm"
+              onCancel={() => setConfirmingDelete(false)}
+              onClose={() => setConfirmingDelete(false)}
+              onConfirm={onDelete}
+            />
+          ) : (
+            <ActionConfirmPopover
+              open={confirmingDelete}
+              anchorRef={deleteAnchorRef}
+              title={removeConfirmation}
+              cancelLabel={t("common:cancel")}
+              confirmLabel={removeLabel}
+              confirmAriaLabel={removeConfirmation}
+              confirmTestId="linear-remove-confirm"
+              testId="linear-remove-confirm-popover"
+              onOpenChange={setConfirmingDelete}
+              onCancel={() => setConfirmingDelete(false)}
+              onConfirm={onDelete}
+            />
+          )
+        }
+      />
     </div>
   );
 }
@@ -514,6 +538,7 @@ export function LinearConnectionSection({ workspaceId }: { workspaceId: string }
           <TestResultAlert result={s.testResult} />
           <Separator />
           <ActionBar
+            workspaceId={workspaceId}
             testing={s.testing}
             loading={s.loading}
             hasConfig={!!s.config}
diff --git a/apps/web/components/quick-chat/quick-chat-modal.test.tsx b/apps/web/components/quick-chat/quick-chat-modal.test.tsx
index 332dd21761..bbe6b55668 100644
--- a/apps/web/components/quick-chat/quick-chat-modal.test.tsx
+++ b/apps/web/components/quick-chat/quick-chat-modal.test.tsx
@@ -1,7 +1,9 @@
 import { useCallback, useState } from "react";
-import { cleanup, fireEvent, render, screen, within } from "@testing-library/react";
+import { cleanup, fireEvent, render, screen, within, waitFor } from "@testing-library/react";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { useClarificationEscapeGuard } from "@/hooks/use-clarification-escape-guard";
+import { ResetContextButton } from "@/components/task/chat/reset-context-button";
+import { TooltipProvider } from "@kandev/ui/tooltip";
 
 const setQuickChatInitialPrompt = vi.fn();
 const quickChatSessionItems: Record<string, { state: string; task_id: string }> = {};
@@ -18,7 +20,7 @@ const WORKSPACE_ID = "ws-1";
 const TERMINAL_TAB_ID = "terminal-1";
 const FIRE_ESCAPE_TESTID = "fire-escape";
 const TOGGLE_ESCAPE_GUARD_TESTID = "toggle-escape-guard";
-const responsiveMock = vi.hoisted(() => ({ isFinePointer: true }));
+const responsiveMock = vi.hoisted(() => ({ isFinePointer: true, isMobile: false }));
 
 vi.mock("@/hooks/use-responsive-breakpoint", () => ({
   useResponsiveBreakpoint: () => responsiveMock,
@@ -34,6 +36,7 @@ vi.mock("@/components/state-provider", () => ({
   ) =>
     selector({
       setQuickChatInitialPrompt,
+      clearContextWindow: vi.fn(),
       taskSessions: { items: quickChatSessionItems },
       prepareProgress: { bySessionId: quickChatPrepareProgress },
     }),
@@ -126,6 +129,9 @@ function EscapeGuardProbe() {
   useClarificationEscapeGuard(predicate);
   return (
     <div data-testid="quick-chat-session-view">
+      <TooltipProvider>
+        <ResetContextButton sessionId="chat-1" presentation="mobile" />
+      </TooltipProvider>
       <button
         type="button"
         data-testid={TOGGLE_ESCAPE_GUARD_TESTID}
@@ -148,6 +154,24 @@ vi.mock("./use-quick-chat-modal", () => ({
   useQuickChatModal: () => useQuickChatModalMock(),
 }));
 
+it("hosts phone context reset inside Quick Chat without another modal", async () => {
+  responsiveMock.isMobile = true;
+  useQuickChatModalMock.mockReturnValue({
+    ...defaultQuickChatModalState,
+    activeKind: "conversation",
+    activeSessionNeedsAgent: false,
+  });
+  render(<QuickChatModal workspaceId={WORKSPACE_ID} />);
+  const trigger = screen.getByTestId("reset-context-button");
+  fireEvent.click(trigger);
+  const confirmation = await screen.findByTestId("mobile-action-confirmation");
+  expect(document.querySelector('[data-slot="drawer-content"]')).toBeNull();
+  expect(trigger.closest('[aria-hidden="true"][inert]')).toBeTruthy();
+  fireEvent.click(within(confirmation).getByRole("button", { name: "Back" }));
+  await waitFor(() => expect(document.activeElement).toBe(trigger));
+  responsiveMock.isMobile = false;
+});
+
 const defaultQuickChatModalState = {
   isOpen: true,
   sessions: [{ sessionId: "chat-1", workspaceId: WORKSPACE_ID, kind: "chat", name: CHAT_NAME }],
@@ -201,6 +225,7 @@ const defaultQuickChatModalState = {
 import { QuickChatModal } from "./quick-chat-modal";
 
 afterEach(() => {
+  responsiveMock.isMobile = false;
   cleanup();
   for (const key of Object.keys(quickChatSessionItems)) delete quickChatSessionItems[key];
   for (const key of Object.keys(quickChatPrepareProgress)) delete quickChatPrepareProgress[key];
diff --git a/apps/web/components/quick-chat/quick-chat-modal.tsx b/apps/web/components/quick-chat/quick-chat-modal.tsx
index 50e4d70b65..a06a96a723 100644
--- a/apps/web/components/quick-chat/quick-chat-modal.tsx
+++ b/apps/web/components/quick-chat/quick-chat-modal.tsx
@@ -19,6 +19,10 @@ import {
 } from "@/hooks/use-clarification-escape-guard";
 import { ConfigChatSetup } from "@/components/config-chat/config-chat-setup";
 import { useConfigChat } from "@/components/config-chat/use-config-chat";
+import {
+  MobileConfirmationHost,
+  MobileConfirmationHostBody,
+} from "@/components/confirmation/mobile-confirmation-host";
 
 const QuickTerminalTabView = dynamic(
   () => import("./quick-terminal-tab-view").then((module) => module.QuickTerminalTabView),
@@ -174,41 +178,52 @@ export const QuickChatModal = memo(function QuickChatModal({ workspaceId }: Quic
   );
   return (
     <ClarificationEscapeGuardProvider value={escapeGuardRegistry}>
-      <Dialog open={quickChat.isOpen} onOpenChange={quickChat.handleOpenChange}>
-        <DialogContent
-          className="!left-0 !top-0 !h-dvh !max-h-dvh !w-screen !max-w-none !translate-x-0 !translate-y-0 flex flex-col gap-0 p-0 pt-safe pb-safe shadow-2xl sm:!left-1/2 sm:!top-1/2 sm:!h-[85vh] sm:!max-h-[85vh] sm:!w-[var(--quick-chat-width)] sm:!max-w-[calc(100vw-2rem)] sm:!-translate-x-1/2 sm:!-translate-y-1/2"
-          style={{ "--quick-chat-width": `${width}px` } as CSSProperties}
-          showCloseButton={false}
-          overlayClassName="bg-black/20 sm:bg-black/40 sm:backdrop-blur-sm"
-          onEscapeKeyDown={(event) => {
-            // A pending, expanded clarification (or an open suggestion popup,
-            // or the reverse-search overlay) handles this Escape itself and
-            // the modal stays open -- but only when that widget's own guard
-            // predicate reports it will actually act on this exact keydown
-            // (matching its enabled/scope/modifier state), so Escape never
-            // goes silently swallowed with nothing left to handle it. Once no
-            // guard claims it (e.g. a second, now-unguarded Escape), the modal
-            // closes, matching the main task chat panel's two-stage Escape
-            // after #2729.
-            for (const test of escapeGuardsRef.current.values()) {
-              if (test(event)) {
-                event.preventDefault();
-                break;
-              }
-            }
-          }}
-        >
-          <DialogTitle className="sr-only">{t("common:commandQuickChat")}</DialogTitle>
-          <QuickChatResizeHandle edge="left" {...leftResizeHandleProps} />
-          <QuickChatResizeHandle edge="right" {...rightResizeHandleProps} />
-          <QuickChatContent
-            workspaceId={workspaceId}
-            configChat={configChat}
-            quickChat={quickChat}
-            setQuickChatInitialPrompt={setQuickChatInitialPrompt}
-          />
-        </DialogContent>
-      </Dialog>
+      <MobileConfirmationHost open={quickChat.isOpen} key={workspaceId}>
+        {({ contentProps }) => (
+          <Dialog open={quickChat.isOpen} onOpenChange={quickChat.handleOpenChange}>
+            <DialogContent
+              {...contentProps}
+              className="!left-0 !top-0 !h-dvh !max-h-dvh !w-screen !max-w-none !translate-x-0 !translate-y-0 flex flex-col gap-0 p-0 pt-safe pb-safe shadow-2xl sm:!left-1/2 sm:!top-1/2 sm:!h-[85vh] sm:!max-h-[85vh] sm:!w-[var(--quick-chat-width)] sm:!max-w-[calc(100vw-2rem)] sm:!-translate-x-1/2 sm:!-translate-y-1/2"
+              style={{ "--quick-chat-width": `${width}px` } as CSSProperties}
+              showCloseButton={false}
+              overlayClassName="bg-black/20 sm:bg-black/40 sm:backdrop-blur-sm"
+              onEscapeKeyDown={(event) => {
+                if (contentProps.onEscapeKeyDown) {
+                  contentProps.onEscapeKeyDown(event);
+                  return;
+                }
+                // A pending, expanded clarification (or an open suggestion popup,
+                // or the reverse-search overlay) handles this Escape itself and
+                // the modal stays open -- but only when that widget's own guard
+                // predicate reports it will actually act on this exact keydown
+                // (matching its enabled/scope/modifier state), so Escape never
+                // goes silently swallowed with nothing left to handle it. Once no
+                // guard claims it (e.g. a second, now-unguarded Escape), the modal
+                // closes, matching the main task chat panel's two-stage Escape
+                // after #2729.
+                for (const test of escapeGuardsRef.current.values()) {
+                  if (test(event)) {
+                    event.preventDefault();
+                    break;
+                  }
+                }
+              }}
+            >
+              <MobileConfirmationHostBody>
+                <DialogTitle className="sr-only">{t("common:commandQuickChat")}</DialogTitle>
+                <QuickChatResizeHandle edge="left" {...leftResizeHandleProps} />
+                <QuickChatResizeHandle edge="right" {...rightResizeHandleProps} />
+                <QuickChatContent
+                  workspaceId={workspaceId}
+                  configChat={configChat}
+                  quickChat={quickChat}
+                  setQuickChatInitialPrompt={setQuickChatInitialPrompt}
+                />
+              </MobileConfirmationHostBody>
+            </DialogContent>
+          </Dialog>
+        )}
+      </MobileConfirmationHost>
 
       <QuickChatDeleteDialog
         sessionToDelete={quickChat.sessionToClose}
diff --git a/apps/web/components/review/walkthrough-discard-confirmation.tsx b/apps/web/components/review/walkthrough-discard-confirmation.tsx
new file mode 100644
index 0000000000..46568e973e
--- /dev/null
+++ b/apps/web/components/review/walkthrough-discard-confirmation.tsx
@@ -0,0 +1,48 @@
+import type { RefObject } from "react";
+import { useTranslation } from "react-i18next";
+import type { TaskWalkthrough } from "@/lib/types/http";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
+import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
+
+export function WalkthroughDiscardConfirmation({
+  taskId,
+  walkthrough,
+  open,
+  disabled,
+  anchorRef,
+  onOpenChange,
+  onConfirm,
+}: {
+  taskId: string;
+  walkthrough: TaskWalkthrough;
+  open: boolean;
+  disabled: boolean;
+  anchorRef: RefObject<HTMLButtonElement | null>;
+  onOpenChange: (open: boolean) => void;
+  onConfirm: () => Promise<void>;
+}) {
+  const { t } = useTranslation();
+  const { isFinePointer } = useResponsiveBreakpoint();
+  const actions = {
+    open,
+    onOpenChange,
+    onConfirm,
+    title: t("review:discardWalkthroughTitle"),
+    description: t("review:discardWalkthroughDescription"),
+    cancelLabel: t("common:cancel"),
+    confirmLabel: t("review:discardWalkthrough"),
+    confirmTestId: "walkthrough-discard-confirm",
+    testId: "walkthrough-discard-confirmation",
+  };
+  return (
+    <MobileActionConfirmation
+      {...actions}
+      targetKey={`${taskId}:${walkthrough.id}:${walkthrough.updated_at}`}
+      subject={walkthrough.title}
+      focusReturnRef={anchorRef}
+      disabled={disabled}
+      fallback={isFinePointer ? <ActionConfirmPopover {...actions} anchorRef={anchorRef} /> : null}
+    />
+  );
+}
diff --git a/apps/web/components/review/walkthrough-overlay.test.tsx b/apps/web/components/review/walkthrough-overlay.test.tsx
index 53747204be..fbb41e50bb 100644
--- a/apps/web/components/review/walkthrough-overlay.test.tsx
+++ b/apps/web/components/review/walkthrough-overlay.test.tsx
@@ -264,7 +264,7 @@ describe("WalkthroughOverlay fine-pointer discard confirmation", () => {
 describe("WalkthroughOverlay coarse-pointer discard confirmation", () => {
   beforeEach(resetOverlayMocks);
 
-  it("morphs coarse-pointer discard into local touch actions", async () => {
+  it("shows a named phone sheet without replacing the walkthrough launcher", async () => {
     vi.mocked(useResponsiveBreakpoint).mockReturnValue(responsive(false));
     vi.mocked(getTaskWalkthrough).mockResolvedValue(walkthrough());
     renderOverlay();
@@ -274,11 +274,14 @@ describe("WalkthroughOverlay coarse-pointer discard confirmation", () => {
     fireEvent.click(screen.getByTestId(DISCARD_BUTTON_TEST_ID));
 
     const confirmation = await screen.findByTestId(DISCARD_CONFIRMATION_TEST_ID);
+    expect(screen.getByRole("dialog").getAttribute("data-slot")).toBe("drawer-content");
+    expect(confirmation.textContent).toContain("Walkthrough");
+    expect(screen.getByTestId(DISCARD_BUTTON_TEST_ID).isConnected).toBe(true);
     expect(confirmation.getAttribute("role")).toBe("group");
     expect(screen.queryByRole(ALERT_DIALOG_ROLE)).toBeNull();
     expect(
       within(confirmation).getByRole("button", { name: DISCARD_BUTTON_NAME }).className,
-    ).toContain("h-11");
+    ).toContain("min-h-12");
   });
 
   it("restores focus to the coarse-pointer discard button after cancel", async () => {
@@ -301,7 +304,9 @@ describe("WalkthroughOverlay coarse-pointer discard confirmation", () => {
     );
     act(() => runAnimationFrame?.(0));
 
-    expect(document.activeElement).toBe(screen.getByTestId(DISCARD_BUTTON_TEST_ID));
+    await waitFor(() =>
+      expect(document.activeElement).toBe(screen.getByTestId(DISCARD_BUTTON_TEST_ID)),
+    );
   });
 });
 
diff --git a/apps/web/components/review/walkthrough-overlay.tsx b/apps/web/components/review/walkthrough-overlay.tsx
index 6002188aad..efcd84b32d 100644
--- a/apps/web/components/review/walkthrough-overlay.tsx
+++ b/apps/web/components/review/walkthrough-overlay.tsx
@@ -10,8 +10,8 @@ import { clearOpenWalkthroughTaskId, setOpenWalkthroughTaskId } from "@/lib/walk
 import { cn } from "@kandev/ui/lib/utils";
 import type { TaskWalkthrough } from "@/lib/types/http";
 import { useTranslation } from "react-i18next";
-import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { WalkthroughDiscardConfirmation } from "./walkthrough-discard-confirmation";
 import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 
 type WalkthroughOverlayProps = {
@@ -29,6 +29,7 @@ type WalkthroughLauncherProps = {
   discardDisabled: boolean;
   hasUnseen: boolean;
   isFinePointer: boolean;
+  isMobile: boolean;
   isOpen: boolean;
   onDiscardClick: () => void;
   onDiscardCancel: () => void;
@@ -45,6 +46,7 @@ function WalkthroughLauncher({
   discardDisabled,
   hasUnseen,
   isFinePointer,
+  isMobile,
   isOpen,
   onDiscardClick,
   onDiscardCancel,
@@ -90,7 +92,7 @@ function WalkthroughLauncher({
           {activeStep + 1}/{stepCount}
         </span>
       </button>
-      {isFinePointer || !confirmDiscardOpen ? (
+      {isMobile || isFinePointer || !confirmDiscardOpen ? (
         <button
           ref={discardAnchorRef}
           type="button"
@@ -178,8 +180,7 @@ function useWalkthroughBackfill(params: {
  */
 export function WalkthroughOverlay({ taskId, onSelectFile }: WalkthroughOverlayProps) {
   const { t } = useTranslation();
-  const discardLabel = t("review:discardWalkthrough");
-  const { isFinePointer } = useResponsiveBreakpoint();
+  const { isFinePointer, isMobile } = useResponsiveBreakpoint();
   const walkthrough = useAppStore((s) => (taskId ? s.walkthroughs.byTaskId[taskId] : null));
   const connectionStatus = useAppStore((s) => s.connection.status);
   const activeStep = useAppStore((s) =>
@@ -251,7 +252,8 @@ export function WalkthroughOverlay({ taskId, onSelectFile }: WalkthroughOverlayP
         discardAnchorRef={discardAnchorRef}
         discardDisabled={discarding}
         hasUnseen={hasUnseen}
-        isFinePointer={isFinePointer}
+        isFinePointer={!isMobile && isFinePointer}
+        isMobile={isMobile}
         isOpen={open}
         onDiscardClick={() => setDiscardTargetTaskId(taskId)}
         onDiscardCancel={() => {
@@ -263,20 +265,15 @@ export function WalkthroughOverlay({ taskId, onSelectFile }: WalkthroughOverlayP
         onToggle={() => (open ? closeTour() : openTour())}
         stepCount={walkthrough.steps.length}
       />
-      {isFinePointer ? (
-        <ActionConfirmPopover
-          open={confirmDiscardOpen}
-          anchorRef={discardAnchorRef}
-          title={t("review:discardWalkthroughTitle")}
-          description={t("review:discardWalkthroughDescription")}
-          cancelLabel={t("common:cancel")}
-          confirmLabel={discardLabel}
-          confirmTestId="walkthrough-discard-confirm"
-          testId="walkthrough-discard-confirmation"
-          onOpenChange={(nextOpen) => setDiscardTargetTaskId(nextOpen ? taskId : null)}
-          onConfirm={() => discardWalkthrough(discardTargetTaskId)}
-        />
-      ) : null}
+      <WalkthroughDiscardConfirmation
+        taskId={taskId}
+        walkthrough={walkthrough}
+        open={confirmDiscardOpen}
+        anchorRef={discardAnchorRef}
+        disabled={discarding}
+        onOpenChange={(nextOpen) => setDiscardTargetTaskId(nextOpen ? taskId : null)}
+        onConfirm={() => discardWalkthrough(discardTargetTaskId)}
+      />
     </>
   );
 }
diff --git a/apps/web/components/sentry/sentry-instance-card.test.tsx b/apps/web/components/sentry/sentry-instance-card.test.tsx
index d43eaca6af..1746aa10b2 100644
--- a/apps/web/components/sentry/sentry-instance-card.test.tsx
+++ b/apps/web/components/sentry/sentry-instance-card.test.tsx
@@ -17,9 +17,33 @@ function instance(id: string, name: string): SentryConfig {
   };
 }
 
-afterEach(() => cleanup());
+afterEach(() => {
+  cleanup();
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
+});
 
 describe("SentryInstanceCard", () => {
+  it("names the phone instance in a sheet and keeps its delete button mounted", () => {
+    Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+    const onCancel = vi.fn();
+    render(
+      <SentryInstanceCard
+        instance={instance("production", "Production")}
+        onEdit={vi.fn()}
+        onDelete={vi.fn()}
+        isFinePointer={false}
+        confirmingDelete
+        onDeleteCancel={onCancel}
+        onDeleteConfirm={vi.fn()}
+      />,
+    );
+    const sheet = screen.getByRole("dialog");
+    expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+    expect(sheet.textContent).toContain("Production");
+    expect(screen.getByTestId("sentry-instance-delete-button").isConnected).toBe(true);
+    fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
+    expect(onCancel).toHaveBeenCalledExactlyOnceWith("production");
+  });
   it("gives each instance action a distinct accessible name", () => {
     render(
       <>
diff --git a/apps/web/components/sentry/sentry-instance-card.tsx b/apps/web/components/sentry/sentry-instance-card.tsx
index ebbbaa6d52..db8ebb25ef 100644
--- a/apps/web/components/sentry/sentry-instance-card.tsx
+++ b/apps/web/components/sentry/sentry-instance-card.tsx
@@ -9,6 +9,8 @@ import {
 } from "@/components/integrations/auth-status-banner";
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import type { SentryConfig } from "@/lib/types/sentry";
 import { useTranslation } from "react-i18next";
 
@@ -48,7 +50,16 @@ export function SentryInstanceCard({
   const { t } = useTranslation();
   const deleteAnchorRef = useRef<HTMLButtonElement>(null);
   const confirmationTitle = t("sentry:removeInstanceConfirm", { name: instance.name });
+  const { isMobile } = useResponsiveBreakpoint();
   const cancelDelete = () => onDeleteCancel(instance.id);
+  const deleteLabel = t("sentry:delete");
+  const actions = {
+    cancelLabel: t("common:cancel"),
+    confirmLabel: deleteLabel,
+    confirmAriaLabel: confirmationTitle,
+    confirmTestId: "sentry-remove-confirm",
+    onConfirm: onDeleteConfirm,
+  };
   return (
     <div className="space-y-3 rounded-md border p-4" data-testid="sentry-instance-card">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between">
@@ -70,7 +81,7 @@ export function SentryInstanceCard({
             <IconPencil className="h-3.5 w-3.5" />
             {t("sentry:edit")}
           </Button>
-          {(isFinePointer || !confirmingDelete) && (
+          {(isMobile || isFinePointer || !confirmingDelete) && (
             <Button
               ref={deleteAnchorRef}
               type="button"
@@ -81,43 +92,46 @@ export function SentryInstanceCard({
               data-testid="sentry-instance-delete-button"
             >
               <IconTrash className="h-3.5 w-3.5" />
-              {t("sentry:delete")}
+              {deleteLabel}
             </Button>
           )}
         </div>
       </div>
-      {!isFinePointer && confirmingDelete ? (
-        <InlineConfirmActions
-          density="touch"
-          testId="sentry-remove-inline-confirmation"
-          ariaLabel={confirmationTitle}
-          description={confirmationTitle}
-          cancelLabel={t("common:cancel")}
-          confirmLabel={t("sentry:delete")}
-          confirmAriaLabel={confirmationTitle}
-          confirmTestId="sentry-remove-confirm"
-          onCancel={cancelDelete}
-          onClose={cancelDelete}
-          onConfirm={onDeleteConfirm}
-        />
-      ) : null}
-      {isFinePointer ? (
-        <ActionConfirmPopover
-          open={confirmingDelete}
-          anchorRef={deleteAnchorRef}
-          title={confirmationTitle}
-          cancelLabel={t("common:cancel")}
-          confirmLabel={t("sentry:delete")}
-          confirmAriaLabel={confirmationTitle}
-          confirmTestId="sentry-remove-confirm"
-          testId="sentry-remove-confirm-popover"
-          onOpenChange={(open) => {
-            if (!open) cancelDelete();
-          }}
-          onCancel={cancelDelete}
-          onConfirm={onDeleteConfirm}
-        />
-      ) : null}
+      <MobileActionConfirmation
+        open={confirmingDelete}
+        targetKey={`${instance.workspaceId}:${instance.id}`}
+        title={confirmationTitle}
+        {...actions}
+        onOpenChange={(open) => {
+          if (!open) cancelDelete();
+        }}
+        focusReturnRef={deleteAnchorRef}
+        fallback={
+          !isFinePointer ? (
+            <InlineConfirmActions
+              density="touch"
+              testId="sentry-remove-inline-confirmation"
+              ariaLabel={confirmationTitle}
+              description={confirmationTitle}
+              {...actions}
+              onCancel={cancelDelete}
+              onClose={cancelDelete}
+            />
+          ) : (
+            <ActionConfirmPopover
+              open={confirmingDelete}
+              anchorRef={deleteAnchorRef}
+              title={confirmationTitle}
+              {...actions}
+              testId="sentry-remove-confirm-popover"
+              onOpenChange={(open) => {
+                if (!open) cancelDelete();
+              }}
+              onCancel={cancelDelete}
+            />
+          )
+        }
+      />
       <IntegrationAuthStatusBanner health={configToHealth(instance)} />
     </div>
   );
diff --git a/apps/web/components/sentry/sentry-issue-watch-table.tsx b/apps/web/components/sentry/sentry-issue-watch-table.tsx
index f33d6934bd..6e7dc94d14 100644
--- a/apps/web/components/sentry/sentry-issue-watch-table.tsx
+++ b/apps/web/components/sentry/sentry-issue-watch-table.tsx
@@ -150,6 +150,8 @@ function WatchActions({
         <TooltipContent>{t("common:reset")}</TooltipContent>
       </Tooltip>
       <WatcherDeleteAction
+        targetKey={`${watch.workspaceId}:${watch.id}`}
+        subject={summarizeFilter(watch.filter)}
         title={t("sentry:deleteThisSentryWatcher")}
         cancelLabel={t("common:cancel")}
         confirmLabel={t("sentry:delete")}
diff --git a/apps/web/components/settings/agent-profile-delete-dialog.test.tsx b/apps/web/components/settings/agent-profile-delete-dialog.test.tsx
index 5e03462fa5..e7678f9177 100644
--- a/apps/web/components/settings/agent-profile-delete-dialog.test.tsx
+++ b/apps/web/components/settings/agent-profile-delete-dialog.test.tsx
@@ -9,7 +9,10 @@ import {
 } from "./agent-profile-delete-dialog";
 import type { AgentProfileDeleteConflict } from "./agent-profile-delete-dialog";
 
-afterEach(cleanup);
+afterEach(() => {
+  cleanup();
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
+});
 
 function renderLocalConfirmation(
   isFinePointer: boolean,
@@ -25,6 +28,8 @@ function renderLocalConfirmation(
           Delete
         </button>
         <AgentProfileDeleteConfirmation
+          profileId="profile-1"
+          profileName="Code reviewer"
           open={open}
           isFinePointer={isFinePointer}
           anchorRef={anchorRef}
@@ -40,6 +45,19 @@ function renderLocalConfirmation(
 }
 
 describe("AgentProfileDeleteConfirmation", () => {
+  it("names the phone target and restores the original trigger on Cancel", async () => {
+    Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+    const onConfirm = vi.fn();
+    renderLocalConfirmation(false, onConfirm);
+    const sheet = screen.getByRole("dialog", { name: "Delete agent profile?" });
+    expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+    expect(within(sheet).getByText("Code reviewer", { selector: "p" })).toBeTruthy();
+    fireEvent.click(within(sheet).getByRole("button", { name: "Cancel" }));
+    await waitFor(() =>
+      expect(document.activeElement).toBe(screen.getByTestId("profile-delete-trigger")),
+    );
+    expect(onConfirm).not.toHaveBeenCalled();
+  });
   it("uses touch-sized inline actions on coarse pointers and cancels without mutating", async () => {
     const onConfirm = vi.fn();
     renderLocalConfirmation(false, onConfirm);
diff --git a/apps/web/components/settings/agent-profile-delete-dialog.tsx b/apps/web/components/settings/agent-profile-delete-dialog.tsx
index 4643fdabe6..4d03570c3e 100644
--- a/apps/web/components/settings/agent-profile-delete-dialog.tsx
+++ b/apps/web/components/settings/agent-profile-delete-dialog.tsx
@@ -15,6 +15,7 @@ import {
 } from "@kandev/ui/alert-dialog";
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
 import { useAppStore } from "@/components/state-provider";
 import type {
   ActiveSessionInfo,
@@ -39,6 +40,8 @@ const DELETE_PROFILE_DESCRIPTION_KEY = "agents:deleteAgentProfileDescription";
 const CANCEL_LABEL_KEY = "common:cancel";
 
 type AgentProfileDeleteConfirmationProps = {
+  profileId: string;
+  profileName: string;
   open: boolean;
   isFinePointer: boolean;
   anchorRef: RefObject<HTMLElement | null>;
@@ -52,6 +55,8 @@ type AgentProfileDeleteConfirmationProps = {
  * AgentProfileDeleteConflictDialog because its dependency lists need a modal.
  */
 export function AgentProfileDeleteConfirmation({
+  profileId,
+  profileName,
   open,
   isFinePointer,
   anchorRef,
@@ -60,26 +65,21 @@ export function AgentProfileDeleteConfirmation({
   onConfirm,
 }: AgentProfileDeleteConfirmationProps) {
   const { t } = useTranslation();
-  if (isFinePointer) {
-    return (
-      <ActionConfirmPopover
-        open={open}
-        anchorRef={anchorRef}
-        title={t(DELETE_PROFILE_TITLE_KEY)}
-        description={t(DELETE_PROFILE_DESCRIPTION_KEY)}
-        cancelLabel={t(CANCEL_LABEL_KEY)}
-        confirmLabel={t("agents:delete")}
-        confirmTestId="agent-profile-delete-confirm"
-        testId="agent-profile-delete-confirm-popover"
-        onOpenChange={onOpenChange}
-        onCancel={onCancel}
-        onConfirm={onConfirm}
-      />
-    );
-  }
-
-  if (!open) return null;
-  return (
+  const fallback = isFinePointer ? (
+    <ActionConfirmPopover
+      open={open}
+      anchorRef={anchorRef}
+      title={t(DELETE_PROFILE_TITLE_KEY)}
+      description={t(DELETE_PROFILE_DESCRIPTION_KEY)}
+      cancelLabel={t(CANCEL_LABEL_KEY)}
+      confirmLabel={t("agents:delete")}
+      confirmTestId="agent-profile-delete-confirm"
+      testId="agent-profile-delete-confirm-popover"
+      onOpenChange={onOpenChange}
+      onCancel={onCancel}
+      onConfirm={onConfirm}
+    />
+  ) : (
     <InlineConfirmActions
       density="touch"
       testId="agent-profile-delete-inline-confirmation"
@@ -93,6 +93,23 @@ export function AgentProfileDeleteConfirmation({
       onConfirm={onConfirm}
     />
   );
+  return (
+    <MobileActionConfirmation
+      open={open}
+      targetKey={profileId}
+      title={t(DELETE_PROFILE_TITLE_KEY)}
+      subject={profileName}
+      description={t(DELETE_PROFILE_DESCRIPTION_KEY)}
+      cancelLabel={t(CANCEL_LABEL_KEY)}
+      confirmLabel={t("agents:delete")}
+      confirmTestId="agent-profile-delete-confirm"
+      focusReturnRef={anchorRef}
+      onOpenChange={onOpenChange}
+      onCancel={onCancel}
+      onConfirm={onConfirm}
+      fallback={fallback}
+    />
+  );
 }
 
 export function AgentProfileDisableConflictDialog({
diff --git a/apps/web/components/settings/agent-profile-page.tsx b/apps/web/components/settings/agent-profile-page.tsx
index d6260448c7..7f636609e7 100644
--- a/apps/web/components/settings/agent-profile-page.tsx
+++ b/apps/web/components/settings/agent-profile-page.tsx
@@ -65,6 +65,7 @@ import type { AgentProfileMcpConfig } from "@/lib/types/http";
 import { useAgentProfileSettings } from "@/app/settings/agents/[agentId]/profiles/[profileId]/use-agent-profile-settings";
 import { agentProfileDiscoveryTarget } from "@/lib/settings-discovery/dynamic-targets";
 import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
+import { useConfirmationBoundary } from "@/components/confirmation/mobile-action-confirmation";
 import { DynamicAgentProfileEditor } from "@/components/settings/dynamic-agent-profile-editor";
 import { isHandledApiError } from "@/lib/api/client";
 
@@ -137,15 +138,23 @@ function ProfileEditorHeader({
 }
 
 type DeleteProfileCardProps = {
+  profile: AgentProfile;
   onDelete: () => void;
   open: boolean;
   onOpenChange: (open: boolean) => void;
   onConfirm: () => void | Promise<void>;
 };
 
-function DeleteProfileCard({ onDelete, open, onOpenChange, onConfirm }: DeleteProfileCardProps) {
+function DeleteProfileCard({
+  profile,
+  onDelete,
+  open,
+  onOpenChange,
+  onConfirm,
+}: DeleteProfileCardProps) {
   const { t } = useTranslation();
-  const { isFinePointer } = useResponsiveBreakpoint();
+  const { isFinePointer, isMobile } = useResponsiveBreakpoint();
+  useConfirmationBoundary(open, profile.id, onOpenChange);
   const deleteAnchorRef = useRef<HTMLButtonElement>(null);
   const closeDeleteConfirmation = () => {
     onOpenChange(false);
@@ -161,7 +170,7 @@ function DeleteProfileCard({ onDelete, open, onOpenChange, onConfirm }: DeletePr
           <p className="text-sm font-medium">{t("agents:removeThisProfile")}</p>
           <p className="text-xs text-muted-foreground">{t("agents:actionCannotBeUndone")}</p>
         </div>
-        {!open || isFinePointer ? (
+        {!open || isFinePointer || isMobile ? (
           <Button
             ref={deleteAnchorRef}
             variant="destructive"
@@ -173,9 +182,11 @@ function DeleteProfileCard({ onDelete, open, onOpenChange, onConfirm }: DeletePr
             {t("agents:delete")}
           </Button>
         ) : null}
-        {!isFinePointer && open ? (
+        {!isMobile && !isFinePointer && open ? (
           <div className="basis-full min-w-0">
             <AgentProfileDeleteConfirmation
+              profileId={profile.id}
+              profileName={profile.name}
               open={open}
               isFinePointer={false}
               anchorRef={deleteAnchorRef}
@@ -186,8 +197,10 @@ function DeleteProfileCard({ onDelete, open, onOpenChange, onConfirm }: DeletePr
           </div>
         ) : null}
       </CardContent>
-      {isFinePointer ? (
+      {isMobile || isFinePointer ? (
         <AgentProfileDeleteConfirmation
+          profileId={profile.id}
+          profileName={profile.name}
           open={open}
           isFinePointer
           anchorRef={deleteAnchorRef}
@@ -517,6 +530,7 @@ function ProfileEditor({
       />
 
       <DeleteProfileCard
+        profile={savedProfile}
         onDelete={deleteState.requestDelete}
         open={deleteState.showDeleteConfirm}
         onOpenChange={deleteState.setShowDeleteConfirm}
diff --git a/apps/web/components/settings/agents/agent-profiles-section.tsx b/apps/web/components/settings/agents/agent-profiles-section.tsx
index b9442e4981..c452407d8f 100644
--- a/apps/web/components/settings/agents/agent-profiles-section.tsx
+++ b/apps/web/components/settings/agents/agent-profiles-section.tsx
@@ -21,6 +21,7 @@ import { deleteAgentProfileAction } from "@/app/actions/agents";
 import { useProfileDuplicate } from "@/hooks/domains/settings/use-profile-duplicate";
 import { useIsAdmin } from "@/hooks/domains/auth/use-is-admin";
 import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
+import { useConfirmationBoundary } from "@/components/confirmation/mobile-action-confirmation";
 import { useRouter } from "@/lib/routing/client-router";
 import { toAgentProfileOption } from "@/lib/state/slices/settings/types";
 import type { Agent, AgentProfile } from "@/lib/types/http";
@@ -78,6 +79,8 @@ function ProfileRowActions({
   onConfirmDelete: () => void;
 }) {
   const { t } = useTranslation();
+  const { isMobile } = useResponsiveBreakpoint();
+  const pendingDelete = useRef(false);
   return (
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
@@ -92,7 +95,15 @@ function ProfileRowActions({
           <IconDotsVertical className="h-4 w-4" />
         </Button>
       </DropdownMenuTrigger>
-      <DropdownMenuContent align="end">
+      <DropdownMenuContent
+        align="end"
+        onCloseAutoFocus={(event) => {
+          if (!pendingDelete.current) return;
+          pendingDelete.current = false;
+          event.preventDefault();
+          onConfirmDelete();
+        }}
+      >
         {profile.kind !== "dynamic" && (
           <DropdownMenuItem
             className="cursor-pointer"
@@ -106,7 +117,10 @@ function ProfileRowActions({
         <DropdownMenuItem
           className="cursor-pointer text-destructive focus:text-destructive"
           data-testid={`delete-profile-${profile.id}`}
-          onSelect={onConfirmDelete}
+          onSelect={() => {
+            if (isMobile) pendingDelete.current = true;
+            else onConfirmDelete();
+          }}
         >
           <IconTrash className="h-4 w-4 mr-2" />
           {t("agents:delete")}
@@ -168,6 +182,8 @@ function ProfileRowInlineActions({
 }
 
 type ProfileRowDeleteConfirmationProps = {
+  profileId: string;
+  profileName: string;
   open: boolean;
   isFinePointer: boolean;
   anchorRef: RefObject<HTMLButtonElement | null>;
@@ -179,6 +195,8 @@ type ProfileRowDeleteConfirmationProps = {
 type ProfileRowDeleteConfirmationBaseProps = Omit<ProfileRowDeleteConfirmationProps, "placement">;
 
 function ProfileRowDeleteConfirmation({
+  profileId,
+  profileName,
   open,
   isFinePointer,
   anchorRef,
@@ -187,11 +205,14 @@ function ProfileRowDeleteConfirmation({
   onConfirm,
   placement,
 }: ProfileRowDeleteConfirmationProps) {
-  if (placement === "inline" && (isFinePointer || !open)) return null;
-  if (placement === "popover" && !isFinePointer) return null;
+  const { isMobile } = useResponsiveBreakpoint();
+  if (placement === "inline" && (isMobile || isFinePointer || !open)) return null;
+  if (placement === "popover" && !isMobile && !isFinePointer) return null;
 
   const confirmation = (
     <AgentProfileDeleteConfirmation
+      profileId={profileId}
+      profileName={profileName}
       open={open}
       isFinePointer={isFinePointer}
       anchorRef={anchorRef}
@@ -232,6 +253,7 @@ function ProfileRowCard({
   onConfirmDelete,
   confirmationProps,
 }: ProfileRowCardProps) {
+  const { isMobile } = useResponsiveBreakpoint();
   return (
     <Card
       // Same surface treatment as the workspace section tiles.
@@ -261,7 +283,7 @@ function ProfileRowCard({
         </div>
         <div className="relative z-10 flex shrink-0 items-center gap-1">
           {canManage &&
-            !(confirmOpen && !isFinePointer) &&
+            (isMobile || !(confirmOpen && !isFinePointer)) &&
             (isFullDesktop ? (
               <ProfileRowInlineActions
                 profile={profile}
@@ -294,6 +316,7 @@ export function ProfileRow({ agent, profile }: { agent: Agent; profile: AgentPro
   const { isFinePointer, isFullDesktop } = useResponsiveBreakpoint();
   const handleDuplicate = useProfileDuplicate();
   const [confirmOpen, setConfirmOpen] = useState(false);
+  useConfirmationBoundary(confirmOpen, profile.id, setConfirmOpen);
   const deleteAnchorRef = useRef<HTMLButtonElement>(null);
   const store = useAppStoreApi();
   const setSettingsAgents = useAppStore((state) => state.setSettingsAgents);
@@ -343,6 +366,8 @@ export function ProfileRow({ agent, profile }: { agent: Agent; profile: AgentPro
     closeDeleteConfirmation();
   };
   const confirmationProps = {
+    profileId: profile.id,
+    profileName: profile.name,
     open: confirmOpen,
     isFinePointer,
     anchorRef: deleteAnchorRef,
diff --git a/apps/web/components/settings/layouts/layout-profile-delete-confirmation.test.tsx b/apps/web/components/settings/layouts/layout-profile-delete-confirmation.test.tsx
new file mode 100644
index 0000000000..b8ccc3253d
--- /dev/null
+++ b/apps/web/components/settings/layouts/layout-profile-delete-confirmation.test.tsx
@@ -0,0 +1,51 @@
+import { useRef, useState } from "react";
+import { cleanup, fireEvent, render, screen, waitFor, within } from "@testing-library/react";
+import { afterEach, expect, it, vi } from "vitest";
+import { TooltipProvider } from "@kandev/ui/tooltip";
+import { getBuiltInLayoutProfile } from "@/lib/layout/layout-profiles";
+import { LayoutProfileDeleteConfirmation } from "./layout-profile-delete-confirmation";
+
+afterEach(() => {
+  cleanup();
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
+});
+
+it("keeps the default-layout warning and stable trigger in the phone sheet", async () => {
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+  const onConfirm = vi.fn();
+  function Harness() {
+    const [open, setOpen] = useState(false);
+    const anchorRef = useRef<HTMLButtonElement>(null);
+    return (
+      <TooltipProvider>
+        <LayoutProfileDeleteConfirmation
+          profile={{
+            id: "layout-1",
+            name: "Review",
+            is_default: true,
+            layout: getBuiltInLayoutProfile("default").layout,
+            created_at: "2026-09-10T00:00:00Z",
+          }}
+          isFinePointer={false}
+          open={open}
+          onOpenChange={setOpen}
+          anchorRef={anchorRef}
+          onConfirm={onConfirm}
+        />
+      </TooltipProvider>
+    );
+  }
+  render(<Harness />);
+  const trigger = screen.getByTestId("layout-profile-delete");
+  fireEvent.click(trigger);
+  const sheet = screen.getByRole("dialog");
+  expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+  expect(within(sheet).getByText(/built-in default layout/i)).toBeTruthy();
+  expect(trigger.isConnected).toBe(true);
+  fireEvent.click(within(sheet).getByRole("button", { name: "Cancel" }));
+  await waitFor(() => expect(document.activeElement).toBe(trigger));
+  expect(onConfirm).not.toHaveBeenCalled();
+  fireEvent.click(trigger);
+  fireEvent.click(screen.getByTestId("layout-profile-delete-confirm"));
+  await waitFor(() => expect(onConfirm).toHaveBeenCalledTimes(1));
+});
diff --git a/apps/web/components/settings/layouts/layout-profile-delete-confirmation.tsx b/apps/web/components/settings/layouts/layout-profile-delete-confirmation.tsx
index e3018ac2e5..2c9212fcb4 100644
--- a/apps/web/components/settings/layouts/layout-profile-delete-confirmation.tsx
+++ b/apps/web/components/settings/layouts/layout-profile-delete-confirmation.tsx
@@ -8,6 +8,8 @@ import { useTranslation } from "react-i18next";
 
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import { settingsActionClassName } from "@/components/settings/settings-control";
 import type { SavedLayout } from "@/lib/types/http";
 
@@ -29,6 +31,7 @@ export function LayoutProfileDeleteConfirmation({
   onConfirm,
 }: LayoutProfileDeleteConfirmationProps) {
   const { t } = useTranslation();
+  const { isMobile } = useResponsiveBreakpoint();
   const title = t("settings:deleteLayoutProfileNamed", { name: profile.name });
   const description = profile.is_default
     ? t("settings:theBuiltInDefaultLayoutWill")
@@ -38,41 +41,53 @@ export function LayoutProfileDeleteConfirmation({
     queueMicrotask(() => anchorRef.current?.focus());
   };
 
-  if (!isFinePointer) {
-    if (!open)
-      return <DeleteProfileButton anchorRef={anchorRef} onClick={() => onOpenChange(true)} />;
-    return (
-      <InlineConfirmActions
-        density="touch"
-        testId="layout-profile-delete-inline-confirmation"
-        ariaLabel={title}
-        description={description}
-        cancelLabel={t("settings:cancel")}
-        confirmLabel={t("settings:delete")}
-        confirmAriaLabel={title}
-        confirmTestId="layout-profile-delete-confirm"
-        onCancel={cancelInlineDelete}
-        onClose={() => onOpenChange(false)}
-        onConfirm={onConfirm}
-      />
-    );
-  }
-
+  const fallback = !isFinePointer ? (
+    <InlineConfirmActions
+      density="touch"
+      testId="layout-profile-delete-inline-confirmation"
+      ariaLabel={title}
+      description={description}
+      cancelLabel={t("settings:cancel")}
+      confirmLabel={t("settings:delete")}
+      confirmAriaLabel={title}
+      confirmTestId="layout-profile-delete-confirm"
+      onCancel={cancelInlineDelete}
+      onClose={() => onOpenChange(false)}
+      onConfirm={onConfirm}
+    />
+  ) : (
+    <ActionConfirmPopover
+      open={open}
+      anchorRef={anchorRef}
+      title={title}
+      description={description}
+      cancelLabel={t("settings:cancel")}
+      confirmLabel={t("settings:delete")}
+      confirmAriaLabel={title}
+      confirmTestId="layout-profile-delete-confirm"
+      testId="layout-profile-delete-confirm-popover"
+      onOpenChange={onOpenChange}
+      onConfirm={onConfirm}
+    />
+  );
   return (
     <>
-      <DeleteProfileButton anchorRef={anchorRef} onClick={() => onOpenChange(true)} />
-      <ActionConfirmPopover
+      {(isMobile || isFinePointer || !open) && (
+        <DeleteProfileButton anchorRef={anchorRef} onClick={() => onOpenChange(true)} />
+      )}
+      <MobileActionConfirmation
         open={open}
-        anchorRef={anchorRef}
+        targetKey={profile.id}
         title={title}
         description={description}
         cancelLabel={t("settings:cancel")}
         confirmLabel={t("settings:delete")}
         confirmAriaLabel={title}
         confirmTestId="layout-profile-delete-confirm"
-        testId="layout-profile-delete-confirm-popover"
+        focusReturnRef={anchorRef}
         onOpenChange={onOpenChange}
         onConfirm={onConfirm}
+        fallback={fallback}
       />
     </>
   );
diff --git a/apps/web/components/settings/plugins/plugin-detail.tsx b/apps/web/components/settings/plugins/plugin-detail.tsx
index 6e9145c85a..793e932e95 100644
--- a/apps/web/components/settings/plugins/plugin-detail.tsx
+++ b/apps/web/components/settings/plugins/plugin-detail.tsx
@@ -236,6 +236,7 @@ function PluginDangerZone({
   onUninstall,
 }: PluginDangerZoneProps) {
   const { t } = useTranslation();
+  const { isMobile } = useResponsiveBreakpoint();
   const busy = actions.busyId === plugin.id || actions.uninstallBusy;
   const canEnable =
     plugin.status === "disabled" || plugin.status === "registered" || plugin.status === "error";
@@ -271,7 +272,7 @@ function PluginDangerZone({
           {t("plugins:disable")}
         </Button>
       )}
-      {(isFinePointer || !confirmingUninstall) && (
+      {(isMobile || isFinePointer || !confirmingUninstall) && (
         <Button
           ref={uninstallAnchorRef}
           variant="ghost"
diff --git a/apps/web/components/settings/plugins/plugin-row.tsx b/apps/web/components/settings/plugins/plugin-row.tsx
index eb0fd32625..b0cee9edf7 100644
--- a/apps/web/components/settings/plugins/plugin-row.tsx
+++ b/apps/web/components/settings/plugins/plugin-row.tsx
@@ -16,6 +16,7 @@ import { PluginRepoLink } from "./plugin-repo-link";
 import { PluginStatusBadge } from "./plugin-status-badge";
 import { PluginErrorDiagnostic } from "./plugin-error-diagnostic";
 import { PluginUninstallConfirmation } from "./uninstall-plugin-dialog";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import type { MarketplaceEntry, PluginRecord } from "@/lib/types/plugins";
 import { SETTINGS_TYPOGRAPHY } from "@/components/settings/settings-typography";
 import { controlSizingClassName } from "@kandev/ui/control-sizing";
@@ -489,31 +490,18 @@ function PluginRowActions({
   onUpdate,
 }: PluginRowActionsProps) {
   const { t } = useTranslation();
+  const { isMobile } = useResponsiveBreakpoint();
   const updateEntry = update?.hasUpdate ? update.latest : undefined;
   return (
     <div className="relative z-10 flex flex-wrap items-center gap-2 shrink-0">
       {updateEntry && onUpdate && (
-        <Button
-          variant="default"
-          size="sm"
-          data-testid={`plugin-update-${plugin.id}`}
-          className={controlSizingClassName(
-            "compact",
-            "cursor-pointer gap-1 max-md:min-h-11 [@media(pointer:coarse)]:min-h-11",
-          )}
-          aria-busy={update?.busy ? "true" : undefined}
+        <PluginUpdateButton
+          pluginId={plugin.id}
+          entry={updateEntry}
+          updating={!!update?.busy}
           disabled={busy}
-          onClick={() => onUpdate(updateEntry)}
-        >
-          {update?.busy ? (
-            <IconLoader2 className="h-4 w-4 animate-spin" />
-          ) : (
-            <IconArrowUpCircle className="h-4 w-4" />
-          )}
-          {update?.busy
-            ? t("plugins:updating")
-            : t("plugins:updateToVersion", { version: updateEntry.version })}
-        </Button>
+          onUpdate={onUpdate}
+        />
       )}
       {canEnable && (
         <Button
@@ -543,7 +531,7 @@ function PluginRowActions({
           {t("plugins:disable")}
         </Button>
       )}
-      {(isFinePointer || !confirmingUninstall) && (
+      {(isMobile || isFinePointer || !confirmingUninstall) && (
         <Button
           ref={uninstallAnchorRef}
           variant="ghost"
@@ -573,3 +561,40 @@ function PluginRowActions({
     </div>
   );
 }
+
+function PluginUpdateButton({
+  pluginId,
+  entry,
+  updating,
+  disabled,
+  onUpdate,
+}: {
+  pluginId: string;
+  entry: MarketplaceEntry;
+  updating: boolean;
+  disabled: boolean;
+  onUpdate: (entry: MarketplaceEntry) => void;
+}) {
+  const { t } = useTranslation();
+  return (
+    <Button
+      variant="default"
+      size="sm"
+      data-testid={`plugin-update-${pluginId}`}
+      className={controlSizingClassName(
+        "compact",
+        "cursor-pointer gap-1 max-md:min-h-11 [@media(pointer:coarse)]:min-h-11",
+      )}
+      aria-busy={updating ? "true" : undefined}
+      disabled={disabled}
+      onClick={() => onUpdate(entry)}
+    >
+      {updating ? (
+        <IconLoader2 className="h-4 w-4 animate-spin" />
+      ) : (
+        <IconArrowUpCircle className="h-4 w-4" />
+      )}
+      {updating ? t("plugins:updating") : t("plugins:updateToVersion", { version: entry.version })}
+    </Button>
+  );
+}
diff --git a/apps/web/components/settings/plugins/uninstall-plugin-dialog.test.tsx b/apps/web/components/settings/plugins/uninstall-plugin-dialog.test.tsx
index 83a70c610d..e95d2e984f 100644
--- a/apps/web/components/settings/plugins/uninstall-plugin-dialog.test.tsx
+++ b/apps/web/components/settings/plugins/uninstall-plugin-dialog.test.tsx
@@ -5,7 +5,10 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import { PluginUninstallConfirmation } from "./uninstall-plugin-dialog";
 import type { PluginRecord } from "@/lib/types/plugins";
 
-afterEach(cleanup);
+afterEach(() => {
+  cleanup();
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
+});
 
 function plugin(): PluginRecord {
   return {
@@ -48,6 +51,14 @@ function Confirmation({ isFinePointer }: { isFinePointer: boolean }) {
 }
 
 describe("plugin uninstall confirmation", () => {
+  it("shows the named phone uninstall warning in a sheet", () => {
+    Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+    render(<Confirmation isFinePointer={false} />);
+    const sheet = screen.getByRole("dialog");
+    expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+    expect(sheet.textContent).toContain("Acme Tools");
+    expect(sheet.textContent).toContain("revoke its API key");
+  });
   it("uses an anchored non-modal confirmation on fine pointers", () => {
     render(<Confirmation isFinePointer />);
 
diff --git a/apps/web/components/settings/plugins/uninstall-plugin-dialog.tsx b/apps/web/components/settings/plugins/uninstall-plugin-dialog.tsx
index 3ac36eabe9..761de6561d 100644
--- a/apps/web/components/settings/plugins/uninstall-plugin-dialog.tsx
+++ b/apps/web/components/settings/plugins/uninstall-plugin-dialog.tsx
@@ -5,6 +5,7 @@ import { Trans, useTranslation } from "react-i18next";
 
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
 import type { PluginRecord } from "@/lib/types/plugins";
 
 type UninstallPluginConfirmationProps = {
@@ -40,33 +41,28 @@ export function PluginUninstallConfirmation({
   );
   const confirmAriaLabel = t("plugins:confirmUninstall");
 
-  if (!isFinePointer) {
-    if (!open) return null;
-    return (
-      <InlineConfirmActions
-        density="touch"
-        testId="plugin-uninstall-inline-confirmation"
-        ariaLabel={t("plugins:uninstallPlugin")}
-        description={description}
-        cancelLabel={t("plugins:cancel")}
-        confirmLabel={t("plugins:confirmUninstall")}
-        confirmAriaLabel={confirmAriaLabel}
-        confirmTestId="plugin-uninstall-confirm"
-        onCancel={onCancel}
-        onClose={() => onOpenChange(false)}
-        onConfirm={onConfirm}
-      />
-    );
-  }
-
-  return (
+  const fallback = !isFinePointer ? (
+    <InlineConfirmActions
+      density="touch"
+      testId="plugin-uninstall-inline-confirmation"
+      ariaLabel={t("plugins:uninstallPlugin")}
+      description={description}
+      cancelLabel={t("plugins:cancel")}
+      confirmLabel={confirmAriaLabel}
+      confirmAriaLabel={confirmAriaLabel}
+      confirmTestId="plugin-uninstall-confirm"
+      onCancel={onCancel}
+      onClose={() => onOpenChange(false)}
+      onConfirm={onConfirm}
+    />
+  ) : (
     <ActionConfirmPopover
       open={open}
       anchorRef={anchorRef}
       title={t("plugins:uninstallPlugin")}
       description={description}
       cancelLabel={t("plugins:cancel")}
-      confirmLabel={t("plugins:confirmUninstall")}
+      confirmLabel={confirmAriaLabel}
       confirmAriaLabel={confirmAriaLabel}
       confirmTestId="plugin-uninstall-confirm"
       testId="plugin-uninstall-confirm-popover"
@@ -75,4 +71,20 @@ export function PluginUninstallConfirmation({
       onConfirm={onConfirm}
     />
   );
+  return (
+    <MobileActionConfirmation
+      open={open}
+      targetKey={target.id}
+      title={t("plugins:uninstallPlugin")}
+      description={description}
+      cancelLabel={t("plugins:cancel")}
+      confirmLabel={confirmAriaLabel}
+      confirmAriaLabel={confirmAriaLabel}
+      confirmTestId="plugin-uninstall-confirm"
+      onOpenChange={onOpenChange}
+      onConfirm={onConfirm}
+      focusReturnRef={anchorRef}
+      fallback={fallback}
+    />
+  );
 }
diff --git a/apps/web/components/settings/prompt-delete-confirmation.tsx b/apps/web/components/settings/prompt-delete-confirmation.tsx
index 921891ea0a..4649005557 100644
--- a/apps/web/components/settings/prompt-delete-confirmation.tsx
+++ b/apps/web/components/settings/prompt-delete-confirmation.tsx
@@ -5,8 +5,10 @@ import { Trans, useTranslation } from "react-i18next";
 
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
 
 type PromptDeleteConfirmationProps = {
+  promptId: string;
   promptName: string;
   open: boolean;
   isFinePointer: boolean;
@@ -28,6 +30,7 @@ function PromptDeleteDescription({ promptName }: { promptName: string }) {
 }
 
 export function PromptDeleteConfirmation({
+  promptId,
   promptName,
   open,
   isFinePointer,
@@ -53,26 +56,22 @@ export function PromptDeleteConfirmation({
     anchorRef.current?.focus();
   }, [anchorRef, isFinePointer, open]);
 
-  if (!isFinePointer) {
-    return open ? (
-      <InlineConfirmActions
-        density="touch"
-        testId="prompt-delete-inline-confirmation"
-        ariaLabel={promptDeleteLabel}
-        description={description}
-        cancelLabel={cancelLabel}
-        confirmLabel={promptDeleteLabel}
-        confirmAriaLabel={promptDeleteLabel}
-        confirmTestId="prompt-delete-confirm"
-        confirmDisabled={isBusy}
-        onCancel={handleCancel}
-        onClose={onClose}
-        onConfirm={onConfirm}
-      />
-    ) : null;
-  }
-
-  return (
+  const fallback = !isFinePointer ? (
+    <InlineConfirmActions
+      density="touch"
+      testId="prompt-delete-inline-confirmation"
+      ariaLabel={promptDeleteLabel}
+      description={description}
+      cancelLabel={cancelLabel}
+      confirmLabel={promptDeleteLabel}
+      confirmAriaLabel={promptDeleteLabel}
+      confirmTestId="prompt-delete-confirm"
+      confirmDisabled={isBusy}
+      onCancel={handleCancel}
+      onClose={onClose}
+      onConfirm={onConfirm}
+    />
+  ) : (
     <ActionConfirmPopover
       open={open}
       anchorRef={anchorRef}
@@ -91,4 +90,26 @@ export function PromptDeleteConfirmation({
       onConfirm={onConfirm}
     />
   );
+  return (
+    <MobileActionConfirmation
+      open={open}
+      targetKey={promptId}
+      title={promptDeleteLabel}
+      subject={`@${promptName}`}
+      description={description}
+      cancelLabel={cancelLabel}
+      confirmLabel={promptDeleteLabel}
+      confirmAriaLabel={promptDeleteLabel}
+      confirmTestId="prompt-delete-confirm"
+      confirmDisabled={isBusy}
+      focusReturnRef={anchorRef}
+      onOpenChange={(nextOpen) => {
+        if (!nextOpen) onClose();
+      }}
+      onCancel={onCancel}
+      onClose={onClose}
+      onConfirm={onConfirm}
+      fallback={fallback}
+    />
+  );
 }
diff --git a/apps/web/components/settings/prompt-row-actions.tsx b/apps/web/components/settings/prompt-row-actions.tsx
index e1eaf31969..bab7997674 100644
--- a/apps/web/components/settings/prompt-row-actions.tsx
+++ b/apps/web/components/settings/prompt-row-actions.tsx
@@ -5,7 +5,7 @@ import { useTranslation } from "react-i18next";
 import { IconEdit, IconTrash } from "@tabler/icons-react";
 import { Button } from "@kandev/ui/button";
 
-import { PromptDeleteConfirmation } from "@/components/settings/prompt-delete-confirmation";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import type { CustomPrompt } from "@/lib/types/http";
 
 type PromptRowActionsProps = {
@@ -13,9 +13,6 @@ type PromptRowActionsProps = {
   deleteAnchorRef: RefObject<HTMLButtonElement | null>;
   onStartEditing: (prompt: CustomPrompt) => void;
   onOpenDelete: (prompt: CustomPrompt) => void;
-  onDeleteClose: () => void;
-  onDeleteCancel: () => void;
-  onDeleteConfirm: () => void;
   isBusy: boolean;
   showCreate: boolean;
   isFinePointer: boolean;
@@ -27,18 +24,16 @@ export function PromptRowActions({
   deleteAnchorRef,
   onStartEditing,
   onOpenDelete,
-  onDeleteClose,
-  onDeleteCancel,
-  onDeleteConfirm,
   isBusy,
   showCreate,
   isFinePointer,
   isDeleteTarget,
 }: PromptRowActionsProps) {
   const { t } = useTranslation();
+  const { isMobile } = useResponsiveBreakpoint();
   return (
     <div className="flex items-center gap-2">
-      {isFinePointer || !isDeleteTarget ? (
+      {isMobile || isFinePointer || !isDeleteTarget ? (
         <>
           <Button
             variant="ghost"
@@ -65,18 +60,6 @@ export function PromptRowActions({
           </Button>
         </>
       ) : null}
-      {isFinePointer ? (
-        <PromptDeleteConfirmation
-          promptName={prompt.name}
-          open={isDeleteTarget}
-          isFinePointer={isFinePointer}
-          anchorRef={deleteAnchorRef}
-          isBusy={isBusy}
-          onClose={onDeleteClose}
-          onCancel={onDeleteCancel}
-          onConfirm={onDeleteConfirm}
-        />
-      ) : null}
     </div>
   );
 }
diff --git a/apps/web/components/settings/prompts-settings.test.tsx b/apps/web/components/settings/prompts-settings.test.tsx
index 28da4c071e..1662e0351f 100644
--- a/apps/web/components/settings/prompts-settings.test.tsx
+++ b/apps/web/components/settings/prompts-settings.test.tsx
@@ -13,6 +13,7 @@ const mocks = vi.hoisted(() => ({
   toast: vi.fn(),
   prompts: [] as CustomPrompt[],
   finePointer: true,
+  isMobile: false,
   promptEditor: vi.fn(),
 }));
 
@@ -26,7 +27,7 @@ vi.mock("@/components/state-provider", () => ({
 }));
 
 vi.mock("@/hooks/use-responsive-breakpoint", () => ({
-  useResponsiveBreakpoint: () => ({ isFinePointer: mocks.finePointer }),
+  useResponsiveBreakpoint: () => ({ isFinePointer: mocks.finePointer, isMobile: mocks.isMobile }),
 }));
 
 vi.mock("@/components/toast-provider", () => ({
@@ -69,6 +70,7 @@ beforeEach(() => {
   vi.clearAllMocks();
   mocks.prompts = [];
   mocks.finePointer = true;
+  mocks.isMobile = false;
   mocks.setPrompts.mockImplementation((next: CustomPrompt[]) => {
     mocks.prompts = next;
   });
@@ -101,6 +103,29 @@ function renderPromptSettings() {
 }
 
 describe("PromptsSettings deletion confirmation", () => {
+  it("keeps the phone editor draft and delete trigger behind a confirmation sheet", async () => {
+    mocks.isMobile = true;
+    mocks.finePointer = false;
+    renderPromptSettings();
+    const row = screen.getByTestId(promptRowTestId);
+    fireEvent.click(within(row).getByTestId("prompt-edit-button"));
+    const editor = within(row).getByTestId(promptContentInputTestId) as HTMLTextAreaElement;
+    fireEvent.change(editor, { target: { value: "Keep the mobile draft" } });
+    const trigger = within(row).getByTestId(promptDeleteButtonTestId);
+    fireEvent.click(trigger);
+    const sheet = screen.getByRole("dialog", { name: "Delete prompt" });
+    expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+    expect(trigger.isConnected).toBe(true);
+    fireEvent.click(within(sheet).getByRole("button", { name: "Cancel" }));
+    await waitFor(() => expect(document.activeElement).toBe(trigger));
+    expect(editor.value).toBe("Keep the mobile draft");
+    expect(mocks.deletePrompt).not.toHaveBeenCalled();
+    fireEvent.click(trigger);
+    fireEvent.click(screen.getByTestId(promptDeleteConfirmTestId));
+    await waitFor(() =>
+      expect(mocks.deletePrompt).toHaveBeenCalledExactlyOnceWith(promptId, { cache: "no-store" }),
+    );
+  });
   it("cancels an anchored delete without losing the prompt editor draft", async () => {
     renderPromptSettings();
 
diff --git a/apps/web/components/settings/prompts-settings.tsx b/apps/web/components/settings/prompts-settings.tsx
index d45da5ef6f..e30db94ab5 100644
--- a/apps/web/components/settings/prompts-settings.tsx
+++ b/apps/web/components/settings/prompts-settings.tsx
@@ -158,27 +158,23 @@ function PromptListItem({
           deleteAnchorRef={deleteAnchorRef}
           onStartEditing={onStartEditing}
           onOpenDelete={onOpenDelete}
-          onDeleteClose={onDeleteCancel}
-          onDeleteCancel={onDeleteCancel}
-          onDeleteConfirm={onDeleteConfirm}
           isBusy={isBusy}
           showCreate={showCreate}
           isFinePointer={isFinePointer}
           isDeleteTarget={isDeleteTarget}
         />
       </div>
-      {!isFinePointer ? (
-        <PromptDeleteConfirmation
-          promptName={prompt.name}
-          open={isDeleteTarget}
-          isFinePointer={isFinePointer}
-          anchorRef={deleteAnchorRef}
-          isBusy={isBusy}
-          onClose={onDeleteCancel}
-          onCancel={onDeleteCancel}
-          onConfirm={onDeleteConfirm}
-        />
-      ) : null}
+      <PromptDeleteConfirmation
+        promptId={prompt.id}
+        promptName={prompt.name}
+        open={isDeleteTarget}
+        isFinePointer={isFinePointer}
+        anchorRef={deleteAnchorRef}
+        isBusy={isBusy}
+        onClose={onDeleteCancel}
+        onCancel={onDeleteCancel}
+        onConfirm={onDeleteConfirm}
+      />
       {isEditing ? (
         <div className="space-y-3">
           <Input
diff --git a/apps/web/components/settings/secrets-delete-dialog.tsx b/apps/web/components/settings/secrets-delete-dialog.tsx
index c5909c6bd4..422e8dbc61 100644
--- a/apps/web/components/settings/secrets-delete-dialog.tsx
+++ b/apps/web/components/settings/secrets-delete-dialog.tsx
@@ -16,6 +16,7 @@ import {
 } from "@kandev/ui/alert-dialog";
 
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
 import type { SecretListItem, SecretReference } from "@/lib/types/http-secrets";
 import { settingsActionClassName } from "./settings-control";
 import { secretReferenceLabel } from "./secret-delete-error";
@@ -42,31 +43,41 @@ export function SecretDeleteConfirmation({
 }: SecretDeleteConfirmationProps) {
   const { t } = useTranslation();
 
+  const description = loading ? (
+    t("settings:checkingSecretReferences")
+  ) : (
+    <Trans i18nKey="settings:thisWillPermanentlyRemoveSecret" values={{ name: secret.name }}>
+      This will permanently remove{" "}
+      <span className="font-medium text-foreground">{secret.name}</span>. This action cannot be
+      undone.
+    </Trans>
+  );
+  const actions = {
+    open,
+    description,
+    cancelLabel: t("settings:cancel"),
+    confirmLabel: t("settings:deleteSecret"),
+    confirmAriaLabel: t("settings:deleteSecretNamed", { name: secret.name }),
+    confirmTestId: "secret-delete-confirm",
+    confirmDisabled: loading,
+    onOpenChange,
+    onConfirm,
+  };
   return (
-    <ActionConfirmPopover
-      open={open}
-      anchorRef={anchorRef}
-      title={t("settings:deleteSecret")}
-      description={
-        loading ? (
-          t("settings:checkingSecretReferences")
-        ) : (
-          <Trans i18nKey="settings:thisWillPermanentlyRemoveSecret" values={{ name: secret.name }}>
-            This will permanently remove{" "}
-            <span className="font-medium text-foreground">{secret.name}</span>. This action cannot
-            be undone.
-          </Trans>
-        )
+    <MobileActionConfirmation
+      {...actions}
+      targetKey={secret.id}
+      title={t("settings:deleteSecretNamed", { name: secret.name })}
+      focusReturnRef={anchorRef}
+      fallback={
+        <ActionConfirmPopover
+          {...actions}
+          anchorRef={anchorRef}
+          title={t("settings:deleteSecret")}
+          testId="secret-delete-confirm-popover"
+          onCancel={onCancel}
+        />
       }
-      cancelLabel={t("settings:cancel")}
-      confirmLabel={t("settings:deleteSecret")}
-      confirmAriaLabel={t("settings:deleteSecretNamed", { name: secret.name })}
-      confirmTestId="secret-delete-confirm"
-      confirmDisabled={loading}
-      testId="secret-delete-confirm-popover"
-      onOpenChange={onOpenChange}
-      onCancel={onCancel}
-      onConfirm={onConfirm}
     />
   );
 }
diff --git a/apps/web/components/settings/secrets-list-item-row.test.tsx b/apps/web/components/settings/secrets-list-item-row.test.tsx
index 754dcea4aa..48e2cec87f 100644
--- a/apps/web/components/settings/secrets-list-item-row.test.tsx
+++ b/apps/web/components/settings/secrets-list-item-row.test.tsx
@@ -4,9 +4,10 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import type { SecretListItem } from "@/lib/types/http-secrets";
 
 let finePointer = true;
+let isMobile = false;
 
 vi.mock("@/hooks/use-responsive-breakpoint", () => ({
-  useResponsiveBreakpoint: () => ({ isFinePointer: finePointer }),
+  useResponsiveBreakpoint: () => ({ isFinePointer: finePointer, isMobile }),
 }));
 
 import { SecretListItemRow } from "./secrets-list-item-row";
@@ -47,6 +48,7 @@ function renderRow(overrides: Partial<Parameters<typeof SecretListItemRow>[0]> =
 
 afterEach(() => {
   finePointer = true;
+  isMobile = false;
   cleanup();
 });
 
@@ -61,6 +63,18 @@ function copyMoveDisabled(): boolean {
 }
 
 describe("SecretListItemRow", () => {
+  it("uses a named phone sheet while keeping the original row controls mounted", async () => {
+    isMobile = true;
+    finePointer = false;
+    const { onDeleteCancel } = renderRow({ isDeleteConfirming: true });
+    const sheet = screen.getByRole("dialog", { name: "Delete secret API Key" });
+    expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+    expect(screen.getByRole("button", { name: COPY_MOVE_BUTTON, hidden: true }).isConnected).toBe(
+      true,
+    );
+    fireEvent.click(within(sheet).getByRole("button", { name: "Cancel" }));
+    expect(onDeleteCancel).toHaveBeenCalledTimes(1);
+  });
   it("keeps delete trigger target-aware and touch-sized", () => {
     const { onDelete } = renderRow();
     const deleteButton = screen.getByRole("button", { name: DELETE_BUTTON });
diff --git a/apps/web/components/settings/secrets-list-item-row.tsx b/apps/web/components/settings/secrets-list-item-row.tsx
index 08c42b47bb..b53eb2958e 100644
--- a/apps/web/components/settings/secrets-list-item-row.tsx
+++ b/apps/web/components/settings/secrets-list-item-row.tsx
@@ -10,6 +10,7 @@ import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import { revealSecret } from "@/lib/api/domains/secrets-api";
 import type { SecretListItem } from "@/lib/types/http-secrets";
 import { SecretDeleteConfirmation } from "./secrets-delete-dialog";
+import { useConfirmationBoundary } from "@/components/confirmation/mobile-action-confirmation";
 
 type SecretListItemRowProps = {
   secret: SecretListItem;
@@ -77,7 +78,10 @@ export function SecretListItemRow({
   isDeleteBlocked = false,
 }: SecretListItemRowProps) {
   const { t } = useTranslation();
-  const { isFinePointer } = useResponsiveBreakpoint();
+  const { isFinePointer, isMobile } = useResponsiveBreakpoint();
+  useConfirmationBoundary(isDeleteConfirming, `${workspaceId}:${secret.id}`, () =>
+    onDeleteCancel(),
+  );
   const [revealed, setRevealed] = useState(false);
   const [revealedValue, setRevealedValue] = useState<string | null>(null);
   const [revealing, setRevealing] = useState(false);
@@ -134,7 +138,7 @@ export function SecretListItemRow({
           isDeleteConfirming={isDeleteConfirming}
           isDeleteLoading={isDeleteLoading}
           isDeleteBlocked={isDeleteBlocked}
-          isFinePointer={isFinePointer}
+          isFinePointer={isMobile || isFinePointer}
           revealed={revealed}
           revealing={revealing}
           deleteAnchorRef={deleteAnchorRef}
diff --git a/apps/web/components/settings/system/users-table.test.tsx b/apps/web/components/settings/system/users-table.test.tsx
index 10fa75a08a..1382935d32 100644
--- a/apps/web/components/settings/system/users-table.test.tsx
+++ b/apps/web/components/settings/system/users-table.test.tsx
@@ -107,7 +107,7 @@ describe("UsersTable confirmation presentation", () => {
     expect(screen.queryByTestId(POPOVER_TEST_ID)).toBeNull();
   });
 
-  it("morphs a phone row action into visible touch-sized status confirmation", async () => {
+  it("opens a phone status change in a named sheet", async () => {
     mocks.responsive.isFinePointer = false;
     mocks.responsive.isMobile = true;
     await renderUsersTable();
@@ -117,7 +117,8 @@ describe("UsersTable confirmation presentation", () => {
     expect(within(row).getByTestId("users-table-email").textContent).toContain(TARGET.email);
     fireEvent.click(within(row).getByTestId(STATUS_TOGGLE_TEST_ID));
 
-    const confirmation = await screen.findByTestId("users-table-inline-confirmation");
+    const confirmation = await screen.findByRole("dialog");
+    expect(confirmation.getAttribute("data-slot")).toBe("drawer-content");
     expect(confirmation.textContent).toContain(
       `Disable ${TARGET_EMAIL}? They will be signed out everywhere.`,
     );
@@ -149,7 +150,7 @@ describe("UsersTable confirmation presentation", () => {
     expect(screen.queryByTestId("users-table")).toBeNull();
 
     fireEvent.click(within(targetRow()).getByTestId(ROLE_TOGGLE_TEST_ID));
-    expect(await screen.findByTestId(POPOVER_TEST_ID)).toBeTruthy();
+    expect((await screen.findByRole("dialog")).getAttribute("data-slot")).toBe("drawer-content");
   });
 });
 
diff --git a/apps/web/components/settings/system/users-table.tsx b/apps/web/components/settings/system/users-table.tsx
index ad3c0b2420..3a2967f111 100644
--- a/apps/web/components/settings/system/users-table.tsx
+++ b/apps/web/components/settings/system/users-table.tsx
@@ -11,6 +11,10 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@
 import { IconMailForward, IconUserPlus, IconUsers } from "@tabler/icons-react";
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import {
+  MobileActionConfirmation,
+  useConfirmationBoundary,
+} from "@/components/confirmation/mobile-action-confirmation";
 import { useToast } from "@/components/toast-provider";
 import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import { ApiError } from "@/lib/api/client";
@@ -171,8 +175,10 @@ function UserActionRegion({
   const statusAnchorRef = useRef<HTMLButtonElement>(null);
   const action = pending?.user.id === user.id ? pending : null;
   const anchorRef = action?.next.role !== undefined ? roleAnchorRef : statusAnchorRef;
+  const targetKey = `${user.id}:${JSON.stringify(action?.next)}`;
+  const { isMobile } = useConfirmationBoundary(!!action, targetKey, () => onCancel());
 
-  if (!isFinePointer && action) {
+  if (!isMobile && !isFinePointer && action) {
     return (
       <InlineConfirmActions
         density="touch"
@@ -195,14 +201,14 @@ function UserActionRegion({
       <UserActionButtons
         user={user}
         isLastActiveAdmin={isLastActiveAdmin}
-        isFinePointer={isFinePointer}
+        isFinePointer={!isMobile && isFinePointer}
         roleAnchorRef={roleAnchorRef}
         statusAnchorRef={statusAnchorRef}
         onToggleRole={onToggleRole}
         onToggleStatus={onToggleStatus}
         isMutating={isMutating}
       />
-      {isFinePointer && action ? (
+      {(isMobile || isFinePointer) && action ? (
         <UserConfirmPopover
           action={action}
           anchorRef={anchorRef}
@@ -285,19 +291,32 @@ function UserConfirmPopover({
   onConfirm: (action: PendingAction) => void;
 }) {
   const { t } = useTranslation();
+  const actions = {
+    title: action.label,
+    description: t("system:usersTakesEffectImmediately", { email: action.user.email }),
+    cancelLabel: t("common:cancel"),
+    confirmLabel: t("system:usersConfirm"),
+    confirmAriaLabel: action.label,
+    confirmTestId: "users-table-confirm",
+    onOpenChange: (open: boolean) => {
+      if (!open) onCancel();
+    },
+    onConfirm: () => onConfirm(action),
+  };
   return (
-    <ActionConfirmPopover
+    <MobileActionConfirmation
+      {...actions}
       open
-      anchorRef={anchorRef}
-      title={action.label}
-      description={t("system:usersTakesEffectImmediately", { email: action.user.email })}
-      cancelLabel={t("common:cancel")}
-      confirmLabel={t("system:usersConfirm")}
-      confirmAriaLabel={action.label}
-      confirmTestId="users-table-confirm"
-      testId="users-table-confirm-popover"
-      onOpenChange={(open) => !open && onCancel()}
-      onConfirm={() => onConfirm(action)}
+      targetKey={`${action.user.id}:${JSON.stringify(action.next)}`}
+      focusReturnRef={anchorRef}
+      fallback={
+        <ActionConfirmPopover
+          {...actions}
+          open
+          anchorRef={anchorRef}
+          testId="users-table-confirm-popover"
+        />
+      }
     />
   );
 }
diff --git a/apps/web/components/settings/workflow-sync-dialog.test.tsx b/apps/web/components/settings/workflow-sync-dialog.test.tsx
index 28fd3abe6f..47507b1dc9 100644
--- a/apps/web/components/settings/workflow-sync-dialog.test.tsx
+++ b/apps/web/components/settings/workflow-sync-dialog.test.tsx
@@ -1,4 +1,4 @@
-import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { cleanup, fireEvent, render, screen, waitFor, act } from "@testing-library/react";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type {
   WorkflowSyncController,
@@ -7,7 +7,10 @@ import type {
 import type { WorkflowSyncConfig } from "@/lib/types/workflow-sync";
 import { WorkflowSyncDialog } from "./workflow-sync-dialog";
 
-afterEach(cleanup);
+afterEach(() => {
+  cleanup();
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
+});
 
 const WORKFLOWS_DIR = ".kandev/workflows";
 const REMOVE_TEST_ID = "workflow-sync-remove";
@@ -77,7 +80,82 @@ function controller(overrides: Partial<WorkflowSyncController> = {}): WorkflowSy
   };
 }
 
-describe("WorkflowSyncDialog removal confirmation", () => {
+describe("WorkflowSyncDialog phone removal confirmation", () => {
+  it("does not dismiss a replacement dialog when an unmounted removal completes", async () => {
+    Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+    let finish!: (result: boolean) => void;
+    const sync = controller({
+      handleDelete: vi.fn(
+        () =>
+          new Promise<boolean>((resolve) => {
+            finish = resolve;
+          }),
+      ),
+    });
+    const onOpenChange = vi.fn();
+    const { rerender } = render(
+      <WorkflowSyncDialog key="original" open onOpenChange={onOpenChange} sync={sync} />,
+    );
+    fireEvent.click(screen.getByTestId(REMOVE_TEST_ID));
+    fireEvent.click(screen.getByTestId(REMOVE_CONFIRM_TEST_ID));
+    await waitFor(() => expect(sync.handleDelete).toHaveBeenCalledTimes(1));
+    rerender(
+      <WorkflowSyncDialog key="replacement" open onOpenChange={onOpenChange} sync={controller()} />,
+    );
+    await act(async () => finish(true));
+    expect(onOpenChange).not.toHaveBeenCalled();
+    expect(screen.getByTestId(REMOVE_TEST_ID)).toBeTruthy();
+  });
+
+  it("uses one phone dialog, preserves its draft, and retries a failed removal", async () => {
+    Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+    let finish!: (result: boolean) => void;
+    const sync = controller({
+      handleDelete: vi
+        .fn()
+        .mockImplementationOnce(
+          () =>
+            new Promise<boolean>((resolve) => {
+              finish = resolve;
+            }),
+        )
+        .mockResolvedValue(true),
+    });
+    const onOpenChange = vi.fn();
+    render(<WorkflowSyncDialog open onOpenChange={onOpenChange} sync={sync} />);
+    const dialog = screen.getByTestId("workflow-sync-dialog");
+    const originalId = dialog.id;
+    const input = screen.getByTestId("workflow-sync-branch-input");
+    const trigger = screen.getByTestId(REMOVE_TEST_ID);
+    fireEvent.click(trigger);
+    expect(screen.getByRole("button", { name: "Back" })).toBeTruthy();
+    expect(screen.getAllByRole("dialog")).toHaveLength(1);
+    expect(dialog.id).toBe(originalId);
+    expect(input.closest("[inert]")).toBeTruthy();
+    fireEvent.click(screen.getByRole("button", { name: "Back" }));
+    await waitFor(() => expect(document.activeElement).toBe(trigger));
+    expect(screen.getByTestId("workflow-sync-branch-input")).toBe(input);
+    expect(sync.handleDelete).not.toHaveBeenCalled();
+    fireEvent.click(trigger);
+    const confirm = screen.getByTestId(REMOVE_CONFIRM_TEST_ID);
+    fireEvent.click(confirm);
+    fireEvent.click(confirm);
+    await waitFor(() => expect(sync.handleDelete).toHaveBeenCalledTimes(1));
+    expect((confirm as HTMLButtonElement).disabled).toBe(true);
+    await act(async () => finish(false));
+    await waitFor(() =>
+      expect((screen.getByTestId(REMOVE_CONFIRM_TEST_ID) as HTMLButtonElement).disabled).toBe(
+        false,
+      ),
+    );
+    expect(onOpenChange).not.toHaveBeenCalled();
+    fireEvent.click(screen.getByTestId(REMOVE_CONFIRM_TEST_ID));
+    await waitFor(() => expect(sync.handleDelete).toHaveBeenCalledTimes(2));
+    expect(onOpenChange).toHaveBeenCalledWith(false);
+  });
+});
+
+describe("WorkflowSyncDialog wider removal confirmation", () => {
   it("keeps removal inline in the existing dialog without a second overlay", () => {
     const sync = controller();
     render(<WorkflowSyncDialog open onOpenChange={vi.fn()} sync={sync} />);
diff --git a/apps/web/components/settings/workflow-sync-dialog.tsx b/apps/web/components/settings/workflow-sync-dialog.tsx
index 088c64e429..61c1c43f02 100644
--- a/apps/web/components/settings/workflow-sync-dialog.tsx
+++ b/apps/web/components/settings/workflow-sync-dialog.tsx
@@ -1,6 +1,13 @@
 "use client";
 
-import { useEffect, useState, type Dispatch, type SetStateAction } from "react";
+import {
+  useEffect,
+  useLayoutEffect,
+  useRef,
+  useState,
+  type Dispatch,
+  type SetStateAction,
+} from "react";
 import { useTranslation } from "react-i18next";
 import {
   Dialog,
@@ -22,6 +29,12 @@ import type {
 import type { WorkflowSyncProvider } from "@/lib/types/workflow-sync";
 import { RemoteRepoProviderTabs } from "@/components/task-create-dialog-remote-repo-provider-tabs";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
+import {
+  MobileConfirmationHost,
+  MobileConfirmationHostBody,
+} from "@/components/confirmation/mobile-confirmation-host";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import type { RemoteRepositoryProvider } from "@/hooks/domains/integrations/use-remote-repositories";
 
 const WORKFLOW_EXPORT_FORMAT = "kandev_workflow";
@@ -230,6 +243,8 @@ function isSaveDisabled(sync: WorkflowSyncController, intervalInvalid: boolean):
 }
 
 type WorkflowSyncRemovalActionsProps = {
+  targetKey: string;
+  subject: string;
   hasConfig: boolean;
   confirming: boolean;
   saving: boolean;
@@ -239,6 +254,8 @@ type WorkflowSyncRemovalActionsProps = {
 };
 
 function WorkflowSyncRemovalActions({
+  targetKey,
+  subject,
   hasConfig,
   confirming,
   saving,
@@ -247,37 +264,61 @@ function WorkflowSyncRemovalActions({
   onConfirm,
 }: WorkflowSyncRemovalActionsProps) {
   const { t } = useTranslation();
+  const { isMobile } = useResponsiveBreakpoint();
+  const anchorRef = useRef<HTMLButtonElement>(null);
   if (!hasConfig) return null;
 
   const removeLabel = t("workflows:remove");
-  if (confirming) {
-    return (
-      <InlineConfirmActions
-        density="touch"
-        testId={REMOVE_CONFIRMATION_TEST_ID}
-        ariaLabel={removeLabel}
+  const fallback = (
+    <InlineConfirmActions
+      density="touch"
+      testId={REMOVE_CONFIRMATION_TEST_ID}
+      ariaLabel={removeLabel}
+      description={t("workflows:removeSyncConfirm")}
+      cancelLabel={t("common:cancel")}
+      confirmLabel={removeLabel}
+      confirmAriaLabel={removeLabel}
+      confirmTestId={REMOVE_CONFIRM_TEST_ID}
+      onCancel={onCancel}
+      onConfirm={onConfirm}
+    />
+  );
+
+  return (
+    <>
+      {(isMobile || !confirming) && (
+        <Button
+          ref={anchorRef}
+          type="button"
+          variant="destructive"
+          onClick={onRequest}
+          disabled={saving}
+          className="sm:mr-auto cursor-pointer"
+          data-testid={REMOVE_TEST_ID}
+        >
+          {removeLabel}
+        </Button>
+      )}
+      <MobileActionConfirmation
+        open={confirming}
+        targetKey={targetKey}
+        title={removeLabel}
+        subject={subject}
         description={t("workflows:removeSyncConfirm")}
         cancelLabel={t("common:cancel")}
         confirmLabel={removeLabel}
         confirmAriaLabel={removeLabel}
         confirmTestId={REMOVE_CONFIRM_TEST_ID}
-        onCancel={onCancel}
+        testId={REMOVE_CONFIRMATION_TEST_ID}
+        onOpenChange={(open) => {
+          if (!open) onCancel();
+        }}
         onConfirm={onConfirm}
+        completionPolicy="await-with-retry"
+        focusReturnRef={anchorRef}
+        fallback={fallback}
       />
-    );
-  }
-
-  return (
-    <Button
-      type="button"
-      variant="destructive"
-      onClick={onRequest}
-      disabled={saving}
-      className="sm:mr-auto cursor-pointer"
-      data-testid={REMOVE_TEST_ID}
-    >
-      {removeLabel}
-    </Button>
+    </>
   );
 }
 
@@ -316,6 +357,36 @@ type WorkflowSyncDialogProps = {
   sync: WorkflowSyncController;
 };
 
+function WorkflowSyncFields({ sync }: { sync: WorkflowSyncController }) {
+  const { t } = useTranslation();
+  const switchingProvider = sync.config && sync.config.provider !== sync.form.provider;
+  return (
+    <div className="space-y-4">
+      <ProviderField provider={sync.form.provider} onChange={sync.setProvider} />
+      {switchingProvider && (
+        <p className="text-xs text-destructive" data-testid="workflow-sync-provider-switch-warning">
+          {t("workflows:switchProviderWarning")}
+        </p>
+      )}
+      <RepoUrlField
+        provider={sync.form.provider}
+        url={sync.url}
+        invalid={sync.urlInvalid}
+        resolved={resolvedTarget(t, sync.form)}
+        onChange={sync.setUrlInput}
+      />
+      <BranchDirectoryFields form={sync.form} update={sync.update} />
+      <PollFields form={sync.form} update={sync.update} />
+      <p className="text-xs text-muted-foreground">
+        {t("workflows:syncDirectoryHelp", {
+          format: WORKFLOW_EXPORT_FORMAT,
+          extensions: WORKFLOW_EXPORT_EXTENSIONS,
+        })}
+      </p>
+    </div>
+  );
+}
+
 // WorkflowSyncDialog holds the workflow sync configuration form. It closes
 // itself after a successful save or removal; failures keep it open with the
 // error surfaced via toast.
@@ -323,12 +394,18 @@ export function WorkflowSyncDialog({ open, onOpenChange, sync }: WorkflowSyncDia
   const { t } = useTranslation();
   const [removeConfirming, setRemoveConfirming] = useState(false);
   const hasConfig = !!sync.config;
-  const switchingProvider = hasConfig && sync.config?.provider !== sync.form.provider;
   const intervalInvalid =
     sync.form.poll_enabled &&
     (!Number.isInteger(sync.form.interval_seconds) || sync.form.interval_seconds < 60);
   const disableSave = isSaveDisabled(sync, intervalInvalid);
-  const resolved = resolvedTarget(t, sync.form);
+  const targetKey = workflowSyncConfirmationTarget(sync);
+  const generation = useRef(0);
+  useLayoutEffect(() => {
+    generation.current += 1;
+    return () => {
+      generation.current += 1;
+    };
+  }, [open, targetKey]);
 
   useClearWorkflowSyncRemovalConfirmation(open, sync, setRemoveConfirming);
 
@@ -336,13 +413,14 @@ export function WorkflowSyncDialog({ open, onOpenChange, sync }: WorkflowSyncDia
     if (await sync.handleSave()) onOpenChange(false);
   };
   const handleRemove = async () => {
-    if (await sync.handleDelete()) {
+    const requestGeneration = generation.current;
+    const removed = await sync.handleDelete();
+    if (generation.current !== requestGeneration) return;
+    if (removed) {
       onOpenChange(false);
       return;
     }
-    // InlineConfirmActions restores its own shell when this callback rejects.
-    // Keep parent confirmation state mounted so the existing failure toast and
-    // retry path remain inside this dialog.
+    // The confirmation owns retry state; the controller owns failure feedback.
     return Promise.reject();
   };
   const handleDialogOpenChange = (nextOpen: boolean) => {
@@ -351,71 +429,72 @@ export function WorkflowSyncDialog({ open, onOpenChange, sync }: WorkflowSyncDia
   };
 
   return (
-    <Dialog open={open} onOpenChange={handleDialogOpenChange}>
-      <DialogContent
-        className="sm:max-w-lg"
-        data-testid="workflow-sync-dialog"
-        onEscapeKeyDown={(event) => {
-          if (!removeConfirming) return;
-          event.preventDefault();
-          setRemoveConfirming(false);
-        }}
-      >
-        <DialogHeader>
-          <DialogTitle>{t("workflows:syncTitle")}</DialogTitle>
-          <DialogDescription>{t("workflows:syncDescription")}</DialogDescription>
-        </DialogHeader>
-        <div className="space-y-4">
-          <ProviderField provider={sync.form.provider} onChange={sync.setProvider} />
-          {switchingProvider && (
-            <p
-              className="text-xs text-destructive"
-              data-testid="workflow-sync-provider-switch-warning"
-            >
-              {t("workflows:switchProviderWarning")}
-            </p>
-          )}
-          <RepoUrlField
-            provider={sync.form.provider}
-            url={sync.url}
-            invalid={sync.urlInvalid}
-            resolved={resolved}
-            onChange={sync.setUrlInput}
-          />
-          <BranchDirectoryFields form={sync.form} update={sync.update} />
-          <PollFields form={sync.form} update={sync.update} />
-          <p className="text-xs text-muted-foreground">
-            {t("workflows:syncDirectoryHelp", {
-              format: WORKFLOW_EXPORT_FORMAT,
-              extensions: WORKFLOW_EXPORT_EXTENSIONS,
-            })}
-          </p>
-        </div>
-        <DialogFooter>
-          <WorkflowSyncRemovalActions
-            hasConfig={hasConfig}
-            confirming={removeConfirming}
-            saving={sync.saving}
-            onRequest={() => setRemoveConfirming(true)}
-            onCancel={() => setRemoveConfirming(false)}
-            onConfirm={handleRemove}
-          />
-          <Button
-            type="button"
-            onClick={handleSave}
-            disabled={disableSave || removeConfirming}
-            className="cursor-pointer"
-            data-testid="workflow-sync-save"
-            data-dialog-default-action
+    <MobileConfirmationHost open={open}>
+      {({ active, contentProps }) => (
+        <Dialog open={open} onOpenChange={handleDialogOpenChange}>
+          <DialogContent
+            className="sm:max-w-lg max-h-[calc(100dvh-2rem)] flex flex-col overflow-hidden"
+            data-testid="workflow-sync-dialog"
+            enterConfirms={!removeConfirming}
+            showCloseButton={!active}
+            onEscapeKeyDown={(event) => {
+              if (!removeConfirming) return;
+              event.preventDefault();
+              setRemoveConfirming(false);
+            }}
+            {...contentProps}
           >
-            {saveLabel(t, sync.saving, hasConfig)}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
+            <MobileConfirmationHostBody>
+              <div className="min-h-0 flex-1 space-y-4 overflow-y-auto">
+                <DialogHeader>
+                  <DialogTitle>{t("workflows:syncTitle")}</DialogTitle>
+                  <DialogDescription>{t("workflows:syncDescription")}</DialogDescription>
+                </DialogHeader>
+                <WorkflowSyncFields sync={sync} />
+                <DialogFooter>
+                  <WorkflowSyncRemovalActions
+                    targetKey={targetKey}
+                    subject={resolvedTarget(t, sync.config ?? sync.form)}
+                    hasConfig={hasConfig}
+                    confirming={removeConfirming}
+                    saving={sync.saving}
+                    onRequest={() => setRemoveConfirming(true)}
+                    onCancel={() => setRemoveConfirming(false)}
+                    onConfirm={handleRemove}
+                  />
+                  <Button
+                    type="button"
+                    onClick={handleSave}
+                    disabled={disableSave || removeConfirming}
+                    className="cursor-pointer"
+                    data-testid="workflow-sync-save"
+                    data-dialog-default-action
+                  >
+                    {saveLabel(t, sync.saving, hasConfig)}
+                  </Button>
+                </DialogFooter>
+              </div>
+            </MobileConfirmationHostBody>
+          </DialogContent>
+        </Dialog>
+      )}
+    </MobileConfirmationHost>
   );
 }
 
+function workflowSyncConfirmationTarget(sync: WorkflowSyncController) {
+  const fields = (config: WorkflowSyncFormState | null) =>
+    config && [
+      config.provider,
+      config.repo_owner,
+      config.repo_name,
+      config.project_path,
+      config.branch,
+      config.path,
+    ];
+  return JSON.stringify([sync.config?.workspace_id, fields(sync.config), fields(sync.form)]);
+}
+
 function saveLabel(t: TFunction, saving: boolean, hasConfig: boolean): string {
   if (saving) return t("workflows:saving");
   return hasConfig ? t("workflows:update") : t("workflows:save");
diff --git a/apps/web/components/settings/workflow-sync-section.tsx b/apps/web/components/settings/workflow-sync-section.tsx
index e5cb9317ad..f54fcde83c 100644
--- a/apps/web/components/settings/workflow-sync-section.tsx
+++ b/apps/web/components/settings/workflow-sync-section.tsx
@@ -62,7 +62,12 @@ export function WorkflowSyncSection({
           <Separator />
         </div>
       )}
-      <WorkflowSyncDialog open={dialogOpen} onOpenChange={onDialogOpenChange} sync={sync} />
+      <WorkflowSyncDialog
+        key={workspaceId}
+        open={dialogOpen}
+        onOpenChange={onDialogOpenChange}
+        sync={sync}
+      />
     </>
   );
 }
diff --git a/apps/web/components/task/chat/chat-input-toolbar-mobile.tsx b/apps/web/components/task/chat/chat-input-toolbar-mobile.tsx
index 8e8920f28e..f3d10a6cd6 100644
--- a/apps/web/components/task/chat/chat-input-toolbar-mobile.tsx
+++ b/apps/web/components/task/chat/chat-input-toolbar-mobile.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { useState } from "react";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import { IconAt } from "@tabler/icons-react";
 import { Button } from "@kandev/ui/button";
 import { ModelSelector } from "@/components/task/model-selector";
@@ -195,7 +196,9 @@ function MobileLeftActions(props: MobileLeftActionsProps) {
 }
 
 export function MobileChatInputToolbar(props: MobileToolbarProps) {
-  const [resetConfirmationOpen, setResetConfirmationOpen] = useState(false);
+  const [resetRequested, setResetConfirmationOpen] = useState(false);
+  const { isMobile } = useResponsiveBreakpoint();
+  const resetConfirmationOpen = resetRequested && !isMobile;
   const presentation = props.presentation ?? "mobile";
 
   return (
diff --git a/apps/web/components/task/chat/chat-input-toolbar.test.tsx b/apps/web/components/task/chat/chat-input-toolbar.test.tsx
index 58f1ad14da..af65abe1b2 100644
--- a/apps/web/components/task/chat/chat-input-toolbar.test.tsx
+++ b/apps/web/components/task/chat/chat-input-toolbar.test.tsx
@@ -3,6 +3,8 @@ import { render, screen, fireEvent, act, cleanup } from "@testing-library/react"
 import { StateProvider } from "@/components/state-provider";
 import type { TaskSession } from "@/lib/types/http";
 
+const MODEL_SELECTOR_TEST_ID = "mock-model-selector";
+
 const responsiveMock = vi.hoisted(() => ({
   breakpoint: "desktop" as "mobile" | "tablet" | "compactDesktop" | "desktop",
 }));
@@ -97,8 +99,19 @@ vi.mock("./implement-plan-button", () => ({
 }));
 
 vi.mock("./reset-context-button", () => ({
-  ResetContextButton: ({ presentation = "desktop" }: { presentation?: "desktop" | "mobile" }) => (
-    <button type="button" data-testid="reset-context-button" data-reset-presentation={presentation}>
+  ResetContextButton: ({
+    presentation = "desktop",
+    onConfirmationOpenChange,
+  }: {
+    presentation?: "desktop" | "mobile";
+    onConfirmationOpenChange?: (open: boolean) => void;
+  }) => (
+    <button
+      type="button"
+      data-testid="reset-context-button"
+      data-reset-presentation={presentation}
+      onClick={() => onConfirmationOpenChange?.(true)}
+    >
       Reset context
     </button>
   ),
@@ -208,6 +221,16 @@ function makeRunningSession(cancellationPending: boolean): TaskSession {
   } as TaskSession;
 }
 
+it("keeps phone composer controls mounted while a reset sheet is open", () => {
+  responsiveMock.breakpoint = "mobile";
+  renderFullToolbar();
+  const model = screen.getByTestId(MODEL_SELECTOR_TEST_ID);
+  const submit = screen.getByTestId(SUBMIT_MESSAGE_BUTTON_TEST_ID);
+  fireEvent.click(screen.getByTestId("reset-context-button"));
+  expect(model.isConnected).toBe(true);
+  expect(submit.isConnected).toBe(true);
+});
+
 describe("ChatInputToolbar backend cancellation state", () => {
   it("renders backend-owned pending state after store hydration", () => {
     render(
@@ -477,9 +500,9 @@ describe("ChatInputToolbar responsive wrapper", () => {
     );
     expect(screen.getByTestId("toolbar-item-enhance")).toBeTruthy();
     expect(screen.getByTestId("mock-mode-selector").className).toContain("max-w-[46vw]");
-    expect(screen.getByTestId("mock-model-selector").className).toContain("max-w-[56vw]");
-    expect(screen.getByTestId("mock-model-selector").className).toContain("min-w-0");
-    expect(screen.getByTestId("mock-model-selector").className).toContain("overflow-hidden");
+    expect(screen.getByTestId(MODEL_SELECTOR_TEST_ID).className).toContain("max-w-[56vw]");
+    expect(screen.getByTestId(MODEL_SELECTOR_TEST_ID).className).toContain("min-w-0");
+    expect(screen.getByTestId(MODEL_SELECTOR_TEST_ID).className).toContain("overflow-hidden");
   });
 
   it("keeps the compact sessions control on tablet layouts", () => {
diff --git a/apps/web/components/task/chat/reset-context-button.test.tsx b/apps/web/components/task/chat/reset-context-button.test.tsx
index 5b5e156947..fce2bc0102 100644
--- a/apps/web/components/task/chat/reset-context-button.test.tsx
+++ b/apps/web/components/task/chat/reset-context-button.test.tsx
@@ -41,6 +41,7 @@ function renderResetButton(
 
 afterEach(() => {
   cleanup();
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
   vi.clearAllMocks();
 });
 
@@ -117,6 +118,25 @@ describe("ResetContextButton context-window invalidation", () => {
 });
 
 describe("ResetContextButton mobile presentation", () => {
+  it("does not leave a phone tooltip floating over a hosted confirmation", () => {
+    Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+    renderResetButton("mobile");
+    act(() => screen.getByTestId(RESET_CONTEXT_BUTTON_TEST_ID).focus());
+    expect(screen.queryByRole("tooltip")).toBeNull();
+  });
+  it("uses a phone sheet while keeping the reset trigger mounted", async () => {
+    Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+    renderResetButton("mobile");
+    const trigger = screen.getByTestId(RESET_CONTEXT_BUTTON_TEST_ID);
+    fireEvent.click(trigger);
+    const sheet = await screen.findByRole("dialog", { name: "Reset agent context?" });
+    expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+    expect(trigger.isConnected).toBe(true);
+    fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
+    await waitFor(() => expect(document.activeElement).toBe(trigger));
+    expect(mocks.request).not.toHaveBeenCalled();
+  });
+
   beforeEach(() => {
     mocks.request.mockResolvedValue({ success: true });
   });
diff --git a/apps/web/components/task/chat/reset-context-button.tsx b/apps/web/components/task/chat/reset-context-button.tsx
index 05daf24040..683be27c25 100644
--- a/apps/web/components/task/chat/reset-context-button.tsx
+++ b/apps/web/components/task/chat/reset-context-button.tsx
@@ -8,6 +8,8 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@kandev/ui/tooltip";
 import { useAppStore } from "@/components/state-provider";
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import { getWebSocketClient } from "@/lib/ws/connection";
 import { useTranslation } from "react-i18next";
 
@@ -32,8 +34,10 @@ function ResetContextTrigger({
   tooltip,
   onOpen,
 }: ResetContextTriggerProps) {
+  const { isMobile } = useResponsiveBreakpoint();
+  const [tooltipOpen, setTooltipOpen] = useState(false);
   return (
-    <Tooltip>
+    <Tooltip open={!isMobile && tooltipOpen} onOpenChange={setTooltipOpen}>
       <TooltipTrigger asChild>
         <Button
           ref={actionRef}
@@ -64,11 +68,11 @@ export function ResetContextButton({
   onConfirmationOpenChange,
 }: ResetContextButtonProps) {
   const { t } = useTranslation();
+  const { isMobile } = useResponsiveBreakpoint();
   const [confirmOpen, setConfirmOpen] = useState(false);
-  const [isResetting, setIsResetting] = useState(false);
+  const { isResetting, handleReset } = useContextResetRequest(sessionId);
   const actionRef = useRef<HTMLButtonElement>(null);
   const restoreFocusAfterCancelRef = useRef(false);
-  const clearContextWindow = useAppStore((state) => state.clearContextWindow);
   const resetContextLabel = t("task:resetContext");
   const resetContextAriaLabel = t("task:resetAgentContext");
   const resetContextTooltip = t("task:resetAgentContextClearsConversationHistory");
@@ -94,20 +98,6 @@ export function ResetContextButton({
     actionRef.current?.focus();
   }, [confirmOpen]);
 
-  const handleReset = useCallback(async () => {
-    setIsResetting(true);
-    try {
-      const client = getWebSocketClient();
-      if (!client) return;
-      await client.request("session.reset_context", { session_id: sessionId }, 30000);
-      clearContextWindow(sessionId);
-    } catch (error) {
-      console.error("Failed to reset agent context:", error);
-    } finally {
-      setIsResetting(false);
-    }
-  }, [clearContextWindow, sessionId]);
-
   const handleMobileCancel = () => {
     restoreFocusAfterCancelRef.current = true;
     updateConfirmationOpen(false);
@@ -123,42 +113,66 @@ export function ResetContextButton({
     />
   );
 
-  if (presentation === "mobile") {
-    return confirmOpen ? (
+  const confirmationProps = {
+    description: t("task:thisWillClearTheAgentS"),
+    cancelLabel: t("common:cancel"),
+    confirmLabel: resetContextLabel,
+    confirmAriaLabel: resetContextLabel,
+    confirmTestId: "reset-context-confirm",
+    onConfirm: handleReset,
+  };
+  const fallback =
+    presentation === "mobile" ? (
       <InlineConfirmActions
+        {...confirmationProps}
         density="touch"
         testId="reset-context-inline-confirm"
         ariaLabel={resetContextAriaLabel}
-        description={t("task:thisWillClearTheAgentS")}
-        cancelLabel={t("common:cancel")}
-        confirmLabel={resetContextLabel}
-        confirmAriaLabel={resetContextLabel}
-        confirmTestId="reset-context-confirm"
         onCancel={handleMobileCancel}
         onClose={() => updateConfirmationOpen(false)}
-        onConfirm={handleReset}
       />
     ) : (
-      resetContextTrigger
-    );
-  }
-
-  return (
-    <>
-      {resetContextTrigger}
       <ActionConfirmPopover
+        {...confirmationProps}
         open={confirmOpen}
         anchorRef={actionRef}
         title={resetContextAriaLabel}
-        description={t("task:thisWillClearTheAgentS")}
-        cancelLabel={t("common:cancel")}
-        confirmLabel={resetContextLabel}
-        confirmAriaLabel={resetContextLabel}
-        confirmTestId="reset-context-confirm"
         testId="reset-context-confirm-popover"
         onOpenChange={updateConfirmationOpen}
-        onConfirm={handleReset}
+      />
+    );
+
+  return (
+    <>
+      {isMobile || presentation !== "mobile" || !confirmOpen ? resetContextTrigger : null}
+      <MobileActionConfirmation
+        {...confirmationProps}
+        open={confirmOpen}
+        targetKey={sessionId}
+        title={resetContextAriaLabel}
+        focusReturnRef={actionRef}
+        onOpenChange={updateConfirmationOpen}
+        fallback={fallback}
       />
     </>
   );
 }
+
+function useContextResetRequest(sessionId: string) {
+  const [isResetting, setIsResetting] = useState(false);
+  const clearContextWindow = useAppStore((state) => state.clearContextWindow);
+  const handleReset = useCallback(async () => {
+    setIsResetting(true);
+    try {
+      const client = getWebSocketClient();
+      if (!client) return;
+      await client.request("session.reset_context", { session_id: sessionId }, 30000);
+      clearContextWindow(sessionId);
+    } catch (error) {
+      console.error("Failed to reset agent context:", error);
+    } finally {
+      setIsResetting(false);
+    }
+  }, [clearContextWindow, sessionId]);
+  return { isResetting, handleReset };
+}
diff --git a/apps/web/components/task/file-browser-parts.tsx b/apps/web/components/task/file-browser-parts.tsx
index d59b09e1c5..c09a02f14e 100644
--- a/apps/web/components/task/file-browser-parts.tsx
+++ b/apps/web/components/task/file-browser-parts.tsx
@@ -21,6 +21,7 @@ import { useTranslation } from "react-i18next";
 import { cn } from "@/lib/utils";
 import { FileIcon } from "@/components/ui/file-icon";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import type { FileTreeNode } from "@/lib/types/backend";
 import type { FileInfo } from "@/lib/state/store";
 import type { FileBrowserRow } from "./file-browser-hooks";
@@ -134,11 +135,13 @@ export function FileTreeNodeTouchActions({
 }) {
   const { t } = useTranslation();
   const deleteAction = useFileDeleteAction();
+  const { isMobile } = useResponsiveBreakpoint();
+  const deletePendingRef = React.useRef(false);
   if (!showTouchActions || (!onAddToChatContext && !deleteAction)) return null;
 
   const stopRowInteraction = (event: React.SyntheticEvent) => event.stopPropagation();
 
-  if (deleteAction?.confirming && !deleteAction.isBulk) {
+  if (deleteAction?.confirming && !deleteAction.isBulk && !isMobile) {
     return (
       <InlineConfirmActions
         density="touch"
@@ -159,6 +162,7 @@ export function FileTreeNodeTouchActions({
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
         <button
+          ref={deleteAction?.triggerRef}
           type="button"
           data-testid="file-tree-node-actions"
           data-path={node.path}
@@ -176,6 +180,12 @@ export function FileTreeNodeTouchActions({
         align="end"
         data-testid="file-tree-touch-menu"
         onClick={stopRowInteraction}
+        onCloseAutoFocus={(event) => {
+          if (!deletePendingRef.current) return;
+          event.preventDefault();
+          deletePendingRef.current = false;
+          deleteAction?.onDelete();
+        }}
       >
         {onAddToChatContext && (
           <DropdownMenuItem
@@ -191,7 +201,10 @@ export function FileTreeNodeTouchActions({
             data-testid="file-tree-touch-delete"
             variant="destructive"
             className="min-h-11 cursor-pointer"
-            onSelect={deleteAction.onDelete}
+            onSelect={() => {
+              if (isMobile && !deleteAction.isBulk) deletePendingRef.current = true;
+              else deleteAction.onDelete();
+            }}
           >
             <IconTrash className="h-3.5 w-3.5" />
             {deleteAction.isBulk
diff --git a/apps/web/components/task/file-browser-responsive.test.tsx b/apps/web/components/task/file-browser-responsive.test.tsx
index 844541555c..dcb5061fb1 100644
--- a/apps/web/components/task/file-browser-responsive.test.tsx
+++ b/apps/web/components/task/file-browser-responsive.test.tsx
@@ -4,6 +4,8 @@ import type * as FileBrowserParts from "./file-browser-parts";
 import { cleanup, render, screen } from "@testing-library/react";
 import { afterEach, describe, expect, it, vi } from "vitest";
 
+const NODE_ACTIONS_TEST_ID = "file-tree-node-actions";
+
 const { responsive, node } = vi.hoisted(() => ({
   responsive: { isMobile: false, isFinePointer: true },
   node: { name: "README.md", path: "README.md", is_dir: false, size: 0 },
@@ -111,11 +113,19 @@ afterEach(() => {
 });
 
 describe("FileBrowser responsive touch action wiring", () => {
+  it("releases row-owned confirmations when the file session changes", () => {
+    responsive.isMobile = true;
+    const { rerender } = render(<FileBrowser sessionId="session-1" onOpenFile={vi.fn()} />);
+    const trigger = screen.getByTestId(NODE_ACTIONS_TEST_ID);
+    rerender(<FileBrowser sessionId="session-2" onOpenFile={vi.fn()} />);
+    expect(trigger.isConnected).toBe(false);
+    expect(screen.getByTestId(NODE_ACTIONS_TEST_ID)).not.toBe(trigger);
+  });
   it("renders the 44px action for a coarse-pointer desktop workbench", () => {
     responsive.isFinePointer = false;
     renderFileBrowser();
 
-    const trigger = screen.getByTestId("file-tree-node-actions");
+    const trigger = screen.getByTestId(NODE_ACTIONS_TEST_ID);
     expect(trigger.className).toContain("min-h-11");
     expect(trigger.className).toContain("min-w-11");
   });
@@ -123,13 +133,13 @@ describe("FileBrowser responsive touch action wiring", () => {
   it("hides the touch action only for fine-pointer desktop", () => {
     renderFileBrowser();
 
-    expect(screen.queryByTestId("file-tree-node-actions")).toBeNull();
+    expect(screen.queryByTestId(NODE_ACTIONS_TEST_ID)).toBeNull();
   });
 
   it("renders the touch action for mobile", () => {
     responsive.isMobile = true;
     renderFileBrowser();
 
-    expect(screen.getByTestId("file-tree-node-actions")).toBeTruthy();
+    expect(screen.getByTestId(NODE_ACTIONS_TEST_ID)).toBeTruthy();
   });
 });
diff --git a/apps/web/components/task/file-browser.tsx b/apps/web/components/task/file-browser.tsx
index 818036c551..acb3fb98d7 100644
--- a/apps/web/components/task/file-browser.tsx
+++ b/apps/web/components/task/file-browser.tsx
@@ -622,6 +622,7 @@ export function FileBrowser({
           addSourcesDisabledReason={addSourcesDisabledReason}
         />
         <FileBrowserTreeContent
+          key={`${sessionId}:${environmentId ?? ""}`}
           scrollAreaRef={scrollAreaRef}
           data={data}
           handlers={handlers}
diff --git a/apps/web/components/task/file-context-menu.test.tsx b/apps/web/components/task/file-context-menu.test.tsx
index 0c50e4db0e..525957d81d 100644
--- a/apps/web/components/task/file-context-menu.test.tsx
+++ b/apps/web/components/task/file-context-menu.test.tsx
@@ -3,7 +3,10 @@ import { render, screen, cleanup, fireEvent, waitFor, within } from "@testing-li
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type { FileTreeNode } from "@/lib/types/backend";
 
-const responsive = vi.hoisted(() => ({ isFinePointer: true }));
+const DELETE_INLINE_CONFIRM_ID = "file-delete-inline-confirmation";
+const DELETE_CONFIRM_ID = "file-delete-confirm";
+
+const responsive = vi.hoisted(() => ({ isFinePointer: true, isMobile: false }));
 
 vi.mock("@/hooks/use-responsive-breakpoint", () => ({
   useResponsiveBreakpoint: () => responsive,
@@ -40,9 +43,46 @@ const BULK_TREE: FileTreeNode = {
 afterEach(() => {
   cleanup();
   responsive.isFinePointer = true;
+  responsive.isMobile = false;
   vi.useRealTimers();
 });
 
+it("hands phone file deletion from the touch menu to a named sheet without replacing its trigger", async () => {
+  responsive.isMobile = true;
+  responsive.isFinePointer = false;
+  const onDeleteFile = vi.fn().mockResolvedValue(true);
+  render(
+    <FileContextMenu
+      node={FILE_NODE}
+      tree={FILE_NODE}
+      setTree={vi.fn()}
+      onDeleteFile={onDeleteFile}
+      onStartRename={vi.fn()}
+    >
+      <div data-testid="phone-file-row">
+        <span>{FILE_NODE.name}</span>
+        <FileTreeNodeTouchActions node={FILE_NODE} showTouchActions />
+      </div>
+    </FileContextMenu>,
+  );
+  const trigger = screen.getByTestId("file-tree-node-actions");
+  fireEvent.pointerDown(trigger);
+  fireEvent.click(screen.getByTestId("file-tree-touch-delete"));
+  const sheet = await screen.findByRole("dialog", { name: "Delete README.md" });
+  expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+  expect(within(sheet).queryByText("README.md", { selector: "p" })).toBeNull();
+  expect(trigger.isConnected).toBe(true);
+  expect(screen.queryByRole("menu")).toBeNull();
+  expect(screen.queryByTestId(DELETE_INLINE_CONFIRM_ID)).toBeNull();
+  fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
+  await waitFor(() => expect(document.activeElement).toBe(trigger));
+  expect(onDeleteFile).not.toHaveBeenCalled();
+  fireEvent.pointerDown(trigger);
+  fireEvent.click(screen.getByTestId("file-tree-touch-delete"));
+  fireEvent.click(await screen.findByTestId(DELETE_CONFIRM_ID));
+  await waitFor(() => expect(onDeleteFile).toHaveBeenCalledExactlyOnceWith(FILE_NODE.path));
+});
+
 function openMenu(triggerTestId: string) {
   const trigger = screen.getByTestId(triggerTestId);
   fireEvent.contextMenu(trigger);
@@ -369,8 +409,8 @@ describe("FileContextMenu bulk deletion", () => {
 
     openMenu("single-delete-row");
     fireEvent.click(screen.getByRole("menuitem", { name: "Delete" }));
-    await waitFor(() => expect(screen.getByTestId("file-delete-confirm")).toBeTruthy());
-    fireEvent.click(screen.getByTestId("file-delete-confirm"));
+    await waitFor(() => expect(screen.getByTestId(DELETE_CONFIRM_ID)).toBeTruthy());
+    fireEvent.click(screen.getByTestId(DELETE_CONFIRM_ID));
 
     await waitFor(() => expect(onDeleteFile).toHaveBeenCalledWith(node.path));
   });
@@ -421,17 +461,13 @@ describe("FileContextMenu touch actions", () => {
     fireEvent.pointerDown(screen.getByTestId("file-tree-node-actions"));
     fireEvent.click(screen.getByTestId("file-tree-touch-delete"));
 
-    await waitFor(() => expect(screen.getByTestId("file-delete-inline-confirmation")).toBeTruthy());
+    await waitFor(() => expect(screen.getByTestId(DELETE_INLINE_CONFIRM_ID)).toBeTruthy());
     expect(screen.queryByTestId(DELETE_CONFIRM_POPOVER_ID)).toBeNull();
     expect(onDeleteFile).not.toHaveBeenCalled();
-    expect(
-      screen.getByTestId("file-delete-inline-confirmation").querySelectorAll("button"),
-    ).toHaveLength(2);
+    expect(screen.getByTestId(DELETE_INLINE_CONFIRM_ID).querySelectorAll("button")).toHaveLength(2);
 
     fireEvent.click(
-      within(screen.getByTestId("file-delete-inline-confirmation")).getByTestId(
-        "file-delete-confirm",
-      ),
+      within(screen.getByTestId(DELETE_INLINE_CONFIRM_ID)).getByTestId(DELETE_CONFIRM_ID),
     );
     await waitFor(() => expect(onDeleteFile).toHaveBeenCalledWith(FILE_NODE.path));
   });
diff --git a/apps/web/components/task/file-context-menu.tsx b/apps/web/components/task/file-context-menu.tsx
index 0c3cad3188..32b9bc5fe7 100644
--- a/apps/web/components/task/file-context-menu.tsx
+++ b/apps/web/components/task/file-context-menu.tsx
@@ -14,6 +14,7 @@ import {
 import { cn } from "@/lib/utils";
 import { useToast } from "@/components/toast-provider";
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
 import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import { useTranslation } from "react-i18next";
 import type { FileTreeNode } from "@/lib/types/backend";
@@ -229,7 +230,10 @@ function FileContextMenuSurface({
   onConfirmDelete,
   onDelete,
 }: FileContextMenuSurfaceProps) {
+  const { isMobile } = useResponsiveBreakpoint();
   const renamePendingRef = useRef(false);
+  const deletePendingRef = useRef(false);
+  const touchTriggerRef = useRef<HTMLButtonElement>(null);
 
   const handleStartRename = useCallback(() => {
     renamePendingRef.current = true;
@@ -237,16 +241,24 @@ function FileContextMenuSurface({
 
   const handleCloseAutoFocus = useCallback(
     (event: Event) => {
+      if (deletePendingRef.current) {
+        event.preventDefault();
+        deletePendingRef.current = false;
+        setDeleteConfirmationOpen(true);
+        return;
+      }
       if (!renamePendingRef.current) return;
       event.preventDefault();
       renamePendingRef.current = false;
       onStartRename();
     },
-    [onStartRename],
+    [onStartRename, setDeleteConfirmationOpen],
   );
 
   return (
-    <FileDeleteActionContext.Provider value={deleteAction}>
+    <FileDeleteActionContext.Provider
+      value={deleteAction ? { ...deleteAction, triggerRef: touchTriggerRef } : null}
+    >
       <ContextMenu>
         <ContextMenuTrigger asChild>{children}</ContextMenuTrigger>
         <ContextMenuContent onCloseAutoFocus={handleCloseAutoFocus}>
@@ -265,7 +277,10 @@ function FileContextMenuSurface({
             onDownloadFile={onDownloadFile}
             onUploadFilesHere={onUploadFilesHere}
             onStartRename={handleStartRename}
-            onDelete={onDelete}
+            onDelete={(event) => {
+              if (isMobile && !isBulk) deletePendingRef.current = true;
+              else onDelete(event);
+            }}
           />
         </ContextMenuContent>
       </ContextMenu>
@@ -274,20 +289,16 @@ function FileContextMenuSurface({
           <DeleteConfirmDialog selectedCount={selectedCount} onConfirm={onConfirmDelete} />
         </AlertDialog>
       )}
-      {!isBulk && isFinePointer && deleteAction && (
-        <ActionConfirmPopover
+      {!isBulk && deleteAction && (
+        <FileDeleteConfirmation
+          action={deleteAction}
           open={deleteConfirmationOpen}
+          path={node.path}
+          isFinePointer={isFinePointer}
           anchorRef={anchorRef}
           focusBoundaryRef={focusBoundaryRef}
-          title={deleteAction.title}
-          description={deleteAction.description}
-          cancelLabel={deleteAction.cancelLabel}
-          confirmLabel={deleteAction.label}
-          confirmAriaLabel={deleteAction.title}
-          confirmTestId="file-delete-confirm"
-          testId="file-delete-confirm-popover"
+          focusReturnRef={touchTriggerRef.current ? touchTriggerRef : anchorRef}
           onOpenChange={setDeleteConfirmationOpen}
-          onCancel={() => setDeleteConfirmationOpen(false)}
           onConfirm={onConfirmDelete}
         />
       )}
@@ -295,6 +306,55 @@ function FileContextMenuSurface({
   );
 }
 
+function FileDeleteConfirmation({
+  action,
+  path,
+  isFinePointer,
+  anchorRef,
+  focusReturnRef,
+  focusBoundaryRef,
+  ...props
+}: {
+  action: FileDeleteAction;
+  path: string;
+  isFinePointer: boolean;
+  anchorRef: React.RefObject<HTMLElement | null>;
+  focusReturnRef: React.RefObject<HTMLElement | null>;
+  focusBoundaryRef: React.RefObject<HTMLElement | null>;
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  onConfirm: () => void;
+}) {
+  const actions = {
+    ...props,
+    title: action.title,
+    description: action.description,
+    cancelLabel: action.cancelLabel,
+    confirmLabel: action.label,
+    confirmAriaLabel: action.title,
+    confirmTestId: "file-delete-confirm",
+  };
+  return (
+    <MobileActionConfirmation
+      {...actions}
+      targetKey={path}
+      subject={path.includes("/") ? path : undefined}
+      focusReturnRef={focusReturnRef}
+      fallback={
+        isFinePointer ? (
+          <ActionConfirmPopover
+            {...actions}
+            anchorRef={anchorRef}
+            focusBoundaryRef={focusBoundaryRef}
+            testId="file-delete-confirm-popover"
+            onCancel={() => props.onOpenChange(false)}
+          />
+        ) : null
+      }
+    />
+  );
+}
+
 /** Context menu for file nodes with Download, Rename, and Delete options */
 export function FileContextMenu({
   children,
diff --git a/apps/web/components/task/file-delete-action.tsx b/apps/web/components/task/file-delete-action.tsx
index 19af9d58cb..5c27d0c9b6 100644
--- a/apps/web/components/task/file-delete-action.tsx
+++ b/apps/web/components/task/file-delete-action.tsx
@@ -12,6 +12,7 @@ export type FileDeleteAction = {
   label: string;
   cancelLabel: string;
   description: React.ReactNode;
+  triggerRef?: React.RefObject<HTMLButtonElement | null>;
   onDelete: () => void;
   onCancel: () => void;
   onConfirm: () => void;
diff --git a/apps/web/components/task/layout-preset-selector.test.tsx b/apps/web/components/task/layout-preset-selector.test.tsx
index 8588633fb8..a749768c38 100644
--- a/apps/web/components/task/layout-preset-selector.test.tsx
+++ b/apps/web/components/task/layout-preset-selector.test.tsx
@@ -5,6 +5,7 @@ import { getBuiltInLayoutProfile } from "@/lib/layout/layout-profiles";
 
 const mocks = vi.hoisted(() => ({
   finePointer: true,
+  isMobile: false,
   savedLayouts: [] as Array<Record<string, unknown>>,
   updateUserSettings: vi.fn(),
   setUserSettings: vi.fn(),
@@ -31,7 +32,7 @@ vi.mock("@/lib/i18n", () => ({
 }));
 
 vi.mock("@/hooks/use-responsive-breakpoint", () => ({
-  useResponsiveBreakpoint: () => ({ isFinePointer: mocks.finePointer }),
+  useResponsiveBreakpoint: () => ({ isFinePointer: mocks.finePointer, isMobile: mocks.isMobile }),
 }));
 
 vi.mock("@/lib/toast/sonner", () => ({
@@ -143,6 +144,7 @@ function deferred<T>() {
 
 beforeEach(() => {
   mocks.finePointer = true;
+  mocks.isMobile = false;
   mocks.savedLayouts = [savedLayout()];
   mocks.updateUserSettings.mockReset();
   mocks.setUserSettings.mockReset();
@@ -166,6 +168,26 @@ afterEach(() => {
 });
 
 describe("LayoutPresetSelector saved-layout deletion", () => {
+  it("hands the phone menu off to a sheet without applying the layout", async () => {
+    mocks.isMobile = true;
+    mocks.finePointer = false;
+    render(<LayoutPresetSelector />);
+    const trigger = screen.getByTestId("layout-preset-trigger");
+    await openSavedLayouts();
+    fireEvent.click(screen.getByTestId(SAVED_DELETE_TEST_ID));
+    const sheet = await screen.findByRole("dialog", { name: "Delete Saved layout?" });
+    expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+    expect(document.querySelector('[data-slot="dropdown-menu-content"]')).toBeNull();
+    fireEvent.click(within(sheet).getByRole("button", { name: "common:cancel" }));
+    await waitFor(() => expect(document.activeElement).toBe(trigger));
+    expect(mocks.applyCustomLayout).not.toHaveBeenCalled();
+    expect(mocks.updateUserSettings).not.toHaveBeenCalled();
+    await openSavedLayouts();
+    fireEvent.click(screen.getByTestId(SAVED_DELETE_TEST_ID));
+    fireEvent.click(await screen.findByTestId(SAVED_DELETE_CONFIRM_TEST_ID));
+    await waitFor(() => expect(mocks.updateUserSettings).toHaveBeenCalledTimes(1));
+    expect(mocks.savedLayouts).toEqual([]);
+  });
   it("anchors desktop confirmation to the menu action and keeps cancel local", async () => {
     render(<LayoutPresetSelector />);
     await openSavedLayouts();
diff --git a/apps/web/components/task/layout-preset-selector.tsx b/apps/web/components/task/layout-preset-selector.tsx
index 8711f6fd0f..4196073e76 100644
--- a/apps/web/components/task/layout-preset-selector.tsx
+++ b/apps/web/components/task/layout-preset-selector.tsx
@@ -50,6 +50,7 @@ import { useAppStore, useAppStoreApi } from "@/components/state-provider";
 import type { SavedLayout } from "@/lib/types/http";
 import { useTaskSessions } from "@/hooks/use-task-sessions";
 import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
+import { useConfirmationBoundary } from "@/components/confirmation/mobile-action-confirmation";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
 import { resolveLayoutApplySessionIds } from "./layout-preset-selector-session-ids";
 import { SavedLayoutDeleteConfirmation } from "./saved-layout-delete-confirmation";
@@ -236,7 +237,7 @@ function SavedLayoutItems({
           <SavedLayoutLabel layout={layout} />
         </DropdownMenuItem>
         <DropdownMenuItem
-          className="min-h-11 min-w-11 shrink-0 cursor-pointer justify-center px-2 text-destructive/60 focus:text-destructive sm:min-h-7 sm:min-w-7"
+          className="min-h-11 min-w-11 shrink-0 cursor-pointer justify-center px-2 text-destructive/60 focus:text-destructive md:min-h-7 md:min-w-7"
           aria-label={t("task:delete2", { name: layout.name })}
           data-testid="layout-saved-delete"
           data-layout-id={layout.id}
@@ -341,6 +342,8 @@ function useApplyBuiltInLayout(
 }
 
 type PresetDropdownProps = {
+  triggerRef: RefObject<HTMLButtonElement | null>;
+  onCloseAutoFocus: (event: Event) => void;
   open: boolean;
   onOpenChange: (open: boolean) => void;
   deleteMenuRef: RefObject<HTMLDivElement | null>;
@@ -360,6 +363,8 @@ type PresetDropdownProps = {
 };
 
 function PresetDropdown({
+  triggerRef,
+  onCloseAutoFocus,
   open,
   onOpenChange,
   deleteMenuRef,
@@ -384,6 +389,7 @@ function PresetDropdown({
         <TooltipTrigger asChild>
           <DropdownMenuTrigger asChild>
             <Button
+              ref={triggerRef}
               size="sm"
               variant="outline"
               className="cursor-pointer px-2"
@@ -397,6 +403,7 @@ function PresetDropdown({
         <TooltipContent side="bottom">{t("task:layoutPresets")}</TooltipContent>
       </Tooltip>
       <DropdownMenuContent
+        onCloseAutoFocus={onCloseAutoFocus}
         ref={deleteMenuRef}
         align="end"
         className="w-60"
@@ -490,12 +497,15 @@ function usePresetDropdownVisibility(onClose: () => void) {
 
 export function LayoutPresetSelector() {
   const { t } = useTranslation();
-  const { isFinePointer } = useResponsiveBreakpoint();
+  const { isFinePointer, isMobile } = useResponsiveBreakpoint();
   const [saveDialogOpen, setSaveDialogOpen] = useState(false);
   const [deleteCandidate, setDeleteCandidate] = useState<SavedLayout | null>(null);
   const cancelDelete = useCallback(() => setDeleteCandidate(null), []);
+  useConfirmationBoundary(deleteCandidate !== null, deleteCandidate?.id ?? "", cancelDelete);
   const deleteAnchorRef = useRef<HTMLElement>(null);
   const deleteMenuRef = useRef<HTMLDivElement>(null);
+  const triggerRef = useRef<HTMLButtonElement>(null);
+  const pendingTarget = useRef<SavedLayout | null>(null);
   const resetLayout = useDockviewStore((s) => s.resetLayout);
   const savedLayouts = useAppStore((s) => s.userSettings.savedLayouts);
   const handleApplyCustom = useApplySavedLayout();
@@ -503,10 +513,18 @@ export function LayoutPresetSelector() {
   const { saveLayout, deleteLayout } = useSavedLayoutMutations();
   const { dropdownOpen, tooltipOpen, handleDropdownOpenChange, handleTooltipOpenChange } =
     usePresetDropdownVisibility(cancelDelete);
-  const beginDelete = useCallback((layout: SavedLayout, anchor: HTMLElement) => {
-    deleteAnchorRef.current = anchor;
-    setDeleteCandidate(layout);
-  }, []);
+  const beginDelete = useCallback(
+    (layout: SavedLayout, anchor: HTMLElement) => {
+      if (isMobile) {
+        pendingTarget.current = layout;
+        handleDropdownOpenChange(false);
+        return;
+      }
+      deleteAnchorRef.current = anchor;
+      setDeleteCandidate(layout);
+    },
+    [isMobile, handleDropdownOpenChange],
+  );
 
   const closeDelete = useCallback(() => {
     setDeleteCandidate(null);
@@ -528,14 +546,22 @@ export function LayoutPresetSelector() {
   return (
     <>
       <PresetDropdown
+        triggerRef={triggerRef}
+        onCloseAutoFocus={(event) => {
+          const target = pendingTarget.current;
+          pendingTarget.current = null;
+          if (!target) return;
+          event.preventDefault();
+          if (savedLayouts.some((layout) => layout.id === target.id)) setDeleteCandidate(target);
+        }}
         open={dropdownOpen}
         onOpenChange={handleDropdownOpenChange}
         deleteMenuRef={deleteMenuRef}
-        tooltipOpen={tooltipOpen}
+        tooltipOpen={!isMobile && tooltipOpen}
         onTooltipOpenChange={handleTooltipOpenChange}
         resetLayout={resetLayout}
         savedLayouts={savedLayouts}
-        isFinePointer={isFinePointer}
+        isFinePointer={isMobile || isFinePointer}
         onApplyCustom={handleApplyCustom}
         onApplyBuiltIn={handleApplyBuiltIn}
         confirmingDeleteId={deleteCandidate?.id ?? null}
@@ -552,8 +578,8 @@ export function LayoutPresetSelector() {
       />
       <SavedLayoutDeleteConfirmation
         layout={deleteCandidate}
-        open={isFinePointer && deleteCandidate !== null}
-        anchorRef={deleteAnchorRef}
+        open={(isMobile || isFinePointer) && deleteCandidate !== null}
+        anchorRef={isMobile ? triggerRef : deleteAnchorRef}
         focusBoundaryRef={deleteMenuRef}
         onOpenChange={(open) => {
           if (!open) cancelDelete();
diff --git a/apps/web/components/task/mobile/mobile-picker-sheet.tsx b/apps/web/components/task/mobile/mobile-picker-sheet.tsx
index dbae835c02..9edff1a0c1 100644
--- a/apps/web/components/task/mobile/mobile-picker-sheet.tsx
+++ b/apps/web/components/task/mobile/mobile-picker-sheet.tsx
@@ -1,6 +1,10 @@
 "use client";
 
 import { type ReactNode } from "react";
+import {
+  MobileConfirmationHost,
+  MobileConfirmationHostBody,
+} from "@/components/confirmation/mobile-confirmation-host";
 import {
   Drawer,
   DrawerContent,
@@ -18,6 +22,8 @@ type MobilePickerSheetProps = {
   contentTestId?: string;
   /** Optional trailing element rendered to the right of the title (e.g. a "+" CTA). */
   headerAction?: ReactNode;
+  /** Replace the picker content with a confirmation step in this same drawer. */
+  confirmationHost?: boolean;
   onCloseAutoFocus?: (event: Event) => void;
   /** Fixed content above the single scrolling picker region. */
   fixedContent?: ReactNode;
@@ -36,28 +42,45 @@ export function MobilePickerSheet({
   description,
   contentTestId,
   headerAction,
+  confirmationHost = false,
   onCloseAutoFocus,
   fixedContent,
   children,
 }: MobilePickerSheetProps) {
+  const content = (
+    <>
+      <DrawerHeader className="text-left pb-2">
+        <div className="flex items-center justify-between gap-2">
+          <DrawerTitle className="text-sm">{title}</DrawerTitle>
+          {headerAction}
+        </div>
+        {description && <DrawerDescription>{description}</DrawerDescription>}
+      </DrawerHeader>
+      {fixedContent}
+      <div
+        className="flex-1 min-h-0 max-h-[70dvh] overflow-y-auto px-2 pb-[calc(1rem+env(safe-area-inset-bottom))]"
+        data-testid={contentTestId}
+      >
+        {children}
+      </div>
+    </>
+  );
+
+  if (confirmationHost)
+    return (
+      <MobileConfirmationHost open={open} surface="drawer">
+        {({ contentProps }) => (
+          <Drawer open={open} onOpenChange={onOpenChange}>
+            <DrawerContent onCloseAutoFocus={onCloseAutoFocus} {...contentProps}>
+              <MobileConfirmationHostBody>{content}</MobileConfirmationHostBody>
+            </DrawerContent>
+          </Drawer>
+        )}
+      </MobileConfirmationHost>
+    );
   return (
     <Drawer open={open} onOpenChange={onOpenChange}>
-      <DrawerContent onCloseAutoFocus={onCloseAutoFocus}>
-        <DrawerHeader className="text-left pb-2">
-          <div className="flex items-center justify-between gap-2">
-            <DrawerTitle className="text-sm">{title}</DrawerTitle>
-            {headerAction}
-          </div>
-          {description && <DrawerDescription>{description}</DrawerDescription>}
-        </DrawerHeader>
-        {fixedContent}
-        <div
-          className="flex-1 min-h-0 max-h-[70dvh] overflow-y-auto px-2 pb-[calc(1rem+env(safe-area-inset-bottom))]"
-          data-testid={contentTestId}
-        >
-          {children}
-        </div>
-      </DrawerContent>
+      <DrawerContent onCloseAutoFocus={onCloseAutoFocus}>{content}</DrawerContent>
     </Drawer>
   );
 }
diff --git a/apps/web/components/task/mobile/mobile-session-delete-confirmation.tsx b/apps/web/components/task/mobile/mobile-session-delete-confirmation.tsx
new file mode 100644
index 0000000000..8429b146d5
--- /dev/null
+++ b/apps/web/components/task/mobile/mobile-session-delete-confirmation.tsx
@@ -0,0 +1,65 @@
+"use client";
+
+import type { RefObject } from "react";
+import { useTranslation } from "react-i18next";
+import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
+import { SessionDeleteDescription } from "../session-delete-description";
+
+export function MobileSessionDeleteConfirmation({
+  open,
+  targetKey,
+  isPrimary,
+  isOnlySession,
+  targetName,
+  focusReturnRef,
+  onCancel,
+  onClose,
+  onConfirm,
+}: {
+  open: boolean;
+  targetKey: string;
+  isPrimary: boolean;
+  isOnlySession: boolean;
+  targetName: string;
+  focusReturnRef: RefObject<HTMLElement | null>;
+  onCancel: () => void;
+  onClose: () => void;
+  onConfirm: () => void | Promise<void>;
+}) {
+  const { t } = useTranslation();
+  const description = (
+    <SessionDeleteDescription isPrimary={isPrimary} isOnlySession={isOnlySession} />
+  );
+  const actions = {
+    testId: "mobile-session-delete-confirmation",
+    description,
+    cancelLabel: t("common:cancel"),
+    confirmLabel: t("task:delete"),
+    confirmAriaLabel: t("task:delete2", { name: targetName }),
+    confirmTestId: "mobile-session-delete-confirm",
+    onClose,
+    onConfirm,
+  };
+  return (
+    <MobileActionConfirmation
+      {...actions}
+      open={open}
+      targetKey={targetKey}
+      title={t("task:deleteSession")}
+      subject={targetName}
+      focusReturnRef={focusReturnRef}
+      onOpenChange={(next) => {
+        if (!next) onCancel();
+      }}
+      fallback={
+        <InlineConfirmActions
+          {...actions}
+          density="touch"
+          ariaLabel={t("task:deleteSession")}
+          onCancel={onCancel}
+        />
+      }
+    />
+  );
+}
diff --git a/apps/web/components/task/mobile/mobile-sessions-section.test.tsx b/apps/web/components/task/mobile/mobile-sessions-section.test.tsx
index 04e9d059d9..2d1e03e2b0 100644
--- a/apps/web/components/task/mobile/mobile-sessions-section.test.tsx
+++ b/apps/web/components/task/mobile/mobile-sessions-section.test.tsx
@@ -406,6 +406,33 @@ describe("MobileSessionsPicker pending lifecycle", () => {
 });
 
 describe("MobileSessionsPicker session delete confirmation", () => {
+  it("uses the same modal for the named delete step and restores the picker on Back", async () => {
+    Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+    try {
+      render(<MobileSessionsPicker taskId={TASK_ID} sessionId={SESSION_A} fullWidth />);
+      fireEvent.click(screen.getByTestId(PILL_TESTID));
+      const picker = screen.getByRole("dialog", { name: "Sessions" });
+      const row = screen.getByTestId(`mobile-session-row-${SESSION_A}`);
+      fireEvent.pointerDown(within(row).getByRole("button", { name: SESSION_ACTIONS_LABEL }));
+      fireEvent.click(screen.getByRole("menuitem", { name: "Delete" }));
+      expect(await screen.findByRole("dialog", { name: "Delete session?" })).toBe(picker);
+      expect(screen.getAllByRole("dialog", { hidden: true })).toHaveLength(1);
+      expect(screen.getByRole("group").textContent).toContain("Alpha");
+      expect(screen.queryByRole("button", { name: SESSION_ACTIONS_LABEL })).toBeNull();
+      fireEvent.click(screen.getByRole("button", { name: "Back" }));
+      expect(screen.getByRole("dialog", { name: "Sessions" })).toBe(picker);
+      expect(row.isConnected).toBe(true);
+      await vi.waitFor(() =>
+        expect(document.activeElement).toBe(
+          within(row).getByRole("button", { name: SESSION_ACTIONS_LABEL }),
+        ),
+      );
+      expect(mocks.removeSession).not.toHaveBeenCalled();
+    } finally {
+      Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
+    }
+  });
+
   it("morphs the target row into local touch-sized confirmation actions", () => {
     mocks.sessions = [session(SESSION_A, "profile-a", START_TIME, { state: "COMPLETED" })];
     render(<MobileSessionsPicker taskId={TASK_ID} sessionId={SESSION_A} fullWidth />);
diff --git a/apps/web/components/task/mobile/mobile-sessions-section.tsx b/apps/web/components/task/mobile/mobile-sessions-section.tsx
index 7bd611c7e8..701e4991a0 100644
--- a/apps/web/components/task/mobile/mobile-sessions-section.tsx
+++ b/apps/web/components/task/mobile/mobile-sessions-section.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { memo, useCallback, useEffect, useMemo, useState } from "react";
+import { memo, useCallback, useEffect, useMemo, useRef, useState, type RefObject } from "react";
 import { IconDotsVertical, IconPlus, IconStar } from "@tabler/icons-react";
 import { Button } from "@kandev/ui/button";
 import {
@@ -11,7 +11,7 @@ import {
   DropdownMenuTrigger,
 } from "@kandev/ui/dropdown-menu";
 import { AgentLogo } from "@/components/agent-logo";
-import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import { useAppStore } from "@/components/state-provider";
 import { useTaskSessions } from "@/hooks/use-task-sessions";
 import {
@@ -32,7 +32,7 @@ import type { ForegroundActivity, TaskSession, TaskSessionState } from "@/lib/ty
 import type { AgentProfileOption } from "@/lib/state/slices";
 import { useTranslation } from "react-i18next";
 import { t } from "@/lib/i18n";
-import { SessionDeleteDescription } from "../session-delete-description";
+import { MobileSessionDeleteConfirmation } from "./mobile-session-delete-confirmation";
 
 type SessionRow = {
   id: string;
@@ -144,6 +144,7 @@ function StateBadge({
 }
 
 function SessionActionsMenu({
+  triggerRef,
   taskId,
   state,
   isPrimary,
@@ -153,6 +154,7 @@ function SessionActionsMenu({
   onAskDelete,
   onHandoffProfile,
 }: {
+  triggerRef: RefObject<HTMLButtonElement | null>;
   taskId: string;
   state: TaskSessionState | null;
   isPrimary: boolean;
@@ -163,6 +165,8 @@ function SessionActionsMenu({
   onHandoffProfile: (profileId: string) => void;
 }) {
   const { t } = useTranslation();
+  const { isMobile } = useResponsiveBreakpoint();
+  const pendingDelete = useRef(false);
   const hasLifecycleAction =
     !!state &&
     (isSessionStoppable(state) || isSessionResumable(state) || isSessionDeletable(state));
@@ -171,16 +175,26 @@ function SessionActionsMenu({
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
         <Button
+          ref={triggerRef}
           variant="ghost"
           size="icon-sm"
-          className="cursor-pointer h-7 w-7"
+          className="cursor-pointer h-11 w-11 md:h-7 md:w-7"
           onClick={(e) => e.stopPropagation()}
           aria-label={t("task:sessionActions")}
         >
           <IconDotsVertical className="h-4 w-4" />
         </Button>
       </DropdownMenuTrigger>
-      <DropdownMenuContent align="end" onClick={(e) => e.stopPropagation()}>
+      <DropdownMenuContent
+        align="end"
+        onClick={(e) => e.stopPropagation()}
+        onCloseAutoFocus={(event) => {
+          if (!pendingDelete.current) return;
+          event.preventDefault();
+          pendingDelete.current = false;
+          onAskDelete();
+        }}
+      >
         <DropdownMenuItem
           className="cursor-pointer"
           onSelect={onSetPrimary}
@@ -202,7 +216,10 @@ function SessionActionsMenu({
         {state && isSessionDeletable(state) && (
           <DropdownMenuItem
             className="cursor-pointer text-destructive focus:text-destructive"
-            onSelect={onAskDelete}
+            onSelect={() => {
+              if (isMobile) pendingDelete.current = true;
+              else onAskDelete();
+            }}
           >
             {t("task:delete")}
           </DropdownMenuItem>
@@ -214,39 +231,6 @@ function SessionActionsMenu({
   );
 }
 
-function SessionDeleteInlineConfirmation({
-  isPrimary,
-  isOnlySession,
-  targetName,
-  onCancel,
-  onClose,
-  onConfirm,
-}: {
-  isPrimary: boolean;
-  isOnlySession: boolean;
-  targetName: string;
-  onCancel: () => void;
-  onClose: () => void;
-  onConfirm: () => void | Promise<void>;
-}) {
-  const { t } = useTranslation();
-  return (
-    <InlineConfirmActions
-      density="touch"
-      testId="mobile-session-delete-confirmation"
-      ariaLabel={t("task:deleteSession")}
-      description={<SessionDeleteDescription isPrimary={isPrimary} isOnlySession={isOnlySession} />}
-      cancelLabel={t("common:cancel")}
-      confirmLabel={t("task:delete")}
-      confirmAriaLabel={t("task:delete2", { name: targetName })}
-      confirmTestId="mobile-session-delete-confirm"
-      onCancel={onCancel}
-      onClose={onClose}
-      onConfirm={onConfirm}
-    />
-  );
-}
-
 function SessionIdentity({ row }: { row: SessionRow }) {
   return (
     <div className="flex min-w-0 flex-1 flex-col">
@@ -282,9 +266,14 @@ function SessionRowTrailingActions({
   onHandoffProfile: (profileId: string) => void;
   actions: ReturnType<typeof useSessionActions>;
 }) {
-  if (isConfirming) {
-    return (
-      <SessionDeleteInlineConfirmation
+  const { isMobile } = useResponsiveBreakpoint();
+  const triggerRef = useRef<HTMLButtonElement>(null);
+  return (
+    <>
+      <MobileSessionDeleteConfirmation
+        focusReturnRef={triggerRef}
+        open={isConfirming}
+        targetKey={`${taskId}:${row.id}`}
         isPrimary={row.isPrimary}
         isOnlySession={totalSessions === 1}
         targetName={row.agentLabel}
@@ -292,19 +281,20 @@ function SessionRowTrailingActions({
         onClose={onCancelDelete}
         onConfirm={() => void actions.remove()}
       />
-    );
-  }
-  return (
-    <SessionActionsMenu
-      taskId={taskId}
-      state={row.state}
-      isPrimary={row.isPrimary}
-      onSetPrimary={() => void actions.setPrimary()}
-      onStop={() => void actions.stop()}
-      onResume={() => void actions.resume()}
-      onAskDelete={onAskDelete}
-      onHandoffProfile={onHandoffProfile}
-    />
+      {(!isConfirming || isMobile) && (
+        <SessionActionsMenu
+          triggerRef={triggerRef}
+          taskId={taskId}
+          state={row.state}
+          isPrimary={row.isPrimary}
+          onSetPrimary={() => void actions.setPrimary()}
+          onStop={() => void actions.stop()}
+          onResume={() => void actions.resume()}
+          onAskDelete={onAskDelete}
+          onHandoffProfile={onHandoffProfile}
+        />
+      )}
+    </>
   );
 }
 
@@ -596,7 +586,13 @@ export const MobileSessionsPicker = memo(function MobileSessionsPicker({
         data-testid="mobile-sessions-pill"
         ariaLabel={ariaLabel}
       />
-      <MobilePickerSheet open={open} onOpenChange={setOpen} title={t("task:sessions")}>
+      <MobilePickerSheet
+        key={taskId}
+        open={open}
+        onOpenChange={setOpen}
+        title={t("task:sessions")}
+        confirmationHost
+      >
         <MobileSessionsList
           taskId={taskId}
           activeSessionId={effectiveSessionId}
diff --git a/apps/web/components/task/mobile/mobile-terminal-row.tsx b/apps/web/components/task/mobile/mobile-terminal-row.tsx
index bfc36920ea..89a24cf34f 100644
--- a/apps/web/components/task/mobile/mobile-terminal-row.tsx
+++ b/apps/web/components/task/mobile/mobile-terminal-row.tsx
@@ -3,6 +3,8 @@
 import { IconTerminal2, IconX } from "@tabler/icons-react";
 import { Button } from "@kandev/ui/button";
 import { useTranslation } from "react-i18next";
+import { useRef } from "react";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 
 import type { Terminal } from "@/hooks/domains/session/use-terminals";
 import { TerminalCloseInlineConfirmation } from "../terminal-close-inline-confirmation";
@@ -31,6 +33,8 @@ export function MobileTerminalRow({
   onConfirmClose,
 }: MobileTerminalRowProps) {
   const { t } = useTranslation();
+  const { isMobile } = useResponsiveBreakpoint();
+  const closeRef = useRef<HTMLButtonElement>(null);
   return (
     <div
       data-testid={`mobile-terminal-row-${terminal.id}`}
@@ -45,32 +49,39 @@ export function MobileTerminalRow({
       >
         <IconTerminal2 className="h-4 w-4 text-muted-foreground shrink-0" />
         <span className="text-sm truncate flex-1">{terminal.label}</span>
-        {isRunning && !isConfirming && (
+        {isRunning && (!isConfirming || isMobile) && (
           <span className="text-[10px] font-medium px-1.5 py-0.5 rounded bg-emerald-500/15 text-emerald-600 dark:text-emerald-400 leading-none">
             {t("task:running")}
           </span>
         )}
       </button>
-      {terminal.closable &&
-        (isConfirming ? (
+      {terminal.closable && (
+        <>
           <TerminalCloseInlineConfirmation
+            open={isConfirming}
+            terminalId={terminal.id}
+            terminalLabel={terminal.label}
+            focusReturnRef={closeRef}
             density="touch"
             testId="mobile-terminal-close-confirmation"
             onCancel={onCancelClose}
             onClose={onClose}
             onConfirm={onConfirmClose}
           />
-        ) : (
-          <Button
-            variant="ghost"
-            size="icon-sm"
-            aria-label={t("task:close2", { label: terminal.label })}
-            className="h-11 min-h-11 w-11 min-w-11 transition-[color,background-color,transform] duration-100 active:scale-[0.96]"
-            onClick={() => onAskClose(terminal)}
-          >
-            <IconX className="h-4 w-4" aria-hidden="true" />
-          </Button>
-        ))}
+          {(!isConfirming || isMobile) && (
+            <Button
+              ref={closeRef}
+              variant="ghost"
+              size="icon-sm"
+              aria-label={t("task:close2", { label: terminal.label })}
+              className="h-11 min-h-11 w-11 min-w-11 transition-[color,background-color,transform] duration-100 active:scale-[0.96]"
+              onClick={() => onAskClose(terminal)}
+            >
+              <IconX className="h-4 w-4" aria-hidden="true" />
+            </Button>
+          )}
+        </>
+      )}
     </div>
   );
 }
diff --git a/apps/web/components/task/mobile/mobile-terminals-section.tsx b/apps/web/components/task/mobile/mobile-terminals-section.tsx
index 82096534eb..763cef1075 100644
--- a/apps/web/components/task/mobile/mobile-terminals-section.tsx
+++ b/apps/web/components/task/mobile/mobile-terminals-section.tsx
@@ -184,7 +184,13 @@ export const MobileTerminalsPicker = memo(function MobileTerminalsPicker({
         data-testid="mobile-terminals-pill"
         ariaLabel={t("task:activeTerminalTapToSwitch", { label })}
       />
-      <MobilePickerSheet open={open} onOpenChange={setOpen} title={t("task:terminals")}>
+      <MobilePickerSheet
+        key={sessionId}
+        open={open}
+        onOpenChange={setOpen}
+        title={t("task:terminals")}
+        confirmationHost
+      >
         <MobileTerminalsList sessionId={sessionId} onClose={() => setOpen(false)} />
       </MobilePickerSheet>
     </>
diff --git a/apps/web/components/task/mobile/session-task-switcher-sheet.test.tsx b/apps/web/components/task/mobile/session-task-switcher-sheet.test.tsx
index 077a60f2b0..8795b5e84d 100644
--- a/apps/web/components/task/mobile/session-task-switcher-sheet.test.tsx
+++ b/apps/web/components/task/mobile/session-task-switcher-sheet.test.tsx
@@ -10,6 +10,10 @@ import type { MobileTaskListProps } from "@/components/task/mobile/session-task-
 import { selectTaskFromSheet } from "@/components/task/mobile/session-task-switcher-sheet-selection";
 import type { TaskSwitcherItem } from "@/components/task/task-switcher";
 import type { TaskSession } from "@/lib/types/http";
+import { useState } from "react";
+import { DrawerTitle } from "@kandev/ui/drawer";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
+import { TaskSwitcherDrawer } from "./task-switcher-drawer";
 
 const mocks = vi.hoisted(() => ({
   toggleSidebarGroupCollapsed: vi.fn(),
@@ -77,6 +81,45 @@ function task(id: string): TaskSwitcherItem {
   };
 }
 
+it("keeps the Tasks drawer as the sole modal during confirmation and restores its list", () => {
+  const previousWidth = window.innerWidth;
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+  function Tasks() {
+    const [confirm, setConfirm] = useState(false);
+    return (
+      <TaskSwitcherDrawer open onOpenChange={vi.fn()}>
+        <DrawerTitle>Tasks</DrawerTitle>
+        <input aria-label="Task filter" defaultValue="Work in progress" />
+        <button onClick={() => setConfirm(true)}>Archive target</button>
+        <MobileActionConfirmation
+          open={confirm}
+          onOpenChange={setConfirm}
+          targetKey="task"
+          title="Archive task?"
+          subject="Target"
+          cancelLabel="Cancel"
+          confirmLabel="Archive"
+          onConfirm={vi.fn()}
+        />
+      </TaskSwitcherDrawer>
+    );
+  }
+  const view = render(<Tasks />);
+  try {
+    const drawer = screen.getByRole("dialog", { name: "Tasks" });
+    const input = screen.getByRole("textbox", { name: "Task filter" });
+    fireEvent.click(screen.getByRole("button", { name: "Archive target" }));
+    expect(screen.getByRole("dialog", { name: "Archive task?" })).toBe(drawer);
+    expect(screen.getAllByRole("dialog", { hidden: true })).toHaveLength(1);
+    expect(screen.queryByRole("textbox", { name: "Task filter" })).toBeNull();
+    fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
+    expect(screen.getByRole("textbox", { name: "Task filter" })).toBe(input);
+  } finally {
+    view.unmount();
+    Object.defineProperty(window, "innerWidth", { configurable: true, value: previousWidth });
+  }
+});
+
 describe("MobileTaskList", () => {
   beforeEach(() => {
     mocks.toggleSidebarGroupCollapsed.mockClear();
diff --git a/apps/web/components/task/mobile/session-task-switcher-sheet.tsx b/apps/web/components/task/mobile/session-task-switcher-sheet.tsx
index c0aa795861..da7a3ba06e 100644
--- a/apps/web/components/task/mobile/session-task-switcher-sheet.tsx
+++ b/apps/web/components/task/mobile/session-task-switcher-sheet.tsx
@@ -4,7 +4,8 @@ import { useCallback, useEffect, useMemo, useState, memo } from "react";
 import { useTranslation } from "react-i18next";
 import { IconCheck, IconNetwork, IconPlus } from "@tabler/icons-react";
 import { Sheet, SheetContent, SheetHeader, SheetTitle } from "@kandev/ui/sheet";
-import { Drawer, DrawerContent, DrawerHeader, DrawerTitle } from "@kandev/ui/drawer";
+import { DrawerHeader, DrawerTitle } from "@kandev/ui/drawer";
+import { TaskSwitcherDrawer } from "./task-switcher-drawer";
 import { Button } from "@kandev/ui/button";
 import { QuickChatSheetButton } from "./quick-chat-sheet-button";
 import { TaskSwitcher } from "../task-switcher";
@@ -475,14 +476,14 @@ export const SessionTaskSwitcherSheet = memo(function SessionTaskSwitcherSheet({
 
   const surface =
     presentation === "drawer" ? (
-      <Drawer open={open} onOpenChange={handleOpenChange}>
-        <DrawerContent
-          onCloseAutoFocus={onCloseAutoFocus}
-          className="h-[88dvh] max-h-[88dvh] overflow-hidden pb-[max(0.5rem,env(safe-area-inset-bottom))]"
-        >
-          {surfaceContent}
-        </DrawerContent>
-      </Drawer>
+      <TaskSwitcherDrawer
+        key={workspaceId}
+        open={open}
+        onOpenChange={handleOpenChange}
+        onCloseAutoFocus={onCloseAutoFocus}
+      >
+        {surfaceContent}
+      </TaskSwitcherDrawer>
     ) : (
       <Sheet open={open} onOpenChange={handleOpenChange}>
         <SheetContent
diff --git a/apps/web/components/task/mobile/task-switcher-drawer.tsx b/apps/web/components/task/mobile/task-switcher-drawer.tsx
new file mode 100644
index 0000000000..6df7a1d761
--- /dev/null
+++ b/apps/web/components/task/mobile/task-switcher-drawer.tsx
@@ -0,0 +1,34 @@
+import type { ReactNode } from "react";
+import { Drawer, DrawerContent } from "@kandev/ui/drawer";
+import {
+  MobileConfirmationHost,
+  MobileConfirmationHostBody,
+} from "@/components/confirmation/mobile-confirmation-host";
+
+export function TaskSwitcherDrawer({
+  open,
+  onOpenChange,
+  onCloseAutoFocus,
+  children,
+}: {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  onCloseAutoFocus?: (event: Event) => void;
+  children: ReactNode;
+}) {
+  return (
+    <MobileConfirmationHost open={open} surface="drawer">
+      {({ contentProps }) => (
+        <Drawer open={open} onOpenChange={onOpenChange}>
+          <DrawerContent
+            onCloseAutoFocus={onCloseAutoFocus}
+            {...contentProps}
+            className="h-[88dvh] max-h-[88dvh] overflow-hidden pb-[max(0.5rem,env(safe-area-inset-bottom))]"
+          >
+            <MobileConfirmationHostBody>{children}</MobileConfirmationHostBody>
+          </DrawerContent>
+        </Drawer>
+      )}
+    </MobileConfirmationHost>
+  );
+}
diff --git a/apps/web/components/task/parked-terminals-menu.tsx b/apps/web/components/task/parked-terminals-menu.tsx
index 4f7d77d951..10c5b78706 100644
--- a/apps/web/components/task/parked-terminals-menu.tsx
+++ b/apps/web/components/task/parked-terminals-menu.tsx
@@ -116,6 +116,8 @@ function ParkedTerminalRow({
         className="w-full px-1"
       >
         <TerminalCloseInlineConfirmation
+          terminalId={terminal.id}
+          terminalLabel={terminal.label}
           onCancel={onCancelDestroy}
           onClose={onCloseDestroy}
           onConfirm={onConfirmDestroy}
diff --git a/apps/web/components/task/saved-layout-delete-confirmation.tsx b/apps/web/components/task/saved-layout-delete-confirmation.tsx
index 3cbd12df2a..a2cc360b29 100644
--- a/apps/web/components/task/saved-layout-delete-confirmation.tsx
+++ b/apps/web/components/task/saved-layout-delete-confirmation.tsx
@@ -4,6 +4,10 @@ import type { RefObject } from "react";
 import { useTranslation } from "react-i18next";
 
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
+import {
+  MobileActionConfirmation,
+  useConfirmationBoundary,
+} from "@/components/confirmation/mobile-action-confirmation";
 import type { SavedLayout } from "@/lib/types/http";
 
 type SavedLayoutDeleteConfirmationProps = {
@@ -24,6 +28,8 @@ export function SavedLayoutDeleteConfirmation({
   onConfirm,
 }: SavedLayoutDeleteConfirmationProps) {
   const { t } = useTranslation();
+  const { changed } = useConfirmationBoundary(open, layout?.id ?? "", onOpenChange);
+  if (changed) return null;
   if (!layout) return null;
 
   const title = t("task:deleteLayoutConfirm", { name: layout.name });
@@ -31,21 +37,31 @@ export function SavedLayoutDeleteConfirmation({
     ? t("task:theBuiltInDefaultLayoutWill")
     : t("task:thisSavedLayoutWillBePermanently");
 
+  const actions = {
+    open,
+    title,
+    description,
+    cancelLabel: t("common:cancel"),
+    confirmLabel: t("task:delete"),
+    confirmAriaLabel: t("task:delete2", { name: layout.name }),
+    confirmTestId: "layout-saved-delete-confirm",
+    onOpenChange,
+    onConfirm: () => onConfirm(layout.id),
+  };
   return (
-    <ActionConfirmPopover
-      open={open}
-      anchorRef={anchorRef}
-      focusBoundaryRef={focusBoundaryRef}
-      title={title}
-      description={description}
-      cancelLabel={t("common:cancel")}
-      confirmLabel={t("task:delete")}
-      confirmAriaLabel={t("task:delete2", { name: layout.name })}
-      confirmTestId="layout-saved-delete-confirm"
-      testId="layout-saved-delete-confirm-popover"
-      confirmationBoundary
-      onOpenChange={onOpenChange}
-      onConfirm={() => onConfirm(layout.id)}
+    <MobileActionConfirmation
+      {...actions}
+      targetKey={layout.id}
+      focusReturnRef={anchorRef}
+      fallback={
+        <ActionConfirmPopover
+          {...actions}
+          anchorRef={anchorRef}
+          focusBoundaryRef={focusBoundaryRef}
+          testId="layout-saved-delete-confirm-popover"
+          confirmationBoundary
+        />
+      }
     />
   );
 }
diff --git a/apps/web/components/task/sidebar-filter/sidebar-filter-popover.test.tsx b/apps/web/components/task/sidebar-filter/sidebar-filter-popover.test.tsx
index 3b29d07b97..ebb4cd845f 100644
--- a/apps/web/components/task/sidebar-filter/sidebar-filter-popover.test.tsx
+++ b/apps/web/components/task/sidebar-filter/sidebar-filter-popover.test.tsx
@@ -1,4 +1,4 @@
-import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { cleanup, fireEvent, render, screen, waitFor, within } from "@testing-library/react";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type { SidebarView } from "@/lib/state/slices/ui/sidebar-view-types";
 import { SidebarFilterPopover } from "./sidebar-filter-popover";
@@ -6,6 +6,7 @@ import { SidebarFilterPopover } from "./sidebar-filter-popover";
 const responsive = vi.hoisted(() => ({
   usesDesktopWorkbench: true,
   isFinePointer: true,
+  isMobile: false,
 }));
 
 vi.mock("@/hooks/use-responsive-breakpoint", () => ({
@@ -66,6 +67,7 @@ afterEach(() => {
   state.sidebarViews.activeViewId = VIEW.id;
   responsive.usesDesktopWorkbench = true;
   responsive.isFinePointer = true;
+  responsive.isMobile = false;
 });
 
 describe("SidebarFilterPopover task-row editor", () => {
@@ -95,6 +97,7 @@ describe("SidebarFilterPopover task-row editor", () => {
   });
 
   it("keeps deletion touch-reachable in a phone drawer with a fine pointer", async () => {
+    responsive.isMobile = true;
     responsive.usesDesktopWorkbench = false;
     responsive.isFinePointer = true;
     state.sidebarViews.views = [VIEW, SECOND_VIEW];
@@ -107,11 +110,19 @@ describe("SidebarFilterPopover task-row editor", () => {
     );
 
     const deleteButton = screen.getByTestId("view-delete-button");
+    const drawer = screen.getByTestId("sidebar-filter-drawer");
+    const dialogId = drawer.id;
     expect(deleteButton.className).toContain("min-h-11");
     fireEvent.click(deleteButton);
 
     expect(state.deleteSidebarView).not.toHaveBeenCalled();
     expect(await screen.findByRole("group", { name: "Delete All tasks?" })).toBeTruthy();
+    expect(screen.getByRole("dialog", { name: "Delete All tasks?" }).id).toBe(dialogId);
+    expect(document.querySelectorAll('[data-slot="drawer-content"]')).toHaveLength(1);
+    expect(deleteButton.isConnected).toBe(true);
+    fireEvent.click(within(drawer).getByRole("button", { name: "Back" }));
+    await waitFor(() => expect(document.activeElement).toBe(deleteButton));
+    expect(state.deleteSidebarView).not.toHaveBeenCalled();
   });
 
   it("keeps view settings collapsed until the user opens them", () => {
diff --git a/apps/web/components/task/sidebar-filter/sidebar-filter-popover.tsx b/apps/web/components/task/sidebar-filter/sidebar-filter-popover.tsx
index 7d5f918499..1a73d211e0 100644
--- a/apps/web/components/task/sidebar-filter/sidebar-filter-popover.tsx
+++ b/apps/web/components/task/sidebar-filter/sidebar-filter-popover.tsx
@@ -20,6 +20,10 @@ import {
   type SavedTaskViewDeleteTarget,
 } from "@/components/confirmation/use-saved-task-view-delete-confirmation";
 import { sidebarViewName } from "@/lib/state/slices/ui/sidebar-view-builtins";
+import {
+  MobileConfirmationHost,
+  MobileConfirmationHostBody,
+} from "@/components/confirmation/mobile-confirmation-host";
 
 type Props = {
   trigger: React.ReactNode;
@@ -207,28 +211,36 @@ function MobileSidebarFilterSurface({
   title,
 }: SidebarFilterSurfaceProps & { title: string }) {
   return (
-    <Drawer
-      open={open}
-      onOpenChange={(nextOpen) => {
-        if (!nextOpen) deletion.close();
-        onOpenChange(nextOpen);
-      }}
-    >
-      <DrawerTrigger asChild>{trigger}</DrawerTrigger>
-      <DrawerContent
-        data-testid="sidebar-filter-drawer"
-        className="h-[min(90dvh,48rem)] max-h-[calc(100dvh-1rem)] overflow-hidden rounded-t-xl"
-      >
-        <DrawerHeader className="shrink-0 border-b px-4 pb-3 pt-5 text-left">
-          <DrawerTitle>{title}</DrawerTitle>
-        </DrawerHeader>
-        <div
-          data-testid="sidebar-filter-popover"
-          className="min-h-0 flex-1 overflow-y-auto overscroll-contain pb-[calc(1rem+env(safe-area-inset-bottom))]"
+    <MobileConfirmationHost open={open} surface="drawer">
+      {({ contentProps }) => (
+        <Drawer
+          open={open}
+          onOpenChange={(nextOpen) => {
+            if (!nextOpen) deletion.close();
+            onOpenChange(nextOpen);
+          }}
         >
-          {editor}
-        </div>
-      </DrawerContent>
-    </Drawer>
+          <DrawerTrigger asChild>{trigger}</DrawerTrigger>
+          <DrawerContent
+            aria-describedby={undefined}
+            {...contentProps}
+            data-testid="sidebar-filter-drawer"
+            className="h-[min(90dvh,48rem)] max-h-[calc(100dvh-1rem)] overflow-hidden rounded-t-xl"
+          >
+            <MobileConfirmationHostBody>
+              <DrawerHeader className="shrink-0 border-b px-4 pb-3 pt-5 text-left">
+                <DrawerTitle>{title}</DrawerTitle>
+              </DrawerHeader>
+              <div
+                data-testid="sidebar-filter-popover"
+                className="min-h-0 flex-1 overflow-y-auto overscroll-contain pb-[calc(1rem+env(safe-area-inset-bottom))]"
+              >
+                {editor}
+              </div>
+            </MobileConfirmationHostBody>
+          </DrawerContent>
+        </Drawer>
+      )}
+    </MobileConfirmationHost>
   );
 }
diff --git a/apps/web/components/task/sidebar-filter/view-manager.tsx b/apps/web/components/task/sidebar-filter/view-manager.tsx
index 2e9f51ac97..bbb55b7e9d 100644
--- a/apps/web/components/task/sidebar-filter/view-manager.tsx
+++ b/apps/web/components/task/sidebar-filter/view-manager.tsx
@@ -13,6 +13,7 @@ import { Button } from "@kandev/ui/button";
 import type { SidebarView } from "@/lib/state/slices/ui/sidebar-view-types";
 import { useTranslation } from "react-i18next";
 import { sidebarViewName } from "@/lib/state/slices/ui/sidebar-view-builtins";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 
 type HeaderMode = "view" | "rename" | "saveAs";
 
@@ -33,6 +34,7 @@ type HeaderProps = {
 };
 
 export function ViewHeaderRow(props: HeaderProps) {
+  const { isMobile } = useResponsiveBreakpoint();
   const { t } = useTranslation();
   const [mode, setMode] = useState<HeaderMode>("view");
   const [nameDraft, setNameDraft] = useState("");
@@ -81,41 +83,44 @@ export function ViewHeaderRow(props: HeaderProps) {
     setEditingViewId(null);
   }, [activeViewId, editingViewId, mode]);
 
-  if (props.deleteConfirmation) {
+  if (props.deleteConfirmation && !isMobile) {
     return <div className="min-w-0 p-1">{props.deleteConfirmation}</div>;
   }
 
   return (
-    <div className="flex items-center justify-between gap-2">
-      <div className="flex flex-1 items-center gap-2 text-xs">
-        <span className="text-muted-foreground">
-          {mode === "saveAs" ? t("task:saveAs") : t("task:view")}
-        </span>
-        {isEditing ? (
-          <NameInput
-            mode={mode}
-            value={nameDraft}
-            onChange={setNameDraft}
-            onSubmit={submit}
-            onCancel={exit}
-          />
-        ) : (
-          <NameDisplay activeView={props.activeView} hasDraft={props.hasDraft} />
-        )}
+    <>
+      <div className="flex items-center justify-between gap-2">
+        <div className="flex flex-1 items-center gap-2 text-xs">
+          <span className="text-muted-foreground">
+            {mode === "saveAs" ? t("task:saveAs") : t("task:view")}
+          </span>
+          {isEditing ? (
+            <NameInput
+              mode={mode}
+              value={nameDraft}
+              onChange={setNameDraft}
+              onSubmit={submit}
+              onCancel={exit}
+            />
+          ) : (
+            <NameDisplay activeView={props.activeView} hasDraft={props.hasDraft} />
+          )}
+        </div>
+        <div className="flex items-center gap-1">
+          {isEditing ? (
+            <EditingActions
+              mode={mode}
+              canSubmit={!!nameDraft.trim()}
+              onSubmit={submit}
+              onCancel={exit}
+            />
+          ) : (
+            <ViewActions {...props} onRename={enterRename} onSaveAs={enterSaveAs} />
+          )}
+        </div>
       </div>
-      <div className="flex items-center gap-1">
-        {isEditing ? (
-          <EditingActions
-            mode={mode}
-            canSubmit={!!nameDraft.trim()}
-            onSubmit={submit}
-            onCancel={exit}
-          />
-        ) : (
-          <ViewActions {...props} onRename={enterRename} onSaveAs={enterSaveAs} />
-        )}
-      </div>
-    </div>
+      {isMobile ? props.deleteConfirmation : null}
+    </>
   );
 }
 
diff --git a/apps/web/components/task/simple/components/parent-picker.tsx b/apps/web/components/task/simple/components/parent-picker.tsx
index 14590978b5..4a68edb7a6 100644
--- a/apps/web/components/task/simple/components/parent-picker.tsx
+++ b/apps/web/components/task/simple/components/parent-picker.tsx
@@ -190,6 +190,7 @@ export function ParentPicker({ task }: ParentPickerProps) {
         testId="parent-picker-trigger"
       />
       <TaskDetachConfirmationSurface
+        taskId={task.id}
         open={detachConfirmation.open}
         anchorRef={detachAnchorRef}
         taskTitle={task.title}
diff --git a/apps/web/components/task/task-actions-menu-dialogs.tsx b/apps/web/components/task/task-actions-menu-dialogs.tsx
index 83f01dcdcd..69d7374577 100644
--- a/apps/web/components/task/task-actions-menu-dialogs.tsx
+++ b/apps/web/components/task/task-actions-menu-dialogs.tsx
@@ -140,6 +140,13 @@ export function TaskActionsMenuDialogs({
   const editBoardRow = useLastResolvedBoardRow(taskId, boardRow);
   if (!taskId) return null;
   const linkDialogTask = buildLinkDialogTask(taskId, taskTitle, boardRow);
+  const confirmationTarget = {
+    taskId,
+    taskTitle,
+    anchorRef: menu.triggerRef,
+    focusReturnRef: menu.triggerRef,
+    restoreFocusOnConfirm: true,
+  };
 
   return (
     <>
@@ -155,12 +162,8 @@ export function TaskActionsMenuDialogs({
         />
       )}
       <TaskArchiveConfirmation
+        {...confirmationTarget}
         open={menu.showArchiveConfirm}
-        anchorRef={menu.triggerRef}
-        focusReturnRef={menu.triggerRef}
-        restoreFocusOnConfirm
-        taskTitle={taskTitle}
-        taskId={taskId}
         executorType={boardRow?.primaryExecutorType ?? subjectExecutorType}
         isArchiving={isArchiving}
         onOpenChange={menu.setShowArchiveConfirm}
@@ -177,11 +180,8 @@ export function TaskActionsMenuDialogs({
         focusReturnRef={menu.triggerRef}
       />
       <TaskDetachConfirmationSurface
+        {...confirmationTarget}
         open={menu.showDetachConfirm}
-        anchorRef={menu.triggerRef}
-        focusReturnRef={menu.triggerRef}
-        restoreFocusOnConfirm
-        taskTitle={taskTitle}
         sharesParentWorkspace={boardRow?.workspaceMode === "inherit_parent"}
         onOpenChange={menu.setShowDetachConfirm}
         onConfirm={menu.handleDetachConfirm}
diff --git a/apps/web/components/task/task-archive-confirm-dialog.tsx b/apps/web/components/task/task-archive-confirm-dialog.tsx
index 75972f097e..3128208ca5 100644
--- a/apps/web/components/task/task-archive-confirm-dialog.tsx
+++ b/apps/web/components/task/task-archive-confirm-dialog.tsx
@@ -28,6 +28,7 @@ import {
   stopDialogPropagation,
 } from "./task-confirm-dialog-shared";
 import { useTranslation } from "react-i18next";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
 
 type TaskArchiveConfirmDialogProps = {
   open: boolean;
@@ -49,7 +50,7 @@ type TaskArchiveConfirmDialogProps = {
   executorType?: string | null;
   /** Executor types of the tasks being archived (bulk). */
   executorTypes?: Array<string | null | undefined>;
-  onConfirm: (opts: { cascade: boolean }) => void;
+  onConfirm: (opts: { cascade: boolean }) => void | Promise<void>;
   confirmTestId?: string;
   /** Preflight result supplied by the local confirmation adapter. */
   subtaskClassification?: SubtaskCountResult;
@@ -110,6 +111,55 @@ function isArchiveActionDisabled(
   );
 }
 
+function archiveCleanup({
+  isBulkOperation,
+  executorTypes,
+  executorType,
+}: Pick<TaskArchiveConfirmDialogProps, "isBulkOperation" | "executorTypes" | "executorType">) {
+  return isBulkOperation
+    ? getBulkCleanupSummary(executorTypes ?? [])
+    : getCleanupSummary(executorType);
+}
+
+function ArchiveOptions({
+  inFlight,
+  bulkCount,
+  subtaskCount,
+  cascade,
+  setCascade,
+  disabled,
+}: {
+  inFlight: boolean;
+  bulkCount?: number;
+  subtaskCount: number;
+  cascade: boolean;
+  setCascade: (value: boolean) => void;
+  disabled?: boolean;
+}) {
+  const { t } = useTranslation();
+  return (
+    <>
+      {inFlight && <StillWorkingWarning count={bulkCount} />}
+      {subtaskCount > 0 && (
+        <label className="flex min-h-11 cursor-pointer items-start gap-2 text-sm md:min-h-0">
+          <Checkbox
+            checked={cascade}
+            onCheckedChange={(v) => setCascade(v === true)}
+            disabled={disabled}
+            data-testid="archive-cascade-checkbox"
+          />
+          <span>
+            {t("task:alsoArchiveSubtasks", { count: subtaskCount })}
+            <span className="block text-sm text-muted-foreground">
+              {t("task:subtasksStayActiveUnlessYouTick")}
+            </span>
+          </span>
+        </label>
+      )}
+    </>
+  );
+}
+
 // The legacy cascade dialog intentionally keeps its state, preference bypass,
 // and cleanup copy in one boundary.
 // eslint-disable-next-line max-lines-per-function
@@ -140,9 +190,7 @@ export function TaskArchiveConfirmDialog({
   const firstLine = isBulkOperation
     ? t("task:archiveTasksConfirm", { count: safeCount })
     : t("task:archiveTaskConfirm", { taskTitle });
-  const cleanup = isBulkOperation
-    ? getBulkCleanupSummary(executorTypes ?? [])
-    : getCleanupSummary(executorType);
+  const cleanup = archiveCleanup({ isBulkOperation, executorTypes, executorType });
 
   const [cascade, setCascade] = useState(false);
   const confirmedRef = useRef(false);
@@ -179,7 +227,23 @@ export function TaskArchiveConfirmDialog({
 
   if (!requiresConfirmation) return null;
 
-  return (
+  const description = (
+    <div className="space-y-3">
+      <p data-testid="task-confirmation-outcome">{firstLine}</p>
+      <TaskCleanupConsequences summary={cleanup} />
+    </div>
+  );
+  const options = (
+    <ArchiveOptions
+      inFlight={taskIsInFlight}
+      bulkCount={isBulkOperation ? safeCount : undefined}
+      subtaskCount={subtaskCount}
+      cascade={cascade}
+      setCascade={setCascade}
+      disabled={isArchiving}
+    />
+  );
+  const desktop = (
     <AlertDialog open={open} onOpenChange={handleOpenChange}>
       <AlertDialogContent
         size="lg"
@@ -196,30 +260,9 @@ export function TaskArchiveConfirmDialog({
         </AlertDialogHeader>
         <div data-testid="task-confirmation-body" className={TASK_CONFIRM_BODY_CLASS}>
           <AlertDialogDescription asChild className="text-left text-sm leading-6">
-            <div className="space-y-3">
-              <p data-testid="task-confirmation-outcome">{firstLine}</p>
-              <TaskCleanupConsequences summary={cleanup} />
-            </div>
+            {description}
           </AlertDialogDescription>
-          {taskIsInFlight && (
-            <StillWorkingWarning count={isBulkOperation ? safeCount : undefined} />
-          )}
-          {subtaskCount > 0 && (
-            <label className="flex cursor-pointer items-start gap-2 text-sm">
-              <Checkbox
-                checked={cascade}
-                onCheckedChange={(v) => setCascade(v === true)}
-                disabled={isArchiving}
-                data-testid="archive-cascade-checkbox"
-              />
-              <span>
-                {t("task:alsoArchiveSubtasks", { count: subtaskCount })}
-                <span className="block text-sm text-muted-foreground">
-                  {t("task:subtasksStayActiveUnlessYouTick")}
-                </span>
-              </span>
-            </label>
-          )}
+          {options}
         </div>
         <AlertDialogFooter className={TASK_CONFIRM_FOOTER_CLASS}>
           <AlertDialogCancel className={TASK_CONFIRM_ACTION_CLASS}>
@@ -244,4 +287,24 @@ export function TaskArchiveConfirmDialog({
       </AlertDialogContent>
     </AlertDialog>
   );
+  return (
+    <MobileActionConfirmation
+      open={open}
+      targetKey={taskId ?? taskIds?.join(",") ?? "archive"}
+      onOpenChange={handleOpenChange}
+      focusReturnRef={focusReturnRef}
+      title={title}
+      description={description}
+      variant="default"
+      cancelLabel={t("common:cancel")}
+      confirmLabel={t("task:archive")}
+      confirmTestId={confirmTestId}
+      confirmDisabled={archiveDisabled}
+      onConfirm={() => onConfirm({ cascade })}
+      fallback={desktop}
+    >
+      {classification.status === "loading" && <p role="status">{t("common:loading")}</p>}
+      {options}
+    </MobileActionConfirmation>
+  );
 }
diff --git a/apps/web/components/task/task-archive-confirmation.test.tsx b/apps/web/components/task/task-archive-confirmation.test.tsx
index d0aedb9d92..6738878371 100644
--- a/apps/web/components/task/task-archive-confirmation.test.tsx
+++ b/apps/web/components/task/task-archive-confirmation.test.tsx
@@ -4,7 +4,7 @@ import { useCallback, useRef, useState, type ReactNode } from "react";
 import { StateProvider } from "@/components/state-provider";
 
 const getSubtaskCountMock = vi.hoisted(() => vi.fn());
-const pointerState = vi.hoisted(() => ({ isFinePointer: false }));
+const pointerState = vi.hoisted(() => ({ isFinePointer: false, isMobile: false }));
 const CONFIRM_TEST_ID = "archive-task-confirm";
 const INLINE_CONFIRMATION_TEST_ID = "task-archive-inline-confirmation";
 const CLEANUP_EFFECTS_TEST_ID = "task-cleanup-effects";
@@ -22,10 +22,48 @@ import { TaskArchiveConfirmation } from "./task-archive-confirmation";
 
 afterEach(cleanup);
 beforeEach(() => {
+  pointerState.isMobile = false;
   pointerState.isFinePointer = false;
   getSubtaskCountMock.mockReset();
 });
 
+describe("TaskArchiveConfirmation phone surfaces", () => {
+  it.each([false, true])("uses a stable phone sheet even with a fine pointer: %s", async (fine) => {
+    pointerState.isMobile = true;
+    pointerState.isFinePointer = fine;
+    const count = deferredSubtaskCount();
+    getSubtaskCountMock.mockReturnValue(count.promise);
+    const onConfirm = vi.fn();
+    renderConfirmation(onConfirm);
+    const sheet = screen.getByRole("dialog", { name: /Archive task/ });
+    expect(screen.getByTestId(CONFIRM_TEST_ID).hasAttribute("disabled")).toBe(true);
+    expect(screen.queryByTestId(INLINE_CONFIRMATION_TEST_ID)).toBeNull();
+    await act(async () => count.resolve({ count: 2 }));
+    expect(screen.getByRole("dialog", { name: /Archive task/ })).toBe(sheet);
+    const cascade = screen.getByRole("checkbox");
+    expect(cascade.getAttribute("data-state")).toBe("unchecked");
+    fireEvent.click(cascade);
+    fireEvent.click(screen.getByTestId(CONFIRM_TEST_ID));
+    await waitFor(() => expect(onConfirm).toHaveBeenCalledWith({ cascade: true }));
+    expect(onConfirm).toHaveBeenCalledOnce();
+  });
+
+  it("keeps forced phone archive in a bottom sheet and cancels delayed classification", async () => {
+    pointerState.isMobile = true;
+    const count = deferredSubtaskCount();
+    getSubtaskCountMock.mockReturnValue(count.promise);
+    const onConfirm = vi.fn();
+    const onOpenChange = vi.fn();
+    renderConfirmation(onConfirm, onOpenChange, true);
+    expect(screen.getByRole("dialog").getAttribute("data-slot")).toBe("drawer-content");
+    fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
+    await act(async () => count.resolve({ count: 3 }));
+    expect(screen.queryByRole("dialog")).toBeNull();
+    expect(onOpenChange).toHaveBeenCalledWith(false);
+    expect(onConfirm).not.toHaveBeenCalled();
+  });
+});
+
 function ConfirmationHarness({
   onConfirm,
   onOpenChange,
@@ -38,17 +76,26 @@ function ConfirmationHarness({
   renderInline?: (content: ReactNode) => ReactNode;
 }) {
   const anchorRef = useRef<HTMLButtonElement>(null);
+  const [open, setOpen] = useState(true);
   return (
     <>
-      <button ref={anchorRef} type="button" data-testid="archive-anchor">
+      <button
+        ref={anchorRef}
+        type="button"
+        data-testid="archive-anchor"
+        onClick={() => setOpen(true)}
+      >
         Archive source
       </button>
       <button type="button" data-testid="outside-action">
         Outside action
       </button>
       <TaskArchiveConfirmation
-        open
-        onOpenChange={onOpenChange}
+        open={open}
+        onOpenChange={(next) => {
+          setOpen(next);
+          onOpenChange(next);
+        }}
         anchorRef={anchorRef}
         taskId="task-1"
         taskTitle="Task One"
@@ -260,7 +307,11 @@ describe("TaskArchiveConfirmation classification", () => {
     fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
     expect(onOpenChange).toHaveBeenCalledWith(false);
 
-    fireEvent.click(archive);
+    fireEvent.click(screen.getByTestId("archive-anchor"));
+    await waitFor(() =>
+      expect(screen.getByTestId(CONFIRM_TEST_ID).hasAttribute("disabled")).toBe(false),
+    );
+    fireEvent.click(screen.getByTestId(CONFIRM_TEST_ID));
     await waitFor(() => expect(onConfirm).toHaveBeenCalledWith({ cascade: false }));
     expect(onOpenChange).toHaveBeenCalledWith(false);
   });
diff --git a/apps/web/components/task/task-archive-confirmation.tsx b/apps/web/components/task/task-archive-confirmation.tsx
index e440b5c3ce..0451063669 100644
--- a/apps/web/components/task/task-archive-confirmation.tsx
+++ b/apps/web/components/task/task-archive-confirmation.tsx
@@ -5,7 +5,7 @@ import { useTranslation } from "react-i18next";
 import { useAppStore } from "@/components/state-provider";
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
-import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
+import { useConfirmationBoundary } from "@/components/confirmation/mobile-action-confirmation";
 import { useSubtaskCountState, type SubtaskCountResult } from "@/hooks/use-subtask-count";
 import { useTaskInFlight } from "@/hooks/use-task-in-flight";
 import { getCleanupSummary, type CleanupSummary } from "./task-cleanup-summary";
@@ -227,6 +227,7 @@ type ArchiveConfirmationContentProps = ArchiveDialogProps & {
   confirmTaskArchive: boolean;
   forceDialog: boolean;
   isFinePointer: boolean;
+  isMobile: boolean;
   taskIsInFlight: boolean;
   anchorRef: RefObject<HTMLElement | null>;
   focusReturnRef?: RefObject<HTMLElement | null>;
@@ -239,6 +240,7 @@ function ArchiveConfirmationContent({
   confirmTaskArchive,
   forceDialog,
   isFinePointer,
+  isMobile,
   taskIsInFlight,
   anchorRef,
   focusReturnRef,
@@ -250,6 +252,7 @@ function ArchiveConfirmationContent({
 }: ArchiveConfirmationContentProps) {
   const { t } = useTranslation();
   const shouldUseDialog =
+    isMobile ||
     forceDialog ||
     !confirmTaskArchive ||
     dialogProps.isBulkOperation ||
@@ -340,19 +343,24 @@ export function TaskArchiveConfirmation({
   renderInline,
   forceDialog = false,
 }: TaskArchiveConfirmationProps) {
-  const { isFinePointer } = useResponsiveBreakpoint();
+  const { isFinePointer, isMobile, changed } = useConfirmationBoundary(
+    open,
+    taskId ?? taskIds?.join(",") ?? "archive",
+    onOpenChange,
+  );
   const confirmTaskArchive = useAppStore((state) => state.userSettings?.confirmTaskArchive ?? true);
   const classification = useSubtaskCountState(open && confirmTaskArchive, taskId, taskIds);
   const storeInFlight = useTaskInFlight(taskId, taskIds, open && confirmTaskArchive);
   const taskIsInFlight = Boolean(isInFlight) || storeInFlight;
 
-  if (!open) return null;
+  if (!open || changed) return null;
 
   return (
     <ArchiveConfirmationContent
       confirmTaskArchive={confirmTaskArchive}
       forceDialog={forceDialog}
       isFinePointer={isFinePointer}
+      isMobile={isMobile}
       taskIsInFlight={taskIsInFlight}
       anchorRef={anchorRef}
       focusReturnRef={focusReturnRef}
diff --git a/apps/web/components/task/task-detach-confirm-dialog.test.tsx b/apps/web/components/task/task-detach-confirm-dialog.test.tsx
index f2b289d220..be6dde5297 100644
--- a/apps/web/components/task/task-detach-confirm-dialog.test.tsx
+++ b/apps/web/components/task/task-detach-confirm-dialog.test.tsx
@@ -6,9 +6,43 @@ import {
   TaskDetachConfirmPopover,
   TaskDetachInlineConfirmation,
   TaskDetachTargetConfirmDialog,
+  TaskDetachConfirmationSurface,
 } from "./task-detach-confirm-dialog";
 
-afterEach(cleanup);
+afterEach(() => {
+  cleanup();
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
+});
+
+it("routes phone detach to a sheet with the named hierarchy-only consequence", async () => {
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+  const onConfirm = vi.fn();
+  function Phone() {
+    const [open, setOpen] = useState(true);
+    const anchorRef = useRef<HTMLButtonElement>(null);
+    return (
+      <>
+        <button ref={anchorRef}>Child task</button>
+        <TaskDetachConfirmationSurface
+          taskId="child"
+          open={open}
+          anchorRef={anchorRef}
+          taskTitle="Child task"
+          sharesParentWorkspace
+          onOpenChange={setOpen}
+          onConfirm={onConfirm}
+        />
+      </>
+    );
+  }
+  render(<Phone />);
+  const sheet = await screen.findByRole("dialog", { name: "Detach task from parent?" });
+  expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+  expect(sheet.textContent).toContain("Child task");
+  expect(sheet.textContent).toContain("shares its parent's workspace");
+  fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
+  expect(onConfirm).not.toHaveBeenCalled();
+});
 
 function PopoverHarness({ onConfirm = vi.fn() }: { onConfirm?: () => void | Promise<void> }) {
   const [open, setOpen] = useState(true);
diff --git a/apps/web/components/task/task-detach-confirm-dialog.tsx b/apps/web/components/task/task-detach-confirm-dialog.tsx
index 4c12eb17cf..08ac7050b6 100644
--- a/apps/web/components/task/task-detach-confirm-dialog.tsx
+++ b/apps/web/components/task/task-detach-confirm-dialog.tsx
@@ -15,10 +15,13 @@ import {
 import { useTranslation } from "react-i18next";
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
 import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 
 const DETACH_TASK_FROM_PARENT_KEY = "task:detachTaskFromParent";
 const DETACH_LABEL_KEY = "task:detach";
+const DETACH_CONFIRM_TEST_ID = "detach-task-confirm";
+const CANCEL_KEY = "common:cancel";
 
 export type TaskDetachConfirmationCopyProps = {
   taskTitle?: string;
@@ -108,10 +111,10 @@ export function TaskDetachConfirmPopover({
           sharesParentWorkspace={sharesParentWorkspace}
         />
       }
-      cancelLabel={t("common:cancel")}
+      cancelLabel={t(CANCEL_KEY)}
       confirmLabel={t(DETACH_LABEL_KEY)}
       confirmAriaLabel={detachConfirmAriaLabel(t, taskTitle)}
-      confirmTestId="detach-task-confirm"
+      confirmTestId={DETACH_CONFIRM_TEST_ID}
       testId="detach-task-confirm-popover"
       onOpenChange={onOpenChange}
       onCancel={onCancel}
@@ -145,10 +148,10 @@ export function TaskDetachInlineConfirmation({
           sharesParentWorkspace={sharesParentWorkspace}
         />
       }
-      cancelLabel={t("common:cancel")}
+      cancelLabel={t(CANCEL_KEY)}
       confirmLabel={t(DETACH_LABEL_KEY)}
       confirmAriaLabel={detachConfirmAriaLabel(t, taskTitle)}
-      confirmTestId="detach-task-confirm"
+      confirmTestId={DETACH_CONFIRM_TEST_ID}
       onCancel={onCancel}
       onClose={onClose}
       onConfirm={onConfirm}
@@ -157,6 +160,7 @@ export function TaskDetachInlineConfirmation({
 }
 
 export type TaskDetachConfirmationSurfaceProps = TaskDetachConfirmationCopyProps & {
+  taskId: string;
   open: boolean;
   anchorRef: RefObject<HTMLElement | null>;
   focusReturnRef?: RefObject<HTMLElement | null>;
@@ -166,6 +170,7 @@ export type TaskDetachConfirmationSurfaceProps = TaskDetachConfirmationCopyProps
 };
 
 export function TaskDetachConfirmationSurface({
+  taskId,
   open,
   anchorRef,
   focusReturnRef,
@@ -175,25 +180,22 @@ export function TaskDetachConfirmationSurface({
   onOpenChange,
   onConfirm,
 }: TaskDetachConfirmationSurfaceProps) {
+  const { t } = useTranslation();
   const { isFinePointer } = useResponsiveBreakpoint();
-  if (isFinePointer) {
-    return (
-      <TaskDetachConfirmPopover
-        open={open}
-        anchorRef={anchorRef}
-        focusReturnRef={focusReturnRef}
-        restoreFocusOnConfirm={restoreFocusOnConfirm}
-        focusBoundaryRef={anchorRef}
-        taskTitle={taskTitle}
-        sharesParentWorkspace={sharesParentWorkspace}
-        onOpenChange={onOpenChange}
-        onCancel={() => onOpenChange(false)}
-        onConfirm={onConfirm}
-      />
-    );
-  }
-  if (!open) return null;
-  return (
+  const fallback = isFinePointer ? (
+    <TaskDetachConfirmPopover
+      open={open}
+      anchorRef={anchorRef}
+      focusReturnRef={focusReturnRef}
+      restoreFocusOnConfirm={restoreFocusOnConfirm}
+      focusBoundaryRef={anchorRef}
+      taskTitle={taskTitle}
+      sharesParentWorkspace={sharesParentWorkspace}
+      onOpenChange={onOpenChange}
+      onCancel={() => onOpenChange(false)}
+      onConfirm={onConfirm}
+    />
+  ) : (
     <TaskDetachInlineConfirmation
       taskTitle={taskTitle}
       sharesParentWorkspace={sharesParentWorkspace}
@@ -202,6 +204,27 @@ export function TaskDetachConfirmationSurface({
       onConfirm={onConfirm}
     />
   );
+  return (
+    <MobileActionConfirmation
+      open={open}
+      targetKey={taskId}
+      title={t(DETACH_TASK_FROM_PARENT_KEY)}
+      description={
+        <TaskDetachDescription
+          taskTitle={taskTitle}
+          sharesParentWorkspace={sharesParentWorkspace}
+        />
+      }
+      cancelLabel={t(CANCEL_KEY)}
+      confirmLabel={t(DETACH_LABEL_KEY)}
+      confirmAriaLabel={detachConfirmAriaLabel(t, taskTitle)}
+      confirmTestId={DETACH_CONFIRM_TEST_ID}
+      focusReturnRef={focusReturnRef ?? anchorRef}
+      onOpenChange={onOpenChange}
+      onConfirm={onConfirm}
+      fallback={fallback}
+    />
+  );
 }
 
 type TaskDetachConfirmDialogProps = {
@@ -244,12 +267,12 @@ export function TaskDetachConfirmDialog({
         </AlertDialogHeader>
         <AlertDialogFooter>
           <AlertDialogCancel disabled={isDetaching} className="cursor-pointer">
-            {t("common:cancel")}
+            {t(CANCEL_KEY)}
           </AlertDialogCancel>
           <AlertDialogAction
             disabled={isDetaching}
             className="cursor-pointer"
-            data-testid="detach-task-confirm"
+            data-testid={DETACH_CONFIRM_TEST_ID}
             onClick={(event) => {
               event.preventDefault();
               if (!isDetaching) onConfirm();
diff --git a/apps/web/components/task/task-plan-revision-restore-actions.test.tsx b/apps/web/components/task/task-plan-revision-restore-actions.test.tsx
new file mode 100644
index 0000000000..330633aa39
--- /dev/null
+++ b/apps/web/components/task/task-plan-revision-restore-actions.test.tsx
@@ -0,0 +1,80 @@
+import { cleanup, fireEvent, render, screen, waitFor, within } from "@testing-library/react";
+import { afterEach, expect, it, vi } from "vitest";
+import type { TaskPlanRevision } from "@/lib/types/http";
+import { TaskPlanRevisions } from "./task-plan-revisions";
+
+vi.mock("@/hooks/use-responsive-breakpoint", () => ({
+  useResponsiveBreakpoint: () => ({ isMobile: true, isFinePointer: false }),
+}));
+vi.mock("@/components/state-provider", () => ({
+  useAppStore: (selector: (state: unknown) => unknown) =>
+    selector({ tasks: { activeSessionId: null }, taskSessions: { items: {} } }),
+}));
+vi.mock("@/lib/toast/sonner", () => ({ toast: { success: vi.fn(), error: vi.fn() } }));
+vi.mock("@/components/agent-logo", () => ({ AgentLogo: () => null }));
+vi.mock("./task-plan-preview-dialog", () => ({ PlanRevisionPreviewDialog: () => null }));
+vi.mock("./task-plan-diff-dialog", () => ({ PlanRevisionDiffDialog: () => null }));
+afterEach(cleanup);
+
+const revisions: TaskPlanRevision[] = [2, 1].map((version) => ({
+  id: `revision-${version}`,
+  task_id: "task-1",
+  revision_number: version,
+  title: `Version ${version}`,
+  content: `Plan ${version}`,
+  author_kind: "user",
+  author_name: "user",
+  created_at: "2026-09-10T10:00:00Z",
+  updated_at: "2026-09-10T10:00:00Z",
+}));
+
+function history() {
+  const props = {
+    taskId: "task-1",
+    revisions,
+    isLoading: false,
+    isSaving: false,
+    onOpen: vi.fn(),
+    onRevert: vi.fn().mockResolvedValue(revisions[0]),
+    loadRevisionContent: vi.fn().mockResolvedValue("content"),
+    previewRevisionId: null,
+    setPreviewRevision: vi.fn(),
+    comparePair: [null, null] as [string | null, string | null],
+    toggleCompareSelection: vi.fn(),
+    clearComparePair: vi.fn(),
+  };
+  const view = render(<TaskPlanRevisions {...props} />);
+  const trigger = screen.getByTestId("plan-rewind-button");
+  const open = () => {
+    fireEvent.click(trigger);
+    fireEvent.click(screen.getByTestId("plan-revision-revert-button"));
+  };
+  open();
+  return { ...view, props, trigger, open };
+}
+
+it("hands off plan history to a standalone phone sheet and restores trigger focus", async () => {
+  const { props, trigger, open } = history();
+  const sheet = await screen.findByRole("dialog", { name: "Restore to version 1?" });
+  expect(sheet.getAttribute("data-slot")).toBe("drawer-content");
+  expect(screen.queryByTestId("plan-revisions-popover")).toBeNull();
+  expect(screen.queryByTestId("plan-revision-restore-inline-confirmation")).toBeNull();
+  fireEvent.click(within(sheet).getByRole("button", { name: "Cancel" }));
+  await waitFor(() => expect(document.activeElement).toBe(trigger));
+  expect(props.onRevert).not.toHaveBeenCalled();
+  open();
+  const confirm = await screen.findByTestId("plan-revision-restore-confirm");
+  fireEvent.click(confirm);
+  fireEvent.click(confirm);
+  await waitFor(() => expect(props.onRevert).toHaveBeenCalledExactlyOnceWith("revision-1"));
+});
+
+it("cancels a captured revision when the task changes", async () => {
+  const { props, rerender } = history();
+  const sheet = await screen.findByRole("dialog", { name: "Restore to version 1?" });
+  const confirm = within(sheet).getByTestId("plan-revision-restore-confirm");
+  rerender(<TaskPlanRevisions {...props} taskId="task-2" />);
+  await waitFor(() => expect(screen.queryByRole("dialog")).toBeNull());
+  fireEvent.click(confirm);
+  expect(props.onRevert).not.toHaveBeenCalled();
+});
diff --git a/apps/web/components/task/task-plan-revision-restore-actions.tsx b/apps/web/components/task/task-plan-revision-restore-actions.tsx
index 11628710d3..d6da5e0b2c 100644
--- a/apps/web/components/task/task-plan-revision-restore-actions.tsx
+++ b/apps/web/components/task/task-plan-revision-restore-actions.tsx
@@ -1,12 +1,13 @@
 "use client";
 
-import { useRef } from "react";
+import { useRef, type RefObject } from "react";
 import { IconRestore } from "@tabler/icons-react";
 import { Button } from "@kandev/ui/button";
 import { useTranslation } from "react-i18next";
 
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
 import type { TaskPlanRevision } from "@/lib/types/http";
 
 type RevisionRestoreProps = {
@@ -23,6 +24,43 @@ type RevisionRestoreActionProps = RevisionRestoreProps & {
   onRevertRequest: (revision: TaskPlanRevision) => void;
 };
 
+export function MobileRevisionRestoreConfirmation({
+  taskId,
+  target,
+  isSaving,
+  anchorRef,
+  onClose,
+  onRevert,
+}: {
+  taskId: string;
+  target: TaskPlanRevision | null;
+  isSaving: boolean;
+  anchorRef: RefObject<HTMLButtonElement | null>;
+  onClose: () => void;
+  onRevert: (revision: TaskPlanRevision) => Promise<void>;
+}) {
+  const { t } = useTranslation();
+  const version = target?.revision_number;
+  return (
+    <MobileActionConfirmation
+      open={target !== null}
+      targetKey={`${taskId}:${target?.id}`}
+      title={t("task:restoreToVersionConfirm", { version })}
+      subject={target?.title}
+      description={t("task:restoreToVersionDescription", { version })}
+      cancelLabel={t("common:cancel")}
+      confirmLabel={t("task:restoreVersion", { version })}
+      confirmTestId="plan-revision-restore-confirm"
+      focusReturnRef={anchorRef}
+      disabled={isSaving}
+      onOpenChange={(next) => {
+        if (!next) onClose();
+      }}
+      onConfirm={() => (target ? onRevert(target) : undefined)}
+    />
+  );
+}
+
 export function RevisionRestoreAction({
   revision,
   isCurrent,
@@ -49,7 +87,7 @@ export function RevisionRestoreAction({
           size="sm"
           variant="ghost"
           disabled={isSaving}
-          className="h-7 px-2 text-xs cursor-pointer shrink-0 gap-1"
+          className="h-11 md:h-7 px-2 text-xs cursor-pointer shrink-0 gap-1"
           onClick={(event) => {
             event.stopPropagation();
             onRevertRequest(revision);
diff --git a/apps/web/components/task/task-plan-revisions.tsx b/apps/web/components/task/task-plan-revisions.tsx
index 604f077a97..6632d6ba23 100644
--- a/apps/web/components/task/task-plan-revisions.tsx
+++ b/apps/web/components/task/task-plan-revisions.tsx
@@ -18,6 +18,7 @@ import { PlanRevisionDiffDialog } from "./task-plan-diff-dialog";
 import { RevertConfirmDialog } from "./task-plan-revert-confirm-dialog";
 import { TaskPlanRevisionRow } from "./task-plan-revision-row";
 import { useTranslation } from "react-i18next";
+import { MobileRevisionRestoreConfirmation } from "./task-plan-revision-restore-actions";
 import type { TFunction } from "i18next";
 
 type ComparePair = [string | null, string | null];
@@ -48,12 +49,14 @@ type TaskPlanRevisionsProps = {
 const USER_DISPLAY_NAME_KEY = "common:you";
 
 export function TaskPlanRevisions(props: TaskPlanRevisionsProps) {
-  const { t } = useTranslation();
-  const { isFinePointer } = useResponsiveBreakpoint();
+  const { isFinePointer, isMobile } = useResponsiveBreakpoint();
   const [open, setOpen] = useState(false);
   const [confirmTarget, setConfirmTarget] = useState<TaskPlanRevision | null>(null);
   const [rowConfirmTarget, setRowConfirmTarget] = useState<TaskPlanRevision | null>(null);
   const [diffOpen, setDiffOpen] = useState(false);
+  const [mobileTarget, setMobileTarget] = useState<TaskPlanRevision | null>(null);
+  const pendingMobileTarget = useRef<TaskPlanRevision | null>(null);
+  const historyTriggerRef = useRef<HTMLButtonElement>(null);
   const agentName = useActiveAgentBackendName();
   const triggerOpenChange = useTriggerOnFirstOpen(setOpen, props.onOpen);
   const handleOpenChange = useCallback(
@@ -65,26 +68,7 @@ export function TaskPlanRevisions(props: TaskPlanRevisionsProps) {
   );
   const closePopover = useCallback(() => handleOpenChange(false), [handleOpenChange]);
 
-  const handleRevert = useCallback(
-    async (revision: TaskPlanRevision) => {
-      try {
-        const result = await props.onRevert(revision.id);
-        if (result) {
-          toast.success(t("task:planRestoredToV", { revisionnumber: revision.revision_number }));
-          closePopover();
-          props.setPreviewRevision(null);
-          setDiffOpen(false);
-        } else {
-          // `revertTo` (the hook impl) swallows errors and returns null, so
-          // surface the failure instead of closing silently.
-          toast.error(t("task:failedToRestorePlan"));
-        }
-      } catch (err) {
-        toast.error(err instanceof Error ? err.message : t("task:failedToRestorePlan"));
-      }
-    },
-    [closePopover, props.onRevert, props.setPreviewRevision, t],
-  );
+  const handleRevert = useRevisionRestore(props, closePopover, setDiffOpen);
 
   const previewRevision = useMemo(
     () => props.revisions.find((r) => r.id === props.previewRevisionId) ?? null,
@@ -98,20 +82,49 @@ export function TaskPlanRevisions(props: TaskPlanRevisionsProps) {
     [props.revisions, props.comparePair],
   );
   const headRevision = props.revisions[0] ?? null;
+  useEffect(() => {
+    if (
+      mobileTarget &&
+      (mobileTarget.task_id !== props.taskId ||
+        !props.revisions.slice(1).some((revision) => revision.id === mobileTarget.id))
+    ) {
+      setMobileTarget(null);
+    }
+  }, [mobileTarget, props.taskId, props.revisions]);
 
   return (
     <>
       <RevisionsPopover
+        historyTriggerRef={historyTriggerRef}
+        onCloseAutoFocus={(event) => {
+          const target = pendingMobileTarget.current;
+          pendingMobileTarget.current = null;
+          if (!target || target.task_id !== props.taskId) return;
+          event.preventDefault();
+          setMobileTarget(target);
+        }}
         open={open}
         onOpenChange={handleOpenChange}
         agentName={agentName}
         rowConfirmTarget={rowConfirmTarget}
         isFinePointer={isFinePointer}
-        onRowRevertRequest={setRowConfirmTarget}
+        onRowRevertRequest={(revision) => {
+          if (!isMobile) return setRowConfirmTarget(revision);
+          pendingMobileTarget.current = revision;
+          closePopover();
+        }}
         onRowRevertCancel={() => setRowConfirmTarget(null)}
         onRowRevert={handleRevert}
         {...props}
       />
+      <MobileRevisionRestoreConfirmation
+        taskId={props.taskId}
+        target={mobileTarget}
+        anchorRef={historyTriggerRef}
+        isSaving={props.isSaving}
+        onClose={() => setMobileTarget(null)}
+        onRevert={handleRevert}
+      />
       <RevisionsDialogStack
         revisions={props.revisions}
         previewRevision={previewRevision}
@@ -132,6 +145,33 @@ export function TaskPlanRevisions(props: TaskPlanRevisionsProps) {
   );
 }
 
+function useRevisionRestore(
+  props: Pick<TaskPlanRevisionsProps, "onRevert" | "setPreviewRevision">,
+  closePopover: () => void,
+  setDiffOpen: (open: boolean) => void,
+) {
+  const { t } = useTranslation();
+  return useCallback(
+    async (revision: TaskPlanRevision) => {
+      try {
+        const result = await props.onRevert(revision.id);
+        if (result) {
+          toast.success(t("task:planRestoredToV", { revisionnumber: revision.revision_number }));
+          closePopover();
+          props.setPreviewRevision(null);
+          setDiffOpen(false);
+        } else {
+          // The persistence hook reports a failed restore as null.
+          toast.error(t("task:failedToRestorePlan"));
+        }
+      } catch (err) {
+        toast.error(err instanceof Error ? err.message : t("task:failedToRestorePlan"));
+      }
+    },
+    [closePopover, props.onRevert, props.setPreviewRevision, setDiffOpen, t],
+  );
+}
+
 /** Lazy-load revisions on the first popover open; subsequent opens reuse the
  * cached list. Wraps the open setter so callers don't need a ref of their own. */
 function useTriggerOnFirstOpen(setOpen: (v: boolean) => void, onOpen: () => void) {
@@ -149,6 +189,8 @@ function useTriggerOnFirstOpen(setOpen: (v: boolean) => void, onOpen: () => void
 }
 
 function RevisionsPopover({
+  historyTriggerRef,
+  onCloseAutoFocus,
   open,
   onOpenChange,
   agentName,
@@ -163,6 +205,8 @@ function RevisionsPopover({
   setPreviewRevision,
   disabled = false,
 }: TaskPlanRevisionsProps & {
+  historyTriggerRef: React.RefObject<HTMLButtonElement | null>;
+  onCloseAutoFocus: (event: Event) => void;
   open: boolean;
   onOpenChange: (next: boolean) => void;
   agentName: string | null;
@@ -178,9 +222,10 @@ function RevisionsPopover({
     <Popover open={open} onOpenChange={onOpenChange}>
       <PopoverTrigger asChild>
         <Button
+          ref={historyTriggerRef}
           size="icon"
           variant="ghost"
-          className="h-7 w-7 cursor-pointer"
+          className="h-11 w-11 md:h-7 md:w-7 cursor-pointer"
           disabled={disabled || !hasRevisions}
           data-testid="plan-rewind-button"
           title={t("task:viewPlanHistory")}
@@ -189,6 +234,7 @@ function RevisionsPopover({
         </Button>
       </PopoverTrigger>
       <PopoverContent
+        onCloseAutoFocus={onCloseAutoFocus}
         align="end"
         // Override the popover's default `gap-4` between flex children — it
         // was rendering as visible empty space above the top-most row.
diff --git a/apps/web/components/task/task-switcher-archive-confirmation.tsx b/apps/web/components/task/task-switcher-archive-confirmation.tsx
index 928e3e1596..a76bdfe700 100644
--- a/apps/web/components/task/task-switcher-archive-confirmation.tsx
+++ b/apps/web/components/task/task-switcher-archive-confirmation.tsx
@@ -3,6 +3,7 @@
 import { useEffect, useRef, useState } from "react";
 import { TaskArchiveConfirmation } from "./task-archive-confirmation";
 import type { TaskSwitcherItem } from "./task-switcher-types";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 
 type TaskSwitcherArchiveConfirmationOptions = {
   task: TaskSwitcherItem;
@@ -17,7 +18,9 @@ export function useTaskSwitcherArchiveConfirmation({
   isArchiving,
   closeMenu,
 }: TaskSwitcherArchiveConfirmationOptions) {
+  const { isMobile } = useResponsiveBreakpoint();
   const [archiveOpen, setArchiveOpen] = useState(false);
+  const pendingPhoneArchive = useRef(false);
   const archiveAnchorRef = useRef<HTMLDivElement>(null);
   const openTimerRef = useRef<number | null>(null);
   useEffect(
@@ -28,6 +31,10 @@ export function useTaskSwitcherArchiveConfirmation({
   );
   const requestArchive = onArchiveTask
     ? () => {
+        if (isMobile) {
+          pendingPhoneArchive.current = true;
+          return;
+        }
         closeMenu();
         openTimerRef.current = window.setTimeout(() => {
           openTimerRef.current = null;
@@ -51,5 +58,17 @@ export function useTaskSwitcherArchiveConfirmation({
       />
     ) : undefined;
 
-  return { archiveOpen, archiveAnchorRef, requestArchive, archiveConfirmation };
+  const handleMenuCloseAutoFocus = (event: Event) => {
+    if (!pendingPhoneArchive.current) return;
+    event.preventDefault();
+    pendingPhoneArchive.current = false;
+    setArchiveOpen(true);
+  };
+  return {
+    archiveOpen,
+    archiveAnchorRef,
+    requestArchive,
+    archiveConfirmation,
+    handleMenuCloseAutoFocus,
+  };
 }
diff --git a/apps/web/components/task/task-switcher-context-menu.test.tsx b/apps/web/components/task/task-switcher-context-menu.test.tsx
index 538abf62d6..08087231e3 100644
--- a/apps/web/components/task/task-switcher-context-menu.test.tsx
+++ b/apps/web/components/task/task-switcher-context-menu.test.tsx
@@ -33,6 +33,7 @@ vi.mock("@/hooks/use-compact-task-chrome", () => ({
 
 afterEach(() => {
   cleanup();
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
   pluginRegistry.unregisterPlugin(PLUGIN_ID);
 });
 
@@ -47,9 +48,24 @@ function task(overrides: Partial<TaskSwitcherItem> = {}): TaskSwitcherItem {
 }
 
 function ArchiveAwareRow({ archiveConfirmation }: { archiveConfirmation?: ReactNode }) {
-  return <div data-testid="task-row">Task 1{archiveConfirmation}</div>;
+  return (
+    <div data-testid="task-row" data-inline-confirmation={Boolean(archiveConfirmation)}>
+      Task 1{archiveConfirmation}
+    </div>
+  );
 }
 
+it("keeps phone rows intact while archive hands off from the menu to a sheet", async () => {
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+  const { onArchiveTask } = renderWithDragHandle();
+  await openContextMenu();
+  fireEvent.click(screen.getByRole("menuitem", { name: /archive/i }));
+  await screen.findByRole("dialog", { name: /Archive task/ });
+  expect(screen.queryByRole("menu")).toBeNull();
+  expect(screen.getByTestId("task-row").getAttribute("data-inline-confirmation")).toBe("false");
+  expect(onArchiveTask).not.toHaveBeenCalled();
+});
+
 /**
  * Stands in for the dnd-kit drag handle that wraps the row. In the real tree
  * the handle's sensor listeners (`onMouseDown`, `onTouchStart`, `onPointerDown`)
diff --git a/apps/web/components/task/task-switcher-context-menu.tsx b/apps/web/components/task/task-switcher-context-menu.tsx
index c2416834e8..d940ba032b 100644
--- a/apps/web/components/task/task-switcher-context-menu.tsx
+++ b/apps/web/components/task/task-switcher-context-menu.tsx
@@ -68,7 +68,7 @@ export function TaskItemWithContextMenu(props: ContextMenuProps) {
     setMenuKey((k) => k + 1);
   };
   const { handleOpenChange, triggerProps } = useMenuTouchDragCancel(setContextOpen);
-  const { isFinePointer } = useResponsiveBreakpoint();
+  const { isFinePointer, isMobile } = useResponsiveBreakpoint();
   const usesTouchDrawer = useTouchDrawer();
   const archive = useTaskSwitcherArchiveConfirmation({
     task: menuProps.task,
@@ -77,8 +77,8 @@ export function TaskItemWithContextMenu(props: ContextMenuProps) {
     closeMenu,
   });
   const archiveConfirmation = archive.archiveOpen ? archive.archiveConfirmation : undefined;
-  const inlineArchiveConfirmation = isFinePointer ? undefined : archiveConfirmation;
-  const portaledArchiveConfirmation = isFinePointer ? archiveConfirmation : undefined;
+  const inlineArchiveConfirmation = isMobile || isFinePointer ? undefined : archiveConfirmation;
+  const portaledArchiveConfirmation = isMobile || isFinePointer ? archiveConfirmation : undefined;
   const {
     moveOptionsStep,
     isMoving,
@@ -123,6 +123,7 @@ export function TaskItemWithContextMenu(props: ContextMenuProps) {
           </div>
         </ContextMenuTrigger>
         <ContextMenuContent
+          onCloseAutoFocus={archive.handleMenuCloseAutoFocus}
           className="w-48"
           onInteractOutside={(event) => {
             if (isWorkflowMoveOptionsTarget(event.target)) {
diff --git a/apps/web/components/task/terminal-close-inline-confirmation.test.tsx b/apps/web/components/task/terminal-close-inline-confirmation.test.tsx
new file mode 100644
index 0000000000..5eff253ac2
--- /dev/null
+++ b/apps/web/components/task/terminal-close-inline-confirmation.test.tsx
@@ -0,0 +1,78 @@
+import { useRef, useState } from "react";
+import { act, cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+import { TerminalCloseInlineConfirmation } from "./terminal-close-inline-confirmation";
+import { MobilePickerSheet } from "./mobile/mobile-picker-sheet";
+
+beforeEach(() => Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 }));
+afterEach(() => {
+  cleanup();
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
+});
+
+function Picker({ onConfirm, events }: { onConfirm: () => Promise<void>; events: string[] }) {
+  const [open, setOpen] = useState(false);
+  const trigger = useRef<HTMLButtonElement>(null);
+  return (
+    <MobilePickerSheet open onOpenChange={vi.fn()} title="Terminals" confirmationHost>
+      <button ref={trigger} onClick={() => setOpen(true)}>
+        Close build shell
+      </button>
+      <button>Sibling shell</button>
+      {open && (
+        <TerminalCloseInlineConfirmation
+          terminalId="shell-build"
+          terminalLabel="Build shell"
+          focusReturnRef={trigger}
+          onCancel={() => {
+            events.push("cancel");
+            setOpen(false);
+          }}
+          onClose={() => {
+            events.push("close");
+            setOpen(false);
+          }}
+          onConfirm={onConfirm}
+        />
+      )}
+    </MobilePickerSheet>
+  );
+}
+
+it("closes its named picker step before teardown and permits only one dispatch", async () => {
+  const events: string[] = [];
+  let finish!: () => void;
+  const onConfirm = vi.fn(() => {
+    events.push("dispatch");
+    return new Promise<void>((resolve) => {
+      finish = resolve;
+    });
+  });
+  render(<Picker onConfirm={onConfirm} events={events} />);
+  const picker = screen.getByRole("dialog", { name: "Terminals" });
+  fireEvent.click(screen.getByRole("button", { name: "Close build shell" }));
+  expect(screen.getByRole("dialog", { name: "Close terminal?" })).toBe(picker);
+  expect(screen.getByRole("group").textContent).toContain("Build shell");
+  expect(screen.queryByRole("button", { name: "Sibling shell" })).toBeNull();
+  const confirm = screen.getByRole("button", { name: "Close terminal" });
+  act(() => {
+    fireEvent.click(confirm);
+    fireEvent.click(confirm);
+  });
+  expect(screen.getByRole("button", { name: "Sibling shell" })).toBeTruthy();
+  await waitFor(() => expect(onConfirm).toHaveBeenCalledOnce());
+  expect(events).toEqual(["close", "dispatch"]);
+  await act(async () => finish());
+});
+
+it("Back restores the original trigger without calling close or teardown", async () => {
+  const events: string[] = [];
+  const onConfirm = vi.fn().mockResolvedValue(undefined);
+  render(<Picker onConfirm={onConfirm} events={events} />);
+  const trigger = screen.getByRole("button", { name: "Close build shell" });
+  fireEvent.click(trigger);
+  fireEvent.click(screen.getByRole("button", { name: "Back" }));
+  await waitFor(() => expect(document.activeElement).toBe(trigger));
+  expect(events).toEqual(["cancel"]);
+  expect(onConfirm).not.toHaveBeenCalled();
+});
diff --git a/apps/web/components/task/terminal-close-inline-confirmation.tsx b/apps/web/components/task/terminal-close-inline-confirmation.tsx
index e45b814859..e38b2f4894 100644
--- a/apps/web/components/task/terminal-close-inline-confirmation.tsx
+++ b/apps/web/components/task/terminal-close-inline-confirmation.tsx
@@ -1,10 +1,16 @@
 "use client";
 
 import { useTranslation } from "react-i18next";
+import type { RefObject } from "react";
 
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
 
 type TerminalCloseInlineConfirmationProps = {
+  open?: boolean;
+  terminalId: string;
+  terminalLabel: string;
+  focusReturnRef?: RefObject<HTMLElement | null>;
   density?: "compact" | "touch";
   testId?: string;
   onCancel: () => void;
@@ -13,6 +19,10 @@ type TerminalCloseInlineConfirmationProps = {
 };
 
 export function TerminalCloseInlineConfirmation({
+  open = true,
+  terminalId,
+  terminalLabel,
+  focusReturnRef,
   density = "compact",
   testId = "terminal-menu-close-confirmation",
   onCancel,
@@ -21,7 +31,7 @@ export function TerminalCloseInlineConfirmation({
 }: TerminalCloseInlineConfirmationProps) {
   const { t } = useTranslation();
 
-  return (
+  const inline = (
     <InlineConfirmActions
       density={density}
       testId={testId}
@@ -33,4 +43,22 @@ export function TerminalCloseInlineConfirmation({
       onConfirm={onConfirm}
     />
   );
+  return (
+    <MobileActionConfirmation
+      open={open}
+      targetKey={terminalId}
+      title={t("task:closeTerminal")}
+      subject={terminalLabel}
+      testId={testId}
+      cancelLabel={t("common:cancel")}
+      confirmLabel={t("task:closeTerminal2")}
+      onOpenChange={(next) => {
+        if (!next) onCancel();
+      }}
+      onClose={onClose}
+      onConfirm={onConfirm}
+      focusReturnRef={focusReturnRef}
+      fallback={inline}
+    />
+  );
 }
diff --git a/apps/web/components/threads/threads-view-controls.test.tsx b/apps/web/components/threads/threads-view-controls.test.tsx
index 5bdb8d08ff..c3b584ef39 100644
--- a/apps/web/components/threads/threads-view-controls.test.tsx
+++ b/apps/web/components/threads/threads-view-controls.test.tsx
@@ -3,7 +3,11 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import type { ThreadView, ThreadViewDraft } from "@/lib/state/slices/ui/thread-view-types";
 import { ThreadsViewControls } from "./threads-view-controls";
 
-const responsive = vi.hoisted(() => ({ usesDesktopWorkbench: true, isFinePointer: true }));
+const responsive = vi.hoisted(() => ({
+  usesDesktopWorkbench: true,
+  isFinePointer: true,
+  isMobile: false,
+}));
 const EMPTY_CANDIDATES: never[] = [];
 const VIEW_PICKER_TEST_ID = "threads-view-picker";
 const DELETE_ACTION_TEST_ID = "threads-view-delete";
@@ -59,6 +63,7 @@ afterEach(() => {
   vi.clearAllMocks();
   responsive.usesDesktopWorkbench = true;
   responsive.isFinePointer = true;
+  responsive.isMobile = false;
   state.threadViews.draft = null;
   state.threadViews.syncError = null;
 });
@@ -91,7 +96,8 @@ describe("ThreadsViewControls", () => {
     await waitFor(() => expect(screen.queryByTestId("threads-view-settings-popover")).toBeNull());
   });
 
-  it("keeps mobile deletion inline until the user confirms", async () => {
+  it("hosts mobile deletion in the existing editor drawer until confirmed", async () => {
+    responsive.isMobile = true;
     responsive.usesDesktopWorkbench = false;
     responsive.isFinePointer = false;
     render(
@@ -105,13 +111,18 @@ describe("ThreadsViewControls", () => {
 
     fireEvent.click(screen.getByTestId("threads-mobile-view-trigger"));
     fireEvent.click(await screen.findByTestId("threads-mobile-view-settings"));
-    fireEvent.click(await screen.findByTestId(DELETE_ACTION_TEST_ID));
+    const trigger = await screen.findByTestId(DELETE_ACTION_TEST_ID);
+    const drawerId = screen.getByTestId(MOBILE_DRAWER_TEST_ID).id;
+    fireEvent.click(trigger);
 
     expect(state.deleteThreadView).not.toHaveBeenCalled();
     const confirmation = screen.getByRole("group", { name: "Delete All threads?" });
     expect(within(confirmation).getByRole("button", { name: "Cancel" }).className).toContain(
-      "h-11",
+      "min-h-12",
     );
+    expect(trigger.isConnected).toBe(true);
+    expect(screen.getByRole("dialog", { name: "Delete All threads?" }).id).toBe(drawerId);
+    expect(document.querySelectorAll('[data-slot="drawer-content"]')).toHaveLength(1);
     fireEvent.click(within(confirmation).getByRole("button", { name: "Cancel" }));
     expect(screen.getByTestId(MOBILE_DRAWER_TEST_ID).dataset.state).toBe("open");
 
diff --git a/apps/web/components/threads/threads-view-controls.tsx b/apps/web/components/threads/threads-view-controls.tsx
index 0fa4b4a329..7daa2b1317 100644
--- a/apps/web/components/threads/threads-view-controls.tsx
+++ b/apps/web/components/threads/threads-view-controls.tsx
@@ -18,6 +18,10 @@ import {
   DropdownMenuTrigger,
 } from "@kandev/ui/dropdown-menu";
 import { Drawer, DrawerContent, DrawerHeader, DrawerTitle } from "@kandev/ui/drawer";
+import {
+  MobileConfirmationHost,
+  MobileConfirmationHostBody,
+} from "@/components/confirmation/mobile-confirmation-host";
 import { Popover, PopoverContent, PopoverTrigger } from "@kandev/ui/popover";
 import { useTranslation } from "react-i18next";
 import { useAppStore } from "@/components/state-provider";
@@ -373,95 +377,103 @@ function MobileThreadsViewControls({
           <span className="sr-only">{t("threads:failedToSyncViews")}</span>
         </span>
       )}
-      <Drawer
-        open={open}
-        onOpenChange={(nextOpen) => {
-          setOpen(nextOpen);
-          if (nextOpen) setPage("views");
-        }}
-      >
-        <DrawerContent
-          className="h-[min(90dvh,48rem)] max-h-[calc(100dvh-1rem)] overflow-hidden pb-[max(0.75rem,env(safe-area-inset-bottom))]"
-          data-testid="threads-mobile-view-drawer"
-          onCloseAutoFocus={(event) => {
-            event.preventDefault();
-            triggerRef.current?.focus();
-          }}
-          onAnimationEnd={(event) => {
-            if (event.currentTarget.dataset.state === "closed") {
-              triggerRef.current?.focus();
-            }
-          }}
-        >
-          <DrawerHeader className="shrink-0 border-b px-4 pb-3 pt-2 text-left">
-            <div className="flex items-center gap-2">
-              {page === "editor" && (
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon"
-                  className="h-11 w-11 shrink-0 cursor-pointer"
-                  onClick={() => setPage("views")}
-                  aria-label={t("threads:backToViewEditor")}
-                  data-testid="threads-mobile-view-back"
-                >
-                  <IconArrowLeft className="h-4 w-4" />
-                </Button>
-              )}
-              <DrawerTitle className="text-base">
-                {page === "editor" ? t("threads:viewSettings") : t("threads:title")}
-              </DrawerTitle>
-            </div>
-          </DrawerHeader>
-          <div
-            className="min-h-0 flex-1 overflow-y-auto overscroll-contain"
-            data-testid="threads-mobile-view-drawer-scroll-region"
+      <MobileConfirmationHost open={open} surface="drawer">
+        {({ contentProps }) => (
+          <Drawer
+            open={open}
+            onOpenChange={(nextOpen) => {
+              setOpen(nextOpen);
+              if (nextOpen) setPage("views");
+            }}
           >
-            {syncError && isMobile && (
-              <ThreadViewSyncError
-                error={syncError}
-                mobile
-                onRetry={onRetrySync}
-                onDismiss={onDismissSyncError}
-              />
-            )}
-            {page === "views" ? (
-              <MobileThreadViewList
-                activeView={activeView}
-                views={views}
-                admittedCount={admittedCount}
-                matchingCount={matchingCount}
-                hiddenCount={hiddenCount}
-                disabledReason={disabledReason}
-                onSelect={selectView}
-                onNewView={startNewView}
-                onOpenSettings={() => setPage("editor")}
-              />
-            ) : (
-              <ThreadsViewEditor
-                activeView={activeView}
-                draft={draft}
-                candidates={candidates}
-                repositories={repositories}
-                viewCount={viewCount}
-                canDelete={canDelete}
-                mobile
-                onUpdate={onUpdate}
-                onSave={onSave}
-                onSaveAs={onSaveAs}
-                onDiscard={onDiscard}
-                onRename={onRename}
-                onDelete={(viewId) => {
-                  onDelete(viewId);
-                  closeDrawer();
-                }}
-                onDuplicate={onDuplicate}
-                onReapplySort={onReapplySort}
-              />
-            )}
-          </div>
-        </DrawerContent>
-      </Drawer>
+            <DrawerContent
+              aria-describedby={undefined}
+              {...contentProps}
+              className="h-[min(90dvh,48rem)] max-h-[calc(100dvh-1rem)] overflow-hidden pb-[max(0.75rem,env(safe-area-inset-bottom))]"
+              data-testid="threads-mobile-view-drawer"
+              onCloseAutoFocus={(event) => {
+                event.preventDefault();
+                triggerRef.current?.focus();
+              }}
+              onAnimationEnd={(event) => {
+                if (event.currentTarget.dataset.state === "closed") {
+                  triggerRef.current?.focus();
+                }
+              }}
+            >
+              <MobileConfirmationHostBody>
+                <DrawerHeader className="shrink-0 border-b px-4 pb-3 pt-2 text-left">
+                  <div className="flex items-center gap-2">
+                    {page === "editor" && (
+                      <Button
+                        type="button"
+                        variant="ghost"
+                        size="icon"
+                        className="h-11 w-11 shrink-0 cursor-pointer"
+                        onClick={() => setPage("views")}
+                        aria-label={t("threads:backToViewEditor")}
+                        data-testid="threads-mobile-view-back"
+                      >
+                        <IconArrowLeft className="h-4 w-4" />
+                      </Button>
+                    )}
+                    <DrawerTitle className="text-base">
+                      {page === "editor" ? t("threads:viewSettings") : t("threads:title")}
+                    </DrawerTitle>
+                  </div>
+                </DrawerHeader>
+                <div
+                  className="min-h-0 flex-1 overflow-y-auto overscroll-contain"
+                  data-testid="threads-mobile-view-drawer-scroll-region"
+                >
+                  {syncError && isMobile && (
+                    <ThreadViewSyncError
+                      error={syncError}
+                      mobile
+                      onRetry={onRetrySync}
+                      onDismiss={onDismissSyncError}
+                    />
+                  )}
+                  {page === "views" ? (
+                    <MobileThreadViewList
+                      activeView={activeView}
+                      views={views}
+                      admittedCount={admittedCount}
+                      matchingCount={matchingCount}
+                      hiddenCount={hiddenCount}
+                      disabledReason={disabledReason}
+                      onSelect={selectView}
+                      onNewView={startNewView}
+                      onOpenSettings={() => setPage("editor")}
+                    />
+                  ) : (
+                    <ThreadsViewEditor
+                      activeView={activeView}
+                      draft={draft}
+                      candidates={candidates}
+                      repositories={repositories}
+                      viewCount={viewCount}
+                      canDelete={canDelete}
+                      mobile
+                      onUpdate={onUpdate}
+                      onSave={onSave}
+                      onSaveAs={onSaveAs}
+                      onDiscard={onDiscard}
+                      onRename={onRename}
+                      onDelete={(viewId) => {
+                        onDelete(viewId);
+                        closeDrawer();
+                      }}
+                      onDuplicate={onDuplicate}
+                      onReapplySort={onReapplySort}
+                    />
+                  )}
+                </div>
+              </MobileConfirmationHostBody>
+            </DrawerContent>
+          </Drawer>
+        )}
+      </MobileConfirmationHost>
     </>
   );
 }
diff --git a/apps/web/components/threads/threads-view-editor.tsx b/apps/web/components/threads/threads-view-editor.tsx
index 7f9a972caa..2160f1db63 100644
--- a/apps/web/components/threads/threads-view-editor.tsx
+++ b/apps/web/components/threads/threads-view-editor.tsx
@@ -14,6 +14,7 @@ import { ThreadsViewTaskPicker } from "./threads-view-task-picker";
 import { EditorBody, type EditorBodyProps } from "./threads-view-editor-sections";
 import { parseThreadMaxColumns } from "./threads-view-editor-utils";
 import { threadViewName } from "@/lib/state/slices/ui/thread-view-builtins";
+import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 
 type EditorProps = {
   activeView: ThreadView;
@@ -55,6 +56,7 @@ export function ThreadsViewEditor({
   deleteFocusBoundaryRef,
 }: EditorProps) {
   const { t } = useTranslation();
+  const { isMobile } = useResponsiveBreakpoint();
   const [pickerOpen, setPickerOpen] = useState(false);
   const [nameMode, setNameMode] = useState<"rename" | "saveAs" | null>(null);
   const [name, setName] = useState("");
@@ -68,7 +70,6 @@ export function ThreadsViewEditor({
     current.taskScope.mode === "selected" && current.taskScope.taskIds.length === 0;
   const hasDraft = !!draft && draft.baseViewId === activeView.id;
   const repositoryNames = useMemo(() => mapRepositoryNames(repositories), [repositories]);
-  const invalidDraft = invalidSelectedScope || maxColumnsInvalid;
   const deleteConfirmation = deletion.target ? (
     <ThreadViewDeleteConfirmation
       deletion={deletion}
@@ -108,7 +109,7 @@ export function ThreadsViewEditor({
         maxColumnsInput={maxColumnsInput}
         maxColumnsInvalid={maxColumnsInvalid}
         invalidSelectedScope={invalidSelectedScope}
-        invalidDraft={invalidDraft}
+        invalidDraft={invalidSelectedScope || maxColumnsInvalid}
         hasDraft={hasDraft}
         viewCount={viewCount}
         canDelete={canDelete}
@@ -123,7 +124,7 @@ export function ThreadsViewEditor({
           deletion.request({ id: activeView.id, label: threadViewName(activeView, t) })
         }
         deleteAnchorRef={deletion.anchorRef}
-        deleteConfirmation={mobile ? deleteConfirmation : undefined}
+        deleteConfirmation={mobile && !isMobile ? deleteConfirmation : undefined}
         onDuplicate={onDuplicate}
         onReapplySort={onReapplySort}
         onSetMaxColumns={(value, badInput = false) => {
@@ -134,7 +135,7 @@ export function ThreadsViewEditor({
         }}
         onOpenPicker={() => setPickerOpen(true)}
       />
-      {!mobile ? deleteConfirmation : null}
+      {!mobile || isMobile ? deleteConfirmation : null}
     </>
   );
 }
diff --git a/apps/web/components/watches/watcher-delete-action.test.tsx b/apps/web/components/watches/watcher-delete-action.test.tsx
new file mode 100644
index 0000000000..5e664bbbbf
--- /dev/null
+++ b/apps/web/components/watches/watcher-delete-action.test.tsx
@@ -0,0 +1,34 @@
+import { cleanup, fireEvent, render, screen, waitFor, within } from "@testing-library/react";
+import { afterEach, expect, it, vi } from "vitest";
+import { WatcherDeleteAction } from "./watcher-delete-action";
+
+afterEach(() => {
+  cleanup();
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 1024 });
+});
+it("names the phone watch and preserves the trigger through cancellation", async () => {
+  Object.defineProperty(window, "innerWidth", { configurable: true, value: 390 });
+  const onConfirm = vi.fn();
+  render(
+    <WatcherDeleteAction
+      targetKey="watch-1"
+      subject="ENG release bugs"
+      title="Delete this watcher?"
+      ariaLabel="Delete watcher"
+      cancelLabel="Cancel"
+      confirmLabel="Delete"
+      onConfirm={onConfirm}
+    />,
+  );
+  const trigger = screen.getByRole("button", { name: "Delete watcher" });
+  fireEvent.click(trigger);
+  const sheet = screen.getByRole("dialog", { name: "Delete this watcher?" });
+  expect(within(sheet).getByText("ENG release bugs", { selector: "p" })).toBeTruthy();
+  expect(trigger.isConnected).toBe(true);
+  fireEvent.click(within(sheet).getByRole("button", { name: "Cancel" }));
+  await waitFor(() => expect(document.activeElement).toBe(trigger));
+  expect(onConfirm).not.toHaveBeenCalled();
+  fireEvent.click(trigger);
+  fireEvent.click(screen.getByRole("button", { name: "Delete" }));
+  await waitFor(() => expect(onConfirm).toHaveBeenCalledTimes(1));
+});
diff --git a/apps/web/components/watches/watcher-delete-action.tsx b/apps/web/components/watches/watcher-delete-action.tsx
index 74c651770b..8bbfb330db 100644
--- a/apps/web/components/watches/watcher-delete-action.tsx
+++ b/apps/web/components/watches/watcher-delete-action.tsx
@@ -7,8 +7,11 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@kandev/ui/tooltip";
 import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
 import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover";
 import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions";
+import { MobileActionConfirmation } from "@/components/confirmation/mobile-action-confirmation";
 
 type WatcherDeleteActionProps = {
+  targetKey: string;
+  subject: ReactNode;
   title: ReactNode;
   cancelLabel: ReactNode;
   confirmLabel: ReactNode;
@@ -24,10 +27,11 @@ type WatcherDeleteActionProps = {
  * Local delete confirmation used by watcher rows/cards.
  *
  * Fine pointers keep the initiating delete button as the popover anchor.
- * Coarse pointers replace the action region with one inline cancel/delete
- * group so a phone never stacks a second overlay on top of its row.
+ * Phones use a named sheet; wider coarse pointers keep their inline actions.
  */
 export function WatcherDeleteAction({
+  targetKey,
+  subject,
   title,
   cancelLabel,
   confirmLabel,
@@ -38,25 +42,36 @@ export function WatcherDeleteAction({
   testId = "watcher-delete-confirmation",
   onConfirm,
 }: WatcherDeleteActionProps) {
-  const { isFinePointer } = useResponsiveBreakpoint();
+  const { isFinePointer, isMobile } = useResponsiveBreakpoint();
   const [open, setOpen] = useState(false);
   const anchorRef = useRef<HTMLButtonElement>(null);
 
-  if (!isFinePointer && open) {
-    return (
-      <InlineConfirmActions
-        density="touch"
-        testId={testId}
-        ariaLabel={ariaLabel}
-        cancelLabel={cancelLabel}
-        confirmLabel={confirmLabel}
-        confirmTestId={confirmTestId}
-        onCancel={() => setOpen(false)}
-        onClose={() => setOpen(false)}
-        onConfirm={onConfirm}
-      />
-    );
-  }
+  const fallback = !isFinePointer ? (
+    <InlineConfirmActions
+      density="touch"
+      testId={testId}
+      ariaLabel={ariaLabel}
+      cancelLabel={cancelLabel}
+      confirmLabel={confirmLabel}
+      confirmTestId={confirmTestId}
+      onCancel={() => setOpen(false)}
+      onClose={() => setOpen(false)}
+      onConfirm={onConfirm}
+    />
+  ) : (
+    <ActionConfirmPopover
+      open={open}
+      anchorRef={anchorRef}
+      title={title}
+      cancelLabel={cancelLabel}
+      confirmLabel={confirmLabel}
+      confirmTestId={confirmTestId}
+      testId={testId}
+      onOpenChange={setOpen}
+      onCancel={() => setOpen(false)}
+      onConfirm={onConfirm}
+    />
+  );
 
   const trigger = (
     <Button
@@ -64,7 +79,7 @@ export function WatcherDeleteAction({
       variant="ghost"
       size="sm"
       className={`p-0 text-red-500 hover:text-red-600 cursor-pointer ${
-        isFinePointer ? "h-7 w-7" : "h-11 w-11"
+        !isMobile && isFinePointer ? "h-7 w-7" : "h-11 w-11"
       }`}
       aria-label={ariaLabel}
       data-testid={triggerTestId}
@@ -79,28 +94,29 @@ export function WatcherDeleteAction({
 
   return (
     <>
-      {isFinePointer && tooltipLabel ? (
-        <Tooltip>
-          <TooltipTrigger asChild>{trigger}</TooltipTrigger>
-          <TooltipContent>{tooltipLabel}</TooltipContent>
-        </Tooltip>
-      ) : (
-        trigger
-      )}
-      {isFinePointer ? (
-        <ActionConfirmPopover
-          open={open}
-          anchorRef={anchorRef}
-          title={title}
-          cancelLabel={cancelLabel}
-          confirmLabel={confirmLabel}
-          confirmTestId={confirmTestId}
-          testId={testId}
-          onOpenChange={setOpen}
-          onCancel={() => setOpen(false)}
-          onConfirm={onConfirm}
-        />
-      ) : null}
+      {(isMobile || isFinePointer || !open) &&
+        (!isMobile && isFinePointer && tooltipLabel ? (
+          <Tooltip>
+            <TooltipTrigger asChild>{trigger}</TooltipTrigger>
+            <TooltipContent>{tooltipLabel}</TooltipContent>
+          </Tooltip>
+        ) : (
+          trigger
+        ))}
+      <MobileActionConfirmation
+        open={open}
+        targetKey={targetKey}
+        title={title}
+        subject={subject}
+        cancelLabel={cancelLabel}
+        confirmLabel={confirmLabel}
+        confirmTestId={confirmTestId}
+        testId={testId}
+        onOpenChange={setOpen}
+        focusReturnRef={anchorRef}
+        onConfirm={onConfirm}
+        fallback={fallback}
+      />
     </>
   );
 }
diff --git a/apps/web/e2e/helpers/mobile-confirmations.ts b/apps/web/e2e/helpers/mobile-confirmations.ts
new file mode 100644
index 0000000000..d6738c8b27
--- /dev/null
+++ b/apps/web/e2e/helpers/mobile-confirmations.ts
@@ -0,0 +1,28 @@
+import { expect, type Locator } from "@playwright/test";
+import { waitForFiniteAnimations } from "./animations";
+import { requireBox } from "./layout-assertions";
+
+/** Short decisions use content height, not an invisible editor's remaining space. */
+export async function expectContentSizedBottomConfirmation(
+  surface: Locator,
+  confirmation: Locator,
+) {
+  await waitForFiniteAnimations(surface);
+  expect(await surface.evaluate((element) => element.scrollTop)).toBe(0);
+  const surfaceBox = await requireBox(surface, "confirmation sheet");
+  const viewportHeight = surface.page().viewportSize()!.height;
+  expect(surfaceBox.y + surfaceBox.height).toBeCloseTo(viewportHeight, 0);
+  expect(surfaceBox.y).toBeGreaterThanOrEqual(0);
+  const contentBox = await requireBox(
+    confirmation.getByTestId("mobile-confirmation-body").locator(":scope > :last-child"),
+    "last consequence or option",
+  );
+  const primaryBox = await requireBox(confirmation.locator("footer button").first(), "action");
+  const actionGap = primaryBox.y - contentBox.y - contentBox.height;
+  expect(actionGap).toBeGreaterThanOrEqual(0);
+  expect(actionGap).toBeLessThanOrEqual(32);
+  for (const control of await confirmation.locator("h2, footer button").all()) {
+    await expect(control).toBeInViewport({ ratio: 1 });
+  }
+  return surfaceBox;
+}
diff --git a/apps/web/e2e/tests/auth/mobile-users-self-actions.spec.ts b/apps/web/e2e/tests/auth/mobile-users-self-actions.spec.ts
index b712dc414a..f3acae3072 100644
--- a/apps/web/e2e/tests/auth/mobile-users-self-actions.spec.ts
+++ b/apps/web/e2e/tests/auth/mobile-users-self-actions.spec.ts
@@ -136,16 +136,20 @@ test.describe.serial("users self-actions guard (mobile)", () => {
       ),
     ).toBe(true);
 
-    // Phone action remains in target row. Confirmation morphs only action
-    // region, leaving identity and current state visible.
+    // A named sheet leaves the original card and its controls mounted.
     const rolePatch = waitForHttp(page, "PATCH", new RegExp(`/api/v1/users/${memberId}$`));
     const roleRefresh = waitForHttp(page, "GET", /^\/api\/v1\/users$/);
-    await memberRow.getByTestId("users-table-toggle-role").tap();
-    const roleConfirmation = memberRow.getByTestId("users-table-inline-confirmation");
+    const roleTrigger = memberRow.getByTestId("users-table-toggle-role");
+    await roleTrigger.tap();
+    const roleConfirmation = page.getByRole("dialog");
     await expect(roleConfirmation).toBeVisible();
     await expect(memberRow.getByTestId("users-table-email")).toBeVisible();
     await expect(memberRow.getByTestId("users-table-role")).toContainText("member");
     await expect(roleConfirmation).toContainText(`Change ${MEMBER.email} to admin?`);
+    await roleConfirmation.getByRole("button", { name: "Cancel" }).tap();
+    await expect(roleTrigger).toBeFocused();
+    await expect(memberRow.getByTestId("users-table-role")).toContainText("member");
+    await roleTrigger.tap();
     const roleConfirmButton = roleConfirmation.getByTestId("users-table-confirm");
     await expect(roleConfirmButton).toBeVisible();
     const roleConfirmBox = await roleConfirmButton.boundingBox();
@@ -159,7 +163,7 @@ test.describe.serial("users self-actions guard (mobile)", () => {
     const statusPatch = waitForHttp(page, "PATCH", new RegExp(`/api/v1/users/${disabledAdminId}$`));
     const statusRefresh = waitForHttp(page, "GET", /^\/api\/v1\/users$/);
     await disabledAdminRow.getByTestId("users-table-toggle-status").tap();
-    const statusConfirmation = disabledAdminRow.getByTestId("users-table-inline-confirmation");
+    const statusConfirmation = page.getByRole("dialog");
     await expect(statusConfirmation).toBeVisible();
     await expect(statusConfirmation).toContainText(`Re-enable ${DISABLED_ADMIN.email}?`);
     const statusConfirmButton = statusConfirmation.getByTestId("users-table-confirm");
diff --git a/apps/web/e2e/tests/chat/mobile-reset-context-confirmation.spec.ts b/apps/web/e2e/tests/chat/mobile-reset-context-confirmation.spec.ts
index d187bea970..76dfe27384 100644
--- a/apps/web/e2e/tests/chat/mobile-reset-context-confirmation.spec.ts
+++ b/apps/web/e2e/tests/chat/mobile-reset-context-confirmation.spec.ts
@@ -7,7 +7,7 @@ import {
 
 test.describe.configure({ timeout: 120_000 });
 
-test("mobile reset context confirms inline without stacking another overlay", async ({
+test("mobile reset context opens a sheet and preserves composer controls", async ({
   testPage,
   apiClient,
   seedData,
@@ -26,7 +26,7 @@ test("mobile reset context confirms inline without stacking another overlay", as
   await expect(contextRing).toBeVisible();
 
   await session.resetContextButton().tap();
-  const inlineConfirmation = testPage.getByTestId("reset-context-inline-confirm");
+  const inlineConfirmation = testPage.getByTestId("mobile-action-confirmation");
   const warning = inlineConfirmation.getByText(
     "This will clear the agent's conversation history and start a fresh context. Your workspace, files, and git state will be preserved.",
     { exact: true },
@@ -34,8 +34,11 @@ test("mobile reset context confirms inline without stacking another overlay", as
   await expect(inlineConfirmation).toBeVisible();
   await expect(warning).toBeVisible();
   await expect(testPage.getByRole("alertdialog")).toHaveCount(0);
+  await expect(testPage.getByRole("dialog")).toHaveAttribute("data-slot", "drawer-content");
+  await expect(session.resetContextButton()).toBeAttached();
+  await expect(testPage.getByTestId("submit-message-button")).toBeAttached();
   await prCapture.screenshot("mobile-reset-context-confirmation", {
-    caption: "Mobile toolbar reset context confirmation",
+    caption: "Mobile context reset preserves the composer behind its compact sheet",
   });
 
   const confirmBox = await inlineConfirmation.getByTestId("reset-context-confirm").boundingBox();
@@ -57,8 +60,8 @@ test("mobile reset context confirms inline without stacking another overlay", as
   });
   expect(warningIsTopmost).toBe(true);
   const confirmationBackground = await testPage
-    .getByTestId("mobile-chat-input-toolbar")
-    .evaluate((element) => getComputedStyle(element).backgroundColor);
+    .getByRole("dialog")
+    .evaluate((element) => getComputedStyle(element, "::before").backgroundColor);
   expect(confirmationBackground).not.toBe("rgba(0, 0, 0, 0)");
 
   await inlineConfirmation.getByRole("button", { name: "Cancel" }).tap();
diff --git a/apps/web/e2e/tests/github/mobile-github-sidebar.spec.ts b/apps/web/e2e/tests/github/mobile-github-sidebar.spec.ts
index 78ae6b9ca2..6bb68d056b 100644
--- a/apps/web/e2e/tests/github/mobile-github-sidebar.spec.ts
+++ b/apps/web/e2e/tests/github/mobile-github-sidebar.spec.ts
@@ -1,5 +1,7 @@
 import { test, expect } from "../../fixtures/test-base";
 import { MobileGitHubPage } from "../../pages/mobile-github-page";
+import { waitForFiniteAnimations } from "../../helpers/animations";
+import { expectContentSizedBottomConfirmation } from "../../helpers/mobile-confirmations";
 
 const DEFAULT_REPO = "mobileorg/defaultrepo";
 const DEFAULT_REPO_ISSUE = "Mobile issue in saved default repo";
@@ -360,17 +362,24 @@ test.describe("Mobile /github sidebar", () => {
     const deleteAction = page.mobileSidebar.getByRole("button", {
       name: `Delete ${savedQuery} saved query`,
     });
+    await waitForFiniteAnimations(page.mobileSidebar);
     const deleteBox = await deleteAction.boundingBox();
     expect(deleteBox?.height ?? 0).toBeGreaterThanOrEqual(44);
     expect(deleteBox?.width ?? 0).toBeGreaterThanOrEqual(44);
+    const originalDialogId = await page.mobileSidebar.getAttribute("id");
+    await expect(page.mobileSidebar).toHaveAttribute("data-vaul-drawer-direction", "bottom");
     await deleteAction.tap();
     const deleteConfirmation = page.mobileSidebar.getByTestId(
       "saved-task-view-delete-confirmation",
     );
     await expect(deleteConfirmation).toHaveAccessibleName(`Delete ${savedQuery}?`);
+    await expectContentSizedBottomConfirmation(page.mobileSidebar, deleteConfirmation);
     await expect(testPage.locator('[role="dialog"]:visible')).toHaveCount(1);
+    await expect(page.mobileSidebar).toHaveAttribute("id", originalDialogId!);
+    await expect(deleteConfirmation.getByRole("button", { name: "Back" })).toBeVisible();
+    await waitForFiniteAnimations(page.mobileSidebar);
     await prCapture.screenshot("saved-query-delete-mobile", {
-      caption: "A saved integration query confirms inline without nesting another sheet.",
+      caption: "A saved integration query becomes a confirmation step inside the filter sheet.",
     });
     await deleteConfirmation.getByRole("button", { name: "Cancel" }).tap();
     await expect(page.savedQueryByLabel(savedQuery)).toBeVisible();
diff --git a/apps/web/e2e/tests/gitlab/mobile-gitlab-parity.spec.ts b/apps/web/e2e/tests/gitlab/mobile-gitlab-parity.spec.ts
index ec9b634dd5..2d5d2202cd 100644
--- a/apps/web/e2e/tests/gitlab/mobile-gitlab-parity.spec.ts
+++ b/apps/web/e2e/tests/gitlab/mobile-gitlab-parity.spec.ts
@@ -12,6 +12,8 @@ import { makeGitEnv } from "../../helpers/git-helper";
 import { GitLabPage } from "../../pages/gitlab-page";
 import { GitLabSettingsPage } from "../../pages/gitlab-settings-page";
 import { KanbanPage } from "../../pages/kanban-page";
+import { expectContentSizedBottomConfirmation } from "../../helpers/mobile-confirmations";
+import { waitForFiniteAnimations } from "../../helpers/animations";
 import { SessionPage } from "../../pages/session-page";
 
 async function expectTouchTarget(locator: ReturnType<GitLabPage["mrRow"]>, label: string) {
@@ -65,6 +67,106 @@ async function seedMultiRepoGitLabTask(
 }
 
 test.describe("Mobile GitLab parity", () => {
+  let previousSavedPresets: unknown;
+  test.afterEach(async ({ apiClient }) => {
+    if (previousSavedPresets === undefined) return;
+    const restored = await apiClient.rawRequest("PATCH", "/api/v1/user/settings", {
+      gitlab_saved_presets: previousSavedPresets,
+    });
+    previousSavedPresets = undefined;
+    expect(restored.ok).toBe(true);
+  });
+
+  test("confirms saved-query deletion in the existing filter sheet", async ({
+    testPage,
+    apiClient,
+    seedData,
+  }, testInfo) => {
+    const phoneViewport = { width: 393, height: 640 };
+    await testPage.setViewportSize(phoneViewport);
+    await seedGitLabReview(apiClient, seedData.workspaceId, 121, "Mobile saved-query review");
+    previousSavedPresets = (await apiClient.getUserSettings()).settings.gitlab_saved_presets ?? [];
+    const saved = {
+      id: "mobile-gitlab-saved",
+      kind: "mr",
+      label: "Release review queue",
+      customQuery: "release",
+      projectFilter: "",
+      milestone: "",
+      preset: "",
+      createdAt: "2026-09-10T00:00:00Z",
+    };
+    const neighbors = Array.from({ length: 8 }, (_, index) => ({
+      ...saved,
+      id: `mobile-gitlab-neighbor-${index}`,
+      label: `Other review queue ${index}`,
+    }));
+    const seeded = await apiClient.rawRequest("PATCH", "/api/v1/user/settings", {
+      gitlab_saved_presets: [...neighbors, saved],
+    });
+    expect(seeded.ok).toBe(true);
+    const gitlab = new GitLabPage(testPage);
+    await gitlab.goto();
+    await gitlab.mobileFiltersButton.tap();
+    // @covers AC-UI-MOBILE-CONFIRMATION-001.8
+    await expect(gitlab.mobileSidebar).toHaveAttribute("data-vaul-drawer-direction", "bottom");
+    await waitForFiniteAnimations(gitlab.mobileSidebar);
+    const originalHeight = (await gitlab.mobileSidebar.boundingBox())!.height;
+    const sheetId = await gitlab.mobileSidebar.getAttribute("id");
+    const trigger = gitlab.mobileSidebar.getByTestId("gitlab-saved-delete-mobile-gitlab-saved");
+    await trigger.scrollIntoViewIfNeeded();
+    const scrollArea = gitlab.mobileSidebar.getByTestId("integration-filters-scroll");
+    const scrollTop = await scrollArea.evaluate((element) => element.scrollTop);
+    expect(scrollTop).toBeGreaterThan(0);
+    await testPage.screenshot({ path: testInfo.outputPath("bottom-query-filters.png") });
+    await trigger.tap();
+    const confirmation = gitlab.mobileSidebar.getByTestId("saved-task-view-delete-confirmation");
+    await expect(confirmation).toHaveAccessibleName("Delete Release review queue?");
+    const compactBounds = await expectContentSizedBottomConfirmation(
+      gitlab.mobileSidebar,
+      confirmation,
+    );
+    expect(compactBounds.height).toBeLessThan(originalHeight);
+    await expect(testPage.getByText("Kandev update available", { exact: true })).toBeHidden();
+    await testPage.screenshot({
+      path: testInfo.outputPath("compact-saved-query-confirmation.png"),
+    });
+    await testInfo.attach("confirmation-geometry", {
+      body: JSON.stringify({ originalHeight, compactBounds }),
+      contentType: "application/json",
+    });
+    await expect(gitlab.mobileSidebar).toHaveAttribute("id", sheetId!);
+    await expect(testPage.getByRole("dialog")).toHaveCount(1);
+    await confirmation.getByRole("button", { name: "Back" }).tap();
+    await expect(trigger).toBeFocused();
+    await waitForFiniteAnimations(gitlab.mobileSidebar);
+    expect((await gitlab.mobileSidebar.boundingBox())!.height).toBeCloseTo(originalHeight, 0);
+    expect(await scrollArea.evaluate((element) => element.scrollTop)).toBe(scrollTop);
+    await trigger.tap();
+    await expect(confirmation).toBeVisible();
+    await testPage.setViewportSize({ width: 768, height: 800 });
+    await expect(confirmation).toHaveCount(0);
+    await expect(gitlab.mobileSidebar).toHaveAttribute("data-side", "right");
+    expect((await apiClient.getUserSettings()).settings.gitlab_saved_presets).toEqual([
+      ...neighbors,
+      saved,
+    ]);
+    await testPage.setViewportSize(phoneViewport);
+    await expect(gitlab.mobileSidebar).toHaveAttribute("data-vaul-drawer-direction", "bottom");
+    await expect(confirmation).toHaveCount(0);
+    await trigger.tap();
+    const removed = testPage.waitForResponse(
+      (response) =>
+        response.url().includes("/api/v1/user/settings") &&
+        response.request().method() === "PATCH" &&
+        response.ok(),
+    );
+    await confirmation.getByTestId("saved-task-view-delete-confirm").tap();
+    await removed;
+    await expect(trigger).toHaveCount(0);
+    await expect(gitlab.mobileSidebar).toBeVisible();
+    expect((await apiClient.getUserSettings()).settings.gitlab_saved_presets).toEqual(neighbors);
+  });
   test("opens the exact linked MR selected from a multi-MR topbar", async ({
     testPage,
     apiClient,
diff --git a/apps/web/e2e/tests/integrations/mobile-azure-devops.spec.ts b/apps/web/e2e/tests/integrations/mobile-azure-devops.spec.ts
index 5e74e1d003..2d95757d07 100644
--- a/apps/web/e2e/tests/integrations/mobile-azure-devops.spec.ts
+++ b/apps/web/e2e/tests/integrations/mobile-azure-devops.spec.ts
@@ -208,12 +208,15 @@ test("mobile board opens a focused column editor without horizontal overflow", a
   await deleteSavedView.tap();
   const deleteConfirmation = testPage.getByTestId("saved-task-view-delete-confirmation");
   await expect(deleteConfirmation).toHaveAccessibleName("Delete Mobile security queue?");
-  await expect(testPage.locator('[role="dialog"]:visible')).toHaveCount(0);
+  await expect(testPage.locator('[role="dialog"]:visible')).toHaveCount(1);
+  await expect(testPage.getByRole("menu")).toHaveCount(0);
   for (const action of await deleteConfirmation.getByRole("button").all()) {
     const box = await action.boundingBox();
     expect(box?.height ?? 0).toBeGreaterThanOrEqual(44);
   }
   await deleteConfirmation.getByRole("button", { name: "Cancel" }).tap();
+  await expect(savedViewsMenu).toBeFocused();
+  await savedViewsMenu.tap();
   await expect(deleteSavedView).toBeVisible();
 
   await deleteSavedView.tap();
@@ -229,6 +232,8 @@ test("mobile board opens a focused column editor without horizontal overflow", a
     .tap();
   await deleteSavedViewResponse;
   await expect(deleteSavedView).toHaveCount(0);
+  await savedViewsMenu.tap();
+  await expect(deleteSavedView).toHaveCount(0);
   await testPage.keyboard.press("Escape");
   await expect(testPage.getByRole("menu")).toBeHidden();
   await expect(testPage.getByText("Handle token rotation")).toBeVisible();
diff --git a/apps/web/e2e/tests/integrations/mobile-integration-remove-confirmations.spec.ts b/apps/web/e2e/tests/integrations/mobile-integration-remove-confirmations.spec.ts
index a5993a24ab..dc1a4a3a63 100644
--- a/apps/web/e2e/tests/integrations/mobile-integration-remove-confirmations.spec.ts
+++ b/apps/web/e2e/tests/integrations/mobile-integration-remove-confirmations.spec.ts
@@ -1,6 +1,7 @@
 import type { Locator, Page } from "@playwright/test";
 import { expect, test } from "../../fixtures/test-base";
 import { SentrySettingsPage } from "../../pages/sentry-settings-page";
+import { waitForFiniteAnimations } from "../../helpers/animations";
 
 function guardAgainstNativeDialogs(testPage: Page) {
   let seen = false;
@@ -11,10 +12,11 @@ function guardAgainstNativeDialogs(testPage: Page) {
   return () => seen;
 }
 
-async function expectTouchSized(locator: Locator) {
+async function expectTouchSized(locator: Locator, minimumHeight = 48) {
   const box = await locator.boundingBox();
   expect(box).not.toBeNull();
-  expect(box!.height).toBeGreaterThanOrEqual(44);
+  expect(box!.height).toBeGreaterThanOrEqual(minimumHeight);
+  expect(box!.width).toBeGreaterThanOrEqual(44);
 }
 
 async function expectNoHorizontalOverflow(testPage: Page) {
@@ -24,7 +26,11 @@ async function expectNoHorizontalOverflow(testPage: Page) {
 }
 
 test.describe("integration configuration removal confirmations on mobile", () => {
-  test("Azure DevOps uses inline touch confirmation", async ({ testPage, apiClient, seedData }) => {
+  test("Azure DevOps uses a touch confirmation sheet", async ({
+    testPage,
+    apiClient,
+    seedData,
+  }) => {
     const sawNativeDialog = guardAgainstNativeDialogs(testPage);
     await apiClient.setAzureDevOpsConfig(seedData.workspaceId, {
       organizationUrl: "https://dev.azure.com/acme",
@@ -36,7 +42,7 @@ test.describe("integration configuration removal confirmations on mobile", () =>
 
     const removeButton = testPage.getByTestId("azure-devops-delete-button");
     await removeButton.tap();
-    const inline = testPage.getByTestId("azure-devops-remove-inline-confirmation");
+    const inline = testPage.getByRole("dialog");
     await expect(inline).toBeVisible();
     await expectTouchSized(inline.getByTestId("azure-devops-remove-confirm"));
     await inline.getByRole("button", { name: "Cancel" }).tap();
@@ -48,7 +54,7 @@ test.describe("integration configuration removal confirmations on mobile", () =>
     await expectNoHorizontalOverflow(testPage);
   });
 
-  test("Jira uses inline touch confirmation", async ({ testPage, apiClient, seedData }) => {
+  test("Jira uses a touch confirmation sheet", async ({ testPage, apiClient, seedData }) => {
     const sawNativeDialog = guardAgainstNativeDialogs(testPage);
     await apiClient.setJiraConfig({
       workspaceId: seedData.workspaceId,
@@ -62,7 +68,7 @@ test.describe("integration configuration removal confirmations on mobile", () =>
 
     const removeButton = testPage.getByTestId("jira-delete-button");
     await removeButton.tap();
-    const inline = testPage.getByTestId("jira-remove-inline-confirmation");
+    const inline = testPage.getByRole("dialog");
     await expect(inline).toBeVisible();
     await expectTouchSized(inline.getByTestId("jira-remove-confirm"));
     await inline.getByRole("button", { name: "Cancel" }).tap();
@@ -74,7 +80,7 @@ test.describe("integration configuration removal confirmations on mobile", () =>
     await expectNoHorizontalOverflow(testPage);
   });
 
-  test("Linear uses inline touch confirmation", async ({ testPage, apiClient, seedData }) => {
+  test("Linear uses a touch confirmation sheet", async ({ testPage, apiClient, seedData }) => {
     const sawNativeDialog = guardAgainstNativeDialogs(testPage);
     await apiClient.setLinearConfig({
       workspaceId: seedData.workspaceId,
@@ -86,7 +92,7 @@ test.describe("integration configuration removal confirmations on mobile", () =>
 
     const removeButton = testPage.getByTestId("linear-delete-button");
     await removeButton.tap();
-    const inline = testPage.getByTestId("linear-remove-inline-confirmation");
+    const inline = testPage.getByRole("dialog");
     await expect(inline).toBeVisible();
     await expectTouchSized(inline.getByTestId("linear-remove-confirm"));
     await inline.getByRole("button", { name: "Cancel" }).tap();
@@ -98,10 +104,11 @@ test.describe("integration configuration removal confirmations on mobile", () =>
     await expectNoHorizontalOverflow(testPage);
   });
 
-  test("Sentry uses an inline confirmation identified by instance", async ({
+  test("Sentry uses a confirmation sheet identified by instance", async ({
     testPage,
     apiClient,
     seedData,
+    prCapture,
   }) => {
     const sawNativeDialog = guardAgainstNativeDialogs(testPage);
     await apiClient.mockSentryReset();
@@ -114,14 +121,18 @@ test.describe("integration configuration removal confirmations on mobile", () =>
     await settings.goto(seedData.workspaceId);
 
     const card = settings.cardByName("Mobile Sentry");
-    await expectTouchSized(card.getByTestId("sentry-instance-edit-button"));
+    await expectTouchSized(card.getByTestId("sentry-instance-edit-button"), 44);
     const removeButton = card.getByTestId("sentry-instance-delete-button");
-    await expectTouchSized(removeButton);
+    await expectTouchSized(removeButton, 44);
     await removeButton.tap();
-    const inline = card.getByTestId("sentry-remove-inline-confirmation");
+    const inline = testPage.getByRole("dialog");
     await expect(inline).toBeVisible();
     await expect(inline).toContainText("Mobile Sentry");
     await expectTouchSized(inline.getByTestId("sentry-remove-confirm"));
+    await waitForFiniteAnimations(inline);
+    await prCapture.screenshot("sentry-removal-sheet", {
+      caption: "Remove a named integration instance in a compact phone sheet.",
+    });
     await inline.getByRole("button", { name: "Cancel" }).tap();
     await expect(removeButton).toBeVisible();
     await removeButton.tap();
diff --git a/apps/web/e2e/tests/integrations/mobile-jira-saved-view.spec.ts b/apps/web/e2e/tests/integrations/mobile-jira-saved-view.spec.ts
index fe4f0b5a48..0c3ae20704 100644
--- a/apps/web/e2e/tests/integrations/mobile-jira-saved-view.spec.ts
+++ b/apps/web/e2e/tests/integrations/mobile-jira-saved-view.spec.ts
@@ -12,10 +12,7 @@ test.describe("Mobile Jira saved views", () => {
     await apiClient.waitForIntegrationAuthHealthy("jira");
   });
 
-  test("keeps custom-view confirmation inline, touch-sized, and contained", async ({
-    testPage,
-    apiClient,
-  }) => {
+  test("hands custom-view deletion off to a touch-sized sheet", async ({ testPage, apiClient }) => {
     const seedResponse = await apiClient.rawRequest("PATCH", "/api/v1/user/settings", {
       jira_saved_views: [
         {
@@ -34,7 +31,8 @@ test.describe("Mobile Jira saved views", () => {
     expect(seedResponse.ok).toBe(true);
     await testPage.goto("/jira");
 
-    await testPage.getByRole("button", { name: "Assigned to me" }).tap();
+    const pickerTrigger = testPage.getByRole("button", { name: "Assigned to me" });
+    await pickerTrigger.tap();
     const deleteAction = testPage.getByRole("button", {
       name: "Delete Long mobile sprint bugs that need review",
     });
@@ -48,14 +46,16 @@ test.describe("Mobile Jira saved views", () => {
       "Delete Long mobile sprint bugs that need review?",
     );
     await expect(testPage.locator('[role="dialog"]:visible')).toHaveCount(1);
+    await expect(testPage.locator('[data-slot="popover-content"]')).toHaveCount(0);
     for (const action of await confirmation.getByRole("button").all()) {
       const box = await action.boundingBox();
       expect(box?.height ?? 0).toBeGreaterThanOrEqual(44);
     }
     await assertNoDocumentHorizontalOverflow(testPage, "mobile Jira saved-view confirmation");
     await confirmation.getByRole("button", { name: "Cancel" }).tap();
-    await expect(deleteAction).toBeFocused();
+    await expect(pickerTrigger).toBeFocused();
 
+    await pickerTrigger.tap();
     await deleteAction.tap();
     const deleteResponse = testPage.waitForResponse(
       (response) =>
@@ -68,6 +68,7 @@ test.describe("Mobile Jira saved views", () => {
       .getByRole("button", { name: "Delete Long mobile sprint bugs that need review" })
       .tap();
     await deleteResponse;
+    await pickerTrigger.tap();
     await expect(deleteAction).toHaveCount(0);
   });
 });
diff --git a/apps/web/e2e/tests/integrations/mobile-watcher-delete-confirmations.spec.ts b/apps/web/e2e/tests/integrations/mobile-watcher-delete-confirmations.spec.ts
index 242de887ec..94f9e03ef5 100644
--- a/apps/web/e2e/tests/integrations/mobile-watcher-delete-confirmations.spec.ts
+++ b/apps/web/e2e/tests/integrations/mobile-watcher-delete-confirmations.spec.ts
@@ -1,9 +1,10 @@
 import { expect, test } from "../../fixtures/test-base";
 import { waitForHttp } from "../../helpers/causal-waits";
 import { seedLinearWatcher } from "./watcher-delete-confirmation-flow";
+import { waitForFiniteAnimations } from "../../helpers/animations";
 
 test.describe("watcher delete confirmations (mobile)", () => {
-  test("keeps Linear delete inline, touch-sized, and inside the viewport", async ({
+  test("keeps Linear delete in a named touch-sized phone sheet", async ({
     testPage,
     apiClient,
     seedData,
@@ -26,13 +27,21 @@ test.describe("watcher delete confirmations (mobile)", () => {
     await expect(trigger).toHaveCSS("height", "44px");
 
     await trigger.tap();
-    const confirmation = row.getByTestId("watcher-delete-confirmation");
+    const confirmation = testPage.getByTestId("watcher-delete-confirmation");
     await expect(confirmation).toBeVisible();
-    await expect(testPage.getByRole("dialog")).toHaveCount(0);
-    await expect(confirmation.getByRole("button", { name: "Cancel" })).toHaveCSS("height", "44px");
-    await expect(confirmation.getByRole("button", { name: "Delete" })).toHaveCSS("height", "44px");
+    await expect(testPage.getByRole("dialog")).toHaveCount(1);
+    await expect(confirmation).toContainText("team:ENG");
+    await expect(confirmation.getByRole("button", { name: "Cancel" })).toHaveCSS(
+      "min-height",
+      "48px",
+    );
+    await expect(confirmation.getByRole("button", { name: "Delete" })).toHaveCSS(
+      "min-height",
+      "48px",
+    );
+    await waitForFiniteAnimations(testPage.getByRole("dialog"));
     await prCapture.screenshot("watcher-delete-confirmation-mobile", {
-      caption: "Mobile inline watcher delete confirmation with touch-sized actions",
+      caption: "Mobile watcher delete confirmation sheet with a named filter",
     });
 
     const viewportFits = await testPage.evaluate(
@@ -43,7 +52,7 @@ test.describe("watcher delete confirmations (mobile)", () => {
     await confirmation.getByRole("button", { name: "Cancel" }).tap();
     await expect(confirmation).toBeHidden();
     await trigger.tap();
-    await row.getByTestId("linear-watch-delete-confirm").tap();
+    await testPage.getByTestId("linear-watch-delete-confirm").tap();
     await expect(row).toHaveCount(0);
     expect(nativeDialogSeen).toBe(false);
   });
diff --git a/apps/web/e2e/tests/kanban/mobile-card-archive-confirmation.spec.ts b/apps/web/e2e/tests/kanban/mobile-card-archive-confirmation.spec.ts
index ece02e04e1..6ea6773330 100644
--- a/apps/web/e2e/tests/kanban/mobile-card-archive-confirmation.spec.ts
+++ b/apps/web/e2e/tests/kanban/mobile-card-archive-confirmation.spec.ts
@@ -46,7 +46,7 @@ async function openArchiveMenu(testPage: Page, taskId: string): Promise<Locator>
 }
 
 test.describe("Mobile Kanban card archive confirmation", () => {
-  test("uses a contained dark dialog and archives the card after confirmation", async ({
+  test("uses a compact dark bottom sheet and archives the card after confirmation", async ({
     testPage,
     apiClient,
     seedData,
@@ -74,7 +74,7 @@ test.describe("Mobile Kanban card archive confirmation", () => {
 
     const archiveTrigger = await openArchiveMenu(testPage, task.id);
 
-    const dialog = testPage.getByRole("alertdialog", { name: /Archive task/ });
+    const dialog = testPage.getByRole("dialog", { name: /Archive task/ });
     await expect(dialog).toBeVisible();
     await expect(dialog).toContainText(TASK_TITLE);
     await expect(dialog.getByTestId("task-confirmation-outcome")).toContainText(TASK_TITLE);
@@ -83,25 +83,32 @@ test.describe("Mobile Kanban card archive confirmation", () => {
     await expect(testPage.getByTestId(INLINE_CONFIRMATION_TEST_ID)).toHaveCount(0);
 
     await waitForFiniteAnimations(dialog);
+    await expect(testPage.getByText("Kandev update available", { exact: true })).toBeHidden();
     await prCapture.screenshot("after-dark", {
-      caption:
-        "After: mobile Kanban uses the contained archive alert dialog without changing card layout.",
+      caption: "Mobile Kanban uses a compact archive bottom sheet without changing card layout.",
     });
     const [dialogBox, viewport, surfaceColors] = await Promise.all([
       dialog.boundingBox(),
       testPage.evaluate(() => ({ width: window.innerWidth, height: window.innerHeight })),
       dialog.evaluate((element) => {
         const styles = getComputedStyle(element);
-        return { backgroundColor: styles.backgroundColor, foregroundColor: styles.color };
+        const surface = getComputedStyle(element, "::before");
+        return {
+          backgroundColor: surface.backgroundColor,
+          foregroundColor: styles.color,
+          inset: Number.parseFloat(surface.left),
+        };
       }),
     ]);
     if (!dialogBox) throw new Error("mobile archive dialog has no layout box");
-    expect(dialogBox.x).toBeGreaterThanOrEqual(12);
-    expect(viewport.width - (dialogBox.x + dialogBox.width)).toBeGreaterThanOrEqual(12);
+    expect(dialogBox.x + surfaceColors.inset).toBeGreaterThanOrEqual(8);
+    expect(
+      viewport.width - (dialogBox.x + dialogBox.width) + surfaceColors.inset,
+    ).toBeGreaterThanOrEqual(8);
     expect(dialogBox.y).toBeGreaterThanOrEqual(0);
     expect(dialogBox.y + dialogBox.height).toBeLessThanOrEqual(viewport.height);
-    const dialogCenterY = dialogBox.y + dialogBox.height / 2;
-    expect(Math.abs(dialogCenterY - viewport.height / 2)).toBeLessThanOrEqual(8);
+    expect(Math.abs(dialogBox.y + dialogBox.height - viewport.height)).toBeLessThanOrEqual(1);
+    expect(dialogBox.height).toBeLessThan(viewport.height * 0.8);
     expect(surfaceColors.backgroundColor).not.toBe("rgba(0, 0, 0, 0)");
     expect(surfaceColors.backgroundColor).toMatch(/^rgb/);
     expect(surfaceColors.foregroundColor).toMatch(/^rgb/);
@@ -134,7 +141,7 @@ test.describe("Mobile Kanban card archive confirmation", () => {
     expect(testPage.url()).toBe(startUrl);
 
     await openArchiveMenu(testPage, task.id);
-    const reopenedDialog = testPage.getByRole("alertdialog", { name: /Archive task/ });
+    const reopenedDialog = testPage.getByRole("dialog", { name: /Archive task/ });
     await expect(reopenedDialog).toBeVisible();
     const archiveResponse = waitForHttp(
       testPage,
@@ -171,6 +178,7 @@ test.describe("Mobile Kanban card archive confirmation", () => {
     await archiveResponse;
     await expect(card).not.toBeVisible();
     await expect(testPage.getByRole("alertdialog")).toHaveCount(0);
+    await expect(testPage.getByTestId("mobile-action-confirmation")).toHaveCount(0);
     await expect(testPage.getByTestId(INLINE_CONFIRMATION_TEST_ID)).toHaveCount(0);
   });
 });
diff --git a/apps/web/e2e/tests/plugins/mobile-plugin-settings-row.spec.ts b/apps/web/e2e/tests/plugins/mobile-plugin-settings-row.spec.ts
index de32139c26..64220b6917 100644
--- a/apps/web/e2e/tests/plugins/mobile-plugin-settings-row.spec.ts
+++ b/apps/web/e2e/tests/plugins/mobile-plugin-settings-row.spec.ts
@@ -15,6 +15,7 @@
 import { expect, test } from "../../fixtures/test-base";
 import { waitForHttp } from "../../helpers/causal-waits";
 import { PLUGIN_ID, installFixturePlugin } from "../../helpers/plugin-fixture";
+import { expectContentSizedBottomConfirmation } from "../../helpers/mobile-confirmations";
 
 test("mobile plugin row: whole card opens settings, controls still act", async ({
   testPage,
@@ -47,20 +48,24 @@ test("mobile plugin row: whole card opens settings, controls still act", async (
     expect(linkBox.width).toBeGreaterThanOrEqual(rowBox.width - 2);
     expect(linkBox.height).toBeGreaterThanOrEqual(rowBox.height - 2);
 
-    // Uninstall keeps its confirmation inside the row on a coarse pointer.
-    // Cancel first so the same fixture can cover the existing disable action
-    // and the detail-surface confirmation below.
+    // Cancel the phone sheet before exercising the row controls and detail page.
     const rowUninstall = pluginRow.getByRole("button", { name: "Uninstall" });
     expect((await rowUninstall.boundingBox())?.height).toBeGreaterThanOrEqual(44);
     await rowUninstall.tap();
-    const rowConfirmation = pluginRow.getByTestId("plugin-uninstall-inline-confirmation");
+    const rowConfirmation = testPage.getByRole("dialog", { name: "Uninstall plugin", exact: true });
     await expect(rowConfirmation).toBeVisible();
-    await expect(testPage.locator('[data-slot="dialog-overlay"]')).toHaveCount(0);
+    await expect(rowConfirmation).toHaveAttribute("data-slot", "drawer-content");
+    await expect(testPage.getByTestId("plugin-uninstall-inline-confirmation")).toHaveCount(0);
+    await expectContentSizedBottomConfirmation(
+      rowConfirmation,
+      rowConfirmation.getByTestId("mobile-action-confirmation"),
+    );
     expect(
       (await rowConfirmation.getByTestId("plugin-uninstall-confirm").boundingBox())?.height,
-    ).toBeGreaterThanOrEqual(44);
+    ).toBeGreaterThanOrEqual(48);
     await rowConfirmation.getByRole("button", { name: "Cancel" }).tap();
     await expect(rowConfirmation).toHaveCount(0);
+    await expect(rowUninstall).toBeFocused();
 
     // Every control sits above the overlay. If one slipped below it the tap would
     // navigate instead of acting, and on a phone there is no hover state to
@@ -123,17 +128,23 @@ test("mobile plugin row: whole card opens settings, controls still act", async (
       await testPage.evaluate(() => document.documentElement.clientWidth),
     );
 
-    // The detail danger zone uses the same phone-native inline confirmation and
-    // keeps both actions at the 44px touch target minimum.
+    // The detail danger zone uses the same phone sheet and 48px action minimum.
     const detailUninstall = detail.getByRole("button", { name: "Uninstall" });
     expect((await detailUninstall.boundingBox())?.height).toBeGreaterThanOrEqual(44);
     await detailUninstall.tap();
-    const detailConfirmation = testPage.getByTestId("plugin-uninstall-inline-confirmation");
+    const detailConfirmation = testPage.getByRole("dialog", {
+      name: "Uninstall plugin",
+      exact: true,
+    });
     await expect(detailConfirmation).toBeVisible();
-    await expect(testPage.locator('[data-slot="dialog-overlay"]')).toHaveCount(0);
+    await expect(detailConfirmation).toHaveAttribute("data-slot", "drawer-content");
+    await expectContentSizedBottomConfirmation(
+      detailConfirmation,
+      detailConfirmation.getByTestId("mobile-action-confirmation"),
+    );
     expect(
       (await detailConfirmation.getByTestId("plugin-uninstall-confirm").boundingBox())?.height,
-    ).toBeGreaterThanOrEqual(44);
+    ).toBeGreaterThanOrEqual(48);
     await detailConfirmation.getByTestId("plugin-uninstall-confirm").tap();
     await expect(testPage).toHaveURL(/\/settings\/plugins$/);
     await expect(testPage.getByTestId(`plugin-row-${PLUGIN_ID}`)).toHaveCount(0);
diff --git a/apps/web/e2e/tests/pr/mobile-ci-automation-options.spec.ts b/apps/web/e2e/tests/pr/mobile-ci-automation-options.spec.ts
index 506a81eba9..9b96d394d5 100644
--- a/apps/web/e2e/tests/pr/mobile-ci-automation-options.spec.ts
+++ b/apps/web/e2e/tests/pr/mobile-ci-automation-options.spec.ts
@@ -2,6 +2,7 @@ import { test, expect } from "../../fixtures/test-base";
 import { SessionPage } from "../../pages/session-page";
 import type { ApiClient } from "../../helpers/api-client";
 import type { SeedData } from "../../fixtures/test-base";
+import { waitForFiniteAnimations } from "../../helpers/animations";
 
 const OWNER = "acme";
 const REPO = "demo";
@@ -444,10 +445,12 @@ test.describe("mobile PR CI automation options", () => {
     const drawer = session.prStatusChipDrawer();
     const retry = drawer.getByRole("button", { name: "Retry" });
     await expect(retry).toBeVisible();
+    await waitForFiniteAnimations(drawer);
     const retryBox = await retry.boundingBox();
     expect(retryBox).not.toBeNull();
-    expect(retryBox!.height).toBeGreaterThanOrEqual(44);
-    expect(retryBox!.width).toBeGreaterThanOrEqual(44);
+    // The settled transform can still introduce subpixel subtraction error.
+    expect(retryBox!.height + 0.001).toBeGreaterThanOrEqual(44);
+    expect(retryBox!.width + 0.001).toBeGreaterThanOrEqual(44);
 
     await apiClient.mockGitHubSetMergeOutcome(OWNER, REPO, PR_NUMBER, "queued");
     await retry.tap();
diff --git a/apps/web/e2e/tests/review/mobile-walkthrough.spec.ts b/apps/web/e2e/tests/review/mobile-walkthrough.spec.ts
index 415da3d431..48664cad95 100644
--- a/apps/web/e2e/tests/review/mobile-walkthrough.spec.ts
+++ b/apps/web/e2e/tests/review/mobile-walkthrough.spec.ts
@@ -167,8 +167,9 @@ test.describe("Mobile code walkthrough", () => {
     await expect(discardConfirmation).toBeVisible();
     await expect(discardConfirmation).toHaveAttribute("role", "group");
     await expect(testPage.getByRole("alertdialog")).toHaveCount(0);
+    await expect(testPage.getByRole("dialog")).toHaveAttribute("data-slot", "drawer-content");
     await prCapture.screenshot("mobile-walkthrough-discard-confirmation", {
-      caption: "Mobile walkthrough keeps discard confirmation inside its touch launcher",
+      caption: "Mobile walkthrough discard uses a named bottom sheet with stacked actions",
     });
     const actionBoxes = await Promise.all(
       ["Cancel", "Discard walkthrough"].map((name) =>
diff --git a/apps/web/e2e/tests/session/copyfiles-progress.spec.ts b/apps/web/e2e/tests/session/copyfiles-progress.spec.ts
index 7f8804e2c8..d852584ed3 100644
--- a/apps/web/e2e/tests/session/copyfiles-progress.spec.ts
+++ b/apps/web/e2e/tests/session/copyfiles-progress.spec.ts
@@ -82,10 +82,14 @@ test.describe("Copy ignored files prepare step", () => {
 
       const panel = testPage.getByTestId("prepare-progress-panel");
       await expect(panel).toBeVisible({ timeout: 30_000 });
-      await expect(panel).toHaveAttribute("data-status", "completed", { timeout: 30_000 });
+      await expect(panel).toHaveAttribute("data-status", /^completed(?:_with_warnings)?$/, {
+        timeout: 30_000,
+      });
 
-      // Panel auto-collapses on a clean run — expand it so the step rows render.
-      await panel.getByTestId("prepare-progress-toggle").click();
+      // A remote-sync warning can keep the panel open without affecting file copying.
+      if ((await panel.getAttribute("data-expanded")) === "false") {
+        await panel.getByTestId("prepare-progress-toggle").click();
+      }
       await expect(panel).toHaveAttribute("data-expanded", "true");
 
       // Pluralized count is what proves the backend wired in CopiedFiles —
@@ -93,6 +97,9 @@ test.describe("Copy ignored files prepare step", () => {
       // step builder would land on "Copy ignored files" (no count) or skip
       // the step entirely.
       await expect(panel).toContainText("Copy 2 ignored files", { timeout: 5_000 });
+      await expect(panel.getByText("Copy 2 ignored files", { exact: true })).toHaveClass(
+        /line-through/,
+      );
     } finally {
       if (fs.existsSync(delayFile)) fs.unlinkSync(delayFile);
       await apiClient.updateRepository(seedData.repositoryId, { copy_files: "" }).catch(() => {
diff --git a/apps/web/e2e/tests/session/mobile-session-deletion.spec.ts b/apps/web/e2e/tests/session/mobile-session-deletion.spec.ts
index 44c7aaff59..9cfe063929 100644
--- a/apps/web/e2e/tests/session/mobile-session-deletion.spec.ts
+++ b/apps/web/e2e/tests/session/mobile-session-deletion.spec.ts
@@ -1,6 +1,7 @@
 import { expect } from "@playwright/test";
 import { test } from "../../fixtures/test-base";
 import { SessionPage } from "../../pages/session-page";
+import { expectContentSizedBottomConfirmation } from "../../helpers/mobile-confirmations";
 
 const DONE_STATES = ["COMPLETED", "WAITING_FOR_INPUT"];
 
@@ -57,6 +58,7 @@ test.describe("mobile: session deletion", () => {
 
     const sheet = testPage.getByRole("dialog", { name: "Sessions" });
     await expect(sheet).toBeVisible({ timeout: 5_000 });
+    const sheetId = await sheet.getAttribute("id");
     const secondaryRow = sheet.getByTestId(`mobile-session-row-${secondarySession.session_id}`);
     await expect(secondaryRow).toBeVisible();
 
@@ -67,11 +69,22 @@ test.describe("mobile: session deletion", () => {
     await expect(actionsMenu).toBeVisible({ timeout: 5_000 });
     await actionsMenu.getByRole("menuitem", { name: "Delete" }).tap();
 
-    const confirmation = secondaryRow.getByTestId("mobile-session-delete-confirmation");
+    const confirmation = testPage.getByTestId("mobile-session-delete-confirmation");
     await expect(confirmation).toBeVisible();
+    await expectContentSizedBottomConfirmation(
+      testPage.getByRole("dialog", { name: "Delete session?" }),
+      confirmation,
+    );
     await expect(testPage.getByRole("alertdialog")).toHaveCount(0);
-    // The row-local confirmation states the conversation-deletion contract and
-    // explicitly says the task workspace and files are retained.
+    await expect(testPage.getByRole("dialog", { name: "Delete session?" })).toHaveAttribute(
+      "id",
+      sheetId!,
+    );
+    await expect(testPage.locator('[data-slot="drawer-content"]')).toHaveCount(1);
+    await expect(
+      testPage.getByTestId(`mobile-session-row-${secondarySession.session_id}`),
+    ).toBeAttached();
+    // The focused step retains the existing conversation-deletion contract.
     await expect(confirmation).toContainText("permanently delete the conversation history");
     await expect(confirmation).toContainText("task workspace and its files are kept");
 
@@ -83,7 +96,7 @@ test.describe("mobile: session deletion", () => {
     const reopenedActionsMenu = testPage.getByRole("menu");
     await expect(reopenedActionsMenu).toBeVisible({ timeout: 5_000 });
     await reopenedActionsMenu.getByRole("menuitem", { name: "Delete" }).tap();
-    await secondaryRow.getByTestId("mobile-session-delete-confirm").tap();
+    await testPage.getByTestId("mobile-session-delete-confirm").tap();
 
     await expect(secondaryRow).not.toBeVisible({ timeout: 15_000 });
     await expect(sheet.getByTestId(`mobile-session-row-${primarySessionId}`)).toBeVisible();
diff --git a/apps/web/e2e/tests/settings/mobile-agent-profile-delete.spec.ts b/apps/web/e2e/tests/settings/mobile-agent-profile-delete.spec.ts
index c041fa7ec9..e2ea493873 100644
--- a/apps/web/e2e/tests/settings/mobile-agent-profile-delete.spec.ts
+++ b/apps/web/e2e/tests/settings/mobile-agent-profile-delete.spec.ts
@@ -1,4 +1,5 @@
 import { test, expect } from "../../fixtures/test-base";
+import { waitForFiniteAnimations } from "../../helpers/animations";
 
 function longProfileDeleteConflict() {
   return {
@@ -31,8 +32,9 @@ test.describe("Agent profile deletion on mobile", () => {
     await trigger.tap();
     await testPage.getByTestId(`delete-profile-${profile.id}`).tap();
 
-    const confirmation = row.getByTestId("agent-profile-delete-inline-confirmation");
+    const confirmation = testPage.getByRole("dialog", { name: "Delete agent profile?" });
     await expect(confirmation).toBeVisible();
+    await expect(testPage.locator('[data-slot="dropdown-menu-content"]')).toHaveCount(0);
     for (const label of ["Cancel", "Delete"]) {
       const action = confirmation.getByRole("button", { name: label, exact: true });
       await expect
@@ -55,7 +57,7 @@ test.describe("Agent profile deletion on mobile", () => {
     await expect(testPage).toHaveURL(/\/settings\/agents$/);
   });
 
-  test("keeps simple deletion inline with touch-sized cancel and delete actions", async ({
+  test("opens simple deletion in a sheet with touch-sized cancel and delete actions", async ({
     testPage,
     apiClient,
     prCapture,
@@ -74,11 +76,12 @@ test.describe("Agent profile deletion on mobile", () => {
     const trigger = testPage.getByTestId("profile-delete-trigger");
     await trigger.tap();
 
-    const confirmation = testPage.getByTestId("agent-profile-delete-inline-confirmation");
+    const confirmation = testPage.getByRole("dialog", { name: "Delete agent profile?" });
     await expect(confirmation).toBeVisible();
     await expect(testPage.getByRole("alertdialog")).toHaveCount(0);
+    await waitForFiniteAnimations(confirmation);
     await prCapture.screenshot("mobile-agent-profile-delete-confirmation", {
-      caption: "Mobile inline agent profile deletion confirmation",
+      caption: "Mobile agent profile deletion confirmation sheet",
     });
     await expect
       .poll(async () =>
@@ -104,7 +107,7 @@ test.describe("Agent profile deletion on mobile", () => {
 
     await trigger.tap();
     await testPage
-      .getByTestId("agent-profile-delete-inline-confirmation")
+      .getByRole("dialog", { name: "Delete agent profile?" })
       .getByTestId("agent-profile-delete-confirm")
       .tap();
 
@@ -137,7 +140,7 @@ test.describe("Agent profile deletion on mobile", () => {
     });
 
     await testPage.getByTestId("profile-delete-trigger").tap();
-    const confirmation = testPage.getByTestId("agent-profile-delete-inline-confirmation");
+    const confirmation = testPage.getByRole("dialog", { name: "Delete agent profile?" });
     await expect(confirmation).toBeVisible();
     await confirmation.getByTestId("agent-profile-delete-confirm").tap();
 
diff --git a/apps/web/e2e/tests/settings/mobile-layout-profiles.spec.ts b/apps/web/e2e/tests/settings/mobile-layout-profiles.spec.ts
index c25e582423..6568ca035a 100644
--- a/apps/web/e2e/tests/settings/mobile-layout-profiles.spec.ts
+++ b/apps/web/e2e/tests/settings/mobile-layout-profiles.spec.ts
@@ -122,10 +122,7 @@ test.describe("Mobile layout profiles", () => {
     await assertNoDescendantOverflowsRight(layouts.root, "edited layouts settings");
   });
 
-  test("morphs custom profile deletion into touch-sized inline actions", async ({
-    testPage,
-    apiClient,
-  }) => {
+  test("opens custom profile deletion in a touch-sized sheet", async ({ testPage, apiClient }) => {
     await apiClient.saveUserSettings({
       saved_layouts: [
         {
@@ -144,7 +141,7 @@ test.describe("Mobile layout profiles", () => {
     await expect(deleteButton).toBeVisible();
     await deleteButton.tap();
 
-    const inline = testPage.getByTestId("layout-profile-delete-inline-confirmation");
+    const inline = testPage.getByRole("dialog", { name: "Delete Mobile layout to delete?" });
     await expect(inline).toBeVisible();
     await expect(testPage.getByRole("alertdialog")).toHaveCount(0);
     for (const action of await inline.getByRole("button").all()) {
@@ -157,7 +154,7 @@ test.describe("Mobile layout profiles", () => {
 
     await deleteButton.tap();
     await testPage
-      .getByTestId("layout-profile-delete-inline-confirmation")
+      .getByRole("dialog", { name: "Delete Mobile layout to delete?" })
       .getByTestId("layout-profile-delete-confirm")
       .tap();
     await expect(deleteButton).toHaveCount(0);
diff --git a/apps/web/e2e/tests/settings/mobile-management-confirmations.spec.ts b/apps/web/e2e/tests/settings/mobile-management-confirmations.spec.ts
new file mode 100644
index 0000000000..69a78345cf
--- /dev/null
+++ b/apps/web/e2e/tests/settings/mobile-management-confirmations.spec.ts
@@ -0,0 +1,124 @@
+import { test, expect } from "../../fixtures/test-base";
+import { WorkflowSettingsPage } from "../../pages/workflow-settings-page";
+import { waitForFiniteAnimations } from "../../helpers/animations";
+import {
+  openInstallDialog,
+  PACKAGE_PATH,
+  PLUGIN_ID,
+  uninstallPluginFixture,
+  uploadPackage,
+} from "../plugins/plugin-test-helpers";
+
+test("phone plugin uninstall preserves the row and works from plugin details", async ({
+  testPage,
+  apiClient,
+}) => {
+  try {
+    await openInstallDialog(testPage);
+    await uploadPackage(testPage, PACKAGE_PATH);
+    const row = testPage.getByTestId(`plugin-row-${PLUGIN_ID}`);
+    await expect(row).toBeVisible();
+    const trigger = row.getByRole("button", { name: "Uninstall", exact: true });
+    await trigger.tap();
+    const confirmation = testPage.getByRole("dialog", { name: "Uninstall plugin" });
+    await expect(confirmation).toContainText("Kandev E2E Fixture Plugin");
+    await expect(confirmation).toContainText("revoke its API key");
+    await expect(testPage.getByRole("dialog")).toHaveCount(1);
+    await confirmation.getByRole("button", { name: "Cancel" }).tap();
+    await expect(trigger).toBeFocused();
+    await testPage.goto(`/settings/plugins/${PLUGIN_ID}`);
+    const detail = testPage.getByTestId(`plugin-detail-${PLUGIN_ID}`);
+    await detail.getByRole("button", { name: "Uninstall", exact: true }).tap();
+    const removed = testPage.waitForResponse(
+      (response) =>
+        response.url().endsWith(`/api/plugins/${PLUGIN_ID}`) &&
+        response.request().method() === "DELETE" &&
+        response.ok(),
+    );
+    await testPage.getByTestId("plugin-uninstall-confirm").tap();
+    await removed;
+    await expect(testPage).toHaveURL(/\/settings\/plugins$/);
+    await expect(row).toHaveCount(0);
+  } finally {
+    await uninstallPluginFixture(apiClient);
+  }
+});
+
+test("phone workflow removal preserves its form and retries a failed request in one dialog", async ({
+  testPage,
+  apiClient,
+  seedData,
+  prCapture,
+}) => {
+  const endpoint = `/api/v1/workflow-sync/config?workspace_id=${seedData.workspaceId}`;
+  const seeded = await apiClient.rawRequest("POST", endpoint, {
+    provider: "github",
+    repo_owner: "acme",
+    repo_name: "workflows",
+    project_path: "",
+    branch: "main",
+    path: ".kandev/workflows",
+    poll_enabled: false,
+    interval_seconds: 300,
+  });
+  expect(seeded.ok).toBe(true);
+  try {
+    await new WorkflowSettingsPage(testPage).goto(seedData.workspaceId);
+    await testPage.getByTestId("workflow-sync-open").tap();
+    const dialog = testPage.getByTestId("workflow-sync-dialog");
+    const dialogId = await dialog.getAttribute("id");
+    const branch = dialog.getByTestId("workflow-sync-branch-input");
+    await branch.fill("draft-branch");
+    const trigger = dialog.getByTestId("workflow-sync-remove");
+    await trigger.tap();
+    await expect(testPage.getByRole("dialog")).toHaveCount(1);
+    await expect(dialog).toHaveAttribute("id", dialogId!);
+    await expect(branch).toBeHidden();
+    await expect(dialog.getByRole("button", { name: "Cancel" })).toBeFocused();
+    await dialog.getByRole("button", { name: "Back" }).tap();
+    await expect(branch).toHaveValue("draft-branch");
+    await expect(trigger).toBeFocused();
+    let attempts = 0;
+    await testPage.route("**/api/v1/workflow-sync/config?*", async (route) => {
+      if (route.request().method() !== "DELETE") return route.continue();
+      attempts += 1;
+      if (attempts !== 1) return route.continue();
+      await route.fulfill({
+        status: 500,
+        contentType: "application/json",
+        body: JSON.stringify({ error: "Temporary removal failure" }),
+      });
+    });
+    await trigger.tap();
+    await waitForFiniteAnimations(dialog);
+    const cancel = dialog.getByRole("button", { name: "Cancel" });
+    const cancelBox = await cancel.boundingBox();
+    expect(cancelBox).not.toBeNull();
+    expect(cancelBox!.height).toBeGreaterThanOrEqual(48);
+    expect(cancelBox!.y + cancelBox!.height).toBeLessThanOrEqual(testPage.viewportSize()!.height);
+    await prCapture.screenshot("workflow-sync-removal-step", {
+      caption: "Workflow sync removal is a focused step in the same phone form dialog.",
+    });
+    const confirmation = dialog.getByTestId("workflow-sync-remove-confirm");
+    await confirmation.tap();
+    await expect.poll(() => attempts).toBe(1);
+    await expect(confirmation).toBeEnabled();
+    await expect(dialog).toBeVisible();
+    await expect(branch).toHaveValue("draft-branch");
+    const removed = testPage.waitForResponse(
+      (response) =>
+        response.url().includes("/api/v1/workflow-sync/config") &&
+        response.request().method() === "DELETE" &&
+        response.ok(),
+    );
+    await confirmation.tap();
+    await removed;
+    await expect(dialog).toBeHidden();
+    expect(attempts).toBe(2);
+    const persisted = await apiClient.rawRequest("GET", endpoint);
+    expect(persisted.status).toBe(204);
+  } finally {
+    await testPage.unroute("**/api/v1/workflow-sync/config?*");
+    await apiClient.rawRequest("DELETE", endpoint);
+  }
+});
diff --git a/apps/web/e2e/tests/settings/mobile-prompts-settings.spec.ts b/apps/web/e2e/tests/settings/mobile-prompts-settings.spec.ts
index bba60ae112..b6c8204ea0 100644
--- a/apps/web/e2e/tests/settings/mobile-prompts-settings.spec.ts
+++ b/apps/web/e2e/tests/settings/mobile-prompts-settings.spec.ts
@@ -10,7 +10,7 @@ test.describe("Prompts settings on a phone", () => {
     }
   });
 
-  test("morphs prompt delete into a touch-sized inline confirmation", async ({
+  test("opens prompt deletion in a touch-sized confirmation sheet", async ({
     testPage,
     apiClient,
   }) => {
@@ -25,7 +25,7 @@ test.describe("Prompts settings on a phone", () => {
     await expect(row).toBeVisible();
     await row.getByTestId("prompt-delete-button").tap();
 
-    const inline = testPage.getByTestId("prompt-delete-inline-confirmation");
+    const inline = testPage.getByRole("dialog", { name: "Delete prompt" });
     await expect(inline).toBeVisible();
     await expect(testPage.getByTestId("prompt-delete-confirm-popover")).toHaveCount(0);
     await expect(testPage.getByRole("alertdialog")).toHaveCount(0);
@@ -52,5 +52,10 @@ test.describe("Prompts settings on a phone", () => {
     await row.getByTestId("prompt-delete-button").tap();
     await testPage.getByTestId("prompt-delete-confirm").tap();
     await expect(row).toHaveCount(0);
+    expect(
+      (await apiClient.listPrompts()).prompts.some(
+        (prompt) => prompt.name === "mobile-delete-prompt",
+      ),
+    ).toBe(false);
   });
 });
diff --git a/apps/web/e2e/tests/settings/mobile-secrets-delete.spec.ts b/apps/web/e2e/tests/settings/mobile-secrets-delete.spec.ts
index 9dc6a9bc7e..82638468b4 100644
--- a/apps/web/e2e/tests/settings/mobile-secrets-delete.spec.ts
+++ b/apps/web/e2e/tests/settings/mobile-secrets-delete.spec.ts
@@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto";
 
 import { test, expect } from "../../fixtures/test-base";
 import { assertNoDocumentHorizontalOverflow } from "../../helpers/layout-assertions";
+import { waitForFiniteAnimations } from "../../helpers/animations";
 import { settledBoundingBox } from "../../helpers/settled-box";
 
 const SECRET_VALUE = "e2e-mobile-secret-delete-redaction-value";
@@ -20,7 +21,7 @@ function conflictReferences() {
 }
 
 test.describe("mobile-secrets-delete", () => {
-  test("confirms inline at the target row without exposing the value", async ({
+  test("confirms in a named sheet without exposing the value", async ({
     testPage,
     apiClient,
     prCapture,
@@ -40,12 +41,12 @@ test.describe("mobile-secrets-delete", () => {
       const trigger = row.getByRole("button", { name: `Delete secret ${name}` });
       await trigger.tap();
 
-      const inline = row.getByTestId("secret-delete-inline-confirmation");
+      const inline = testPage.getByRole("dialog", { name: `Delete secret ${name}` });
       await expect(inline).toBeVisible();
       await expect(inline).toContainText(
         `This will permanently remove ${name}. This action cannot be undone.`,
       );
-      const warningBox = await inline.locator("p").boundingBox();
+      const warningBox = await inline.getByTestId("mobile-confirmation-body").boundingBox();
       expect(warningBox).not.toBeNull();
       expect(warningBox!.x).toBeGreaterThanOrEqual(0);
       expect(warningBox!.x + warningBox!.width).toBeLessThanOrEqual(testPage.viewportSize()!.width);
@@ -63,8 +64,9 @@ test.describe("mobile-secrets-delete", () => {
         expect(box!.height).toBeGreaterThanOrEqual(44);
       }
       await assertNoDocumentHorizontalOverflow(testPage, "mobile secret deletion confirmation");
+      await waitForFiniteAnimations(inline);
       await prCapture.screenshot("mobile-secrets-delete-confirmation", {
-        caption: "Mobile secret row inline confirmation",
+        caption: "Mobile secret deletion confirmation sheet. The secret value is never shown.",
       });
 
       await inline.getByRole("button", { name: "Cancel" }).tap();
@@ -72,8 +74,8 @@ test.describe("mobile-secrets-delete", () => {
       expect((await apiClient.listSecrets()).some((item) => item.id === secret.id)).toBe(true);
 
       await row.getByRole("button", { name: `Delete secret ${name}` }).tap();
-      await row
-        .getByTestId("secret-delete-inline-confirmation")
+      await testPage
+        .getByRole("dialog", { name: `Delete secret ${name}` })
         .getByTestId("secret-delete-confirm")
         .tap();
       await expect(row).toHaveCount(0);
diff --git a/apps/web/e2e/tests/task/confirmation-text-hierarchy.spec.ts b/apps/web/e2e/tests/task/confirmation-text-hierarchy.spec.ts
index 0087130739..f90dd7b6e2 100644
--- a/apps/web/e2e/tests/task/confirmation-text-hierarchy.spec.ts
+++ b/apps/web/e2e/tests/task/confirmation-text-hierarchy.spec.ts
@@ -10,6 +10,35 @@ import { SessionPage } from "../../pages/session-page";
 
 const LONG_TASK_TITLE = `Desktop cleanup confirmation ${"X".repeat(31)}`;
 
+test.describe("Touch tablet archive boundary", () => {
+  test.use({ hasTouch: true, viewport: { width: 768, height: 1024 } });
+
+  test("retains the tablet inline confirmation at 768px", async ({
+    testPage,
+    apiClient,
+    seedData,
+  }) => {
+    const title = "Tablet archive stays inline";
+    const task = await apiClient.seedTask(seedData.workspaceId, title, {
+      workflow_id: seedData.workflowId,
+      workflow_step_id: seedData.startStepId,
+    });
+    await testPage.goto(`/t/${task.task_id}`);
+    const session = new SessionPage(testPage);
+    await session.waitForLoad();
+    expect(await testPage.evaluate(() => matchMedia("(pointer: coarse)").matches)).toBe(true);
+    const row = testPage.getByTestId("sidebar-task-item").filter({ hasText: title });
+    await row.click({ button: "right" });
+    await testPage.getByRole("menuitem", { name: "Archive", exact: true }).click();
+    const inline = row.getByTestId("task-archive-inline-confirmation");
+    await expect(inline).toBeVisible();
+    await expect(testPage.getByTestId("mobile-action-confirmation")).toHaveCount(0);
+    await inline.getByRole("button", { name: "Cancel", exact: true }).click();
+    await expect(inline).toHaveCount(0);
+    await expect(row).toBeVisible();
+  });
+});
+
 async function assertDesktopDeleteDialog(dialog: Locator): Promise<void> {
   await waitForFiniteAnimations(dialog);
 
diff --git a/apps/web/e2e/tests/task/file-tree-search.spec.ts b/apps/web/e2e/tests/task/file-tree-search.spec.ts
index 8d44268fd1..8b986d2228 100644
--- a/apps/web/e2e/tests/task/file-tree-search.spec.ts
+++ b/apps/web/e2e/tests/task/file-tree-search.spec.ts
@@ -61,8 +61,11 @@ test.describe("File tree search", () => {
       "FT Search Collapsed",
     );
 
-    await expect(session.fileTreeNode("search-alpha.ts")).toBeVisible({ timeout: 15_000 });
-    // Sanity: target file's tree row is not in the DOM (folder is collapsed).
+    // Files are virtualized, so a root file below the viewport is not a readiness signal.
+    const collapsedFolder = session.fileTreeNode("deep");
+    await expect(collapsedFolder).toBeVisible({ timeout: 15_000 });
+    await expect(collapsedFolder.locator(".tabler-icon-chevron-right")).toBeVisible();
+    // The parent is visibly collapsed, not merely outside the virtualized viewport.
     await expect(session.fileTreeNode("deep/nested/needle-target.ts")).toHaveCount(0);
 
     await testPage.getByRole("button", { name: "Search files" }).click();
diff --git a/apps/web/e2e/tests/task/mobile-action-confirmations.spec.ts b/apps/web/e2e/tests/task/mobile-action-confirmations.spec.ts
new file mode 100644
index 0000000000..c4936ba356
--- /dev/null
+++ b/apps/web/e2e/tests/task/mobile-action-confirmations.spec.ts
@@ -0,0 +1,268 @@
+import { test, expect } from "../../fixtures/test-base";
+import { SessionPage } from "../../pages/session-page";
+import { waitForFiniteAnimations } from "../../helpers/animations";
+import { assertNoDocumentHorizontalOverflow } from "../../helpers/layout-assertions";
+import { MobileKanbanPage } from "../../pages/mobile-kanban-page";
+import { expectContentSizedBottomConfirmation } from "../../helpers/mobile-confirmations";
+
+const presentations = [
+  {
+    locale: "pt-pt",
+    width: 320,
+    height: 640,
+    theme: "light",
+    more: "Mais opções",
+    archive: "Arquivar",
+    cancel: "Cancelar",
+  },
+  {
+    locale: "en",
+    width: 767,
+    height: 900,
+    theme: "dark",
+    more: "More options",
+    archive: "Archive",
+    cancel: "Cancel",
+  },
+  {
+    locale: "pseudo",
+    width: 667,
+    height: 375,
+    theme: "light",
+    more: "Ḿōŕē ōƥţĩōńś",
+    archive: "Àŕćĥĩvē",
+    cancel: "Ćàńćēĺ",
+  },
+] as const;
+
+for (const presentation of presentations) {
+  test(`standalone archive fits ${presentation.width}px ${presentation.locale} ${presentation.theme}`, async ({
+    testPage,
+    apiClient,
+    seedData,
+    prCapture,
+  }) => {
+    await testPage.setViewportSize(presentation);
+    await testPage.addInitScript(({ theme }) => {
+      localStorage.setItem("theme", theme);
+    }, presentation);
+    const task = await apiClient.createTask(
+      seedData.workspaceId,
+      `Long mobile title ${"X".repeat(40)}`,
+      {
+        workflow_id: seedData.workflowId,
+        workflow_step_id: seedData.startStepId,
+      },
+    );
+    const board = new MobileKanbanPage(testPage);
+    await board.goto();
+    await testPage.evaluate((locale) => {
+      document.cookie = `kandev_locale=${locale}; path=/; SameSite=Lax`;
+    }, presentation.locale);
+    await testPage.reload();
+    await expect(testPage.locator("html")).toHaveAttribute("lang", presentation.locale);
+    const card = board.taskCard(task.id);
+    await card.getByRole("button", { name: presentation.more, exact: true }).tap();
+    await testPage.getByRole("menuitem", { name: presentation.archive, exact: true }).tap();
+    const dialog = testPage
+      .getByRole("dialog")
+      .filter({ has: testPage.getByTestId("mobile-action-confirmation") });
+    await expect(dialog).toContainText(task.title);
+    await waitForFiniteAnimations(dialog);
+    await expect(testPage.getByText("Kandev update available", { exact: true })).toBeHidden();
+    await assertNoDocumentHorizontalOverflow(testPage);
+    const confirm = dialog.getByRole("button", { name: presentation.archive, exact: true });
+    const cancel = dialog.getByRole("button", { name: presentation.cancel, exact: true });
+    const boxes = [];
+    for (const button of [confirm, cancel]) {
+      const box = (await button.boundingBox())!;
+      boxes.push(box);
+      expect(box.height).toBeGreaterThanOrEqual(48);
+      expect(box.y).toBeGreaterThanOrEqual(0);
+      expect(box.y + box.height).toBeLessThanOrEqual(presentation.height);
+      expect(
+        await button.evaluate((element) => {
+          const bounds = element.getBoundingClientRect();
+          return element.contains(
+            document.elementFromPoint(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2),
+          );
+        }),
+      ).toBe(true);
+    }
+    expect(boxes[0].y + boxes[0].height).toBeLessThanOrEqual(boxes[1].y);
+    await expect(cancel).toBeFocused();
+    await prCapture.screenshot(
+      `standalone-${presentation.width}-${presentation.locale}-${presentation.theme}`,
+    );
+    const dialogId = await dialog.getAttribute("id");
+    await testPage.setViewportSize({ width: 393, height: 700 });
+    await expect(dialog).toHaveAttribute("id", dialogId!);
+    await expect(cancel).toBeVisible();
+    await testPage.setViewportSize({ width: 768, height: 800 });
+    await expect(testPage.getByTestId("mobile-action-confirmation")).toHaveCount(0);
+    const response = await apiClient.rawRequest("GET", `/api/v1/tasks/${task.id}`);
+    expect((await response.json()).archived_at).toBeFalsy();
+  });
+}
+
+for (const presentation of presentations) {
+  test(`hosted archive fits ${presentation.width}px ${presentation.locale} ${presentation.theme}`, async ({
+    testPage,
+    apiClient,
+    seedData,
+  }, testInfo) => {
+    // Enter through the portrait task drawer, then exercise phone rotation while open.
+    await testPage.setViewportSize({
+      width: Math.min(presentation.width, 393),
+      height: Math.max(presentation.height, 640),
+    });
+    await testPage.emulateMedia({ reducedMotion: "reduce" });
+    await testPage.addInitScript(({ theme }) => {
+      localStorage.setItem("theme", theme);
+    }, presentation);
+    const options = { workflow_id: seedData.workflowId, workflow_step_id: seedData.startStepId };
+    const navigation = await apiClient.seedTask(
+      seedData.workspaceId,
+      "Geometry navigation",
+      options,
+    );
+    const target = await apiClient.createTask(
+      seedData.workspaceId,
+      `Long confirmation ${"X".repeat(40)}`,
+      options,
+    );
+    await apiClient.createTask(seedData.workspaceId, "Active child task", {
+      ...options,
+      parent_id: target.id,
+    });
+    await testPage.goto(`/t/${navigation.task_id}`);
+    await testPage.evaluate((locale) => {
+      document.cookie = `kandev_locale=${locale}; path=/; SameSite=Lax`;
+    }, presentation.locale);
+    await testPage.reload();
+    await new SessionPage(testPage).waitForLoad();
+    await expect(testPage.locator("html")).toHaveAttribute("lang", presentation.locale);
+    await testPage.getByTestId("mobile-session-menu").tap();
+    const row = testPage
+      .getByTestId("mobile-task-switcher-list")
+      .getByTestId("sidebar-task-item")
+      .filter({ hasText: target.title });
+    await row.locator("button.mobile-task-actions-button").tap();
+    await testPage.getByRole("menuitem", { name: presentation.archive, exact: true }).tap();
+    const confirmation = testPage.getByTestId("mobile-action-confirmation");
+    const drawer = testPage.getByRole("dialog").filter({ has: confirmation });
+    await expect(confirmation).toContainText(target.title);
+    const drawerId = await drawer.getAttribute("id");
+    await testPage.setViewportSize(presentation);
+    await expect(drawer).toHaveAttribute("id", drawerId!);
+    await waitForFiniteAnimations(drawer);
+    const bounds = (await drawer.boundingBox())!;
+    expect(bounds.y).toBeGreaterThanOrEqual(0);
+    expect(bounds.y + bounds.height).toBeCloseTo(presentation.height, 0);
+    await assertNoDocumentHorizontalOverflow(testPage);
+    const body = confirmation.getByTestId("mobile-confirmation-body");
+    await expect(body).toHaveCSS("overflow-y", "auto");
+    await expect(confirmation.getByTestId("archive-cascade-checkbox")).not.toBeChecked();
+    if (presentation.height === 375) {
+      expect(await body.evaluate((element) => element.scrollHeight > element.clientHeight)).toBe(
+        true,
+      );
+      await body.evaluate((element) => {
+        element.scrollTop = element.scrollHeight;
+      });
+      expect(await body.evaluate((element) => element.scrollTop)).toBeGreaterThan(0);
+    }
+    for (const button of await confirmation.locator("footer button").all()) {
+      const box = (await button.boundingBox())!;
+      expect(box.height).toBeGreaterThanOrEqual(48);
+      expect(box.y + box.height).toBeLessThanOrEqual(presentation.height);
+      expect(
+        await button.evaluate((element) => {
+          const rect = element.getBoundingClientRect();
+          return element.contains(
+            document.elementFromPoint(rect.x + rect.width / 2, rect.y + rect.height / 2),
+          );
+        }),
+      ).toBe(true);
+    }
+    await testPage.screenshot({ path: testInfo.outputPath("hosted-confirmation.png") });
+    await confirmation.getByRole("button", { name: presentation.cancel, exact: true }).tap();
+    await expect(row).toBeVisible();
+    await expect(testPage).toHaveURL(new RegExp(`/t/${navigation.task_id}`));
+    const response = await apiClient.rawRequest("GET", `/api/v1/tasks/${target.id}`);
+    expect((await response.json()).archived_at).toBeFalsy();
+  });
+}
+
+test("archive is a step in the Tasks drawer and Cancel restores the scrolled list", async ({
+  testPage,
+  apiClient,
+  seedData,
+  prCapture,
+}, testInfo) => {
+  const options = {
+    workflow_id: seedData.workflowId,
+    workflow_step_id: seedData.startStepId,
+    repository_ids: [seedData.repositoryId],
+  };
+  const active = await apiClient.createTaskWithAgent(
+    seedData.workspaceId,
+    "Active mobile context",
+    seedData.agentProfileId,
+    { ...options, description: 'e2e:message("Ready")' },
+  );
+  const target = await apiClient.createTask(
+    seedData.workspaceId,
+    "Archive target with a long title that wraps on a phone",
+    options,
+  );
+  for (let index = 0; index < 18; index++) {
+    await apiClient.createTask(seedData.workspaceId, `Mobile neighboring task ${index}`, options);
+  }
+  await testPage.goto(`/t/${active.id}`);
+  await new SessionPage(testPage).waitForLoad();
+  await testPage.getByTestId("mobile-session-menu").tap();
+  const sheet = testPage
+    .locator('[data-slot="drawer-content"]')
+    .filter({ has: testPage.getByRole("heading", { name: "Tasks", exact: true }) });
+  await expect(sheet).toBeVisible();
+  const sheetId = await sheet.getAttribute("id");
+  const row = sheet.getByTestId("sidebar-task-item").filter({ hasText: target.title });
+  await row.scrollIntoViewIfNeeded();
+  const list = sheet.getByTestId("mobile-task-switcher-list");
+  const scrollTop = await list.evaluate((element) => element.scrollTop);
+  const originalHeight = (await sheet.boundingBox())!.height;
+  await row.getByRole("button", { name: "Task actions" }).tap();
+  await testPage.getByRole("menuitem", { name: "Archive", exact: true }).tap();
+  const confirmation = testPage.getByRole("dialog", { name: "Archive task?", exact: true });
+  await expect(confirmation).toBeVisible();
+  await expect(confirmation).toHaveAttribute("id", sheetId!);
+  await expect(testPage.locator('[data-slot="drawer-content"]')).toHaveCount(1);
+  await expect(confirmation).toContainText(target.title);
+  await expect(list).toBeHidden();
+  await expect(testPage.getByTestId("task-archive-inline-confirmation")).toHaveCount(0);
+  const compactBox = await expectContentSizedBottomConfirmation(
+    confirmation,
+    confirmation.getByTestId("mobile-action-confirmation"),
+  );
+  expect(compactBox.height).toBeLessThan(originalHeight);
+  await testInfo.attach("confirmation-geometry", {
+    body: JSON.stringify({ originalHeight, compactBox }),
+    contentType: "application/json",
+  });
+  await assertNoDocumentHorizontalOverflow(testPage);
+  const cancel = confirmation.getByRole("button", { name: "Cancel", exact: true });
+  await expect(cancel).toBeFocused();
+  await prCapture.screenshot("hosted-archive", {
+    caption: "Archive becomes a focused step in the same Tasks sheet.",
+  });
+  await testPage.screenshot({ path: testInfo.outputPath("compact-archive.png") });
+  await cancel.tap();
+  await expect(testPage.getByRole("dialog", { name: "Tasks", exact: true })).toBeVisible();
+  await expect(list).toBeVisible();
+  await waitForFiniteAnimations(sheet);
+  expect((await sheet.boundingBox())!.height).toBeCloseTo(originalHeight, 0);
+  expect(await list.evaluate((element) => element.scrollTop)).toBe(scrollTop);
+  await expect(row).toBeVisible();
+  await expect(testPage).toHaveURL(new RegExp(`/t/${active.id}`));
+});
diff --git a/apps/web/e2e/tests/task/mobile-archive-task-redirect.spec.ts b/apps/web/e2e/tests/task/mobile-archive-task-redirect.spec.ts
index 2109de6d99..ca155b1c91 100644
--- a/apps/web/e2e/tests/task/mobile-archive-task-redirect.spec.ts
+++ b/apps/web/e2e/tests/task/mobile-archive-task-redirect.spec.ts
@@ -96,7 +96,7 @@ test.describe("Mobile archive task redirect", () => {
     await parentRow.getByRole("button", { name: "Task actions" }).tap();
     await testPage.getByRole("menuitem", { name: "Archive", exact: true }).tap();
 
-    const archiveDialog = testPage.getByRole("alertdialog");
+    const archiveDialog = testPage.getByRole("dialog", { name: "Archive task?", exact: true });
     await expect(archiveDialog).toBeVisible();
     await archiveDialog.getByTestId("archive-cascade-checkbox").tap();
     await archiveDialog.getByRole("button", { name: "Archive", exact: true }).tap();
diff --git a/apps/web/e2e/tests/task/mobile-confirmation-text-hierarchy.spec.ts b/apps/web/e2e/tests/task/mobile-confirmation-text-hierarchy.spec.ts
index e594b4d221..f740752337 100644
--- a/apps/web/e2e/tests/task/mobile-confirmation-text-hierarchy.spec.ts
+++ b/apps/web/e2e/tests/task/mobile-confirmation-text-hierarchy.spec.ts
@@ -228,13 +228,13 @@ test.describe("Mobile confirmation text hierarchy", () => {
 
   // @covers AC-UI-SURFACE-TEXT-HIERARCHY-001.1, AC-UI-SURFACE-TEXT-HIERARCHY-001.3
   // @covers AC-UI-TASK-CLEANUP-CONFIRMATION-001.4, AC-UI-TASK-CLEANUP-CONFIRMATION-001.5
-  test("keeps the phone Drawer and inline archive confirmation touch-safe", async ({
+  test("keeps the phone Drawer confirmation step touch-safe", async ({
     testPage,
     apiClient,
     seedData,
   }) => {
     await testPage.setViewportSize({ width: 393, height: 640 });
-    const title = "Mobile inline archive confirmation target";
+    const title = "Mobile archive confirmation target";
     const task = await apiClient.seedTask(seedData.workspaceId, title, {
       workflow_id: seedData.workflowId,
       workflow_step_id: seedData.startStepId,
@@ -258,18 +258,20 @@ test.describe("Mobile confirmation text hierarchy", () => {
     const menu = testPage.locator('[data-slot="context-menu-content"]:visible').last();
     await menu.getByRole("menuitem", { name: "Archive", exact: true }).tap();
 
-    const confirmation = taskRow.getByTestId("task-archive-inline-confirmation");
+    const confirmation = drawer.getByTestId("mobile-action-confirmation");
     await expect(confirmation).toBeVisible();
     await expect(testPage.getByRole("alertdialog")).toHaveCount(0);
     await expect(confirmation).toContainText(title);
-    await assertNoDocumentHorizontalOverflow(testPage, "phone inline archive confirmation");
+    await expect(testPage.locator('[data-slot="drawer-content"]')).toHaveCount(1);
+    await expect(taskRow).toBeHidden();
+    await assertNoDocumentHorizontalOverflow(testPage, "phone archive confirmation step");
 
     for (const button of [
       confirmation.getByRole("button", { name: "Cancel", exact: true }),
       confirmation.getByTestId("archive-task-confirm"),
     ]) {
       const box = await button.boundingBox();
-      if (!box) throw new Error("phone inline archive action has no rendered hitbox");
+      if (!box) throw new Error("phone archive action has no rendered hitbox");
       expect(Math.round(box.width)).toBeGreaterThanOrEqual(44);
       expect(Math.round(box.height)).toBeGreaterThanOrEqual(44);
       await expect(button).toBeInViewport();
@@ -277,6 +279,7 @@ test.describe("Mobile confirmation text hierarchy", () => {
 
     await confirmation.getByRole("button", { name: "Cancel", exact: true }).tap();
     await expect(confirmation).toBeHidden();
+    await expect(taskRow).toBeVisible();
     expect((await apiClient.getTask(task.task_id)).id).toBe(task.task_id);
   });
 
diff --git a/apps/web/e2e/tests/task/mobile-content-confirmations.spec.ts b/apps/web/e2e/tests/task/mobile-content-confirmations.spec.ts
new file mode 100644
index 0000000000..294b03229b
--- /dev/null
+++ b/apps/web/e2e/tests/task/mobile-content-confirmations.spec.ts
@@ -0,0 +1,34 @@
+import { test, expect } from "../../fixtures/test-base";
+import { startQuickChatFromSetup } from "../chat/quick-chat-helpers";
+import { waitForFiniteAnimations } from "../../helpers/animations";
+
+test("Quick Chat hosts context reset without losing its draft or dialog", async ({
+  testPage,
+  prCapture,
+}) => {
+  await testPage.goto("/");
+  await testPage.getByTestId("mobile-topbar-menu").tap();
+  await testPage.getByTestId("mobile-quick-chat-button").tap();
+  const chat = testPage.getByRole("dialog", { name: "Quick Chat" });
+  await startQuickChatFromSetup(chat, testPage);
+  const reset = chat.getByTestId("reset-context-button");
+  await expect(reset).toBeVisible({ timeout: 30_000 });
+  const editor = chat.locator(".tiptap.ProseMirror");
+  await editor.fill("Keep this unsent mobile draft");
+  const dialogId = await chat.getAttribute("id");
+  await reset.tap();
+  const step = testPage.getByRole("dialog", { name: "Reset agent context?" });
+  await expect(step).toHaveAttribute("id", dialogId!);
+  await expect(testPage.locator('[data-slot="dialog-content"]')).toHaveCount(1);
+  await expect(testPage.locator('[data-slot="drawer-content"]')).toHaveCount(0);
+  await expect(step.getByRole("button", { name: "Cancel" })).toBeFocused();
+  await waitForFiniteAnimations(step);
+  await expect(testPage.getByRole("tooltip")).toHaveCount(0);
+  await prCapture.screenshot("quick-chat-context-reset-step", {
+    caption: "Quick Chat keeps one modal and the unsent draft behind its context-reset step",
+  });
+  await step.getByRole("button", { name: "Back" }).tap();
+  await expect(chat).toBeVisible();
+  await expect(editor).toHaveText("Keep this unsent mobile draft");
+  await expect(reset).toBeFocused();
+});
diff --git a/apps/web/e2e/tests/task/mobile-file-confirmations.spec.ts b/apps/web/e2e/tests/task/mobile-file-confirmations.spec.ts
index 22547b13f7..2358bfd373 100644
--- a/apps/web/e2e/tests/task/mobile-file-confirmations.spec.ts
+++ b/apps/web/e2e/tests/task/mobile-file-confirmations.spec.ts
@@ -5,6 +5,7 @@ import type { ApiClient } from "../../helpers/api-client";
 import type { BackendContext } from "../../fixtures/backend";
 import { GitHelper, makeGitEnv } from "../../helpers/git-helper";
 import { SessionPage } from "../../pages/session-page";
+import { waitForFiniteAnimations } from "../../helpers/animations";
 
 async function setupMobileFileTask(
   testPage: Page,
@@ -13,7 +14,7 @@ async function setupMobileFileTask(
   backend: BackendContext,
 ) {
   const suffix = `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-  const filePath = `mobile-delete-file-${suffix}.md`;
+  const filePath = `mobile-delete-very-long-unbroken-document-name-for-confirmation-${suffix}.md`;
   const git = new GitHelper(
     path.join(backend.tmpDir, "repos", "e2e-repo"),
     makeGitEnv(backend.tmpDir),
@@ -56,7 +57,7 @@ test.describe("Mobile file confirmations", () => {
     restoreRepository = undefined;
   });
 
-  test("confirms one file deletion inline without horizontal overflow", async ({
+  test("confirms one file deletion in a sheet without changing its row", async ({
     testPage,
     apiClient,
     seedData,
@@ -74,6 +75,7 @@ test.describe("Mobile file confirmations", () => {
     const file = session.fileTreeNode(filePath);
     await expect(file).toBeVisible({ timeout: 15_000 });
     const trigger = session.fileTreeNodeActions(filePath);
+    const rowHeight = (await file.boundingBox())!.height;
     await expect(trigger).toBeVisible();
     const triggerBox = await trigger.boundingBox();
     expect(triggerBox).not.toBeNull();
@@ -101,8 +103,12 @@ test.describe("Mobile file confirmations", () => {
     expect(menuBox!.y + menuBox!.height).toBeLessThanOrEqual(viewport.height);
 
     await deleteItem.tap();
-    const inline = testPage.getByTestId("file-delete-inline-confirmation");
+    const inline = testPage.getByTestId("mobile-action-confirmation");
     await expect(inline).toBeVisible();
+    await expect(menu).toBeHidden();
+    await expect(testPage.getByRole("dialog")).toHaveAttribute("data-slot", "drawer-content");
+    await waitForFiniteAnimations(testPage.getByRole("dialog"));
+    expect((await file.boundingBox())!.height).toBe(rowHeight);
     await expect(testPage.getByRole("alertdialog")).toHaveCount(0);
     const confirm = inline.getByTestId("file-delete-confirm");
     const cancel = inline.getByRole("button", { name: "Cancel" });
@@ -123,6 +129,15 @@ test.describe("Mobile file confirmations", () => {
       expect(buttonBox).not.toBeNull();
       expect(buttonBox!.x).toBeGreaterThanOrEqual(0);
       expect(buttonBox!.x + buttonBox!.width).toBeLessThanOrEqual(viewport.width);
+      expect(buttonBox!.y + buttonBox!.height).toBeLessThanOrEqual(viewport.height);
+      expect(
+        await button.evaluate((element) => {
+          const bounds = element.getBoundingClientRect();
+          return element.contains(
+            document.elementFromPoint(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2),
+          );
+        }),
+      ).toBe(true);
     }
     await expect
       .poll(async () => (await confirm.boundingBox())?.height ?? 0, { timeout: 2_000 })
@@ -137,9 +152,15 @@ test.describe("Mobile file confirmations", () => {
       ),
     ).toBe(true);
     await prCapture.screenshot("mobile-file-delete-confirmation", {
-      caption: "Pixel 5 file actions keep one-file deletion confirmation inline and touch-safe",
+      caption: "A long file name wraps inside a compact phone confirmation sheet",
     });
 
+    await cancel.tap();
+    await expect(trigger).toBeFocused();
+    await expect(file).toBeVisible();
+    await trigger.tap();
+    await deleteItem.tap();
+    await expect(inline).toBeVisible();
     await confirm.tap();
     await expect(file).not.toBeVisible({ timeout: 15_000 });
   });
diff --git a/apps/web/e2e/tests/task/mobile-plan-restore.spec.ts b/apps/web/e2e/tests/task/mobile-plan-restore.spec.ts
index 64d2ce1e28..ea5deb58b3 100644
--- a/apps/web/e2e/tests/task/mobile-plan-restore.spec.ts
+++ b/apps/web/e2e/tests/task/mobile-plan-restore.spec.ts
@@ -52,7 +52,7 @@ async function seedMobilePlanTask(
 }
 
 test.describe("Mobile plan restore confirmation", () => {
-  test("keeps restore confirmation inline and creates a new head revision", async ({
+  test("hands history off to a restore sheet and creates a new head revision", async ({
     testPage,
     apiClient,
     seedData,
@@ -72,12 +72,16 @@ test.describe("Mobile plan restore confirmation", () => {
     const row = session.revisionRow(1);
     await session.revertButton(row).tap();
 
-    const inlineConfirmation = session.revertInlineConfirmation(row);
+    const inlineConfirmation = testPage.getByTestId("mobile-action-confirmation");
     await expect(inlineConfirmation).toBeVisible();
+    await expect(session.revisionsPopover()).toBeHidden();
+    await expect(testPage.getByRole("dialog")).toHaveAttribute("data-slot", "drawer-content");
     await expect(inlineConfirmation).toContainText("v1");
     await expect(session.revertConfirmPopover()).toHaveCount(0);
 
-    const restoreBox = await session.revertInlineConfirm(row).boundingBox();
+    const restoreBox = await inlineConfirmation
+      .getByTestId("plan-revision-restore-confirm")
+      .boundingBox();
     expect(restoreBox).not.toBeNull();
     expect(restoreBox!.height).toBeGreaterThanOrEqual(44);
     expect(
@@ -87,12 +91,14 @@ test.describe("Mobile plan restore confirmation", () => {
       }),
     ).toBe(true);
 
-    await session.revertInlineCancel(row).tap();
+    await inlineConfirmation.getByRole("button", { name: "Cancel" }).tap();
     await expect(inlineConfirmation).toBeHidden();
+    await expect(session.rewindButton()).toBeFocused();
+    await session.rewindButton().tap();
     await expect(session.revertButton(row)).toBeVisible();
 
     await session.revertButton(row).tap();
-    await session.revertInlineConfirm(row).tap();
+    await inlineConfirmation.getByTestId("plan-revision-restore-confirm").tap();
     await expect(session.planPanel).toContainText("Mobile draft A", { timeout: 15_000 });
     expect(nativeDialogOpened).toBe(false);
 
diff --git a/apps/web/e2e/tests/task/mobile-sidebar-task-actions.spec.ts b/apps/web/e2e/tests/task/mobile-sidebar-task-actions.spec.ts
index 103135199c..a422c6b245 100644
--- a/apps/web/e2e/tests/task/mobile-sidebar-task-actions.spec.ts
+++ b/apps/web/e2e/tests/task/mobile-sidebar-task-actions.spec.ts
@@ -6,6 +6,7 @@ import { activeSessionId, seedSecondaryClarificationTask } from "../../helpers/c
 import { makeGitEnv } from "../../helpers/git-helper";
 import { waitForActiveSessionForegroundActivity } from "../../helpers/session-store";
 import { assertNoDocumentHorizontalOverflow } from "../../helpers/layout-assertions";
+import { expectContentSizedBottomConfirmation } from "../../helpers/mobile-confirmations";
 import {
   expectActiveTaskRow,
   expectActiveTaskRowWithoutColor,
@@ -308,12 +309,12 @@ test.describe("Mobile sidebar task actions", () => {
     expect(cardBox.y).toBeGreaterThan(0);
   });
 
-  test("keeps the inline archive confirmation readable on a phone", async ({
+  test("keeps the archive confirmation sheet readable on a phone", async ({
     testPage,
     apiClient,
     seedData,
   }) => {
-    const task = await apiClient.seedTask(seedData.workspaceId, "Mobile archive inline target", {
+    const task = await apiClient.seedTask(seedData.workspaceId, "Mobile archive sheet target", {
       workflow_id: seedData.workflowId,
       workflow_step_id: seedData.startStepId,
     });
@@ -324,25 +325,32 @@ test.describe("Mobile sidebar task actions", () => {
     await testPage.getByTestId("mobile-session-menu").tap();
 
     const drawer = testPage.getByRole("dialog", { name: "Tasks" });
+    const drawerId = await drawer.getAttribute("id");
     const taskRow = drawer
       .getByTestId("sidebar-task-item")
-      .filter({ hasText: "Mobile archive inline target" });
+      .filter({ hasText: "Mobile archive sheet target" });
     await taskRow.getByRole("button", { name: "Task actions" }).tap();
     await testPage.getByRole("menuitem", { name: "Archive", exact: true }).tap();
 
-    const confirmation = taskRow.getByTestId("task-archive-inline-confirmation");
+    const confirmation = testPage.getByRole("dialog", { name: "Archive task?", exact: true });
     await expect(confirmation).toBeVisible();
+    await expect(confirmation).toHaveAttribute("id", drawerId!);
     await expect(testPage.getByRole("alertdialog")).toHaveCount(0);
-    await expect(confirmation).toContainText("Mobile archive inline target");
+    await expect(testPage.getByTestId("task-archive-inline-confirmation")).toHaveCount(0);
+    await expect(confirmation).toContainText("Mobile archive sheet target");
+    await expectContentSizedBottomConfirmation(
+      confirmation,
+      confirmation.getByTestId("mobile-action-confirmation"),
+    );
 
     for (const button of [
       confirmation.getByRole("button", { name: "Cancel" }),
       confirmation.getByTestId("archive-task-confirm"),
     ]) {
       const box = await button.boundingBox();
-      if (!box) throw new Error("inline archive action has no layout box");
+      if (!box) throw new Error("archive sheet action has no layout box");
       expect(box.width).toBeGreaterThanOrEqual(44);
-      expect(box.height).toBeGreaterThanOrEqual(44);
+      expect(box.height).toBeGreaterThanOrEqual(48);
       await expect(button).toBeInViewport();
     }
 
@@ -351,6 +359,8 @@ test.describe("Mobile sidebar task actions", () => {
       client: document.documentElement.clientWidth,
     }));
     expect(pageWidth.scroll).toBeLessThanOrEqual(pageWidth.client);
+    await confirmation.getByRole("button", { name: "Cancel", exact: true }).tap();
+    await expect(taskRow).toBeVisible();
   });
 
   test("keeps the in-flight warning compact and reachable on a phone", async ({
@@ -380,6 +390,8 @@ test.describe("Mobile sidebar task actions", () => {
     await testPage.getByTestId("mobile-session-menu").tap();
 
     const drawer = testPage.getByRole("dialog", { name: "Tasks" });
+    const drawerId = await drawer.getAttribute("id");
+    const drawerHeight = (await drawer.boundingBox())!.height;
     const taskRow = drawer.getByTestId("sidebar-task-item").filter({ hasText: title });
     const heightBefore = await taskRow.evaluate(
       (element) => element.getBoundingClientRect().height,
@@ -390,10 +402,17 @@ test.describe("Mobile sidebar task actions", () => {
     await taskRow.getByRole("button", { name: "Task actions" }).tap();
     await testPage.getByRole("menuitem", { name: "Archive", exact: true }).tap();
 
-    const confirmation = taskRow.getByTestId("task-archive-inline-confirmation");
+    const confirmation = testPage.getByRole("dialog", { name: "Archive task?", exact: true });
     const warning = confirmation.getByTestId("still-working-warning");
     await expect(confirmation).toBeVisible();
+    await expect(confirmation).toHaveAttribute("id", drawerId!);
+    await expect(testPage.locator('[data-slot="drawer-content"]')).toHaveCount(1);
+    await expect(taskRow).toBeHidden();
     await expect(warning).toBeVisible();
+    const confirmationBox = await expectContentSizedBottomConfirmation(
+      confirmation,
+      confirmation.getByTestId("mobile-action-confirmation"),
+    );
     await prCapture.screenshot("mobile-in-flight-archive-warning", {
       caption: "Compact in-flight warning in phone archive confirmation",
     });
@@ -404,17 +423,16 @@ test.describe("Mobile sidebar task actions", () => {
     });
     expect(warningMetrics).toEqual({ fontSize: "12px", lineHeight: "20px" });
     await expect(warning).toHaveClass(/text-pretty/);
-    const heightOpen = await taskRow.evaluate((element) => element.getBoundingClientRect().height);
-    expect(heightOpen).toBeGreaterThan(heightBefore);
+    expect(confirmationBox.height).toBeLessThan(drawerHeight);
 
     for (const button of [
       confirmation.getByRole("button", { name: "Cancel" }),
       confirmation.getByTestId("archive-task-confirm"),
     ]) {
       const box = await button.boundingBox();
-      if (!box) throw new Error("in-flight inline archive action has no layout box");
+      if (!box) throw new Error("in-flight archive sheet action has no layout box");
       expect(box.width).toBeGreaterThanOrEqual(44);
-      expect(box.height).toBeGreaterThanOrEqual(44);
+      expect(box.height).toBeGreaterThanOrEqual(48);
       await expect(button).toBeInViewport();
     }
 
@@ -425,6 +443,11 @@ test.describe("Mobile sidebar task actions", () => {
     expect(pageWidth.scroll).toBeLessThanOrEqual(pageWidth.client);
     await confirmation.getByRole("button", { name: "Cancel" }).tap();
     await expect(confirmation).toBeHidden();
+    await expect(taskRow).toBeVisible();
+    expect(await taskRow.evaluate((element) => element.getBoundingClientRect().height)).toBeCloseTo(
+      heightBefore,
+      0,
+    );
   });
 
   test("keeps the tablet task switcher as a left-side sheet", async ({
diff --git a/apps/web/e2e/tests/task/mobile-sidebar-views.spec.ts b/apps/web/e2e/tests/task/mobile-sidebar-views.spec.ts
index 69caf217ae..1ea3069131 100644
--- a/apps/web/e2e/tests/task/mobile-sidebar-views.spec.ts
+++ b/apps/web/e2e/tests/task/mobile-sidebar-views.spec.ts
@@ -14,6 +14,9 @@ import type { Page, Locator } from "@playwright/test";
 import type { ApiClient } from "../../helpers/api-client";
 import { dwell } from "../../helpers/causal-waits";
 import { SessionPage } from "../../pages/session-page";
+import { waitForFiniteAnimations } from "../../helpers/animations";
+import { requireBox } from "../../helpers/layout-assertions";
+import { expectContentSizedBottomConfirmation } from "../../helpers/mobile-confirmations";
 import {
   repositoryName,
   seedSidebarCombinationRepository,
@@ -242,6 +245,9 @@ test.describe("Mobile sidebar — view system", () => {
     const deleteEditor = deleteDrawer.getByTestId("sidebar-filter-popover");
     const deleteButton = deleteEditor.getByTestId("view-delete-button");
     await deleteButton.scrollIntoViewIfNeeded();
+    await waitForFiniteAnimations(deleteDrawer);
+    const originalHeight = (await requireBox(deleteDrawer, "view editor")).height;
+    const originalScroll = await deleteEditor.evaluate((element) => element.scrollTop);
     const deleteButtonBox = await deleteButton.boundingBox();
     expect(deleteButtonBox).not.toBeNull();
     expect(deleteButtonBox!.height).toBeGreaterThanOrEqual(44);
@@ -256,18 +262,26 @@ test.describe("Mobile sidebar — view system", () => {
       }),
     ).toBe(true);
     await deleteButton.tap();
-    const confirmation = deleteEditor.getByTestId("saved-task-view-delete-confirmation");
+    const confirmation = deleteDrawer.getByTestId("saved-task-view-delete-confirmation");
     await expect(confirmation).toHaveAccessibleName("Delete New view?");
+    const compactBox = await expectContentSizedBottomConfirmation(deleteDrawer, confirmation);
+    expect(compactBox.height).toBeLessThan(originalHeight);
     await expect(testPage.locator('[role="dialog"]:visible')).toHaveCount(2);
     for (const action of await confirmation.getByRole("button").all()) {
       const box = await action.boundingBox();
       expect(box?.height ?? 0).toBeGreaterThanOrEqual(44);
     }
     await prCapture.screenshot("saved-task-view-delete-mobile", {
-      caption: "Mobile confirmation stays inline in the existing task-filter drawer.",
+      caption: "Mobile confirmation becomes a focused step in the existing task-filter drawer.",
     });
     await confirmation.getByRole("button", { name: "Cancel" }).tap();
     await expect(deleteDrawer).toBeVisible();
+    await waitForFiniteAnimations(deleteDrawer);
+    expect((await requireBox(deleteDrawer, "restored view editor")).height).toBeCloseTo(
+      originalHeight,
+      0,
+    );
+    expect(await deleteEditor.evaluate((element) => element.scrollTop)).toBe(originalScroll);
     await expect(deleteEditor.getByTestId("sidebar-filter-active-view-name")).toContainText(
       "New view",
     );
@@ -279,7 +293,7 @@ test.describe("Mobile sidebar — view system", () => {
         response.request().method() === "PATCH" &&
         response.ok(),
     );
-    await deleteEditor
+    await deleteDrawer
       .getByTestId("saved-task-view-delete-confirmation")
       .getByRole("button", { name: "Delete New view" })
       .tap();
@@ -680,7 +694,7 @@ test.describe("Mobile sidebar — view system", () => {
     const trailingTime = row.getByTestId("sidebar-task-trailing-time");
     await expect(trailingTime).toBeVisible();
     await expect(row.getByTestId("sidebar-task-time")).toHaveCount(0);
-    await expect(trailingTime).not.toContainText(/ago|yesterday/i);
+    await expect(trailingTime.locator('[aria-hidden="true"]')).not.toContainText(/ago|yesterday/i);
     await expect(trailingTime.locator(".sr-only")).toHaveText(/\S/);
     const mobileTimeBox = await trailingTime.boundingBox();
     expect(mobileTimeBox).not.toBeNull();
diff --git a/apps/web/e2e/tests/task/mobile-subtask-detachment.spec.ts b/apps/web/e2e/tests/task/mobile-subtask-detachment.spec.ts
index ac79134dde..d260914ee9 100644
--- a/apps/web/e2e/tests/task/mobile-subtask-detachment.spec.ts
+++ b/apps/web/e2e/tests/task/mobile-subtask-detachment.spec.ts
@@ -67,7 +67,7 @@ test.describe("Mobile subtask detachment", () => {
     await expect(testPage.getByRole("menuitem", { name: "Detach from parent" })).toHaveCount(0);
   });
 
-  test("keeps kanban detachment inline on a phone", async ({ testPage, apiClient, seedData }) => {
+  test("confirms kanban detachment in a phone sheet", async ({ testPage, apiClient, seedData }) => {
     const placement = {
       workflow_id: seedData.workflowId,
       workflow_step_id: seedData.startStepId,
@@ -91,11 +91,11 @@ test.describe("Mobile subtask detachment", () => {
     let menu = testPage.locator('[data-slot="dropdown-menu-content"]:visible');
     await menu.getByRole("menuitem", { name: "Detach from parent" }).click();
 
-    let inlineConfirmation = testPage.getByTestId("detach-task-inline-confirmation");
+    let inlineConfirmation = testPage.getByTestId("mobile-action-confirmation");
     await expect(inlineConfirmation).toBeVisible();
     await expect(testPage.getByRole("alertdialog")).toHaveCount(0);
-    await expect(inlineConfirmation.getByTestId("detach-task-confirm")).toHaveClass(/h-11/);
-    await expect(inlineConfirmation.getByTestId("detach-task-confirm")).toHaveClass(/min-w-11/);
+    await expect(testPage.getByRole("dialog")).toHaveAttribute("data-slot", "drawer-content");
+    await expect(inlineConfirmation.getByTestId("detach-task-confirm")).toHaveClass(/min-h-12/);
     await expect
       .poll(() => testPage.evaluate(() => document.documentElement.scrollWidth <= innerWidth))
       .toBe(true);
@@ -107,7 +107,7 @@ test.describe("Mobile subtask detachment", () => {
     await card.getByRole("button", { name: "More options" }).click();
     menu = testPage.locator('[data-slot="dropdown-menu-content"]:visible');
     await menu.getByRole("menuitem", { name: "Detach from parent" }).click();
-    inlineConfirmation = testPage.getByTestId("detach-task-inline-confirmation");
+    inlineConfirmation = testPage.getByTestId("mobile-action-confirmation");
     await inlineConfirmation.getByTestId("detach-task-confirm").click();
 
     await expect.poll(async () => (await apiClient.getTask(child.id)).parent_id ?? "").toBe("");
diff --git a/apps/web/e2e/tests/task/mobile-threads-view.spec.ts b/apps/web/e2e/tests/task/mobile-threads-view.spec.ts
index 21659a20d8..6b487f5e1b 100644
--- a/apps/web/e2e/tests/task/mobile-threads-view.spec.ts
+++ b/apps/web/e2e/tests/task/mobile-threads-view.spec.ts
@@ -7,6 +7,8 @@ import { createStandardProfile, openTaskSession } from "../../helpers/git-helper
 import { assertNoHorizontalOverflow } from "../../helpers/session-stream-overload";
 import { waitForLatestSessionDone } from "../../helpers/session";
 import { attachGatewayTrafficCapture, type GatewayTrafficFrame } from "../../helpers/ws-traffic";
+import { requireBox } from "../../helpers/layout-assertions";
+import { expectContentSizedBottomConfirmation } from "../../helpers/mobile-confirmations";
 import { closeQuickTerminalTab } from "../terminal/terminal-test-helpers";
 import { swipeDeckLeft } from "./mobile-threads-swipe-helpers";
 
@@ -46,6 +48,17 @@ async function expectSwipeCue(page: Page, column: Locator, total: number) {
 }
 
 test.describe("Mobile Threads view", () => {
+  let previousViewSettings: Record<string, unknown> | null = null;
+  test.afterEach(async ({ apiClient }) => {
+    if (!previousViewSettings) return;
+    const restored = await apiClient.rawRequest(
+      "PATCH",
+      "/api/v1/user/settings",
+      previousViewSettings,
+    );
+    previousViewSettings = null;
+    expect(restored.ok).toBe(true);
+  });
   test("reaches the deck from the drawer and pages one full-width column", async ({
     testPage,
     apiClient,
@@ -495,7 +508,14 @@ test.describe("Mobile Threads view", () => {
   test("confirms deletion of a saved view inside the native drawer", async ({
     testPage,
     apiClient,
-  }) => {
+  }, testInfo) => {
+    await testPage.setViewportSize({ width: 393, height: 640 });
+    const { settings } = await apiClient.getUserSettings();
+    previousViewSettings = {
+      thread_views: settings.thread_views ?? [],
+      thread_active_view_id: settings.thread_active_view_id ?? "view-all-threads",
+      thread_view_draft: settings.thread_view_draft ?? null,
+    };
     const baseView = {
       task_scope: { mode: "all", task_ids: [] },
       filters: [],
@@ -519,17 +539,56 @@ test.describe("Mobile Threads view", () => {
     const drawer = testPage.getByTestId("threads-mobile-view-drawer");
     await drawer.getByTestId("threads-mobile-view-settings").tap();
     const editor = drawer.getByTestId("threads-view-editor");
+    // Invalid input stays local; a valid persisted draft intentionally hides Delete.
+    await editor.getByTestId("threads-max-columns").fill("0");
+    await expect(editor.getByTestId("threads-max-columns")).toHaveAttribute("aria-invalid", "true");
+    await editor.getByTestId("threads-view-delete").scrollIntoViewIfNeeded();
+    const scrollRegion = drawer.getByTestId("threads-mobile-view-drawer-scroll-region");
+    const scrollTop = await scrollRegion.evaluate((element) => element.scrollTop);
+    expect(scrollTop).toBeGreaterThan(0);
+    await waitForFiniteAnimations(drawer);
+    const originalBox = await requireBox(drawer, "view editor");
+    const drawerId = await drawer.getAttribute("id");
     await editor.getByTestId("threads-view-delete").tap();
-    const confirmation = editor.getByTestId("saved-task-view-delete-confirmation");
+    const confirmation = drawer.getByTestId("saved-task-view-delete-confirmation");
     await expect(confirmation).toHaveAccessibleName("Delete Release threads?");
     await expect(testPage.locator('[role="dialog"]:visible')).toHaveCount(1);
+    // @covers AC-UI-MOBILE-CONFIRMATION-002.4
+    const compactBox = await expectContentSizedBottomConfirmation(drawer, confirmation);
+    const viewportHeight = testPage.viewportSize()!.height;
+    expect(compactBox.height).toBeLessThan(viewportHeight * 0.6);
+    await expect(drawer).toHaveAttribute("id", drawerId!);
+    await expect(testPage.getByText("Kandev update available", { exact: true })).toBeHidden();
+    await testPage.screenshot({ path: testInfo.outputPath("compact-view-confirmation.png") });
+    await testInfo.attach("confirmation bounds", {
+      body: JSON.stringify({
+        editor: originalBox,
+        confirmation: compactBox,
+        viewportHeight,
+        drawerScroll: await drawer.evaluate((element) => ({
+          top: element.scrollTop,
+          height: element.scrollHeight,
+          clientHeight: element.clientHeight,
+        })),
+      }),
+      contentType: "application/json",
+    });
+    await expectContentSizedBottomConfirmation(drawer, confirmation);
     for (const action of await confirmation.getByRole("button").all()) {
       const box = await action.boundingBox();
       expect(box?.height ?? 0).toBeGreaterThanOrEqual(44);
     }
     await confirmation.getByRole("button", { name: "Cancel" }).tap();
     await expect(drawer).toBeVisible();
+    await waitForFiniteAnimations(drawer);
+    expect((await requireBox(drawer, "restored view editor")).height).toBeCloseTo(
+      originalBox.height,
+      0,
+    );
     await expect(editor.getByTestId("threads-view-delete")).toBeFocused();
+    expect(await scrollRegion.evaluate((element) => element.scrollTop)).toBe(scrollTop);
+    await expect(editor.getByTestId("threads-max-columns")).toHaveValue("0");
+    await expect(editor.getByTestId("threads-max-columns")).toHaveAttribute("aria-invalid", "true");
 
     await editor.getByTestId("threads-view-delete").tap();
     const deletedViewResponse = testPage.waitForResponse(
@@ -538,7 +597,7 @@ test.describe("Mobile Threads view", () => {
         response.request().method() === "PATCH" &&
         response.url().includes("/api/v1/user/settings"),
     );
-    await editor
+    await drawer
       .getByTestId("saved-task-view-delete-confirmation")
       .getByRole("button", { name: "Delete Release threads" })
       .tap();
diff --git a/apps/web/e2e/tests/terminal/mobile-terminal-close.spec.ts b/apps/web/e2e/tests/terminal/mobile-terminal-close.spec.ts
index b7818443ac..036c1ab042 100644
--- a/apps/web/e2e/tests/terminal/mobile-terminal-close.spec.ts
+++ b/apps/web/e2e/tests/terminal/mobile-terminal-close.spec.ts
@@ -8,6 +8,7 @@ import { SessionPage } from "../../pages/session-page";
 import { switchToTerminalPanel, waitForShellReady } from "./mobile-terminal-helpers";
 import { pauseNextTerminalDestroy } from "./terminal-close-pause";
 import { readTerminalHostBuffer } from "./terminal-test-helpers";
+import { expectContentSizedBottomConfirmation } from "../../helpers/mobile-confirmations";
 
 async function seedTaskWithSession(
   testPage: Page,
@@ -43,6 +44,7 @@ test.describe("Mobile terminal close", () => {
     testPage,
     apiClient,
     seedData,
+    prCapture,
   }) => {
     test.setTimeout(120_000);
     const destroyPause = await pauseNextTerminalDestroy(testPage);
@@ -91,14 +93,26 @@ test.describe("Mobile terminal close", () => {
       })
       .not.toBe("");
     await testPage.getByTestId("mobile-terminals-pill").tap();
+    const pickerId = await testPage
+      .getByRole("dialog", { name: "Terminals", exact: true })
+      .getAttribute("id");
     destroyPause.arm();
     await targetRow.getByRole("button", { name: /^Close / }).tap();
-    const confirmation = targetRow.getByTestId("mobile-terminal-close-confirmation");
+    const confirmation = testPage.getByTestId("mobile-terminal-close-confirmation");
     await expect(confirmation).toBeVisible({ timeout: 5_000 });
     await expect(confirmation).toHaveRole("group");
     await expect(confirmation).toHaveAccessibleName("Close terminal?");
+    await expectContentSizedBottomConfirmation(
+      testPage.getByRole("dialog", { name: "Close terminal?", exact: true }),
+      confirmation,
+    );
     await expect(testPage.getByRole("alertdialog")).toHaveCount(0);
-    await expect(targetRow).toBeVisible();
+    await expect(
+      testPage.getByRole("dialog", { name: "Close terminal?", exact: true }),
+    ).toHaveAttribute("id", pickerId!);
+    await expect(testPage.locator('[data-slot="drawer-content"]')).toHaveCount(1);
+    await expect(targetRow).toBeAttached();
+    await expect(targetRow).toBeHidden();
     const cancelConfirmation = confirmation.getByRole("button", { name: "Cancel", exact: true });
     const confirmClose = confirmation.getByRole("button", {
       name: "Close terminal",
@@ -110,6 +124,11 @@ test.describe("Mobile terminal close", () => {
       expect(actionBox!.width).toBeGreaterThanOrEqual(44);
       expect(actionBox!.height).toBeGreaterThanOrEqual(44);
     }
+    await prCapture.screenshot("terminal-close-step");
+    await cancelConfirmation.tap();
+    await expect(targetRow).toBeVisible();
+    await expect(targetRow.getByRole("button", { name: /^Close / })).toBeFocused();
+    await targetRow.getByRole("button", { name: /^Close / }).tap();
     await confirmClose.tap();
     await destroyPause.waitForRequest();
 
diff --git a/docs/decisions/2026-09-10-mobile-confirmation-surfaces.md b/docs/decisions/2026-09-10-mobile-confirmation-surfaces.md
new file mode 100644
index 0000000000..c468bd36e8
--- /dev/null
+++ b/docs/decisions/2026-09-10-mobile-confirmation-surfaces.md
@@ -0,0 +1,47 @@
+# ADR-2026-09-10-mobile-confirmation-surfaces: Focus mobile confirmation in one surface
+
+**Status:** accepted
+**Date:** 2026-09-10
+**Area:** frontend
+
+## Context
+
+Archive and other phone confirmations currently expand selected rows or replace
+their trailing actions. The decision competes with surrounding list content,
+and longer warnings move neighboring rows. Kandev already uses inset bottom
+drawers for temporary mobile choices. Many confirmation origins are inside
+those drawers, so another drawer would create competing modal/focus boundaries.
+
+## Decision
+
+Phone archive and existing inline confirmations use a focused confirmation
+step. Reuse an open drawer as the step host; from a page, dismiss any transient
+menu and open a compact bottom drawer. Keep one active surface and preserve
+origin state for Cancel. An inline decision inside a centered form/dialog uses
+a step in that existing boundary. Existing full task-delete, discard-consent,
+type-to-confirm, and system maintenance alerts retain their current surfaces.
+
+Share presentation components and keep domain state, eligibility, callbacks,
+feedback, and persistence with current owners. The rule is phone-specific;
+desktop and tablet retain their current compositions. The UI contract is in
+[Mobile action confirmations](../specs/ui/requirements/mobile-action-confirmations.md).
+
+## Consequences
+
+Phone users get readable consequences and full-width actions while list rows
+stay stable. Hosts must preserve hidden origin content, restore focus/scroll,
+and cancel stale requests. Menu owners must survive their portaled content
+closing. This adds explicit hosting at several existing surfaces, but does not
+require a global overlay manager or change mutation/recovery semantics.
+
+## Alternatives Considered
+
+- Keep enlarged inline rows: less overlay coordination, but warnings still
+  interrupt list scanning and move neighboring items.
+- Open a new drawer for every action: simpler call sites, but nested origins
+  gain a second modal layer and ambiguous dismissal/focus behavior.
+- Use centered alerts everywhere: useful for existing high-consequence full
+  dialogs, but less comfortable for frequent phone actions and duplicates the
+  existing drawer context.
+- Replace archive confirmation with Undo: appealing for reversible state, but
+  runtime cleanup and session teardown require a separate recovery contract.
diff --git a/docs/decisions/INDEX.md b/docs/decisions/INDEX.md
index e45b810e7e..c2127915a7 100644
--- a/docs/decisions/INDEX.md
+++ b/docs/decisions/INDEX.md
@@ -266,4 +266,5 @@ Read individual ADRs for full context. Create new ones via `/record decision` or
 | 2026-09-08-domain-owned-settings-catalog | [Discover settings through domain-owned contracts](2026-09-08-domain-owned-settings-catalog.md) | accepted | backend, frontend, protocol | 2026-09-08 |
 | 2026-09-09-task-completion-conversation-availability | [Separate task completion from conversation availability](2026-09-09-task-completion-conversation-availability.md) | accepted | workflow | 2026-09-09 |
 | 2026-09-09-count-application-files-for-pr-size | [Count Application Files for Pull Request Size](2026-09-09-count-application-files-for-pr-size.md) | accepted | workflow, infra | 2026-09-09 |
+| 2026-09-10-mobile-confirmation-surfaces | [Focus mobile confirmation in one surface](2026-09-10-mobile-confirmation-surfaces.md) | accepted | frontend | 2026-09-10 |
 | 2026-09-11-contribution-resume-preflight | [Separate resume admission from push history readiness](2026-09-11-contribution-resume-preflight.md) | proposed | backend, protocol, security | 2026-09-11 |
diff --git a/docs/plans/mobile-action-confirmations/plan.md b/docs/plans/mobile-action-confirmations/plan.md
new file mode 100644
index 0000000000..9bc4436cf7
--- /dev/null
+++ b/docs/plans/mobile-action-confirmations/plan.md
@@ -0,0 +1,210 @@
+---
+created: 2026-09-10
+status: complete
+requirements:
+  - REQ-UI-MOBILE-CONFIRMATION-001
+  - REQ-UI-MOBILE-CONFIRMATION-002
+  - REQ-UI-MOBILE-CONFIRMATION-003
+system_design:
+  - ../../specs/ui/system-design/mobile-action-confirmations.md
+legacy_specs: []
+---
+
+# Implementation Plan: Mobile Action Confirmations
+
+## Overview
+
+Give phone archive and existing inline confirmations a focused surface. Build
+the shared presentation and host first, connect archive as the first complete
+flow, then migrate picker, content, saved-artifact, and management actions.
+Execute work orders 01 through 06 sequentially. Each adoption owns its tests;
+there is no separate generic QA or verification phase.
+
+The [requirements](../../specs/ui/requirements/mobile-action-confirmations.md),
+[system design](../../specs/ui/system-design/mobile-action-confirmations.md),
+and [decision](../../decisions/2026-09-10-mobile-confirmation-surfaces.md) form the
+design package. Existing UI contracts were reconciled for the intended phone
+presentation. Implementation was explicitly requested on 2026-09-10.
+
+## Scope
+
+### In scope
+
+- A confirmation step inside the open Tasks/picker/filter sheet, and compact
+  standalone bottom confirmation from a page.
+- Phone archive across rows, Kanban, bulk, detail flows, and command panel;
+  existing inline actions across the inventory below.
+- State/scroll/focus restoration, localized content, safe areas, accessible
+  actions, stale-request cancellation, and existing domain callback behavior.
+- Focused component and production-build mobile/desktop regression evidence.
+
+### Out of scope
+
+- Backend, cleanup, recovery, Undo, permissions, API/SDK, persistence, or
+  confirmation-preference changes.
+- Desktop/tablet composition changes or a global responsive-menu rewrite.
+- Existing full task-delete/discard/type-to-confirm/system maintenance alerts.
+- Bespoke external-plugin UI, broad refactoring, broad test audits, publication,
+  or delegated implementation.
+
+## Technical approach
+
+### Shared presentation
+
+Add `MobileConfirmationContent`, `MobileActionConfirmation`, and
+`MobileConfirmationHost` under `apps/web/components/confirmation/`. Reuse
+`@kandev/ui/drawer` and the application's `useResponsiveBreakpoint`. Host
+registration is local, source-keyed, and cleans up after commit. Keep the origin
+mounted but hidden/inert beside its confirmation outlet; never hide a portal
+inside its own hidden ancestor. Keep one active modal/focus boundary.
+
+Add opt-in hosting to `MobilePickerSheet`; register other hosts at actual
+drawer/dialog owners. Do not change the global semantics of
+`InlineConfirmActions`, `ActionConfirmPopover`, `Dialog`, or `Drawer`.
+
+### Archive integration
+
+Share archive content/state between its non-phone alert and phone renderer.
+Adapt `TaskArchiveConfirmation`, `TaskArchiveConfirmDialog`,
+`TaskArchiveConfirmFlow`, the row adapter, `SessionTaskSwitcherSheet`, and the
+command-panel owner. Phone routing wins over old `inline`/`forceDialog` hints;
+desktop classification gating and tablet behavior remain unchanged. Use the
+same preference, cleanup model, cascade values, and domain navigation.
+
+### Consumer inventory and ownership
+
+Paths below are under `apps/web/components/`. Each row is an adoption boundary,
+not permission to rewrite the owning domain.
+
+| Work order | Adapters and owned mobile hosts |
+| --- | --- |
+| 02 | `task/task-archive-confirmation.tsx`, `task/task-archive-confirm-dialog.tsx`, `task/task-archive-confirm-flow.tsx`, `task/task-switcher-archive-confirmation.tsx`, `task/task-switcher-context-menu.tsx`, `task/mobile/session-task-switcher-sheet.tsx`, `kanban/task-multi-select-toolbar.tsx`, command-panel confirmation owner |
+| 03 | `task/terminal-close-inline-confirmation.tsx`, `task/mobile/mobile-terminals-section.tsx`, `task/mobile/mobile-sessions-section.tsx`; terminal picker host through `mobile-picker-sheet.tsx` |
+| 04 | `task/file-browser-parts.tsx`, `task/file-context-menu.tsx`, `task/chat/reset-context-button.tsx`, `task/task-plan-revision-restore-actions.tsx`, `task/task-detach-confirm-dialog.tsx`, `review/walkthrough-overlay.tsx`; existing file/plan/review parent surfaces |
+| 05 | `confirmation/saved-task-view-delete-confirmation.tsx`, task sidebar-filter and Threads view hosts, GitHub/GitLab preset sidebars and filter hosts, `integrations/presets-scope-bar-base.tsx`, `jira/my-jira/list-toolbar.tsx` |
+| 05 | `settings/prompt-delete-confirmation.tsx`, `settings/layouts/layout-profile-delete-confirmation.tsx`, `settings/agent-profile-delete-dialog.tsx`, `task/layout-preset-selector.tsx`, `task/saved-layout-delete-confirmation.tsx` and their owning surfaces |
+| 06 | `watches/watcher-delete-action.tsx`, `jira/jira-action-bar.tsx`, `linear/linear-settings.tsx`, `azure-devops/azure-devops-settings.tsx`, `sentry/sentry-instance-card.tsx` |
+| 06 | `settings/plugins/uninstall-plugin-dialog.tsx`, `settings/system/users-table.tsx`, `settings/secrets-list-item-row.tsx`, `settings/workflow-sync-dialog.tsx`; existing form-dialog host for sync removal |
+
+Before each adoption, search its mobile E2E selectors for the old inline
+container/role. Replace interactions with the new surface without deleting
+outcome, focus, geometry, or failure assertions. Preserve existing test IDs
+where meaningful; use `data-legacy-testid` if an ID must be renamed. Read scoped
+`AGENTS.md` for Threads, review, and chat before editing those subtrees.
+
+### Content, documentation, and compatibility
+
+Use explicit titles/subjects and the current localized consequences. Archive
+uses the current non-destructive full-dialog variant; true delete actions use
+destructive styling. New labels must reach all five real catalogs plus pseudo.
+Each adopting work order owns its needed domain copy and catalog updates.
+
+Phone interaction guidance is recorded in `apps/web/AGENTS.md` and the how-to
+in `docs/public/mobile-remote-access.md`, linked from the archive section of
+`docs/public/tasks-and-workflows.md`. `/docs-maintainer` identified that public
+documentation impact during planning; the public text was updated alongside
+implementation. Requirements and system-design status now describe the
+implemented contract.
+
+## Tests
+
+Methods below name required scenarios; new test files are explicitly noted.
+The work orders contain the exact commands and TDD sequence.
+
+| Acceptance criteria | Unit/component evidence |
+| --- | --- |
+| 001.2-.7; 002.3-.7; 003.1-.2, .5 | New `mobile-confirmation-host.test.tsx`: preserves form/scroll owner, restores focus, cancels one step, clears stale registrations. New `mobile-action-confirmation.test.tsx`: standalone/hosted routing, boundary cancellation, captured target, double activation, rejection after dismissal. New `mobile-confirmation-content.test.tsx`: semantics, action variants, disabled state, live locale. |
+| 001.1; 002.1-.2; 003.3-.4, .6 | `task-archive-confirmation.test.tsx`, `task-archive-confirm-dialog.test.tsx`, `session-task-switcher-sheet.test.tsx`, `use-task-archive-confirm.test.ts`: phone routing, disabled/failed classification, preference bypass, cascade/bulk values, shared warnings and navigation. |
+| 001.1-.5; 003.1-.2, .5-.6 | `mobile-sessions-section.test.tsx` and new `terminal-close-inline-confirmation.test.tsx`: named target, same-host Cancel, duplicate prevention, no wait for teardown. |
+| 001.1-.5; 002.1-.2; 003.1-.2, .5-.6 | Existing file-context-menu, reset-context-button, detach and walkthrough tests plus new revision-restore tests: source-target isolation, menu handoff, owner feedback, protected actions. |
+| 001.1-.5; 002.1-.2, .6; 003.1-.2, .5-.6 | Saved-view shell/host tests and existing agent-profile/layout/prompt tests: exact IDs, no select/default action, built-in/last-view guard, preserved editor state, current rollback. |
+| 001.1-.5, .7; 003.1-.2, .5-.6 | Existing provider-settings, secrets, users, plugin-uninstall and workflow-sync tests: one mutation, current failure feedback, removal-form retry without a second modal. |
+
+The abbreviated AC suffixes in these tables refer to
+`AC-UI-MOBILE-CONFIRMATION-<group>.<criterion>`. Work-order frontmatter lists
+full IDs. Retained domain requirements are linked from each relevant order.
+
+## E2E tests
+
+| Flow and required outcome | AC groups | Evidence on `mobile-chrome` |
+| --- | --- | --- |
+| Scroll Tasks, open archive, see one active surface, Cancel/Back restores exact context; archive non-active/active/parent/bulk tasks; dismiss delayed classification and reject stale results | 001, 002, 003 | New `tests/task/mobile-action-confirmations.spec.ts`; existing mobile archive preference, redirect, and Kanban card specs |
+| Standalone archive geometry at 320px/767px and landscape; long names, pseudo/Portuguese, light/dark; hit-test footer; rotate/breakpoint dismissal; task-delete stays centered | 001.3, .6-.7; 002; 003.2-.4 | New mobile action-confirmation scenarios and updated `tests/task/mobile-confirmation-text-hierarchy.spec.ts`, `tests/kanban/mobile-card-archive-confirmation.spec.ts` |
+| Close terminal and use sibling before teardown; cancel/delete session with shared warnings and later failure feedback | 001.2-.5; 002; 003.5-.6 | `tests/terminal/mobile-terminal-close.spec.ts`, `tests/session/mobile-session-deletion.spec.ts` |
+| Delete file, reset context, restore plan, detach task, and delete walkthrough through their real phone entry points | 001; 002; 003.1-.2, .5-.6 | Existing mobile file/reset/plan specs plus new `tests/task/mobile-content-confirmations.spec.ts` |
+| Delete saved sidebar/Threads/integration views without selecting them; cancel restores editor values; delete prompt/layout/profile | 001; 002; 003.1-.2, .5-.6 | Existing mobile sidebar/Threads/integration saved-view, prompt/profile/layout specs |
+| Remove integration/watch, secret, user, plugin and workflow-sync configuration; cancellation and owner error paths remain usable | 001; 002; 003.1-.2, .5-.6 | Existing mobile integration/watch/secret specs and new `tests/settings/mobile-management-confirmations.spec.ts` |
+
+Use existing isolated `test-base` fixtures, seed via API, assert outcomes via
+UI and persistence where relevant. Restore changed settings after each case.
+Use causal transport waits and finite-animation settlement. Keep mobile files
+named `mobile-*.spec.ts`; run desktop separately with `chromium`. A separate
+touch-enabled 768px scenario inside the focused desktop regression verifies
+the tablet boundary without changing the mobile project's device fixture.
+
+## Work orders
+
+| Order | Work order | Status | Dependency |
+| --- | --- | --- | --- |
+| 01 | [Shared mobile surfaces](task-01-shared-mobile-surfaces.md) | done | None |
+| 02 | [Archive surfaces](task-02-archive-surfaces.md) | done | 01 |
+| 03 | [Session and terminal pickers](task-03-picker-confirmations.md) | done | 01 |
+| 04 | [Task content actions](task-04-content-confirmations.md) | done | 01 |
+| 05 | [Saved artifact deletion](task-05-saved-artifact-confirmations.md) | done | 01 |
+| 06 | [Management removals](task-06-management-confirmations.md) | done | 01 |
+
+All orders are sequential because shared adapters/catalogs and test helpers can
+overlap. Dependencies express prerequisites, not authorization for delegation.
+All six orders were implemented in the primary session after the user's
+explicit implementation request. Their results are recorded in the work orders.
+
+## Verification results
+
+All six work orders are complete. No production or permanent test files changed
+during the design-only turn; implementation followed the explicit user request.
+
+- Final combined affected-component run: **360 tests passed across 46 files**.
+  Earlier per-order RED/GREEN evidence remains in each work order.
+- Browser scenarios passed across the focused runs:
+
+  | Adoption | Phone scenarios | Desktop/tablet regressions |
+  | --- | --- | --- |
+  | Archive | 12 | 11 |
+  | Session/terminal pickers | 2 | 1 |
+  | Task content and Quick Chat | 7 | 2 |
+  | Saved views/profiles/layouts/prompts | 10 | 7 |
+  | Integration and system management | 10 | 7 |
+
+- Inspected phone captures cover same-host and standalone composition, narrow
+  translated text, dark/light themes, landscape pseudo, long file names,
+  saved-view/profile deletion, integration removal, and workflow form removal.
+  Full task-delete and existing conflict alerts retain their original safeguards.
+- All 72 changed web production files pass ESLint with zero warnings. Typecheck,
+  the production E2E build, changed TS/TSX Prettier check, i18n validation and
+  the new-code ratchet pass. Existing build chunk-size/deprecation warnings
+  remain non-blocking and unrelated to this change.
+- Public documentation: 46 pages validated and the validator test passed.
+  All specification files and all 30 specification-linter tests passed.
+- `git diff --check` passed. No new translation keys, backend/API/schema,
+  permission, transport, cleanup-policy or plugin-runtime changes were needed.
+- Every remaining legacy inline consumer is accounted for in work order 06;
+  retained standalone popover/full-alert exceptions are explicitly recorded.
+- Test coverage follows real existing flows: the authenticated mobile user
+  guard stays in its auth spec, and detach/walkthrough checks reuse their
+  established fixtures. No persistent platform workers or tasks were created.
+- The existing ADR index contains a pre-existing unrelated missing link to
+  `2026-09-05-script-capable-html-preview-isolation.md`; the new decision link
+  resolves. No unrelated decision history was changed.
+
+## Risks
+
+- Hiding/unmounting the origin can destroy the request or lose scroll/editor
+  state. A host outlet must be outside the hidden origin and preserve ownership.
+- Radix/Vaul focus and close events can dismiss two layers or refocus a removed
+  menu item. Test exact menu-to-host transfer and nested Escape behavior.
+- Current callers differ in callback close timing and retry behavior; a generic
+  awaited mutation wrapper would regress terminal close and optimistic actions.
+- Archive classification, live row removal, and breakpoint changes can deliver
+  late effects. Token/target invalidation must prevent a stale submission.
+- The screenshot's text can lag current cleanup policy. Use current domain
+  content; do not bake branch-deletion claims into the new visual component.
diff --git a/docs/plans/mobile-action-confirmations/task-01-shared-mobile-surfaces.md b/docs/plans/mobile-action-confirmations/task-01-shared-mobile-surfaces.md
new file mode 100644
index 0000000000..f358e2f5a9
--- /dev/null
+++ b/docs/plans/mobile-action-confirmations/task-01-shared-mobile-surfaces.md
@@ -0,0 +1,119 @@
+---
+id: "01-shared-mobile-surfaces"
+title: "Shared mobile confirmation surfaces"
+status: done
+wave: 1
+depends_on: []
+plan: "plan.md"
+requirements:
+  - REQ-UI-MOBILE-CONFIRMATION-001
+  - REQ-UI-MOBILE-CONFIRMATION-002
+  - REQ-UI-MOBILE-CONFIRMATION-003
+acceptance_criteria:
+  - AC-UI-MOBILE-CONFIRMATION-001.2
+  - AC-UI-MOBILE-CONFIRMATION-001.3
+  - AC-UI-MOBILE-CONFIRMATION-001.4
+  - AC-UI-MOBILE-CONFIRMATION-001.5
+  - AC-UI-MOBILE-CONFIRMATION-001.6
+  - AC-UI-MOBILE-CONFIRMATION-001.7
+  - AC-UI-MOBILE-CONFIRMATION-002.3
+  - AC-UI-MOBILE-CONFIRMATION-002.4
+  - AC-UI-MOBILE-CONFIRMATION-002.5
+  - AC-UI-MOBILE-CONFIRMATION-002.6
+  - AC-UI-MOBILE-CONFIRMATION-002.7
+  - AC-UI-MOBILE-CONFIRMATION-003.1
+  - AC-UI-MOBILE-CONFIRMATION-003.2
+  - AC-UI-MOBILE-CONFIRMATION-003.5
+system_design:
+  - ../../specs/ui/system-design/mobile-action-confirmations.md
+---
+
+# Task 01: Shared Mobile Confirmation Surfaces
+
+## Summary
+
+Build the controlled phone confirmation renderer and explicit local host.
+Prove lifecycle and accessibility behavior in component fixtures before any
+domain adapter migrates. This order establishes the reusable presentation API.
+
+## In scope
+
+- Add the three components described in the design; keep the origin mounted
+  hidden/inert beside its portal outlet, one active token, and one focus boundary.
+- Implement standalone Drawer and hosted drawer/dialog modes, focus restoration,
+  local Escape/Back, parent/route/breakpoint invalidation, and duplicate guards.
+- Add opt-in hosting to `task/mobile/mobile-picker-sheet.tsx`; preserve normal
+  picker behavior when no confirmation is active. Update frontend guidance and
+  any shared localized labels in all catalogs.
+
+## Out of scope
+
+Domain migrations, mutation ownership, global modal state, global primitive
+styling, new dependencies, backend changes, and browser-history interception.
+
+## Acceptance
+
+1. Tests demonstrate preserved origin state, a sibling outlet, stale-token
+   cleanup, one-step Escape, focus return, and cancellation at the phone boundary.
+2. Both render modes share readable content and accessible full-width phone
+   actions; desktop/tablet primitives retain their current behavior.
+3. Explicit submission dispatches once with caller-owned close/error behavior;
+   rejection after dismissal cannot restore a stale request.
+
+## Verification
+
+After an explicit implementation request, use `/tdd`: add failing component
+tests first, implement, and run the focused checks below. Bootstrap dependencies
+once if this worktree has not been installed. Browser geometry is proven by 02.
+
+```bash
+cd apps
+pnpm install --frozen-lockfile
+cd web
+pnpm exec vitest run components/confirmation/mobile-confirmation-content.test.tsx components/confirmation/mobile-action-confirmation.test.tsx components/confirmation/mobile-confirmation-host.test.tsx components/confirmation/inline-confirm-actions.test.tsx components/confirmation/action-confirm-popover.test.tsx
+pnpm run typecheck
+pnpm run i18n:check
+pnpm run i18n:ratchet
+```
+
+Run changed-file ESLint on the new components and `mobile-picker-sheet.tsx`.
+When adding copy, run `pnpm run i18n:zh-hant` and `pnpm run i18n:pseudo` before
+catalog checks.
+
+## Files likely touched
+
+- `apps/web/components/confirmation/mobile-{confirmation-content,action-confirmation,confirmation-host}.tsx` and new corresponding tests.
+- `apps/web/components/task/mobile/mobile-picker-sheet.tsx`.
+- `apps/web/AGENTS.md` and `apps/web/src/locales/{en,pt-pt,zh-cn,zh-hk,zh-tw,pseudo}/common.json` as needed.
+
+## Dependencies
+
+None.
+
+## Risks
+
+Portals under hidden ancestors, effect cleanup removing a newer request, focus
+return racing parent close-autofocus, and accidentally changing global Enter
+or pointer behavior.
+
+## Parallelism
+
+`sequential`
+
+## Inputs
+
+The paired mobile requirements/design and ADR; current `InlineConfirmActions`,
+`ActionConfirmPopover`, `MobilePickerSheet`, their tests, and frontend guidance.
+
+## Results
+
+Shared content, responsive adapter, and local host implemented. Pickers can opt
+in without changing their default composition. Component tests proved preserved
+draft/scroll, focus return/fallback, one actual modal, Escape, source cleanup,
+target/breakpoint invalidation, superseded-token isolation, duplicate prevention,
+close-before-dispatch, rejected callbacks, disabled actions, and live locale.
+
+- Focused Vitest: 5 files, 33 tests passed (behavioral RED failures observed).
+- Typecheck and changed-file ESLint passed.
+- i18n check and ratchet passed; reused existing localized labels, no new keys.
+- Phone geometry remains owned by work order 02's browser verification.
diff --git a/docs/plans/mobile-action-confirmations/task-02-archive-surfaces.md b/docs/plans/mobile-action-confirmations/task-02-archive-surfaces.md
new file mode 100644
index 0000000000..33a5517948
--- /dev/null
+++ b/docs/plans/mobile-action-confirmations/task-02-archive-surfaces.md
@@ -0,0 +1,144 @@
+---
+id: "02-archive-surfaces"
+title: "Phone archive confirmation surfaces"
+status: done
+wave: 2
+depends_on:
+  - "01-shared-mobile-surfaces"
+plan: "plan.md"
+requirements:
+  - REQ-UI-MOBILE-CONFIRMATION-001
+  - REQ-UI-MOBILE-CONFIRMATION-002
+  - REQ-UI-MOBILE-CONFIRMATION-003
+acceptance_criteria:
+  - AC-UI-MOBILE-CONFIRMATION-001.1
+  - AC-UI-MOBILE-CONFIRMATION-001.2
+  - AC-UI-MOBILE-CONFIRMATION-001.3
+  - AC-UI-MOBILE-CONFIRMATION-001.4
+  - AC-UI-MOBILE-CONFIRMATION-001.5
+  - AC-UI-MOBILE-CONFIRMATION-001.6
+  - AC-UI-MOBILE-CONFIRMATION-001.7
+  - AC-UI-MOBILE-CONFIRMATION-002.1
+  - AC-UI-MOBILE-CONFIRMATION-002.2
+  - AC-UI-MOBILE-CONFIRMATION-002.3
+  - AC-UI-MOBILE-CONFIRMATION-002.4
+  - AC-UI-MOBILE-CONFIRMATION-002.5
+  - AC-UI-MOBILE-CONFIRMATION-002.6
+  - AC-UI-MOBILE-CONFIRMATION-002.7
+  - AC-UI-MOBILE-CONFIRMATION-003.1
+  - AC-UI-MOBILE-CONFIRMATION-003.2
+  - AC-UI-MOBILE-CONFIRMATION-003.3
+  - AC-UI-MOBILE-CONFIRMATION-003.4
+  - AC-UI-MOBILE-CONFIRMATION-003.5
+  - AC-UI-MOBILE-CONFIRMATION-003.6
+system_design:
+  - ../../specs/ui/system-design/mobile-action-confirmations.md
+  - ../../specs/ui/system-design/confirmation-warning-hierarchy.md
+  - ../../specs/tasks/system-design/archive-confirmation.md
+---
+
+# Task 02: Phone Archive Confirmation Surfaces
+
+## Summary
+
+Deliver the screenshot's primary flow: Archive becomes a dedicated step in the
+Tasks drawer, with Cancel restoring the list. Use the same phone renderer from
+Kanban, detail, bulk, and command-panel entry points.
+
+## In scope
+
+- Share archive state/content, route phones before pointer/legacy hints, and
+  mount row confirmation beside the normal row. Preserve preference,
+  classification/cascade, cleanup content, in-flight warning and navigation.
+- Add Tasks and command-dialog hosts at stable ownership boundaries; retain
+  close-on-confirm callbacks and restore list/query context on Cancel.
+- Add geometry/lifecycle E2E and update existing mobile archive assertions;
+  document the implemented behavior in the existing public how-to pages.
+
+## Out of scope
+
+Task deletion presentation, discard consent, archive API/cleanup/Undo, desktop
+popover changes, and tablet composition changes.
+
+## Acceptance
+
+1. Tasks uses one active sheet with unchanged origin row geometry; Cancel/Back
+   restores scroll/filter/focus. Page archive opens one compact bottom drawer.
+2. Delayed/failed classification, bypass preference, active/non-active targets,
+   cascade/bulk operations and navigation retain their existing domain outcomes.
+3. Phone controls pass long-copy, contrast, safe-area, keyboard, touch, viewport
+   and breakpoint checks; retained task-delete and wider layouts still work.
+
+## Verification
+
+Use `/tdd`, `/mobile-parity`, and `/e2e`. First add failing cases to existing
+component tests and new `mobile-action-confirmations.spec.ts`. Keep existing
+mobile outcome assertions while replacing inline/centered-archive selectors.
+
+```bash
+cd apps/web
+pnpm exec vitest run components/task/task-archive-confirmation.test.tsx components/task/task-archive-confirm-dialog.test.tsx components/task/mobile/session-task-switcher-sheet.test.tsx components/task/task-switcher-context-menu.test.tsx hooks/use-task-archive-confirm.test.ts
+pnpm e2e:run --project mobile-chrome tests/task/mobile-action-confirmations.spec.ts tests/kanban/mobile-card-archive-confirmation.spec.ts tests/task/mobile-archive-confirmation-preference.spec.ts tests/task/mobile-archive-task-redirect.spec.ts tests/task/mobile-confirmation-text-hierarchy.spec.ts
+pnpm e2e:run --project chromium tests/task/confirmation-text-hierarchy.spec.ts tests/task/archive-confirmation-preference.spec.ts tests/task/archive-task-redirect.spec.ts tests/task/command-palette-archive.spec.ts tests/kanban/dialog-enter-confirms.spec.ts
+pnpm run typecheck
+pnpm run i18n:check
+pnpm run i18n:ratchet
+```
+
+Capture and inspect hosted and standalone phone confirmations. Cover 320px,
+767px, landscape, long localized content, and a touch-enabled 768px regression
+case. Use finite-animation waits and `elementFromPoint` on footer actions.
+Run `node --test scripts/validate-public-docs.test.mjs` and
+`node scripts/validate-public-docs.mjs` from the repo root after public edits.
+
+## Files likely touched
+
+- Archive components and task-row/Tasks hosts listed in the manifest; `command-panel-confirmation.tsx` and its stable command-panel owner.
+- Existing archive tests above; new `apps/web/e2e/tests/task/mobile-action-confirmations.spec.ts` and scoped geometry helper if shared.
+- `apps/web/src/locales/` task catalogs if needed; `docs/public/mobile-remote-access.md` and `docs/public/tasks-and-workflows.md`.
+
+## Dependencies
+
+01 supplies the host and mobile renderer.
+
+## Risks
+
+The row-owned source can unmount itself, old `surfaceAction` wrappers can close
+the drawer too early, and late classification can resurrect a cancelled target.
+Screenshot cleanup wording must not override current domain content.
+
+## Parallelism
+
+`sequential`
+
+## Inputs
+
+Mobile design sections on archive/routing/lifetime; existing archive preference,
+task cleanup and mobile navigation requirements; current archive and geometry tests.
+
+## Results
+
+Implemented the phone archive renderer, Tasks drawer host, menu handoff, and
+command-dialog host. CommandDialog gained an optional content-props passthrough;
+existing default dialog behavior is unchanged. Shared archive options were
+extracted to keep the existing component within its complexity limit.
+
+Validation:
+
+- 77 focused component/hook tests passed before the additional disabled-parent
+  regression; that regression and the shared action suite subsequently passed
+  (13 tests).
+- All 12 distinct mobile archive scenarios passed across the focused runs,
+  including 320px Portuguese, 767px dark, landscape pseudo, rotation/breakpoint
+  cancellation, footer hit-testing, preference, redirect, and retained full delete.
+- All 11 desktop/tablet scenarios passed. The added 768px coarse-pointer case
+  uses the existing context menu, not a phone-only menu trigger.
+- Typecheck, changed-file ESLint, i18n check/ratchet, and public-doc validation
+  passed. No new translation keys were required.
+- Inspected hosted, compact dark, narrow Portuguese and landscape pseudo captures.
+  Tasks preserves its height and scroll; standalone uses content height.
+
+The sandbox prohibits local sockets, so isolated browser runs used approved
+local-socket access. A test title exceeding the existing 60-character limit,
+locale setup before the initial server boot, and a phone-only tablet selector
+were corrected in the tests. No backend or policy changes were needed.
diff --git a/docs/plans/mobile-action-confirmations/task-03-picker-confirmations.md b/docs/plans/mobile-action-confirmations/task-03-picker-confirmations.md
new file mode 100644
index 0000000000..8020f403bb
--- /dev/null
+++ b/docs/plans/mobile-action-confirmations/task-03-picker-confirmations.md
@@ -0,0 +1,117 @@
+---
+id: "03-picker-confirmations"
+title: "Session and terminal picker confirmations"
+status: done
+wave: 2
+depends_on:
+  - "01-shared-mobile-surfaces"
+plan: "plan.md"
+requirements:
+  - REQ-UI-MOBILE-CONFIRMATION-001
+  - REQ-UI-MOBILE-CONFIRMATION-002
+  - REQ-UI-MOBILE-CONFIRMATION-003
+acceptance_criteria:
+  - AC-UI-MOBILE-CONFIRMATION-001.1
+  - AC-UI-MOBILE-CONFIRMATION-001.2
+  - AC-UI-MOBILE-CONFIRMATION-001.4
+  - AC-UI-MOBILE-CONFIRMATION-001.5
+  - AC-UI-MOBILE-CONFIRMATION-002.1
+  - AC-UI-MOBILE-CONFIRMATION-002.3
+  - AC-UI-MOBILE-CONFIRMATION-002.5
+  - AC-UI-MOBILE-CONFIRMATION-003.1
+  - AC-UI-MOBILE-CONFIRMATION-003.2
+  - AC-UI-MOBILE-CONFIRMATION-003.5
+  - AC-UI-MOBILE-CONFIRMATION-003.6
+system_design:
+  - ../../specs/ui/system-design/mobile-action-confirmations.md
+---
+
+# Task 03: Session and Terminal Picker Confirmations
+
+## Summary
+
+Use one focused confirmation step in the existing session or terminal picker.
+Retain terminal immediate dismissal and session deletion's current feedback.
+
+## In scope
+
+- Adapt terminal close and session delete to the shared picker host, preserving
+  normal rows, explicit target names, primary/only-session warnings and focus.
+- Keep target selection stable through menu dismissal and live updates.
+- Replace row-scoped mobile confirmation selectors and prove preserved sibling
+  usability while terminal teardown is held pending.
+
+## Out of scope
+
+Terminal teardown, server reconciliation, session deletion/primary-selection
+semantics, Quick Terminal, desktop tab-X dialogs, and generic progress feedback.
+
+## Acceptance
+
+1. Cancel/Back restores the same picker state and target focus, and parent
+   dismissal clears the decision without a mutation or stale reopen.
+2. Confirm invokes the captured action once; terminal UI disappears before
+   teardown and its sibling remains usable, including the existing failure path.
+3. Session delete retains its warnings, eligibility, selection fallback, and
+   owner feedback while the confirmation uses the shared phone layout.
+
+## Verification
+
+Use `/tdd` and `/e2e`. Add the focused terminal adapter test file named below;
+extend session component tests and the existing real mobile flows.
+
+```bash
+cd apps/web
+pnpm exec vitest run components/task/terminal-close-inline-confirmation.test.tsx components/task/mobile/mobile-sessions-section.test.tsx components/task/close-terminal-confirm-popover.test.tsx
+pnpm e2e:run --project mobile-chrome tests/terminal/mobile-terminal-close.spec.ts tests/session/mobile-session-deletion.spec.ts
+pnpm e2e:run --project chromium tests/session/session-tab-close-guard.spec.ts
+pnpm run typecheck
+pnpm run i18n:check
+pnpm run i18n:ratchet
+```
+
+Use the existing causal teardown pause helper; no new sleeps or timeout growth.
+Keep the target row mounted during confirmation and assert the active host,
+not a now-hidden inline group. Inspect a rendered picker confirmation.
+
+## Files likely touched
+
+- `apps/web/components/task/terminal-close-inline-confirmation.tsx` and new test.
+- `apps/web/components/task/mobile/mobile-{terminals,sessions}-section.tsx`, existing session tests, and picker host wiring.
+- The mobile specs above and task locale catalogs if target/title copy is needed.
+
+## Dependencies
+
+01 supplies the picker host and shared renderer.
+
+## Risks
+
+A shared pending spinner would violate terminal feedback. Session and terminal
+IDs differ; the adapter must pass the same stable target as the existing owner.
+
+## Parallelism
+
+`sequential`
+
+## Inputs
+
+Mobile design on hosted content and domain failure behavior;
+[terminal close requirements](../../specs/ui/requirements/terminal-close-feedback.md)
+and [session delete requirements](../../specs/ui/requirements/session-tab-delete-feedback.md).
+
+## Results
+
+Implemented named session/terminal steps in the opted-in picker host. Normal
+phone rows and triggers stay mounted; menu close transfers to the session step,
+and Back/Cancel restore the initiating control. Session confirmation is a small
+separate adapter to keep the existing section within the file-length limit.
+The shared mobile adapter accepts an explicit owner `onClose` for consumers whose
+pre-dispatch dismissal differs from cancellation. Parked-terminal desktop call
+sites now supply terminal identity; their presentation remains unchanged.
+
+Validation: 18 focused picker/popover tests passed, followed by 93 affected
+shared/archive/picker tests after the final adapter and focus changes. Both
+mobile E2E flows passed, including a sibling shell command while target teardown
+was held. The desktop last-session tab-close regression passed. Typecheck,
+changed-file ESLint and i18n check/ratchet passed. No new copy keys or teardown
+policy changes were required.
diff --git a/docs/plans/mobile-action-confirmations/task-04-content-confirmations.md b/docs/plans/mobile-action-confirmations/task-04-content-confirmations.md
new file mode 100644
index 0000000000..589d8569a1
--- /dev/null
+++ b/docs/plans/mobile-action-confirmations/task-04-content-confirmations.md
@@ -0,0 +1,129 @@
+---
+id: "04-content-confirmations"
+title: "Phone task content confirmations"
+status: done
+wave: 2
+depends_on:
+  - "01-shared-mobile-surfaces"
+plan: "plan.md"
+requirements:
+  - REQ-UI-MOBILE-CONFIRMATION-001
+  - REQ-UI-MOBILE-CONFIRMATION-002
+  - REQ-UI-MOBILE-CONFIRMATION-003
+acceptance_criteria:
+  - AC-UI-MOBILE-CONFIRMATION-001.1
+  - AC-UI-MOBILE-CONFIRMATION-001.2
+  - AC-UI-MOBILE-CONFIRMATION-001.3
+  - AC-UI-MOBILE-CONFIRMATION-001.4
+  - AC-UI-MOBILE-CONFIRMATION-001.5
+  - AC-UI-MOBILE-CONFIRMATION-001.7
+  - AC-UI-MOBILE-CONFIRMATION-002.1
+  - AC-UI-MOBILE-CONFIRMATION-002.2
+  - AC-UI-MOBILE-CONFIRMATION-002.3
+  - AC-UI-MOBILE-CONFIRMATION-002.5
+  - AC-UI-MOBILE-CONFIRMATION-003.1
+  - AC-UI-MOBILE-CONFIRMATION-003.2
+  - AC-UI-MOBILE-CONFIRMATION-003.5
+  - AC-UI-MOBILE-CONFIRMATION-003.6
+system_design:
+  - ../../specs/ui/system-design/mobile-action-confirmations.md
+---
+
+# Task 04: Phone Task Content Confirmations
+
+## Summary
+
+Move the existing inline file, context-reset, revision-restore, detach, and
+walkthrough decisions to the shared phone presentation. Keep target selection
+and each action's existing semantics with its current owner.
+
+## In scope
+
+- Route phone inline consumers through standalone or existing-surface hosts;
+  preserve normal file/revision rows and stable ownership across menu close.
+- Supply explicit localized action/target identity and the existing consequence
+  content, including destructive and session/context-specific warnings.
+- Add adapter and real mobile-flow coverage for Cancel, confirmation, stale
+  target/context removal, and current error/retry behavior.
+
+## Out of scope
+
+File deletion semantics, reset quiescence, revision persistence, task detach
+policy, walkthrough data, general review layout, and existing full alerts.
+
+## Acceptance
+
+1. Each listed phone action uses one focused surface, preserves origin state
+   on Cancel, and dispatches only the captured eligible target on confirmation.
+2. Menu close and host changes neither unmount the decision prematurely nor
+   leave hidden confirm controls active; rows retain their geometry.
+3. Existing operation-specific effects, errors, and non-phone interactions
+   pass focused regressions without introducing shared transport behavior.
+
+## Verification
+
+Read `components/task/chat/AGENTS.md` and `components/review/AGENTS.md` before
+editing. Use `/tdd` and `/e2e`; add new revision adapter tests and the mobile
+content spec below for detach/walkthrough coverage missing from existing specs.
+
+```bash
+cd apps/web
+pnpm exec vitest run components/task/file-context-menu.test.tsx components/task/chat/reset-context-button.test.tsx components/task/task-plan-revision-restore-actions.test.tsx components/task/task-detach-confirm-dialog.test.tsx components/review/walkthrough-overlay.test.tsx
+pnpm e2e:run --project mobile-chrome tests/task/mobile-file-confirmations.spec.ts tests/chat/mobile-reset-context-confirmation.spec.ts tests/task/mobile-plan-restore.spec.ts tests/task/mobile-content-confirmations.spec.ts
+pnpm e2e:run --project chromium tests/chat/reset-context-confirmation.spec.ts
+pnpm run typecheck
+pnpm run i18n:check
+pnpm run i18n:ratchet
+```
+
+Use the existing isolated test fixtures and active-panel selectors. Capture
+one long-name standalone file confirmation and one hosted content confirmation.
+Retain full file/folder deletion alerts where they already exist.
+
+## Files likely touched
+
+- `apps/web/components/task/{file-browser-parts,file-context-menu,task-plan-revision-restore-actions,task-detach-confirm-dialog}.tsx` and relevant tests/owning surfaces.
+- `apps/web/components/task/chat/reset-context-button.tsx` and `apps/web/components/review/walkthrough-overlay.tsx` with their tests.
+- Listed mobile E2E files, the new revision unit test, and affected locale catalogs.
+
+## Dependencies
+
+01 supplies the shared presentation and host.
+
+## Risks
+
+File controls currently change row classes while inline confirmation exists.
+Remove the phone-only layout effect at the adapter, without changing tablet
+behavior. Review/plan origins may already be modal and require an explicit host.
+
+## Parallelism
+
+`sequential`
+
+## Inputs
+
+Mobile design routing, other consumers, and failure sections; current file,
+reset, revision, detach, and walkthrough components/tests and scoped guidance.
+
+## Results
+
+Implemented file deletion, context reset, history-row restore, inline detach,
+and walkthrough discard through the shared phone surface. Menu handoffs leave
+their source controls mounted; file-session changes unmount row-owned requests.
+Quick Chat opts into its existing dialog host, preserving an unsent draft.
+Existing full detach and revision-preview alerts remain unchanged.
+
+Verification: 101 focused component cases passed, followed by the additional
+phone-tooltip regression and focused refactor checks (25 cases). Typecheck,
+changed-file lint, i18n checks, and the ratchet passed. Seven distinct mobile
+flows passed, including the existing full-detach regression. The final reset,
+Quick Chat, and long-file polish rerun passed all three. Desktop reset passed.
+Long-file footer bounds/hit targets and Quick Chat's single-modal/draft behavior
+were checked in the real browser; settled screenshots were inspected. The
+desktop Quick Chat viewport regression also passed on an isolated rerun;
+no timeout or production change was needed for that check.
+
+Reused `mobile-subtask-detachment.spec.ts` and
+`review/mobile-walkthrough.spec.ts` for their actual mutation outcomes rather
+than duplicating those fixtures. The new `mobile-content-confirmations.spec.ts`
+covers the previously untested hosted Quick Chat reset path.
diff --git a/docs/plans/mobile-action-confirmations/task-05-saved-artifact-confirmations.md b/docs/plans/mobile-action-confirmations/task-05-saved-artifact-confirmations.md
new file mode 100644
index 0000000000..b39bbc1b76
--- /dev/null
+++ b/docs/plans/mobile-action-confirmations/task-05-saved-artifact-confirmations.md
@@ -0,0 +1,129 @@
+---
+id: "05-saved-artifact-confirmations"
+title: "Phone saved artifact deletion confirmations"
+status: done
+wave: 2
+depends_on:
+  - "01-shared-mobile-surfaces"
+plan: "plan.md"
+requirements:
+  - REQ-UI-MOBILE-CONFIRMATION-001
+  - REQ-UI-MOBILE-CONFIRMATION-002
+  - REQ-UI-MOBILE-CONFIRMATION-003
+acceptance_criteria:
+  - AC-UI-MOBILE-CONFIRMATION-001.1
+  - AC-UI-MOBILE-CONFIRMATION-001.2
+  - AC-UI-MOBILE-CONFIRMATION-001.3
+  - AC-UI-MOBILE-CONFIRMATION-001.4
+  - AC-UI-MOBILE-CONFIRMATION-001.5
+  - AC-UI-MOBILE-CONFIRMATION-002.1
+  - AC-UI-MOBILE-CONFIRMATION-002.2
+  - AC-UI-MOBILE-CONFIRMATION-002.3
+  - AC-UI-MOBILE-CONFIRMATION-002.6
+  - AC-UI-MOBILE-CONFIRMATION-003.1
+  - AC-UI-MOBILE-CONFIRMATION-003.2
+  - AC-UI-MOBILE-CONFIRMATION-003.5
+  - AC-UI-MOBILE-CONFIRMATION-003.6
+system_design:
+  - ../../specs/ui/system-design/mobile-action-confirmations.md
+  - ../../specs/ui/system-design/saved-task-view-deletion-confirmation.md
+---
+
+# Task 05: Phone Saved Artifact Deletion Confirmations
+
+## Summary
+
+Adopt the mobile confirmation contract for reusable views, filters, prompts,
+layouts and profiles. Their existing stores, eligibility and delete callbacks
+stay authoritative. Migrate the shared saved-view adapter before its hosts.
+
+## In scope
+
+- Update the saved-task-view shell and its sidebar/Threads/integration owners.
+  Use a step in current filter/editor drawers, preserving unsaved form state.
+- Update prompt, layout-profile, action-preset, saved-layout and agent-profile
+  confirmation adapters, keeping the same deleted target and visible context.
+- Cover exact target IDs, built-in/last-view guards, pending/default-marker
+  isolation, current rollback, persistence, focus, and phone geometry.
+
+## Out of scope
+
+Saved-view/profile models, filtering, last-view policies, provider data,
+persistence queues, plugin APIs, and non-phone editor composition.
+
+## Acceptance
+
+1. Every manifest entry in this group uses the shared phone surface; Cancel
+   restores its current editor/list state without a delete or row selection.
+2. Confirmation invokes the same target-specific delete once and retains
+   protected-item and current rollback/persistence behavior.
+3. Every distinct mobile host and the shared dropdown handoff is exercised;
+   desktop saved-view popovers retain their existing boundaries.
+
+## Verification
+
+Read `components/threads/AGENTS.md`, then use `/tdd` and `/e2e`. Add focused
+adapter cases to existing tests, plus new prompt/layout-profile tests if those
+adapters have no direct coverage. The listed broader component files already
+cover the remaining owners.
+
+```bash
+cd apps/web
+pnpm exec vitest run components/confirmation/saved-task-view-delete-confirmation.test.tsx components/task/sidebar-filter/sidebar-filter-popover.test.tsx components/threads/threads-view-controls.test.tsx components/integrations/presets-scope-bar-base.test.tsx components/github/my-github/presets-sidebar.test.tsx components/gitlab/my-gitlab/presets-sidebar.test.tsx components/jira/my-jira/list-toolbar.test.tsx components/task/layout-preset-selector.test.tsx components/settings/agent-profile-delete-dialog.test.tsx components/settings/prompt-delete-confirmation.test.tsx components/settings/layouts/layout-profile-delete-confirmation.test.tsx
+pnpm e2e:run --project mobile-chrome tests/task/mobile-sidebar-views.spec.ts tests/task/mobile-threads-view.spec.ts tests/github/mobile-github-sidebar.spec.ts tests/gitlab/mobile-gitlab-issue-milestone-filter.spec.ts tests/integrations/mobile-azure-devops.spec.ts tests/integrations/mobile-jira-saved-view.spec.ts
+pnpm e2e:run --project mobile-chrome tests/settings/mobile-prompts-settings.spec.ts tests/settings/mobile-layout-profiles.spec.ts tests/settings/mobile-agent-profile-delete.spec.ts
+pnpm e2e:run --project chromium tests/task/sidebar-filter.spec.ts tests/task/threads-view.spec.ts tests/github/github-scope-bar.spec.ts tests/settings/agent-profile-delete.spec.ts
+pnpm run typecheck
+pnpm run i18n:check
+pnpm run i18n:ratchet
+```
+
+Extend the listed specs with missing delete/Cancel outcomes rather than treating
+an unrelated layout assertion as coverage. Test long translated target names
+and unsaved filter controls through the real hosted surface.
+
+## Files likely touched
+
+- Both 05 inventory rows in `plan.md`, including the shared confirmation hook where target-lifetime integration requires it.
+- Existing filter/editor drawer owners and their component tests, including new prompt/layout-profile adapter tests.
+- Listed E2E files and relevant locale catalogs; no saved-view persistence modules.
+
+## Dependencies
+
+01 supplies the shared host and renderer.
+
+## Risks
+
+Delete controls must not activate a view or its default marker. Closing a menu
+can destroy its candidate unless state lives at a stable owner. Hidden editors
+must retain unsaved values without writing them to persistence.
+
+## Parallelism
+
+`sequential`
+
+## Inputs
+
+Mobile design plus the linked saved-view requirement/design; current shell,
+saved-view hooks, host components/tests, and completed saved-view deletion plan.
+
+## Results
+
+Implemented the shared saved-view adapter, sidebar/Threads and GitHub/GitLab
+modal hosts, transient Jira/integration/layout-menu handoff, and prompt,
+layout-profile and agent-profile adapters. Original controls stay mounted on
+phones. Cancel restores focus and drafts; existing persistence, eligibility,
+default-view rules and full conflict alerts remain unchanged.
+
+Observed behavioral RED tests before adoption. All 80 focused component tests
+passed across 13 files, including desktop/coarse-pointer regressions. Ten
+mobile browser flows passed across the sidebar, Threads, GitHub, GitLab, Jira,
+Azure DevOps, prompts, layouts, and both agent-profile entry points. Successful
+deletions include persisted-state checks where supported. Inspected GitHub's
+same-sheet confirmation step and the standalone profile sheet screenshots.
+Changed production files pass ESLint without warnings; typecheck passed.
+
+Seven desktop saved-artifact regressions passed in the final compatibility
+run: GitHub saved query persistence, sidebar deletion and last-view protection,
+Threads deletion, and three agent-profile deletion/conflict cases. Combined
+affected-component and static-check results are recorded in the manifest.
diff --git a/docs/plans/mobile-action-confirmations/task-06-management-confirmations.md b/docs/plans/mobile-action-confirmations/task-06-management-confirmations.md
new file mode 100644
index 0000000000..5640343376
--- /dev/null
+++ b/docs/plans/mobile-action-confirmations/task-06-management-confirmations.md
@@ -0,0 +1,164 @@
+---
+id: "06-management-confirmations"
+title: "Phone management removal confirmations"
+status: done
+wave: 2
+depends_on:
+  - "01-shared-mobile-surfaces"
+plan: "plan.md"
+requirements:
+  - REQ-UI-MOBILE-CONFIRMATION-001
+  - REQ-UI-MOBILE-CONFIRMATION-002
+  - REQ-UI-MOBILE-CONFIRMATION-003
+acceptance_criteria:
+  - AC-UI-MOBILE-CONFIRMATION-001.1
+  - AC-UI-MOBILE-CONFIRMATION-001.2
+  - AC-UI-MOBILE-CONFIRMATION-001.3
+  - AC-UI-MOBILE-CONFIRMATION-001.4
+  - AC-UI-MOBILE-CONFIRMATION-001.5
+  - AC-UI-MOBILE-CONFIRMATION-001.7
+  - AC-UI-MOBILE-CONFIRMATION-002.1
+  - AC-UI-MOBILE-CONFIRMATION-002.2
+  - AC-UI-MOBILE-CONFIRMATION-002.3
+  - AC-UI-MOBILE-CONFIRMATION-002.6
+  - AC-UI-MOBILE-CONFIRMATION-003.1
+  - AC-UI-MOBILE-CONFIRMATION-003.2
+  - AC-UI-MOBILE-CONFIRMATION-003.5
+  - AC-UI-MOBILE-CONFIRMATION-003.6
+system_design:
+  - ../../specs/ui/system-design/mobile-action-confirmations.md
+---
+
+# Task 06: Phone Management Removal Confirmations
+
+## Summary
+
+Finish the current inline-consumer inventory across integration settings,
+watches, secrets, users, plugin uninstall and workflow-sync removal. Preserve
+the originating page or form and each owner's existing failure behavior.
+
+## In scope
+
+- Use standalone compact sheets from ordinary settings cards and stable menu
+  owners, with named targets and current warning copy.
+- Use a focused step in the existing workflow-sync form dialog; Cancel and a
+  retryable failure preserve the form's values and current error handling.
+- Extend component/mobile tests and account for every remaining phone use of
+  `InlineConfirmActions` in the manifest. Retain explicit full-alert exceptions.
+
+## Out of scope
+
+Credential/provider health, watchers, user permission policies, plugin runtime
+or uninstall behavior, workflow reconciliation, full system alerts, and APIs.
+
+## Acceptance
+
+1. Each listed removal reaches one named confirmation surface; opening and
+   cancelling never mutate or disturb the origin's state.
+2. Confirmation respects pending/eligibility rules, dispatches once, and
+   preserves the existing success, error, rollback and retry behavior.
+3. Mobile tests cover standalone and existing-dialog composition, plus actual
+   removals; remaining inline usage is non-phone or an explicitly scoped
+   existing full-alert path, documented in the work-order results.
+
+## Verification
+
+Use `/tdd` and `/e2e`. Extend the existing provider/management component tests
+and add the new focused watcher/Jira tests where coverage is absent. Add
+`mobile-management-confirmations.spec.ts` for user/plugin/workflow-sync outcomes.
+
+```bash
+cd apps/web
+pnpm exec vitest run components/watches/watcher-delete-action.test.tsx components/jira/jira-action-bar.test.tsx components/linear/linear-settings.test.tsx components/azure-devops/azure-devops-settings.test.tsx components/sentry/sentry-instance-card.test.tsx components/settings/secrets-list-item-row.test.tsx components/settings/system/users-table.test.tsx components/settings/plugins/uninstall-plugin-dialog.test.tsx components/settings/workflow-sync-dialog.test.tsx
+pnpm e2e:run --project mobile-chrome tests/integrations/mobile-integration-remove-confirmations.spec.ts tests/integrations/mobile-watcher-delete-confirmations.spec.ts tests/settings/mobile-secrets-delete.spec.ts tests/settings/mobile-management-confirmations.spec.ts
+pnpm e2e:run --project chromium tests/integrations/integration-remove-confirmations.spec.ts tests/integrations/watcher-delete-confirmations.spec.ts tests/settings/secrets-delete.spec.ts
+pnpm run typecheck
+pnpm run i18n:check
+pnpm run i18n:ratchet
+```
+
+Run this inventory check from the repository root and record dispositions:
+
+```bash
+rg -n 'InlineConfirmActions|ActionConfirmPopover' apps/web/components --glob '!*.test.*'
+```
+
+Keep E2E seeding on disposable fixture data. Extend existing mobile tests with
+visible successful removals and persisted-state assertions where applicable.
+Inspect a standalone integration confirmation and the workflow form step.
+
+## Files likely touched
+
+- Both 06 inventory rows in `plan.md`, their stable parent surfaces, and component tests.
+- Existing mobile integration/watch/secret specs; new watcher/Jira unit tests and `apps/web/e2e/tests/settings/mobile-management-confirmations.spec.ts`.
+- Relevant locale catalogs; no provider/auth/backend or plugin SDK files.
+
+## Dependencies
+
+01 supplies standalone and existing-dialog hosting.
+
+## Risks
+
+Workflow-sync removal currently restores inline confirmation after a rejected
+promise; a blanket close-on-submit policy would lose its retry behavior.
+Settings sources vary between menus and persistent cards, so handoff must be
+explicit. Secret values must never enter confirmation titles or test captures.
+
+## Parallelism
+
+`sequential`
+
+## Inputs
+
+Mobile design sections on routing, other consumers, and failure handling;
+current provider/settings components and their cancellation/removal tests.
+
+## Results
+
+Implemented named phone sheets for all four watcher types, Jira/Linear/Azure
+DevOps connection removal, Sentry instances, plugin uninstall, secret deletion,
+and user role/status changes. Plugin row/detail and secret/user action controls
+remain mounted. Existing permissions, last-administrator protection, secret
+redaction, and full in-use conflict dialogs remain authoritative.
+
+Workflow-sync removal uses a step in its actual form dialog. Its explicit
+await-with-retry policy disables duplicate submission, retains the form on
+failure, and leaves feedback with the existing controller. Target changes,
+closure and unmount invalidate stale completion callbacks. A behavioral RED
+test exposed an unmounted completion dismissing a replacement dialog; the
+generation cleanup fixes that case.
+
+Verification:
+
+- Behavioral RED tests preceded the new adapters and retry policy. All 94
+  focused component cases passed across 13 files, including the shared host,
+  plugin row, secret conflict and stale-completion regressions.
+- Ten mobile browser scenarios passed: four integration removals, watcher
+  deletion, plugin row/detail uninstall, workflow-sync Cancel/failure/retry,
+  simple secret deletion, secret conflict, and user self-action guards.
+- User coverage extends `auth/mobile-users-self-actions.spec.ts` rather than
+  duplicating its authenticated setup in the new management test file.
+- Seven desktop provider/watch/secret cases passed in the combined 14-case
+  compatibility run. Existing popovers and full conflict flows remain usable.
+- Inspected the standalone Sentry sheet and hosted workflow removal capture.
+  Browser assertions cover reachable 48px actions, one modal, Cancel focus,
+  preserved draft, successful mutation and persistence where supported.
+- Changed production ESLint, typecheck, build, i18n checks/ratchet, public-doc
+  validation, and specification lint passed. No new translation keys or API,
+  backend, credential, permission or plugin-runtime changes were needed.
+
+Inventory disposition:
+
+- Every `InlineConfirmActions` consumer in the manifest now sits behind the
+  phone adapter or an explicit non-phone branch. This includes archive,
+  session/terminal pickers, content, saved artifacts, and management consumers.
+- `CloseTerminalConfirmPopover` remains in Dockview/terminal reopen controls
+  and the tablet right panel; phones use the migrated terminal picker.
+- `DeleteSessionPopover` remains in Dockview and the non-phone Kanban preview;
+  phones use the migrated session picker. Kanban skips preview below 768px.
+- `changes-panel-dialogs.tsx` retains its existing single-file Git-discard
+  popover and bulk discard alert. This separate loss-of-work consent flow is
+  not an inline consumer and is outside the adopted inventory.
+- Existing full task-delete/discard/type-to-confirm, full detach and plan
+  preview alerts, profile/secret conflict alerts, and system maintenance
+  dialogs are intentionally unchanged. Shared legacy primitives are unchanged.
diff --git a/docs/plans/mobile-confirmation-sheet-sizing/plan.md b/docs/plans/mobile-confirmation-sheet-sizing/plan.md
new file mode 100644
index 0000000000..e9806b4223
--- /dev/null
+++ b/docs/plans/mobile-confirmation-sheet-sizing/plan.md
@@ -0,0 +1,278 @@
+---
+created: 2026-09-10
+status: complete
+requirements:
+  - REQ-UI-MOBILE-CONFIRMATION-001
+  - REQ-UI-MOBILE-CONFIRMATION-002
+  - REQ-UI-MOBILE-CONFIRMATION-003
+system_design:
+  - ../../specs/ui/system-design/mobile-action-confirmations.md
+legacy_specs: []
+---
+
+# Implementation Plan: Compact Mobile Confirmation Sheets
+
+## Overview
+
+Correct the geometry of the already-delivered mobile confirmation surfaces.
+First make hosted drawer confirmations content-sized without losing origin
+state. Then align the two saved-query filter hosts that still enter from the
+side. Execute both work orders sequentially after the design handoff.
+
+UI owns this reusable geometry and interaction contract, not the task/view
+mutation. The amended [requirements](../../specs/ui/requirements/mobile-action-confirmations.md)
+and [design](../../specs/ui/system-design/mobile-action-confirmations.md) retain
+the accepted [single-surface decision](../../decisions/2026-09-10-mobile-confirmation-surfaces.md).
+No new ADR is needed: the modal/state ownership decision is unchanged.
+
+The [original delivery](../mobile-action-confirmations/plan.md) remains a
+completed historical record. This follow-up was implemented and verified after
+the 2026-09-11 explicit request.
+
+## Evidence and root cause
+
+The user's Threads deletion screenshot shows a short decision in a tall editor
+shell, with a large empty region between the explanation and actions. A phone
+browser check of the corresponding sidebar-view flow at 393 by 851 CSS pixels
+measured a 681-pixel sheet. The editor was correctly hidden/inert and Cancel
+restored it. The isolated server's asset hash matched this worktree's build;
+this is not stale delivery or a missed `SavedTaskViewDeleteConfirmation` route.
+
+Two layout rules explain it: the filter/Threads/Tasks hosts set tall heights,
+and `MobileConfirmationHostBody` keeps the invisible origin in the same grid
+track as the confirmation. The old design explicitly preserved host height;
+AC-UI-MOBILE-CONFIRMATION-002.4 only required standalone sheets to fit content.
+The revised criterion applies to hosted bottom sheets too.
+
+An inventory of every host also found right-hand `Sheet` components in the
+GitHub and GitLab phone filters. They need a phone bottom host to meet the same
+visual contract; other centered dialog hosts are intentional exceptions.
+
+Smallest reproduction: `/threads` with two saved views, select the custom view,
+open its view picker, open settings, tap Delete. The permanent RED regression
+belongs in `e2e/tests/task/mobile-threads-view.spec.ts`, extending
+`confirms deletion of a saved view inside the native drawer` with compact bounds
+and copy-to-action spacing assertions.
+
+## Scope
+
+### In scope
+
+- Compact same-host confirmation in Tasks, sidebar view settings, Threads,
+  session and terminal pickers.
+- Bottom-hosted saved-query filter/confirmation flows on phone GitHub/GitLab.
+- Original size, draft, selection, scroll and focus restoration on Cancel/Back.
+- Long-content containment, safe areas, touch targets and reduced-motion behavior.
+- Targeted rendered regressions, relevant desktop/tablet checks and the existing
+  phone how-to update alongside implementation.
+
+### Out of scope
+
+- Domain mutations, cleanup policy, permissions, persistence, recovery or Undo.
+- Centered command/Quick Chat/workflow-sync hosts and retained full alerts.
+- Changing desktop/tablet layout, general navigation, or global UI primitives.
+- New animation libraries, snap detents, modal queues or plugin contracts.
+- Publishing, committing, changing the seeded database or touching main :9998.
+
+## Technical approach
+
+`MobileConfirmationHost` gets an explicit drawer composition opt-in. While a
+request is active, its content properties override tall origin dimensions with
+intrinsic height and the same dynamic-viewport cap as standalone confirmation.
+`MobileConfirmationHostBody` removes the hidden origin from active layout while
+preserving its measured dimensions, mounted controls and nested scroll offsets.
+Keep token lifetime, portal ownership, focus handling and callbacks unchanged.
+
+The explicit opt-in prevents centered dialogs from accidentally shrinking.
+Apply it to the actual drawer owners rather than per-action copies of sizing
+logic. Convert the two phone integration filter roots to the existing Drawer
+primitive in work order 02; do not use a drawer stacked over their side sheet.
+
+### Mobile design contract
+
+| Choice | Contract |
+| --- | --- |
+| Entry points and desktop outcome | The existing delete/archive/close controls remain discoverable; each action still targets the same record and uses existing desktop confirmation. |
+| Exemplar | Standalone `MobileActionConfirmation` supplies compact inset geometry; `MobilePickerSheet` supplies bottom entry, safe areas and one internal scroll owner. |
+| Hierarchy | Back where hosted, title/target, consequences/options, full-width primary action, Cancel. Short content has no flexible empty middle. |
+| Surface rationale | A short temporary decision needs a content-sized bottom sheet; the long editor/list regains its normal height on return. |
+| Geometry and state | Dynamic viewport cap, one active body scroller, 48px action targets, safe-area clearance; only presentation changes. Existing domain hooks own all data. |
+
+The default-English short Threads fixture should settle below 60% of the
+configured Pixel 5 viewport, remain bottom-anchored, and leave at most 32 CSS
+pixels between the final description content and the first action. These are
+fixture assertions, not a fixed product height: translations, warnings and
+long targets may need more space and internal scrolling.
+
+## Tests
+
+| Criteria | Evidence |
+| --- | --- |
+| 001.2, .4-.7; 003.1-.2, .5 | Existing `mobile-confirmation-host.test.tsx` and `mobile-action-confirmation.test.tsx`: same modal, mounted origin, focus, token invalidation, breakpoint cancel and callback lifetime. Add behavioral coverage for the drawer opt-in without using DOM-only tests as geometry evidence. |
+| 002.3-.7 | Real browser bounds, footer spacing, hit tests, long content, dynamic viewport and reduced-motion cases in work order 01. |
+| 001.8; 003.1, .6 | Real phone integration filter selection/default/deletion cases in work order 02. |
+
+Abbreviated criteria use the `AC-UI-MOBILE-CONFIRMATION-` prefix. Full IDs and
+exact commands are in each work order.
+
+## E2E tests
+
+| Flow | Project and test file |
+| --- | --- |
+| Screenshot regression and restored editor state | `mobile-chrome`: `tests/task/mobile-threads-view.spec.ts`, `tests/task/mobile-sidebar-views.spec.ts` |
+| Compact Tasks confirmation, unchanged scroll and action target | `mobile-chrome`: `tests/task/mobile-action-confirmations.spec.ts`; replace its obsolete same-height assertion, retain the other safeguards |
+| Picker content cannot force confirmation height | `mobile-chrome`: `tests/terminal/mobile-terminal-close.spec.ts`, `tests/session/mobile-session-deletion.spec.ts` |
+| Centered form remains unchanged | `mobile-chrome`: workflow-sync case in `tests/settings/mobile-management-confirmations.spec.ts` |
+| Saved-query filters enter from bottom, Cancel restores selection/scroll | `mobile-chrome`: `tests/github/mobile-github-sidebar.spec.ts`, saved-query case in `tests/gitlab/mobile-gitlab-parity.spec.ts` |
+| Non-phone presentation remains unchanged | `chromium`: saved-view cases in `tests/task/sidebar-filter.spec.ts`, `tests/task/threads-view.spec.ts`, `tests/github/github-scope-bar.spec.ts`, `tests/gitlab/gitlab-issue-milestone-filter.spec.ts` |
+
+Use fresh isolated E2E fixtures and a rebuilt frontend, not the user's seeded
+test database. Settle finite animations before measuring; no fixed sleeps or
+all-worker overrides. Inspect phone captures of Threads, Tasks and one provider
+filter before refreshing the separately running test instance.
+
+## Work orders
+
+- [x] [Task 01: Compact hosted drawer geometry](task-01-compact-drawer-hosts.md)
+- [x] [Task 02: Bottom-hosted saved-query filters](task-02-bottom-filter-hosts.md)
+
+Order 02 depends on 01. Both are sequential; no delegation is authorized.
+
+## Verification results
+
+- `python3 scripts/lint-spec-files.test.py`: all 30 tests passed.
+- `python3 scripts/lint-spec-files.py --all`: all specification files passed.
+- `git diff --check`: passed.
+
+The above document checks were run during the design turn. Work order 01 now
+has passing rendered geometry, restoration, long-content and desktop checks;
+its results are recorded in that work order. Both work orders are implemented.
+
+Historical verification before PR integration with the newer base:
+
+- Fresh `build:e2e`, typecheck, changed-file ESLint, Prettier and the i18n
+  new-code ratchet passed. No user-facing copy or translation keys were added.
+- All 20 host/content/request unit tests passed, including Cancel focus without
+  scrolling and mounted-origin restoration in both drawer/dialog composition.
+- The final targeted `mobile-chrome` batch passed all 16 cases without retries
+  or skipped/flaky cases. It includes both providers, session deletion, centered
+  workflow removal/retry, standalone and hosted archive at three viewport/locale
+  combinations, sidebar views, Threads deletion, and terminal close.
+- Earlier compatibility runs passed 12 desktop saved-view/scope cases and all
+  three GitLab milestone/query cases. Four confirmation/persistence cases
+  passed again after the final scroll-containment edit. That wrapper reported
+  all four passes but exited 143; no fixture listener remained. The same four
+  cases then passed with exit 0 through the repository's one-worker guarded
+  `e2e:raw` runner. No test assertions were removed or retries added.
+- The initial final batch's GitHub entry-timing failure and the subsequently
+  discovered clipped Threads heading are documented in the work orders. They
+  were remediated before the clean 16-case run; a passing box-size assertion
+  alone is not accepted as visual evidence.
+
+Inspected captures include Threads, Tasks, GitLab filters/confirmation, narrow
+Portuguese, wide dark mode and landscape pseudo-locale. Final browser bounds:
+
+| Surface | Viewport | Origin height | Confirmation height | Bottom edge |
+| --- | --- | --- | --- | --- |
+| Threads saved-view deletion | 393x640 | 512px | 350px | 640px |
+| Tasks archive | 393x727 | 581.59px | 358px | 727px |
+| GitLab saved-query deletion | 393x640 | 512px | 346px | 640px |
+
+The Threads root now has zero scroll offset; the title and actions intersect
+the viewport fully. Cancel preserves the invalid input, editor scroll and
+original size. The short-content action gap is at most 32px. Long landscape
+content scrolls inside the body with its footer reachable.
+
+Disposable captures and the JSON result report are in
+`/tmp/kandev-compact-captures.SMEGuq/`; they are not committed product assets.
+Public docs updated: `docs/public/mobile-remote-access.md`, an existing how-to,
+now describes compact hosted steps, restoration and bottom provider filters.
+Specification lint, its 30 tests, public-doc validator tests, all 46 published
+page checks and `git diff --check` passed.
+
+The existing isolated instance remains at
+`https://koi.taile29c7d.ts.net:48649`. Its served assets match the final local
+build (`index-9P1CcRyb.js`, `index-DfhIhLPE.css`). Test 48429 and main 9998 both
+returned readiness 200. No seed reset, backend restart, Tailscale route change,
+commit or push was performed. The ownership-checked shutdown command remains:
+
+```bash
+bash /tmp/kandev-mobile-test.MPZpbZ/stop.sh
+```
+
+Known pre-existing limitation outside this correction: a general Tasks ellipsis
+CSS rule hides the entry at 640-767px with a coarse pointer. Wide hosted tests
+open in portrait and then rotate; they do not claim to fix that entry rule.
+
+## PR integration verification
+
+The base integration preserves the newer GitHub Views picker, fixed save action
+and focus-release handoff; Threads listing chrome and sync errors; shared
+control sizing; and picker close-focus callbacks. The extracted task-action
+dialog owner now supplies the task ID required by mobile detach confirmation.
+The design and mobile how-to name the current provider owners.
+
+Post-integration checks:
+
+- All 277 tests in the 37 changed unit-test files passed. A separate 31-file
+  host/GitHub/Threads/menu run passed 253 tests (overlapping coverage), and the
+  newly extracted task-action dialog owner's nine tests passed.
+- `pnpm run typecheck`, resolved-file ESLint with zero warnings, Prettier,
+  `pnpm run i18n:check`, architecture and harness lint passed.
+- Harness validator: 19 tests passed; specification validator: 36 tests passed;
+  all specs and 46 public docs pages validated; 62 public-doc validator tests passed.
+- Fresh managed backend, web and packaged-fixture builds passed. The full mobile
+  GitHub sidebar, action-confirmations and secrets specs passed all 16 tests.
+- A second one-worker, no-retry batch passed eight selected mobile cases in
+  Threads, sidebar views, GitLab, sessions, terminals and management confirmations.
+- Four desktop GitHub scope/saved-query and sidebar/Threads deletion checks
+  passed without retries against the same build.
+
+The integration commit was pushed and its remote checks were inspected. Static
+and frontend checks passed; four E2E shards exposed five stale mobile test
+expectations and three intermittent assertion/fixture interactions. The
+dependent E2E aggregate failures came from those shards.
+
+## PR CI remediation
+
+This remediation is test-only. It changes no application behavior, public
+contract, copy, or screenshots, so the requirements, system design and public
+how-to need no further change.
+
+- Archive and plugin-uninstall regressions now require compact bottom sheets,
+  48px confirmation actions and restored origin state, rather than inline rows.
+- Quick Chat enters through the current mobile menu. Sentry's ordinary row
+  controls use the shared 44px minimum; confirmation actions still require 48px.
+- Mobile CI retry bounds settle finite animations and allow only 0.001px of
+  floating-point error around the existing 44px target requirement.
+- File-tree readiness checks a visibly collapsed parent folder rather than a
+  virtualized root file pushed offscreen by preceding LSP fixtures.
+- Copy-files progress accepts an unrelated remote-sync warning but still requires
+  the exact two-file count and a successfully completed copy step.
+
+Local evidence before the remediation commit:
+
+- The five failing mobile scenarios reproduced with retries disabled, then
+  passed after the assertion/entry updates.
+- Running the LSP file-intelligence spec before file-tree search reproduced the
+  virtualized-row failure. The corrected ordered desktop run passed all 18
+  cases, including both copy-files progress scenarios, without retries:
+  `pnpm e2e:run --no-build --project chromium tests/lsp/lsp-file-intelligence.spec.ts tests/task/file-tree-search.spec.ts tests/session/copyfiles-progress.spec.ts -- --retries=0`.
+- All 29 cases in the five affected mobile specs passed without retries:
+  `pnpm e2e:run --no-build --project mobile-chrome tests/task/mobile-sidebar-task-actions.spec.ts tests/task/mobile-content-confirmations.spec.ts tests/plugins/mobile-plugin-settings-row.spec.ts tests/integrations/mobile-integration-remove-confirmations.spec.ts tests/pr/mobile-ci-automation-options.spec.ts -- --retries=0`.
+- Typecheck, seven-file ESLint with zero warnings, Prettier,
+  `python3 scripts/lint-spec-files.py --all` and `git diff --check` passed.
+
+No timeouts were increased, retries added or production behavior changed.
+Earlier exact-head CI/review evidence becomes historical after the remediation
+push. Final remote CI, delayed review comments and mergeability must be checked
+on that new head before delivery; they are not claimed complete here.
+
+## Risks
+
+- Hiding an origin with zero or smaller dimensions can silently reset scroll.
+- A shared host change can shrink centered dialogs unless explicitly scoped.
+- Drawer transforms, focus return and resize can compete; preserve Vaul's
+  ownership and test cancellation during transitions.
+- Normalizing provider filters must not select a view or change its default
+  while confirming deletion; preserve their current close timing.
diff --git a/docs/plans/mobile-confirmation-sheet-sizing/task-01-compact-drawer-hosts.md b/docs/plans/mobile-confirmation-sheet-sizing/task-01-compact-drawer-hosts.md
new file mode 100644
index 0000000000..2d310808d1
--- /dev/null
+++ b/docs/plans/mobile-confirmation-sheet-sizing/task-01-compact-drawer-hosts.md
@@ -0,0 +1,167 @@
+---
+id: "01-compact-drawer-hosts"
+title: "Compact hosted drawer geometry"
+status: done
+wave: 1
+depends_on: []
+plan: "plan.md"
+requirements:
+  - REQ-UI-MOBILE-CONFIRMATION-001
+  - REQ-UI-MOBILE-CONFIRMATION-002
+  - REQ-UI-MOBILE-CONFIRMATION-003
+acceptance_criteria:
+  - AC-UI-MOBILE-CONFIRMATION-001.2
+  - AC-UI-MOBILE-CONFIRMATION-001.4
+  - AC-UI-MOBILE-CONFIRMATION-001.5
+  - AC-UI-MOBILE-CONFIRMATION-001.6
+  - AC-UI-MOBILE-CONFIRMATION-001.7
+  - AC-UI-MOBILE-CONFIRMATION-002.3
+  - AC-UI-MOBILE-CONFIRMATION-002.4
+  - AC-UI-MOBILE-CONFIRMATION-002.5
+  - AC-UI-MOBILE-CONFIRMATION-002.6
+  - AC-UI-MOBILE-CONFIRMATION-002.7
+  - AC-UI-MOBILE-CONFIRMATION-003.1
+  - AC-UI-MOBILE-CONFIRMATION-003.2
+  - AC-UI-MOBILE-CONFIRMATION-003.5
+system_design:
+  - ../../specs/ui/system-design/mobile-action-confirmations.md
+---
+
+# Task 01: Compact Hosted Drawer Geometry
+
+## Summary
+
+Make short confirmations content-sized inside existing bottom drawers. Preserve
+the same modal and mounted origin, restoring the editor/list geometry and state
+when the user cancels.
+
+## In scope
+
+- Add explicit drawer composition to the shared host, with scoped active sizing.
+- Remove the hidden origin from layout without clamping its scroll containers.
+- Adopt in Tasks, sidebar-filter, Threads and `MobilePickerSheet` owners.
+- Extend the real phone regressions and preserve centered-dialog behavior.
+
+## Out of scope
+
+Provider filter conversion (02), mutations, global primitive changes, new copy,
+new preferences, publishing and any change to main :9998.
+
+## Acceptance
+
+1. The English short Threads deletion fixture occupies less than 60% of the
+   configured phone viewport, ends at the existing bottom inset, and has no
+   more than 32px between description content and primary action. Long text
+   instead uses a contained body scroller with title/actions visible.
+2. Cancel/Back restores the same dialog identity, original editor height,
+   unsaved values, selection, scroll and trigger focus. Tasks and both pickers
+   exhibit the same behavior. Opening/cancelling never dispatches the action.
+3. Centered dialogs and 768px+ fallback remain unchanged. Narrow, landscape,
+   Portuguese/pseudo and reduced-motion checks retain usable 44px+ hit targets,
+   safe areas and no document overflow.
+
+## Verification
+
+After an explicit implementation request, use `/tdd` and `/e2e`. Extend the
+Threads saved-view deletion test first; run it against the current build and
+observe failure on bounds/spacing, not setup or selectors. Then implement.
+Replace the Tasks same-height assertion with compact-size plus restored-size
+checks; do not remove its scroll, target, focus or modal-identity assertions.
+
+Dependencies are installed in this worktree. In a fresh worktree, first run
+`pnpm install --frozen-lockfile` from `apps/`. Run from `apps/web`:
+
+```bash
+pnpm run build:e2e
+pnpm e2e:run --project mobile-chrome tests/task/mobile-threads-view.spec.ts --grep 'confirms deletion'
+pnpm exec vitest run components/confirmation/mobile-confirmation-host.test.tsx components/confirmation/mobile-action-confirmation.test.tsx components/confirmation/mobile-confirmation-content.test.tsx
+pnpm e2e:run --project mobile-chrome tests/task/mobile-threads-view.spec.ts tests/task/mobile-sidebar-views.spec.ts tests/task/mobile-action-confirmations.spec.ts tests/terminal/mobile-terminal-close.spec.ts tests/session/mobile-session-deletion.spec.ts
+pnpm e2e:run --project mobile-chrome tests/settings/mobile-management-confirmations.spec.ts --grep 'workflow'
+pnpm e2e:run --project chromium tests/task/sidebar-filter.spec.ts tests/task/threads-view.spec.ts --grep 'delete|deletion|tablet'
+pnpm run typecheck
+pnpm exec eslint --max-warnings 0 components/confirmation/mobile-confirmation-host.tsx components/confirmation/mobile-confirmation-content.tsx components/task/mobile/task-switcher-drawer.tsx components/task/mobile/mobile-picker-sheet.tsx components/task/sidebar-filter/sidebar-filter-popover.tsx components/threads/threads-view-controls.tsx
+```
+
+Rebuild after the implementation's final frontend edit before GREEN E2E runs.
+Use the existing managed runner's single-worker limits. Inspect Threads and
+Tasks phone screenshots; record actual bounds, not just a screenshot path.
+
+## Files likely touched
+
+- `apps/web/components/confirmation/mobile-confirmation-host.tsx`,
+  `mobile-confirmation-content.tsx` if needed, corresponding tests and `AGENTS.md`.
+- `apps/web/components/task/mobile/task-switcher-drawer.tsx`,
+  `mobile-picker-sheet.tsx` and `task/sidebar-filter/sidebar-filter-popover.tsx`.
+- `apps/web/components/threads/threads-view-controls.tsx`.
+- The five main phone E2E files in the verification command; reuse the existing
+  viewport/animation helpers instead of adding an artificial component route.
+- The paired requirements/design and this work order for execution results.
+
+## Dependencies
+
+The original mobile confirmation implementation at `90c65b7664` is present.
+No pending work-order dependency.
+
+## Risks
+
+Frozen origin dimensions must preserve nested scroll without exposing hidden
+content to focus/accessibility. Primitive max-height variants can override
+ordinary utility classes. Do not write competing transforms onto Vaul's root.
+
+## Parallelism
+
+`sequential`
+
+## Inputs
+
+The paired design's Hosted content, Mobile composition and Verification
+sections; current standalone confirmation and picker shell; host lifecycle
+tests; `apps/web/AGENTS.md` and scoped confirmation/Threads guidance.
+
+## Results
+
+Initially implemented on 2026-09-11 after the explicit implementation request.
+
+PR integration preserves the newer Threads listing-context trigger and sync
+status, fixed picker content, shared control sizing and close-focus handlers.
+The newly extracted task-action dialog owner passes the captured task ID to
+detach confirmation. Current post-integration checks are recorded in the parent
+plan, including the test-only CI remediation of the archive and Quick Chat
+scenarios; the original results below remain historical evidence.
+
+- RED: the Threads fixture measured a 581.59px sheet against a 436.2px compact
+  limit. The failure was rendered geometry, not visibility or fixture setup.
+- GREEN: explicit drawer composition overrides tall host sizing; the hidden
+  origin keeps measured dimensions outside layout. Tasks, sidebar filters,
+  Threads and session/terminal picker hosts opt in. Centered dialogs do not.
+- The Threads regression now uses a 393x640 viewport, an invalid unsubmitted
+  column input and a nonzero editor scroll. Compact height/spacing, same modal,
+  restored size/input/scroll/focus, and persisted deletion pass.
+- The Tasks/list, sidebar-view, session and terminal geometry cases pass;
+  standalone and hosted archive cases pass at 320x640 Portuguese/light,
+  767x900 English/dark and 667x375 pseudo/light. Hosted cases use reduced motion
+  and rotate an already open request; a child task forces scrolling long copy
+  in landscape. Cancel never archives the parent.
+- Host/content/request unit tests: 20 passed. Typecheck and changed-file lint
+  passed. The centered workflow-removal/retry case passed. Four desktop
+  saved-view deletion/eligibility regressions passed.
+- Corrected an unrelated E2E timestamp assertion to inspect visible compact
+  text separately from its intentionally verbose screen-reader text.
+- A legacy Tasks ellipsis CSS rule hides its entry at coarse-pointer widths
+  640-767px. This pre-existing, general-menu issue is outside this geometry
+  correction; the wide hosted tests cover portrait entry followed by rotation,
+  not direct entry at those widths.
+- An interrupted E2E run left this worktree's orphan backend on 18081, causing
+  a later fixture workspace-404 failure. Its exact process was identified and
+  stopped; the clean rerun passed. Main 9998 and seeded 48429 were not stopped.
+- Final screenshot inspection exposed a separate scroll-containment regression:
+  the Threads root retained a 274px scroll offset while its measured box still
+  passed sizing assertions. A traced RED run reproduced a completely clipped
+  heading. Drawer composition now uses `overflow: clip` even in the origin
+  step, so only the inner list/body scrolls. Initial Cancel focus also uses
+  `preventScroll`, covered by a RED/GREEN unit assertion. Browser checks now
+  require zero root scroll and full heading/action intersection with the
+  viewport, including after capturing the edited-input case.
+
+The final combined regression pass and fresh captures after work order 02 are
+recorded in the parent plan.
diff --git a/docs/plans/mobile-confirmation-sheet-sizing/task-02-bottom-filter-hosts.md b/docs/plans/mobile-confirmation-sheet-sizing/task-02-bottom-filter-hosts.md
new file mode 100644
index 0000000000..71cd9052f7
--- /dev/null
+++ b/docs/plans/mobile-confirmation-sheet-sizing/task-02-bottom-filter-hosts.md
@@ -0,0 +1,150 @@
+---
+id: "02-bottom-filter-hosts"
+title: "Bottom-hosted saved-query filters"
+status: done
+wave: 2
+depends_on:
+  - "01-compact-drawer-hosts"
+plan: "plan.md"
+requirements:
+  - REQ-UI-MOBILE-CONFIRMATION-001
+  - REQ-UI-MOBILE-CONFIRMATION-002
+  - REQ-UI-MOBILE-CONFIRMATION-003
+acceptance_criteria:
+  - AC-UI-MOBILE-CONFIRMATION-001.2
+  - AC-UI-MOBILE-CONFIRMATION-001.4
+  - AC-UI-MOBILE-CONFIRMATION-001.6
+  - AC-UI-MOBILE-CONFIRMATION-001.8
+  - AC-UI-MOBILE-CONFIRMATION-002.3
+  - AC-UI-MOBILE-CONFIRMATION-002.4
+  - AC-UI-MOBILE-CONFIRMATION-003.1
+  - AC-UI-MOBILE-CONFIRMATION-003.6
+system_design:
+  - ../../specs/ui/system-design/mobile-action-confirmations.md
+---
+
+# Task 02: Bottom-Hosted Saved-Query Filters
+
+## Summary
+
+Move the GitHub and GitLab phone filter hosts from their existing right-hand
+Sheet to an inset bottom Drawer. Use work order 01's compact confirmation mode
+inside that host without changing saved-query semantics.
+
+## In scope
+
+- Change only the phone filter shell in both provider page clients.
+- Preserve IDs, entry triggers, filtering/selection/default state, cancellation
+  and each provider's current close-on-select/save/delete timing.
+- Add actual bottom-direction and compact geometry assertions to their existing
+  mobile saved-query flows; retain desktop/tablet compatibility.
+- Update the mobile how-to with compact hosted behavior after implementation.
+
+## Out of scope
+
+Provider APIs, persistence, query semantics, broad dashboard navigation, plugin
+surfaces, new translations, global Sheet styling and main :9998.
+
+## Acceptance
+
+1. On phones both filter panels open from the bottom and expose all current
+   choices through one viewport-contained scroller. Confirming saved-query
+   deletion switches that same host to compact geometry, never another modal.
+2. Cancel/Back restores filter state, scroll and focus. Explicit deletion uses
+   the captured ID once and does not select the row or toggle its default.
+3. Phone-boundary changes cancel pending decisions; non-phone layouts and saved
+   preferences remain unchanged. The public phone how-to describes the shipped
+   geometry accurately.
+
+## Verification
+
+Use `/tdd`, `/e2e` and `/docs-maintainer`. First assert bottom-drawer direction in
+the existing GitLab saved-query test; current code must fail because it renders
+a right-hand Sheet. Extend the equivalent GitHub saved-query flow and keep its
+default-action isolation assertions. From `apps/web`:
+
+```bash
+pnpm run build:e2e
+pnpm e2e:run --project mobile-chrome tests/gitlab/mobile-gitlab-parity.spec.ts --grep 'saved-query deletion'
+pnpm e2e:run --project mobile-chrome tests/github/mobile-github-sidebar.spec.ts
+pnpm e2e:run --project mobile-chrome tests/gitlab/mobile-gitlab-parity.spec.ts --grep 'saved-query deletion'
+pnpm e2e:run --project chromium tests/github/github-scope-bar.spec.ts tests/gitlab/gitlab-issue-milestone-filter.spec.ts
+pnpm exec vitest run components/confirmation/mobile-confirmation-host.test.tsx components/confirmation/mobile-action-confirmation.test.tsx
+pnpm run typecheck
+pnpm exec eslint --max-warnings 0 app/github/github-page-client.tsx app/gitlab/gitlab-page-client.tsx
+```
+
+The first GitLab command is RED before conversion; the later runs use a fresh
+build after implementation. Inspect one provider's phone filter/confirmation
+capture. From the repository root, validate documentation:
+
+```bash
+python3 scripts/lint-spec-files.py --all
+node --test scripts/validate-public-docs.test.mjs
+node scripts/validate-public-docs.mjs
+git diff --check
+```
+
+After checks, the existing isolated test instance may serve the rebuilt web
+assets without restarting its backend. Preserve its data and Tailscale route;
+do not reset the seed or touch main :9998. Report its refresh URL, not a claim
+that the user's live main installation was updated.
+
+## Files likely touched
+
+- `apps/web/app/github/github-page-client.tsx`.
+- `apps/web/app/gitlab/gitlab-page-client.tsx`.
+- `apps/web/components/integrations/integration-filters-sheet.tsx` (shared shell).
+- `apps/web/e2e/tests/github/mobile-github-sidebar.spec.ts`.
+- `apps/web/e2e/tests/gitlab/mobile-gitlab-parity.spec.ts` and relevant existing
+  desktop saved-query cases if needed for the phone-boundary check.
+- `docs/public/mobile-remote-access.md` (existing how-to), plan/work-order results.
+
+## Dependencies
+
+Work order `01-compact-drawer-hosts` must be done.
+
+## Risks
+
+Replacing a primitive changes focus/close callbacks and scroll containment.
+Keep the form/list owner stable and verify selection/default isolation. Do not
+turn a formerly phone-only entry point into a desktop drawer.
+
+## Parallelism
+
+`sequential`
+
+## Inputs
+
+The design's Other inline consumers and Hosted content sections; both current
+provider filter roots and saved-query mobile tests; the mobile UI language's
+bottom-picker precedent and `apps/web/AGENTS.md`.
+
+## Results
+
+Initial implementation verified on 2026-09-11. RED reproduced the missing bottom direction on the
+GitLab phone filter: the current root had `data-side="right"` and no Vaul
+direction. Both providers now use a shared presentation-only
+`IntegrationFiltersSheet`, with an existing Drawer on phones and the retained
+right Sheet above the phone boundary. No query or mutation hooks moved.
+
+The fresh frontend build and changed-file lint pass. All five provider mobile
+cases passed, including scroll restoration and crossing 768px during a pending
+confirmation. Desktop GitHub scope/saved-query checks and all three GitLab
+milestone/saved-query checks passed.
+
+A later combined run opened Save query instead of the GitHub delete step once
+during sheet entry. Its geometry/tap check now settles the existing finite
+entry animation first; no fixed delay or retry was added. The final run also
+includes work order 01's outer-scroll containment correction and stronger
+heading/action visibility assertions. All 16 targeted mobile cases passed on
+the final build, followed by four clean desktop confirmation/persistence checks
+through the guarded raw runner. Full results and actual bounds are in the
+parent plan. The existing mobile how-to was updated, and its validators pass.
+
+PR integration with the newer base moves GitHub hosting to its extracted
+`MobileViewsPicker`, preserving its fixed save action and delayed focus handoff.
+GitLab retains `IntegrationFiltersSheet`. The full seven-case mobile GitHub
+sidebar spec passes after integration, including save retry, kind switching,
+saved defaults, compact deletion and Cancel restoration. Current combined
+verification is recorded in the parent plan.
diff --git a/docs/public/mobile-remote-access.md b/docs/public/mobile-remote-access.md
index b73f4e3f91..a649f11c71 100644
--- a/docs/public/mobile-remote-access.md
+++ b/docs/public/mobile-remote-access.md
@@ -9,6 +9,43 @@ This how-to guide connects a phone to Kandev through Tailscale, Cloudflare Tunne
 
 Anyone who can reach an unauthenticated Kandev origin has administrator access. Use a protected network boundary.
 
+## Confirm an action on a phone
+
+Archiving from the **Tasks** sheet shows a dedicated confirmation step in that
+same sheet. Review the task name, cleanup effects, and optional subtask selection.
+The sheet shrinks to fit a short decision, with **Archive** and **Cancel** just
+below the details and above the phone's safe area. Longer details scroll without
+moving those buttons off screen.
+
+Choose **Cancel** or **Back** to restore the list or editor's original height,
+draft values, filters, and scroll position. Swiping the sheet away or tapping its
+backdrop cancels the decision and closes the sheet. From the board or a page,
+archive opens a compact bottom sheet.
+Inside the command panel, confirmation stays in the panel and Cancel keeps your
+search query. The archive-confirmation preference and cleanup behavior are unchanged.
+
+The same pattern applies to other inline confirmations:
+
+- Session deletion and terminal closing stay inside their open picker. Saved
+  sidebar, Threads, GitHub, and GitLab views stay inside their filter/editor sheet.
+  These sheets fit the confirmation's content instead of keeping the taller
+  picker or editor height. GitHub's **Views** picker and GitLab's phone filters
+  also open from the bottom.
+- File deletion, chat context reset, plan revision restore, subtask detachment,
+  and walkthrough discard use a compact sheet from the page. Resetting context
+  inside Quick Chat stays in that dialog.
+- Deleting saved prompts, layouts, agent profiles, or views from a menu opens a
+  compact sheet. The menu closes first, leaving only one active decision.
+- Removing integrations, watches, secrets, or plugins, and changing a user's
+  role or status uses the same named confirmation. Secret values are never
+  included in the confirmation.
+- Removing workflow sync is a step in its existing configuration dialog. Cancel
+  returns to the draft; a failed removal keeps the confirmation available to retry.
+
+Full task-delete and discard-consent dialogs retain their existing layout and
+safeguards, as do in-use conflict and system maintenance dialogs. Desktop and
+tablet confirmation layouts are unchanged.
+
 ## How a phone request reaches an agent
 
 Each protected path reaches the same Kandev origin. Kandev then sends task work to the selected executor.
diff --git a/docs/public/tasks-and-workflows.md b/docs/public/tasks-and-workflows.md
index cc720107e8..7735530912 100644
--- a/docs/public/tasks-and-workflows.md
+++ b/docs/public/tasks-and-workflows.md
@@ -690,6 +690,10 @@ Regular Kanban reads and enforces blocker relationships (see [Task dependencies]
 
 ## Archive, unarchive, and delete
 
+On a phone, archive uses a focused confirmation step in the open Tasks sheet,
+or a compact bottom sheet from a page. [Phone confirmation controls](mobile-remote-access.md#confirm-an-action-on-a-phone)
+explain how to review the action and return to your list without losing your place.
+
 Archive records the task as archived and removes it from active views immediately. Runtime stopping and physical cleanup then run in the background with a 60-second timeout. Cleanup is best-effort: a stop or deletion failure is logged and does not undo the archive, and Kandev preserves a runtime or environment when a nonterminal session cannot be stopped. Shared inherited environments and borrowed worktrees are also preserved while another active task still uses them.
 
 | Executor      | Archive cleanup                                                                                                                                                                                                       |
diff --git a/docs/specs/tasks/system-design/archive-confirmation.md b/docs/specs/tasks/system-design/archive-confirmation.md
index d78a68247d..a03a2a397f 100644
--- a/docs/specs/tasks/system-design/archive-confirmation.md
+++ b/docs/specs/tasks/system-design/archive-confirmation.md
@@ -4,6 +4,7 @@ system: tasks
 requirements:
   - REQ-TASKS-ARCHIVE-CONFIRMATION-001
 created: 2026-08-24
+updated: 2026-09-10
 owners:
   - kandev
 ---
@@ -26,7 +27,7 @@ programmatic archive callers remain separate contracts.
 
 - The user-settings service reads and writes the preference.
 - Task archive actions ask the settings state whether confirmation is required.
-- The archive dialog remains responsible for cleanup summary and optional
+- The shared archive confirmation remains responsible for cleanup summary and optional
   cascade selection.
 - The task-navigation coordinator selects a surviving task or the task
   overview after a successful archive.
@@ -42,8 +43,10 @@ changes.
 
 ## Control flow
 
-When confirmation is enabled, user archive actions open the existing dialog.
-The dialog may request a cascade archive. When confirmation is disabled, the
+When confirmation is enabled, user archive actions open the confirmation
+surface. The [UI mobile confirmation design](../../ui/system-design/mobile-action-confirmations.md)
+owns phone presentation; this task contract does not prescribe a dialog or
+sheet. The confirmation may request cascade archive. When confirmation is disabled, the
 action archives only the requested task immediately; it never silently adds
 subtasks.
 
diff --git a/docs/specs/ui/README.md b/docs/specs/ui/README.md
index 58778ff903..e23c54be09 100644
--- a/docs/specs/ui/README.md
+++ b/docs/specs/ui/README.md
@@ -84,6 +84,7 @@ runtime, and workspace lifecycle/state ownership.
 - [Mobile topbar actions](requirements/mobile-quick-chat-topbar.md)
 - [Mobile Task Chrome](requirements/mobile-task-chrome.md)
 - [Mobile Task Navigation](requirements/mobile-task-navigation.md)
+- [Mobile Action Confirmations](requirements/mobile-action-confirmations.md)
 - [Plan comments](requirements/plan-comment-drafts.md)
 - [Plan Editor Task-Switch Stability](requirements/plan-editor-task-switch-stability.md)
 - [Port-forwarding discovery](requirements/port-forwarding-discovery.md)
@@ -188,6 +189,7 @@ runtime, and workspace lifecycle/state ownership.
 - [Message Queue Automation Controls (current)](system-design/message-queue-automation-controls.md)
 - [Native HTML File Preview](system-design/native-html-preview.md)
 - [Mobile Task Chrome](system-design/mobile-task-chrome.md)
+- [Mobile Action Confirmations](system-design/mobile-action-confirmations.md)
 - [Mobile workspace topbar](system-design/mobile-quick-chat-topbar.md)
 - [Mobile Menu Backdrops System Design](system-design/mobile-menu-backdrops.md)
 - [Persistent status motion](system-design/persistent-status-motion.md)
diff --git a/docs/specs/ui/requirements/confirmation-warning-hierarchy.md b/docs/specs/ui/requirements/confirmation-warning-hierarchy.md
index 062053da5f..5862b336b9 100644
--- a/docs/specs/ui/requirements/confirmation-warning-hierarchy.md
+++ b/docs/specs/ui/requirements/confirmation-warning-hierarchy.md
@@ -24,6 +24,12 @@ every sentence as an equal paragraph.
 
 ## Terminology
 
+Phone archive presentation follows the
+[mobile action confirmation contract](mobile-action-confirmations.md).
+This document continues to own cleanup content, action variants, and full
+task-delete consent. Delivery is tracked in the
+[mobile confirmation plan](../../../plans/mobile-action-confirmations/plan.md).
+
 - **Still-working warning:** The localized caution shown when the task or one
   of the selected tasks has generating or background activity.
 
@@ -42,21 +48,21 @@ meaning and the existing archive and delete workflows.
   short-text wrapping, and its icon, spacing, and padding shall remain optically
   balanced with that typography.
 - **AC-TASKS-CONFIRMATION-WARNING-001.2:** When the warning renders in a full
-  dialog, desktop archive popover, archive inline confirmation, or shared delete
+  dialog, phone archive sheet, desktop archive popover, tablet inline confirmation, or shared delete
   dialog, it shall preserve its localized text, `role=alert`, restrained yellow
   semantic treatment, and existing in-flight visibility conditions.
 - **AC-TASKS-CONFIRMATION-WARNING-001.3:** At desktop and phone confirmation
   widths, the warning shall remain contained without document-level horizontal
   overflow, and existing confirmation actions shall remain reachable. Full
   task cleanup dialogs shall follow the dedicated action contract in
-  `AC-UI-TASK-CLEANUP-CONFIRMATION-001.5`; other action geometry shall remain
-  unchanged.
+  `AC-UI-TASK-CLEANUP-CONFIRMATION-001.5`; phone archive follows the mobile
+  contract and other action geometry shall remain unchanged.
 
 ### REQ-TASKS-CONFIRMATION-SURFACE-002: Stable fine-pointer archive surface
 
 **Intent:** Give the fine-pointer archive confirmation readable width while
-keeping the source sidebar row stable and preserving the intentional coarse
-pointer inline confirmation behavior.
+keeping the source sidebar row stable and preserving tablet coarse-pointer
+inline confirmation behavior.
 
 #### Acceptance criteria
 
@@ -73,9 +79,10 @@ pointer inline confirmation behavior.
   tolerance-only assertion.
 - **AC-TASKS-CONFIRMATION-SURFACE-002.3:** The fine-pointer popover shall
   preserve its existing anchor, focus-return boundary, confirmation callbacks,
-  and compact desktop/tablet viewport containment. Coarse-pointer inline
-  confirmation may continue to expand its row and shall retain its existing
-  44px action geometry and zero-overflow behavior.
+  and compact desktop/tablet viewport containment. Tablet coarse-pointer inline
+  confirmation may continue to expand its row with its existing 44px actions.
+  Phone archive shall leave row geometry unchanged and use a dedicated
+  confirmation step in the open sheet or a standalone bottom sheet.
 - **AC-TASKS-CONFIRMATION-SURFACE-002.4:** When a fine-pointer archive action
   needs descendant classification before choosing its confirmation surface, no
   provisional confirmation popover or archive action shall appear while that
@@ -111,32 +118,34 @@ repository resources, so that I can understand the consequence before acting.
   local Docker, remote Docker, Sprites, SSH, unknown executors, and running
   agent sessions in every supported locale.
 - **AC-UI-TASK-CLEANUP-CONFIRMATION-001.4:** Full dialogs, the archive popover,
-  and the archive inline confirmation shall derive their cleanup content from
+  phone archive surfaces, and tablet inline confirmation shall derive cleanup content from
   the same structured model. Each surface may use its established density, but
   shall preserve the same effects, reassurance, and order.
-- **AC-UI-TASK-CLEANUP-CONFIRMATION-001.5:** At phone widths, full task cleanup
+- **AC-UI-TASK-CLEANUP-CONFIRMATION-001.5:** At phone widths, full task-delete
   dialogs shall remain centered and inset within the visual viewport, create no
   document horizontal overflow, keep overflowing content reachable, and expose
-  stacked full-width actions at least 44 CSS px high. Tablet and desktop shall
-  retain compact row actions.
+  stacked full-width actions at least 44 CSS px high. Phone archive shall use
+  the mobile confirmation surface with reachable consequences and options.
+  Tablet and desktop shall retain compact row actions.
 - **AC-UI-TASK-CLEANUP-CONFIRMATION-001.6:** Delete shall use the design
   system's semantic destructive action treatment without a competing primary
   treatment. Archive shall retain its non-destructive action treatment.
 - **AC-UI-TASK-CLEANUP-CONFIRMATION-001.7:** Cancel, dismiss, focus, Escape,
   Enter default-action behavior, archive/delete mutation loading state, cascade
   selection, in-flight warning visibility, and single/bulk archive and delete
-  callbacks shall remain unchanged.
+  callbacks shall remain unchanged. The new phone archive surface requires
+  explicit button activation; desktop default-Enter behavior remains unchanged.
 - **AC-UI-TASK-CLEANUP-CONFIRMATION-001.8:** When archive is initiated from a
-  phone Kanban card, the card shall use the contained full task-cleanup alert
-  dialog even when the task has no descendants. The dialog shall be centered
-  and inset, use the existing theme tokens, keep its content internally
+  phone Kanban card, the card shall use a compact inset bottom confirmation
+  sheet even when the task has no descendants. The sheet shall use the
+  existing theme tokens, keep its content internally
   scrollable, and expose stacked full-width actions at least 44 CSS px high;
   no inline confirmation shall be inserted between cards or change the card's
   height, board URL, or selected task. Fine-pointer desktop and compact-desktop
   Kanban shall retain their anchored archive popover. Coarse-pointer tablet
   Kanban shall retain its existing routing, including its current inline
-  zero-descendant surface. Task-switcher/task-row surfaces shall retain their
-  intentional row-owned coarse-pointer inline confirmation, and a disabled
+  zero-descendant surface. Phone task-switcher/task-row actions shall use a
+  confirmation step in the existing sheet without expanding a row. A disabled
   archive-confirmation preference shall continue to bypass the surface.
 - **AC-UI-TASK-CLEANUP-CONFIRMATION-001.11:** When the task's executor
   projection is absent but task-owned worktree state may remain after the last
@@ -163,15 +172,14 @@ Consent inspection, clean-workspace suppression, and failure recovery follow
 
 - Rewriting or re-translating the still-working warning.
 - Widening all confirmation popovers globally.
-- Changing in-flight detection, archive behavior, focus handling, Escape
-  handling, or safe-area handling.
-- Changing compact archive popover/inline or unrelated dialog action
+- Changing in-flight detection or archive behavior. Phone presentation, focus,
+  dismissal, and safe-area rules are owned by the linked mobile contract.
+- Changing desktop/tablet compact archive or unrelated dialog action
   dimensions.
-- Replacing the centered task alerts with a drawer, sheet, or new navigation
+- Replacing the centered task-delete alerts with a drawer, sheet, or new navigation
   flow.
 - Changing the descendant-count API or introducing background prefetching for
   archive confirmation.
 - Masking sidebar row layout changes with fixed/minimum heights or negative
   offsets.
-- Adding animation or redesigning any confirmation surface beyond the shared
-  warning density and the task cleanup hierarchy above.
+- Redesigning other confirmation surfaces under this cleanup-content contract.
diff --git a/docs/specs/ui/requirements/mobile-action-confirmations.md b/docs/specs/ui/requirements/mobile-action-confirmations.md
new file mode 100644
index 0000000000..5c289de940
--- /dev/null
+++ b/docs/specs/ui/requirements/mobile-action-confirmations.md
@@ -0,0 +1,172 @@
+---
+status: active
+system: ui
+created: 2026-09-10
+owners:
+  - kandev
+---
+
+# Mobile Action Confirmation Requirements
+
+## Overview
+
+Phone confirmations give one decision its own focused surface. A confirmation
+inside an open bottom sheet becomes a content-sized step in that sheet; a
+confirmation from a page opens a compact bottom sheet. Short decisions do not
+inherit a tall editor's height. Lists retain their normal row geometry.
+
+UI owns this reusable presentation, accessibility, and dismissal contract.
+Tasks, saved views, terminals, integrations, and settings retain their existing
+eligibility, mutations, persistence, feedback, and recovery contracts.
+
+This replaces phone inline presentation in
+[task cleanup confirmations](confirmation-warning-hierarchy.md),
+[saved task view deletion](saved-task-view-deletion-confirmation.md),
+[terminal close](terminal-close-feedback.md), and
+[session deletion](session-tab-delete-feedback.md). Those documents continue
+to own their action-specific consequences and non-phone behavior.
+
+## Terminology
+
+- **Phone:** A viewport narrower than 768 CSS pixels, regardless of pointer.
+- **Hosted confirmation:** A confirmation step inside the already-open surface.
+- **Standalone confirmation:** A compact bottom sheet opened from a page after
+  its transient action menu has closed.
+- **Origin:** The task, list, picker, or editor and target that initiated the
+  confirmation, including its current selection and scroll position.
+
+## Requirements
+
+### REQ-UI-MOBILE-CONFIRMATION-001: Focused phone surfaces
+
+**Intent:** Make repeated confirmation interactions comfortable on a phone
+without changing the action being confirmed.
+
+#### Acceptance criteria
+
+- **AC-UI-MOBILE-CONFIRMATION-001.1:** On a phone, task archive and existing
+  inline confirmations in task pickers, file/content controls, saved artifacts,
+  and settings/integrations shall show a dedicated confirmation surface rather
+  than expand or replace the initiating row's content.
+- **AC-UI-MOBILE-CONFIRMATION-001.2:** When the origin is an open bottom sheet,
+  confirmation shall replace its visible content within that same sheet. Only
+  the confirmation shall be interactive or exposed to assistive technology;
+  the underlying list or form shall retain its state.
+- **AC-UI-MOBILE-CONFIRMATION-001.3:** When the origin is a page, confirmation
+  shall open a compact inset bottom sheet after any transient initiating menu
+  closes. The page's selection and scroll position shall remain unchanged.
+- **AC-UI-MOBILE-CONFIRMATION-001.4:** Cancel and the confirmation's Back control
+  shall return to the origin at its normal size without changing its filters,
+  selection, draft values, or scroll position, except for changes caused by
+  live domain data.
+  A surviving initiating control shall receive focus; otherwise a visible
+  control in the origin shall receive focus.
+- **AC-UI-MOBILE-CONFIRMATION-001.5:** Dismissing the whole sheet or navigating
+  away shall cancel the unsubmitted decision. Reopening the origin shall not
+  resurrect the confirmation. Browser Back shall retain normal navigation
+  behavior; confirmation shall not create browser-history entries.
+- **AC-UI-MOBILE-CONFIRMATION-001.6:** At widths of 768 CSS pixels or greater,
+  current desktop/tablet confirmation composition and pointer rules shall
+  remain unchanged. A viewport change across that boundary shall dismiss an
+  unsubmitted confirmation without dispatching its action.
+- **AC-UI-MOBILE-CONFIRMATION-001.7:** Existing full task-delete, discard-consent,
+  type-to-confirm, and system maintenance dialogs shall retain their current
+  presentation. An inline decision inside an existing centered form dialog
+  shall become a focused step in that dialog, preserving the form on Cancel
+  and opening no additional modal surface.
+- **AC-UI-MOBILE-CONFIRMATION-001.8:** Saved-view filter panels that host a phone
+  confirmation, including connected-service saved-query panels, shall use
+  bottom-sheet presentation for their list/editor and confirmation steps.
+  Switching to confirmation shall not introduce a side panel or an additional
+  modal surface.
+
+### REQ-UI-MOBILE-CONFIRMATION-002: Readable content and reachable actions
+
+**Intent:** Let a phone user identify the target, understand the consequences,
+and operate both actions without scrolling the page.
+
+#### Acceptance criteria
+
+- **AC-UI-MOBILE-CONFIRMATION-002.1:** Each confirmation shall expose a visible
+  action title and target identity, including a count for bulk actions. Task
+  archive shall retain executor-specific cleanup effects, supporting notes,
+  in-flight warnings, and optional subtask selection from its shared model.
+- **AC-UI-MOBILE-CONFIRMATION-002.2:** Consequences shall use readable body text
+  distinct from supporting reassurance. Neither target names nor required
+  consequences shall be hidden in a tooltip or optional disclosure. Long
+  names shall wrap without introducing horizontal page overflow.
+- **AC-UI-MOBILE-CONFIRMATION-002.3:** The primary action and Cancel shall be
+  vertically stacked, full-width, and at least 44 CSS pixels high, targeting
+  48 pixels. Back and selectable option labels shall have at least 44-pixel
+  touch targets. Archive shall use its existing non-destructive treatment;
+  deletion shall use semantic destructive treatment.
+- **AC-UI-MOBILE-CONFIRMATION-002.4:** Short bottom-sheet confirmations, whether
+  hosted or standalone, shall fit their content and remain anchored to the
+  bottom inset. Actions shall follow the consequences and options with normal
+  component spacing, without an empty region reserved for the hidden origin.
+  Longer confirmations shall remain inside the dynamic visual viewport, with
+  one active internal body scroller and visible title/actions. Bottom actions
+  shall clear the device safe area, including in landscape.
+- **AC-UI-MOBILE-CONFIRMATION-002.5:** The active surface shall have an accessible
+  name and description. Initial action focus shall be on Cancel. Escape shall
+  cancel only the confirmation step; it shall not also dismiss its host. Plain
+  Enter shall not implicitly execute a destructive phone action, and normal
+  focused-button keyboard activation shall remain available.
+- **AC-UI-MOBILE-CONFIRMATION-002.6:** Labels, descriptions, warnings, accessible
+  names, and count-dependent copy shall use the active supported locale.
+  Pseudo-locale and longer translations shall retain readable hierarchy and
+  reachable controls. Light and dark themes shall retain readable contrast.
+- **AC-UI-MOBILE-CONFIRMATION-002.7:** A surface transition shall never activate
+  the new action from the gesture that opened it. Reduced-motion preferences
+  shall suppress additional content-transition motion without delaying input.
+
+### REQ-UI-MOBILE-CONFIRMATION-003: Stable action ownership
+
+**Intent:** Change presentation while preserving domain behavior and preventing
+stale or duplicate actions during overlay transitions.
+
+#### Acceptance criteria
+
+- **AC-UI-MOBILE-CONFIRMATION-003.1:** Opening, cancelling, dismissing, or changing
+  presentation shall perform no domain mutation. Explicit confirmation shall
+  invoke the captured target's existing action once, including rapid repeated
+  taps or keyboard activation.
+- **AC-UI-MOBILE-CONFIRMATION-003.2:** A removed or ineligible target, origin
+  unmount, or context change shall invalidate an unsubmitted request. Late
+  asynchronous results shall neither reopen it nor redirect it to another
+  task, session, file, or saved artifact.
+- **AC-UI-MOBILE-CONFIRMATION-003.3:** Archive confirmation shall preserve the
+  user's confirmation preference, default unchecked cascade selection,
+  descendant classification, bulk behavior, and existing post-archive
+  navigation. Disabled confirmation shall bypass every new surface and shall
+  not implicitly include subtasks.
+- **AC-UI-MOBILE-CONFIRMATION-003.4:** Archive shall expose no enabled submit
+  action while descendant classification is pending. Its known phone surface
+  shall remain stable while results arrive, and classification failure shall
+  retain the existing conservative confirmation behavior without inventing a
+  descendant count or silently enabling cascade.
+- **AC-UI-MOBILE-CONFIRMATION-003.5:** Each action shall preserve its existing
+  pending, close timing, error, rollback, and retry behavior. Terminal close
+  shall still remove local UI immediately and complete teardown in the
+  background. Presentation shall add no common transport spinner or toast.
+- **AC-UI-MOBILE-CONFIRMATION-003.6:** Existing eligibility and confirmation
+  controls shall remain effective, including protected/built-in saved views,
+  disabled actions, primary/only-session warnings, and typed/discard consent
+  in the retained full dialogs. Presentation shall grant no new capability.
+
+## Out of scope
+
+- Undo, cleanup/recovery changes, new confirmation preferences, API changes,
+  or new persistence and telemetry.
+- Redesigning desktop/tablet surfaces, general mobile menus, navigation, or
+  unrelated full dialogs.
+- Changing destructive text-entry tokens or expanding plugin APIs; bespoke
+  external-plugin UI remains owned by its repository.
+- Forcing every action to wait for transport completion or changing existing
+  failure feedback into a shared retry flow.
+
+## Design and delivery
+
+- [System design](../system-design/mobile-action-confirmations.md)
+- [Implementation plan](../../../plans/mobile-action-confirmations/plan.md)
+- [Compact sheet correction](../../../plans/mobile-confirmation-sheet-sizing/plan.md)
diff --git a/docs/specs/ui/requirements/saved-task-view-deletion-confirmation.md b/docs/specs/ui/requirements/saved-task-view-deletion-confirmation.md
index 56fc620d4d..e883e50437 100644
--- a/docs/specs/ui/requirements/saved-task-view-deletion-confirmation.md
+++ b/docs/specs/ui/requirements/saved-task-view-deletion-confirmation.md
@@ -2,6 +2,7 @@
 status: active
 system: ui
 created: 2026-09-06
+updated: 2026-09-10
 owners:
   - kandev
 ---
@@ -27,8 +28,11 @@ fallback, and failure recovery.
   DevOps UI that owns a saved task view and its delete action.
 - **Fine-pointer confirmation:** A compact confirmation anchored to the delete
   action that opened it.
-- **Coarse-pointer confirmation:** An in-place confirmation inside the current
-  drawer, sheet, menu, or editor.
+- **Phone confirmation:** A focused step in the current sheet/dialog or a
+  compact standalone bottom sheet, as specified by
+  [mobile action confirmations](mobile-action-confirmations.md).
+- **Tablet coarse-pointer confirmation:** An in-place confirmation inside the
+  current drawer, sheet, menu, or editor.
 
 ## Requirements
 
@@ -62,13 +66,15 @@ before deleting it, so that an accidental action does not discard my filters.
   because a view is built in, is the protected last view, or is temporarily
   disabled by an existing mutation shall remain unavailable and shall not open
   confirmation.
-- **AC-UI-SAVED-TASK-VIEW-DELETION-001.6:** With a fine pointer, confirmation
+- **AC-UI-SAVED-TASK-VIEW-DELETION-001.6:** Outside phone widths, with a fine pointer, confirmation
   shall be anchored to the initiating delete action, stay within the viewport,
   and keep its owning menu, popover, or editor available until the user decides.
-- **AC-UI-SAVED-TASK-VIEW-DELETION-001.7:** With a coarse pointer, confirmation
-  shall replace the relevant row or action region inside the existing surface.
-  It shall not stack another drawer, sheet, or modal, and its actions shall be
-  visible without hover and at least 44 by 44 CSS pixels.
+- **AC-UI-SAVED-TASK-VIEW-DELETION-001.7:** On phones, confirmation shall use a
+  focused step in an existing sheet/dialog or a compact bottom sheet from a
+  page. The saved-view row shall retain its normal geometry, and Cancel shall
+  restore the origin. Tablet coarse-pointer confirmation shall retain its
+  current in-place surface. Neither path shall stack modal surfaces, and both
+  shall expose actions without hover with at least 44-pixel touch targets.
 - **AC-UI-SAVED-TASK-VIEW-DELETION-001.8:** The delete trigger and confirmation
   shall be keyboard and screen-reader operable. The target name shall be
   programmatically available, Cancel shall receive initial confirmation focus,
diff --git a/docs/specs/ui/requirements/session-tab-delete-feedback.md b/docs/specs/ui/requirements/session-tab-delete-feedback.md
index d8d6ce6820..56283dc8f5 100644
--- a/docs/specs/ui/requirements/session-tab-delete-feedback.md
+++ b/docs/specs/ui/requirements/session-tab-delete-feedback.md
@@ -2,6 +2,7 @@
 status: active
 system: ui
 created: 2026-08-05
+updated: 2026-09-10
 owners:
   - kandev
 ---
@@ -21,7 +22,7 @@ Deleting an agent session from the task tab currently shows both a progress toas
 
 - **AC-UI-SESSION-TAB-DELETE-FEEDBACK-001.1:** Clicking the X on a deletable agent-session tab continues to open the existing delete confirmation dialog.
 - **AC-UI-SESSION-TAB-DELETE-FEEDBACK-001.2:** Choosing Delete from a desktop session context menu keeps that menu mounted and opens a compact, non-modal confirmation popover anchored to the Delete item. Cancelling or dismissing the popover leaves the session unchanged.
-- **AC-UI-SESSION-TAB-DELETE-FEEDBACK-001.3:** On phone, choosing Delete from a row in the Sessions picker morphs that row into touch-sized Cancel and Delete actions. It does not open another dialog or drawer. Cancelling, selecting another session, or closing the picker clears the pending confirmation without deleting.
+- **AC-UI-SESSION-TAB-DELETE-FEEDBACK-001.3:** On phone, choosing Delete from a Sessions picker row opens a focused confirmation step in the same picker, retaining the row's geometry. Cancel restores the picker; external context change or closing it clears the unsubmitted confirmation without deleting. Presentation follows [mobile action confirmations](mobile-action-confirmations.md).
 - **AC-UI-SESSION-TAB-DELETE-FEEDBACK-001.4:** Desktop and phone confirmation surfaces share the same conversation-deletion, workspace-retention, primary-session, and only-session warnings.
 - **AC-UI-SESSION-TAB-DELETE-FEEDBACK-001.5:** After the user confirms, the X is replaced in place by a compact circular indeterminate spinner matching the terminal-tab close action, not the grid-shaped activity spinner, until the delete request settles. The close action is non-interactive and exposed as busy while the request is pending.
 - **AC-UI-SESSION-TAB-DELETE-FEEDBACK-001.6:** X-initiated deletion does not show progress or success toasts.
@@ -49,9 +50,9 @@ hides the session context the user is acting on.
 - Choosing Delete from a desktop session context menu keeps that menu mounted and opens a compact,
   non-modal confirmation popover anchored to the Delete item. Cancelling or dismissing the popover
   leaves the session unchanged.
-- On phone, choosing Delete from a row in the Sessions picker morphs that row into touch-sized
-  Cancel and Delete actions. It does not open another dialog or drawer. Cancelling, selecting
-  another session, or closing the picker clears the pending confirmation without deleting.
+- On phone, choosing Delete opens a confirmation step in the existing Sessions
+  picker with full-width actions. Cancel restores the picker. External context
+  changes or closing the picker invalidate the unsubmitted request.
 - Desktop and phone confirmation surfaces share the same conversation-deletion,
   workspace-retention, primary-session, and only-session warnings.
 - After the user confirms, the X is replaced in place by a compact circular indeterminate spinner
@@ -99,11 +100,11 @@ hides the session context the user is acting on.
   confirmation popover stays anchored to that menu item without opening an alert dialog or starting
   deletion.
 - **GIVEN** a phone viewport, **WHEN** the user chooses Delete from a Sessions picker row, **THEN**
-  that row shows touch-sized inline Cancel and Delete actions without opening an alert dialog.
-- **GIVEN** a phone row has pending delete confirmation, **WHEN** the user closes the Sessions
+  the existing picker shows a dedicated confirmation step without a second modal.
+- **GIVEN** a phone picker has pending delete confirmation, **WHEN** the user closes the Sessions
   picker externally, **THEN** the pending confirmation is cleared and reopening the picker shows
   the normal row actions without dispatching deletion.
-- **GIVEN** a phone viewport, **WHEN** the user confirms deletion from the inline row actions,
+- **GIVEN** a phone viewport, **WHEN** the user confirms deletion from the picker confirmation step,
   **THEN** the selected session is removed and the remaining session stays reachable without
   relying on a desktop tab X.
 
@@ -111,5 +112,6 @@ hides the session context the user is acting on.
 
 - Removing or redesigning the tab-X delete confirmation dialog.
 - Changing backend session-deletion semantics, active-session selection, or Dockview reconciliation.
-- Changing the Sessions picker hierarchy, drawer, or non-delete row actions.
+- Changing Sessions picker hierarchy or non-delete row actions beyond hosting
+  the shared confirmation step.
 - Replacing feedback for context-menu, mobile, stop, or resume actions.
diff --git a/docs/specs/ui/requirements/terminal-close-feedback.md b/docs/specs/ui/requirements/terminal-close-feedback.md
index 35b0f834f0..1371456f15 100644
--- a/docs/specs/ui/requirements/terminal-close-feedback.md
+++ b/docs/specs/ui/requirements/terminal-close-feedback.md
@@ -2,6 +2,7 @@
 status: active
 system: ui
 created: 2026-08-14
+updated: 2026-09-10
 owners:
   - kandev
 ---
@@ -13,6 +14,11 @@ Closing a task terminal is a UI decision. Waiting for shell teardown after the u
 
 ## Requirements
 
+Phone presentation follows the planned
+[mobile action confirmation contract](mobile-action-confirmations.md).
+The immediate local dismissal and background teardown behavior here remains
+authoritative across every viewport.
+
 ### REQ-UI-TERMINAL-CLOSE-FEEDBACK-001: Terminal close feedback
 
 **Intent:** Closing a task terminal is a UI decision. Waiting for shell teardown after the user confirms leaves the terminal tab, content, or picker row on screen and makes the task surface feel blocked by backend cleanup that should be invisible.
@@ -20,12 +26,12 @@ Closing a task terminal is a UI decision. Waiting for shell teardown after the u
 #### Acceptance criteria
 
 - **AC-UI-TERMINAL-CLOSE-FEEDBACK-001.1:** Every action that permanently destroys a task terminal requires destructive confirmation before teardown starts. Cancelling leaves the terminal unchanged.
-- **AC-UI-TERMINAL-CLOSE-FEEDBACK-001.2:** Confirmation stays at the action locus instead of blocking the page: desktop and tablet use a compact popover anchored to the close control; the phone close control morphs into inline Cancel and Close terminal actions inside the existing terminal picker row.
-- **AC-UI-TERMINAL-CLOSE-FEEDBACK-001.3:** Dockview tab close and context-menu Terminate share the same anchored confirmation. Terminal rows inside the add-panel menu use that same close-anchored popover. Parked-terminal rows morph in place to inline Cancel and Close actions.
+- **AC-UI-TERMINAL-CLOSE-FEEDBACK-001.2:** Desktop and tablet use a compact popover anchored to the close control. Phone close uses a focused confirmation step in the terminal picker, retaining the row's geometry and restoring the picker on Cancel.
+- **AC-UI-TERMINAL-CLOSE-FEEDBACK-001.3:** Dockview tab close and context-menu Terminate share the same anchored confirmation. Terminal rows inside the non-phone add-panel menu use that same close-anchored popover. Non-phone parked-terminal rows retain inline Cancel and Close actions; phone rows use the shared mobile surface.
 - **AC-UI-TERMINAL-CLOSE-FEEDBACK-001.4:** The add-panel confirmation remains open while pointer movement returns focus to its owning menu, so the user can move from the row close control into the popover actions.
 - **AC-UI-TERMINAL-CLOSE-FEEDBACK-001.5:** On fine-pointer layouts, the add-panel terminal row keeps the standard compact menu-row height; its trailing close control does not make that row taller than adjacent entries. Coarse-pointer layouts retain a 44px row and close target.
 - **AC-UI-TERMINAL-CLOSE-FEEDBACK-001.6:** Task-terminal confirmation never uses a browser-native `confirm()` dialog.
-- **AC-UI-TERMINAL-CLOSE-FEEDBACK-001.7:** Terminal close confirmation never adds a page-level backdrop or full modal. Unrelated task UI remains available until the user confirms or dismisses the local confirmation.
+- **AC-UI-TERMINAL-CLOSE-FEEDBACK-001.7:** Non-phone terminal close confirmation shall retain its local non-modal behavior. Phone confirmation shall use one active sheet: reuse the open picker, or open a compact bottom sheet from a page after its menu closes.
 - **AC-UI-TERMINAL-CLOSE-FEEDBACK-001.8:** Confirming removes every local representation of the target immediately: the confirmation, terminal tab or picker row, mounted terminal content, and active selection.
 
 ## Migrated source detail
@@ -40,20 +46,19 @@ backend cleanup that should be invisible.
 
 - Every action that permanently destroys a task terminal requires destructive confirmation before
   teardown starts. Cancelling leaves the terminal unchanged.
-- Confirmation stays at the action locus instead of blocking the page: desktop and tablet use a
-  compact popover anchored to the close control; the phone close control morphs into inline Cancel
-  and Close terminal actions inside the existing terminal picker row.
+- Desktop and tablet use a compact popover anchored to the close control;
+  phone close opens a confirmation step inside the terminal picker.
 - Dockview tab close and context-menu Terminate share the same anchored confirmation. Terminal rows
-  inside the add-panel menu use that same close-anchored popover. Parked-terminal rows morph in
-  place to inline Cancel and Close actions.
+  inside the non-phone add-panel menu use that same close-anchored popover.
+  Non-phone parked-terminal rows retain inline Cancel and Close actions.
 - The add-panel confirmation remains open while pointer movement returns focus to its owning menu,
   so the user can move from the row close control into the popover actions.
 - On fine-pointer layouts, the add-panel terminal row keeps the standard compact menu-row height;
   its trailing close control does not make that row taller than adjacent entries. Coarse-pointer
   layouts retain a 44px row and close target.
 - Task-terminal confirmation never uses a browser-native `confirm()` dialog.
-- Terminal close confirmation never adds a page-level backdrop or full modal. Unrelated task UI
-  remains available until the user confirms or dismisses the local confirmation.
+- Non-phone confirmation stays local and non-modal. Phone confirmation uses
+  one sheet, reusing the picker when already open.
 - Confirming removes every local representation of the target immediately: the confirmation,
   terminal tab or picker row, mounted terminal content, and active selection.
 - The existing sibling-terminal fallback happens as part of that immediate local removal.
@@ -99,7 +104,7 @@ reconciliation retain their existing backend ownership and persistence behavior.
   and Close terminal actions remain reachable.
 - **GIVEN** an add-panel menu on a fine-pointer layout, **WHEN** terminal rows are rendered beside
   ordinary menu entries, **THEN** both use the same compact row height.
-- **GIVEN** a terminal row in the parked-terminal menu, **WHEN** the user activates its destructive
+- **GIVEN** a non-phone terminal row in the parked-terminal menu, **WHEN** the user activates its destructive
   action, **THEN** that row shows inline Cancel and Close actions.
 - **GIVEN** any task-terminal close request is pending, **WHEN** the user activates its close control
   again, **THEN** no second teardown request is sent.
@@ -110,11 +115,11 @@ reconciliation retain their existing backend ownership and persistence behavior.
 - **GIVEN** the close confirmation is open, **WHEN** the user cancels it, **THEN** no teardown starts
   and the terminal remains unchanged.
 - **GIVEN** a phone viewport with two task terminals, **WHEN** the user confirms a terminal close from
-  the terminal picker, **THEN** the inline confirmation, row, and mounted terminal disappear
+  the terminal picker, **THEN** the confirmation step, row, and mounted terminal disappear
   immediately and the sibling terminal remains reachable.
 - **GIVEN** a phone terminal, **WHEN** its close control is activated, **THEN**
-  that row replaces the close control with touch-sized Cancel and Close terminal actions without
-  opening another modal or drawer.
+  the picker shows a dedicated confirmation step with full-width actions;
+  Cancel restores the same picker state without opening another modal.
 - **GIVEN** a tablet viewport, **WHEN** terminal teardown is pending from the right-panel strip,
   **THEN** the target tab is already absent and the task layout remains usable.
 
@@ -124,8 +129,7 @@ reconciliation retain their existing backend ownership and persistence behavior.
 - Changing `user_shell.destroy`, PTY termination, terminal persistence, or active-tab fallback
   semantics.
 - Changing Quick Terminal tabs in Quick Chat or the terminal on Settings > Agents.
-- Generalizing localized confirmation into a repository-wide primitive before another concrete
-  consumer establishes the shared API.
+- Changing shared mobile presentation outside its owning confirmation contract.
 - Adding durable teardown jobs, cancellation controls, progress indicators, or success toasts.
 
 ## Implementation plan
diff --git a/docs/specs/ui/system-design/confirmation-warning-hierarchy.md b/docs/specs/ui/system-design/confirmation-warning-hierarchy.md
index 17a2c98926..42bdd36872 100644
--- a/docs/specs/ui/system-design/confirmation-warning-hierarchy.md
+++ b/docs/specs/ui/system-design/confirmation-warning-hierarchy.md
@@ -20,6 +20,11 @@ the task runtime contract.
 
 ## Requirement mapping
 
+Phone archive surface selection is now owned by the
+[mobile action confirmation design](mobile-action-confirmations.md). The
+popover and inline mechanics below remain the desktop/tablet contract. Cleanup
+content and full task-delete consent remain owned here.
+
 | Requirement                            | Design section                                                                                                                                                                                                                                                                                                    |
 | -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `REQ-TASKS-CONFIRMATION-WARNING-001`   | [Components and responsibilities](#components-and-responsibilities) and [Mobile and desktop containment](#mobile-and-desktop-containment)                                                                                                                                                                         |
@@ -65,10 +70,10 @@ policy into a visual component.
 
 ### Full-dialog composition
 
-`TaskArchiveConfirmDialog` and `TaskDeleteConfirmDialog` keep Radix
-`AlertDialog` and the existing centered inset surface. The current `size="lg"`
-phone width remains because prose benefits from the available line length and
-the primitive already preserves 16px viewport insets.
+`TaskDeleteConfirmDialog` keeps Radix `AlertDialog` and the existing centered
+inset surface, including `size="lg"` on phones. Archive shares its state and
+content across the existing non-phone alert and the new phone confirmation
+surface described in the mobile design.
 
 `TaskDeleteConfirmDialog` shows an unchecked discard selection only when fresh
 inspection finds dirty worktrees in the selected scope. Clean results hide the
@@ -105,21 +110,16 @@ notes and the existing still-working warning.
 
 ### Source-specific archive routing
 
-Archive presentation is selected by the source surface, not by coarse-pointer
-classification alone. The mobile Kanban card opts into the existing full
-`TaskArchiveConfirmDialog` through `TaskArchiveConfirmation`'s internal
-`forceDialog` presentation prop. This keeps the confirmation portaled over the
-board, so a virtualized card row does not grow when a zero-descendant task is
-being archived.
+Phone archive uses a confirmation step in an open owned surface, or a compact
+standalone bottom drawer from a page. This includes Kanban, task rows, direct
+archive-flow callers, bulk archive, and the phone command panel's owned step.
+The mobile branch precedes legacy `forceDialog`, `inline`, and pointer routing.
+Cards and rows do not grow while the confirmation is open.
 
-Fine-pointer desktop and compact-desktop Kanban retain the anchored
-`ActionConfirmPopover`. Coarse-pointer tablet Kanban retains its existing
-coarse-pointer routing, including the current inline zero-descendant surface.
-The task-switcher/task-row adapter may explicitly own the coarse-pointer inline
-confirmation, and command-panel callers that request `inline` retain their
-existing row-owned surface. These callers keep their established focus,
-containment, and action contracts; only the mobile Kanban card changes its
-surface selection.
+Fine-pointer desktop and compact-desktop retain the anchored popover;
+coarse-pointer tablet retains its inline zero-descendant surface. Non-phone
+command-panel callers retain explicit inline confirmation. The mobile design
+owns focus transfer, retained host content, and cancellation restoration.
 
 ### Classification-gated surface selection
 
@@ -147,9 +147,10 @@ ignores any late response, so a dismissed request cannot surface later. The
 controller mounts no role, action, or visual confirmation shell.
 
 Callers whose final presentation is already known keep their current behavior.
-Forced mobile Kanban and bulk operations may mount the full dialog immediately
-with its action disabled until classification settles. Explicit inline and
-coarse-pointer row confirmations retain their established loading treatment.
+Non-phone forced and bulk operations may mount the full dialog immediately
+with its action disabled until classification settles. Phone archive may mount
+its known mobile surface with the same disabled action. Tablet inline
+confirmations retain their established loading treatment.
 
 ### Popover width contract
 
@@ -170,9 +171,9 @@ determines where the already-created archive confirmation node mounts:
   the existing anchor wrapper. It does not pass `archiveConfirmation` into
   `TaskItem`, so `TaskItem` does not add its `flex-wrap` row branch or the
   `basis-full` action slot for a portaled popover.
-- Coarse-pointer confirmation continues to pass through `TaskItem`'s existing
-  inline action slot. Its intentional row expansion and mobile action geometry
-  remain unchanged.
+- Tablet coarse-pointer confirmation continues through `TaskItem`'s existing
+  inline action slot. Phone confirmation mounts beside the row and uses the
+  mobile host, leaving the origin row's geometry unchanged.
 
 Both branches reuse the same `useTaskSwitcherArchiveConfirmation` node,
 callbacks, anchor ref, and focus-return ref. No business logic or duplicate
@@ -210,13 +211,13 @@ The existing task-level `foregroundActivity` projection and explicit
 `isInFlight` props continue to determine whether the warning is rendered. The
 dialog computes the localized task outcome and cleanup model during render,
 then passes the model to the shared task-local renderer. Archive/delete
-callbacks and dialog state remain untouched. The source adapter supplies the
-existing `presentation` value and, for mobile Kanban only, maps it to
-`forceDialog`. For a standard fine-pointer request, descendant classification
-settles before the selected popover or dialog mounts. Pointer classification
-continues to select the fine-pointer popover or the explicitly inline row
-surface after that gate. This changes presentation timing only, not archive
-commands, descendant classification, preference state, or callbacks.
+callbacks and domain state remain unchanged. Phone sources choose the shared
+mobile surface before legacy `forceDialog` and explicit-inline selection.
+Outside phone widths, descendant classification settles before a standard
+fine-pointer request mounts its popover or dialog. Tablet coarse-pointer and
+explicit non-phone inline callers retain their current routing. The mobile
+design owns presentation and focus timing; archive commands, preference state,
+classification and callbacks retain their existing ownership.
 
 The delete dialog resets discard selection when it closes. On confirm, it sends
 the cascade and discard choices through the existing callback. A typed dirty
@@ -271,16 +272,14 @@ For a parent task, a delayed descendant-count response leaves the confirmation
 shell absent until classification settles; after release, only the full cascade
 dialog is rendered and the anchored popover never becomes visible.
 
-The phone Kanban check enters through a card overflow menu and expects the
-mobile presentation to use the full alert dialog even for a zero-descendant
-task. It records the card height before and during the dialog, verifies the
-centered/inset surface, stacked actions, cleanup copy, dark theme tokens, and
-zero document horizontal overflow, then cancels and repeats the existing
-archive callback flow. The card remains unchanged while the dialog is open.
+The phone Kanban check enters through a card overflow menu and expects an inset
+bottom confirmation even for a zero-descendant task. It retains stable card
+geometry, stacked actions, cleanup copy, theme contrast, cancellation/focus,
+and zero horizontal-overflow checks.
 
-The phone task-switcher check keeps the existing coarse-pointer sidebar inline
-flow. It expects that confirmation to remain intentionally row-owned, keeps
-actions at or above 44px, and asserts zero document horizontal overflow.
+The phone task-switcher check expects one confirmation step inside the same
+drawer, unchanged row geometry, and restoration of list state/scroll on Cancel.
+It asserts reachable actions, one active scroll owner, and no horizontal overflow.
 
 The task-delete phone check enters through the real task drawer action menu and
 opens Delete with a long task title and a longer bundled locale. After portal
diff --git a/docs/specs/ui/system-design/mobile-action-confirmations.md b/docs/specs/ui/system-design/mobile-action-confirmations.md
new file mode 100644
index 0000000000..ce399414f0
--- /dev/null
+++ b/docs/specs/ui/system-design/mobile-action-confirmations.md
@@ -0,0 +1,309 @@
+---
+status: current
+system: ui
+requirements:
+  - REQ-UI-MOBILE-CONFIRMATION-001
+  - REQ-UI-MOBILE-CONFIRMATION-002
+  - REQ-UI-MOBILE-CONFIRMATION-003
+created: 2026-09-10
+owners:
+  - kandev
+---
+
+# Mobile Action Confirmation System Design
+
+## Purpose and boundaries
+
+This design owns reusable phone confirmation presentation. Domain adapters
+continue to supply the target, current eligibility, localized consequences,
+options, and mutation callbacks. No backend, store schema, plugin SDK, archive
+policy, or recovery boundary changes.
+
+The accepted surface choice is recorded in
+[Mobile confirmation surfaces](../../../decisions/2026-09-10-mobile-confirmation-surfaces.md).
+The [task archive design](../../tasks/system-design/archive-confirmation.md)
+remains authoritative for preference and navigation;
+[task cleanup hierarchy](confirmation-warning-hierarchy.md) remains
+authoritative for cleanup copy and discard consent. Delivery is tracked in the
+[plan](../../../plans/mobile-action-confirmations/plan.md). The content-sized
+host correction is tracked in the
+[sheet sizing plan](../../../plans/mobile-confirmation-sheet-sizing/plan.md).
+
+## Requirement mapping
+
+| Requirement | Design sections |
+| --- | --- |
+| REQ-UI-MOBILE-CONFIRMATION-001 | Routing, hosted content, adoption boundaries |
+| REQ-UI-MOBILE-CONFIRMATION-002 | Mobile composition, accessibility, localization |
+| REQ-UI-MOBILE-CONFIRMATION-003 | Request lifetime, domain adapters, failure behavior |
+
+## Current implementation
+
+`InlineConfirmActions` inserts a `basis-full` description/action region into
+rows and can remove itself before invoking the owning callback.
+`TaskArchiveConfirmation` routes fine pointers to `ActionConfirmPopover` and
+coarse pointers to inline copy, with `TaskArchiveConfirmDialog` for cascade,
+bulk, or forced-dialog requests. Phone Kanban currently forces that alert.
+
+`SessionTaskSwitcherSheet` already owns an inset `Drawer`, its list state, and
+its scroll container. `MobilePickerSheet` owns the corresponding session and
+terminal picker shell. Their current rows keep their own confirmation state.
+Several settings and integration adapters share the same inline primitive.
+
+## Components and responsibilities
+
+Add application-owned components under `apps/web/components/confirmation/`:
+
+- `MobileConfirmationContent`: title, subject, accessible description,
+  optional domain content, and full-width footer. It receives action variant,
+  disabled state, test IDs, and callbacks; it knows no domain IDs or stores.
+- `MobileActionConfirmation`: controlled phone surface adapter. It uses the
+  nearest explicit host when available, otherwise the existing `@kandev/ui`
+  `Drawer`. It does not infer host ownership from DOM selectors.
+- `MobileConfirmationHost`: one locally scoped confirmation outlet inside an
+  existing drawer or centered form dialog. It preserves the origin subtree,
+  shows one active confirmation, and owns step cancellation and focus return.
+
+Names are implementation targets, not public APIs. Keep these small and
+composable; do not introduce an application-wide modal queue or persist React
+nodes in Zustand. Retain `InlineConfirmActions` and `ActionConfirmPopover` for
+existing non-phone consumers rather than changing their global semantics.
+
+### Routing
+
+Use `useResponsiveBreakpoint().isMobile` before pointer-specific routing.
+Phones remain phones with a mouse attached; 640-767px must not fall through the
+global menu CSS breakpoint. At 768px and wider, preserve each caller's existing
+fine/coarse-pointer behavior.
+
+| Origin | Phone destination | Cancellation destination |
+| --- | --- | --- |
+| Tasks drawer | Confirmation step in that drawer | Same task list, filters and scroll |
+| Session/terminal or saved-view drawer | Confirmation step in that drawer | Same picker/editor state |
+| Page or its transient menu/popover | Standalone compact Drawer after menu dismissal | Page and surviving trigger |
+| Inline action in a centered form dialog | Confirmation step in that dialog | Same unsubmitted form |
+| Existing full delete/discard/type-to-confirm alert | Existing alert | Existing behavior |
+
+For a menu inside a drawer, close only the menu and use the drawer host. For a
+page menu, move confirmation ownership outside its portaled children before
+closing it. An open confirmation must never be owned solely by an unmounted
+menu item. Use controlled menu dismissal and its close-autofocus completion,
+not a new fixed timeout, to transfer focus.
+
+### Hosted content
+
+The host belongs inside the existing `Drawer`/`Dialog` root and outside the
+origin content it may hide. Keep the list/form subtree mounted, hidden and
+inert while the confirmation outlet is active; the outlet is a sibling, never
+a descendant of that hidden subtree. Its source controls remain mounted, so
+row-local state and scroll offsets survive. A source-keyed registration plus
+a portal into the outlet can preserve the confirmation's owning React context.
+Register and clean up after commit, never update host state during render.
+
+The registration has one stable request token. Re-rendering descriptions or
+disabled state updates the same request rather than reopening it. Releasing an
+older request cannot remove a newer one. Unmount clears only its own token.
+There is one active request per host and no request queue.
+
+Update the host's accessible title/description references to the active step.
+Use one dialog/focus-trap boundary; do not insert another nested `role=dialog`
+or `Drawer` for hosted content. Keep a semantic labelled group inside it.
+Origin content contributes no active scroll region while hidden.
+
+Drawer hosts use content-sized confirmation geometry, including the Tasks,
+sidebar-filter, Threads, session, terminal, GitHub, and GitLab surfaces. The
+origin's regular height is restored on Cancel; it does not set a minimum height
+for the decision. Centered form/command dialog hosts retain their existing
+geometry. An explicit host surface kind distinguishes these compositions;
+never infer them by querying ancestor roles or change every `Drawer` globally.
+
+For an active drawer request, the host supplies content properties that override
+the origin's fixed height and the primitive's direction-specific height cap.
+Use intrinsic height, a `calc(100dvh - 1rem)` maximum and the existing bottom
+inset. Keep the header and action footer outside the body's internal scroller.
+The confirmation outlet alone participates in the active layout.
+The drawer root uses `overflow: clip` in both steps. Unlike `overflow: hidden`,
+this prevents focus or scroll-into-view from scrolling the shell itself and
+clipping the header while its bounds still appear correct. Inner origin/body
+scrollers retain normal scrolling. Initial Cancel focus uses `preventScroll`.
+
+Before hiding the origin, capture its rendered dimensions for that request.
+Keep it mounted, invisible and inert in an out-of-flow container with those
+dimensions while the compact step is active. Simply using `visibility:hidden`
+inside the shared grid still reserves the editor's height; removing its layout
+without preserving its dimensions can clamp nested scroll offsets. Release the
+temporary sizing with the request, restore normal flow, then return focus.
+Rotation recomputes visible containment without recreating the request.
+
+Reuse Vaul's bottom entry, swipe and dismissal behavior. Do not close and reopen
+the root merely to replay an entrance animation. Any hosted content transition
+is scoped, bottom-up and reduced-motion-aware; it must not compete with Vaul's
+outer transform, restart when copy changes, or delay action availability. No
+new detents, gesture navigation, global animation rules or dependencies are
+introduced.
+
+### Request lifetime and focus
+
+Capture a stable target key and initiating control before leaving a menu.
+Adapters retain existing domain validation, including target disappearance and
+pending eligibility changes. A disconnected menu node is not sufficient proof
+that a page-owned target disappeared; use the stable owner/target plus a
+surviving focus-return control.
+
+Cancel or header Back releases the active step, reveals the origin and then
+focuses its surviving trigger. If live data removed the trigger, focus the
+host's visible title or nearest valid control. Escape is handled in capture
+phase and stops propagation so it cannot also close the outer drawer. Swipe
+or backdrop dismissal closes the entire surface and invalidates its request.
+Route/context changes and crossing the phone breakpoint cancel unsubmitted
+requests. Rotation within phone widths only recomputes containment.
+
+Add a synchronous submit guard before closing any confirmation or invoking
+its callback. The event which opened the decision never submits it. A late
+classification result, rejected callback, or effect cleanup must not reopen
+an invalidated request. Reopening explicitly creates a fresh request token.
+
+## Domain adapters
+
+### Archive
+
+Use one archive state/content boundary for preference mode, descendant
+classification, cascade state, in-flight warnings, and cleanup consequences.
+Extract it from `TaskArchiveConfirmDialog` only as far as required for the
+existing alert and new mobile renderer to share it. Do not duplicate
+`useArchiveConfirmationMode`, `useSubtaskCountState`, or cleanup policy.
+
+Phone `TaskArchiveConfirmation` selects the mobile surface even when an older
+caller supplies `inline` or `forceDialog`. Direct full-dialog callers and
+`TaskArchiveConfirmFlow` also reach the same mobile renderer. The archive
+surface is known before classification, so it may show localized loading copy
+with the action disabled until the result settles. An error keeps the existing
+conservative full-content decision and does not pretend there are zero children.
+Desktop classification gating and tablet routing remain unchanged.
+
+Mount task-row confirmation beside the row, using the existing fine-pointer
+sibling pattern on phones too. In `SessionTaskSwitcherSheet`, host the request
+above the hidden list. Preserve `useSheetActions` navigation and
+`surfaceAction` close-on-confirm behavior: opening or cancelling a step must
+not call that wrapper. Single/bulk/cascade submissions keep the same values.
+
+The command panel's `CommandPanelConfirmation` is an existing owned
+confirmation region inside a dialog. On phones, use that dialog's focused
+step host; keep the command source mounted and restore its query on Cancel.
+Do not open a drawer under an already active command dialog. Its desktop
+explicit-inline behavior remains unchanged.
+
+`getCleanupSummary`, `getBulkCleanupSummary`, `TaskCleanupConsequences`, and
+`StillWorkingWarning` remain shared. Render the current domain-provided
+consequences; the screenshot is not an authority for branch-deletion policy.
+Archive's phone action uses the existing full-dialog default variant. Task
+delete and its discard selection remain in their existing centered alert.
+
+### Other inline consumers
+
+Adopt the adapter at each actual phone call site, supply a visible localized
+title and target, and keep the initiating row/trigger mounted. Do not promote
+an `aria-label` into visible copy by scraping the DOM.
+
+Session/terminal pickers use the `MobilePickerSheet` host. Saved-view filters,
+Threads, GitHub/GitLab filter sheets, and settings forms opt into the host at
+their existing shell. File rows and ordinary settings cards open standalone
+drawers; action menus hand off to a stable owner first. Walkthrough and plan
+history surfaces host a step when already inside a mobile drawer/dialog.
+
+Saved-view eligibility, exact captured IDs, default-marker isolation, and
+optimistic rollback stay in their current hooks. Session warnings remain
+shared with desktop. Full system alerts and explicit discard inputs are not
+replaced by this adapter.
+
+GitHub's `components/github/my-github/mobile-views-picker.tsx` hosts the compact
+confirmation inside its Views drawer. Its delayed save handoff still waits for
+the drawer to release focus. GitLab's `app/gitlab/gitlab-page-client.tsx` uses
+the presentation-only `components/integrations/integration-filters-sheet.tsx`:
+a bottom `Drawer` on phones and the existing right-hand `Sheet` above the phone
+boundary. Each phone picker and confirmation share one surface, with a fixed
+header and one scrollable list. Selection, default, save and delete handlers
+stay with each provider; retain their close timing and test IDs.
+
+## Mobile composition and accessibility
+
+Reuse the inset rounded geometry of `SessionTaskSwitcherSheet` and the fixed
+header/internal scroll pattern of `MobilePickerSheet`. Use existing theme
+tokens with a neutral surface, a 16-18px action title, and 14px readable body
+copy. Consequences precede quieter supporting notes; required warnings and
+options remain visible in the body. Avoid reusing selection color as warning
+background. Restrained transitions follow existing primitives and reduced
+motion; no stagger delays, new animation dependency, or decorative bounce.
+
+Use a `min-h-0 flex-1 overflow-y-auto overscroll-contain` body, a fixed header,
+and an action footer with `env(safe-area-inset-bottom)` clearance. Cap the
+surface using dynamic viewport units and preserve top/side insets. The footer
+orders the semantic primary action above Cancel, both full-width with a 48px
+target height. Apply these sizes only to phone composition.
+
+Cancel receives initial focus. Centered form/command `DialogContent` hosts
+disable their existing `enterConfirms` option while a phone confirmation step
+is active. Phone destructive actions have no implicit Enter default; focused
+buttons retain normal Enter/Space activation. Archive
+also uses explicit button activation on the new phone surface. Existing
+desktop alert Enter behavior remains in the base UI package. Label controls,
+announce the active step, and keep the hidden origin outside the accessibility
+tree. Give active title/description references unique IDs even when the hidden
+origin includes a primitive title; never mount two elements with the same ID.
+Verify touch hit-testing, not just CSS dimensions.
+
+All new copy belongs to existing domain namespaces or `common`, uses `t()` or
+`Trans`, and ships in `en`, `pt-pt`, `zh-cn`, generated `zh-hk`/`zh-tw`, and
+generated `pseudo`. Keep comparison tokens untranslated. Prefer existing
+localized titles/labels and current cleanup copy to unnecessary wording changes.
+
+## Failure, persistence, and security
+
+Presentation does not take ownership of domain transport. Preserve each
+caller's close-before-dispatch, awaited, or optimistic behavior explicitly in
+its adapter. In particular terminal close still removes local state before
+teardown and shows only its existing error notification on failure; it does
+not restore the terminal or display a shared spinner. A caller that keeps its
+form open for retry continues to do so, scoped to its current request token.
+The adapter defaults to `completionPolicy="close-before-dispatch"`. Workflow
+sync removal opts into `"await-with-retry"`: a fulfilled callback dismisses the
+step, while rejection releases the submit guard without discarding the form.
+The controller retains its existing error feedback. Unmount, target changes,
+or parent closure invalidate completion handling for the old request.
+
+The shared shell neither invents success/rollback behavior nor suppresses a
+domain error. Existing pending state disables confirmation; ordinary Cancel
+remains available unless the owner already prevents dismissal during execution.
+The submit guard supplements, not replaces, domain in-flight guards.
+
+All presentation state is ephemeral. No database, user-setting, remote API,
+permission, plugin contract, or logging changes. Existing archive preference,
+task navigation, worktree discard consent, and terminal teardown contracts
+remain authoritative.
+
+## Verification
+
+Component tests cover host lifetime, preserved origin state, focus, captured
+targets, route/breakpoint cancellation, stale registration cleanup, callback
+ordering, disabled/duplicate submission, and rejection after dismissal.
+
+Each adoption work order owns mobile Playwright scenarios for its real entry
+points and the existing desktop regression command. The shared geometry checks
+cover 320px, configured Pixel 5, 767px, and landscape phone widths; a separate
+coarse-pointer 768px case proves the unchanged tablet boundary. Long names,
+Portuguese/pseudo copy, dark/light themes, safe-area padding, finite animation
+settlement, one active scroll owner, focus return, and horizontal overflow are
+tested on the active surface. Desktop and phone projects run separately through
+the managed runner with a fresh production build.
+
+Hosted geometry checks must assert the short confirmation's actual bounds and
+copy-to-footer spacing, not merely dialog presence or a height equal to the
+editor. Use the saved Threads view deletion as the compact regression fixture;
+also assert restoration of the original dimensions, draft, scroll and focus.
+Exercise the fixed-height Tasks/filter hosts and the intrinsically sized
+session/terminal pickers. GitHub/GitLab cases must assert bottom direction in
+addition to deletion and selection/default isolation.
+
+Capture and inspect the Tasks confirmation, standalone archive, and one
+non-task sheet using the focused E2E fixtures. Public instructions change with
+implementation, not in this design-only turn.
diff --git a/docs/specs/ui/system-design/saved-task-view-deletion-confirmation.md b/docs/specs/ui/system-design/saved-task-view-deletion-confirmation.md
index ca5451e63d..bb6631a810 100644
--- a/docs/specs/ui/system-design/saved-task-view-deletion-confirmation.md
+++ b/docs/specs/ui/system-design/saved-task-view-deletion-confirmation.md
@@ -1,6 +1,7 @@
 ---
 status: current
 system: ui
+updated: 2026-09-10
 requirements:
   - REQ-UI-SAVED-TASK-VIEW-DELETION-001
 ---
@@ -27,6 +28,14 @@ second saved-view source of truth.
 
 ## Surface inventory
 
+The planned [mobile action confirmation design](mobile-action-confirmations.md)
+owns phone presentation, including phones with a fine pointer. On phones,
+`SavedTaskViewDeleteConfirmation` renders through the shared mobile adapter;
+drawer/dialog owners supply a host, and transient menus transfer to a stable
+owner before closing. The `popover`/`inline` API and row replacement mechanics
+below remain the non-phone implementation contract. Phone saved rows retain
+their geometry, and hidden host content preserves scroll and editor state.
+
 | Owning surface | Existing delete entry | Existing mutation boundary |
 | --- | --- | --- |
 | Task sidebar | Active-view actions in `ViewHeaderRow` | `deleteSidebarView` |
@@ -101,16 +110,15 @@ or user-authored label already rendered by that surface.
   GitHub, GitLab, and Azure DevOps. The shared dropdown stays mounted around a
   fine-pointer confirmation; its coarse-pointer row becomes the inline surface.
 - GitHub and GitLab `PresetsSidebar` components keep their mobile-sheet
-  candidate local and replace only that saved-query row. Their delete actions
+  candidate local and display a confirmation step in that sheet. Their delete actions
   remain separate from row selection and GitHub's default marker.
 - Jira `ViewsDropdown` coordinates custom saved-view rows. Built-in rows never
   create a candidate. Its parent popover uses the same confirmation-boundary
   handling as the shared scope-bar menu.
 
-The task sidebar, Threads, integration scope bar, and Jira adapters read pointer
-mode from `useResponsiveBreakpoint`. GitHub and GitLab mobile sidebars always
-use the coarse-pointer inline presentation because their Kandev-owned mount is
-the phone filter sheet.
+The task sidebar, Threads, integration scope bar, and Jira adapters select the
+phone surface before reading pointer mode from `useResponsiveBreakpoint`.
+GitHub and GitLab mobile filter sheets provide an explicit confirmation host.
 
 ## Data and contracts
 
@@ -134,8 +142,8 @@ mounted.
 1. The owning surface evaluates its existing eligibility and pending rules.
 2. Activating an available delete trigger records the target and anchor. It
    prevents row selection or default-toggle events and performs no mutation.
-3. A fine pointer opens the anchored confirmation. A coarse pointer replaces
-   the relevant row or action region inside its existing parent surface.
+3. A phone opens the shared mobile step. Outside phone widths, a fine pointer
+   opens the anchored confirmation and a coarse pointer retains inline content.
 4. Cancel, Escape, parent dismissal, target disappearance, view switching, or
    unmount clears the candidate without invoking the delete callback.
 5. Explicit Delete first closes the confirmation, then invokes the owning
@@ -155,12 +163,13 @@ viewport-contained non-modal popover anchored to the trigger. Its parent
 dropdown or popover stays mounted while focus moves between the two surfaces,
 and Cancel restores focus to the connected trigger.
 
-Coarse-pointer triggers and both confirmation actions use a minimum 44-pixel
+Tablet coarse-pointer triggers and both confirmation actions use a minimum 44-pixel
 hit area and are visible without hover. Inline content wraps long translated
 copy and names without widening its parent. It remains inside the current
 drawer, sheet, dropdown bottom sheet, or editor, so no second modal navigation
 layer is introduced. The existing parent remains the sole vertical scroll
-owner and keeps its current safe-area padding.
+owner and keeps its current safe-area padding. Phone hosts instead reveal only
+the focused confirmation step, as specified in the linked mobile design.
 
 The confirmation is exposed as a named group or dialog. Cancel receives initial
 focus. Escape is a cancellation path, the destructive action is not an implicit