zidane 7.1.3 → 7.1.5

package/dist/tui.js

@@ -1,7 +1,7 @@
 import { C as estimateRebilledCostUsd } from "./openai-compat-Dy56weK8.js";
 import { n as THINKING_LEVELS } from "./types-CWgENVLY.js";
-import { t as buildContextSegments } from "./context-segments-BrEsRhA0.js";
-import { $ as ExtensionInstallError, $n as effectiveContextWindow, A as buildPostCompactAttachments, Bn as artifactKindLabel, C as rehomePersistedStubs, Cn as parseExtensionScanPathEnv, Ct as basic_default, D as resolvePersistDir, E as resolveMcpWarningsDir, En as setDebugLogSink, Jn as renderArtifactRow, Ln as createExtensionBus, Lt as tailTruncate, M as selectFilesFromSession, Nn as resolveExtensionConfigValue, O as resolveSessionDir, P as compactConversation, Pn as sanitizeExtensionConfigActionPatch, Q as createExtensionPromptBridge, Qn as OUTPUT_RESERVE_TOKENS, T as resolveLegacySessionDir, Tn as createDebugLog, Vt as createModelSearchTool, Xt as artifacts_default, _n as registerExtensionHostModules, an as groupBindings, at as removeInstalledExtension, b as cleanupPersistedSession, bt as composePresets, ct as discoverAndBuildExtensionRegistry, dt as composeExtensionPreset, f as applyCompactSummaryCutoff, fn as resolveExtensionKeybindings, ft as disposeExtensionRegistry, gt as partitionExtensionCatalog, in as formatBindingForDisplay, k as resolveTasksDir, kn as coerceExtensionConfigInput, kt as isSpawnTool, mt as filterRegistryPlugins, nn as KEYBINDING_KEY_COL_WIDTH, on as keybindingsPath, ot as updateInstalledExtension, pt as filterExtensionRegistry, q as summaryToTurn, qn as refreshArtifact, rn as ensureKeybindingsFile, sn as matchesBinding, st as createExtensionHud, t as createAgent, tt as installExtensionFromSpec, vt as createExtensionHostRuntimeBridge, w as resolveLegacyPersistDir, wn as scanExtensionDirectories, xn as inlineLoadedExtension, zt as looksBinary } from "./agent-_xxElOgH.js";
+import { d as buildContextSegments, i as DEFAULT_OAUTH_ACCOUNT_LABEL, u as oauthAccountLabel } from "./cred-keys-BbbBr4q3.js";
+import { $ as ExtensionInstallError, A as buildPostCompactAttachments, An as resolveExtensionConfigValue, C as rehomePersistedStubs, Cn as setDebugLogSink, Ct as basic_default, D as resolvePersistDir, E as resolveMcpWarningsDir, En as coerceExtensionConfigInput, Gn as renderArtifactRow, Ln as artifactKindLabel, Lt as tailTruncate, M as selectFilesFromSession, O as resolveSessionDir, P as compactConversation, Pn as createExtensionBus, Q as createExtensionPromptBridge, Sn as createDebugLog, T as resolveLegacySessionDir, Vt as createModelSearchTool, Wn as refreshArtifact, Xn as effectiveContextWindow, Xt as artifacts_default, Yn as OUTPUT_RESERVE_TOKENS, an as groupBindings, at as removeInstalledExtension, b as cleanupPersistedSession, bn as parseExtensionScanPathEnv, bt as composePresets, ct as discoverAndBuildExtensionRegistry, dt as composeExtensionPreset, f as applyCompactSummaryCutoff, fn as resolveExtensionKeybindings, ft as disposeExtensionRegistry, gt as partitionExtensionCatalog, in as formatBindingForDisplay, jn as sanitizeExtensionConfigActionPatch, k as resolveTasksDir, kt as isSpawnTool, mn as registerExtensionHostModules, mt as filterRegistryPlugins, nn as KEYBINDING_KEY_COL_WIDTH, on as keybindingsPath, ot as updateInstalledExtension, pt as filterExtensionRegistry, q as summaryToTurn, rn as ensureKeybindingsFile, sn as matchesBinding, st as createExtensionHud, t as createAgent, tt as installExtensionFromSpec, vn as inlineLoadedExtension, vt as createExtensionHostRuntimeBridge, w as resolveLegacyPersistDir, xn as scanExtensionDirectories, zt as looksBinary } from "./agent-BlGt76qk.js";
 import { D as shouldAutoGenerateTitle, E as generateSessionTitle, F as parseCommandInvocation, M as commandBlocksToContent, P as executeCommand, S as resolveInlineSuggestion, a as loginMcpServer, b as createPathAutocompleteProvider, c as SKILL_EDIT_METADATA_KEY, g as readSkillEditMarker, h as extensionScaffold, j as commandBlockToEvent, l as ZIDANE_EXTENSION_SKILL_NAME, m as extensionDirForCwd, p as editSessionMetadata, u as ZIDANE_SKILL_EDIT_SKILL_NAME, v as withZidaneExtensionSkill, w as generateStructuredData, x as patchInlineGhost, y as withZidaneSkillEditSkill } from "./src-CkNQKFKr.js";
 import { a as formatDuration, c as previewLine, i as fmtTokens, l as shortId, n as compactPath, o as formatTaskStatus, r as fmtCost, s as formatTaskSummary, t as ageString } from "./format-BF745pLL.js";
 import { i as killProcessGroup, n as SUPPORTS_PROCESS_GROUPS, r as createProcessContext } from "./contexts-CRE9pw07.js";
@@ -19,11 +19,11 @@ import { s as withTimeout } from "./timeout-CjOG2mea.js";
 import { i as installCacheBreakLogger } from "./cache-telemetry-ehVdWsg2.js";
 import { s as resolveCompletionSubmit } from "./completion-core-BRo86R_L.js";
 import { n as JsonRpcRemoteError, t as JsonRpcConnectionClosedError } from "./json-rpc-rSWMUh9b.js";
