From c5f18d1616fcef8c140479c389f39e3dbc9dde36 Mon Sep 17 00:00:00 2001 From: Aarav Sareen <96787824+arvsrn@users.noreply.github.com> Date: Mon, 16 Nov 2026 17:37:20 +0530 Subject: [PATCH] fix(app): confirm before disconnecting providers or removing accounts in settings (#64212) --- packages/app/e2e/regression/settings.spec.ts | 13 +++ packages/app/src/runtime/i18n/en.ts | 11 +++ .../app/src/settings/providers/providers.tsx | 96 ++++++++++++++++--- 3 files changed, 105 insertions(+), 15 deletions(-) diff --git a/packages/app/e2e/regression/settings.spec.ts b/packages/app/e2e/regression/settings.spec.ts index 5ece2fbfd7e..455f6750791 100644 --- a/packages/app/e2e/regression/settings.spec.ts +++ b/packages/app/e2e/regression/settings.spec.ts @@ -2251,8 +2251,17 @@ test("providers: the account options rename and remove the active account", asyn await settings.getByRole("tab", { name: "Providers", exact: true }).click() await expect(trigger).toHaveText("Shared") + const confirm = page.getByRole("dialog", { name: "Remove Shared?", exact: true }) await settings.getByRole("button", { name: "Shared options", exact: true }).click() await page.getByRole("menuitem", { name: "Remove", exact: true }).click() + await confirm.getByRole("button", { name: "Cancel", exact: true }).click() + await expect(confirm).toBeHidden() + await expect(trigger).toHaveText("Shared") + expect(removed).toEqual([]) + + await settings.getByRole("button", { name: "Shared options", exact: true }).click() + await page.getByRole("menuitem", { name: "Remove", exact: true }).click() + await confirm.getByRole("button", { name: "Remove", exact: true }).click() await expect.poll(() => removed).toEqual(["cred_work"]) }) @@ -2269,6 +2278,10 @@ test("providers: a disconnect that finds no stored credentials keeps the provide await expect(connected.getByText("OpenRouter", { exact: true })).toBeVisible() await disconnect.click() + await page + .getByRole("dialog", { name: "Disconnect OpenRouter?", exact: true }) + .getByRole("button", { name: "Disconnect", exact: true }) + .click() await expect(page.getByText("No removable credentials found for OpenRouter", { exact: true })).toBeVisible() await expect(connected.getByText("OpenRouter", { exact: true })).toBeVisible() await expect(disconnect).toBeVisible() diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts index d9f2fb404a2..559f18c7451 100644 --- a/packages/app/src/runtime/i18n/en.ts +++ b/packages/app/src/runtime/i18n/en.ts @@ -1246,6 +1246,17 @@ export const dict = { "settings.providers.account.switched.description": "Now using {{account}}.", "settings.providers.account.removed.title": "{{account}} removed", "settings.providers.account.removed.description": "{{provider}} will no longer use this account.", + "settings.providers.account.remove.title": "Remove {{account}}?", + "settings.providers.account.remove.description": "{{provider}} will no longer use this account.", + "settings.providers.account.remove.finalDescription": + "This is your only {{provider}} account, so {{provider}} will be disconnected.", + "settings.providers.disconnect.title": "Disconnect {{provider}}?", + "settings.providers.disconnect.description": + "Its saved credentials will be removed and its models will no longer be available.", + "settings.providers.disconnect.consoleDescription.one": + "Your sign-in will be removed and {{count}} provider from {{workspace}} will no longer be available.", + "settings.providers.disconnect.consoleDescription.other": + "Your sign-in will be removed and {{count}} providers from {{workspace}} will no longer be available.", "settings.providers.console.available.one": "{{count}} provider available", "settings.providers.console.available.other": "{{count}} providers available", "settings.providers.section.popular": "Popular providers", diff --git a/packages/app/src/settings/providers/providers.tsx b/packages/app/src/settings/providers/providers.tsx index 6bc7d59aa58..014cb287158 100644 --- a/packages/app/src/settings/providers/providers.tsx +++ b/packages/app/src/settings/providers/providers.tsx @@ -1,6 +1,7 @@ import { Button } from "@opencode/ui/button" import { Badge } from "@opencode/ui/badge" import { useDialog } from "@opencode/ui/context/dialog" +import { Dialog, DialogFooter, DialogHeader, DialogTitleGroup } from "@opencode/ui/dialog" import { Icon } from "@opencode/ui/icon" import { IconButton } from "@opencode/ui/icon-button" import { Menu } from "@opencode/ui/menu" @@ -298,13 +299,30 @@ export const SettingsProviders: Component<{ const note = (id: string) => PROVIDER_NOTES.find((item) => item.match(id))?.key const disconnect = (item: ProviderItem, name: string) => { - const group = consoleGroup() - dispatch({ - type: "disconnect.requested", - providerIDs: group?.root.id === item.id ? group.providers.map((provider) => provider.id) : [item.id], - integrationID: item.integrationID ?? item.id, - providerName: name, - }) + const group = consoleGroup()?.root.id === item.id ? consoleGroup() : undefined + + void dialog.push(() => ( + 1 + ? language.plural("settings.providers.disconnect.consoleDescription", group.providers.length, { + count: group.providers.length, + workspace: group.workspace, + }) + : language.t("settings.providers.disconnect.description") + } + action={language.t("common.disconnect")} + onConfirm={() => + dispatch({ + type: "disconnect.requested", + providerIDs: group ? group.providers.map((provider) => provider.id) : [item.id], + integrationID: item.integrationID ?? item.id, + providerName: name, + }) + } + /> + )) } const activate = (provider: ProviderItem, providerName: string, account: ProviderAccount) => @@ -318,14 +336,29 @@ export const SettingsProviders: Component<{ }) const remove = (provider: ProviderItem, providerName: string, account: ProviderAccount) => - dispatch({ - type: "account.remove.requested", - integrationID: provider.integrationID ?? provider.id, - providerName, - account, - final: providerAccounts(integration(provider)).length === 1, - catalog: untrack(available), - }) + void dialog.push(() => ( + + dispatch({ + type: "account.remove.requested", + integrationID: provider.integrationID ?? provider.id, + providerName, + account, + final: providerAccounts(integration(provider)).length === 1, + catalog: untrack(available), + }) + } + /> + )) function AccountMenu(menuProps: { provider: ProviderItem; name?: string }) { const accounts = () => providerAccounts(integration(menuProps.provider)) @@ -634,3 +667,36 @@ export const SettingsProviders: Component<{ ) } + +// The row leaves the list as soon as the removal starts, so the dialog closes before the request settles. +function DialogConfirmProviderRemoval(props: { + title: string + description: string + action: string + onConfirm: () => void +}) { + const dialog = useDialog() + const language = useLanguage() + + const confirm = () => { + if (dialog.closing) return + dialog.close() + props.onConfirm() + } + + return ( + + + + + + + + + + ) +}