pi-agent-browser-native 0.2.1 → 0.2.3

package/extensions/agent-browser/index.ts

@@ -16,6 +16,7 @@ import { buildToolPresentation, getAgentBrowserErrorText, parseAgentBrowserEnvel
 import {
 	buildExecutionPlan,
 	buildPromptPolicy,
+	chooseOpenResultTabCorrection,
 	createEphemeralSessionSeed,
 	createFreshSessionName,
 	createImplicitSessionName,
@@ -23,10 +24,17 @@ import {
 	getImplicitSessionIdleTimeoutMs,
 	getLatestUserPrompt,
 	hasUsableBraveApiKey,
+	redactInvocationArgs,
+	redactSensitiveText,
+	redactSensitiveValue,
+	restoreManagedSessionStateFromBranch,
 	resolveManagedSessionState,
+	shouldAppendBrowserSystemPrompt,
 	validateToolArgs,
+	type CompatibilityWorkaround,
+	type OpenResultTabCorrection,
 } from "./lib/runtime.js";
-import { cleanupSecureTempArtifacts } from "./lib/temp.js";
+import { cleanupSecureTempArtifacts, type PersistentSessionArtifactStore } from "./lib/temp.js";
 
 const DEFAULT_SESSION_MODE = "auto" as const;
 
@@ -91,25 +99,190 @@ function buildInvocationPreview(effectiveArgs: string[]): string {
 	return preview.length > 120 ? `${preview.slice(0, 117)}...` : preview;
 }
 
-const AGENT_BROWSER_BASH_PREFIX = String.raw`(?:env(?:\s+[A-Za-z_][A-Za-z0-9_]*=[^\s;&|]+)*\s+)?(?:(?:npx|bunx)(?:\s+-[^\s;&|]+|\s+--[^\s;&|]+(?:=[^\s;&|]+)?)*\s+|(?:pnpm|yarn)\s+dlx(?:\s+-[^\s;&|]+|\s+--[^\s;&|]+(?:=[^\s;&|]+)?)*\s+)?`;
-const AGENT_BROWSER_BASH_EXECUTABLE = String.raw`(?:[.~]|\.\.?|\/)?(?:[^\s;&|]+\/)?agent-browser`;
-const DIRECT_AGENT_BROWSER_BASH_PATTERN = new RegExp(
-	String.raw`(^|[\s;&|])${AGENT_BROWSER_BASH_PREFIX}${AGENT_BROWSER_BASH_EXECUTABLE}(?=\s|$)`,
-);
-const HARMLESS_AGENT_BROWSER_INSPECTION_PATTERN = /(command\s+-v|which|type\s+-P)\s+agent-browser\b/;
+const DIRECT_AGENT_BROWSER_EXECUTABLE_PATTERN = /^(?:[.~]|\.\.?|\/)?(?:[^\s;&|]+\/)?agent-browser$/;
+const HARMLESS_AGENT_BROWSER_INSPECTION_PATTERN = /^\s*(?:command\s+-v|which|type\s+-P)\s+agent-browser\s*$/;
 
+type ShellQuoteState = 'double' | 'single' | undefined;
+
+function isShellAssignmentToken(token: string): boolean {
+	return /^[A-Za-z_][A-Za-z0-9_]*=/.test(token);
+}
+
+function stripOuterQuotes(token: string): string {
+	if (token.length >= 2 && ((token.startsWith('"') && token.endsWith('"')) || (token.startsWith("'") && token.endsWith("'")))) {
+		return token.slice(1, -1);
+	}
+	return token;
+}
+
+function segmentLaunchesAgentBrowser(tokens: string[]): boolean {
+	let index = 0;
+	while (index < tokens.length && isShellAssignmentToken(tokens[index])) {
+		index += 1;
+	}
+	if (index >= tokens.length) {
+		return false;
+	}
+
+	let executableToken = tokens[index];
+	if (executableToken === 'env') {
+		index += 1;
+		while (index < tokens.length && isShellAssignmentToken(tokens[index])) {
+			index += 1;
+		}
+		executableToken = tokens[index] ?? '';
+	}
+	if (executableToken === 'npx' || executableToken === 'bunx') {
+		index += 1;
+		while (index < tokens.length && tokens[index].startsWith('-')) {
+			index += 1;
+		}
+		executableToken = tokens[index] ?? '';
+	}
+	if (executableToken === 'pnpm' || executableToken === 'yarn') {
+		index += 1;
+		if (tokens[index] !== 'dlx') {
+			return false;
+		}
+		index += 1;
+		while (index < tokens.length && tokens[index].startsWith('-')) {
+			index += 1;
+		}
+		executableToken = tokens[index] ?? '';
+	}
+	return DIRECT_AGENT_BROWSER_EXECUTABLE_PATTERN.test(executableToken);
+}
+
+// Best-effort detection for common direct launches only. This is an ergonomics guard,
+// not a general-purpose bash parser or security boundary.
 function looksLikeDirectAgentBrowserBash(command: string): boolean {
-	return DIRECT_AGENT_BROWSER_BASH_PATTERN.test(command);
+	let currentToken = '';
+	let quoteState: ShellQuoteState;
+	let awaitingHeredocDelimiter: { stripTabs: boolean } | undefined;
+	let pendingHeredoc: { delimiter: string; stripTabs: boolean } | undefined;
+	let pendingHeredocLine = '';
+	let segmentTokens: string[] = [];
+
+	const acceptToken = (token: string) => {
+		if (token.length === 0) {
+			return;
+		}
+		if (awaitingHeredocDelimiter) {
+			pendingHeredoc = {
+				delimiter: stripOuterQuotes(token),
+				stripTabs: awaitingHeredocDelimiter.stripTabs,
+			};
+			awaitingHeredocDelimiter = undefined;
+			return;
+		}
+		segmentTokens.push(token);
+	};
+	const flushToken = () => {
+		acceptToken(currentToken);
+		currentToken = '';
+	};
+	const flushSegment = () => {
+		const launchesAgentBrowser = segmentLaunchesAgentBrowser(segmentTokens);
+		segmentTokens = [];
+		return launchesAgentBrowser;
+	};
+
+	for (let index = 0; index < command.length; index += 1) {
+		const char = command[index];
+		if (pendingHeredoc) {
+			if (char === '\n') {
+				const candidate = pendingHeredoc.stripTabs ? pendingHeredocLine.replace(/^\t+/, '') : pendingHeredocLine;
+				if (candidate === pendingHeredoc.delimiter) {
+					pendingHeredoc = undefined;
+				}
+				pendingHeredocLine = '';
+				continue;
+			}
+			pendingHeredocLine += char;
+			continue;
+		}
+
+		if (quoteState === 'single') {
+			currentToken += char;
+			if (char === "'") {
+				quoteState = undefined;
+			}
+			continue;
+		}
+		if (quoteState === 'double') {
+			currentToken += char;
+			if (char === '\\' && index + 1 < command.length) {
+				currentToken += command[index + 1];
+				index += 1;
+				continue;
+			}
+			if (char === '"') {
+				quoteState = undefined;
+			}
+			continue;
+		}
+		if (char === "'" || char === '"') {
+			currentToken += char;
+			quoteState = char === "'" ? 'single' : 'double';
+			continue;
+		}
+		if (char === '\\' && index + 1 < command.length) {
+			currentToken += char;
+			currentToken += command[index + 1];
+			index += 1;
+			continue;
+		}
+		if (char === '\n') {
+			flushToken();
+			if (flushSegment()) {
+				return true;
+			}
+			continue;
+		}
+		if (/\s/.test(char)) {
+			flushToken();
+			continue;
+		}
+		const threeCharOperator = command.slice(index, index + 3);
+		if (threeCharOperator === '<<-') {
+			flushToken();
+			awaitingHeredocDelimiter = { stripTabs: true };
+			index += 2;
+			continue;
+		}
+		const twoCharOperator = command.slice(index, index + 2);
+		if (twoCharOperator === '<<') {
+			flushToken();
+			awaitingHeredocDelimiter = { stripTabs: false };
+			index += 1;
+			continue;
+		}
+		if (twoCharOperator === '&&' || twoCharOperator === '||') {
+			flushToken();
+			if (flushSegment()) {
+				return true;
+			}
+			index += 1;
+			continue;
+		}
+		if (char === '|' || char === ';' || char === '&') {
+			flushToken();
+			if (flushSegment()) {
+				return true;
+			}
+			continue;
+		}
+		currentToken += char;
+	}
+
+	flushToken();
+	return flushSegment();
 }
 
 function isHarmlessAgentBrowserInspectionCommand(command: string): boolean {
 	return HARMLESS_AGENT_BROWSER_INSPECTION_PATTERN.test(command);
 }
 
-function isPlainTextInspectionArgs(args: string[]): boolean {
-	return args.includes("--help") || args.includes("-h") || args.includes("--version") || args.includes("-V");
-}
-
 const NAVIGATION_SUMMARY_COMMANDS = new Set(["back", "click", "dblclick", "forward", "reload"]);
 
 interface NavigationSummary {
@@ -141,41 +314,53 @@ function extractStringResultField(data: unknown, fieldName: "title" | "url"): st
 	return text.length > 0 ? text : undefined;
 }
 
-async function collectNavigationSummary(options: {
+async function runSessionCommandData(options: {
+	args: string[];
 	cwd: string;
 	sessionName?: string;
 	signal?: AbortSignal;
-}): Promise<NavigationSummary | undefined> {
-	const { cwd, sessionName, signal } = options;
+}): Promise<unknown | undefined> {
+	const { args, cwd, sessionName, signal } = options;
 	if (!sessionName) return undefined;
 
-	const readField = async (fieldName: "title" | "url"): Promise<string | undefined> => {
-		const processResult = await runAgentBrowserProcess({
-			args: ["--json", "--session", sessionName, "get", fieldName],
-			cwd,
-			signal,
-		});
-		if (processResult.aborted || processResult.spawnError || processResult.exitCode !== 0) {
+	const processResult = await runAgentBrowserProcess({
+		args: ["--json", "--session", sessionName, ...args],
+		cwd,
+		signal,
+	});
+	if (processResult.aborted || processResult.spawnError || processResult.exitCode !== 0) {
+		return undefined;
+	}
+	const parsed = await parseAgentBrowserEnvelope({
+		stdout: processResult.stdout,
+		stdoutPath: processResult.stdoutSpillPath,
+	});
+	try {
+		if (parsed.parseError || parsed.envelope?.success === false) {
 			return undefined;
 		}
-		const parsed = await parseAgentBrowserEnvelope({
-			stdout: processResult.stdout,
-			stdoutPath: processResult.stdoutSpillPath,
-		});
-		try {
-			if (parsed.parseError || parsed.envelope?.success === false) {
-				return undefined;
-			}
-			return extractStringResultField(parsed.envelope?.data, fieldName);
-		} finally {
-			if (processResult.stdoutSpillPath) {
-				await rm(processResult.stdoutSpillPath, { force: true }).catch(() => undefined);
-			}
+		return parsed.envelope?.data;
+	} finally {
+		if (processResult.stdoutSpillPath) {
+			await rm(processResult.stdoutSpillPath, { force: true }).catch(() => undefined);
 		}
-	};
+	}
+}
 
-	const title = await readField("title");
-	const url = await readField("url");
+async function collectNavigationSummary(options: {
+	cwd: string;
+	sessionName?: string;
+	signal?: AbortSignal;
+}): Promise<NavigationSummary | undefined> {
+	const { cwd, sessionName, signal } = options;
+	const title = extractStringResultField(
+		await runSessionCommandData({ args: ["get", "title"], cwd, sessionName, signal }),
+		"title",
+	);
+	const url = extractStringResultField(
+		await runSessionCommandData({ args: ["get", "url"], cwd, sessionName, signal }),
+		"url",
+	);
 	if (!title && !url) return undefined;
 	return { title, url };
 }
@@ -187,6 +372,43 @@ function mergeNavigationSummaryIntoData(data: unknown, navigationSummary: Naviga
 	return { navigationSummary, result: data };
 }
 
+async function collectOpenResultTabCorrection(options: {
+	cwd: string;
+	sessionName?: string;
+	signal?: AbortSignal;
+	targetTitle?: string;
+	targetUrl?: string;
+}): Promise<OpenResultTabCorrection | undefined> {
+	const { cwd, sessionName, signal, targetTitle, targetUrl } = options;
+	const tabData = await runSessionCommandData({ args: ["tab", "list"], cwd, sessionName, signal });
+	if (!isRecord(tabData) || !Array.isArray(tabData.tabs)) {
+		return undefined;
+	}
+	const tabs = tabData.tabs.filter(isRecord).map((tab) => ({
+		active: tab.active === true,
+		index: typeof tab.index === "number" ? tab.index : undefined,
+		title: typeof tab.title === "string" ? tab.title : undefined,
+		url: typeof tab.url === "string" ? tab.url : undefined,
+	}));
+	return chooseOpenResultTabCorrection({ tabs, targetTitle, targetUrl });
+}
+
+async function applyOpenResultTabCorrection(options: {
+	correction: OpenResultTabCorrection;
+	cwd: string;
+	sessionName?: string;
+	signal?: AbortSignal;
+}): Promise<OpenResultTabCorrection | undefined> {
+	const { correction, cwd, sessionName, signal } = options;
+	const result = await runSessionCommandData({
+		args: ["tab", String(correction.selectedIndex)],
+		cwd,
+		sessionName,
+		signal,
+	});
+	return result === undefined ? undefined : correction;
+}
+
 function buildSharedBrowserPlaybookGuidelines(hasBraveApiKey: boolean): string[] {
 	return [
 		SHARED_BROWSER_PLAYBOOK_GUIDELINES[0],
@@ -195,18 +417,6 @@ function buildSharedBrowserPlaybookGuidelines(hasBraveApiKey: boolean): string[]
 	];
 }
 
-function buildBrowserSystemPromptAppendix(hasBraveApiKey: boolean): string {
-	return [
-		PROJECT_RULE_PROMPT,
-		"",
-		"Quick start:",
-		...QUICK_START_GUIDELINES.map((guideline) => `- ${guideline}`),
-		"",
-		"Browser operating playbook:",
-		...buildSharedBrowserPlaybookGuidelines(hasBraveApiKey).map((guideline) => `- ${guideline}`),
-	].join("\n");
-}
-
 function buildToolPromptGuidelines(hasBraveApiKey: boolean): string[] {
 	return [
 		...TOOL_PROMPT_GUIDELINES_PREFIX,
@@ -216,6 +426,46 @@ function buildToolPromptGuidelines(hasBraveApiKey: boolean): string[] {
 	];
 }
 
+function buildSessionDetailFields(sessionName: string | undefined, usedImplicitSession: boolean): Record<string, unknown> {
+	return sessionName ? { sessionName, usedImplicitSession } : {};
+}
+
+function getPersistentSessionArtifactStore(ctx: {
+	sessionManager: {
+		getSessionDir?: () => string;
+		getSessionFile?: () => string | undefined;
+		getSessionId: () => string | undefined;
+	};
+}): PersistentSessionArtifactStore | undefined {
+	const sessionFile = typeof ctx.sessionManager.getSessionFile === "function" ? ctx.sessionManager.getSessionFile() : undefined;
+	const sessionDir = typeof ctx.sessionManager.getSessionDir === "function" ? ctx.sessionManager.getSessionDir() : undefined;
+	const sessionId = ctx.sessionManager.getSessionId();
+	if (!sessionFile || !sessionDir || !sessionId) {
+		return undefined;
+	}
+	return { sessionDir, sessionId };
+}
+
+function redactRecoveryHint(recoveryHint: {
+	exampleArgs: string[];
+	exampleParams: { args: string[]; sessionMode: "fresh" };
+	reason: string;
+	recommendedSessionMode: "fresh";
+} | undefined): typeof recoveryHint {
+	if (!recoveryHint) {
+		return undefined;
+	}
+	const exampleArgs = redactInvocationArgs(recoveryHint.exampleArgs);
+	return {
+		...recoveryHint,
+		exampleArgs,
+		exampleParams: {
+			...recoveryHint.exampleParams,
+			args: exampleArgs,
+		},
+	};
+}
+
 async function closeManagedSession(options: { cwd: string; sessionName: string; timeoutMs: number }): Promise<void> {
 	const controller = new AbortController();
 	const timer = setTimeout(() => controller.abort(), options.timeoutMs);
@@ -235,7 +485,6 @@ async function closeManagedSession(options: { cwd: string; sessionName: string;
 export default function agentBrowserExtension(pi: ExtensionAPI) {
 	const ephemeralSessionSeed = createEphemeralSessionSeed();
 	const hasBraveApiKey = hasUsableBraveApiKey();
-	const browserSystemPromptAppendix = buildBrowserSystemPromptAppendix(hasBraveApiKey);
 	const toolPromptGuidelines = buildToolPromptGuidelines(hasBraveApiKey);
 	const implicitSessionIdleTimeoutMs = getImplicitSessionIdleTimeoutMs();
 	const implicitSessionCloseTimeoutMs = getImplicitSessionCloseTimeoutMs();
@@ -246,26 +495,25 @@ export default function agentBrowserExtension(pi: ExtensionAPI) {
 	let freshSessionOrdinal = 0;
 
 	pi.on("session_start", async (_event, ctx) => {
-		managedSessionActive = false;
 		managedSessionBaseName = createImplicitSessionName(ctx.sessionManager.getSessionId(), ctx.cwd, ephemeralSessionSeed);
-		managedSessionName = managedSessionBaseName;
+		const restoredState = restoreManagedSessionStateFromBranch(ctx.sessionManager.getBranch(), managedSessionBaseName);
+		managedSessionActive = restoredState.active;
+		managedSessionName = restoredState.sessionName;
 		managedSessionCwd = ctx.cwd;
-		freshSessionOrdinal = 0;
+		freshSessionOrdinal = restoredState.freshSessionOrdinal;
 	});
 
 	pi.on("session_shutdown", async () => {
 		managedSessionActive = false;
-		await closeManagedSession({
-			cwd: managedSessionCwd,
-			sessionName: managedSessionName,
-			timeoutMs: implicitSessionCloseTimeoutMs,
-		});
 		await cleanupSecureTempArtifacts();
 	});
 
 	pi.on("before_agent_start", async (event) => {
+		if (!shouldAppendBrowserSystemPrompt(event.prompt)) {
+			return undefined;
+		}
 		return {
-			systemPrompt: `${event.systemPrompt}\n\n${browserSystemPromptAppendix}`,
+			systemPrompt: `${event.systemPrompt}\n\n${PROJECT_RULE_PROMPT}`,
 		};
 	});
 
@@ -294,11 +542,12 @@ export default function agentBrowserExtension(pi: ExtensionAPI) {
 		promptGuidelines: toolPromptGuidelines,
 		parameters: AGENT_BROWSER_PARAMS,
 		async execute(_toolCallId, params, signal, onUpdate, ctx) {
+			const redactedArgs = redactInvocationArgs(params.args);
 			const validationError = validateToolArgs(params.args);
 			if (validationError) {
 				return {
 					content: [{ type: "text", text: validationError }],
-					details: { args: params.args, validationError },
+					details: { args: redactedArgs, validationError },
 					isError: true,
 				};
 			}
@@ -311,6 +560,9 @@ export default function agentBrowserExtension(pi: ExtensionAPI) {
 				managedSessionName,
 				sessionMode,
 			});
+			const redactedEffectiveArgs = redactInvocationArgs(executionPlan.effectiveArgs);
+			const redactedRecoveryHint = redactRecoveryHint(executionPlan.recoveryHint);
+			const compatibilityWorkaround: CompatibilityWorkaround | undefined = executionPlan.compatibilityWorkaround;
 			if (executionPlan.managedSessionName === freshSessionName) {
 				freshSessionOrdinal += 1;
 			}
@@ -319,10 +571,10 @@ export default function agentBrowserExtension(pi: ExtensionAPI) {
 				return {
 					content: [{ type: "text", text: executionPlan.validationError }],
 					details: {
-						args: params.args,
+						args: redactedArgs,
 						invalidValueFlag: executionPlan.invalidValueFlag,
 						sessionMode,
-						sessionRecoveryHint: executionPlan.recoveryHint,
+						sessionRecoveryHint: redactedRecoveryHint,
 						startupScopedFlags: executionPlan.startupScopedFlags,
 						validationError: executionPlan.validationError,
 					},
@@ -331,12 +583,12 @@ export default function agentBrowserExtension(pi: ExtensionAPI) {
 			}
 
 			onUpdate?.({
-				content: [{ type: "text", text: `Running agent-browser ${buildInvocationPreview(executionPlan.effectiveArgs)}` }],
+				content: [{ type: "text", text: `Running agent-browser ${buildInvocationPreview(redactedEffectiveArgs)}` }],
 				details: {
-					effectiveArgs: executionPlan.effectiveArgs,
+					compatibilityWorkaround,
+					effectiveArgs: redactedEffectiveArgs,
 					sessionMode,
-					sessionName: executionPlan.sessionName,
-					usedImplicitSession: executionPlan.usedImplicitSession,
+					...buildSessionDetailFields(executionPlan.sessionName, executionPlan.usedImplicitSession),
 				},
 			});
 
@@ -353,8 +605,9 @@ export default function agentBrowserExtension(pi: ExtensionAPI) {
 				return {
 					content: [{ type: "text", text: errorText }],
 					details: {
-						args: params.args,
-						effectiveArgs: executionPlan.effectiveArgs,
+						args: redactedArgs,
+						compatibilityWorkaround,
+						effectiveArgs: redactedEffectiveArgs,
 						sessionMode,
 						spawnError: processResult.spawnError.message,
 					},
@@ -369,10 +622,11 @@ export default function agentBrowserExtension(pi: ExtensionAPI) {
 				});
 				let presentationEnvelope = parsed.envelope;
 				const processSucceeded = !processResult.aborted && !processResult.spawnError && processResult.exitCode === 0;
-				const plainTextInspection = isPlainTextInspectionArgs(params.args) && processSucceeded && parsed.parseError !== undefined;
-				const envelopeSuccess = plainTextInspection ? true : parsed.envelope?.success !== false;
+				const plainTextInspection = executionPlan.plainTextInspection && processSucceeded;
 				const parseSucceeded = plainTextInspection || parsed.parseError === undefined;
+				const envelopeSuccess = plainTextInspection ? true : parsed.envelope?.success !== false;
 				const succeeded = processSucceeded && parseSucceeded && envelopeSuccess;
+				const inspectionText = plainTextInspection ? processResult.stdout.trim() : undefined;
 
 				let navigationSummary: NavigationSummary | undefined;
 				if (succeeded && shouldCaptureNavigationSummary(executionPlan.commandInfo.command, parsed.envelope?.data)) {
@@ -389,6 +643,34 @@ export default function agentBrowserExtension(pi: ExtensionAPI) {
 					}
 				}
 
+				let openResultTabCorrection: OpenResultTabCorrection | undefined;
+				if (
+					succeeded &&
+					executionPlan.sessionName &&
+					params.args.some((token) => token === "--profile" || token.startsWith("--profile=")) &&
+					(executionPlan.commandInfo.command === "goto" ||
+						executionPlan.commandInfo.command === "navigate" ||
+						executionPlan.commandInfo.command === "open")
+				) {
+					const targetTitle = extractStringResultField(parsed.envelope?.data, "title");
+					const targetUrl = extractStringResultField(parsed.envelope?.data, "url");
+					const plannedTabCorrection = await collectOpenResultTabCorrection({
+						cwd: ctx.cwd,
+						sessionName: executionPlan.sessionName,
+						signal,
+						targetTitle,
+						targetUrl,
+					});
+					if (plannedTabCorrection) {
+						openResultTabCorrection = await applyOpenResultTabCorrection({
+							correction: plannedTabCorrection,
+							cwd: ctx.cwd,
+							sessionName: executionPlan.sessionName,
+							signal,
+						});
+					}
+				}
+
 				const priorManagedSessionCwd = managedSessionCwd;
 				const managedSessionState = resolveManagedSessionState({
 					command: executionPlan.commandInfo.command,
@@ -423,43 +705,59 @@ export default function agentBrowserExtension(pi: ExtensionAPI) {
 
 				const presentation = plainTextInspection
 					? {
-						content: [{ type: "text" as const, text: processResult.stdout.trim() }],
+						batchFailure: undefined,
+						batchSteps: undefined,
+						content: [{ type: "text" as const, text: inspectionText ?? "" }],
+						data: undefined,
+						fullOutputPath: undefined,
+						fullOutputPaths: undefined,
 						imagePath: undefined,
-						summary: `${params.args.join(" ")} completed`,
+						imagePaths: undefined,
+						summary: `${redactedArgs.join(" ")} completed`,
 					  }
 					: await buildToolPresentation({
 							commandInfo: executionPlan.commandInfo,
 							cwd: ctx.cwd,
 							envelope: presentationEnvelope,
 							errorText,
+							persistentArtifactStore: getPersistentSessionArtifactStore(ctx),
 					  });
+				const redactedContent = presentation.content.map((item) =>
+					item.type === "text" ? { ...item, text: redactSensitiveText(item.text) } : item,
+				);
 
 				return {
-					content: presentation.content,
+					content: redactedContent,
 					details: {
-						args: params.args,
-						batchFailure: presentation.batchFailure,
-						batchSteps: presentation.batchSteps,
+						args: redactedArgs,
+						batchFailure: redactSensitiveValue(presentation.batchFailure),
+						batchSteps: redactSensitiveValue(presentation.batchSteps),
 						command: executionPlan.commandInfo.command,
+						compatibilityWorkaround,
 						subcommand: executionPlan.commandInfo.subcommand,
-						data: presentation.data,
-						error: parsed.envelope?.error,
-						navigationSummary,
-						effectiveArgs: executionPlan.effectiveArgs,
+						data: redactSensitiveValue(presentation.data),
+						error: plainTextInspection ? undefined : redactSensitiveValue(parsed.envelope?.error),
+						inspection: plainTextInspection || undefined,
+						navigationSummary: redactSensitiveValue(navigationSummary),
+						openResultTabCorrection: redactSensitiveValue(openResultTabCorrection),
+						effectiveArgs: redactedEffectiveArgs,
 						exitCode: processResult.exitCode,
 						fullOutputPath: presentation.fullOutputPath,
 						fullOutputPaths: presentation.fullOutputPaths,
 						imagePath: presentation.imagePath,
 						imagePaths: presentation.imagePaths,
-						parseError: parsed.parseError,
+						parseError: plainTextInspection ? undefined : parsed.parseError,
 						sessionMode,
-						sessionName: executionPlan.sessionName,
-						sessionRecoveryHint: executionPlan.recoveryHint,
+						...buildSessionDetailFields(executionPlan.sessionName, executionPlan.usedImplicitSession),
+						sessionRecoveryHint: redactedRecoveryHint,
 						startupScopedFlags: executionPlan.startupScopedFlags,
-						stderr: processResult.stderr || undefined,
-						stdout: parseSucceeded ? undefined : processResult.stdout,
-						summary: presentation.summary,
-						usedImplicitSession: executionPlan.usedImplicitSession,
+						stderr: processResult.stderr ? redactSensitiveText(processResult.stderr) : undefined,
+						stdout: plainTextInspection
+							? redactSensitiveText(inspectionText ?? "")
+							: parseSucceeded
+								? undefined
+								: redactSensitiveText(processResult.stdout),
+						summary: redactSensitiveText(presentation.summary),
 					},
 					isError: !succeeded,
 				};

package/extensions/agent-browser/lib/process.ts

@@ -65,7 +65,7 @@ const INHERITED_ENV_NAMES = new Set([
 	allProxyEnvName,
 	noProxyEnvName,
 ]);
-const INHERITED_ENV_PREFIXES = ["AGENT_BROWSER_", "AI_GATEWAY_", "XDG_"] as const;
+const INHERITED_ENV_PREFIXES = ["AI_GATEWAY_", "XDG_"] as const;
 
 export interface ProcessRunResult {
 	aborted: boolean;