-import { $ as providerKeySetChanged, $t as formatRunReceiptLine, A as chunkMarkdownForRender, C as usageTone, Cn as summarizeOutcomes, Dt as selectionAfterTurnRemoval, E as filterModelCatalog, En as createChatsCompletionProvider, Et as selectableTurnIds, F as stripHtmlCommentsOutsideCode, Gt as sessionEventMeta, Ht as sessionDirLabel, I as cacheBreakChip, K as chainPositionOf, Kt as shortSessionId, Lt as isMainSession, M as codeTokenHasClosingFence, N as normalizeMarkdownCodeFences, Nt as SESSION_EVENT_STATUS_STYLE, O as parseCustomModelQuery, Ot as streamEventSearchText, P as splitMarkdownCodeBlocks, Qt as formatRunReceiptCells, R as compactingLabel, S as resetLabel, Sn as stripEditOutcomesAnnotation, St as promptHistoryFromEvents, T as buildModelCatalog, Tt as retagUserPromptEventsFromRefs, U as DAEMON_HEALTH_STYLE, Ut as sessionEventExcerpt, V as streamingLabel, W as buildRunModel, X as pickChainPrimary, Xt as formatCostUsd, Y as filterChainFallbacks, Yt as fitRunReceiptCells, _ as turnContextSize, _t as isEditErrorResult, a as TOOL_DISPLAY, an as buildContextualDiff, b as formatUsagePercent, bn as resolveApprovalForPayload, bt as isVisible, d as finalizeStreamingMarkdown, dn as filetypeFromPath, en as formatTokenCount, et as reorderKeyed, f as finalizeStreamingMarkdownForOwner, fn as previewEditPayload, ft as createCommandsCompletionProvider, g as revealEarlierTranscriptEvents, gn as buildEditOutcomesAnnotation, gt as EDIT_TOOL_NAMES, h as replaceTranscriptTurnEvents, ht as BASH_CALL_ID_PREFIX, i as turnAsText, j as closeDanglingCodeFence, kt as turnSelectionOwnership, lt as createFilesCompletionProvider, mn as summarizeEditPayload, mt as buildLinearRamp, n as deleteTurnSafely, nn as hasRunReceipt, o as displayNameFor, on as buildUnifiedDiff, ot as createSkillsCompletionProvider, p as hiddenEarlierTranscriptCount, pt as blendHsl, q as chainsEqual, qt as truncateTitle, r as truncateTurnsAt, rn as runReceiptFromRun, rt as toggleChainEntry, s as formatToolCall, sn as clipDiffForRender, st as uniqueSkillNamesFromReferences, tt as restoreChainFallbacks, u as capTranscriptEvents, un as extractEditPayload, v as formatBalance, vn as mergeApprovalAndBodyOutcomes, vt as isTurnHighlighted, w as splitPromptSegments, wt as retagUserPromptEvents, x as mostConstrainedWindow, xn as rewriteMultiEditHeader, xt as isVisibleDuringSearch, yn as parseEditOutcomesFromResult, yt as isUserBashEvent, z as liveSessionCost } from "./turn-operations-6JDu2ewy.js";
+import { $ as pickChainPrimary, $t as formatCostUsd, At as selectionAfterTurnRemoval, Bt as isMainSession, C as resetLabel, Cn as resolveApprovalForPayload, Ct as isVisible, D as splitPromptSegments, Dt as retagUserPromptEvents, E as usageTone, En as summarizeOutcomes, F as codeTokenHasClosingFence, Gt as sessionDirLabel, H as liveSessionCost, I as normalizeMarkdownCodeFences, It as SESSION_EVENT_STATUS_STYLE, Jt as sessionEventMeta, K as DAEMON_HEALTH_STYLE, Kt as sessionEventExcerpt, L as splitMarkdownCodeBlocks, Mt as turnSelectionOwnership, N as chunkMarkdownForRender, O as buildModelCatalog, Ot as retagUserPromptEventsFromRefs, P as closeDanglingCodeFence, Q as filterChainFallbacks, Qt as fitRunReceiptCells, R as stripHtmlCommentsOutsideCode, S as mostConstrainedWindow, Sn as parseEditOutcomesFromResult, St as isUserBashEvent, T as updatedLabel, Tn as stripEditOutcomesAnnotation, Tt as promptHistoryFromEvents, V as compactingLabel, W as streamingLabel, X as chainsEqual, Xt as truncateTitle, Y as chainPositionOf, Yt as shortSessionId, _ as turnContextSize, _n as summarizeEditPayload, _t as buildLinearRamp, a as TOOL_DISPLAY, an as hasRunReceipt, bt as isEditErrorResult, cn as buildContextualDiff, d as finalizeStreamingMarkdown, f as finalizeStreamingMarkdownForOwner, ft as createFilesCompletionProvider, g as revealEarlierTranscriptEvents, gt as blendHsl, h as replaceTranscriptTurnEvents, hn as previewEditPayload, ht as createCommandsCompletionProvider, i as turnAsText, it as restoreChainFallbacks, j as parseCustomModelQuery, jt as streamEventSearchText, k as filterModelCatalog, kn as createChatsCompletionProvider, kt as selectableTurnIds, ln as buildUnifiedDiff, lt as createSkillsCompletionProvider, mn as filetypeFromPath, n as deleteTurnSafely, nn as formatRunReceiptLine, nt as providerKeySetChanged, o as displayNameFor, on as runReceiptFromRun, ot as toggleChainEntry, p as hiddenEarlierTranscriptCount, pn as extractEditPayload, q as buildRunModel, r as truncateTurnsAt, rn as formatTokenCount, rt as reorderKeyed, s as formatToolCall, tn as formatRunReceiptCells, u as capTranscriptEvents, un as clipDiffForRender, ut as uniqueSkillNamesFromReferences, vt as BASH_CALL_ID_PREFIX, w as showsAccount, wn as rewriteMultiEditHeader, wt as isVisibleDuringSearch, x as formatUsagePercent, xn as mergeApprovalAndBodyOutcomes, xt as isTurnHighlighted, y as formatBalance, yn as buildEditOutcomesAnnotation, yt as EDIT_TOOL_NAMES, z as cacheBreakChip } from "./turn-operations-JynC5ODZ.js";
 import { a as searchHighlightRanges, c as searchSessionHistoryIndexAsync, i as highlightSegments, n as buildSessionSearchIndexAsync, r as filterSessionSearchCatalog, u as searchSessionIndexAsync } from "./history-search-C4bk1Wz_.js";
