oc-codex-multi-auth 6.7.1 → 6.8.1

package/dist/lib/tools/codex-label.js

@@ -3,7 +3,7 @@
  * Extracted from `index.ts` per RC-1 Phase 2.
  */
 import { tool } from "@opencode-ai/plugin/tool";
-import { loadAccounts, saveAccounts } from "../storage.js";
+import { loadAccounts, withAccountStorageTransaction } from "../storage.js";
 import { AccountManager } from "../accounts.js";
 import { logWarn } from "../logger.js";
 import { formatUiHeader, formatUiItem, formatUiKeyValue, } from "../ui/format.js";
@@ -23,8 +23,12 @@ export function createCodexLabelTool(ctx) {
         async execute({ index, label }) {
             const ui = resolveUiRuntime();
             const maskEmail = resolveMaskEmail();
-            const storage = await loadAccounts();
-            if (!storage || storage.accounts.length === 0) {
+            // Read-only snapshot for the "no accounts" / interactive-picker UX.
+            // The actual mutate+save runs inside withAccountStorageTransaction
+            // below against a freshly re-read snapshot so a concurrent save
+            // between this read and the eventual persist can't be clobbered.
+            const initialStorage = await loadAccounts();
+            if (!initialStorage || initialStorage.accounts.length === 0) {
                 if (ui.v2Enabled) {
                     return [
                         ...formatUiHeader(ui, "Set account label"),
@@ -37,7 +41,7 @@ export function createCodexLabelTool(ctx) {
             }
             let resolvedIndex = index;
             if (resolvedIndex === undefined) {
-                const selectedIndex = await promptAccountIndexSelection(ui, storage, "Set account label");
+                const selectedIndex = await promptAccountIndexSelection(ui, initialStorage, "Set account label");
                 if (selectedIndex === null) {
                     if (supportsInteractiveMenus()) {
                         if (ui.v2Enabled) {
@@ -62,64 +66,86 @@ export function createCodexLabelTool(ctx) {
                 }
                 resolvedIndex = selectedIndex + 1;
             }
-            const targetIndex = Math.floor((resolvedIndex ?? 0) - 1);
-            if (!Number.isFinite(targetIndex) ||
-                targetIndex < 0 ||
-                targetIndex >= storage.accounts.length) {
+            const normalizedLabel = (label ?? "").trim().replace(/\s+/g, " ");
+            if (normalizedLabel.length > 60) {
                 if (ui.v2Enabled) {
                     return [
                         ...formatUiHeader(ui, "Set account label"),
                         "",
-                        formatUiItem(ui, `Invalid account number: ${resolvedIndex}`, "danger"),
-                        formatUiKeyValue(ui, "Valid range", `1-${storage.accounts.length}`, "muted"),
+                        formatUiItem(ui, "Label is too long (max 60 characters).", "danger"),
                     ].join("\n");
                 }
-                return `Invalid account number: ${resolvedIndex}\n\nValid range: 1-${storage.accounts.length}`;
+                return "Label is too long (max 60 characters).";
             }
-            const normalizedLabel = (label ?? "").trim().replace(/\s+/g, " ");
-            if (normalizedLabel.length > 60) {
+            const outcome = await withAccountStorageTransaction(async (current, persist) => {
+                const storage = current;
+                const accounts = storage?.accounts ?? [];
+                const targetIndex = (resolvedIndex ?? 0) - 1;
+                if (!Number.isInteger(targetIndex) ||
+                    targetIndex < 0 ||
+                    targetIndex >= accounts.length) {
+                    return { kind: "invalid", accountCount: accounts.length };
+                }
+                const account = accounts[targetIndex];
+                if (!account || !storage) {
+                    return { kind: "not-found" };
+                }
+                const previousLabel = account.accountLabel?.trim() ?? "";
+                if (normalizedLabel.length === 0) {
+                    delete account.accountLabel;
+                }
+                else {
+                    account.accountLabel = normalizedLabel;
+                }
+                try {
+                    await persist(storage);
+                }
+                catch (saveError) {
+                    logWarn("Failed to save account label update", {
+                        error: String(saveError),
+                    });
+                    return { kind: "save-failed" };
+                }
+                const accountLabel = formatCommandAccountLabel(account, targetIndex, {
+                    maskEmail,
+                });
+                return { kind: "ok", accountLabel, previousLabel };
+            });
+            if (outcome.kind === "invalid") {
                 if (ui.v2Enabled) {
                     return [
                         ...formatUiHeader(ui, "Set account label"),
                         "",
-                        formatUiItem(ui, "Label is too long (max 60 characters).", "danger"),
+                        formatUiItem(ui, `Invalid account number: ${resolvedIndex}`, "danger"),
+                        formatUiKeyValue(ui, "Valid range", `1-${outcome.accountCount}`, "muted"),
                     ].join("\n");
                 }
-                return "Label is too long (max 60 characters).";
+                return `Invalid account number: ${resolvedIndex}\n\nValid range: 1-${outcome.accountCount}`;
             }
-            const account = storage.accounts[targetIndex];
-            if (!account) {
+            if (outcome.kind === "not-found") {
                 return `Account ${resolvedIndex} not found.`;
             }
-            const previousLabel = account.accountLabel?.trim() ?? "";
-            if (normalizedLabel.length === 0) {
-                delete account.accountLabel;
-            }
-            else {
-                account.accountLabel = normalizedLabel;
-            }
-            try {
-                await saveAccounts(storage);
-            }
-            catch (saveError) {
-                logWarn("Failed to save account label update", {
-                    error: String(saveError),
-                });
+            if (outcome.kind === "save-failed") {
+                // The transaction only mutated its in-memory snapshot; the
+                // persist() call that would have made the label change durable
+                // threw, so the label was never actually updated. Wording must
+                // not imply it was (matches the codex-switch/-remove fix for
+                // the same pattern).
                 if (ui.v2Enabled) {
                     return [
                         ...formatUiHeader(ui, "Set account label"),
                         "",
-                        formatUiItem(ui, "Label updated in memory but failed to persist.", "danger"),
+                        formatUiItem(ui, `Failed to set label for account ${resolvedIndex}: account storage could not be updated.`, "danger"),
                     ].join("\n");
                 }
-                return "Label updated in memory but failed to persist. Changes may be lost on restart.";
+                return `Failed to set label for account ${resolvedIndex}: account storage could not be updated.`;
             }
             if (cachedAccountManagerRef.current) {
                 const reloadedManager = await AccountManager.loadFromDisk();
                 cachedAccountManagerRef.current = reloadedManager;
                 accountManagerPromiseRef.current = Promise.resolve(reloadedManager);
             }
-            const accountLabel = formatCommandAccountLabel(account, targetIndex, { maskEmail });
+            const { accountLabel, previousLabel } = outcome;
             if (ui.v2Enabled) {
                 const statusText = normalizedLabel.length === 0
                     ? `Cleared label for ${accountLabel}`

package/dist/lib/tools/codex-label.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-label.js","sourceRoot":"","sources":["../../../lib/tools/codex-label.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-label.js","sourceRoot":"","sources":["../../../lib/tools/codex-label.ts"],"names":[],"mappings":"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"}

package/dist/lib/tools/codex-limits.js

@@ -162,8 +162,11 @@ export function createCodexLimitsTool(ctx) {
                     });
                     if (ui.v2Enabled) {
                         lines.push(formatUiItem(ui, `${displayLabel}${activeSuffix}`));
-                        lines.push(`  ${formatUiKeyValue(ui, formatUsageLimitTitle(usage.primary.windowMinutes), formatUsageLimitSummary(usage.primary), "muted")}`);
-                        lines.push(`  ${formatUiKeyValue(ui, formatUsageLimitTitle(usage.secondary.windowMinutes), formatUsageLimitSummary(usage.secondary), "muted")}`);
+                        for (const window of [usage.primary, usage.secondary]) {
+                            if (!hasUsageWindow(window))
+                                continue;
+                            lines.push(`  ${formatUiKeyValue(ui, formatUsageLimitTitle(window.windowMinutes), formatUsageLimitSummary(window), "muted")}`);
+                        }
                         if (hasUsageWindow(usage.codeReview)) {
                             lines.push(`  ${formatUiKeyValue(ui, "Code review", formatUsageLimitSummary(usage.codeReview), "muted")}`);
                         }
@@ -179,8 +182,11 @@ export function createCodexLimitsTool(ctx) {
                     }
                     else {
                         lines.push(`${displayLabel}${activeSuffix}:`);
-                        lines.push(`  ${formatUsageLimitTitle(usage.primary.windowMinutes)}: ${formatUsageLimitSummary(usage.primary)}`);
-                        lines.push(`  ${formatUsageLimitTitle(usage.secondary.windowMinutes)}: ${formatUsageLimitSummary(usage.secondary)}`);
+                        for (const window of [usage.primary, usage.secondary]) {
+                            if (!hasUsageWindow(window))
+                                continue;
+                            lines.push(`  ${formatUsageLimitTitle(window.windowMinutes)}: ${formatUsageLimitSummary(window)}`);
+                        }
                         if (hasUsageWindow(usage.codeReview)) {
                             lines.push(`  Code review: ${formatUsageLimitSummary(usage.codeReview)}`);
                         }

package/dist/lib/tools/codex-limits.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-limits.js","sourceRoot":"","sources":["../../../lib/tools/codex-limits.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-limits.js","sourceRoot":"","sources":["../../../lib/tools/codex-limits.ts"],"names":[],"mappings":"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"}

package/dist/lib/tools/codex-refresh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-refresh.d.ts","sourceRoot":"","sources":["../../../lib/tools/codex-refresh.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAKrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,CAqFvE"}
+{"version":3,"file":"codex-refresh.d.ts","sourceRoot":"","sources":["../../../lib/tools/codex-refresh.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAKrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAoE9C,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,CAoIvE"}

package/dist/lib/tools/codex-refresh.js

@@ -3,10 +3,38 @@
  * Extracted from `index.ts` per RC-1 Phase 2.
  */
 import { tool } from "@opencode-ai/plugin/tool";
-import { loadAccounts, saveAccounts } from "../storage.js";
+import { loadAccounts, withAccountStorageTransaction } from "../storage.js";
 import { AccountManager } from "../accounts.js";
 import { queuedRefresh } from "../refresh-queue.js";
 import { formatUiHeader, formatUiItem, paintUiText } from "../ui/format.js";
+/**
+ * Finds the index of the account matching `identity` in `accounts`, using
+ * the same organizationId -> accountId -> refreshToken priority order the
+ * storage layer's dedup/identity helpers use elsewhere (see
+ * `lib/storage/identity.ts`). Kept local rather than importing the shared
+ * helper because the barrel does not currently re-export it.
+ */
+function findAccountIndexByIdentity(accounts, identity) {
+    const organizationId = identity.organizationId?.trim();
+    if (organizationId) {
+        const idx = accounts.findIndex((a) => a.organizationId?.trim() === organizationId);
+        if (idx >= 0)
+            return idx;
+    }
+    const accountId = identity.accountId?.trim();
+    if (accountId) {
+        const idx = accounts.findIndex((a) => a.accountId?.trim() === accountId);
+        if (idx >= 0)
+            return idx;
+    }
+    const refreshToken = identity.refreshToken?.trim();
+    if (refreshToken) {
+        const idx = accounts.findIndex((a) => a.refreshToken?.trim() === refreshToken);
+        if (idx >= 0)
+            return idx;
+    }
+    return -1;
+}
 export function createCodexRefreshTool(ctx) {
     const { resolveUiRuntime, formatCommandAccountLabel, resolveMaskEmail, getStatusMarker, cachedAccountManagerRef, accountManagerPromiseRef, } = ctx;
     return tool({
@@ -32,17 +60,36 @@ export function createCodexRefreshTool(ctx) {
                 : [`Refreshing ${storage.accounts.length} account(s):`, ""];
             let refreshedCount = 0;
             let failedCount = 0;
+            // Collected here, applied to a freshly re-read snapshot in a single
+            // transaction after all (network-bound, multi-second) refreshes
+            // complete -- see the module doc comment on RefreshOutcome. Holding
+            // the storage lock across queuedRefresh calls would block every
+            // other tool/rotation for the full duration of this loop, and
+            // mutating `storage` in place and saving it at the end (the old
+            // behavior) silently clobbered any rate-limit/cooldown/activeIndex
+            // state a concurrent rotation persisted while this loop was running.
+            const refreshedAccounts = [];
             for (let i = 0; i < storage.accounts.length; i++) {
                 const account = storage.accounts[i];
                 if (!account)
                     continue;
                 const label = formatCommandAccountLabel(account, i, { maskEmail });
+                const identity = {
+                    organizationId: account.organizationId,
+                    accountId: account.accountId,
+                    refreshToken: account.refreshToken,
+                };
                 try {
                     const refreshResult = await queuedRefresh(account.refreshToken);
                     if (refreshResult.type === "success") {
-                        account.refreshToken = refreshResult.refresh;
-                        account.accessToken = refreshResult.access;
-                        account.expiresAt = refreshResult.expires;
+                        const rotated = refreshResult.refresh !== account.refreshToken;
+                        refreshedAccounts.push({
+                            identity,
+                            refreshToken: refreshResult.refresh,
+                            accessToken: refreshResult.access,
+                            expiresAt: refreshResult.expires,
+                            rotatedAt: rotated ? Date.now() : undefined,
+                        });
                         results.push(`  ${getStatusMarker(ui, "ok")} ${label}: Refreshed`);
                         refreshedCount++;
                     }
@@ -57,7 +104,35 @@ export function createCodexRefreshTool(ctx) {
                     failedCount++;
                 }
             }
-            await saveAccounts(storage);
+            if (refreshedAccounts.length > 0) {
+                await withAccountStorageTransaction(async (current, persist) => {
+                    if (!current)
+                        return;
+                    for (const outcome of refreshedAccounts) {
+                        const idx = findAccountIndexByIdentity(current.accounts, outcome.identity);
+                        if (idx < 0)
+                            continue; // Account removed concurrently; nothing to apply.
+                        const target = current.accounts[idx];
+                        if (!target)
+                            continue;
+                        // The refresh was keyed off `outcome.identity.refreshToken` (the
+                        // pre-refresh value). If the on-disk refreshToken no longer
+                        // matches it, another process rotated this account mid-flight
+                        // while our (network-bound) refresh was in progress -- we
+                        // cannot know which resulting chain is the live one, so skip
+                        // rather than clobber whatever that other process wrote.
+                        if (target.refreshToken !== outcome.identity.refreshToken)
+                            continue;
+                        target.refreshToken = outcome.refreshToken;
+                        target.accessToken = outcome.accessToken;
+                        target.expiresAt = outcome.expiresAt;
+                        if (outcome.rotatedAt !== undefined) {
+                            target.tokenRotatedAt = outcome.rotatedAt;
+                        }
+                    }
+                    await persist(current);
+                });
+            }
             if (cachedAccountManagerRef.current) {
                 const reloadedManager = await AccountManager.loadFromDisk();
                 cachedAccountManagerRef.current = reloadedManager;

package/dist/lib/tools/codex-refresh.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-refresh.js","sourceRoot":"","sources":["../../../lib/tools/codex-refresh.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-refresh.js","sourceRoot":"","sources":["../../../lib/tools/codex-refresh.ts"],"names":[],"mappings":"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"}

package/dist/lib/tools/codex-remove.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-remove.d.ts","sourceRoot":"","sources":["../../../lib/tools/codex-remove.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAWrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,CA+OtE"}
+{"version":3,"file":"codex-remove.d.ts","sourceRoot":"","sources":["../../../lib/tools/codex-remove.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAWrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,CA8RtE"}

package/dist/lib/tools/codex-remove.js

@@ -3,7 +3,7 @@
  * Extracted from `index.ts` per RC-1 Phase 2.
  */
 import { tool } from "@opencode-ai/plugin/tool";
-import { loadAccounts, saveAccounts } from "../storage.js";
+import { loadAccounts, withAccountStorageTransaction } from "../storage.js";
 import { AccountManager } from "../accounts.js";
 import { resolveDisplayEmail } from "../account-display.js";
 import { logWarn } from "../logger.js";
@@ -43,8 +43,12 @@ export function createCodexRemoveTool(ctx) {
                 }
                 return guidance;
             }
-            const storage = await loadAccounts();
-            if (!storage || storage.accounts.length === 0) {
+            // Read-only snapshot for the "no accounts" / interactive-picker UX.
+            // The actual mutate+save runs inside withAccountStorageTransaction
+            // below against a freshly re-read snapshot so a concurrent save
+            // between this read and the eventual persist can't be clobbered.
+            const initialStorage = await loadAccounts();
+            if (!initialStorage || initialStorage.accounts.length === 0) {
                 if (ui.v2Enabled) {
                     return [
                         ...formatUiHeader(ui, "Remove account"),
@@ -56,7 +60,7 @@ export function createCodexRemoveTool(ctx) {
             }
             let resolvedIndex = index;
             if (resolvedIndex === undefined) {
-                const selectedIndex = await promptAccountIndexSelection(ui, storage, "Remove account");
+                const selectedIndex = await promptAccountIndexSelection(ui, initialStorage, "Remove account");
                 if (selectedIndex === null) {
                     if (supportsInteractiveMenus()) {
                         if (ui.v2Enabled) {
@@ -81,81 +85,106 @@ export function createCodexRemoveTool(ctx) {
                 }
                 resolvedIndex = selectedIndex + 1;
             }
-            const targetIndex = Math.floor((resolvedIndex ?? 0) - 1);
-            if (!Number.isFinite(targetIndex) ||
-                targetIndex < 0 ||
-                targetIndex >= storage.accounts.length) {
+            const outcome = await withAccountStorageTransaction(async (current, persist) => {
+                const storage = current;
+                const accounts = storage?.accounts ?? [];
+                const targetIndex = (resolvedIndex ?? 0) - 1;
+                if (!Number.isInteger(targetIndex) ||
+                    targetIndex < 0 ||
+                    targetIndex >= accounts.length) {
+                    return { kind: "invalid", accountCount: accounts.length };
+                }
+                const account = accounts[targetIndex];
+                if (!account || !storage) {
+                    return { kind: "not-found" };
+                }
+                const label = formatCommandAccountLabel(account, targetIndex, {
+                    maskEmail,
+                });
+                storage.accounts.splice(targetIndex, 1);
+                if (storage.accounts.length === 0) {
+                    storage.activeIndex = 0;
+                    storage.activeIndexByFamily = {};
+                }
+                else {
+                    if (storage.activeIndex >= storage.accounts.length) {
+                        storage.activeIndex = 0;
+                    }
+                    else if (storage.activeIndex > targetIndex) {
+                        storage.activeIndex -= 1;
+                    }
+                    if (storage.activeIndexByFamily) {
+                        for (const family of MODEL_FAMILIES) {
+                            const idx = storage.activeIndexByFamily[family];
+                            if (typeof idx === "number") {
+                                if (idx >= storage.accounts.length) {
+                                    storage.activeIndexByFamily[family] = 0;
+                                }
+                                else if (idx > targetIndex) {
+                                    storage.activeIndexByFamily[family] = idx - 1;
+                                }
+                            }
+                        }
+                    }
+                }
+                try {
+                    await persist(storage);
+                }
+                catch (saveError) {
+                    logWarn("Failed to save account removal", {
+                        error: String(saveError),
+                    });
+                    return { kind: "save-failed", label };
+                }
+                const remaining = storage.accounts.length;
+                const matchingEmailRemaining = account.email?.trim()
+                    ? storage.accounts.filter((entry) => entry.email === account.email)
+                        .length
+                    : 0;
+                return {
+                    kind: "ok",
+                    label,
+                    remaining,
+                    matchingEmailRemaining,
+                    removedEmail: account.email,
+                };
+            });
+            if (outcome.kind === "invalid") {
                 if (ui.v2Enabled) {
                     return [
                         ...formatUiHeader(ui, "Remove account"),
                         "",
                         formatUiItem(ui, `Invalid account number: ${resolvedIndex}`, "danger"),
-                        formatUiKeyValue(ui, "Valid range", `1-${storage.accounts.length}`, "muted"),
+                        formatUiKeyValue(ui, "Valid range", `1-${outcome.accountCount}`, "muted"),
                         formatUiItem(ui, "Use codex-list to list all accounts.", "accent"),
                     ].join("\n");
                 }
-                return `Invalid account number: ${resolvedIndex}\n\nValid range: 1-${storage.accounts.length}\n\nUse codex-list to list all accounts.`;
+                return `Invalid account number: ${resolvedIndex}\n\nValid range: 1-${outcome.accountCount}\n\nUse codex-list to list all accounts.`;
             }
-            const account = storage.accounts[targetIndex];
-            if (!account) {
+            if (outcome.kind === "not-found") {
                 return `Account ${resolvedIndex} not found.`;
             }
-            const label = formatCommandAccountLabel(account, targetIndex, { maskEmail });
-            storage.accounts.splice(targetIndex, 1);
-            if (storage.accounts.length === 0) {
-                storage.activeIndex = 0;
-                storage.activeIndexByFamily = {};
-            }
-            else {
-                if (storage.activeIndex >= storage.accounts.length) {
-                    storage.activeIndex = 0;
-                }
-                else if (storage.activeIndex > targetIndex) {
-                    storage.activeIndex -= 1;
-                }
-                if (storage.activeIndexByFamily) {
-                    for (const family of MODEL_FAMILIES) {
-                        const idx = storage.activeIndexByFamily[family];
-                        if (typeof idx === "number") {
-                            if (idx >= storage.accounts.length) {
-                                storage.activeIndexByFamily[family] = 0;
-                            }
-                            else if (idx > targetIndex) {
-                                storage.activeIndexByFamily[family] = idx - 1;
-                            }
-                        }
-                    }
-                }
-            }
-            try {
-                await saveAccounts(storage);
-            }
-            catch (saveError) {
-                logWarn("Failed to save account removal", {
-                    error: String(saveError),
-                });
+            if (outcome.kind === "save-failed") {
+                // The transaction only mutated its in-memory snapshot; the
+                // persist() call that would have made the removal durable
+                // threw, so the account was never actually removed. Wording
+                // must not imply it was.
                 if (ui.v2Enabled) {
                     return [
                         ...formatUiHeader(ui, "Remove account"),
                         "",
-                        formatUiItem(ui, `Removed selected entry: ${label}`, "warning"),
-                        formatUiItem(ui, "Only the selected index was changed.", "muted"),
-                        formatUiItem(ui, "Failed to persist. Change may be lost on restart.", "danger"),
+                        formatUiItem(ui, `Failed to remove ${outcome.label}: account storage could not be updated.`, "danger"),
                     ].join("\n");
                 }
-                return `Removed selected entry: ${label} from memory, but failed to persist. Only the selected index was changed and this may be lost on restart.`;
+                return `Failed to remove ${outcome.label}: account storage could not be updated.`;
             }
             if (cachedAccountManagerRef.current) {
                 const reloadedManager = await AccountManager.loadFromDisk();
                 cachedAccountManagerRef.current = reloadedManager;
                 accountManagerPromiseRef.current = Promise.resolve(reloadedManager);
             }
-            const remaining = storage.accounts.length;
-            const matchingEmailRemaining = account.email?.trim()
-                ? storage.accounts.filter((entry) => entry.email === account.email)
-                    .length
-                : 0;
-            const displayEmail = resolveDisplayEmail(account.email, maskEmail);
+            const { label, remaining, matchingEmailRemaining, removedEmail } = outcome;
+            const displayEmail = resolveDisplayEmail(removedEmail, maskEmail);
             if (ui.v2Enabled) {
                 const postRemoveHint = matchingEmailRemaining > 0 && displayEmail
                     ? formatUiItem(ui, `Other entries for ${displayEmail} remain: ${matchingEmailRemaining}`, "muted")