@oh-my-pi/pi-coding-agent 16.1.8 → 16.1.9

package/src/lsp/client.ts

@@ -327,9 +327,45 @@ async function startMessageReader(client: LspClient): Promise<void> {
 				try {
 					const message: LspJsonRpcResponse | LspJsonRpcNotification = JSON.parse(messageText);
 
-					// Route message
-					if ("id" in message && message.id !== undefined) {
-						// Response to a request
+					// Route message. A JSON-RPC message carrying a `method` is always
+					// server-originated: a request when it also has an `id`, a
+					// notification otherwise. A message with only an `id` is a response
+					// to one of our requests. Disambiguate on `method` FIRST: a
+					// server's request ids live in its own id space and routinely
+					// collide with our in-flight client request ids (e.g. a
+					// basedpyright `workspace/configuration` pull arriving while a
+					// `documentSymbol` request with the same id is pending). Matching
+					// pending requests first would swallow that pull as a bogus
+					// response -- dropping the config answer the server blocks on and
+					// resolving our request with `undefined`, wedging the lazy
+					// cold-start handshake (#3001).
+					if ("method" in message) {
+						if ("id" in message && message.id !== undefined) {
+							// Server-initiated request: must be answered.
+							await handleServerRequest(client, message as LspJsonRpcRequest);
+						} else {
+							// Server notification
+							if (message.method === "textDocument/publishDiagnostics" && message.params) {
+								const params = message.params as PublishDiagnosticsParams;
+								client.diagnostics.set(params.uri, {
+									diagnostics: params.diagnostics,
+									version: params.version ?? null,
+								});
+								client.diagnosticsVersion += 1;
+							} else if (message.method === "$/progress" && message.params) {
+								const params = message.params as { token: string | number; value?: { kind?: string } };
+								if (params.value?.kind === "begin") {
+									client.activeProgressTokens.add(params.token);
+								} else if (params.value?.kind === "end") {
+									client.activeProgressTokens.delete(params.token);
+									if (client.activeProgressTokens.size === 0) {
+										client.resolveProjectLoaded();
+									}
+								}
+							}
+						}
+					} else if ("id" in message && message.id !== undefined) {
+						// Response to one of our requests.
 						const pending = client.pendingRequests.get(message.id);
 						if (pending) {
 							client.pendingRequests.delete(message.id);
@@ -338,28 +374,6 @@ async function startMessageReader(client: LspClient): Promise<void> {
 							} else {
 								pending.resolve(message.result);
 							}
-						} else if ("method" in message) {
-							await handleServerRequest(client, message as LspJsonRpcRequest);
-						}
-					} else if ("method" in message) {
-						// Server notification
-						if (message.method === "textDocument/publishDiagnostics" && message.params) {
-							const params = message.params as PublishDiagnosticsParams;
-							client.diagnostics.set(params.uri, {
-								diagnostics: params.diagnostics,
-								version: params.version ?? null,
-							});
-							client.diagnosticsVersion += 1;
-						} else if (message.method === "$/progress" && message.params) {
-							const params = message.params as { token: string | number; value?: { kind?: string } };
-							if (params.value?.kind === "begin") {
-								client.activeProgressTokens.add(params.token);
-							} else if (params.value?.kind === "end") {
-								client.activeProgressTokens.delete(params.token);
-								if (client.activeProgressTokens.size === 0) {
-									client.resolveProjectLoaded();
-								}
-							}
 						}
 					}
 				} catch (err) {

package/src/modes/controllers/command-controller.ts

@@ -85,15 +85,30 @@ export class CommandController {
 		}
 	}
 
-	handleDumpCommand() {
+	async handleDumpCommand(): Promise<void> {
 		try {
 			const formatted = this.ctx.session.formatSessionAsText();
 			if (!formatted) {
 				this.ctx.showError("No messages to dump yet.");
 				return;
 			}
-			copyToClipboard(formatted);
-			this.ctx.showStatus("Session copied to clipboard");
+			// Build the LLM request JSON sidecar first so its path (and a
+			// raw-context warning) can be appended to the copied transcript.
+			let sidecarPath: string | undefined;
+			let sidecarError: string | undefined;
+			try {
+				sidecarPath = await this.ctx.session.dumpLlmRequestToTmpDir();
+			} catch (error: unknown) {
+				sidecarError = error instanceof Error ? error.message : "Unknown error";
+			}
+			const doc = sidecarPath
+				? `${formatted}\n\n---\nLLM request JSON: ${sidecarPath}\nThis file persists on disk and may contain raw context/secrets — treat accordingly.`
+				: formatted;
+			await copyToClipboard(doc);
+			const statusParts = ["Session copied to clipboard"];
+			if (sidecarPath) statusParts.push(`LLM request JSON: ${sidecarPath}`);
+			if (sidecarError) statusParts.push(`LLM request JSON unavailable: ${sidecarError}`);
+			this.ctx.showStatus(statusParts.join("\n"));
 		} catch (error: unknown) {
 			this.ctx.showError(`Failed to copy session: ${error instanceof Error ? error.message : "Unknown error"}`);
 		}

package/src/modes/controllers/mcp-command-controller.ts

@@ -8,7 +8,7 @@ import { type Component, replaceTabs, Spacer, Text } from "@oh-my-pi/pi-tui";
 import { getMCPConfigPath, getProjectDir } from "@oh-my-pi/pi-utils";
 import type { SourceMeta } from "../../capability/types";
 import { expandEnvVarsDeep } from "../../discovery/helpers";
-import { analyzeAuthError, discoverOAuthEndpoints, MCPManager } from "../../mcp";
+import { analyzeAuthError, discoverOAuthEndpoints, loadAllMCPConfigs, MCPManager } from "../../mcp";
 import { connectToServer, disconnectServer, listTools } from "../../mcp/client";
 import {
 	addMCPServer,
@@ -1383,7 +1383,7 @@ export class MCPCommandController {
 				}
 				await setServerDisabled(userConfigPath, name, !enabled);
 				if (enabled) {
-					await this.#reloadMCP();
+					await this.#connectEnabledMCPServer(name);
 					const state = await this.#waitForServerConnectionWithAnimation(name);
 					const status =
 						state === "connected"
@@ -1419,7 +1419,12 @@ export class MCPCommandController {
 
 			const updated: MCPServerConfig = { ...found.config, enabled };
 			await updateMCPServer(found.filePath, name, updated);
-			await this.#reloadMCP();
+			if (enabled) {
+				await this.#connectEnabledMCPServer(name);
+			} else {
+				await this.ctx.mcpManager?.disconnectServer(name);
+				await this.ctx.session.refreshMCPTools(this.ctx.mcpManager?.getTools() ?? []);
+			}
 
 			let status = "";
 			if (enabled) {
@@ -1671,6 +1676,37 @@ export class MCPCommandController {
 		}
 	}
 
+	async #connectEnabledMCPServer(name: string): Promise<void> {
+		if (!this.ctx.mcpManager) {
+			return;
+		}
+
+		const { configs, sources } = await loadAllMCPConfigs(getProjectDir());
+		const config = configs[name];
+		if (!config) {
+			await this.ctx.session.refreshMCPTools(this.ctx.mcpManager.getTools());
+			return;
+		}
+
+		const source = sources[name];
+		const result = await this.ctx.mcpManager.connectServers({ [name]: config }, source ? { [name]: source } : {});
+		await this.ctx.session.refreshMCPTools(this.ctx.mcpManager.getTools());
+		this.#showMCPConnectionErrors(result.errors);
+	}
+
+	#showMCPConnectionErrors(errors: Map<string, string>): void {
+		if (errors.size === 0) {
+			return;
+		}
+
+		const errorLines = ["", theme.fg("warning", "Some servers failed to connect:"), ""];
+		for (const [serverName, error] of errors.entries()) {
+			errorLines.push(`  ${serverName}: ${error}`);
+		}
+		errorLines.push("");
+		this.#showMessage(errorLines.join("\n"));
+	}
+
 	/**
 	 * Reload MCP manager with new configs
 	 */
@@ -1686,15 +1722,7 @@ export class MCPCommandController {
 		const result = await this.ctx.mcpManager.discoverAndConnect();
 		await this.ctx.session.refreshMCPTools(this.ctx.mcpManager.getTools());
 
-		// Show any connection errors
-		if (result.errors.size > 0) {
-			const errorLines = ["", theme.fg("warning", "Some servers failed to connect:"), ""];
-			for (const [serverName, error] of result.errors.entries()) {
-				errorLines.push(`  ${serverName}: ${error}`);
-			}
-			errorLines.push("");
-			this.#showMessage(errorLines.join("\n"));
-		}
+		this.#showMCPConnectionErrors(result.errors);
 	}
 
 	/**

package/src/modes/interactive-mode.ts

@@ -3491,7 +3491,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		return this.#commandController.handleExportCommand(text);
 	}
 
-	handleDumpCommand() {
+	async handleDumpCommand(): Promise<void> {
 		return this.#commandController.handleDumpCommand();
 	}
 

package/src/modes/types.ts

@@ -290,7 +290,7 @@ export interface InteractiveModeContext {
 	handleHotkeysCommand(): void;
 	handleToolsCommand(): void;
 	handleContextCommand(): void;
-	handleDumpCommand(): void;
+	handleDumpCommand(): Promise<void>;
 	handleAdvisorDumpCommand(isRaw?: boolean): void;
 	handleDebugTranscriptCommand(): Promise<void>;
 	handleClearCommand(): Promise<void>;

package/src/session/agent-session.ts

@@ -103,7 +103,7 @@ import {
 	resolveServiceTier,
 	streamSimple,
 } from "@oh-my-pi/pi-ai";
-import { stripToolDescriptions } from "@oh-my-pi/pi-ai/utils/schema";
+import { stripToolDescriptions, toolWireSchema } from "@oh-my-pi/pi-ai/utils/schema";
 import { THINKING_LOOP_ERROR_MARKER } from "@oh-my-pi/pi-ai/utils/thinking-loop";
 import { isFireworksFastModelId, toFireworksBaseModelId } from "@oh-my-pi/pi-catalog/fireworks-model-id";
 import { getSupportedEfforts } from "@oh-my-pi/pi-catalog/model-thinking";
@@ -12606,6 +12606,41 @@ export class AgentSession {
 		});
 	}
 
+	/**
+	 * Dump the current session's LLM-facing request context as JSON to a
+	 * auto-named file in `os.tmpdir()`. This is the synchronous
+	 * `convertToLlm`-boundary snapshot — system prompt, tools (wire schemas),
+	 * thinking/service tier, and converted messages — with no network round-trip
+	 * and no arming flag, so advisor/side requests cannot intercept it.
+	 *
+	 * The file persists on disk and may contain the same raw context/secrets
+	 * as `/dump`; treat the path accordingly.
+	 *
+	 * @returns the written file path, or `undefined` when there are no messages.
+	 */
+	async dumpLlmRequestToTmpDir(): Promise<string | undefined> {
+		const messages = this.messages;
+		if (messages.length === 0) return undefined;
+		const llmMessages = await this.convertMessagesToLlm(messages);
+		const payload = {
+			model: this.agent.state.model ?? null,
+			thinkingLevel: this.#thinkingLevel ?? null,
+			serviceTier: this.agent.serviceTier ?? null,
+			systemPrompt: this.agent.state.systemPrompt,
+			tools: this.agent.state.tools.map(tool => ({
+				name: tool.name,
+				description: tool.description,
+				parameters: toolWireSchema(tool),
+				...(tool.strict !== undefined ? { strict: tool.strict } : {}),
+				...(tool.customWireName ? { customWireName: tool.customWireName } : {}),
+			})),
+			messages: llmMessages,
+		};
+		const filePath = path.join(os.tmpdir(), `omp-llm-request-${Snowflake.next()}.json`);
+		await Bun.write(filePath, `${JSON.stringify(payload, null, 2)}\n`);
+		return filePath;
+	}
+
 	/**
 	 * Enable or disable the advisor for this session. The setting is overridden for the session,
 	 * and the runtime is started or stopped to match.

package/src/slash-commands/builtin-registry.ts

@@ -1,8 +1,6 @@
 import * as fs from "node:fs/promises";
-import * as os from "node:os";
 import * as path from "node:path";
 import { getOAuthProviders } from "@oh-my-pi/pi-ai/oauth";
-import { setNextRequestDebugPath } from "@oh-my-pi/pi-ai/utils/request-debug";
 import { type AutocompleteItem, Spacer } from "@oh-my-pi/pi-tui";
 import { APP_NAME, setProjectDir } from "@oh-my-pi/pi-utils";
 import { COLLAB_GUEST_ALLOWED_COMMANDS, CollabGuestLink } from "../collab/guest";
@@ -192,46 +190,6 @@ async function handleUsageResetCommand(
 	await output(describeRedeemOutcome(outcome, target.label));
 }
 
-const DEBUG_DUMP_NEXT_REQUEST_USAGE = "Usage: /debug dump-next-request <path>";
-
-function resolveDebugRequestDumpPath(target: string, cwd: string): string {
-	const expanded =
-		target === "~"
-			? os.homedir()
-			: target.startsWith("~/") || target.startsWith("~\\")
-				? path.join(os.homedir(), target.slice(2))
-				: target;
-	return path.resolve(cwd, expanded);
-}
-
-async function handleDebugSubcommand(
-	args: string,
-	cwd: string,
-	output: (text: string) => Promise<void> | void,
-): Promise<SlashCommandResult> {
-	const { verb, rest } = parseSubcommand(args);
-	switch (verb) {
-		case "":
-			await output(DEBUG_DUMP_NEXT_REQUEST_USAGE);
-			return commandConsumed();
-		case "dump-next-request":
-		case "dump-request":
-		case "next-request": {
-			if (!rest) {
-				await output(DEBUG_DUMP_NEXT_REQUEST_USAGE);
-				return commandConsumed();
-			}
-			const requestPath = resolveDebugRequestDumpPath(rest, cwd);
-			setNextRequestDebugPath(requestPath);
-			await output(`Next AI provider request will be dumped to ${requestPath}`);
-			return commandConsumed();
-		}
-		default:
-			await output(`Unknown /debug subcommand "${verb}". ${DEBUG_DUMP_NEXT_REQUEST_USAGE}`);
-			return commandConsumed();
-	}
-}
-
 /** Parse the `/shake` subcommand into a {@link ShakeMode}; empty defaults to elide. */
 function parseShakeMode(args: string): ShakeMode | { error: string } {
 	const verb = args.trim().toLowerCase();
@@ -612,16 +570,33 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<SlashCommandSpec> = [
 	},
 	{
 		name: "dump",
-		description: "Copy session transcript to clipboard",
-		acpDescription: "Return full transcript as plain text",
+		description: "Copy session transcript to clipboard (and write LLM request JSON to tmp)",
+		acpDescription: "Return full transcript as plain text, with LLM request JSON path",
 		allowArgs: true,
 		handle: async (_command, runtime) => {
 			const text = runtime.session.formatSessionAsText();
-			await runtime.output(text || "No messages to dump yet.");
+			if (!text) {
+				await runtime.output("No messages to dump yet.");
+				return commandConsumed();
+			}
+			let sidecarPath: string | undefined;
+			try {
+				sidecarPath = await runtime.session.dumpLlmRequestToTmpDir();
+			} catch {
+				// Sidecar is best-effort; the transcript is still output below.
+			}
+			const lines = [text];
+			if (sidecarPath)
+				lines.push(
+					"",
+					`LLM request JSON: ${sidecarPath}`,
+					"This file persists on disk and may contain raw context/secrets — treat accordingly.",
+				);
+			await runtime.output(lines.join("\n"));
 			return commandConsumed();
 		},
-		handleTui: (_command, runtime) => {
-			runtime.ctx.handleDumpCommand();
+		handleTui: async (_command, runtime) => {
+			await runtime.ctx.handleDumpCommand();
 			runtime.ctx.editor.setText("");
 		},
 	},
@@ -1509,25 +1484,8 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<SlashCommandSpec> = [
 	{
 		name: "debug",
 		description: "Open debug tools selector",
-		allowArgs: true,
-		subcommands: [
-			{
-				name: "dump-next-request",
-				description: "Dump the next AI provider HTTP request as JSON",
-				usage: "<path>",
-			},
-		],
-		handle: async (command, runtime) =>
-			handleDebugSubcommand(command.args, runtime.cwd, text => runtime.output(text)),
-		handleTui: async (command, runtime) => {
-			const args = command.args.trim();
-			if (args.length === 0) {
-				runtime.ctx.showDebugSelector();
-			} else {
-				await handleDebugSubcommand(args, runtime.ctx.sessionManager.getCwd(), text =>
-					runtime.ctx.showStatus(text),
-				);
-			}
+		handleTui: async (_command, runtime) => {
+			await runtime.ctx.showDebugSelector();
 			runtime.ctx.editor.setText("");
 		},
 	},

package/src/tools/browser/launch.ts

@@ -29,10 +29,23 @@ export const DEFAULT_VIEWPORT = { width: 1365, height: 768, deviceScaleFactor: 1
  * connection dropped, etc.).
  */
 export const BROWSER_PROTOCOL_TIMEOUT_MS = 60_000;
+// Automation-tell launch flags that puppeteer-core adds by default. We suppress
+// them via `ignoreDefaultArgs` (the supported escape hatch) to mirror xxxx's
+// chromiumSwitches patch. `--enable-automation` is the loudest: it sets
+// navigator.webdriver=true and shows the "controlled by automated software" infobar.
+// `ignoreDefaultArgs` does exact-string matching, so each entry must be a flag that
+// puppeteer emits verbatim. The default `--disable-features=...` string can't be
+// matched this way; it is neutralized in the puppeteer-core patch (ChromeLauncher).
 const STEALTH_IGNORE_DEFAULT_ARGS = [
+	"--enable-automation",
 	"--disable-extensions",
 	"--disable-default-apps",
 	"--disable-component-extensions-with-background-pages",
+	"--disable-popup-blocking",
+	"--disable-client-side-phishing-detection",
+	"--allow-pre-commit-input",
+	"--disable-ipc-flooding-protection",
+	"--metrics-recording-only",
 ];
 const STEALTH_ACCEPT_LANGUAGE = "en-US,en";
 
@@ -309,9 +322,11 @@ export interface UserAgentOverride {
 	userAgentMetadata: {
 		brands: Array<{ brand: string; version: string }>;
 		fullVersion: string;
+		fullVersionList: Array<{ brand: string; version: string }>;
 		platform: string;
 		platformVersion: string;
 		architecture: string;
+		bitness: string;
 		model: string;
 		mobile: boolean;
 	};
@@ -371,6 +386,26 @@ function patchSourceUrl(page: Page): void {
 	};
 }
 
+async function resolveMacOsProductVersion(): Promise<string> {
+	if (os.platform() !== "darwin") return "";
+	try {
+		const plist = await Bun.file("/System/Library/CoreServices/SystemVersion.plist").text();
+		return plist.match(/<key>ProductVersion<\/key>\s*<string>([^<]+)<\/string>/)?.[1] ?? "";
+	} catch {
+		return "";
+	}
+}
+
+function resolveHostArchitecture(): string {
+	if (os.arch() === "arm64") return "arm";
+	if (os.arch().includes("64")) return "x86";
+	return "";
+}
+
+function resolveHostBitness(): string {
+	return os.arch().includes("64") ? "64" : "";
+}
+
 async function resolveUserAgentOverride(page: Page): Promise<UserAgentOverride> {
 	const rawUserAgent = await page.browser().userAgent();
 	let userAgent = rawUserAgent.replace("HeadlessChrome/", "Chrome/");
@@ -379,32 +414,24 @@ async function resolveUserAgentOverride(page: Page): Promise<UserAgentOverride>
 	}
 
 	const uaVersionMatch = userAgent.match(/Chrome\/([\d|.]+)/);
-	const fallbackVersionMatch = uaVersionMatch ?? (await page.browser().version()).match(/\/([\d|.]+)/);
-	const uaVersion = fallbackVersionMatch?.[1] ?? "0";
-	const majorVersion = Number.parseInt(uaVersion.split(".")[0] ?? "0", 10) || 0;
+	const browserVersionMatch = (await page.browser().version()).match(/\/([\d|.]+)/);
+	const legacyVersion = uaVersionMatch?.[1] ?? browserVersionMatch?.[1] ?? "0";
+	const fullVersion = browserVersionMatch?.[1] ?? legacyVersion;
+	const majorVersion = Number.parseInt(legacyVersion.split(".")[0] ?? "0", 10) || 0;
 	const isAndroid = userAgent.includes("Android");
-	const platform = userAgent.includes("Mac OS X")
-		? "MacIntel"
-		: isAndroid
-			? "Android"
-			: userAgent.includes("Linux")
-				? "Linux"
-				: "Win32";
-	const platformFull = userAgent.includes("Mac OS X")
-		? "Mac OS X"
-		: isAndroid
-			? "Android"
-			: userAgent.includes("Linux")
-				? "Linux"
-				: "Windows";
-	const platformVersion = userAgent.includes("Mac OS X ")
-		? (userAgent.match(/Mac OS X ([^)]+)/)?.[1] ?? "")
+	const isMac = userAgent.includes("Mac OS X");
+	const isWindows = userAgent.includes("Windows");
+	const platform = isMac ? "MacIntel" : isAndroid ? "Android" : userAgent.includes("Linux") ? "Linux" : "Win32";
+	const platformFull = isMac ? "macOS" : isAndroid ? "Android" : userAgent.includes("Linux") ? "Linux" : "Windows";
+	const platformVersion = isMac
+		? await resolveMacOsProductVersion()
 		: userAgent.includes("Android ")
 			? (userAgent.match(/Android ([^;]+)/)?.[1] ?? "")
-			: userAgent.includes("Windows ")
-				? (userAgent.match(/Windows .*?([\d|.]+);?/)?.[1] ?? "")
+			: isWindows
+				? (userAgent.match(/Windows NT ([\d.]+)/)?.[1] ?? "")
 				: "";
-	const architecture = isAndroid ? "" : "x86";
+	const architecture = isAndroid ? "" : resolveHostArchitecture();
+	const bitness = isAndroid ? "" : resolveHostBitness();
 	const model = isAndroid ? (userAgent.match(/Android.*?;\s([^)]+)/)?.[1] ?? "") : "";
 
 	const brandOrders = [
@@ -422,6 +449,10 @@ async function resolveUserAgentOverride(page: Page): Promise<UserAgentOverride>
 	brands[order[0]!] = { brand: greaseyBrand, version: "99" };
 	brands[order[1]!] = { brand: "Chromium", version: String(majorVersion) };
 	brands[order[2]!] = { brand: "Google Chrome", version: String(majorVersion) };
+	const fullVersionList = brands.map(({ brand }) => ({
+		brand,
+		version: brand === greaseyBrand ? "99.0.0.0" : fullVersion,
+	}));
 
 	return {
 		userAgent,
@@ -429,10 +460,12 @@ async function resolveUserAgentOverride(page: Page): Promise<UserAgentOverride>
 		acceptLanguage: STEALTH_ACCEPT_LANGUAGE,
 		userAgentMetadata: {
 			brands,
-			fullVersion: uaVersion,
+			fullVersion,
+			fullVersionList,
 			platform: platformFull,
 			platformVersion,
 			architecture,
+			bitness,
 			model,
 			mobile: isAndroid,
 		},
@@ -578,15 +611,29 @@ function buildStealthInjectionScript(scripts: readonly string[] = STEALTH_PATCH_
 		.join(";\n");
 
 	return `(() => {
-				// Native function cache - captured before any tampering
-				const iframe = document.createElement("iframe");
-				iframe.style.display = "none";
+				const Page_Function_toString = Function.prototype.toString;
+				const Page_FunctionToStringDescriptor = Object.getOwnPropertyDescriptor(Function.prototype, "toString");
+				const Page_Proxy = Proxy;
+				const Page_WeakMap = WeakMap;
+				const Page_WeakMap_get = Page_WeakMap.prototype.get;
+				const Page_WeakMap_set = Page_WeakMap.prototype.set;
+				// Native function cache - captured before any tampering.
+				// A same-origin iframe yields natives uncontaminated by page-level
+				// tampering, but at document-start (when this preload runs) there is
+				// no documentElement to attach it to. In that case the page itself
+				// hasn't executed yet, so window's own natives are still pristine —
+				// fall back to window instead of bailing, otherwise none of the
+				// fingerprint patches below would ever run.
+				let iframe = null;
 				const container = document.head ?? document.documentElement;
-				if (!container) return;
-				container.appendChild(iframe);
+				if (container) {
+					iframe = document.createElement("iframe");
+					iframe.style.display = "none";
+					container.appendChild(iframe);
+					if (!iframe.contentWindow) iframe = null;
+				}
 				try {
-					const nativeWindow = iframe.contentWindow;
-					if (!nativeWindow) return;
+					const nativeWindow = iframe ? iframe.contentWindow : window;
 
 					// Cache pristine native functions
 					const Function_toString = nativeWindow.Function.prototype.toString;
@@ -626,9 +673,38 @@ function buildStealthInjectionScript(scripts: readonly string[] = STEALTH_PATCH_
 					const Intl_DateTimeFormat = nativeWindow.Intl.DateTimeFormat;
 					const Date_constructor = nativeWindow.Date;
 
+					const nativeFunctionSources = new Page_WeakMap();
+					const makeNativeString = (name) => "function " + (name || "") + "() { [native code] }";
+					const registerNativeSource = (fn, source) => {
+						if (typeof fn === "function") Reflect_apply(Page_WeakMap_set, nativeFunctionSources, [fn, source]);
+						return fn;
+					};
+					const patchToString = (fn, name) => registerNativeSource(fn, makeNativeString(name));
+					if (${scripts.length > 0 ? "true" : "false"}) {
+						const functionToStringProxy = new Page_Proxy(Page_Function_toString, {
+							apply(target, thisArg, args) {
+								const source = Reflect_apply(Page_WeakMap_get, nativeFunctionSources, [thisArg]);
+								if (source) return source;
+								return Reflect_apply(target, thisArg, args || []);
+							},
+							get(target, key, receiver) {
+								return Reflect_get(target, key, receiver);
+							},
+						});
+						registerNativeSource(functionToStringProxy, makeNativeString("toString"));
+						Object_defineProperty(Function.prototype, "toString", {
+							...(Page_FunctionToStringDescriptor || {
+								writable: true,
+								configurable: true,
+								enumerable: false,
+							}),
+							value: functionToStringProxy,
+						});
+					}
+
 					${joint}
 				} finally {
-					if (iframe.parentNode) iframe.parentNode.removeChild(iframe);
+					if (iframe && iframe.parentNode) iframe.parentNode.removeChild(iframe);
 				}})();`;
 }
 

package/src/tools/puppeteer/00_stealth_tampering.txt

@@ -1,8 +1,5 @@
-// Helper to generate native code string
-const makeNativeString = (name) =>
-  "function " + (name || "") + "() { [native code] }";
-
-// Patch toString for common fingerprinted functions
+// Register native-looking source for common fingerprinted functions without
+// adding own toString properties.
 const patchedFns = [
   [window.alert, "alert"],
   [window.prompt, "prompt"],
@@ -20,44 +17,28 @@ const patchedFns = [
 ];
 
 for (const [fn, name] of patchedFns) {
-  if (typeof fn === "function") {
-    const nativeStr = makeNativeString(name);
-    Object_defineProperty(fn, "toString", {
-      value: function toString() { return nativeStr; },
-      writable: false,
-      configurable: true,
-      enumerable: false,
-    });
-  }
+  patchToString(fn, name);
 }
 
-// Patch Object.getOwnPropertyDescriptor to return native-looking descriptors
-Object.getOwnPropertyDescriptor = function (obj, prop) {
-  const descriptor = Object_getOwnPropertyDescriptor.call(this, obj, prop);
+// Patch Object.getOwnPropertyDescriptor to return native-looking accessor
+// source through the shared Function.prototype.toString registry.
+const patchedGetOwnPropertyDescriptor = function getOwnPropertyDescriptor(obj, prop) {
+  const descriptor = Reflect_apply(Object_getOwnPropertyDescriptor, this, [obj, prop]);
   if (!descriptor) return descriptor;
 
-  // Make patched descriptors look native
   if (descriptor.get && typeof descriptor.get === "function") {
-    const getStr = makeNativeString("get " + String(prop));
-    Object_defineProperty(descriptor.get, "toString", {
-      value: function toString() { return getStr; },
-      writable: false,
-      configurable: true,
-      enumerable: false,
-    });
+    patchToString(descriptor.get, "get " + String(prop));
   }
   if (descriptor.set && typeof descriptor.set === "function") {
-    const setStr = makeNativeString("set " + String(prop));
-    Object_defineProperty(descriptor.set, "toString", {
-      value: function toString() { return setStr; },
-      writable: false,
-      configurable: true,
-      enumerable: false,
-    });
+    patchToString(descriptor.set, "set " + String(prop));
   }
 
   return descriptor;
 };
-
-// Cleanup
-document.head.removeChild(iframe);
+patchToString(patchedGetOwnPropertyDescriptor, "getOwnPropertyDescriptor");
+Object_defineProperty(Object, "getOwnPropertyDescriptor", {
+  value: patchedGetOwnPropertyDescriptor,
+  writable: true,
+  configurable: true,
+  enumerable: false,
+});