-import { $ as supportsOAuth, $t as parsePluginScanPathEnv, A as useSafeModeQueue, Ai as listSessionMeta, Ar as chatWindowBehavior, At as useInteractionsActions, Bi as toolResultText, Bn as resolveStoragePaths, Cn as resolveTheme, Ct as createAutomaticInteractionResponse, Di as eventsFromTurns, Dt as makeRequestInteraction, Ei as deriveSessionTitle, Et as isModelInteraction, Fi as serverToolResultSummary, Fn as useDiscovery, Ft as installProviderDiagnosticHook, G as usageChecksOptedOut, Gn as countClaudeSessionFiles, H as fetchAllProviderUsage, Hi as usageByModel, Hn as createArtifactsCompletionProvider, Ht as applyThinkingBindingSetting, Ii as stripSpawnTokensLine, In as useDiscoveryOptional, J as fetchOAuthRedirect, Jn as mcpsWritePath, Jr as TODO_STATUS_GLYPHS, Kn as hasClaudeCodeSetup, Kt as resolveSandboxFromSettings, Li as sumRunCosts, Ln as ConfigProvider, M as addToSafelist, Mi as marginTopFor, Mn as quoteForShell, N as getSafelist, Ni as noticeTurnContent, Nn as createDiscoverySlot, Nr as discoverAgentsMd, O as SafeModeProvider, Oi as getSessionMeta, Ot as pendingInteractionsFromTurns, P as isOnSafelist, Pn as DiscoveryProvider, Q as runOAuthLogin, Qn as dedupMcpServersByName, Qt as discoverProjectPlugins, R as suggestSafelistEntries, Rn as useConfig, Si as createChatTurnsReadTool, Sn as resolveChipColor, St as buildResumedToolResultsTurn, U as fetchProviderUsage, Ut as createMainSession, V as clearProviderUsageCache, Vi as updateToolEventOutcomes, Vr as accentColor, Vt as createBuiltinCommands, W as providerUsageSupported, Wn as useCompletion, Wt as modelChainMetadata, X as redirectUriFromAuthUrl, Xn as upsertMcpServer, Xr as applyTodosSnapshot, Xt as runEndNotice, Yn as removeMcpServer, Z as oauthUsesManualCodePaste, Zn as buildMcpServers, Zt as buildPluginContributions, _ as buildSpawnEndEvent, _n as clampFps, _t as ASK_USER_TOOL, ai as setTodosForRun, an as hintsLength, ar as bootTick, at as subscribeMcpToolsCache, b as defaultSkillScanPaths, bi as envSection, bt as InteractionsProvider, c as useSelectStyle, cr as buildUpdateHint, d as useTheme, dn as DEFAULT_SETTINGS, dt as parentServerName, en as attachMcpWarnLog, er as discoverProjectMcps, f as discoverSystemMd, fn as SETTINGS_CATEGORIES, ft as McpAuthProvider, g as useStreamBuffer, gn as SettingsProvider, gr as useRestartRequired, h as userSystemMdPath, hn as SETTINGS_TOGGLES, ht as getMcpAuthStatus, ii as selectActiveTodos, in as clipHintsToWidth, ji as loadState, jn as parseEditorCommand, jr as groupArtifacts, jt as useInteractionsQueue, k as useSafeModeActions, ki as lastContextSizeFromTurns, l as useSurfaces, ln as listProjectFiles, lr as useUpdateCheck, lt as buildVisibleMcpRows, m as userScopeOverridesLoad, mn as SETTINGS_INPUTS, mt as useMcpAuthState, ni as pruneTodosByRun, nr as tryOpenBrowser, nt as mcpToolsCachePath, o as ThemeProvider, oi as todoProgressLabel, on as truncateTrailing, p as renderSystemMdSeed, pn as SETTINGS_CHOICES, pt as useMcpAuthDispatch, q as formatPathForCwd, qn as importFromClaudeCode, qt as createFileMcpCredentialStore, r as computeTurnAnchors, rn as EMPTY_HINTS, rr as tryRevealPath, rt as refreshMcpToolsCatalog, s as useColors, si as useActiveTodos, sn as buildHints, sr as buildRestartHint, st as useMcpToolToggleMap, ti as pickActiveRunId, tt as loadMcpToolsCache, un as useEnabledToggleSet, ut as indexOfServerRow, v as buildSpawnStartEvent, vi as buildBuildSystem, w as writeSessionExport, wi as compactSummaryEvent, wt as createInteractionTools, x as discoverProjectSkills, xi as chatReferenceTokensForPrompt, xt as PRESENT_PLAN_TOOL, y as buildSkillsConfig, yi as buildPlanSystem, yn as useSettings, yt as HOST_INTERACTION_ID_PREFIX, zi as toolCallPreview, zn as resolveConfig } from "./approvals-u2T19Dc-.js";
-import { E as renderDefaultCallbackPage, T as restoreModelOptions, b as modelSupportsReasoning, c as setPreferredCredential, g as getContextWindow, h as enabledModelOptions, l as setProviderCredential, n as applyApiKeyEnv, t as detectAuth, w as piIdOf, y as modelOptionsFor } from "./auth-HRKkOErn.js";
-import { a as connectIpcClient, d as defaultSocketPath, f as ensureDaemonRunning, m as selfDaemonSpawnCommand, o as connectOrSpawnDaemon } from "./server-CTUpOdh3.js";
+import { $ as runOAuthLogin, $n as dedupMcpServersByName, $t as discoverProjectPlugins, A as useSafeModeQueue, Ai as lastContextSizeFromTurns, Bi as toolCallPreview, Bn as resolveConfig, Ci as createChatTurnsReadTool, Cn as resolveChipColor, Ct as buildResumedToolResultsTurn, Di as deriveSessionTitle, Dt as isModelInteraction, Fn as DiscoveryProvider, G as providerUsageSupported, Gn as useCompletion, Gt as modelChainMetadata, H as fetchAllProviderUsage, Hi as updateToolEventOutcomes, Hr as accentColor, Ht as createBuiltinCommands, Ii as serverToolResultSummary, In as useDiscovery, It as installProviderDiagnosticHook, J as formatPathForCwd, Jn as importFromClaudeCode, Jt as createFileMcpCredentialStore, K as usageChecksOptedOut, Kn as countClaudeSessionFiles, Li as stripSpawnTokensLine, Ln as useDiscoveryOptional, M as addToSafelist, Mi as loadState, Mn as parseEditorCommand, Mr as groupArtifacts, Mt as useInteractionsQueue, N as getSafelist, Ni as marginTopFor, Nn as quoteForShell, O as SafeModeProvider, Oi as eventsFromTurns, Ot as makeRequestInteraction, P as isOnSafelist, Pi as noticeTurnContent, Pn as createDiscoverySlot, Pr as discoverAgentsMd, Q as oauthUsesManualCodePaste, Qn as buildMcpServers, Qt as buildPluginContributions, R as suggestSafelistEntries, Ri as sumRunCosts, Rn as ConfigProvider, Si as chatReferenceTokensForPrompt, St as PRESENT_PLAN_TOOL, Ti as compactSummaryEvent, Tt as createInteractionTools, U as fetchProviderUsage, Ui as usageByModel, Un as createArtifactsCompletionProvider, Ut as applyThinkingBindingSetting, V as clearProviderUsageCache, Vi as toolResultText, Vn as resolveStoragePaths, Wt as createMainSession, Xn as removeMcpServer, Y as fetchOAuthRedirect, Yn as mcpsWritePath, Yr as TODO_STATUS_GLYPHS, Z as redirectUriFromAuthUrl, Zn as upsertMcpServer, Zr as applyTodosSnapshot, Zt as runEndNotice, _ as buildSpawnEndEvent, _n as SettingsProvider, _r as useRestartRequired, ai as selectActiveTodos, an as clipHintsToWidth, b as defaultSkillScanPaths, bi as buildPlanSystem, bn as useSettings, bt as HOST_INTERACTION_ID_PREFIX, c as useSelectStyle, ci as useActiveTodos, cn as buildHints, cr as buildRestartHint, ct as useMcpToolToggleMap, d as useTheme, dn as useEnabledToggleSet, dt as indexOfServerRow, en as parsePluginScanPathEnv, et as supportsOAuth, f as discoverSystemMd, fn as DEFAULT_SETTINGS, ft as parentServerName, g as useStreamBuffer, gn as SETTINGS_TOGGLES, gt as getMcpAuthStatus, h as userSystemMdPath, hn as SETTINGS_INPUTS, ht as useMcpAuthState, in as EMPTY_HINTS, ir as tryRevealPath, it as refreshMcpToolsCatalog, ji as listSessionMeta, jr as chatWindowBehavior, jt as useInteractionsActions, k as useSafeModeActions, ki as getSessionMeta, kt as pendingInteractionsFromTurns, l as useSurfaces, lr as buildUpdateHint, m as userScopeOverridesLoad, mn as SETTINGS_CHOICES, mt as useMcpAuthDispatch, ni as pickActiveRunId, nt as loadMcpToolsCache, o as ThemeProvider, oi as setTodosForRun, on as hintsLength, or as bootTick, ot as subscribeMcpToolsCache, p as renderSystemMdSeed, pn as SETTINGS_CATEGORIES, pt as McpAuthProvider, qn as hasClaudeCodeSetup, qt as resolveSandboxFromSettings, r as computeTurnAnchors, ri as pruneTodosByRun, rr as tryOpenBrowser, rt as mcpToolsCachePath, s as useColors, si as todoProgressLabel, sn as truncateTrailing, tn as attachMcpWarnLog, tr as discoverProjectMcps, un as listProjectFiles, ur as useUpdateCheck, ut as buildVisibleMcpRows, v as buildSpawnStartEvent, vn as clampFps, vt as ASK_USER_TOOL, w as writeSessionExport, wn as resolveTheme, wt as createAutomaticInteractionResponse, x as discoverProjectSkills, xi as envSection, xt as InteractionsProvider, y as buildSkillsConfig, yi as buildBuildSystem, zn as useConfig } from "./approvals-BznYVVGD.js";
+import { A as renderDefaultCallbackPage, C as modelOptionsFor, O as piIdOf, b as getContextWindow, d as setPreferredCredential, f as setProviderCredential, k as restoreModelOptions, l as removeStoredCredential, n as applyApiKeyEnv, s as readProviderCredentials, t as detectAuth, u as setCredentialLabel, w as modelSupportsReasoning, y as enabledModelOptions } from "./auth-DvMdkpGD.js";
+import { _ as selfDaemonSpawnCommand, c as connectIpcClient, h as ensureDaemonRunning, l as connectOrSpawnDaemon, m as defaultSocketPath } from "./shell-path-3tZ2lyQ2.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createTuiStore } from "./session/sqlite.js";
 import { _ as buildVisibleAuthRows, a as editTodo, b as parentProviderKey, c as NOTICE_GLYPH, f as validateMcpForm, g as instructionPreviewLines, h as instructionOriginBadge, i as cycleTodoStatus, l as MCP_TRANSPORTS, m as buildVisibleInstructionRows, n as buildTodoRetryMessage, r as clearTodos, s as removeTodo, t as addTodo, v as indexOfProviderRow, x as selectableSources } from "./todo-edits-Dw2oO2ON.js";
