@oh-my-pi/pi-coding-agent 17.2.3 → 17.2.4

package/src/extensibility/plugins/marketplace/registry.ts

@@ -2,7 +2,7 @@
  * Registry read/write operations for the marketplace plugin system.
  *
  * Two registries:
- *   - marketplaces.json under getConfigRootDir() — which catalogs the user has added
+ *   - marketplaces.json at getMarketplacesRegistryPath() — which catalogs the user has added
  *   - installed_plugins.json under getPluginsDir() — which plugins are installed
  *
  * Read/write functions accept explicit file paths so callers control the
@@ -15,7 +15,9 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 
-import { getConfigRootDir, getPluginsDir, isEnoent, logger, tryParseJson } from "@oh-my-pi/pi-utils";
+import { getPluginsDir, isEnoent, logger, tryParseJson } from "@oh-my-pi/pi-utils";
+
+export { getMarketplacesRegistryPath } from "@oh-my-pi/pi-utils";
 
 import type {
 	InstalledPluginEntry,
@@ -24,12 +26,6 @@ import type {
 	MarketplacesRegistry,
 } from "./types";
 
-// ── Path helpers ─────────────────────────────────────────────────────
-
-export function getMarketplacesRegistryPath(): string {
-	return path.join(getConfigRootDir(), "marketplaces.json");
-}
-
 export function getInstalledPluginsRegistryPath(): string {
 	return path.join(getPluginsDir(), "installed_plugins.json");
 }

package/src/launch/paths.ts

@@ -1,11 +1,8 @@
 import * as path from "node:path";
-import { getConfigRootDir } from "@oh-my-pi/pi-utils";
+import { getDaemonRuntimeDir } from "@oh-my-pi/pi-utils";
 
 /** Resolve the private runtime directory shared by omp processes in one project directory. */
-export function daemonRuntimeDir(projectDir: string, configRoot: string = getConfigRootDir()): string {
-	const key = Bun.hash.wyhash(path.resolve(projectDir)).toString(16).padStart(16, "0");
-	return path.join(configRoot, "run", "daemons", key);
-}
+export { getDaemonRuntimeDir as daemonRuntimeDir };
 
 /** Resolve the Unix socket or Windows named pipe used by one project broker. */
 export function daemonBrokerEndpoint(projectDir: string, runtimeDir: string): string {

package/src/main.ts

@@ -1110,14 +1110,13 @@ export async function buildSessionOptions(
 	}
 
 	// Additional extension paths from CLI
-	const cliExtensionPaths = parsed.noExtensions ? [] : [...(parsed.extensions ?? []), ...(parsed.hooks ?? [])];
+	const cliExtensionPaths = [...(parsed.extensions ?? []), ...(parsed.hooks ?? [])];
 	if (cliExtensionPaths.length > 0) {
 		options.additionalExtensionPaths = cliExtensionPaths;
 	}
 
 	if (parsed.noExtensions) {
 		options.disableExtensionDiscovery = true;
-		options.additionalExtensionPaths = [];
 	}
 
 	return options;
@@ -1151,10 +1150,6 @@ export async function runRootCommand(
 
 	const notifs: (InteractiveModeNotify | null)[] = [];
 
-	// Create AuthStorage and ModelRegistry upfront
-	const authStorage = await logger.time("discoverAuthStorage", deps.discoverAuthStorage ?? discoverAuthStorage);
-	const modelRegistry = logger.time("modelRegistry:init", () => new ModelRegistry(authStorage));
-
 	if (parsedArgs.version) {
 		writeStartupNotice(parsedArgs, `${VERSION}\n`);
 		process.exit(0);
@@ -1197,15 +1192,31 @@ export async function runRootCommand(
 	// Register CLI-provided extension package paths (`--extension`, `--hook`) so
 	// the `omp-plugins` discovery provider can surface their `skills/`, `hooks/`,
 	// `tools/`, `commands/`, `rules/`, `prompts/`, and `.mcp.json` sub-trees.
-	// `--no-extensions` short-circuits both the factory load and the sub-discovery.
-	if (!parsedArgs.noExtensions) {
-		const cliExtensions = [...(parsedArgs.extensions ?? []), ...(parsedArgs.hooks ?? [])];
-		if (cliExtensions.length > 0) {
-			injectOmpExtensionCliRoots(cliExtensions, home, getProjectDir());
-		}
-	}
+	// Explicit roots remain authorized under `--no-extensions`; only ambient
+	// extension discovery is disabled.
+	const cliExtensions = [...(parsedArgs.extensions ?? []), ...(parsedArgs.hooks ?? [])];
+	injectOmpExtensionCliRoots(cliExtensions, home, getProjectDir(), {
+		mode: parsedArgs.noExtensions ? "explicit-only" : "merge",
+		replace: true,
+	});
 
 	let cwd = getProjectDir();
+	// Classify the host before opening auth or settings storage so every
+	// session-critical database connection picks the right busy timeout.
+	// See getDbBusyTimeoutMs().
+	const isProtocolMode = mode === "rpc" || mode === "rpc-ui" || mode === "acp";
+	// Protocol modes own stdin; treating it as prompt text would consume JSON-RPC frames before their transports start.
+	const pipedInput = isProtocolMode ? undefined : await logger.time("readPipedInput", readPipedInput);
+	const autoPrint = pipedInput !== undefined && !parsedArgs.print && parsedArgs.mode === undefined;
+	const isInteractive = !parsedArgs.print && !autoPrint && parsedArgs.mode === undefined;
+	// Only the interactive host renders a focusable Agent Hub / subagent session
+	// tree; declare it so headless subagent optimizations (e.g. skipping replan
+	// title refresh) can tell a focusable process from a print/RPC/eval one.
+	setInteractiveHost(isInteractive);
+	// Create AuthStorage and ModelRegistry upfront
+	const authStorage = await logger.time("discoverAuthStorage", deps.discoverAuthStorage ?? discoverAuthStorage);
+	const modelRegistry = logger.time("modelRegistry:init", () => new ModelRegistry(authStorage));
+
 	const settingsInstance =
 		deps.settings ?? (await logger.time("settings:init", Settings.init, { cwd, configFiles: parsedArgs.config }));
 	if (parsedArgs.approvalMode) {
@@ -1228,15 +1239,6 @@ export async function runRootCommand(
 	if (parsedArgs.noTitle || parsedArgs.mode === "rpc" || parsedArgs.mode === "rpc-ui" || parsedArgs.mode === "acp") {
 		Bun.env.PI_NO_TITLE = "1";
 	}
-	const isProtocolMode = mode === "rpc" || mode === "rpc-ui" || mode === "acp";
-	// Protocol modes own stdin; treating it as prompt text would consume JSON-RPC frames before their transports start.
-	const pipedInput = isProtocolMode ? undefined : await logger.time("readPipedInput", readPipedInput);
-	const autoPrint = pipedInput !== undefined && !parsedArgs.print && parsedArgs.mode === undefined;
-	const isInteractive = !parsedArgs.print && !autoPrint && parsedArgs.mode === undefined;
-	// Only the interactive host renders a focusable Agent Hub / subagent session
-	// tree; declare it so headless subagent optimizations (e.g. skipping replan
-	// title refresh) can tell a focusable process from a print/RPC/eval one.
-	setInteractiveHost(isInteractive);
 
 	// Initialize discovery system with settings for provider persistence
 	logger.time("initializeWithSettings", initializeWithSettings, settingsInstance);

package/src/mcp/config.ts

@@ -41,6 +41,7 @@ function convertToLegacyConfig(server: MCPServer): MCPServerConfig {
 	const shared = {
 		enabled: server.enabled,
 		timeout: server.timeout,
+		requestIdFormat: server.requestIdFormat,
 		auth: server.auth,
 		oauth: server.oauth,
 	};

package/src/mcp/request-id.ts

@@ -0,0 +1,24 @@
+import { Snowflake } from "@oh-my-pi/pi-utils";
+import type { MCPRequestIdFormat } from "./types";
+
+/**
+ * Per-transport allocator for outgoing JSON-RPC request ids.
+ *
+ * JSON-RPC 2.0 permits String and Number ids equally, but the wider MCP
+ * ecosystem (reference SDKs included) issues incrementing integers, so servers
+ * are best tested against numbers — Apple's `xcrun mcpbridge` even logs
+ * `mcpbridge.DecodeError Code=1` and never answers a string id. Integers are
+ * therefore the default. `"string"` opts a server back into collision-resistant
+ * snowflake ids.
+ *
+ * The counter is per instance and never reset, so ids stay unique for the life
+ * of the transport even though a reconnect rejects and clears every pending
+ * request.
+ */
+export class RequestIdAllocator {
+	#previousNumeric = 0;
+
+	next(format: MCPRequestIdFormat | undefined): string | number {
+		return format === "string" ? Snowflake.next() : ++this.#previousNumeric;
+	}
+}

package/src/mcp/transports/http.ts

@@ -5,7 +5,7 @@
  * Based on MCP spec 2025-03-26.
  */
 import * as AIError from "@oh-my-pi/pi-ai/error";
-import { logger, readSseJson, Snowflake } from "@oh-my-pi/pi-utils";
+import { logger, readSseJson } from "@oh-my-pi/pi-utils";
 import type {
 	JsonRpcError,
 	JsonRpcMessage,
@@ -17,6 +17,7 @@ import type {
 	MCPTransport,
 } from "../../mcp/types";
 import { toJsonRpcError } from "../../mcp/types";
+import { RequestIdAllocator } from "../request-id";
 import { createMCPTimeout, getNeverAbortSignal, isMCPTimeoutEnabled, resolveMCPTimeoutMs } from "../timeout";
 
 const HTTP_SSE_CONNECT_TIMEOUT_MS = 1_000;
@@ -42,6 +43,7 @@ export class HttpTransport implements MCPTransport {
 	#connected = false;
 	#sessionId: string | null = null;
 	#sseConnection: AbortController | null = null;
+	readonly #requestIds = new RequestIdAllocator();
 
 	onClose?: () => void;
 	onError?: (error: Error) => void;
@@ -209,7 +211,7 @@ export class HttpTransport implements MCPTransport {
 			throw new Error("Transport not connected");
 		}
 
-		const id = Snowflake.next();
+		const id = this.#requestIds.next(this.config.requestIdFormat);
 		const body = {
 			jsonrpc: "2.0" as const,
 			id,

package/src/mcp/transports/sse.ts

@@ -1,5 +1,5 @@
 import * as AIError from "@oh-my-pi/pi-ai/error";
-import { logger, readSseEvents, Snowflake } from "@oh-my-pi/pi-utils";
+import { logger, readSseEvents } from "@oh-my-pi/pi-utils";
 import type {
 	JsonRpcError,
 	JsonRpcMessage,
@@ -10,6 +10,7 @@ import type {
 	MCPTransport,
 } from "../../mcp/types";
 import { toJsonRpcError } from "../../mcp/types";
+import { RequestIdAllocator } from "../request-id";
 import { createMCPTimeout, getNeverAbortSignal, resolveMCPTimeoutMs } from "../timeout";
 
 interface MCPTimeoutOperation {
@@ -32,6 +33,7 @@ export class LegacySseTransport implements MCPTransport {
 	#sseConnection: AbortController | null = null;
 	#pending = new Map<string | number, PendingLegacySseRequest>();
 	#config: MCPSseServerConfig;
+	readonly #requestIds = new RequestIdAllocator();
 
 	onClose?: () => void;
 	onError?: (error: Error) => void;
@@ -194,7 +196,7 @@ export class LegacySseTransport implements MCPTransport {
 			throw new Error("Transport not connected");
 		}
 
-		const id = Snowflake.next();
+		const id = this.#requestIds.next(this.#config.requestIdFormat);
 		const body = {
 			jsonrpc: "2.0" as const,
 			id,

package/src/mcp/transports/stdio.ts

@@ -7,7 +7,7 @@
 
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import { getProjectDir, readJsonl, Snowflake } from "@oh-my-pi/pi-utils";
+import { getProjectDir, readJsonl } from "@oh-my-pi/pi-utils";
 import type { Subprocess } from "bun";
 import { hostHasInheritableConsole } from "../../eval/py/spawn-options";
 import type {
@@ -20,6 +20,7 @@ import type {
 	MCPTransport,
 } from "../../mcp/types";
 import { toJsonRpcError } from "../../mcp/types";
+import { RequestIdAllocator } from "../request-id";
 import { isMCPTimeoutEnabled, resolveMCPTimeoutMs } from "../timeout";
 
 /** Subprocess argv and platform-derived spawn flags for an MCP stdio server. */
@@ -551,6 +552,7 @@ export class StdioTransport implements MCPTransport {
 	 * actually spawned into its own session may target it.
 	 */
 	#detached = false;
+	readonly #requestIds = new RequestIdAllocator();
 
 	onClose?: () => void;
 	onError?: (error: Error) => void;
@@ -734,7 +736,7 @@ export class StdioTransport implements MCPTransport {
 			throw new Error("Transport not connected");
 		}
 
-		const id = Snowflake.next();
+		const id = this.#requestIds.next(this.config.requestIdFormat);
 		const request = {
 			jsonrpc: "2.0" as const,
 			id,

package/src/mcp/types.ts

@@ -59,12 +59,27 @@ export interface MCPAuthConfig {
 	resource?: string;
 }
 
+/** Encoding used for outgoing JSON-RPC request ids. */
+export type MCPRequestIdFormat = "string" | "number";
+
 /** Base server config with shared options */
 interface MCPServerConfigBase {
 	/** Whether this server is enabled (default: true) */
 	enabled?: boolean;
 	/** MCP request timeout in milliseconds (default: 30000, 0 to disable) */
 	timeout?: number;
+	/**
+	 * Encoding for outgoing JSON-RPC request ids (default: `"number"`).
+	 *
+	 * Set `"string"` for servers that need collision-resistant snowflake string
+	 * ids instead of per-transport integers. See `RequestIdAllocator` in
+	 * `./request-id`.
+	 *
+	 * OMP-specific, so only the OMP-owned discovery providers parse it (native,
+	 * standalone `mcp.json`, OMP plugins). Providers that translate another
+	 * tool's config do not, since the key is not part of those formats.
+	 */
+	requestIdFormat?: MCPRequestIdFormat;
 	/** Authentication configuration (optional) */
 	auth?: MCPAuthConfig;
 	/** OAuth configuration for servers requiring explicit client credentials */

package/src/memory-backend/index.ts

@@ -12,6 +12,7 @@ export type {
 	MnemopiSessionStateOptions,
 } from "../mnemopi/state";
 export * from "./local-backend";
+export * from "./messages";
 export * from "./off-backend";
 export * from "./resolve";
 export * from "./runtime";

package/src/memory-backend/messages.ts

@@ -0,0 +1,19 @@
+import type { MemoryBackendId } from "./types";
+
+/**
+ * Fallback text for `/memory stats` and `/memory diagnose` when the active
+ * backend's hook is missing or returns nothing.
+ *
+ * The `off` backend isn't a real backend a user picked among several
+ * stats-capable options — it's the no-op state memory falls back to by
+ * default — so it gets its own message instead of the generic
+ * "not available for the X backend" template, which would otherwise read as
+ * the self-contradictory "not available for the off backend".
+ *
+ * Shared by both the TUI (`CommandController.handleMemoryCommand`) and the
+ * ACP/RPC slash-command handler so the two surfaces stay consistent.
+ */
+export function memoryStatsUnavailableMessage(backendId: MemoryBackendId, action: "stats" | "diagnose"): string {
+	if (backendId === "off") return "Memory backend is off — there is nothing to show.";
+	return `Memory ${action} is not available for the ${backendId} backend.`;
+}

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

@@ -636,7 +636,7 @@ export class AgentHubOverlayComponent extends Container {
 				if (ref.status === "running" && ref.session) {
 					await ref.session.abort({ reason: USER_INTERRUPT_LABEL });
 				}
-				await this.#lifecycle().release(ref.id, ref);
+				await this.#lifecycle().release(ref.id, ref, { tombstone: true });
 			} catch (error) {
 				logger.warn("Agent hub: kill failed", { id: ref.id, error: String(error) });
 				this.#notice = error instanceof Error ? error.message : String(error);

package/src/modes/components/custom-editor.ts

@@ -56,7 +56,7 @@ const DEFAULT_ACTION_KEYS: Record<ConfigurableEditorAction, KeyId[]> = {
 	"app.thinking.toggle": ["ctrl+t"],
 	"app.editor.external": ["ctrl+g"],
 	"app.history.search": ["ctrl+r"],
-	"app.message.dequeue": ["alt+up"],
+	"app.message.dequeue": ["alt+up", "shift+up"],
 	"app.retry": ["alt+r"],
 	"app.clipboard.pasteImage": ["ctrl+v"],
 	"app.clipboard.pasteTextRaw": ["ctrl+shift+v", "alt+shift+v"],

package/src/modes/components/model-browser.ts

@@ -314,10 +314,10 @@ function padLeftVisible(text: string, width: number): string {
 export interface ModelBrowserOptions {
 	/** Render the dim `provider/` prefix before model ids. Default true. */
 	showProvider?: boolean;
-	/** Session token count used to disable models whose context window is exceeded. */
+	/** Session token count used to flag models whose context window is exceeded. */
 	currentContextTokens?: number;
-	/** When true, rows over the current context are unselectable (session-switch mode). */
-	disableOverContext?: boolean;
+	/** When true, over-context rows render grayed; picking one compacts first (session-switch mode). */
+	markOverContext?: boolean;
 	/** Host-provided empty-state text (e.g. provider discovery status). */
 	emptyText?: () => string | undefined;
 }
@@ -351,7 +351,7 @@ export class ModelBrowser implements Component {
 	#maxVisible = 10;
 	#showProvider: boolean;
 	#currentContextTokens: number;
-	#disableOverContext: boolean;
+	#markOverContext: boolean;
 	#emptyText?: () => string | undefined;
 	/** Keep role-like virtual rows in their host-defined order during search. */
 	#preserveQueryOrder = false;
@@ -375,7 +375,7 @@ export class ModelBrowser implements Component {
 		this.#showProvider = options.showProvider ?? true;
 		const tokens = options.currentContextTokens ?? 0;
 		this.#currentContextTokens = Number.isFinite(tokens) && tokens > 0 ? Math.floor(tokens) : 0;
-		this.#disableOverContext = options.disableOverContext ?? false;
+		this.#markOverContext = options.markOverContext ?? false;
 		this.#emptyText = options.emptyText;
 	}
 
@@ -420,9 +420,9 @@ export class ModelBrowser implements Component {
 	setPreserveQueryOrder(preserve: boolean): void {
 		this.#preserveQueryOrder = preserve;
 	}
-	/** Allow hosts to toggle context-window eligibility between browser modes. */
-	setDisableOverContext(disable: boolean): void {
-		this.#disableOverContext = disable;
+	/** Allow hosts to toggle context-window flagging between browser modes. */
+	setMarkOverContext(mark: boolean): void {
+		this.#markOverContext = mark;
 	}
 	/** Focused: accent cursor + selected-row background band. Unfocused: dim cursor, no band. */
 	setFocused(focused: boolean): void {
@@ -461,8 +461,13 @@ export class ModelBrowser implements Component {
 	}
 
 	#isDisabled(item: ModelBrowserItem): boolean {
-		if (item.id === "separator") return true;
-		if (!this.#disableOverContext || this.#currentContextTokens <= 0) return false;
+		return item.id === "separator";
+	}
+
+	/** True when `item`'s context window is smaller than the live session token count (grayed row; hosts compact before switching). */
+	isOverContext(item: ModelBrowserItem): boolean {
+		if (item.id === "separator") return false;
+		if (!this.#markOverContext || this.#currentContextTokens <= 0) return false;
 		const contextWindow = item.model.contextWindow ?? 0;
 		return contextWindow > 0 && this.#currentContextTokens > contextWindow;
 	}
@@ -718,7 +723,7 @@ export class ModelBrowser implements Component {
 			const line = theme.fg("muted", "─".repeat(dashCount));
 			return `  ${line}  `;
 		}
-		const disabled = this.#isDisabled(item);
+		const overContext = this.isOverContext(item);
 		const prefix = selected && this.#focused ? `${theme.fg("accent", theme.nav.cursor)} ` : "  ";
 		const providerPrefix = this.#showProvider ? theme.fg("dim", `${item.provider}/`) : "";
 		const name = item.labelColor
@@ -728,7 +733,7 @@ export class ModelBrowser implements Component {
 				: item.id;
 		const currentMark =
 			item.selector === this.#currentSelector ? ` ${theme.fg("success", theme.status.enabled)}` : "";
-		const overLimit = disabled
+		const overLimit = overContext
 			? ` ${theme.status.disabled} context>${formatNumber(item.model.contextWindow ?? 0).toLowerCase()}`
 			: "";
 		let left = `${prefix}${providerPrefix}${name}${currentMark}${overLimit}`;
@@ -743,12 +748,15 @@ export class ModelBrowser implements Component {
 		const gap = Math.max(0, available - visibleWidth(left));
 
 		let line = `${left}${" ".repeat(gap)} ${meta}`;
-		if (disabled) {
-			line = theme.fg("dim", Bun.stripANSI(line));
+		if (overContext) {
+			// Gray the whole row but keep the selection cursor visible: over-context
+			// models stay selectable (the host compacts before switching).
+			const plainPrefix = Bun.stripANSI(prefix);
+			line = `${prefix}${theme.fg("dim", Bun.stripANSI(line).slice(plainPrefix.length))}`;
 		}
 		// The bg band is reserved for the mouse: it marks hover, nothing else.
 		// Keyboard selection is the cursor glyph + accent name.
-		if (hovered && !disabled) {
+		if (hovered) {
 			line = theme.bg("selectedBg", line);
 		}
 		return line;
@@ -772,8 +780,8 @@ export class ModelBrowser implements Component {
 		}
 		const line1 = truncateToWidth(theme.fg("muted", `  ${facts.join(" · ")}`), width);
 
-		if (this.#isDisabled(selected)) {
-			const warning = `  ${theme.status.disabled} current context ${formatNumber(this.#currentContextTokens).toLowerCase()} exceeds ${formatNumber(model.contextWindow ?? 0).toLowerCase()} limit`;
+		if (this.isOverContext(selected)) {
+			const warning = `  ${theme.status.disabled} context ${formatNumber(this.#currentContextTokens).toLowerCase()} exceeds ${formatNumber(model.contextWindow ?? 0).toLowerCase()} limit · compacts with current model, then switches`;
 			return [line1, truncateToWidth(theme.fg("warning", warning), width)];
 		}
 

package/src/modes/components/model-picker.ts

@@ -22,8 +22,12 @@ import { bottomBorder, row, topBorder } from "./overlay-box";
 import { resolveSegmentPalette } from "./segment-track";
 
 export interface ModelPickerCallbacks {
-	/** A model was chosen for a session-only switch. `selector` is `provider/id`. */
-	onPick: (model: Model, selector: string) => void;
+	/**
+	 * A model was chosen for a session-only switch. `selector` is `provider/id`.
+	 * `overContext` is true when the session transcript exceeds the model's
+	 * context window — the host must compact before switching.
+	 */
+	onPick: (model: Model, selector: string, meta: { overContext: boolean }) => void;
 	/** A configured ctrl+p quick role was chosen. */
 	onPickRole?: (entry: ResolvedRoleModel) => void;
 	/** The picker was dismissed. */
@@ -31,7 +35,7 @@ export interface ModelPickerCallbacks {
 }
 
 export interface ModelPickerOptions {
-	/** Session token count; models with smaller context windows are disabled. */
+	/** Session token count; models with smaller context windows are grayed and compact-first on pick. */
 	currentContextTokens?: number;
 	/** `provider/id` of the session's active model; highlighted and preselected. */
 	currentSelector?: string;
@@ -97,7 +101,7 @@ export class ModelPickerComponent implements Component {
 
 		this.#browser = new ModelBrowser(settings, {
 			currentContextTokens: options.currentContextTokens,
-			disableOverContext: true,
+			markOverContext: true,
 			emptyText: () => (this.#roleMode ? "  No quick roles in the Ctrl+P cycle" : undefined),
 		});
 		this.#browser.onActivate = item => {
@@ -106,7 +110,7 @@ export class ModelPickerComponent implements Component {
 				callbacks.onPickRole?.(quickRole);
 				return;
 			}
-			callbacks.onPick(item.model, item.selector);
+			callbacks.onPick(item.model, item.selector, { overContext: this.#browser.isOverContext(item) });
 		};
 		this.#browser.onCancel = () => callbacks.onCancel();
 		this.#browser.onQueryChange = query => this.#syncItemsForQuery(query);
@@ -193,7 +197,7 @@ export class ModelPickerComponent implements Component {
 
 		this.#roleMode = roleMode;
 		this.#browser.setShowProvider(!roleMode);
-		this.#browser.setDisableOverContext(!roleMode);
+		this.#browser.setMarkOverContext(!roleMode);
 		this.#browser.setPreserveQueryOrder(roleMode);
 		const currentSelector = roleMode ? this.#currentQuickRoleSelector : this.#currentSelector;
 		this.#browser.setCurrentSelector(currentSelector);

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

@@ -397,6 +397,32 @@ export class ReadToolGroupComponent extends Container implements ToolExecutionHa
 		this.#updateDisplay();
 	}
 
+	/**
+	 * Re-key an entry whose streamed tool-call id changed mid-stream (a provider
+	 * rewriting the id across deltas; see EventController's
+	 * `#streamedToolCallIdByIndex`). Preserves row order so a sibling read run is
+	 * not visibly reshuffled, and no-ops when the rename would collide.
+	 */
+	renameEntry(oldId: string, newId: string): void {
+		if (oldId === newId || !newId) return;
+		const entry = this.#entries.get(oldId);
+		if (!entry || this.#entries.has(newId)) return;
+		entry.toolCallId = newId;
+		const reordered = [...this.#entries].map(([key, value]): [string, ReadEntry] => [
+			key === oldId ? newId : key,
+			value,
+		]);
+		this.#entries.clear();
+		for (const [key, value] of reordered) this.#entries.set(key, value);
+		this.#updateDisplay();
+	}
+	/** Remove one call without discarding successful siblings in the shared group. */
+	removeEntry(toolCallId: string): boolean {
+		if (!this.#entries.delete(toolCallId)) return this.#entries.size === 0;
+		this.#updateDisplay();
+		return this.#entries.size === 0;
+	}
+
 	updateResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: unknown; isError?: boolean },
 		isPartial = false,