Claude Code. Any Model. The most powerful AI coding agent now speaks every language.
fix(mcp): set the config TUI's Keychain role to never in an MCP session
Jack Rudenkobbd4c40ab3af
diff --git a/packages/cli/src/auth/credentials/prompt-role.test.ts b/packages/cli/src/auth/credentials/prompt-role.test.tsindex a8f627e0..300b67ca 100644--- a/packages/cli/src/auth/credentials/prompt-role.test.ts+++ b/packages/cli/src/auth/credentials/prompt-role.test.ts@@ -129,6 +129,26 @@ describe("P1: permission to read a credential", () => {expect(roles.decideLaunchRole(facts)).toBe("never");});}+ describe("decideTuiRole", () => {+ test("standalone TUI receives tui rights", () => {+ expect(roles.decideTuiRole({})).toBe("tui");+ });+ test("MCP session marker denies TUI rights without a cwd", () => {+ expect(roles.decideTuiRole({ CLAUDISH_PANE_CHILD: "1" })).toBe("never");+ });+ test("MCP session marker denies TUI rights with a cwd", () => {+ expect(roles.decideTuiRole({ CLAUDISH_PANE_CHILD: "1", CLAUDISH_PANE_CWD: "/x" })).toBe(+ "never"+ );+ });+ test("MCP session TUI role cannot later be raised to tui", () => {+ roles._resetCredentialPromptRoleForTest();+ roles.setCredentialPromptRole(roles.decideTuiRole({ CLAUDISH_PANE_CHILD: "1" }));+ expect(roles.credentialPromptRole()).toBe("never");+ roles.setCredentialPromptRole("tui");+ expect(roles.credentialPromptRole()).toBe("never");+ });+ });test("never role cannot gain rights from prompt:true", async () => {await expect(core.ensureMuseCredentialReady({ prompt: true })).rejects.toThrow("login");expect(reads).toBe(0);diff --git a/packages/cli/src/auth/credentials/prompt-role.ts b/packages/cli/src/auth/credentials/prompt-role.tsindex 87d2a2fe..97eb112e 100644--- a/packages/cli/src/auth/credentials/prompt-role.ts+++ b/packages/cli/src/auth/credentials/prompt-role.ts@@ -93,6 +93,17 @@ export function decideLaunchRole(facts: LaunchFacts): CredentialPromptRole {return "interactive-launch";}+/**+ * The role of the config TUI (`tui/index.tsx` `startConfigTui`). Inside an MCP+ * session it is `never`: a `claudish config` typed into a session's pane renders+ * on a screen nobody may be watching, so a Keychain dialog would wait unseen.+ */+export function decideTuiRole(+ env: Record<string, string | undefined> = process.env+): CredentialPromptRole {+ return inMcpSession(env) ? "never" : "tui";+}+/** Test seam: forget the role, as if no entry point had run. */export function _resetCredentialPromptRoleForTest(): void {role = "never";diff --git a/packages/cli/src/tui/index.tsx b/packages/cli/src/tui/index.tsxindex b75c96f9..5b1b528a 100644--- a/packages/cli/src/tui/index.tsx+++ b/packages/cli/src/tui/index.tsx@@ -5,7 +5,7 @@ import { createRoot } from "@opentui/react";import { _resetAntigravityTokenState } from "../auth/antigravity-token.js";import { getCodexOAuth } from "../auth/codex-oauth.js";import { credentials } from "../auth/credentials/authority.js";-import { setCredentialPromptRole } from "../auth/credentials/prompt-role.js";+import { decideTuiRole, setCredentialPromptRole } from "../auth/credentials/prompt-role.js";import { getKimiOAuth } from "../auth/kimi-oauth.js";import { setStderrQuiet } from "../logger.js";import { applyRendererThemeMode } from "../theme/renderer-theme.js";@@ -36,8 +36,8 @@ import { invalidateProbeProxyHandlers, shutdownProbeProxy } from "./probe-proxy.export async function startConfigTui(): Promise<void> {// The config TUI may read a credential only inside an explicit user action,// in-process, before that action issues any proxy request- // (`auth/credentials/prompt-role.ts`).- setCredentialPromptRole("tui");+ // (`auth/credentials/prompt-role.ts`), and never inside an MCP session.+ setCredentialPromptRole(decideTuiRole());// Register bundled endpoints before the first render: the Providers tab is// built from `getAllProviders()`, so a catalog vendor the user has a key for// must already be in the provider list or it simply is not there to configure.