@@ -12228,6 +12228,14 @@ function AuthScreen({ onPick, initialConfigureKey }) {
 		}), /* @__PURE__ */ jsx$1(TitleOverlay, { title: "pick a provider" })]
 	});
 }
+/** Stored OAuth accounts of a provider, as the account picker lists them. */
+function oauthAccountsOf(dataDir, descriptor) {
+	return readProviderCredentials(dataDir, descriptor).flatMap((s) => s.credential.kind === "oauth" ? [{
+		key: s.key,
+		label: oauthAccountLabel(s.credential),
+		active: s.active
+	}] : []);
+}
 /**
 * First credential step for a chosen provider. The method picker only earns
 * its place when there's a genuine choice — i.e. the provider supports OAuth
@@ -12269,9 +12277,46 @@ function SetupWizard({ registry, dataDir, initialDescriptor, onConfigured, onCan
 			descriptor,
 			customFields: {}
 		});
-		else setStep({
+		else {
+			const accounts = oauthAccountsOf(dataDir, descriptor);
+			if (accounts.length === 0) setStep({
+				kind: "oauth-running",
+				descriptor,
+				target: { label: DEFAULT_OAUTH_ACCOUNT_LABEL }
+			});
+			else setStep({
+				kind: "pick-oauth-account",
+				descriptor,
+				accounts
+			});
+		}
+	}, [dataDir]);
+	const onPickOAuthAccount = useCallback((descriptor, choice) => {
+		setError(null);
+		const target = choice === "add" ? { label: "" } : {
+			replaceKey: choice.key,
+			label: choice.label
+		};
+		setStep({
+			kind: "name-oauth-account",
+			descriptor,
+			target
+		});
+	}, []);
+	const onNameOAuthAccount = useCallback((descriptor, target, label) => {
+		const trimmed = label.trim();
+		if (!trimmed && target.replaceKey === void 0) {
+			setError("Enter a name for this account.");
+			return;
+		}
+		setError(null);
+		setStep({
 			kind: "oauth-running",
-			descriptor
+			descriptor,
+			target: {
+				...target,
+				label: trimmed || "Default"
+			}
 		});
 	}, []);
 	/**
@@ -12364,9 +12409,23 @@ function SetupWizard({ registry, dataDir, initialDescriptor, onConfigured, onCan
 		error,
 		onSubmit: onApiKeySubmit
 	});
+	if (step.kind === "pick-oauth-account") return /* @__PURE__ */ jsx$1(PickOAuthAccountStep, {
+		descriptor: step.descriptor,
+		accounts: step.accounts,
+		error,
+		onPick: onPickOAuthAccount
+	});
+	if (step.kind === "name-oauth-account") return /* @__PURE__ */ jsx$1(NameOAuthAccountStep, {
+		descriptor: step.descriptor,
+		target: step.target,
+		error,
+		onSubmit: onNameOAuthAccount
+	});
 	return /* @__PURE__ */ jsx$1(OAuthRunningStep, {
 		descriptor: step.descriptor,
 		dataDir,
+		label: step.target.label,
+		replaceKey: step.target.replaceKey,
 		onSuccess: onOAuthSuccess,
 		onError: onOAuthError
 	});
