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

package/src/commands/usage.ts

@@ -1,12 +1,13 @@
 /**
  * Show provider usage limits for every authenticated account.
  */
+
 import { Args, Command, Flags } from "@oh-my-pi/pi-utils/cli";
+import { usageHelp as commandHelp } from "../cli/command-help";
 import { runUsageCommand } from "../cli/usage-cli";
 
 export default class Usage extends Command {
-	static description = "Show provider usage limits for every authenticated account";
-
+	static description = commandHelp.description;
 	static args = {
 		action: Args.string({
 			description: "Optional subcommand to execute",

package/src/commands/web-search.ts

@@ -1,7 +1,9 @@
 /**
  * Test web search providers.
  */
+
 import { Args, Command, Flags } from "@oh-my-pi/pi-utils/cli";
+import { searchHelp as commandHelp } from "../cli/command-help";
 import { runSearchCommand, type SearchCommandArgs } from "../cli/web-search-cli";
 import { SEARCH_PROVIDER_ORDER } from "../web/search/provider";
 
@@ -10,8 +12,7 @@ const PROVIDERS: Array<string> = ["auto", ...SEARCH_PROVIDER_ORDER];
 const RECENCY: NonNullable<SearchCommandArgs["recency"]>[] = ["day", "week", "month", "year"];
 
 export default class Search extends Command {
-	static description = "Test web search providers";
-
+	static description = commandHelp.description;
 	static aliases = ["q"];
 
 	static args = {

package/src/commands/worktree.ts

@@ -1,14 +1,15 @@
 /**
  * List and clean up agent-managed git worktrees under `~/.omp/wt`.
  */
+
 import { getProjectDir } from "@oh-my-pi/pi-utils";
 import { Args, Command, Flags } from "@oh-my-pi/pi-utils/cli";
+import { worktreeHelp as commandHelp } from "../cli/command-help";
 import { clearWorktrees, listWorktrees } from "../cli/worktree-cli";
 import { Settings } from "../config/settings";
 
 export default class Worktree extends Command {
-	static description = "List or clear agent-managed git worktrees (~/.omp/wt)";
-
+	static description = commandHelp.description;
 	static aliases = ["wt"];
 
 	static args = {

package/src/config/keybindings.ts

@@ -29,6 +29,7 @@ interface AppKeybindings {
 	"app.model.select": true;
 	"app.model.selectTemporary": true;
 	"app.tools.expand": true;
+	"app.tools.toggleVisibility": true;
 	"app.editor.external": true;
 	"app.message.followUp": true;
 	"app.retry": true;
@@ -124,6 +125,10 @@ export const KEYBINDINGS = {
 		defaultKeys: "ctrl+o",
 		description: "Expand tools",
 	},
+	"app.tools.toggleVisibility": {
+		defaultKeys: "ctrl+shift+o",
+		description: "Show or hide tool activity",
+	},
 	"app.editor.external": {
 		defaultKeys: "ctrl+g",
 		description: "Open external editor",

package/src/config/model-discovery.ts

@@ -76,7 +76,10 @@ const REMOTE_DISCOVERY_TIMEOUT_MS = 10_000;
  * empty (issue #7087). Anything that is not strictly loopback therefore gets
  * {@link REMOTE_DISCOVERY_TIMEOUT_MS}.
  */
-export function discoveryProbeTimeoutMs(baseUrl: string, loopbackMs: number): number {
+export function discoveryProbeTimeoutMs(baseUrl: string, loopbackMs: number, customTimeoutMs?: number): number {
+	if (typeof customTimeoutMs === "number" && customTimeoutMs > 0 && Number.isFinite(customTimeoutMs)) {
+		return customTimeoutMs;
+	}
 	let hostname: string;
 	try {
 		hostname = new URL(baseUrl).hostname;
@@ -415,10 +418,11 @@ async function discoverOllamaModelMetadata(
 	endpoint: string,
 	modelId: string,
 	headers: Record<string, string> | undefined,
+	customTimeoutMs?: number,
 ): Promise<OllamaDiscoveredModelMetadata | null> {
 	const showUrl = `${endpoint}/api/show`;
 	try {
-		const payload = await withTimeoutSignal(discoveryProbeTimeoutMs(endpoint, 150), async signal => {
+		const payload = await withTimeoutSignal(discoveryProbeTimeoutMs(endpoint, 150, customTimeoutMs), async signal => {
 			const response = await ctx.fetch(showUrl, {
 				method: "POST",
 				headers: { ...(headers ?? {}), "Content-Type": "application/json" },
@@ -471,7 +475,8 @@ export async function discoverOllamaModels(
 	const endpoint = normalizeOllamaBaseUrl(providerConfig.baseUrl);
 	const tagsUrl = `${endpoint}/api/tags`;
 	const headers = { ...(providerConfig.headers ?? {}) };
-	const payload = await withTimeoutSignal(discoveryProbeTimeoutMs(endpoint, 250), async signal => {
+	const customTimeoutMs = providerConfig.discovery.timeoutMs;
+	const payload = await withTimeoutSignal(discoveryProbeTimeoutMs(endpoint, 250, customTimeoutMs), async signal => {
 		const response = await ctx.fetch(tagsUrl, {
 			headers,
 			signal,
@@ -488,7 +493,11 @@ export async function discoverOllamaModels(
 	const metadataById = new Map(
 		await Promise.all(
 			entries.map(
-				async entry => [entry.id, await discoverOllamaModelMetadata(ctx, endpoint, entry.id, headers)] as const,
+				async entry =>
+					[
+						entry.id,
+						await discoverOllamaModelMetadata(ctx, endpoint, entry.id, headers, customTimeoutMs),
+					] as const,
 			),
 		),
 	);
@@ -515,10 +524,11 @@ async function discoverLlamaCppServerMetadata(
 	ctx: DiscoveryContext,
 	baseUrl: string,
 	headers: Record<string, string> | undefined,
+	customTimeoutMs?: number,
 ): Promise<LlamaCppDiscoveredServerMetadata | null> {
 	const propsUrl = `${toLlamaCppNativeBaseUrl(baseUrl)}/props`;
 	try {
-		const payload = await withTimeoutSignal(discoveryProbeTimeoutMs(baseUrl, 150), async signal => {
+		const payload = await withTimeoutSignal(discoveryProbeTimeoutMs(baseUrl, 150, customTimeoutMs), async signal => {
 			const response = await ctx.fetch(propsUrl, {
 				headers,
 				signal,
@@ -592,9 +602,10 @@ export async function discoverLlamaCppModels(
 
 	const baseHeaders: Record<string, string> = { ...(providerConfig.headers ?? {}) };
 	let headers = baseHeaders;
+	const customTimeoutMs = providerConfig.discovery.timeoutMs;
 	const attempt = async (h: Record<string, string>) => {
 		const [payload, metadata] = await Promise.all([
-			withTimeoutSignal(discoveryProbeTimeoutMs(baseUrl, 250), async signal => {
+			withTimeoutSignal(discoveryProbeTimeoutMs(baseUrl, 250, customTimeoutMs), async signal => {
 				const response = await ctx.fetch(modelsUrl, {
 					headers: h,
 					signal,
@@ -605,7 +616,7 @@ export async function discoverLlamaCppModels(
 				headers = h;
 				return (await response.json()) as unknown;
 			}),
-			discoverLlamaCppServerMetadata(ctx, baseUrl, h),
+			discoverLlamaCppServerMetadata(ctx, baseUrl, h, customTimeoutMs),
 		]);
 		return [payload, metadata] as const;
 	};
@@ -657,6 +668,7 @@ export async function discoverLlamaCppModels(
 export async function discoverLlamaCppModelRuntimeMetadata(
 	model: Pick<Model<Api>, "provider" | "id" | "baseUrl" | "headers">,
 	ctx: DiscoveryContext,
+	customTimeoutMs?: number,
 ): Promise<LlamaCppDiscoveredModelRuntimeMetadata | undefined> {
 	const baseUrl = normalizeLlamaCppBaseUrl(model.baseUrl);
 	// Probe the native `/models` endpoint (not the OpenAI-compatible `/v1/models`)
@@ -668,7 +680,7 @@ export async function discoverLlamaCppModelRuntimeMetadata(
 	const baseHeaders: Record<string, string> = { ...(model.headers ?? {}) };
 	const attempt = async (headers: Record<string, string>) => {
 		const [entries, serverMetadata] = await Promise.all([
-			withTimeoutSignal(discoveryProbeTimeoutMs(nativeBaseUrl, 250), async signal => {
+			withTimeoutSignal(discoveryProbeTimeoutMs(nativeBaseUrl, 250, customTimeoutMs), async signal => {
 				const response = await ctx.fetch(modelsUrl, {
 					headers,
 					signal,
@@ -678,7 +690,7 @@ export async function discoverLlamaCppModelRuntimeMetadata(
 				}
 				return parseLlamaCppModelList(await response.json());
 			}),
-			discoverLlamaCppServerMetadata(ctx, nativeBaseUrl, headers),
+			discoverLlamaCppServerMetadata(ctx, nativeBaseUrl, headers, customTimeoutMs),
 		]);
 		if (!entries) {
 			return undefined;
@@ -721,13 +733,16 @@ export async function discoverOpenAIModelsList(
 
 	const baseHeaders: Record<string, string> = { ...(providerConfig.headers ?? {}) };
 	let headers = baseHeaders;
+	const timeoutMs = providerConfig.discovery.timeoutMs ?? 10_000;
 	const attempt = async (h: Record<string, string>) => {
 		const nativeMetadataPromise =
 			providerConfig.discovery.type === "lm-studio"
-				? fetchLmStudioNativeModelMetadata(baseUrl, ctx.fetch, { headers: h })
+				? withTimeoutSignal(timeoutMs, signal =>
+						fetchLmStudioNativeModelMetadata(baseUrl, ctx.fetch, { headers: h, signal }),
+					)
 				: Promise.resolve(null);
 		const [payload, nativeMetadata] = await Promise.all([
-			withTimeoutSignal(10_000, async signal => {
+			withTimeoutSignal(timeoutMs, async signal => {
 				const res = await ctx.fetch(modelsUrl, {
 					headers: h,
 					signal,
@@ -819,6 +834,7 @@ export async function discoverLiteLLMModels(
 	const resolveReference = (id: string) => resolveModelReference(id, references) as ModelSpec<Api> | undefined;
 	const baseHeaders: Record<string, string> = { ...(providerConfig.headers ?? {}) };
 	let headers = baseHeaders;
+	const timeoutMs = providerConfig.discovery.timeoutMs ?? 10_000;
 	const attempt = async (h: Record<string, string>) => {
 		headers = h;
 		let authError: (Error & { status: number }) | undefined;
@@ -830,7 +846,7 @@ export async function discoverLiteLLMModels(
 			}
 			return response;
 		};
-		const models = await withTimeoutSignal(10_000, signal =>
+		const models = await withTimeoutSignal(timeoutMs, signal =>
 			fetchLiteLLMRichModels({
 				api: providerConfig.api,
 				provider: providerConfig.provider,
@@ -889,8 +905,9 @@ export async function discoverProxyModels(
 
 	const baseHeaders: Record<string, string> = { ...(providerConfig.headers ?? {}) };
 	let headers = baseHeaders;
+	const timeoutMs = providerConfig.discovery.timeoutMs ?? 10_000;
 	const attempt = async (h: Record<string, string>) =>
-		withTimeoutSignal(10_000, async signal => {
+		withTimeoutSignal(timeoutMs, async signal => {
 			const res = await ctx.fetch(modelsUrl, {
 				headers: h,
 				signal,

package/src/config/model-registry.ts

@@ -73,7 +73,7 @@ import {
 	inheritReferenceThinking,
 	resolveModelReference,
 } from "@oh-my-pi/pi-catalog/identity";
-import { isBunTestRuntime, isRecord, logger, wrapFetchForExtraCa } from "@oh-my-pi/pi-utils";
+import { $envExact, isBunTestRuntime, isRecord, logger, wrapFetchForExtraCa } from "@oh-my-pi/pi-utils";
 import { parseModelString, resolveProviderModelReference } from "../config/model-resolver";
 import { generateCodexAttestation } from "../live/attestation";
 import type { AuthStorage, OAuthCredential } from "../session/auth-storage";
@@ -329,7 +329,7 @@ interface CommandApiKeyResolution {
  */
 function resolveConfigValue(valueConfig: string): string | undefined {
 	if (valueConfig.startsWith("!")) return resolveCommandConfig(valueConfig.slice(1).trim());
-	const envValue = Bun.env[valueConfig];
+	const envValue = $envExact(valueConfig);
 	if (envValue) return envValue;
 	return valueConfig;
 }
@@ -972,14 +972,18 @@ export class ModelRegistry {
 	 * Refresh dynamic metadata that can appear only after a local model loads.
 	 */
 	async refreshSelectedModelMetadata(model: Model<Api>): Promise<Model<Api>> {
-		const isLlamaCppDiscovery = this.#discoverableProviders.some(
+		const llamaCppDiscoveryConfig = this.#discoverableProviders.find(
 			providerConfig => providerConfig.provider === model.provider && providerConfig.discovery.type === "llama.cpp",
 		);
-		if (!isLlamaCppDiscovery) {
+		if (!llamaCppDiscoveryConfig) {
 			return model;
 		}
 		this.#ensureFullSnapshot();
-		const runtimeMetadata = await discoverLlamaCppModelRuntimeMetadata(model, this.#nonResolvingDiscoveryContext());
+		const runtimeMetadata = await discoverLlamaCppModelRuntimeMetadata(
+			model,
+			this.#nonResolvingDiscoveryContext(),
+			llamaCppDiscoveryConfig.discovery.timeoutMs,
+		);
 		if (runtimeMetadata === undefined) {
 			return this.find(model.provider, model.id) ?? model;
 		}

package/src/config/models-config-schema-bundle.ts

@@ -262,6 +262,15 @@ export const getModelsConfigSchemaBundle = once(() => {
 
 	const ProviderDiscoverySchema = type({
 		type: '"ollama" | "llama.cpp" | "lm-studio" | "openai-models-list" | "proxy" | "litellm"',
+		"timeoutMs?": "number",
+	}).narrow((value, ctx) => {
+		if (
+			value.timeoutMs !== undefined &&
+			(typeof value.timeoutMs !== "number" || value.timeoutMs <= 0 || !Number.isFinite(value.timeoutMs))
+		) {
+			return ctx.mustBe("timeoutMs a positive finite number");
+		}
+		return true;
 	});
 
 	const ProviderAuthSchema = type('"apiKey" | "none" | "oauth"');

package/src/config/resolve-config-value.ts

@@ -5,6 +5,7 @@
  */
 
 import { executeShell } from "@oh-my-pi/pi-natives";
+import { $envExact } from "@oh-my-pi/pi-utils";
 
 /** Cache for successful shell command results (persists for process lifetime). */
 const commandResultCache = new Map<string, string>();
@@ -21,7 +22,7 @@ export async function resolveConfigValue(config: string): Promise<string | undef
 	if (config.startsWith("!")) {
 		return await executeCommand(config);
 	}
-	const envValue = process.env[config];
+	const envValue = $envExact(config);
 	return envValue || config;
 }
 

package/src/config/service-tier.ts

@@ -16,6 +16,11 @@ export type ServiceTierOpenAISettingValue = (typeof SERVICE_TIER_OPENAI_VALUES)[
 export type ServiceTierAnthropicSettingValue = (typeof SERVICE_TIER_ANTHROPIC_VALUES)[number];
 export type ServiceTierGoogleSettingValue = (typeof SERVICE_TIER_GOOGLE_VALUES)[number];
 
+/** Whether a runtime value is a supported OpenAI service-tier setting. */
+export function isServiceTierOpenAISettingValue(value: string): value is ServiceTierOpenAISettingValue {
+	return SERVICE_TIER_OPENAI_VALUES.some(tier => tier === value);
+}
+
 /** Whether a runtime value names a provider family with an independent service-tier knob. */
 export function isServiceTierFamily(value: unknown): value is ServiceTierFamily {
 	return value === "openai" || value === "anthropic" || value === "google";

package/src/config/settings-schema.ts

@@ -37,7 +37,12 @@ import {
 	TTS_LOCAL_VOICE_VALUES,
 } from "../tts/models";
 import { EDIT_MODES } from "../utils/edit-mode";
-import { SEARCH_PROVIDER_CHOICES, type SearchProviderId } from "../web/search/types";
+import {
+	DEFAULT_WEB_SEARCH_TIMEOUT_SECONDS,
+	MAX_WEB_SEARCH_TIMEOUT_SECONDS,
+	SEARCH_PROVIDER_CHOICES,
+	type SearchProviderId,
+} from "../web/search/types";
 import {
 	SERVICE_TIER_ANTHROPIC_OPTIONS,
 	SERVICE_TIER_ANTHROPIC_VALUES,
@@ -1013,6 +1018,17 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
+	"display.hideToolActivity": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "appearance",
+			group: "Display",
+			label: "Hide Tool Activity",
+			description: "Hide model-initiated tool calls and results from the transcript",
+		},
+	},
+
 	"display.showTokenUsage": {
 		type: "boolean",
 		default: false,
@@ -3382,6 +3398,18 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
+	"lsp.shared": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "files",
+			group: "LSP",
+			label: "Shared Language Servers",
+			description:
+				"Share one language server per project across omp instances via the daemon broker (falls back to private servers when unavailable)",
+		},
+	},
+
 	"lsp.formatOnWrite": {
 		type: "boolean",
 		default: false,
@@ -3897,23 +3925,7 @@ export const SETTINGS_SCHEMA = {
 			tab: "tools",
 			group: "Available Tools",
 			label: "Computer",
-			description: "Enable native host-desktop screenshots and input for OpenAI computer use",
-		},
-	},
-
-	"computer.backend": {
-		type: "enum",
-		values: ["auto", "native"] as const,
-		default: "auto",
-		ui: {
-			tab: "tools",
-			group: "Computer",
-			label: "Computer Backend",
-			description: "Select automatic or explicit platform-native desktop capture and input",
-			options: [
-				{ value: "auto", label: "Auto" },
-				{ value: "native", label: "Native" },
-			],
+			description: "Enable the scriptable host-desktop control tool (screenshots, input, accessibility)",
 		},
 	},
 
@@ -3930,7 +3942,7 @@ export const SETTINGS_SCHEMA = {
 
 	"computer.maxWidth": {
 		type: "number",
-		default: 1920,
+		default: 3840,
 		ui: {
 			tab: "tools",
 			group: "Computer",
@@ -3941,7 +3953,7 @@ export const SETTINGS_SCHEMA = {
 
 	"computer.maxHeight": {
 		type: "number",
-		default: 1200,
+		default: 2400,
 		ui: {
 			tab: "tools",
 			group: "Computer",
@@ -4108,6 +4120,29 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
+	"browser.relay": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "tools",
+			group: "Grep & Browser",
+			label: "Browser Relay",
+			description:
+				"Drive your own Chrome tabs through the omp browser relay. Install the extension once (`omp browser-relay install`); the relay server auto-starts when the browser tool needs it. Takes precedence over Browser CDP URL; set PI_BROWSER_RELAY=0 or PI_BROWSER_RELAY=1 to override.",
+		},
+	},
+
+	"browser.relayUrl": {
+		type: "string",
+		default: undefined,
+		ui: {
+			tab: "tools",
+			group: "Grep & Browser",
+			label: "Browser Relay URL",
+			description: "omp browser relay endpoint (default http://127.0.0.1:9224).",
+		},
+	},
+
 	"browser.headless": {
 		type: "boolean",
 		default: true,
@@ -4869,6 +4904,23 @@ export const SETTINGS_SCHEMA = {
 			options: SEARCH_PROVIDER_CHOICES,
 		},
 	},
+	"providers.webSearchTimeoutSeconds": {
+		type: "number",
+		default: DEFAULT_WEB_SEARCH_TIMEOUT_SECONDS,
+		ui: {
+			tab: "providers",
+			group: "Services",
+			label: "Web Search Timeout",
+			description: `Hard timeout for each provider's search transport before web_search advances to the next fallback, in seconds (maximum ${MAX_WEB_SEARCH_TIMEOUT_SECONDS})`,
+			options: [
+				{ value: "30", label: "30 seconds" },
+				{ value: "60", label: "1 minute" },
+				{ value: "120", label: "2 minutes" },
+				{ value: "180", label: "3 minutes" },
+				{ value: "300", label: "5 minutes" },
+			],
+		},
+	},
 	"providers.webSearchGeminiModel": {
 		type: "string",
 		default: undefined,

package/src/cursor-bridge-tools.ts

@@ -39,7 +39,7 @@ export function createBridgeGrepFactory(
 /**
  * Build the `replace`-mode `edit` the bridge answers `pi_edit` with.
  *
- * `PiEditExecArgs` carries `old_text`/`new_text` pairs, which is exactly
+ * `PiEditExecArgs` carries `old_string`/`new_string` replacements, which is exactly
  * `replace`'s schema and nothing else's. The session's own instance follows the
  * configured `edit.mode` — `hashline` by default, whose schema is a single
  * `input` string — so a frame handed that instance fails validation instead of

package/src/cursor.ts

@@ -69,7 +69,7 @@ interface CursorExecBridgeOptions {
 	 *
 	 * `PiEditExecArgs` is that mode's schema verbatim, and the session's own
 	 * `edit` may be in any mode — `hashline` by default — whose schema rejects
-	 * `old_text`/`new_text` outright. {@link tools} therefore cannot be trusted
+	 * `old_string`/`new_string` outright. {@link tools} therefore cannot be trusted
 	 * for this one frame: a session that starts on another provider keeps its
 	 * configured instance in the map (only Cursor sessions move `edit` out), and
 	 * switching to Cursor later does not rebuild the roster.
@@ -641,25 +641,21 @@ export class CursorExecHandlers implements ICursorExecHandlers {
 	}
 
 	/**
-	 * `PiEditExecArgs` is the local `edit` tool's replace mode verbatim: a path
-	 * plus `old_text`/`new_text` pairs. The tool's schema is snake_case, so the
-	 * proto's camelCase accessors are mapped back on the way in.
+	 * `PiEditExecArgs` carries a path plus `oldText`/`newText` replacement
+	 * pairs. A single replacement maps onto the model-facing single-edit
+	 * `replace` schema verbatim; a multi-replacement frame still runs as ONE
+	 * tool lifecycle (one start/end event pair, one aggregate diff), so it is
+	 * sent in the tool's internal `edits` batch form (`ReplaceBatchParams`),
+	 * which only this bridge produces.
 	 *
 	 * The replace-mode instance is requested explicitly rather than resolved
 	 * from {@link CursorExecBridgeOptions.tools}: the registry's `edit` is in
 	 * the session's configured mode, whose schema rejects these arguments.
 	 */
 	async piEdit(call: Parameters<NonNullable<ICursorExecHandlers["piEdit"]>>[0]) {
-		return await executeTool(
-			this.options,
-			"edit",
-			call.toolCallId,
-			{
-				path: call.args.path,
-				edits: call.args.edits.map(edit => ({ old_text: edit.oldText, new_text: edit.newText })),
-			},
-			this.options.getEditReplaceTool?.(),
-		);
+		const edits = call.args.edits.map(edit => ({ old_string: edit.oldText, new_string: edit.newText }));
+		const args = edits.length === 1 ? { path: call.args.path, ...edits[0] } : { path: call.args.path, edits };
+		return await executeTool(this.options, "edit", call.toolCallId, args, this.options.getEditReplaceTool?.());
 	}
 
 	async piWrite(call: Parameters<NonNullable<ICursorExecHandlers["piWrite"]>>[0]) {

package/src/edit/diff.ts

@@ -855,7 +855,6 @@ export function replaceText(content: string, oldText: string, newText: string, o
 	let normalizedContent = normalizeToLF(content);
 	const normalizedOldText = normalizeToLF(oldText);
 	const normalizedNewText = normalizeToLF(newText);
-	let count = 0;
 
 	if (options.all) {
 		// Check for exact matches first
@@ -867,11 +866,13 @@ export function replaceText(content: string, oldText: string, newText: string, o
 			};
 		}
 
-		// No exact matches - try fuzzy matching iteratively
+		// Match against the immutable source so inserted replacement text cannot become a later candidate.
+		const replacements: Array<{ startIndex: number; endIndex: number; text: string }> = [];
 		while (true) {
 			const matchOutcome = findMatch(normalizedContent, normalizedOldText, {
 				allowFuzzy: options.fuzzy,
 				threshold,
+				excludedRanges: replacements,
 			});
 
 			const shouldUseClosest =
@@ -888,14 +889,22 @@ export function replaceText(content: string, oldText: string, newText: string, o
 			if (adjustedNewText === match.actualText) {
 				break;
 			}
-			normalizedContent =
-				normalizedContent.substring(0, match.startIndex) +
-				adjustedNewText +
-				normalizedContent.substring(match.startIndex + match.actualText.length);
-			count++;
+			replacements.push({
+				startIndex: match.startIndex,
+				endIndex: match.startIndex + Math.max(match.actualText.length, 1),
+				text: adjustedNewText,
+			});
 		}
 
-		return { content: normalizedContent, count };
+		replacements.sort((a, b) => a.startIndex - b.startIndex);
+		const parts: string[] = [];
+		let sourceIndex = 0;
+		for (const replacement of replacements) {
+			parts.push(normalizedContent.substring(sourceIndex, replacement.startIndex), replacement.text);
+			sourceIndex = replacement.endIndex;
+		}
+		parts.push(normalizedContent.substring(sourceIndex));
+		return { content: parts.join(""), count: replacements.length };
 	}
 
 	// Single replacement mode

package/src/edit/index.ts

@@ -19,7 +19,7 @@ import { executeHashlineSingle, hashlineEditParamsSchema } from "./hashline";
 import { type ApplyPatchParams, applyPatchSchema, expandApplyPatchToEntries } from "./modes/apply-patch";
 import applyPatchGrammar from "./modes/apply-patch.lark" with { type: "text" };
 import { executePatchSingle, type PatchEditEntry, type PatchParams, patchEditSchema } from "./modes/patch";
-import { executeReplaceSingle, type ReplaceEditEntry, type ReplaceParams, replaceEditSchema } from "./modes/replace";
+import { executeReplace, type ReplaceBatchParams, type ReplaceParams, replaceEditSchema } from "./modes/replace";
 import { type EditToolDetails, type EditToolPerFileResult, getLspBatchRequest, type LspBatchRequest } from "./renderer";
 import { pruneOversizedEditSnapshots } from "./snapshot-details";
 import { EDIT_MODE_STRATEGIES } from "./streaming";
@@ -46,7 +46,7 @@ type TInput =
 
 type HashlineParams = typeof hashlineEditParamsSchema.infer;
 
-type EditParams = ReplaceParams | PatchParams | HashlineParams | ApplyPatchParams;
+type EditParams = ReplaceParams | ReplaceBatchParams | PatchParams | HashlineParams | ApplyPatchParams;
 
 type EditModeDefinition = {
 	description: (session: ToolSession) => string;
@@ -402,7 +402,7 @@ export class EditTool implements AgentTool<TInput> {
 	/**
 	 * `mode` pins the edit variant for this instance, for callers whose protocol
 	 * fixes the shape of an edit. The Cursor `pi_edit` frame carries
-	 * `old_text`/`new_text` pairs, which only `replace` accepts — under the
+	 * `old_string`/`new_string` args, which only `replace` accepts — under the
 	 * default `hashline` mode those args do not match the schema at all. Left
 	 * unset, the env/settings resolution applies as before.
 	 */
@@ -662,11 +662,24 @@ export class EditTool implements AgentTool<TInput> {
 					batchRequest: LspBatchRequest | undefined,
 					onUpdate?: (partialResult: AgentToolResult<EditToolDetails, TInput>) => void,
 				) => {
-					const { edits, path } = params as ReplaceParams;
-					const targetPath = await resolveEditPath(tool.session, path, { mustExist: true, signal });
-					const runs = (edits as ReplaceEditEntry[]).map(
+					// `edits` is the internal `ReplaceBatchParams` form only the Cursor
+					// exec bridge produces (multi-replacement `pi_edit` frames run as one
+					// lifecycle); model calls always arrive in the single-edit schema shape.
+					const replaceParams = params as ReplaceParams | ReplaceBatchParams;
+					const entries =
+						"edits" in replaceParams
+							? replaceParams.edits
+							: [
+									{
+										old_string: replaceParams.old_string,
+										new_string: replaceParams.new_string,
+										replace_all: replaceParams.replace_all,
+									},
+								];
+					const targetPath = await resolveEditPath(tool.session, replaceParams.path, { mustExist: true, signal });
+					const runs = entries.map(
 						entry => (br: LspBatchRequest | undefined) =>
-							executeReplaceSingle({
+							executeReplace({
 								session: tool.session,
 								path: targetPath,
 								params: entry,