@oh-my-pi/pi-coding-agent 12.17.0 → 12.17.2

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 ## [Unreleased]
 
+## [12.17.2] - 2026-02-21
+### Changed
+
+- Modified bash command normalization to only apply explicit head/tail parameters from tool input, removing automatic extraction from command pipes
+- Updated shell snapshot creation to use explicit timeout and kill signal configuration for more reliable process termination
+
+### Fixed
+
+- Fixed persistent shell session state not being reset after command abort or hard timeout, preventing stale environment variables from affecting subsequent commands
+- Fixed hard timeout handling to properly interrupt long-running commands that exceed the grace period beyond the configured timeout
+
+## [12.17.1] - 2026-02-21
+### Added
+
+- Added `filterBrowser` option to filter out browser automation MCP servers when builtin browser tool is enabled
+- Added `isBrowserMCPServer()` function to detect browser automation MCP servers by name, URL, or command patterns
+- Added `filterBrowserMCPServers()` function to remove browser MCP servers from loaded configurations
+- Added `BrowserFilterResult` type for browser MCP server filtering results
+
 ## [12.17.0] - 2026-02-21
 ### Added
 

package/package.json

@@ -1,50 +1,259 @@
 {
+	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "12.17.0",
+	"version": "12.17.2",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
-	"type": "module",
-	"bin": {
-		"omp": "src/cli.ts"
+	"homepage": "https://github.com/can1357/oh-my-pi",
+	"author": "Can Bölük",
+	"contributors": [
+		"Mario Zechner"
+	],
+	"license": "MIT",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/can1357/oh-my-pi.git",
+		"directory": "packages/coding-agent"
 	},
+	"bugs": {
+		"url": "https://github.com/can1357/oh-my-pi/issues"
+	},
+	"keywords": [
+		"coding-agent",
+		"ai",
+		"llm",
+		"cli",
+		"tui",
+		"agent"
+	],
 	"main": "./src/index.ts",
 	"types": "./src/index.ts",
+	"bin": {
+		"omp": "src/cli.ts"
+	},
+	"scripts": {
+		"check": "tsgo -p tsconfig.json",
+		"format-prompts": "bun scripts/format-prompts.ts",
+		"generate-docs-index": "bun scripts/generate-docs-index.ts",
+		"prepack": "bun scripts/generate-docs-index.ts",
+		"build:binary": "cd ../.. && bun --cwd=packages/stats scripts/generate-client-bundle.ts && bun --cwd=packages/natives run embed:native && bun build --compile --define PI_COMPILED=true --root . ./packages/coding-agent/src/cli.ts --outfile packages/coding-agent/dist/omp && bun --cwd=packages/natives run embed:native --reset && bun --cwd=packages/stats scripts/generate-client-bundle.ts --reset",
+		"generate-template": "bun scripts/generate-template.ts",
+		"test": "bun test"
+	},
+	"dependencies": {
+		"@mozilla/readability": "0.6.0",
+		"@oh-my-pi/omp-stats": "12.17.2",
+		"@oh-my-pi/pi-agent-core": "12.17.2",
+		"@oh-my-pi/pi-ai": "12.17.2",
+		"@oh-my-pi/pi-natives": "12.17.2",
+		"@oh-my-pi/pi-tui": "12.17.2",
+		"@oh-my-pi/pi-utils": "12.17.2",
+		"@sinclair/typebox": "^0.34.48",
+		"@xterm/headless": "^6.0.0",
+		"ajv": "^8.18.0",
+		"chalk": "^5.6.2",
+		"diff": "^8.0.3",
+		"file-type": "^21.3.0",
+		"glob": "^13.0.3",
+		"handlebars": "^4.7.8",
+		"ignore": "^7.0.5",
+		"linkedom": "^0.18.12",
+		"marked": "^17.0.2",
+		"node-html-parser": "^7.0.2",
+		"puppeteer": "^24.37.3",
+		"smol-toml": "^1.6.0",
+		"zod": "^4.3.6"
+	},
+	"devDependencies": {
+		"@types/bun": "^1.3.9",
+		"@types/ms": "^2.1.0",
+		"ms": "^2.1.3"
+	},
+	"engines": {
+		"bun": ">=1.3.7"
+	},
+	"files": [
+		"src",
+		"scripts",
+		"examples",
+		"README.md",
+		"CHANGELOG.md"
+	],
 	"exports": {
 		".": {
 			"types": "./src/index.ts",
 			"import": "./src/index.ts"
 		},
-		"./hooks": {
-			"types": "./src/extensibility/hooks/index.ts",
-			"import": "./src/extensibility/hooks/index.ts"
+		"./*": {
+			"types": "./src/*.ts",
+			"import": "./src/*.ts"
 		},
-		"./sdk": {
-			"types": "./src/sdk.ts",
-			"import": "./src/sdk.ts"
+		"./capability": {
+			"types": "./src/capability/index.ts",
+			"import": "./src/capability/index.ts"
 		},
-		"./prompts/*": "./src/prompts/*.md",
 		"./capability/*": {
 			"types": "./src/capability/*.ts",
 			"import": "./src/capability/*.ts"
 		},
+		"./cli/*": {
+			"types": "./src/cli/*.ts",
+			"import": "./src/cli/*.ts"
+		},
+		"./commands/*": {
+			"types": "./src/commands/*.ts",
+			"import": "./src/commands/*.ts"
+		},
+		"./commit": {
+			"types": "./src/commit/index.ts",
+			"import": "./src/commit/index.ts"
+		},
+		"./commit/*": {
+			"types": "./src/commit/*.ts",
+			"import": "./src/commit/*.ts"
+		},
+		"./commit/agentic": {
+			"types": "./src/commit/agentic/index.ts",
+			"import": "./src/commit/agentic/index.ts"
+		},
+		"./commit/agentic/*": {
+			"types": "./src/commit/agentic/*.ts",
+			"import": "./src/commit/agentic/*.ts"
+		},
+		"./commit/agentic/tools": {
+			"types": "./src/commit/agentic/tools/index.ts",
+			"import": "./src/commit/agentic/tools/index.ts"
+		},
+		"./commit/agentic/tools/*": {
+			"types": "./src/commit/agentic/tools/*.ts",
+			"import": "./src/commit/agentic/tools/*.ts"
+		},
+		"./commit/analysis": {
+			"types": "./src/commit/analysis/index.ts",
+			"import": "./src/commit/analysis/index.ts"
+		},
+		"./commit/analysis/*": {
+			"types": "./src/commit/analysis/*.ts",
+			"import": "./src/commit/analysis/*.ts"
+		},
+		"./commit/changelog": {
+			"types": "./src/commit/changelog/index.ts",
+			"import": "./src/commit/changelog/index.ts"
+		},
+		"./commit/changelog/*": {
+			"types": "./src/commit/changelog/*.ts",
+			"import": "./src/commit/changelog/*.ts"
+		},
+		"./commit/git": {
+			"types": "./src/commit/git/index.ts",
+			"import": "./src/commit/git/index.ts"
+		},
+		"./commit/git/*": {
+			"types": "./src/commit/git/*.ts",
+			"import": "./src/commit/git/*.ts"
+		},
+		"./commit/map-reduce": {
+			"types": "./src/commit/map-reduce/index.ts",
+			"import": "./src/commit/map-reduce/index.ts"
+		},
+		"./commit/map-reduce/*": {
+			"types": "./src/commit/map-reduce/*.ts",
+			"import": "./src/commit/map-reduce/*.ts"
+		},
+		"./commit/utils/*": {
+			"types": "./src/commit/utils/*.ts",
+			"import": "./src/commit/utils/*.ts"
+		},
 		"./config/*": {
 			"types": "./src/config/*.ts",
 			"import": "./src/config/*.ts"
 		},
+		"./debug": {
+			"types": "./src/debug/index.ts",
+			"import": "./src/debug/index.ts"
+		},
+		"./debug/*": {
+			"types": "./src/debug/*.ts",
+			"import": "./src/debug/*.ts"
+		},
+		"./discovery": {
+			"types": "./src/discovery/index.ts",
+			"import": "./src/discovery/index.ts"
+		},
+		"./discovery/*": {
+			"types": "./src/discovery/*.ts",
+			"import": "./src/discovery/*.ts"
+		},
+		"./exa": {
+			"types": "./src/exa/index.ts",
+			"import": "./src/exa/index.ts"
+		},
+		"./exa/*": {
+			"types": "./src/exa/*.ts",
+			"import": "./src/exa/*.ts"
+		},
+		"./exec/*": {
+			"types": "./src/exec/*.ts",
+			"import": "./src/exec/*.ts"
+		},
+		"./export/*": {
+			"types": "./src/export/*.ts",
+			"import": "./src/export/*.ts"
+		},
+		"./export/html": {
+			"types": "./src/export/html/index.ts",
+			"import": "./src/export/html/index.ts"
+		},
+		"./export/html/*": {
+			"types": "./src/export/html/*.ts",
+			"import": "./src/export/html/*.ts"
+		},
 		"./extensibility/*": {
 			"types": "./src/extensibility/*.ts",
 			"import": "./src/extensibility/*.ts"
 		},
-		"./extensibility/hooks/*": {
-			"types": "./src/extensibility/hooks/*.ts",
-			"import": "./src/extensibility/hooks/*.ts"
+		"./extensibility/custom-commands": {
+			"types": "./src/extensibility/custom-commands/index.ts",
+			"import": "./src/extensibility/custom-commands/index.ts"
+		},
+		"./extensibility/custom-commands/*": {
+			"types": "./src/extensibility/custom-commands/*.ts",
+			"import": "./src/extensibility/custom-commands/*.ts"
+		},
+		"./extensibility/custom-commands/bundled/review": {
+			"types": "./src/extensibility/custom-commands/bundled/review/index.ts",
+			"import": "./src/extensibility/custom-commands/bundled/review/index.ts"
+		},
+		"./extensibility/custom-tools": {
+			"types": "./src/extensibility/custom-tools/index.ts",
+			"import": "./src/extensibility/custom-tools/index.ts"
+		},
+		"./extensibility/custom-tools/*": {
+			"types": "./src/extensibility/custom-tools/*.ts",
+			"import": "./src/extensibility/custom-tools/*.ts"
+		},
+		"./extensibility/extensions": {
+			"types": "./src/extensibility/extensions/index.ts",
+			"import": "./src/extensibility/extensions/index.ts"
 		},
 		"./extensibility/extensions/*": {
 			"types": "./src/extensibility/extensions/*.ts",
 			"import": "./src/extensibility/extensions/*.ts"
 		},
-		"./session/*": {
-			"types": "./src/session/*.ts",
-			"import": "./src/session/*.ts"
+		"./extensibility/hooks": {
+			"types": "./src/extensibility/hooks/index.ts",
+			"import": "./src/extensibility/hooks/index.ts"
+		},
+		"./extensibility/hooks/*": {
+			"types": "./src/extensibility/hooks/*.ts",
+			"import": "./src/extensibility/hooks/*.ts"
+		},
+		"./extensibility/plugins": {
+			"types": "./src/extensibility/plugins/index.ts",
+			"import": "./src/extensibility/plugins/index.ts"
+		},
+		"./extensibility/plugins/*": {
+			"types": "./src/extensibility/plugins/*.ts",
+			"import": "./src/extensibility/plugins/*.ts"
 		},
 		"./internal-urls": {
 			"types": "./src/internal-urls/index.ts",
@@ -54,85 +263,198 @@
 			"types": "./src/internal-urls/*.ts",
 			"import": "./src/internal-urls/*.ts"
 		},
+		"./ipy/*": {
+			"types": "./src/ipy/*.ts",
+			"import": "./src/ipy/*.ts"
+		},
+		"./lsp": {
+			"types": "./src/lsp/index.ts",
+			"import": "./src/lsp/index.ts"
+		},
+		"./lsp/*": {
+			"types": "./src/lsp/*.ts",
+			"import": "./src/lsp/*.ts"
+		},
+		"./lsp/clients": {
+			"types": "./src/lsp/clients/index.ts",
+			"import": "./src/lsp/clients/index.ts"
+		},
+		"./lsp/clients/*": {
+			"types": "./src/lsp/clients/*.ts",
+			"import": "./src/lsp/clients/*.ts"
+		},
+		"./mcp": {
+			"types": "./src/mcp/index.ts",
+			"import": "./src/mcp/index.ts"
+		},
+		"./mcp/*": {
+			"types": "./src/mcp/*.ts",
+			"import": "./src/mcp/*.ts"
+		},
+		"./mcp/transports": {
+			"types": "./src/mcp/transports/index.ts",
+			"import": "./src/mcp/transports/index.ts"
+		},
+		"./mcp/transports/*": {
+			"types": "./src/mcp/transports/*.ts",
+			"import": "./src/mcp/transports/*.ts"
+		},
+		"./memories": {
+			"types": "./src/memories/index.ts",
+			"import": "./src/memories/index.ts"
+		},
+		"./memories/*": {
+			"types": "./src/memories/*.ts",
+			"import": "./src/memories/*.ts"
+		},
+		"./modes": {
+			"types": "./src/modes/index.ts",
+			"import": "./src/modes/index.ts"
+		},
+		"./modes/*": {
+			"types": "./src/modes/*.ts",
+			"import": "./src/modes/*.ts"
+		},
+		"./modes/components": {
+			"types": "./src/modes/components/index.ts",
+			"import": "./src/modes/components/index.ts"
+		},
+		"./modes/components/*": {
+			"types": "./src/modes/components/*.ts",
+			"import": "./src/modes/components/*.ts"
+		},
+		"./modes/components/extensions": {
+			"types": "./src/modes/components/extensions/index.ts",
+			"import": "./src/modes/components/extensions/index.ts"
+		},
+		"./modes/components/extensions/*": {
+			"types": "./src/modes/components/extensions/*.ts",
+			"import": "./src/modes/components/extensions/*.ts"
+		},
+		"./modes/components/status-line": {
+			"types": "./src/modes/components/status-line/index.ts",
+			"import": "./src/modes/components/status-line/index.ts"
+		},
+		"./modes/components/status-line/*": {
+			"types": "./src/modes/components/status-line/*.ts",
+			"import": "./src/modes/components/status-line/*.ts"
+		},
+		"./modes/controllers/*": {
+			"types": "./src/modes/controllers/*.ts",
+			"import": "./src/modes/controllers/*.ts"
+		},
+		"./modes/rpc/*": {
+			"types": "./src/modes/rpc/*.ts",
+			"import": "./src/modes/rpc/*.ts"
+		},
+		"./modes/theme/*": {
+			"types": "./src/modes/theme/*.ts",
+			"import": "./src/modes/theme/*.ts"
+		},
+		"./modes/theme/defaults": {
+			"types": "./src/modes/theme/defaults/index.ts",
+			"import": "./src/modes/theme/defaults/index.ts"
+		},
+		"./modes/utils/*": {
+			"types": "./src/modes/utils/*.ts",
+			"import": "./src/modes/utils/*.ts"
+		},
+		"./patch": {
+			"types": "./src/patch/index.ts",
+			"import": "./src/patch/index.ts"
+		},
 		"./patch/*": {
 			"types": "./src/patch/*.ts",
 			"import": "./src/patch/*.ts"
 		},
-		"./cli": {
-			"types": "./src/cli.ts",
-			"import": "./src/cli.ts"
+		"./plan-mode/*": {
+			"types": "./src/plan-mode/*.ts",
+			"import": "./src/plan-mode/*.ts"
 		},
-		"./*": {
-			"types": "./src/*.ts",
-			"import": "./src/*.ts"
+		"./prompts/*": "./src/prompts/*.md",
+		"./secrets": {
+			"types": "./src/secrets/index.ts",
+			"import": "./src/secrets/index.ts"
+		},
+		"./secrets/*": {
+			"types": "./src/secrets/*.ts",
+			"import": "./src/secrets/*.ts"
+		},
+		"./session/*": {
+			"types": "./src/session/*.ts",
+			"import": "./src/session/*.ts"
+		},
+		"./session/compaction": {
+			"types": "./src/session/compaction/index.ts",
+			"import": "./src/session/compaction/index.ts"
+		},
+		"./session/compaction/*": {
+			"types": "./src/session/compaction/*.ts",
+			"import": "./src/session/compaction/*.ts"
+		},
+		"./slash-commands/*": {
+			"types": "./src/slash-commands/*.ts",
+			"import": "./src/slash-commands/*.ts"
+		},
+		"./ssh/*": {
+			"types": "./src/ssh/*.ts",
+			"import": "./src/ssh/*.ts"
+		},
+		"./stt": {
+			"types": "./src/stt/index.ts",
+			"import": "./src/stt/index.ts"
+		},
+		"./stt/*": {
+			"types": "./src/stt/*.ts",
+			"import": "./src/stt/*.ts"
+		},
+		"./task": {
+			"types": "./src/task/index.ts",
+			"import": "./src/task/index.ts"
+		},
+		"./task/*": {
+			"types": "./src/task/*.ts",
+			"import": "./src/task/*.ts"
+		},
+		"./tools": {
+			"types": "./src/tools/index.ts",
+			"import": "./src/tools/index.ts"
+		},
+		"./tools/*": {
+			"types": "./src/tools/*.ts",
+			"import": "./src/tools/*.ts"
+		},
+		"./tui": {
+			"types": "./src/tui/index.ts",
+			"import": "./src/tui/index.ts"
+		},
+		"./tui/*": {
+			"types": "./src/tui/*.ts",
+			"import": "./src/tui/*.ts"
+		},
+		"./utils/*": {
+			"types": "./src/utils/*.ts",
+			"import": "./src/utils/*.ts"
+		},
+		"./web/scrapers": {
+			"types": "./src/web/scrapers/index.ts",
+			"import": "./src/web/scrapers/index.ts"
+		},
+		"./web/scrapers/*": {
+			"types": "./src/web/scrapers/*.ts",
+			"import": "./src/web/scrapers/*.ts"
+		},
+		"./web/search": {
+			"types": "./src/web/search/index.ts",
+			"import": "./src/web/search/index.ts"
+		},
+		"./web/search/*": {
+			"types": "./src/web/search/*.ts",
+			"import": "./src/web/search/*.ts"
+		},
+		"./web/search/providers/*": {
+			"types": "./src/web/search/providers/*.ts",
+			"import": "./src/web/search/providers/*.ts"
 		}
-	},
-	"files": [
-		"src",
-		"scripts",
-		"examples",
-		"README.md",
-		"CHANGELOG.md"
-	],
-	"scripts": {
-		"check": "tsgo -p tsconfig.json",
-		"format-prompts": "bun scripts/format-prompts.ts",
-		"generate-docs-index": "bun scripts/generate-docs-index.ts",
-		"prepack": "bun scripts/generate-docs-index.ts",
-		"build:binary": "cd ../.. && bun --cwd=packages/stats scripts/generate-client-bundle.ts && bun --cwd=packages/natives run embed:native && bun build --compile --define PI_COMPILED=true --root . ./packages/coding-agent/src/cli.ts --outfile packages/coding-agent/dist/omp && bun --cwd=packages/natives run embed:native --reset && bun --cwd=packages/stats scripts/generate-client-bundle.ts --reset",
-		"generate-template": "bun scripts/generate-template.ts",
-		"test": "bun test"
-	},
-	"dependencies": {
-		"@mozilla/readability": "0.6.0",
-		"@oh-my-pi/omp-stats": "12.17.0",
-		"@oh-my-pi/pi-agent-core": "12.17.0",
-		"@oh-my-pi/pi-ai": "12.17.0",
-		"@oh-my-pi/pi-natives": "12.17.0",
-		"@oh-my-pi/pi-tui": "12.17.0",
-		"@oh-my-pi/pi-utils": "12.17.0",
-		"@sinclair/typebox": "^0.34.48",
-		"@xterm/headless": "^6.0.0",
-		"ajv": "^8.18.0",
-		"chalk": "^5.6.2",
-		"diff": "^8.0.3",
-		"file-type": "^21.3.0",
-		"glob": "^13.0.3",
-		"handlebars": "^4.7.8",
-		"ignore": "^7.0.5",
-		"linkedom": "^0.18.12",
-		"marked": "^17.0.2",
-		"node-html-parser": "^7.0.2",
-		"puppeteer": "^24.37.3",
-		"smol-toml": "^1.6.0",
-		"zod": "^4.3.6"
-	},
-	"devDependencies": {
-		"@types/bun": "^1.3.9",
-		"@types/ms": "^2.1.0",
-		"ms": "^2.1.3"
-	},
-	"keywords": [
-		"coding-agent",
-		"ai",
-		"llm",
-		"cli",
-		"tui",
-		"agent"
-	],
-	"author": "Can Bölük",
-	"contributors": ["Mario Zechner"],
-	"license": "MIT",
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/can1357/oh-my-pi.git",
-		"directory": "packages/coding-agent"
-	},
-	"homepage": "https://github.com/can1357/oh-my-pi",
-	"bugs": {
-	"url": "https://github.com/can1357/oh-my-pi/issues"
-},
-"engines": {
-	"bun": ">=1.3.7"
-}
+	}
 }

package/src/cli/stats-cli.ts

@@ -85,9 +85,9 @@ function formatPercent(n: number): string {
 
 export async function runStatsCommand(cmd: StatsCommandArgs): Promise<void> {
 	// Lazy import to avoid loading stats module when not needed
-	const { getDashboardStats, syncAllSessions, getTotalMessageCount } = await import("@oh-my-pi/omp-stats");
-	const { startServer } = await import("@oh-my-pi/omp-stats/src/server");
-	const { closeDb } = await import("@oh-my-pi/omp-stats/src/db");
+	const { getDashboardStats, syncAllSessions, getTotalMessageCount, startServer, closeDb } = await import(
+		"@oh-my-pi/omp-stats"
+	);
 
 	// Sync session files first
 	console.log("Syncing session files...");

package/src/exec/bash-executor.ts

@@ -34,6 +34,8 @@ export interface BashResult {
 	artifactId?: string;
 }
 
+const HARD_TIMEOUT_GRACE_MS = 5_000;
+
 const shellSessions = new Map<string, Shell>();
 
 export async function executeBash(command: string, options?: BashExecutorOptions): Promise<BashResult> {
@@ -65,74 +67,106 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 		};
 	}
 
+	const sessionKey = buildSessionKey(shell, prefix, snapshotPath, shellEnv, options?.sessionKey);
+	let shellSession = shellSessions.get(sessionKey);
+	if (!shellSession) {
+		shellSession = new Shell({ sessionEnv: shellEnv, snapshotPath: snapshotPath ?? undefined });
+		shellSessions.set(sessionKey, shellSession);
+	}
+	const signal = options?.signal;
+	const abortHandler = () => {
+		shellSession.abort(signal?.reason instanceof Error ? signal.reason.message : undefined);
+	};
+	if (signal) {
+		signal.addEventListener("abort", abortHandler, { once: true });
+	}
+
+	let hardTimeoutTimer: NodeJS.Timeout | undefined;
+	const hardTimeoutDeferred = Promise.withResolvers<"hard-timeout">();
+	const baseTimeoutMs = Math.max(1_000, options?.timeout ?? 300_000);
+	const hardTimeoutMs = baseTimeoutMs + HARD_TIMEOUT_GRACE_MS;
+	hardTimeoutTimer = setTimeout(() => {
+		shellSession.abort(`Hard timeout after ${Math.round(hardTimeoutMs / 1000)}s`);
+		hardTimeoutDeferred.resolve("hard-timeout");
+	}, hardTimeoutMs);
+
+	let resetSession = false;
+
 	try {
-		const sessionKey = buildSessionKey(shell, prefix, snapshotPath, shellEnv, options?.sessionKey);
-		let shellSession = shellSessions.get(sessionKey);
-		if (!shellSession) {
-			shellSession = new Shell({ sessionEnv: shellEnv, snapshotPath: snapshotPath ?? undefined });
-			shellSessions.set(sessionKey, shellSession);
+		const runPromise = shellSession.run(
+			{
+				command: finalCommand,
+				cwd: options?.cwd,
+				env: options?.env,
+				timeoutMs: options?.timeout,
+				signal,
+			},
+			(err, chunk) => {
+				if (!err) {
+					enqueueChunk(chunk);
+				}
+			},
+		);
+
+		const winner = await Promise.race([
+			runPromise.then(result => ({ kind: "result" as const, result })),
+			hardTimeoutDeferred.promise.then(() => ({ kind: "hard-timeout" as const })),
+		]);
+
+		await pendingChunks;
+
+		if (winner.kind === "hard-timeout") {
+			resetSession = true;
+			return {
+				exitCode: undefined,
+				cancelled: true,
+				...(await sink.dump(`Command exceeded hard timeout after ${Math.round(hardTimeoutMs / 1000)} seconds`)),
+			};
 		}
 
-		const signal = options?.signal;
-		const abortHandler = () => {
-			shellSession.abort(signal?.reason instanceof Error ? signal.reason.message : undefined);
-		};
-		if (signal) {
-			signal.addEventListener("abort", abortHandler, { once: true });
+		// Handle timeout
+		if (winner.result.timedOut) {
+			const annotation = options?.timeout
+				? `Command timed out after ${Math.round(options.timeout / 1000)} seconds`
+				: "Command timed out";
+			resetSession = true;
+			return {
+				exitCode: undefined,
+				cancelled: true,
+				...(await sink.dump(annotation)),
+			};
 		}
 
-		try {
-			const result = await shellSession.run(
-				{
-					command: finalCommand,
-					cwd: options?.cwd,
-					env: options?.env,
-					timeoutMs: options?.timeout,
-					signal,
-				},
-				(err, chunk) => {
-					if (!err) {
-						enqueueChunk(chunk);
-					}
-				},
-			);
-
-			await pendingChunks;
-
-			// Handle timeout
-			if (result.timedOut) {
-				const annotation = options?.timeout
-					? `Command timed out after ${Math.round(options.timeout / 1000)} seconds`
-					: "Command timed out";
-				return {
-					exitCode: undefined,
-					cancelled: true,
-					...(await sink.dump(annotation)),
-				};
-			}
-
-			// Handle cancellation
-			if (result.cancelled) {
-				return {
-					exitCode: undefined,
-					cancelled: true,
-					...(await sink.dump("Command cancelled")),
-				};
-			}
-
-			// Normal completion
+		// Handle cancellation
+		if (winner.result.cancelled) {
+			resetSession = true;
 			return {
-				exitCode: result.exitCode,
-				cancelled: false,
-				...(await sink.dump()),
+				exitCode: undefined,
+				cancelled: true,
+				...(await sink.dump("Command cancelled")),
 			};
-		} finally {
-			if (signal) {
-				signal.removeEventListener("abort", abortHandler);
-			}
 		}
+
+		// Normal completion
+		return {
+			exitCode: winner.result.exitCode,
+			cancelled: false,
+			...(await sink.dump()),
+		};
+	} catch (err) {
+		resetSession = true;
+		throw err;
 	} finally {
+		if (hardTimeoutTimer) {
+			clearTimeout(hardTimeoutTimer);
+		}
+		if (signal) {
+			signal.removeEventListener("abort", abortHandler);
+		}
 		await pendingChunks;
+		if (resetSession) {
+			shellSessions.delete(sessionKey);
+		}
 	}
 }
 

package/src/mcp/config.ts

@@ -18,6 +18,8 @@ export interface LoadMCPConfigsOptions {
 	enableProjectConfig?: boolean;
 	/** Whether to filter out Exa MCP servers (default: true) */
 	filterExa?: boolean;
+	/** Whether to filter out browser MCP servers when builtin browser tool is enabled (default: false) */
+	filterBrowser?: boolean;
 }
 
 /** Result of loading MCP configs */
@@ -91,6 +93,7 @@ function convertToLegacyConfig(server: MCPServer): MCPServerConfig {
 export async function loadAllMCPConfigs(cwd: string, options?: LoadMCPConfigsOptions): Promise<LoadMCPConfigsResult> {
 	const enableProjectConfig = options?.enableProjectConfig ?? true;
 	const filterExa = options?.filterExa ?? true;
+	const filterBrowser = options?.filterBrowser ?? false;
 
 	// Load MCP servers via capability system
 	const result = await loadCapability<MCPServer>(mcpCapability.id, { cwd });
@@ -103,8 +106,8 @@ export async function loadAllMCPConfigs(cwd: string, options?: LoadMCPConfigsOpt
 	// Load user-level disabled servers list
 	const disabledServers = new Set(await readDisabledServers(getMCPConfigPath("user", cwd)));
 	// Convert to legacy format and preserve source metadata
-	const configs: Record<string, MCPServerConfig> = {};
-	const sources: Record<string, SourceMeta> = {};
+	let configs: Record<string, MCPServerConfig> = {};
+	let sources: Record<string, SourceMeta> = {};
 	for (const server of servers) {
 		const config = convertToLegacyConfig(server);
 		if (config.enabled === false || (server._source.level !== "user" && disabledServers.has(server.name))) {
@@ -114,11 +117,19 @@ export async function loadAllMCPConfigs(cwd: string, options?: LoadMCPConfigsOpt
 		sources[server.name] = server._source;
 	}
 
-	const exaApiKeys: string[] = [];
+	let exaApiKeys: string[] = [];
 
 	if (filterExa) {
-		const filterResult = filterExaMCPServers(configs, sources);
-		return { configs: filterResult.configs, exaApiKeys: filterResult.exaApiKeys, sources: filterResult.sources };
+		const exaResult = filterExaMCPServers(configs, sources);
+		configs = exaResult.configs;
+		sources = exaResult.sources;
+		exaApiKeys = exaResult.exaApiKeys;
+	}
+
+	if (filterBrowser) {
+		const browserResult = filterBrowserMCPServers(configs, sources);
+		configs = browserResult.configs;
+		sources = browserResult.sources;
 	}
 
 	return { configs, exaApiKeys, sources };
@@ -264,3 +275,89 @@ export function validateServerConfig(name: string, config: MCPServerConfig): str
 
 	return errors;
 }
+
+/** Known browser automation MCP server names (lowercase) */
+const BROWSER_MCP_NAMES = new Set([
+	"puppeteer",
+	"playwright",
+	"browserbase",
+	"browser-tools",
+	"browser-use",
+	"browser",
+]);
+
+/** Patterns matching browser MCP package names in command/args */
+const BROWSER_MCP_PKG_PATTERN =
+	// Official packages
+	// - @modelcontextprotocol/server-puppeteer
+	// - @playwright/mcp
+	// - @browserbasehq/mcp-server-browserbase
+	// - @agentdeskai/browser-tools-mcp
+	// - @agent-infra/mcp-server-browser
+	// Community packages: puppeteer-mcp-server, playwright-mcp, pptr-mcp, etc.
+	/(?:@modelcontextprotocol\/server-puppeteer|@playwright\/mcp|@browserbasehq\/mcp-server-browserbase|@agentdeskai\/browser-tools-mcp|@agent-infra\/mcp-server-browser|puppeteer-mcp|playwright-mcp|pptr-mcp|browser-use-mcp|mcp-browser-use)/i;
+
+/** URL patterns for hosted browser MCP services */
+const BROWSER_MCP_URL_PATTERN = /browserbase\.com|browser-use\.com/i;
+
+/**
+ * Check if a server config is a browser automation MCP server.
+ */
+export function isBrowserMCPServer(name: string, config: MCPServerConfig): boolean {
+	// Check by server name
+	if (BROWSER_MCP_NAMES.has(name.toLowerCase())) {
+		return true;
+	}
+
+	// Check by URL for HTTP/SSE servers
+	if (config.type === "http" || config.type === "sse") {
+		const httpConfig = config as { url?: string };
+		if (httpConfig.url && BROWSER_MCP_URL_PATTERN.test(httpConfig.url)) {
+			return true;
+		}
+	}
+
+	// Check by command/args for stdio servers
+	if (!config.type || config.type === "stdio") {
+		const stdioConfig = config as { command?: string; args?: string[] };
+		if (stdioConfig.command && BROWSER_MCP_PKG_PATTERN.test(stdioConfig.command)) {
+			return true;
+		}
+		if (stdioConfig.args?.some(arg => BROWSER_MCP_PKG_PATTERN.test(arg))) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/** Result of filtering browser MCP servers */
+export interface BrowserFilterResult {
+	/** Configs with browser servers removed */
+	configs: Record<string, MCPServerConfig>;
+	/** Source metadata for remaining servers */
+	sources: Record<string, SourceMeta>;
+}
+
+/**
+ * Filter out browser automation MCP servers.
+ * Since we have a native browser tool, we don't need these MCP servers.
+ */
+export function filterBrowserMCPServers(
+	configs: Record<string, MCPServerConfig>,
+	sources: Record<string, SourceMeta>,
+): BrowserFilterResult {
+	const filtered: Record<string, MCPServerConfig> = {};
+	const filteredSources: Record<string, SourceMeta> = {};
+
+	for (const [name, config] of Object.entries(configs)) {
+		if (!isBrowserMCPServer(name, config)) {
+			filtered[name] = config;
+			if (sources[name]) {
+				filteredSources[name] = sources[name];
+			}
+		}
+	}
+
+	return { configs: filtered, sources: filteredSources };
+}

package/src/mcp/index.ts

@@ -8,10 +8,12 @@
 // Client
 export { callTool, connectToServer, disconnectServer, listTools, serverSupportsTools } from "./client";
 // Config
-export type { ExaFilterResult, LoadMCPConfigsOptions, LoadMCPConfigsResult } from "./config";
+export type { BrowserFilterResult, ExaFilterResult, LoadMCPConfigsOptions, LoadMCPConfigsResult } from "./config";
 export {
 	extractExaApiKey,
+	filterBrowserMCPServers,
 	filterExaMCPServers,
+	isBrowserMCPServer,
 	isExaMCPServer,
 	loadAllMCPConfigs,
 	validateServerConfig,

package/src/mcp/loader.ts

@@ -32,6 +32,8 @@ export interface MCPToolsLoadOptions {
 	enableProjectConfig?: boolean;
 	/** Whether to filter out Exa MCP servers (default: true) */
 	filterExa?: boolean;
+	/** Whether to filter out browser MCP servers when builtin browser tool is enabled (default: false) */
+	filterBrowser?: boolean;
 	/** SQLite storage for MCP tool cache (null disables cache) */
 	cacheStorage?: AgentStorage | null;
 	/** Auth storage used to resolve OAuth credentials before initial MCP connect */
@@ -69,6 +71,7 @@ export async function discoverAndLoadMCPTools(cwd: string, options?: MCPToolsLoa
 			onConnecting: options?.onConnecting,
 			enableProjectConfig: options?.enableProjectConfig,
 			filterExa: options?.filterExa,
+			filterBrowser: options?.filterBrowser,
 		});
 	} catch (error) {
 		// If discovery fails entirely, return empty result

package/src/mcp/manager.ts

@@ -68,6 +68,8 @@ export interface MCPDiscoverOptions {
 	enableProjectConfig?: boolean;
 	/** Whether to filter out Exa MCP servers (default: true) */
 	filterExa?: boolean;
+	/** Whether to filter out browser MCP servers when builtin browser tool is enabled (default: false) */
+	filterBrowser?: boolean;
 	/** Called when starting to connect to servers */
 	onConnecting?: (serverNames: string[]) => void;
 }
@@ -105,6 +107,7 @@ export class MCPManager {
 		const { configs, exaApiKeys, sources } = await loadAllMCPConfigs(this.cwd, {
 			enableProjectConfig: options?.enableProjectConfig,
 			filterExa: options?.filterExa,
+			filterBrowser: options?.filterBrowser,
 		});
 		const result = await this.connectServers(configs, sources, options?.onConnecting);
 		result.exaApiKeys = exaApiKeys;

package/src/sdk.ts

@@ -806,6 +806,8 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			enableProjectConfig: settings.get("mcp.enableProjectConfig") ?? true,
 			// Always filter Exa - we have native integration
 			filterExa: true,
+			// Filter browser MCP servers when builtin browser tool is active
+			filterBrowser: (settings.get("browser.enabled") as boolean) ?? false,
 			cacheStorage: settings.getStorage(),
 			authStorage,
 		});

package/src/system-prompt.ts

@@ -61,6 +61,7 @@ export async function loadGitContext(cwd: string): Promise<GitContext | null> {
 			stdout: "pipe",
 			stderr: "ignore",
 			timeout: timeout,
+			killSignal: "SIGKILL",
 		});
 		return untilAborted(abortSignal, async () => {
 			const exitCode = await proc.exited;

package/src/tools/bash.ts

@@ -17,7 +17,7 @@ import { CachedOutputBlock } from "../tui/output-block";
 import type { ToolSession } from ".";
 import { type BashInteractiveResult, runInteractiveBashPty } from "./bash-interactive";
 import { checkBashInterception } from "./bash-interceptor";
-import { applyHeadTail, normalizeBashCommand } from "./bash-normalize";
+import { applyHeadTail } from "./bash-normalize";
 import { expandInternalUrls } from "./bash-skill-urls";
 import type { OutputMeta } from "./output-meta";
 import { allocateOutputArtifact, createTailBuffer } from "./output-utils";
@@ -75,13 +75,11 @@ export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails> {
 		onUpdate?: AgentToolUpdateCallback<BashToolDetails>,
 		ctx?: AgentToolContext,
 	): Promise<AgentToolResult<BashToolDetails>> {
-		// Normalize command: strip head/tail pipes and 2>&1
-		const normalized = normalizeBashCommand(rawCommand);
-		let command = normalized.command;
+		let command = rawCommand;
 
-		// Merge explicit params with extracted ones (explicit takes precedence)
-		const headLines = head ?? normalized.headLines;
-		const tailLines = tail ?? normalized.tailLines;
+		// Only apply explicit head/tail params from tool input.
+		const headLines = head;
+		const tailLines = tail;
 
 		// Check interception if enabled and available tools are known
 		if (this.session.settings.get("bashInterceptor.enabled")) {
@@ -140,6 +138,7 @@ export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails> {
 				})
 			: await executeBash(command, {
 					cwd: commandCwd,
+					sessionKey: this.session.getSessionId?.() ?? undefined,
 					timeout: timeoutMs,
 					signal,
 					env: extraEnv,

package/src/utils/shell-snapshot.ts

@@ -9,9 +9,9 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { postmortem } from "@oh-my-pi/pi-utils";
-import { $ } from "bun";
 
 const cachedSnapshotPaths = new Map<string, string>();
+const SNAPSHOT_TIMEOUT_MS = 2_000;
 
 function sanitizeSnapshotEnv(env: Record<string, string | undefined>): Record<string, string | undefined> {
 	const sanitized = { ...env };
@@ -153,8 +153,23 @@ export async function getOrCreateSnapshot(
 
 	try {
 		const snapshotEnv = sanitizeSnapshotEnv(env);
-		await $`${shell} -c ${script}`.env(snapshotEnv).quiet().text();
-		if (fs.existsSync(snapshotPath)) {
+		const spawnEnv: Record<string, string> = {};
+		for (const [key, value] of Object.entries(snapshotEnv)) {
+			if (value !== undefined) {
+				spawnEnv[key] = value;
+			}
+		}
+		const child = Bun.spawn([shell, "-c", script], {
+			env: spawnEnv,
+			stdin: "ignore",
+			stdout: "ignore",
+			stderr: "ignore",
+			timeout: SNAPSHOT_TIMEOUT_MS,
+			killSignal: "SIGKILL",
+		});
+
+		await child.exited;
+		if (child.exitCode === 0 && fs.existsSync(snapshotPath)) {
 			cachedSnapshotPaths.set(cacheKey, snapshotPath);
 			return snapshotPath;
 		}