@@ -12474,7 +12533,7 @@ function PickProviderStep({ descriptors, error, onPick, onCancel }) {
 		children: [!onCancel && /* @__PURE__ */ jsxs("text", {
 			fg: COLOR.dim,
 			children: [
-				"No provider credentials yet. Pick a provider to configure — keys are stored in",
+				"No provider credentials yet. Pick a provider to configure. Keys are stored in",
 				/* @__PURE__ */ jsx$1("span", {
 					fg: COLOR.model,
 					children: " ~/.zidane/credentials.json "
@@ -12714,7 +12773,86 @@ function EnterApiKeyStep({ descriptor, customFields, error, onSubmit }) {
 		})]
 	});
 }
-function OAuthRunningStep({ descriptor, dataDir, onSuccess, onError }) {
+/** Sentinel option value for the account picker's "add another account" row. */
+const ADD_OAUTH_ACCOUNT_VALUE = "__add__";
+function PickOAuthAccountStep({ descriptor, accounts, error, onPick }) {
+	const focused = useModalAwareFocus();
+	const SELECT_THEME = useSelectStyle();
+	const options = [{
+		name: "+ add another account",
+		description: "sign in with a different account",
+		value: ADD_OAUTH_ACCOUNT_VALUE
+	}, ...accounts.map((a) => ({
+		name: a.label,
+		description: a.active ? "re-authenticate (in use)" : "re-authenticate",
+		value: a.key
+	}))];
+	return /* @__PURE__ */ jsxs(WizardPanel, {
+		title: `configure ${descriptor.label} · OAuth account`,
+		error,
+		children: [/* @__PURE__ */ jsx$1(WizardEscHint, {}), /* @__PURE__ */ jsx$1("select", {
+			...SELECT_THEME,
+			focused,
+			options,
+			wrapSelection: true,
+			onSelect: (_idx, option) => {
+				if (!option) return;
+				if (option.value === ADD_OAUTH_ACCOUNT_VALUE) {
+					onPick(descriptor, "add");
+					return;
+				}
+				const choice = accounts.find((a) => a.key === option.value);
+				if (choice) onPick(descriptor, choice);
+			},
+			style: { flexGrow: 1 }
+		})]
+	});
+}
+function NameOAuthAccountStep({ descriptor, target, error, onSubmit }) {
+	const focused = useModalAwareFocus();
+	const inputRef = useRef(null);
+	const COLOR = useColors();
+	const submit = useCallback(() => {
+		onSubmit(descriptor, target, inputRef.current?.value ?? "");
+	}, [
+		descriptor,
+		target,
+		onSubmit
+	]);
+	return /* @__PURE__ */ jsxs(WizardPanel, {
+		title: `configure ${descriptor.label} · account name`,
+		error,
+		children: [/* @__PURE__ */ jsxs("text", {
+			fg: COLOR.dim,
+			children: [
+				"Name this account so you can tell it apart in Settings (for example work or personal), then press",
+				/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.model,
+					children: " enter "
+				}),
+				"to open the browser. Esc to exit."
+			]
+		}), /* @__PURE__ */ jsx$1("box", {
+			style: {
+				border: true,
+				borderColor: COLOR.borderActive,
+				paddingLeft: 1,
+				paddingRight: 1,
+				height: 3
+			},
+			children: /* @__PURE__ */ jsx$1("input", {
+				ref: inputRef,
+				focused,
+				keyBindings: API_KEY_INPUT_BINDINGS,
+				value: target.label,
+				placeholder: "account name",
+				onSubmit: submit,
+				style: { flexGrow: 1 }
+			})
+		})]
+	});
+}
+function OAuthRunningStep({ descriptor, dataDir, label, replaceKey, onSuccess, onError }) {
 	const usesManualPaste = oauthUsesManualCodePaste(descriptor);
 	const [url, setUrl] = useState(null);
 	const [status, setStatus] = useState(usesManualPaste ? "opening browser…" : "starting browser…");
@@ -12765,8 +12903,9 @@ function OAuthRunningStep({ descriptor, dataDir, onSuccess, onError }) {
 				if (cancelled) return;
 				setProviderCredential(dataDir, descriptor, {
 					kind: "oauth",
-					...creds
-				});
+					...creds,
+					label
+				}, replaceKey ? { replaceKey } : {});
 				if (descriptor.envKey) delete process.env[descriptor.envKey];
 				onSuccess();
 			} catch (err) {
@@ -12783,6 +12922,8 @@ function OAuthRunningStep({ descriptor, dataDir, onSuccess, onError }) {
 	}, [
 		descriptor,
 		dataDir,
+		label,
+		replaceKey,
 		onSuccess,
 		onError,
 		usesManualPaste
@@ -16587,6 +16728,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	const scrollboxRef = useRef(null);
 	const [editingInputKey, setEditingInputKey] = useState(null);
 	const editInputRef = useRef(null);
+	const renameInputRef = useRef(null);
 	const { width: termWidth } = useTerminalDimensions();
 	const contentCols = Math.max(40, termWidth - 2 - 4 - 2 - 1);
 	const discovery = useDiscoveryOptional();
@@ -16837,6 +16979,9 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	* here, so the swap is visible in place.
 	*/
 	const [providersAfterSwap, setProvidersAfterSwap] = useState(null);
+	const [credentialRemoveArmed, setCredentialRemoveArmed] = useState(null);
+	const [authNotice, setAuthNotice] = useState(null);
+	const [renamingCredential, setRenamingCredential] = useState(null);
 	const [instructionsNotice, setInstructionsNotice] = useState(null);
 	const [instructionSegments, setInstructionSegments] = useState([]);
 	const [instructionsLoading, setInstructionsLoading] = useState(false);
@@ -17456,21 +17601,28 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	useEffect(() => {
 		setMcpRemoveArmed(null);
 	}, [focusedMcp?.config.name, activeTab]);
+	useEffect(() => {
+		setCredentialRemoveArmed(null);
+	}, [cursor, activeTab]);
 	const authorizingMcp = activeTab === "mcps" ? mcpsCatalog.map((entry) => ({
 		entry,
 		status: getMcpAuthStatus(authState, entry.config.name)
 	})).find(({ status }) => status.kind === "authorizing") : void 0;
 	const oauthPasteActive = !!authorizingMcp && authorizingMcp.status.kind === "authorizing" && !!authorizingMcp.status.url;
 	useEffect(() => {
-		if (!oauthPasteActive && !editingInputKey && !authorizingMcp) inputRef.current?.focus();
+		if (!oauthPasteActive && !editingInputKey && !renamingCredential && !authorizingMcp) inputRef.current?.focus();
 	}, [
 		oauthPasteActive,
 		editingInputKey,
+		renamingCredential,
 		authorizingMcp
 	]);
 	useEffect(() => {
 		if (editingInputKey) editInputRef.current?.focus();
 	}, [editingInputKey]);
+	useEffect(() => {
+		if (renamingCredential) renameInputRef.current?.focus();
+	}, [renamingCredential]);
 	/**
 	* Activate the row at `index` on the ACTIVE tab — the ↵ semantics
 	* (toggle / cycle / open editor / run action), extracted so row
@@ -17548,7 +17700,8 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			if (row.method.source === "env" || row.method.active) return;
 			const provider = filteredProviders.find((p) => p.key === row.providerKey);
 			if (!provider) return;
-			const refreshed = actions?.onSetPreferredCredential?.(provider, row.method.source);
+			const target = row.method.key ? { key: row.method.key } : row.method.source;
+			const refreshed = actions?.onSetPreferredCredential?.(provider, target);
 			if (refreshed) setProvidersAfterSwap(refreshed);
 		}
 	}, [
@@ -17583,7 +17736,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	* switch tabs behind the user's back. Also drives the lists' `focused`
 	* prop, so "list looks focused" and "list accepts input" cannot drift.
 	*/
-	const modalInputCaptured = oauthPasteActive || configEditActive || editingInputKey !== null || extInstallActive || skillInstallActive || skillImportAllActive || mcpAddActive;
+	const modalInputCaptured = oauthPasteActive || configEditActive || editingInputKey !== null || renamingCredential !== null || extInstallActive || skillInstallActive || skillImportAllActive || mcpAddActive;
 	/**
 	* Row CLICK dispatch: focus the clicked row, then act on it. Expandable
 	* headers (MCP servers, extensions with config) expand/collapse — the
@@ -17669,6 +17822,10 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			if (key.name === "escape") setEditingInputKey(null);
 			return;
 		}
+		if (renamingCredential) {
+			if (key.name === "escape") setRenamingCredential(null);
+			return;
+		}
 		if (!key.ctrl && !key.meta && !key.shift && (key.name === "left" || key.name === "right")) {
 			key.preventDefault();
 			const idx = tabOrder.indexOf(activeTab);
@@ -17722,6 +17879,39 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			toggleExpandFocusedProviderRow();
 			return;
 		}
+		if (activeTab === "authentication" && key.ctrl && key.name === "x" && actions?.onRemoveCredential) {
+			key.preventDefault();
+			const row = authVisibleRows[cursor];
+			if (row?.kind !== "source" || !row.method.key) return;
+			const provider = filteredProviders.find((p) => p.key === row.providerKey);
+			if (!provider) return;
+			const name = row.method.label ?? row.method.source;
+			if (credentialRemoveArmed !== row.method.key) {
+				setCredentialRemoveArmed(row.method.key);
+				setAuthNotice(`remove ${provider.label} ${name}${row.method.active ? " (in use)" : ""}? press ctrl+x again to confirm.`);
+				return;
+			}
+			setCredentialRemoveArmed(null);
+			const refreshed = actions.onRemoveCredential(provider, row.method.key);
+			if (refreshed) setProvidersAfterSwap(refreshed);
+			setAuthNotice(`removed ${provider.label} ${name}.`);
+			return;
+		}
+		if (activeTab === "authentication" && key.ctrl && key.name === "e" && actions?.onRenameCredential) {
+			key.preventDefault();
+			const row = authVisibleRows[cursor];
+			if (row?.kind !== "source" || row.method.source !== "oauth" || !row.method.key) return;
+			const provider = filteredProviders.find((p) => p.key === row.providerKey);
+			if (!provider) return;
+			setCredentialRemoveArmed(null);
+			setAuthNotice(null);
+			setRenamingCredential({
+				provider,
+				key: row.method.key,
+				label: row.method.label ?? ""
+			});
+			return;
+		}
 		if (key.name === "return") {
 			activateRowAt(cursor);
 			return;
@@ -17974,7 +18164,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		horizontalMargin: 0,
 		verticalMargin: 0,
 		...version ? { bottomTitle: `zidane v${version}` } : {},
-		disableEscape: configEditActive || !!editingInputKey || extInstallActive || skillInstallActive || skillImportAllActive || mcpAddActive,
+		disableEscape: configEditActive || !!editingInputKey || !!renamingCredential || extInstallActive || skillInstallActive || skillImportAllActive || mcpAddActive,
 		children: [
 			/* @__PURE__ */ jsx$1("box", {
 				style: { flexShrink: 0 },
@@ -18170,6 +18360,67 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 					children: mcpOp.text
 				})
 			}),
