@oh-my-pi/pi-coding-agent 16.5.0 → 16.5.2

package/src/mcp/tool-bridge.ts

@@ -15,8 +15,10 @@ import type {
 	CustomToolResult,
 	RenderResultOptions,
 } from "../extensibility/custom-tools/types";
+import { resolveLocalUrlToFile } from "../internal-urls/local-protocol";
 import type { Theme } from "../modes/theme/theme";
 import type { OutputMeta } from "../tools/output-meta";
+import { normalizeLocalScheme } from "../tools/path-utils";
 import { ToolAbortError, throwIfAborted } from "../tools/tool-errors";
 import { callTool } from "./client";
 import { renderMCPCall, renderMCPResult } from "./render";
@@ -104,13 +106,62 @@ function stripHarnessIntent(args: MCPToolArgs, inputSchema: MCPToolDefinition["i
 	return rest;
 }
 
+async function resolveOutboundLocalUrlArgs(
+	value: unknown,
+	context: CustomToolContext,
+	seen: WeakSet<object> = new WeakSet(),
+): Promise<unknown> {
+	if (typeof value === "string") {
+		const normalized = normalizeLocalScheme(value);
+		if (!normalized.startsWith("local://")) return value;
+		const localFile = await resolveLocalUrlToFile(normalized, {
+			cwd: context.sessionManager?.getCwd?.(),
+			settings: context.settings,
+			localProtocolOptions: context.localProtocolOptions,
+		});
+		return localFile?.path ?? value;
+	}
+	if (typeof value !== "object" || value === null) return value;
+	if (seen.has(value)) return value;
+	seen.add(value);
+
+	if (Array.isArray(value)) {
+		let resolved: unknown[] | undefined;
+		for (let index = 0; index < value.length; index++) {
+			const item = value[index];
+			const next = await resolveOutboundLocalUrlArgs(item, context, seen);
+			if (next === item && !resolved) continue;
+			resolved ??= value.slice();
+			resolved[index] = next;
+		}
+		return resolved ?? value;
+	}
+
+	const input = value as Record<string, unknown>;
+	let resolved: Record<string, unknown> | undefined;
+	for (const key in input) {
+		const item = input[key];
+		const next = await resolveOutboundLocalUrlArgs(item, context, seen);
+		if (next === item && !resolved) continue;
+		resolved ??= { ...input };
+		resolved[key] = next;
+	}
+	return resolved ?? value;
+}
+
 /**
  * Normalize raw tool params into the outbound `tools/call` arguments: strip
- * the harness intent field, then drop optional empty placeholders the server
- * declares but doesn't require.
+ * the harness intent field, drop optional empty placeholders the server
+ * declares but doesn't require, then translate session-local files to paths
+ * external MCP servers can read.
  */
-function prepareOutboundArgs(params: unknown, inputSchema: MCPToolDefinition["inputSchema"]): MCPToolArgs {
-	return omitUnusedOptionalArgs(stripHarnessIntent(normalizeToolArgs(params), inputSchema), inputSchema);
+async function prepareOutboundArgs(
+	params: unknown,
+	inputSchema: MCPToolDefinition["inputSchema"],
+	context: CustomToolContext,
+): Promise<MCPToolArgs> {
+	const args = omitUnusedOptionalArgs(stripHarnessIntent(normalizeToolArgs(params), inputSchema), inputSchema);
+	return (await resolveOutboundLocalUrlArgs(args, context)) as MCPToolArgs;
 }
 
 /** Details included in MCP tool results for rendering */
@@ -316,7 +367,7 @@ export class MCPTool implements CustomTool<TSchema, MCPToolDetails> {
 		signal?: AbortSignal,
 	): Promise<CustomToolResult<MCPToolDetails>> {
 		throwIfAborted(signal);
-		const args = prepareOutboundArgs(params, this.tool.inputSchema);
+		const args = await prepareOutboundArgs(params, this.tool.inputSchema, _ctx);
 		const provider = this.connection._source?.provider;
 		const providerName = this.connection._source?.providerName;
 
@@ -415,7 +466,7 @@ export class DeferredMCPTool implements CustomTool<TSchema, MCPToolDetails> {
 		signal?: AbortSignal,
 	): Promise<CustomToolResult<MCPToolDetails>> {
 		throwIfAborted(signal);
-		const args = prepareOutboundArgs(params, this.tool.inputSchema);
+		const args = await prepareOutboundArgs(params, this.tool.inputSchema, _ctx);
 		const provider = this.#fallbackProvider;
 		const providerName = this.#fallbackProviderName;
 

package/src/modes/components/__tests__/dynamic-border.test.ts

@@ -0,0 +1,55 @@
+import { describe, expect, it } from "bun:test";
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { getThemeByName, setThemeInstance, theme } from "../../theme/theme";
+import { DynamicBorder } from "../dynamic-border";
+
+const componentPath = path.resolve(import.meta.dir, "../dynamic-border.ts");
+
+describe("DynamicBorder", () => {
+	// Regression for #5366: extensions importing legacy pi UI components get a
+	// second `src` module graph whose module-level `theme` is never assigned by
+	// host startup. `render()` must degrade to plain glyphs instead of throwing
+	// "undefined is not an object (evaluating 'theme.boxRound')" and killing the
+	// TUI. Other test files in the same process initialize the theme module, so
+	// the uninitialized state is only reachable in a fresh module graph — a
+	// subprocess reproduces the actual reported scenario deterministically.
+	it("renders plain glyphs when the module-level theme is uninitialized", async () => {
+		const dir = await fs.mkdtemp(path.join(os.tmpdir(), "omp-dynamic-border-"));
+		try {
+			const script = [
+				`import { DynamicBorder } from ${JSON.stringify(componentPath)};`,
+				'const custom = new DynamicBorder(str => "<" + str + ">");',
+				`if (JSON.stringify(custom.render(4)) !== JSON.stringify(["<────>"])) process.exit(1);`,
+				"const plain = new DynamicBorder();",
+				`if (JSON.stringify(plain.render(3)) !== JSON.stringify(["───"])) process.exit(2);`,
+				"",
+			].join("\n");
+			const file = path.join(dir, "uninitialized-theme.ts");
+			await Bun.write(file, script);
+			const proc = Bun.spawn(["bun", file], { stdin: "ignore", stdout: "pipe", stderr: "pipe" });
+			const [exitCode, stderr] = await Promise.all([
+				proc.exited,
+				new Response(proc.stderr as ReadableStream<Uint8Array>).text(),
+			]);
+			expect(stderr).toBe("");
+			expect(exitCode).toBe(0);
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true });
+		}
+	});
+
+	it("paints with theme.boxRound.horizontal once the theme is initialized", async () => {
+		const previous = theme;
+		const loaded = await getThemeByName("dark");
+		if (!loaded) throw new Error("theme unavailable");
+		setThemeInstance(loaded);
+		try {
+			const border = new DynamicBorder(str => `<${str}>`);
+			expect(border.render(3)).toEqual([`<${loaded.boxRound.horizontal.repeat(3)}>`]);
+		} finally {
+			if (previous) setThemeInstance(previous);
+		}
+	});
+});

package/src/modes/components/agent-dashboard.ts

@@ -1142,11 +1142,11 @@ export class AgentDashboard extends Container {
 			return;
 		}
 
-		if (matchesSelectUp(data) || data === "k") {
+		if (matchesSelectUp(data) || matchesKey(data, "k")) {
 			this.#moveSelection(-1);
 			return;
 		}
-		if (matchesSelectDown(data) || data === "j") {
+		if (matchesSelectDown(data) || matchesKey(data, "j")) {
 			this.#moveSelection(1);
 			return;
 		}

package/src/modes/components/agent-hub.ts

@@ -340,6 +340,19 @@ export class AgentHubOverlayComponent extends Container {
 		this.#handleTableInput(keyData);
 	}
 
+	/**
+	 * Seed the table's left-left close detector with the current time so a single
+	 * subsequent `←` (within {@link LEFT_TAP_WINDOW_MS}) dismisses the hub.
+	 *
+	 * The editor's own double-tap detector consumes the `←←` that opens the hub,
+	 * leaving this detector at its fresh `0` — without this handoff the user would
+	 * have to press `←←` a second time to escape. Called by the opener when the hub
+	 * was raised by that gesture.
+	 */
+	armCloseTap(): void {
+		this.#lastLeftTap = Date.now();
+	}
+
 	/**
 	 * Open the fullscreen transcript viewer for an agent id (public for table Enter
 	 * and tests). Mounts {@link AgentTranscriptViewer} as a `fullscreen` overlay so it
@@ -573,14 +586,14 @@ export class AgentHubOverlayComponent extends Container {
 			}
 			return;
 		}
-		if (keyData === "j" || matchesSelectDown(keyData)) {
+		if (matchesKey(keyData, "j") || matchesSelectDown(keyData)) {
 			if (this.#rows.length > 0) {
 				this.#selectedRow = Math.min(this.#selectedRow + 1, this.#rows.length - 1);
 			}
 			this.#requestRender();
 			return;
 		}
-		if (keyData === "k" || matchesSelectUp(keyData)) {
+		if (matchesKey(keyData, "k") || matchesSelectUp(keyData)) {
 			if (this.#rows.length > 0) {
 				this.#selectedRow = Math.max(this.#selectedRow - 1, 0);
 			}

package/src/modes/components/agent-transcript-viewer.ts

@@ -496,9 +496,9 @@ export class AgentTranscriptViewer implements Component {
 			this.deps.requestRender();
 			return true;
 		}
-		if (data === "j" || matchesSelectDown(data)) {
+		if (matchesKey(data, "j") || matchesSelectDown(data)) {
 			this.#scrollView.scroll(1);
-		} else if (data === "k" || matchesSelectUp(data)) {
+		} else if (matchesKey(data, "k") || matchesSelectUp(data)) {
 			this.#scrollView.scroll(-1);
 		} else if (data === "g") {
 			this.#scrollView.scrollToTop();

package/src/modes/components/chat-transcript-builder.ts

@@ -35,6 +35,7 @@ import {
 	buildIrcMessageCard,
 	normalizeToolArgs,
 	resolveAssistantErrorPresentation,
+	splitAssistantMessageToolTimeline,
 } from "../utils/transcript-render-helpers";
 import { createAdvisorMessageCard } from "./advisor-message";
 import { AssistantMessageComponent } from "./assistant-message";
@@ -273,12 +274,13 @@ export class ChatTranscriptBuilder {
 	#appendAssistantMessage(message: Extract<AgentMessage, { role: "assistant" }>): void {
 		const hideThinkingBlock = this.deps.hideThinkingBlock?.() ?? false;
 		const proseOnlyThinking = this.deps.proseOnlyThinking ? this.deps.proseOnlyThinking() : true;
+		const timeline = splitAssistantMessageToolTimeline(message);
 		const assistantComponent = new AssistantMessageComponent(
-			message,
+			timeline.beforeTools,
 			hideThinkingBlock,
 			() => this.deps.requestRender(),
 			this.deps.getMessageRenderer ? undefined : [], // placeholder for thinkingRenderers
-			undefined, // placeholder for imageBudget
+			this.deps.ui.imageBudget,
 			proseOnlyThinking,
 		);
 		this.container.addChild(assistantComponent);
@@ -301,11 +303,24 @@ export class ChatTranscriptBuilder {
 		const errorPresentation = resolveAssistantErrorPresentation(message);
 		const hasErrorStop = errorPresentation.kind === "full";
 		const errorMessage = hasErrorStop ? errorPresentation.text : null;
+		const appendAssistantSegment = (segment: Extract<AgentMessage, { role: "assistant" }> | undefined) => {
+			if (!segment || !assistantHasVisibleContent(segment)) return;
+			const component = new AssistantMessageComponent(
+				segment,
+				hideThinkingBlock,
+				() => this.deps.requestRender(),
+				this.deps.getMessageRenderer ? undefined : [],
+				undefined,
+				proseOnlyThinking,
+			);
+			this.container.addChild(component);
+		};
 
 		for (const content of message.content) {
 			if (content.type !== "toolCall") continue;
 			this.#resolveWaitingPoll(content.name);
 
+			const afterToolSegment = timeline.afterToolCalls.get(content.id);
 			if (
 				content.name === "read" &&
 				readArgsHaveTarget(content.arguments) &&
@@ -319,10 +334,15 @@ export class ChatTranscriptBuilder {
 						false,
 						content.id,
 					);
+				} else if (afterToolSegment) {
+					const group = this.#ensureReadGroup();
+					group.updateArgs(content.arguments, content.id);
+					this.#pendingTools.set(content.id, group);
 				} else {
 					const normalizedArgs = normalizeToolArgs(content.arguments);
 					this.#readArgs.set(content.id, normalizedArgs);
 				}
+				appendAssistantSegment(afterToolSegment);
 				continue;
 			}
 
@@ -332,8 +352,9 @@ export class ChatTranscriptBuilder {
 				content.name,
 				content.arguments,
 				{
-					// Images can't be sliced through the scroll viewport; keep them off.
-					showImages: false,
+					// Stable ids and Kitty placeholder cells keep images anchored
+					// while the transcript viewport scrolls and reflows.
+					showImages: settings.get("terminal.showImages"),
 					editFuzzyThreshold: settings.get("edit.fuzzyThreshold"),
 					editAllowFuzzy: settings.get("edit.fuzzyMatch"),
 					liveRegion: this.container,
@@ -355,6 +376,7 @@ export class ChatTranscriptBuilder {
 			} else {
 				this.#pendingTools.set(content.id, component);
 			}
+			appendAssistantSegment(afterToolSegment);
 		}
 
 		this.#pendingUsage =

package/src/modes/components/dynamic-border.ts

@@ -1,19 +1,21 @@
 import type { Component } from "@oh-my-pi/pi-tui";
-import { theme } from "../../modes/theme/theme";
+import { fgOrPlain, theme } from "../../modes/theme/theme";
 
 /**
  * Dynamic border component that adjusts to viewport width.
  *
- * Note: When used from hooks loaded via jiti, the global `theme` may be undefined
- * because jiti creates a separate module cache. Always pass an explicit color
- * function when using DynamicBorder in components exported for hook use.
+ * Note: the module-level `theme` may be `undefined` — when loaded through jiti
+ * (separate module cache) or from a second `src` module graph in npm-package
+ * installs, where the host bundle assigns `theme` but this copy never sees it
+ * (issue #5366). Both the default color and `render()` degrade to plain,
+ * unstyled output instead of crashing the TUI.
  */
 export class DynamicBorder implements Component {
 	#color: (str: string) => string;
 	#cachedWidth = -1;
 	#cachedLines: string[] | undefined;
 
-	constructor(color: (str: string) => string = str => theme.fg("border", str)) {
+	constructor(color: (str: string) => string = str => fgOrPlain("border", str)) {
 		this.#color = color;
 	}
 
@@ -26,7 +28,8 @@ export class DynamicBorder implements Component {
 		if (this.#cachedLines && this.#cachedWidth === width) {
 			return this.#cachedLines;
 		}
-		const lines = [this.#color(theme.boxRound.horizontal.repeat(Math.max(1, width)))];
+		const horizontal = typeof theme === "undefined" ? "─" : theme.boxRound.horizontal;
+		const lines = [this.#color(horizontal.repeat(Math.max(1, width)))];
 		this.#cachedWidth = width;
 		this.#cachedLines = lines;
 		return lines;

package/src/modes/components/extensions/extension-list.ts

@@ -449,12 +449,12 @@ export class ExtensionList implements Component {
 
 	handleInput(data: string): void {
 		// Navigation
-		if (matchesSelectUp(data) || data === "k") {
+		if (matchesSelectUp(data) || matchesKey(data, "k")) {
 			this.#moveSelectionUp();
 			return;
 		}
 
-		if (matchesSelectDown(data) || data === "j") {
+		if (matchesSelectDown(data) || matchesKey(data, "j")) {
 			this.#moveSelectionDown();
 			return;
 		}

package/src/modes/components/hook-selector.ts

@@ -652,17 +652,23 @@ export class HookSelectorComponent extends Container {
 			return;
 		}
 
-		if (matchesSelectUp(keyData) || (!this.#isSearchEnabled() && keyData === "k")) {
+		if (matchesSelectUp(keyData) || (!this.#isSearchEnabled() && matchesKey(keyData, "k"))) {
 			this.#moveSelection(-1);
-		} else if (matchesSelectDown(keyData) || (!this.#isSearchEnabled() && keyData === "j")) {
+		} else if (matchesSelectDown(keyData) || (!this.#isSearchEnabled() && matchesKey(keyData, "j"))) {
 			this.#moveSelection(1);
 		} else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const selected = this.#filteredOptions[this.#selectedIndex];
 			if (selected && !this.#isDisabled(selected.index)) this.#onSelectCallback(selected.option.label);
-		} else if (matchesKey(keyData, "left") || (this.#slider && !this.#isSearchEnabled() && keyData === "h")) {
+		} else if (
+			matchesKey(keyData, "left") ||
+			(this.#slider && !this.#isSearchEnabled() && matchesKey(keyData, "h"))
+		) {
 			if (this.#slider) this.#moveSlider(-1);
 			else this.#onLeftCallback?.();
-		} else if (matchesKey(keyData, "right") || (this.#slider && !this.#isSearchEnabled() && keyData === "l")) {
+		} else if (
+			matchesKey(keyData, "right") ||
+			(this.#slider && !this.#isSearchEnabled() && matchesKey(keyData, "l"))
+		) {
 			if (this.#slider) this.#moveSlider(1);
 			else this.#onRightCallback?.();
 		} else if (this.#onExternalEditorCallback && matchesAppExternalEditor(keyData)) {

package/src/modes/components/login-dialog.ts

@@ -164,6 +164,11 @@ export class LoginDialogComponent extends Container {
 		this.#tui.requestRender();
 	}
 
+	/** Route non-bracketed paste transports into the active login input. */
+	pasteText(text: string): void {
+		this.#input.pasteText(text);
+	}
+
 	handleInput(data: string): void {
 		const kb = getKeybindings();
 

package/src/modes/components/mcp-add-wizard.ts

@@ -63,6 +63,7 @@ export interface MCPAddWizardOAuthResult {
 interface MCPAddWizardOAuthOptions {
 	serverUrl?: string;
 	resource?: string;
+	registrationUrl?: string;
 	/**
 	 * External cancellation source. Aborting it tears down the in-flight OAuth
 	 * flow and surfaces a neutral cancellation error. The wizard wires its own
@@ -82,6 +83,7 @@ interface WizardState {
 	authMethod: AuthMethod;
 	oauthAuthUrl: string;
 	oauthTokenUrl: string;
+	oauthRegistrationUrl: string;
 	oauthClientId: string;
 	oauthClientSecret: string;
 	oauthScopes: string;
@@ -113,6 +115,7 @@ export class MCPAddWizard extends Container {
 		authMethod: "none",
 		oauthAuthUrl: "",
 		oauthTokenUrl: "",
+		oauthRegistrationUrl: "",
 		oauthClientId: "",
 		oauthClientSecret: "",
 		oauthScopes: "",
@@ -1026,6 +1029,7 @@ export class MCPAddWizard extends Container {
 				if (oauth) {
 					this.#state.oauthAuthUrl = oauth.authorizationUrl;
 					this.#state.oauthTokenUrl = oauth.tokenUrl;
+					this.#state.oauthRegistrationUrl = oauth.registrationUrl || "";
 					this.#state.oauthClientId = oauth.clientId || "";
 					this.#state.oauthScopes = oauth.scopes || "";
 					this.#state.oauthResource = oauth.resource || (this.#state.transport === "stdio" ? "" : this.#state.url);
@@ -1196,6 +1200,7 @@ export class MCPAddWizard extends Container {
 				this.#state.oauthScopes,
 				{
 					serverUrl: this.#state.url || undefined,
+					registrationUrl: this.#state.oauthRegistrationUrl || undefined,
 					resource: oauthResource || undefined,
 					abortSignal: this.#oauthAbort.signal,
 				},

package/src/modes/components/plan-review-overlay.ts

@@ -400,8 +400,8 @@ export class PlanReviewOverlay implements Component {
 		// Left/right always drive the slider. The sidebar sits beside the body
 		// (above this row), not the slider, so stealing left for it would strand
 		// the operator unable to step the model tier back — reach the ToC via Tab.
-		const isLeft = matchesKey(data, "left") || (this.#slider !== undefined && data === "h");
-		const isRight = matchesKey(data, "right") || (this.#slider !== undefined && data === "l");
+		const isLeft = matchesKey(data, "left") || (this.#slider !== undefined && matchesKey(data, "h"));
+		const isRight = matchesKey(data, "right") || (this.#slider !== undefined && matchesKey(data, "l"));
 		if (isLeft) {
 			this.#moveSlider(-1);
 			return;
@@ -410,12 +410,12 @@ export class PlanReviewOverlay implements Component {
 			this.#moveSlider(1);
 			return;
 		}
-		if (matchesSelectUp(data) || data === "k") {
+		if (matchesSelectUp(data) || matchesKey(data, "k")) {
 			if (this.#selectedIndex === this.#firstEnabledIndex()) this.#setFocus("body");
 			else this.#moveSelection(-1);
 			return;
 		}
-		if (matchesSelectDown(data) || data === "j") {
+		if (matchesSelectDown(data) || matchesKey(data, "j")) {
 			this.#moveSelection(1);
 			return;
 		}
@@ -427,13 +427,13 @@ export class PlanReviewOverlay implements Component {
 	}
 
 	#handleBody(data: string): void {
-		if (matchesKey(data, "left") || data === "h") {
+		if (matchesKey(data, "left") || matchesKey(data, "h")) {
 			if (this.#sidebarShown) this.#setFocus("toc");
 			return;
 		}
 		if (
 			matchesKey(data, "right") ||
-			data === "l" ||
+			matchesKey(data, "l") ||
 			matchesKey(data, "enter") ||
 			matchesKey(data, "return") ||
 			data === "\n"
@@ -444,12 +444,12 @@ export class PlanReviewOverlay implements Component {
 		// Vertical nav flows between regions at the edges: scrolling off the bottom
 		// drops into the actions ("next step"); scrolling off the top steps back up
 		// to the ToC.
-		if (matchesSelectUp(data) || data === "k") {
+		if (matchesSelectUp(data) || matchesKey(data, "k")) {
 			if (this.#scrollView.getScrollOffset() <= 0 && this.#sidebarShown) this.#setFocus("toc");
 			else this.#scrollView.scroll(-1);
 			return;
 		}
-		if (matchesSelectDown(data) || data === "j") {
+		if (matchesSelectDown(data) || matchesKey(data, "j")) {
 			if (this.#scrollView.getScrollOffset() >= this.#scrollView.getMaxScrollOffset()) this.#setFocus("actions");
 			else this.#scrollView.scroll(1);
 			return;
@@ -470,11 +470,11 @@ export class PlanReviewOverlay implements Component {
 	}
 
 	#handleToc(data: string): void {
-		if (matchesSelectUp(data) || data === "k") {
+		if (matchesSelectUp(data) || matchesKey(data, "k")) {
 			this.#moveTocCursor(-1);
 			return;
 		}
-		if (matchesSelectDown(data) || data === "j") {
+		if (matchesSelectDown(data) || matchesKey(data, "j")) {
 			// Past the last section, fall through to the actions ("next step").
 			if (this.#tocCursor >= this.#toc.length - 1) this.#setFocus("actions");
 			else this.#moveTocCursor(1);
@@ -482,7 +482,7 @@ export class PlanReviewOverlay implements Component {
 		}
 		if (
 			matchesKey(data, "right") ||
-			data === "l" ||
+			matchesKey(data, "l") ||
 			matchesKey(data, "enter") ||
 			matchesKey(data, "return") ||
 			data === "\n"

package/src/modes/components/read-tool-group.ts

@@ -37,9 +37,6 @@ export function readArgsTargetInternalUrl(args: unknown): boolean {
 type ReadRenderArgs = {
 	path?: string;
 	file_path?: string;
-	selector?: string;
-	// Legacy field from the old schema; tolerated for rebuilt transcripts.
-	sel?: string;
 };
 
 type ReadToolSuffixResolution = {
@@ -344,11 +341,7 @@ export class ReadToolGroupComponent extends Container implements ToolExecutionHa
 
 	updateArgs(args: ReadRenderArgs, toolCallId?: string): void {
 		if (!toolCallId) return;
-		const basePath = args.file_path || args.path || "";
-		const rawSelector =
-			typeof args.selector === "string" ? args.selector : typeof args.sel === "string" ? args.sel : undefined;
-		const selector = rawSelector?.trim().replace(/^:+/, "");
-		const rawPath = selector && selector.length > 0 ? `${basePath}:${selector}` : basePath;
+		const rawPath = args.file_path || args.path || "";
 		const entry: ReadEntry = this.#entries.get(toolCallId) ?? {
 			toolCallId,
 			path: rawPath,

package/src/modes/components/status-line/component.ts

@@ -780,7 +780,16 @@ export class StatusLineComponent implements Component {
 		const activeProvider = session.state.model?.provider ?? session.model?.provider ?? "";
 		if (!activeProvider) return "";
 		const identity = session.modelRegistry?.authStorage?.getOAuthAccountIdentity(activeProvider, session.sessionId);
-		return [activeProvider, identity?.accountId ?? "", identity?.email ?? "", identity?.projectId ?? ""].join("\0");
+		// orgId is part of the key: rotating between two same-email Anthropic
+		// subscriptions must invalidate the cached usage immediately instead of
+		// showing the previous org's quota for the rest of the cache TTL.
+		return [
+			activeProvider,
+			identity?.accountId ?? "",
+			identity?.email ?? "",
+			identity?.projectId ?? "",
+			identity?.orgId ?? "",
+		].join("\0");
 	}
 
 	/**