@oh-my-pi/pi-coding-agent 14.9.0 → 14.9.2

package/src/mcp/transports/http.ts

@@ -245,11 +245,7 @@ export class HttpTransport implements MCPTransport {
 		}
 	}
 
-	async #parseSSEResponse<T>(
-		response: Response,
-		expectedId: string | number,
-		options?: MCPRequestOptions,
-	): Promise<T> {
+	#parseSSEResponse<T>(response: Response, expectedId: string | number, options?: MCPRequestOptions): Promise<T> {
 		if (!response.body) {
 			throw new Error("No response body");
 		}
@@ -261,54 +257,60 @@ export class HttpTransport implements MCPTransport {
 			? AbortSignal.any([options.signal, abortController.signal])
 			: abortController.signal;
 
-		try {
-			let result: T | undefined;
-			let captured = false;
-			for await (const raw of readSseJson<JsonRpcMessage | JsonRpcMessage[]>(response.body, operationSignal)) {
-				// Flatten batches (JSON-RPC 2.0 section 6) into individual messages.
-				const messages = Array.isArray(raw) ? raw : [raw];
-				for (const message of messages) {
-					if (
-						!captured &&
-						"id" in message &&
-						message.id === expectedId &&
-						("result" in message || "error" in message)
-					) {
-						clearTimeout(timeoutId);
-						if (message.error) {
-							throw new Error(`MCP error ${message.error.code}: ${message.error.message}`);
+		const { promise, resolve, reject } = Promise.withResolvers<T>();
+		let captured = false;
+
+		// Drain the SSE stream from a single iterator. We resolve the deferred
+		// promise as soon as the matching response arrives, then keep iterating
+		// in the background to pick up piggybacked notifications/requests.
+		// Re-reading `response.body` after `for await` breaks would lock the
+		// stream a second time and surface as "ReadableStream already has a
+		// controller", so we must not exit the loop early.
+		const drain = async (): Promise<void> => {
+			try {
+				for await (const raw of readSseJson<JsonRpcMessage | JsonRpcMessage[]>(response.body!, operationSignal)) {
+					const messages = Array.isArray(raw) ? raw : [raw];
+					for (const message of messages) {
+						if (
+							!captured &&
+							"id" in message &&
+							message.id === expectedId &&
+							("result" in message || "error" in message)
+						) {
+							captured = true;
+							clearTimeout(timeoutId);
+							if (message.error) {
+								reject(new Error(`MCP error ${message.error.code}: ${message.error.message}`));
+							} else {
+								resolve(message.result as T);
+							}
+							continue;
 						}
-						result = message.result as T;
-						captured = true;
-						continue;
+						if (!this.#connected) continue;
+						this.#dispatchSSEMessage(message);
 					}
-					this.#dispatchSSEMessage(message);
 				}
-				if (captured) break;
-			}
-			if (!captured) {
-				throw new Error(`No response received for request ID ${expectedId}`);
-			}
-			// Reader released after break — safe to start a background drain
-			// for piggybacked notifications/requests on the same stream.
-			this.#drainSSEBackground(response.body, operationSignal);
-			return result as T;
-		} catch (error) {
-			if (error instanceof Error && error.name === "AbortError") {
-				if (options?.signal?.aborted) {
-					throw error;
+				if (!captured) {
+					reject(new Error(`No response received for request ID ${expectedId}`));
 				}
-				throw new Error(`SSE response timeout after ${timeout}ms`);
+			} catch (error) {
+				if (captured) return;
+				if (error instanceof Error && error.name === "AbortError") {
+					if (options?.signal?.aborted) {
+						reject(error);
+					} else {
+						reject(new Error(`SSE response timeout after ${timeout}ms`));
+					}
+				} else {
+					reject(error as Error);
+				}
+			} finally {
+				clearTimeout(timeoutId);
 			}
-			throw error;
-		} finally {
-			clearTimeout(timeoutId);
-		}
-	}
+		};
 
-	/** Continue reading SSE messages in the background after the primary response is captured. */
-	#drainSSEBackground(body: ReadableStream<Uint8Array>, signal: AbortSignal): void {
-		void this.#readSSEStream(body, signal);
+		void drain();
+		return promise;
 	}
 
 	async #handleServerRequest(request: JsonRpcRequest): Promise<void> {

package/src/prompts/tools/hashline.md

@@ -37,6 +37,7 @@ When your edit involves brace boundaries (`{` / `}`), prefer these shapes:
 - **Do not duplicate chunks inside one payload.** When emitting a long `=` payload, never paste the same multi-line block twice. If you catch yourself re-emitting an earlier run of lines, stop and rewrite the op.
 - **Anchor only inside the visible region.** If the read output around your `=`/`-` end anchor is truncated (you cannot see the line at B+1), issue a fresh `read` before editing — anchoring blind drops or duplicates the boundary line.
 - **Prefer the narrowest self-contained edit.** Once your range cleanly contains the construct you are changing, a `+`/`<` insert plus a small `-` delete is almost always clearer and safer than a single wide `= A..B` that re-emits unchanged context.
+- **Anchors always reference the file as you last read it.** When stacking multiple `+`/`<`/`-`/`=` ops in one patch, do **NOT** mentally shift line numbers to account for prior ops in the same patch. Every op resolves against the original line numbering.
 </common-failures>
 
 <case file="a.ts">
@@ -95,10 +96,6 @@ When your edit involves brace boundaries (`{` / `}`), prefer these shapes:
 + {{hrefr 4}}
 {{hsep}}	if (clean.length === 0) return DEF;
 
-# Append WITHIN a line
-@a.ts
-+ {{hrefr 4}}{{hsep}} // first run
-
 # Append to end of file
 @a.ts
 + EOF

package/src/sdk.ts

@@ -100,9 +100,7 @@ import { SessionManager } from "./session/session-manager";
 import { closeAllConnections } from "./ssh/connection-manager";
 import { unmountAll } from "./ssh/sshfs-mount";
 import {
-	type AgentsMdSearch,
 	type BuildSystemPromptResult,
-	buildAgentsMdSearch,
 	buildSystemPrompt as buildSystemPromptInternal,
 	buildSystemPromptToolMetadata,
 	loadProjectContextFiles as loadContextFilesInternal,
@@ -201,8 +199,6 @@ export interface CreateAgentSessionOptions {
 	rules?: Rule[];
 	/** Context files (AGENTS.md content). Default: discovered walking up from cwd */
 	contextFiles?: Array<{ path: string; content: string }>;
-	/** Pre-built AGENTS.md search (skips re-scanning the workspace; passed by parents to subagents). */
-	agentsMdSearch?: AgentsMdSearch;
 	/** Pre-built workspace tree (skips re-scanning; passed by parents to subagents). */
 	workspaceTree?: WorkspaceTree;
 	/** Prompt templates. Default: discovered from cwd/.omp/prompts/ + agentDir/prompts/ */
@@ -691,16 +687,14 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	if (!options.modelRegistry) {
 		modelRegistry.refreshInBackground();
 	}
-	// Kick off AGENTS.md filesystem search and workspace tree in parallel — they are the slowest pieces of
-	// buildSystemPrompt (can be many seconds on large repos) and only need `cwd`, so they overlap with
-	// everything that follows. Subagents inherit the parent's resolved values via options.
-	const agentsMdSearchPromise: Promise<AgentsMdSearch> = options.agentsMdSearch
-		? Promise.resolve(options.agentsMdSearch)
-		: logger.time("buildAgentsMdSearch", buildAgentsMdSearch, cwd);
-	agentsMdSearchPromise.catch(() => {});
+	// Kick off workspace tree discovery early. The native workspace scan returns
+	// both the rendered-tree input and the AGENTS.md directory-context index, so
+	// startup does not perform a second recursive filesystem search. Subagents
+	// inherit the parent's resolved values via options.
+	const STARTUP_SCAN_DEADLINE_MS = 5000;
 	const workspaceTreePromise: Promise<WorkspaceTree> = options.workspaceTree
 		? Promise.resolve(options.workspaceTree)
-		: logger.time("buildWorkspaceTree", buildWorkspaceTree, cwd);
+		: logger.time("buildWorkspaceTree", () => buildWorkspaceTree(cwd, { timeoutMs: STARTUP_SCAN_DEADLINE_MS }));
 	workspaceTreePromise.catch(() => {});
 
 	// Independent discoveries that depend only on cwd/agentDir — kicked off in parallel and awaited
@@ -898,12 +892,11 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		return { ttsrManager, rulebookRules, alwaysApplyRules };
 	});
 
-	// Resolve contextFiles up-front (it's needed before tool creation). The agentsMd / workspace tree
-	// scans are slowest on large repos and we MUST NOT block startup on them — race them against a
-	// short deadline. On timeout we forward `undefined` to ToolSession; buildSystemPromptInternal will
-	// re-race them through its own withDeadline path, and subagents will scan independently (still
-	// cheaper than an unbounded parent hang). Background work continues so caches still warm.
-	const STARTUP_SCAN_DEADLINE_MS = 5000;
+	// Resolve contextFiles up-front (it's needed before tool creation). The
+	// workspace tree scan is slow on large repos and we MUST NOT block startup on
+	// it. On timeout we forward `undefined` to ToolSession; buildSystemPromptInternal
+	// will re-race the same promise through its own withDeadline path. Background
+	// work continues so caches still warm.
 	const raceWithDeadline = <T>(name: string, work: Promise<T>): Promise<T | undefined> =>
 		Promise.race([
 			work,
@@ -916,9 +909,8 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				return undefined;
 			}),
 		]);
-	const [contextFiles, resolvedAgentsMdSearch, resolvedWorkspaceTree] = await Promise.all([
+	const [contextFiles, resolvedWorkspaceTree] = await Promise.all([
 		contextFilesPromise,
-		raceWithDeadline("buildAgentsMdSearch", agentsMdSearchPromise),
 		raceWithDeadline("buildWorkspaceTree", workspaceTreePromise),
 	]);
 
@@ -1004,7 +996,6 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			},
 			skipPythonPreflight: options.skipPythonPreflight,
 			contextFiles,
-			agentsMdSearch: resolvedAgentsMdSearch,
 			workspaceTree: resolvedWorkspaceTree,
 			skills,
 			eventBus,
@@ -1456,7 +1447,6 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				mcpDiscoveryServerSummaries: discoverableToolSummary.servers.map(formatDiscoverableMCPToolServerSummary),
 				eagerTasks,
 				secretsEnabled,
-				agentsMdSearch: agentsMdSearchPromise,
 				workspaceTree: workspaceTreePromise,
 			});
 

package/src/system-prompt.ts

@@ -4,7 +4,6 @@
 
 import * as os from "node:os";
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
-import { FileType, glob } from "@oh-my-pi/pi-natives";
 import { $env, getGpuCachePath, getProjectDir, hasFsCode, isEnoent, logger, prompt } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import { contextFileCapability } from "./capability/context-file";
@@ -15,7 +14,7 @@ import { loadSkills, type Skill } from "./extensibility/skills";
 import customSystemPromptTemplate from "./prompts/system/custom-system-prompt.md" with { type: "text" };
 import projectPromptTemplate from "./prompts/system/project-prompt.md" with { type: "text" };
 import systemPromptTemplate from "./prompts/system/system-prompt.md" with { type: "text" };
-import { buildWorkspaceTree, type WorkspaceTree } from "./workspace-tree";
+import { AGENTS_MD_LIMIT, buildWorkspaceTree, type WorkspaceTree } from "./workspace-tree";
 
 interface AlwaysApplyRule {
 	name: string;
@@ -84,58 +83,7 @@ function parseWmicTable(output: string, header: string): string | null {
 	return filtered[0] ?? null;
 }
 
-const AGENTS_MD_MIN_DEPTH = 1;
-const AGENTS_MD_MAX_DEPTH = 4;
-const AGENTS_MD_LIMIT = 200;
 const SYSTEM_PROMPT_PREP_TIMEOUT_MS = 5000;
-const AGENTS_MD_EXCLUDED_DIRS = new Set(["node_modules", ".git"]);
-
-export interface AgentsMdSearch {
-	scopePath: string;
-	limit: number;
-	pattern: string;
-	files: string[];
-}
-
-async function listAgentsMdFiles(root: string, limit: number): Promise<string[]> {
-	try {
-		const result = await glob({
-			pattern: "**/AGENTS.md",
-			path: root,
-			fileType: FileType.File,
-			recursive: true,
-			hidden: false,
-			gitignore: true,
-			maxResults: limit * 4,
-			cache: true,
-		});
-		const files: string[] = [];
-		for (const m of result.matches) {
-			const rel = m.path.replace(/\\/g, "/");
-			if (!rel?.endsWith("AGENTS.md")) continue;
-			const segments = rel.split("/");
-			const depth = segments.length - 1;
-			if (depth < AGENTS_MD_MIN_DEPTH || depth > AGENTS_MD_MAX_DEPTH) continue;
-			const dirSegments = segments.slice(0, -1);
-			if (dirSegments.some(seg => AGENTS_MD_EXCLUDED_DIRS.has(seg) || seg.startsWith("."))) continue;
-			files.push(rel);
-			if (files.length >= limit) break;
-		}
-		return Array.from(new Set(files)).sort().slice(0, limit);
-	} catch {
-		return [];
-	}
-}
-
-export async function buildAgentsMdSearch(cwd: string): Promise<AgentsMdSearch> {
-	const files = await listAgentsMdFiles(cwd, AGENTS_MD_LIMIT);
-	return {
-		scopePath: ".",
-		limit: AGENTS_MD_LIMIT,
-		pattern: `AGENTS.md depth ${AGENTS_MD_MIN_DEPTH}-${AGENTS_MD_MAX_DEPTH}`,
-		files,
-	};
-}
 
 async function getGpuModel(): Promise<string | null> {
 	switch (process.platform) {
@@ -409,8 +357,6 @@ export interface BuildSystemPromptOptions {
 	alwaysApplyRules?: AlwaysApplyRule[];
 	/** Whether secret obfuscation is active. When true, explains the redaction format in the prompt. */
 	secretsEnabled?: boolean;
-	/** Pre-loaded AGENTS.md search (skips discovery if provided). May be a Promise to allow early kick-off. */
-	agentsMdSearch?: AgentsMdSearch | Promise<AgentsMdSearch>;
 	/** Pre-loaded workspace tree (skips discovery if provided). May be a Promise to allow early kick-off. */
 	workspaceTree?: WorkspaceTree | Promise<WorkspaceTree>;
 }
@@ -444,7 +390,6 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		mcpDiscoveryServerSummaries = [],
 		eagerTasks = false,
 		secretsEnabled = false,
-		agentsMdSearch: providedAgentsMdSearch,
 		workspaceTree: providedWorkspaceTree,
 	} = options;
 	const resolvedCwd = cwd ?? getProjectDir();
@@ -454,18 +399,13 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		resolvedAppendPrompt: undefined as string | undefined,
 		systemPromptCustomization: null as string | null,
 		contextFiles: dedupeExactContextFiles(providedContextFiles ?? []),
-		agentsMdSearch: {
-			scopePath: ".",
-			limit: AGENTS_MD_LIMIT,
-			pattern: `AGENTS.md depth ${AGENTS_MD_MIN_DEPTH}-${AGENTS_MD_MAX_DEPTH}`,
-			files: [] as string[],
-		} satisfies AgentsMdSearch,
 		skills: providedSkills ?? ([] as Skill[]),
 		workspaceTree: {
 			rootPath: resolvedCwd,
 			rendered: "",
 			truncated: false,
 			totalLines: 0,
+			agentsMdFiles: [],
 		} satisfies WorkspaceTree,
 	};
 
@@ -503,14 +443,12 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 	const contextFilesPromise = providedContextFiles
 		? Promise.resolve(providedContextFiles)
 		: logger.time("loadProjectContextFiles", loadProjectContextFiles, { cwd: resolvedCwd });
-	const agentsMdSearchPromise =
-		providedAgentsMdSearch !== undefined
-			? Promise.resolve(providedAgentsMdSearch)
-			: logger.time("buildAgentsMdSearch", buildAgentsMdSearch, resolvedCwd);
 	const workspaceTreePromise =
 		providedWorkspaceTree !== undefined
 			? Promise.resolve(providedWorkspaceTree)
-			: logger.time("buildWorkspaceTree", buildWorkspaceTree, resolvedCwd);
+			: logger.time("buildWorkspaceTree", () =>
+					buildWorkspaceTree(resolvedCwd, { timeoutMs: SYSTEM_PROMPT_PREP_TIMEOUT_MS }),
+				);
 	const skillsPromise: Promise<Skill[]> =
 		providedSkills !== undefined
 			? Promise.resolve(providedSkills)
@@ -518,33 +456,30 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 				? loadSkills({ ...skillsSettings, cwd: resolvedCwd }).then(result => result.skills)
 				: Promise.resolve([]);
 
-	const [
-		resolvedCustomPrompt,
-		resolvedAppendPrompt,
-		systemPromptCustomization,
-		contextFiles,
-		agentsMdSearch,
-		skills,
-		workspaceTree,
-	] = await Promise.all([
-		withDeadline(
-			"customPrompt",
-			resolvePromptInput(customPrompt, "system prompt"),
-			prepDefaults.resolvedCustomPrompt,
-		),
-		withDeadline(
-			"appendSystemPrompt",
-			resolvePromptInput(appendSystemPrompt, "append system prompt"),
-			prepDefaults.resolvedAppendPrompt,
-		),
-		withDeadline("loadSystemPromptFiles", systemPromptCustomizationPromise, prepDefaults.systemPromptCustomization),
-		withDeadline("loadProjectContextFiles", contextFilesPromise, prepDefaults.contextFiles).then(
-			dedupeExactContextFiles,
-		),
-		withDeadline("buildAgentsMdSearch", agentsMdSearchPromise, prepDefaults.agentsMdSearch),
-		withDeadline("loadSkills", skillsPromise, prepDefaults.skills),
-		withDeadline("buildWorkspaceTree", workspaceTreePromise, prepDefaults.workspaceTree),
-	]);
+	const [resolvedCustomPrompt, resolvedAppendPrompt, systemPromptCustomization, contextFiles, skills, workspaceTree] =
+		await Promise.all([
+			withDeadline(
+				"customPrompt",
+				resolvePromptInput(customPrompt, "system prompt"),
+				prepDefaults.resolvedCustomPrompt,
+			),
+			withDeadline(
+				"appendSystemPrompt",
+				resolvePromptInput(appendSystemPrompt, "append system prompt"),
+				prepDefaults.resolvedAppendPrompt,
+			),
+			withDeadline(
+				"loadSystemPromptFiles",
+				systemPromptCustomizationPromise,
+				prepDefaults.systemPromptCustomization,
+			),
+			withDeadline("loadProjectContextFiles", contextFilesPromise, prepDefaults.contextFiles).then(
+				dedupeExactContextFiles,
+			),
+			withDeadline("loadSkills", skillsPromise, prepDefaults.skills),
+			withDeadline("buildWorkspaceTree", workspaceTreePromise, prepDefaults.workspaceTree),
+		]);
+	const agentsMdFiles = Array.from(new Set(workspaceTree.agentsMdFiles)).sort().slice(0, AGENTS_MD_LIMIT);
 
 	if (timedOut.length > 0) {
 		logger.warn("System prompt preparation steps timed out; using minimal fallback for those steps", {
@@ -617,7 +552,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		toolRefs,
 		environment,
 		contextFiles,
-		agentsMdSearch,
+		agentsMdSearch: { files: agentsMdFiles },
 		workspaceTree,
 		skills: filteredSkills,
 		rules: rules ?? [],

package/src/task/executor.ts

@@ -28,7 +28,6 @@ import { createAgentSession, discoverAuthStorage } from "../sdk";
 import type { AgentSession, AgentSessionEvent } from "../session/agent-session";
 import type { AuthStorage } from "../session/auth-storage";
 import { SessionManager } from "../session/session-manager";
-import type { AgentsMdSearch } from "../system-prompt";
 import { type ContextFileEntry, truncateTail } from "../tools";
 import { jtdToJsonSchema, normalizeSchema } from "../tools/jtd-to-json-schema";
 import { ToolAbortError } from "../tools/tool-errors";
@@ -165,7 +164,6 @@ export interface ExecutorOptions {
 	contextFiles?: ContextFileEntry[];
 	skills?: Skill[];
 	promptTemplates?: PromptTemplate[];
-	agentsMdSearch?: AgentsMdSearch;
 	workspaceTree?: WorkspaceTree;
 	mcpManager?: MCPManager;
 	authStorage?: AuthStorage;
@@ -941,8 +939,13 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 			checkAbort();
 			const authStorage = options.authStorage ?? (await discoverAuthStorage());
 			checkAbort();
+			const registryFromParent = options.modelRegistry !== undefined;
 			const modelRegistry = options.modelRegistry ?? new ModelRegistry(authStorage);
-			await modelRegistry.refresh();
+			if (!registryFromParent) {
+				await modelRegistry.refresh();
+			} else {
+				logger.debug("runSubagent: reusing parent modelRegistry; skipping refresh");
+			}
 			checkAbort();
 
 			const {
@@ -990,7 +993,6 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 				contextFiles: options.contextFiles,
 				skills: options.skills,
 				promptTemplates: options.promptTemplates,
-				agentsMdSearch: options.agentsMdSearch,
 				workspaceTree: options.workspaceTree,
 				systemPrompt: defaultPrompt => [
 					prompt.render(subagentSystemPromptTemplate, {

package/src/task/index.ts

@@ -866,7 +866,6 @@ export class TaskTool implements AgentTool<TSchema, TaskToolDetails, Theme> {
 						mcpManager: this.session.mcpManager,
 						contextFiles,
 						skills: availableSkills,
-						agentsMdSearch: this.session.agentsMdSearch,
 						workspaceTree: this.session.workspaceTree,
 						promptTemplates,
 						localProtocolOptions,
@@ -924,7 +923,6 @@ export class TaskTool implements AgentTool<TSchema, TaskToolDetails, Theme> {
 						mcpManager: this.session.mcpManager,
 						contextFiles,
 						skills: availableSkills,
-						agentsMdSearch: this.session.agentsMdSearch,
 						workspaceTree: this.session.workspaceTree,
 						promptTemplates,
 						localProtocolOptions,

package/src/task/render.ts

@@ -470,14 +470,16 @@ export function renderCall(args: TaskParams, _options: RenderResultOptions, them
 			lines.push(` ${vertical}  ${content}`);
 		}
 		const taskPrefix = showIsolated ? branch : last;
-		lines.push(` ${taskPrefix} ${theme.fg("dim", "Tasks")}: ${theme.fg("muted", `${args.tasks.length} agents`)}`);
+		lines.push(
+			` ${taskPrefix} ${theme.fg("dim", "Tasks")}: ${theme.fg("muted", `${args.tasks?.length ?? 0} agents`)}`,
+		);
 		if (showIsolated) {
 			lines.push(` ${last} ${theme.fg("dim", "Isolated")}: ${theme.fg("muted", "true")}`);
 		}
 		return new Text(lines.join("\n"), 0, 0);
 	}
 
-	lines.push(`${theme.fg("dim", "Tasks")}: ${theme.fg("muted", `${args.tasks.length} agents`)}`);
+	lines.push(`${theme.fg("dim", "Tasks")}: ${theme.fg("muted", `${args.tasks?.length ?? 0} agents`)}`);
 	if (showIsolated) {
 		lines.push(`${theme.fg("dim", "Isolated")}: ${theme.fg("muted", "true")}`);
 	}

package/src/tools/index.ts

@@ -14,7 +14,6 @@ import type { PlanModeState } from "../plan-mode/state";
 import type { AgentRegistry } from "../registry/agent-registry";
 import type { CustomMessage } from "../session/messages";
 import type { ToolChoiceQueue } from "../session/tool-choice-queue";
-import type { AgentsMdSearch } from "../system-prompt";
 import { TaskTool } from "../task";
 import type { AgentOutputManager } from "../task/output-manager";
 import type { DiscoverableTool, DiscoverableToolSearchIndex } from "../tool-discovery/tool-index";
@@ -122,8 +121,6 @@ export interface ToolSession {
 	skipPythonPreflight?: boolean;
 	/** Pre-loaded context files (AGENTS.md, etc) */
 	contextFiles?: ContextFileEntry[];
-	/** Pre-loaded AGENTS.md search (forwarded to subagents to skip re-scanning) */
-	agentsMdSearch?: AgentsMdSearch;
 	/** Pre-loaded workspace tree (forwarded to subagents to skip re-scanning) */
 	workspaceTree?: WorkspaceTree;
 	/** Pre-loaded skills */

package/src/tools/read.ts

@@ -73,20 +73,6 @@ const PROSE_SUMMARY_EXTENSIONS = new Set([".md", ".txt"]);
 // Remote mount path prefix (sshfs mounts) - skip fuzzy matching to avoid hangs
 const REMOTE_MOUNT_PREFIX = getRemoteDir() + path.sep;
 
-const READ_DIRECTORY_EXCLUDED_DIRS = new Set([
-	"node_modules",
-	".git",
-	".next",
-	"dist",
-	"build",
-	"target",
-	".venv",
-	".cache",
-	".turbo",
-	".parcel-cache",
-	"coverage",
-]);
-
 function isRemoteMountPath(absolutePath: string): boolean {
 	return absolutePath.startsWith(REMOTE_MOUNT_PREFIX);
 }
@@ -1581,15 +1567,9 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 		try {
 			tree = await buildDirectoryTree(absolutePath, {
 				maxDepth: READ_DIRECTORY_MAX_DEPTH,
-				directoryEntryLimit: READ_DIRECTORY_CHILD_LIMIT,
-				rootEntryLimit: null,
+				perDirLimit: READ_DIRECTORY_CHILD_LIMIT,
+				rootLimit: null,
 				lineCap: limit ?? null,
-				lineCapProtectedDepth: 1,
-				hidden: true,
-				gitignore: false,
-				cache: true,
-				excludedDirectoryNames: READ_DIRECTORY_EXCLUDED_DIRS,
-				rootLabel: ".",
 			});
 		} catch (error) {
 			const message = error instanceof Error ? error.message : String(error);