@wahack/pi-coding-agent 15.11.0

package/src/tools/index.ts

@@ -0,0 +1,599 @@
+import type { InMemorySnapshotStore } from "@oh-my-pi/hashline";
+import type { AgentTelemetryConfig, AgentTool } from "@oh-my-pi/pi-agent-core";
+import type { FetchImpl, ToolChoice } from "@oh-my-pi/pi-ai";
+import { logger } from "@oh-my-pi/pi-utils";
+import type { AsyncJobManager } from "../async/job-manager";
+import type { Rule } from "../capability/rule";
+import type { PromptTemplate } from "../config/prompt-templates";
+import type { Settings } from "../config/settings";
+import { EditTool } from "../edit";
+import { checkPythonKernelAvailability } from "../eval/py/kernel";
+import type { ToolPathWithSource } from "../extensibility/custom-tools";
+import type { Skill } from "../extensibility/skills";
+import type { GoalModeState, GoalRuntime } from "../goals";
+import { GoalTool } from "../goals/tools/goal-tool";
+import type { HindsightSessionState } from "../hindsight/state";
+import type { LocalProtocolOptions } from "../internal-urls";
+import { LspTool } from "../lsp";
+import type { MCPManager } from "../mcp";
+import type { MnemopiSessionState } from "../mnemopi/state";
+import type { PlanModeState } from "../plan-mode/state";
+import type { AgentRegistry } from "../registry/agent-registry";
+import type { ArtifactManager } from "../session/artifacts";
+import type { ClientBridge } from "../session/client-bridge";
+import type { CustomMessage } from "../session/messages";
+import type { ToolChoiceQueue } from "../session/tool-choice-queue";
+import { TaskTool } from "../task";
+import type { AgentOutputManager } from "../task/output-manager";
+import { countToolsForAutoDiscovery, resolveEffectiveToolDiscoveryMode } from "../tool-discovery/mode";
+import type { DiscoverableTool, DiscoverableToolSearchIndex } from "../tool-discovery/tool-index";
+import type { EventBus } from "../utils/event-bus";
+import { WebSearchTool } from "../web/search";
+import type { WorkspaceTree } from "../workspace-tree";
+import { AskTool } from "./ask";
+import { AstEditTool } from "./ast-edit";
+import { AstGrepTool } from "./ast-grep";
+import { BashTool } from "./bash";
+import { BrowserTool } from "./browser";
+import { type CheckpointState, CheckpointTool, RewindTool } from "./checkpoint";
+import { DebugTool } from "./debug";
+import { EvalTool } from "./eval";
+import { resolveEvalBackends } from "./eval-backends";
+import { FindTool } from "./find";
+import { GithubTool } from "./gh";
+import { InspectImageTool } from "./inspect-image";
+import { IrcTool, isIrcEnabled } from "./irc";
+import { JobTool } from "./job";
+import { MemoryEditTool } from "./memory-edit";
+import { MemoryRecallTool } from "./memory-recall";
+import { MemoryReflectTool } from "./memory-reflect";
+import { MemoryRetainTool } from "./memory-retain";
+import { wrapToolWithMetaNotice } from "./output-meta";
+import { ReadTool } from "./read";
+import { RenderMermaidTool } from "./render-mermaid";
+import { createReportToolIssueTool, isAutoQaEnabled } from "./report-tool-issue";
+import { ResolveTool } from "./resolve";
+import { reportFindingTool } from "./review";
+import { SearchTool } from "./search";
+import { SearchToolBm25Tool } from "./search-tool-bm25";
+import { loadSshTool } from "./ssh";
+import { type TodoPhase, TodoTool } from "./todo";
+import { WriteTool } from "./write";
+import { YieldTool } from "./yield";
+
+export * from "../edit";
+export * from "../goals";
+export * from "../lsp";
+export * from "../session/streaming-output";
+export * from "../task";
+export * from "../web/search";
+export * from "./ask";
+export * from "./ast-edit";
+export * from "./ast-grep";
+export * from "./bash";
+export * from "./browser";
+export * from "./checkpoint";
+export * from "./debug";
+export * from "./eval";
+export * from "./eval-backends";
+export * from "./find";
+export * from "./gh";
+export * from "./image-gen";
+export * from "./inspect-image";
+export * from "./irc";
+export * from "./job";
+export * from "./memory-edit";
+export * from "./memory-recall";
+export * from "./memory-reflect";
+export * from "./memory-retain";
+export * from "./read";
+export * from "./render-mermaid";
+export * from "./report-tool-issue";
+export * from "./resolve";
+export * from "./review";
+export * from "./search";
+export * from "./search-tool-bm25";
+export * from "./ssh";
+export * from "./todo";
+export * from "./tts";
+export * from "./write";
+export * from "./yield";
+
+/** Tool type (AgentTool from pi-ai) */
+export type Tool = AgentTool<any, any, any>;
+
+export type ContextFileEntry = {
+	path: string;
+	content: string;
+	depth?: number;
+};
+
+export type {
+	DiscoverableTool,
+	DiscoverableToolSearchIndex,
+	DiscoverableToolSearchResult,
+	DiscoverableToolSource,
+} from "../tool-discovery/tool-index";
+
+/**
+ * A late LSP diagnostics result that arrived after the edit/write tool already
+ * returned. Surfaced to the model and the transcript via
+ * {@link ToolSession.queueDeferredDiagnostics}, batched through the session
+ * yield queue like background-job results.
+ */
+export interface DeferredDiagnosticsEntry {
+	/** Absolute path the diagnostics belong to (the renderer shortens it). */
+	path: string;
+	/** One-line severity summary, e.g. "2 errors". */
+	summary: string;
+	/** Formatted, ready-to-display diagnostic lines. */
+	messages: string[];
+	/** True when any message is error severity. */
+	errored: boolean;
+	/**
+	 * Evaluated at injection time (in the dispatcher's stale check): drop the entry
+	 * when a newer mutation to the same file has superseded it, so the model never
+	 * sees diagnostics for stale content.
+	 */
+	isStale(): boolean;
+}
+
+/** Session context for tool factories */
+export interface ToolSession {
+	/** Current working directory */
+	cwd: string;
+	/** Whether UI is available */
+	hasUI: boolean;
+	/** Optional fetch implementation injected into the URL read pipeline (tests, proxies). Defaults to global fetch. */
+	fetch?: FetchImpl;
+	/** Skip Python kernel availability check and warmup */
+	skipPythonPreflight?: boolean;
+	/** Pre-loaded context files (AGENTS.md, etc) */
+	contextFiles?: ContextFileEntry[];
+	/** Pre-loaded workspace tree (forwarded to subagents to skip re-scanning) */
+	workspaceTree?: WorkspaceTree;
+	/** Pre-loaded skills */
+	skills?: Skill[];
+	/** Pre-loaded prompt templates */
+	promptTemplates?: PromptTemplate[];
+	/** Pre-loaded rules (forwarded to subagents to skip re-discovery). */
+	rules?: Rule[];
+	/**
+	 * Pre-discovered extension source paths. Forwarded to subagents so they
+	 * skip the FS scan but still re-bind extensions to their own session-scoped
+	 * `ExtensionAPI` (cwd, eventBus, runtime). Inline extension factories
+	 * (`<inline-N>`) are NOT included — those are session-local.
+	 */
+	extensionPaths?: string[];
+	/**
+	 * Pre-discovered custom-tool source paths from `.omp/tools/`, `.claude/tools/`,
+	 * plugins, etc. Forwarded to subagents so they skip the FS scan but still
+	 * re-bind tools to their own session-scoped `CustomToolAPI`.
+	 */
+	customToolPaths?: ToolPathWithSource[];
+	/** Whether LSP integrations are enabled */
+	enableLsp?: boolean;
+	/** Whether an edit-capable tool is available in this session (controls hashline output) */
+	hasEditTool?: boolean;
+	/** Event bus for tool/extension communication */
+	eventBus?: EventBus;
+	/** Output schema for structured completion (subagents) */
+	outputSchema?: unknown;
+	/** Whether to include the yield tool by default */
+	requireYieldTool?: boolean;
+	/** Task recursion depth (0 = top-level, 1 = first child, etc.) */
+	taskDepth?: number;
+	/** Get shared eval executor session ID. Subagents inherit this to share JS/Python state. */
+	getEvalSessionId?: () => string | null;
+	/** Get session file */
+	getSessionFile: () => string | null;
+	/** Get eval kernel owner ID for session-scoped retained-kernel cleanup. */
+	getEvalKernelOwnerId?: () => string | null;
+	/** Reject new eval (python or js) work once session disposal has started. */
+	assertEvalExecutionAllowed?: () => void;
+	/** Track tool-owned eval work so session disposal can await/abort it like direct session eval runs. */
+	trackEvalExecution?<T>(execution: Promise<T>, abortController: AbortController): Promise<T>;
+	/** Get session ID */
+	getSessionId?: () => string | null;
+	/** Get Hindsight runtime state for this agent session. */
+	getHindsightSessionState?: () => HindsightSessionState | undefined;
+	/** Get Mnemopi runtime state for this agent session. */
+	getMnemopiSessionState?: () => MnemopiSessionState | undefined;
+	/** Agent identity used for IRC routing. Returns the registry id (e.g. "Main", "AuthLoader"). */
+	getAgentId?: () => string | null;
+	/** Look up a registered tool by name (used by the eval js backend's tool bridge). */
+	getToolByName?: (name: string) => AgentTool | undefined;
+	/** Agent registry for IRC routing across live sessions. */
+	agentRegistry?: AgentRegistry;
+	/** Get artifacts directory for artifact:// URLs */
+	getArtifactsDir?: () => string | null;
+	/** Get the ArtifactManager backing this session (shared across parent + subagents). */
+	getArtifactManager?: () => ArtifactManager | null;
+	/** Allocate a new artifact path and ID for session-scoped truncated output. */
+	allocateOutputArtifact?: (toolType: string) => Promise<{ id?: string; path?: string }>;
+	/** Get session spawns */
+	getSessionSpawns: () => string | null;
+	/** Get resolved model string if explicitly set for this session */
+	getModelString?: () => string | undefined;
+	/** Get the current session model string, regardless of how it was chosen */
+	getActiveModelString?: () => string | undefined;
+	/** Auth storage for passing to subagents (avoids re-discovery) */
+	authStorage?: import("../session/auth-storage").AuthStorage;
+	/** Model registry for passing to subagents (avoids re-discovery) */
+	modelRegistry?: import("../config/model-registry").ModelRegistry;
+	/** Agent output manager for unique agent:// IDs across task invocations */
+	agentOutputManager?: AgentOutputManager;
+	/**
+	 * Async job manager scoped to this session.
+	 *
+	 * - Top-level session that constructed one: its own manager.
+	 * - Subagent (`parentTaskPrefix` set): the parent's manager, so background
+	 *   bash/task work and `onJobComplete` deliveries flow into the conversation
+	 *   that spawned it.
+	 * - Secondary in-process top-level session that found a singleton already
+	 *   installed (issue #1923): `undefined`. Tools refuse async work rather
+	 *   than silently route completions into the owning session's `yieldQueue`.
+	 *
+	 * Tools MUST use this instead of `AsyncJobManager.instance()` so a secondary
+	 * session never borrows the owning session's manager by accident.
+	 */
+	asyncJobManager?: AsyncJobManager;
+	/** MCP manager visible to subagents without relying on the process-global singleton. */
+	mcpManager?: MCPManager;
+	/** Local protocol root to propagate to nested subagents and eval-created agents. */
+	localProtocolOptions?: LocalProtocolOptions;
+	/** Settings instance for passing to subagents */
+	settings: Settings;
+	/** Plan mode state (if active) */
+	getPlanModeState?: () => PlanModeState | undefined;
+	/** Path of the session's active plan reference (e.g. `local://<title>.md`); defaults to `local://PLAN.md`. */
+	getPlanReferencePath?: () => string;
+	/** Goal mode state (if active or paused) */
+	getGoalModeState?: () => GoalModeState | undefined;
+	/** Goal runtime for the active agent session. */
+	getGoalRuntime?: () => GoalRuntime | undefined;
+	/** Get cumulative session usage statistics (input/output tokens, cost). */
+	getUsageStatistics?: () => import("../session/session-manager").UsageStatistics;
+	/** Current per-turn token budget {total, spent, hard} for the eval `budget` helper. */
+	getTurnBudget?: () => { total: number | null; spent: number; hard: boolean };
+	/** Record output tokens consumed by an eval-spawned subagent toward the current turn budget. */
+	recordEvalSubagentUsage?: (output: number) => void;
+	/** Bridge to the connected client (e.g. ACP editor host). Tools should route fs/terminal/permission requests through this when available. */
+	getClientBridge?: () => ClientBridge | undefined;
+	/** Get cached todo phases for this session. */
+	getTodoPhases?: () => TodoPhase[];
+	/** Replace cached todo phases for this session. */
+	setTodoPhases?: (phases: TodoPhase[]) => void;
+	/** Whether MCP tool discovery is active for this session. */
+	isMCPDiscoveryEnabled?: () => boolean;
+	/** Get MCP tools activated by prior search_tool_bm25 calls. */
+	getSelectedMCPToolNames?: () => string[];
+	/** Merge MCP tool selections into the active session tool set. */
+	activateDiscoveredMCPTools?: (toolNames: string[]) => Promise<string[]>;
+	// ── Generic tool discovery (unified — covers built-in + MCP + extension) ──
+	/** Whether any form of tool discovery is active (tools.discoveryMode !== "off" or mcp.discoveryMode). */
+	isToolDiscoveryEnabled?: () => boolean;
+	/** Get all hidden-but-discoverable tools for search_tool_bm25 prompts. */
+	getDiscoverableTools?: (filter?: {
+		source?: import("../tool-discovery/tool-index").DiscoverableToolSource;
+	}) => DiscoverableTool[];
+	/** Get the cached generic discoverable search index. */
+	getDiscoverableToolSearchIndex?: () => DiscoverableToolSearchIndex;
+	/** Get tool names activated by prior search_tool_bm25 calls (all sources). */
+	getSelectedDiscoveredToolNames?: () => string[];
+	/** Merge tool selections into the active session tool set. */
+	activateDiscoveredTools?: (toolNames: string[]) => Promise<string[]>;
+	/** The tool-choice queue used to force forthcoming tool invocations and carry invocation handlers. */
+	getToolChoiceQueue?(): ToolChoiceQueue;
+	/** Build a model-provider-specific ToolChoice that targets the named tool, or undefined if unsupported. */
+	buildToolChoice?(toolName: string): ToolChoice | undefined;
+	/** Steer a hidden custom message into the conversation (e.g. a preview reminder). */
+	steer?(message: { customType: string; content: string; details?: unknown }): void;
+	/** Peek the currently in-flight tool-choice queue directive's invocation handler. Used by the `resolve` tool to dispatch to the pending action. */
+	peekQueueInvoker?(): ((input: unknown) => Promise<unknown> | unknown) | undefined;
+	/** Peek the long-lived "standing" resolve handler registered by a mode (e.g. plan mode).
+	 *  Consulted by the `resolve` tool as a fallback when no queue invoker is in flight,
+	 *  letting modes accept `resolve` invocations without forcing the tool choice every turn. */
+	peekStandingResolveHandler?(): ((input: unknown) => Promise<unknown> | unknown) | undefined;
+	/** Register or clear the standing resolve handler. Passing `null` clears it. */
+	setStandingResolveHandler?(handler: ((input: unknown) => Promise<unknown> | unknown) | null): void;
+	/** Get active checkpoint state if any. */
+	getCheckpointState?: () => CheckpointState | undefined;
+	/** Set or clear active checkpoint state. */
+	setCheckpointState?: (state: CheckpointState | null) => void;
+
+	/** Per-session snapshot store of file contents as last shown to the model
+	 *  by `read`/`search`. Used by hashline anchor-stale recovery to
+	 *  reconstruct the version the model authored anchors against when the
+	 *  file changed out-of-band. Lazily initialized by `getFileSnapshotStore`. */
+	fileSnapshotStore?: InMemorySnapshotStore;
+
+	/** Per-session log of unresolved git merge conflict regions surfaced by
+	 *  `read`. Each entry gets a stable id N referenced by `write conflict://N`
+	 *  to splice the recorded region with replacement content. Lazily initialized
+	 *  by `getConflictHistory`. */
+	conflictHistory?: import("./conflict-detect").ConflictHistory;
+
+	/** Per-session ledger of post-edit LSP diagnostics already surfaced to the
+	 *  model for each file. Lazily initialized by `getDiagnosticsLedger`. */
+	diagnosticsLedger?: import("../lsp/diagnostics-ledger").DiagnosticsLedger;
+
+	/** Per-session ledger of consecutive byte-identical no-op edits, keyed by
+	 *  canonical file path. The hashline executor escalates a soft no-op hint
+	 *  to a thrown error once the same payload no-ops `NOOP_HARD_LIMIT` times,
+	 *  breaking subagent loops that ignore the textual hint (issue #2081).
+	 *  Lazily initialized by `getNoopLoopGuard`. */
+	noopLoopGuard?: import("../edit/hashline/noop-loop-guard").NoopLoopGuard;
+
+	/** Queue a hidden message to be injected at the next agent turn. */
+	queueDeferredMessage?(message: CustomMessage): void;
+	/** Queue late LSP diagnostics (arrived after an edit/write returned) to be shown
+	 *  in the transcript and delivered to the model at the next yield, like background
+	 *  job results. */
+	queueDeferredDiagnostics?(entry: DeferredDiagnosticsEntry): void;
+	/** Bump and return the session-global mutation counter for `path`. Edit/write
+	 *  tools call this on every file mutation so stale late-diagnostics can be dropped. */
+	bumpFileMutationVersion?(path: string): number;
+	/** Read the current session-global mutation counter for `path` (0 if never mutated). */
+	getFileMutationVersion?(path: string): number;
+	/** Get the active OpenTelemetry config so subagent dispatch can forward
+	 *  the parent's tracer/hooks with the subagent's own identity stamped. */
+	getTelemetry?: () => AgentTelemetryConfig | undefined;
+}
+
+export type ToolFactory = (session: ToolSession) => Tool | null | Promise<Tool | null>;
+
+export type BuiltinToolLoadMode = "essential" | "discoverable";
+
+/** Default essential tool names when tools.essentialOverride is empty. */
+export const DEFAULT_ESSENTIAL_TOOL_NAMES: readonly string[] = ["read", "bash", "edit"] as const;
+
+/**
+ * Resolve the active essential built-in tool names from settings.
+ * Returns `tools.essentialOverride` if non-empty (filtered to known built-ins),
+ * otherwise `DEFAULT_ESSENTIAL_TOOL_NAMES`.
+ */
+export function computeEssentialBuiltinNames(settings: Settings): string[] {
+	const override = settings.get("tools.essentialOverride") ?? [];
+	const cleaned = override.map(name => name.trim()).filter(Boolean);
+	if (cleaned.length > 0) {
+		return cleaned.filter(name => name in BUILTIN_TOOLS);
+	}
+	return [...DEFAULT_ESSENTIAL_TOOL_NAMES];
+}
+
+/**
+ * Filter the initial active tool set when `tools.discoveryMode === "all"`.
+ *
+ * Non-essential discoverable built-ins are hidden — the model rediscovers them
+ * via `search_tool_bm25` and activates them on demand. A tool survives hiding
+ * when it is essential, explicitly requested, restored from a prior selection,
+ * or required by a forced tool_choice feature (`forceActive`). The last case is
+ * load-bearing: a named tool_choice (e.g. the eager `todo` prelude) must
+ * reference a tool present in the request, or the provider rejects it with 400.
+ */
+export function filterInitialToolsForDiscoveryAll(
+	initialToolNames: string[],
+	opts: {
+		loadModeOf: (name: string) => BuiltinToolLoadMode | undefined;
+		essentialNames: ReadonlySet<string>;
+		explicitlyRequested: ReadonlySet<string>;
+		restored: ReadonlySet<string>;
+		forceActive: ReadonlySet<string>;
+	},
+): string[] {
+	return initialToolNames.filter(name => {
+		const loadMode = opts.loadModeOf(name);
+		if (!loadMode) return true; // not a built-in — leave MCP/custom/extension to existing logic
+		if (loadMode === "essential") return true;
+		if (opts.essentialNames.has(name)) return true;
+		if (opts.explicitlyRequested.has(name)) return true;
+		if (opts.restored.has(name)) return true;
+		if (opts.forceActive.has(name)) return true;
+		return false;
+	});
+}
+
+/**
+ * Public callable factory map. External callers may invoke `BUILTIN_TOOLS.read(session)` or
+ * `BUILTIN_TOOLS[name](session)` to construct a tool directly.
+ */
+export const BUILTIN_TOOLS: Record<string, ToolFactory> = {
+	read: s => new ReadTool(s),
+	bash: s => new BashTool(s),
+	edit: s => new EditTool(s),
+	ast_grep: s => new AstGrepTool(s),
+	ast_edit: s => new AstEditTool(s),
+	render_mermaid: s => new RenderMermaidTool(s),
+	ask: AskTool.createIf,
+	debug: DebugTool.createIf,
+	eval: s => new EvalTool(s),
+	ssh: loadSshTool,
+	github: GithubTool.createIf,
+	find: s => new FindTool(s),
+	search: s => new SearchTool(s),
+	lsp: LspTool.createIf,
+	inspect_image: s => new InspectImageTool(s),
+	browser: s => new BrowserTool(s),
+	checkpoint: CheckpointTool.createIf,
+	rewind: RewindTool.createIf,
+	task: s => TaskTool.create(s),
+	job: s => new JobTool(s),
+	irc: IrcTool.createIf,
+	todo: s => new TodoTool(s),
+	web_search: s => new WebSearchTool(s),
+	search_tool_bm25: SearchToolBm25Tool.createIf,
+	write: s => new WriteTool(s),
+	memory_edit: MemoryEditTool.createIf,
+	retain: MemoryRetainTool.createIf,
+	recall: MemoryRecallTool.createIf,
+	reflect: MemoryReflectTool.createIf,
+};
+
+export const HIDDEN_TOOLS: Record<string, ToolFactory> = {
+	yield: s => new YieldTool(s),
+	report_finding: () => reportFindingTool,
+	report_tool_issue: s => createReportToolIssueTool(s),
+	resolve: s => new ResolveTool(s),
+	goal: s => new GoalTool(s),
+};
+
+export type ToolName = keyof typeof BUILTIN_TOOLS;
+
+/**
+ * Create tools from BUILTIN_TOOLS registry.
+ */
+export async function createTools(session: ToolSession, toolNames?: string[]): Promise<Tool[]> {
+	const includeYield = session.requireYieldTool === true;
+	const enableLsp = session.enableLsp ?? true;
+	let requestedTools =
+		toolNames && toolNames.length > 0 ? [...new Set(toolNames.map(name => name.toLowerCase()))] : undefined;
+	const goalEnabled = session.settings.get("goal.enabled");
+	const goalModeActive = goalEnabled && session.getGoalModeState?.()?.enabled === true;
+	if (goalModeActive && requestedTools && !requestedTools.includes("goal")) {
+		requestedTools = [...requestedTools, "goal"];
+	}
+	const backends = resolveEvalBackends(session);
+	const allowPython = backends.python;
+	const allowJs = backends.js;
+	const skipPythonPreflight = session.skipPythonPreflight === true;
+	// Eval tool is enabled if EITHER backend is reachable. We only need to know
+	// whether python is reachable when JS is disabled — otherwise allowEval is
+	// already true and the python-availability check can be deferred to first
+	// invocation of the python backend (already handled inside the executor).
+	let pythonAvailable = true;
+	if (
+		!skipPythonPreflight &&
+		allowPython &&
+		!allowJs &&
+		(requestedTools === undefined || requestedTools.includes("eval"))
+	) {
+		const availability = await logger.time(
+			"createTools:pythonCheck",
+			checkPythonKernelAvailability,
+			session.cwd,
+			session.settings.get("python.interpreter")?.trim() || undefined,
+		);
+		pythonAvailable = availability.ok;
+		if (!availability.ok) {
+			logger.warn("Python kernel unavailable and JS backend disabled; eval will be unavailable", {
+				reason: availability.reason,
+			});
+		}
+	}
+
+	const effectivePythonAllowed = allowPython && pythonAvailable;
+	// Eval is exposed whenever any backend is reachable. The python backend may
+	// be unreachable, in which case eval dispatches exclusively to js.
+	const allowEval = effectivePythonAllowed || allowJs;
+
+	// Auto-include AST counterparts when their text-based sibling is present
+	if (requestedTools) {
+		if (
+			requestedTools.includes("search") &&
+			!requestedTools.includes("ast_grep") &&
+			session.settings.get("astGrep.enabled")
+		) {
+			requestedTools.push("ast_grep");
+		}
+		if (
+			requestedTools.includes("edit") &&
+			!requestedTools.includes("ast_edit") &&
+			session.settings.get("astEdit.enabled")
+		) {
+			requestedTools.push("ast_edit");
+		}
+		if (["hindsight", "mnemopi"].includes(session.settings.get("memory.backend") ?? "")) {
+			for (const name of ["recall", "retain", "reflect"]) {
+				if (!requestedTools.includes(name)) requestedTools.push(name);
+			}
+		}
+	}
+	// Resolve effective tool discovery mode.
+	// tools.discoveryMode controls the new modes; mcp.discoveryMode remains a back-compat alias for "mcp-only".
+	const effectiveDiscoveryMode = resolveEffectiveToolDiscoveryMode(
+		session.settings,
+		countToolsForAutoDiscovery(requestedTools ?? Object.keys(BUILTIN_TOOLS)),
+	);
+	const discoveryActive = effectiveDiscoveryMode !== "off";
+
+	const allTools: Record<string, ToolFactory> = { ...BUILTIN_TOOLS, ...HIDDEN_TOOLS };
+	const isToolAllowed = (name: string) => {
+		if (name === "goal") return goalEnabled && goalModeActive;
+		if (name === "lsp") return enableLsp && session.settings.get("lsp.enabled");
+		if (name === "bash") return session.settings.get("bash.enabled");
+		if (name === "eval") return allowEval;
+		if (name === "debug") return session.settings.get("debug.enabled");
+		if (name === "todo") return !includeYield && session.settings.get("todo.enabled");
+		if (name === "find") return session.settings.get("find.enabled");
+		if (name === "search") return session.settings.get("search.enabled");
+		if (name === "github") return session.settings.get("github.enabled");
+		if (name === "ast_grep") return session.settings.get("astGrep.enabled");
+		if (name === "ast_edit") return session.settings.get("astEdit.enabled");
+		if (name === "render_mermaid") return session.settings.get("renderMermaid.enabled");
+		if (name === "inspect_image") return session.settings.get("inspect_image.enabled");
+		if (name === "web_search") return session.settings.get("web_search.enabled");
+		// search_tool_bm25 is allowed when either legacy mcp.discoveryMode or new tools.discoveryMode is active.
+		if (name === "search_tool_bm25") return discoveryActive;
+		if (name === "browser") return session.settings.get("browser.enabled");
+		if (name === "checkpoint" || name === "rewind") return session.settings.get("checkpoint.enabled");
+		if (name === "irc") return isIrcEnabled(session.settings, session.taskDepth ?? 0);
+		if (name === "retain" || name === "recall" || name === "reflect") {
+			return ["hindsight", "mnemopi"].includes(session.settings.get("memory.backend") ?? "");
+		}
+		if (name === "task") {
+			const maxDepth = session.settings.get("task.maxRecursionDepth") ?? 2;
+			const currentDepth = session.taskDepth ?? 0;
+			return maxDepth < 0 || currentDepth < maxDepth;
+		}
+		return true;
+	};
+	if (includeYield && requestedTools && !requestedTools.includes("yield")) {
+		requestedTools.push("yield");
+	}
+
+	const filteredRequestedTools = requestedTools?.filter(name => name in allTools && isToolAllowed(name));
+	const baseEntries =
+		filteredRequestedTools !== undefined
+			? filteredRequestedTools.filter(name => name !== "resolve").map(name => [name, allTools[name]] as const)
+			: [
+					...Object.entries(BUILTIN_TOOLS)
+						.filter(([name]) => isToolAllowed(name))
+						.map(([name, factory]) => [name, factory] as const),
+					...(includeYield ? ([["yield", HIDDEN_TOOLS.yield]] as const) : []),
+					...(goalModeActive ? ([["goal", HIDDEN_TOOLS.goal]] as const) : []),
+				];
+
+	const baseResults = await Promise.all(
+		baseEntries.map(async ([name, factory]) => {
+			const tool = await logger.time(`createTools:${name}`, factory as ToolFactory, session);
+			return tool ? wrapToolWithMetaNotice(tool) : null;
+		}),
+	);
+	const tools = baseResults.filter((r): r is Tool => r !== null);
+	if (!tools.some(tool => tool.name === "resolve")) {
+		const resolveTool = await logger.time("createTools:resolve", HIDDEN_TOOLS.resolve, session);
+		if (resolveTool) {
+			tools.push(wrapToolWithMetaNotice(resolveTool));
+		}
+	}
+
+	// Auto-inject report_tool_issue when autoqa is enabled (env or setting).
+	// Injected unconditionally into every agent, regardless of requested tool list.
+	const autoQA = isAutoQaEnabled(session.settings);
+	if (autoQA && !tools.some(t => t.name === "report_tool_issue")) {
+		// Build the enum from tools we just constructed via BUILTIN_TOOLS / HIDDEN_TOOLS.
+		// Extension overrides (e.g. a user's custom `bash`) get added later by
+		// other code paths, so they're absent here — exactly what we want; MCP /
+		// extension tools never end up in the report enum.
+		const activeBuiltinNames = tools
+			.map(t => t.name)
+			.filter(name => (name in BUILTIN_TOOLS || name in HIDDEN_TOOLS) && name !== "report_tool_issue");
+		const qaTool = createReportToolIssueTool(session, activeBuiltinNames);
+		if (qaTool) {
+			tools.push(wrapToolWithMetaNotice(qaTool));
+		}
+	}
+
+	return tools;
+}