+			activeTab === "authentication" && authNotice && !renamingCredential && /* @__PURE__ */ jsx$1("box", {
+				style: { flexShrink: 0 },
+				children: /* @__PURE__ */ jsx$1("text", {
+					fg: COLOR.dim,
+					children: authNotice
+				})
+			}),
+			renamingCredential && /* @__PURE__ */ jsxs("box", {
+				style: {
+					flexShrink: 0,
+					flexDirection: "column",
+					border: ["top"],
+					borderColor: COLOR.border,
+					paddingTop: 1
+				},
+				children: [
+					/* @__PURE__ */ jsx$1("text", {
+						fg: COLOR.brand,
+						children: `Rename ${renamingCredential.provider.label} account`
+					}),
+					/* @__PURE__ */ jsx$1("box", {
+						style: {
+							border: true,
+							borderColor: COLOR.borderActive,
+							paddingLeft: 1,
+							paddingRight: 1,
+							height: 3
+						},
+						children: /* @__PURE__ */ jsx$1("input", {
+							ref: renameInputRef,
+							focused: true,
+							value: renamingCredential.label,
+							placeholder: "account name",
+							onSubmit: () => {
+								const next = (renameInputRef.current?.value ?? "").trim();
+								const { provider, key, label } = renamingCredential;
+								setRenamingCredential(null);
+								if (next === label) return;
+								const refreshed = actions?.onRenameCredential?.(provider, key, next);
+								if (refreshed) setProvidersAfterSwap(refreshed);
+								setAuthNotice(`renamed ${provider.label} ${label} to ${next || "Default"}.`);
+							},
+							style: { flexGrow: 1 }
+						})
+					}),
+					/* @__PURE__ */ jsx$1(ModalHints, { hints: [
+						{
+							key: "↵",
+							label: "save"
+						},
+						{
+							key: "esc",
+							label: "cancel"
+						},
+						{
+							key: "",
+							label: `empty = Default`
+						}
+					] })
+				]
+			}),
 			editingInputItem && /* @__PURE__ */ jsxs("box", {
 				style: {
 					flexShrink: 0,
@@ -18241,6 +18492,14 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 					canAddMcp: !!actions?.onAddMcp,
 					canRemoveSkill: !!actions?.onRemoveSkill,
 					canRemoveMcp: !!actions?.onRemoveMcp,
+					canRemoveCredential: !!actions?.onRemoveCredential && activeTab === "authentication" && (() => {
+						const row = authVisibleRows[cursor];
+						return row?.kind === "source" && !!row.method.key;
+					})(),
+					canRenameCredential: !!actions?.onRenameCredential && activeTab === "authentication" && (() => {
+						const row = authVisibleRows[cursor];
+						return row?.kind === "source" && row.method.source === "oauth" && !!row.method.key;
+					})(),
 					focusedExtensionExpandable: activeTab === "extensions" && extensionVisibleRows[cursor] !== void 0 && (() => {
 						const row = extensionVisibleRows[cursor];
 						return row.kind === "config" || row.kind === "extension" && row.hasConfig;
@@ -19602,6 +19861,8 @@ function AuthenticationList({ view, providers, rows, cursor, highlightBg, query
 					const { method } = row;
 					const isEnv = method.source === "env";
 					const dotColor = isEnv ? COLOR.model : method.active ? COLOR.accent : COLOR.mute;
+					const title = method.label ?? method.source;
+					const detail = method.label && method.detail.startsWith(`${method.label} · `) ? `${method.source} · ${method.detail.slice(method.label.length + 3)}` : method.detail;
 					return /* @__PURE__ */ jsx$1("box", {
 						id: anchorIdFor(i),
 						style: {
@@ -19623,11 +19884,11 @@ function AuthenticationList({ view, providers, rows, cursor, highlightBg, query
 								}),
 								/* @__PURE__ */ jsx$1("span", {
 									fg: isEnv ? COLOR.model : method.active ? COLOR.accent : focused ? COLOR.brand : COLOR.dim,
-									children: method.source
+									children: title
 								}),
 								/* @__PURE__ */ jsx$1("span", {
 									fg: COLOR.mute,
-									children: `  ${displayPath$1(method.detail, home)}`
+									children: `  ${displayPath$1(detail, home)}`
 								}),
 								method.active && /* @__PURE__ */ jsx$1("span", {
 									fg: COLOR.mute,
@@ -19635,7 +19896,7 @@ function AuthenticationList({ view, providers, rows, cursor, highlightBg, query
 								})
 							]
 						})
-					}, `${i}:${row.providerKey}:${method.source}`);
+					}, `${i}:${row.providerKey}:${method.key ?? method.source}`);
 				}
 				const p = row.provider;
 				const expanded = row.expandable && rows[i + 1]?.kind === "source";
@@ -19990,7 +20251,7 @@ function renderMcpErrors(errors, home, warnColor, dimColor) {
 		}, err.path))
 	});
 }
-function Hints({ activeTab, authorizing = false, focusedMcp, focusedMcpRow, focusedMcpStatus, canRefreshSkills, canRefreshMcps, canRefreshPlugins, canEditExtension, canCreateExtension, canUpdateExtension, canRemoveExtension, canInstallExtension, canInstallSkill, canEditSkill, canAddMcp, canRemoveSkill, canRemoveMcp, focusedExtensionExpandable, focusedSecretClearable = false, focusedInstructionOpenable = false, focusedInstructionCreatable = false }) {
+function Hints({ activeTab, authorizing = false, focusedMcp, focusedMcpRow, focusedMcpStatus, canRefreshSkills, canRefreshMcps, canRefreshPlugins, canEditExtension, canCreateExtension, canUpdateExtension, canRemoveExtension, canInstallExtension, canInstallSkill, canEditSkill, canAddMcp, canRemoveSkill, canRemoveMcp, canRemoveCredential, canRenameCredential, focusedExtensionExpandable, focusedSecretClearable = false, focusedInstructionOpenable = false, focusedInstructionCreatable = false }) {
 	const COLOR = useColors();
 	const onServerRow = focusedMcpRow?.kind === "server";
 	const showLogin = activeTab === "mcps" && onServerRow && !!focusedMcp && !!focusedMcpStatus && canLogin$1(focusedMcp, focusedMcpStatus);
@@ -20075,6 +20336,14 @@ function Hints({ activeTab, authorizing = false, focusedMcp, focusedMcpRow, focu
 			key: "ctrl+x",
 			label: "remove"
 		}] : [],
+		...canRenameCredential ? [{
+			key: "ctrl+e",
+			label: "rename"
+		}] : [],
+		...canRemoveCredential ? [{
+			key: "ctrl+x",
+			label: "remove"
+		}] : [],
 		...showLogin ? [{
 			key: "ctrl+L",
 			label: "login"
@@ -21306,13 +21575,15 @@ function UsagePanelModal({ dataDir, registry, activeProviderKey, autoLoad = true
 		return (a.providerKey === activeProviderKey ? 0 : 1) - (b.providerKey === activeProviderKey ? 0 : 1);
 	});
 	const { height: termHeight } = useTerminalDimensions();
+	const bodyMaxHeight = Math.max(6, termHeight - 11);
+	const updated = updatedLabel(snapshots);
 	return /* @__PURE__ */ jsxs(Modal, {
 		title: "subscription usage",
 		maxWidth: 72,
 		children: [/* @__PURE__ */ jsx$1("box", {
 			style: {
 				flexDirection: "column",
-				maxHeight: Math.max(6, termHeight - 11),
+				maxHeight: bodyMaxHeight,
 				flexShrink: 1,
 				overflow: "hidden"
 			},
@@ -21334,23 +21605,32 @@ function UsagePanelModal({ dataDir, registry, activeProviderKey, autoLoad = true
 					})
 				}) : ordered.map((snapshot, index) => /* @__PURE__ */ jsx$1(ProviderSection, {
 					snapshot,
-					isActive: snapshot.providerKey === activeProviderKey,
+					account: showsAccount(snapshot, ordered) ? snapshot.account : null,
+					isActive: snapshot.providerKey === activeProviderKey && snapshot.activeCredential,
 					first: index === 0,
 					COLOR
-				}, snapshot.providerKey))
+				}, snapshot.credentialKey))
 			})
-		}), /* @__PURE__ */ jsx$1(ModalHints, { hints: [...envOptedOut ? [] : [{
-			key: "ctrl+r",
-			label: loading ? "refreshing" : "refresh",
-			labelColor: COLOR.dim
-		}], {
-			key: "esc",
-			label: "close",
-			labelColor: COLOR.dim
-		}] })]
+		}), /* @__PURE__ */ jsx$1(ModalHints, { hints: [
+			...envOptedOut ? [] : [{
+				key: "ctrl+r",
+				label: loading ? "refreshing" : "refresh",
+				labelColor: COLOR.dim
+			}],
+			...updated && !loading ? [{
+				key: "",
+				label: updated,
+				labelColor: COLOR.dim
+			}] : [],
+			{
+				key: "esc",
+				label: "close",
+				labelColor: COLOR.dim
+			}
+		] })]
 	});
 }
-function ProviderSection({ snapshot, isActive, first, COLOR }) {
+function ProviderSection({ snapshot, account, isActive, first, COLOR }) {
 	const SURFACE = useSurfaces();
 	const looseCredits = snapshot.windows.some((win) => win.id === "credits") ? null : snapshot.credits;
 	return /* @__PURE__ */ jsxs("box", {
@@ -21373,13 +21653,20 @@ function ProviderSection({ snapshot, isActive, first, COLOR }) {
 				children: [
 					/* @__PURE__ */ jsxs("text", {
 						wrapMode: "none",
-						children: [/* @__PURE__ */ jsx$1("span", {
-							fg: isActive ? COLOR.brand : COLOR.model,
-							children: snapshot.label
-						}), snapshot.plan ? /* @__PURE__ */ jsx$1("span", {
-							fg: COLOR.mute,
-							children: ` · ${snapshot.plan}`
-						}) : null]
+						children: [
+							/* @__PURE__ */ jsx$1("span", {
+								fg: isActive ? COLOR.brand : COLOR.model,
+								children: snapshot.label
+							}),
+							account ? /* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.dim,
+								children: ` · ${account}`
+							}) : null,
+							snapshot.plan ? /* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.mute,
+								children: ` · ${snapshot.plan}`
+							}) : null
+						]
 					}),
 					/* @__PURE__ */ jsx$1("box", { style: { flexGrow: 1 } }),
 					isActive && /* @__PURE__ */ jsx$1("text", {
@@ -27077,16 +27364,36 @@ function AppShell() {
 	}, []);
 	rebuildActiveAgentRef.current = rebuildActiveAgent;
 	/**
+	* Shared tail of every in-modal credential mutation (swap, per-account
+	* removal): re-reconcile `process.env`, rebuild the live agent when it is the
+	* one affected, and hand back fresh detection for the modal to render.
+	*
+	* `applyApiKeyEnv` is the step that actually makes a change take effect: a
+	* promoted API key has to be injected, and a promoted OAuth grant has to
+	* CLEAR the ambient var so the refresh path runs instead of a stale token.
+	*/
+	const afterCredentialChange = useCallback((providerKey) => {
+		applyApiKeyEnv(config.paths.userDir, providerRegistry, { log: (message) => getTuiLogging()?.sink.emit({
+			level: "debug",
+			timestamp: Date.now(),
+			message: message.trimEnd(),
+			attrs: { scope: "chat" }
+		}) });
+		if (providerKey === pickedRef.current?.provider.key) rebuildActiveAgent().catch((err) => debugLog("afterCredentialChange: rebuild failed", err));
+		return detectAuth(config.paths.userDir, providerRegistry);
+	}, [
+		config.paths.userDir,
+		providerRegistry,
+		rebuildActiveAgent
+	]);
+	/**
 	* Promote one of a provider's stored credentials — Settings → Authentication
-	* → `↵` on a source row, for a provider holding both an API key and an OAuth
-	* grant.
+	* → `↵` on a source row, for a provider holding more than one (an API key,
+	* several OAuth accounts).
 	*
 	* The preference IS the storage layout (the canonical file key holds the
 	* winner), so persisting it is the entire change — there is no separate
-	* precedence setting to keep in sync. `applyApiKeyEnv` then re-reconciles
-	* `process.env`, which is the step that actually makes it take effect: a
-	* promoted API key has to be injected, and a promoted OAuth grant has to
-	* CLEAR the ambient var so the refresh path runs instead of a stale token.
+	* precedence setting to keep in sync.
 	*
 	* Returns freshly-detected providers instead of closing the modal. The
 	* settings modal's provider list is frozen at open time, so an earlier
@@ -27100,26 +27407,47 @@ function AppShell() {
 	*/
 	const onSetPreferredCredential = useMemo(() => {
 		if (busy || pendingApproval) return void 0;
-		return (provider, source) => {
+		return (provider, target) => {
 			const descriptor = providerRegistry[provider.key];
 			if (!descriptor) return void 0;
-			if (setPreferredCredential(config.paths.userDir, descriptor, source) !== "promoted") return void 0;
-			applyApiKeyEnv(config.paths.userDir, providerRegistry, { log: (message) => getTuiLogging()?.sink.emit({
-				level: "debug",
-				timestamp: Date.now(),
-				message: message.trimEnd(),
-				attrs: { scope: "chat" }
-			}) });
-			if (provider.key === pickedRef.current?.provider.key) rebuildActiveAgent().catch((err) => debugLog("onSetPreferredCredential: rebuild failed", err));
-			return detectAuth(config.paths.userDir, providerRegistry);
+			if (setPreferredCredential(config.paths.userDir, descriptor, target) !== "promoted") return void 0;
+			return afterCredentialChange(provider.key);
 		};
 	}, [
 		busy,
 		pendingApproval,
-		config.paths.userDir,
 		providerRegistry,
-		rebuildActiveAgent
+		afterCredentialChange
 	]);
+	/**
+	* Drop ONE stored credential — Settings → Authentication → `ctrl+x` on a
+	* source row. Removing the active one promotes a survivor (`removeStoredCredential`),
+	* so the same env + agent reconciliation as a swap applies.
+	*/
+	const onRemoveCredential = useMemo(() => {
+		if (busy || pendingApproval) return void 0;
+		return (provider, key) => {
+			const descriptor = providerRegistry[provider.key];
+			if (!descriptor) return void 0;
+			if (!removeStoredCredential(config.paths.userDir, descriptor, key)) return void 0;
+			return afterCredentialChange(provider.key);
+		};
+	}, [
+		busy,
+		pendingApproval,
+		providerRegistry,
+		afterCredentialChange
+	]);
+	/**
+	* Rename a stored OAuth account — Settings → Authentication → `ctrl+e` on
+	* its row. Presentation only: the name plays no part in credential
+	* resolution, so no env reconcile or agent rebuild follows.
+	*/
+	const onRenameCredential = useCallback((provider, key, label) => {
+		const descriptor = providerRegistry[provider.key];
+		if (!descriptor || !setCredentialLabel(config.paths.userDir, descriptor, key, label)) return void 0;
+		return detectAuth(config.paths.userDir, providerRegistry);
+	}, [config.paths.userDir, providerRegistry]);
 	useEffect(() => {
 		const prev = mcpRuntimeKeyRef.current;
 		if (prev === null) {
@@ -28138,6 +28466,8 @@ function AppShell() {
 				actions: {
 					onConfigureProvider,
 					onSetPreferredCredential,
+					onRemoveCredential,
+					onRenameCredential,
 					onOpenKeybindings: onOpenKeybindingsFile,
 					getContextSegments: onReadContextSegments,
 					onOpenInstructionsFile,