@oh-my-pi/pi-coding-agent 3.20.1 → 3.24.0

package/src/core/agent-session.ts

@@ -13,9 +13,9 @@
  * Modes use this class and add their own I/O layer on top.
  */
 
+import type { AssistantMessage, ImageContent, Message, Model, TextContent, Usage } from "@mariozechner/pi-ai";
+import { isContextOverflow, modelsAreEqual, supportsXhigh } from "@mariozechner/pi-ai";
 import type { Agent, AgentEvent, AgentMessage, AgentState, AgentTool, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { AssistantMessage, ImageContent, Message, Model, TextContent, Usage } from "@oh-my-pi/pi-ai";
-import { isContextOverflow, modelsAreEqual, supportsXhigh } from "@oh-my-pi/pi-ai";
 import type { Rule } from "../capability/rule";
 import { getAuthPath } from "../config";
 import { theme } from "../modes/interactive/theme/theme";
@@ -51,6 +51,7 @@ import { parseModelString } from "./model-resolver";
 import { expandPromptTemplate, type PromptTemplate, parseCommandArgs } from "./prompt-templates";
 import type { BranchSummaryEntry, CompactionEntry, NewSessionOptions, SessionManager } from "./session-manager";
 import type { SettingsManager, SkillsSettings } from "./settings-manager";
+import { expandSlashCommand, type FileSlashCommand } from "./slash-commands";
 import type { TtsrManager } from "./ttsr";
 
 /** Session-specific events that extend the core AgentEvent */
@@ -77,6 +78,8 @@ export interface AgentSessionConfig {
 	scopedModels?: Array<{ model: Model<any>; thinkingLevel: ThinkingLevel }>;
 	/** Prompt templates for expansion */
 	promptTemplates?: PromptTemplate[];
+	/** File-based slash commands for expansion */
+	slashCommands?: FileSlashCommand[];
 	/** Extension runner (created in main.ts with wrapped tools) */
 	extensionRunner?: ExtensionRunner;
 	/** Custom commands (TypeScript slash commands) */
@@ -87,7 +90,7 @@ export interface AgentSessionConfig {
 	/** Tool registry for LSP and settings */
 	toolRegistry?: Map<string, AgentTool>;
 	/** System prompt builder that can consider tool availability */
-	rebuildSystemPrompt?: (toolNames: string[]) => string;
+	rebuildSystemPrompt?: (toolNames: string[], tools: Map<string, AgentTool>) => string;
 	/** TTSR manager for time-traveling stream rules */
 	ttsrManager?: TtsrManager;
 }
@@ -175,6 +178,7 @@ export class AgentSession {
 
 	private _scopedModels: Array<{ model: Model<any>; thinkingLevel: ThinkingLevel }>;
 	private _promptTemplates: PromptTemplate[];
+	private _slashCommands: FileSlashCommand[];
 
 	// Event subscription state
 	private _unsubscribeAgent?: () => void;
@@ -218,7 +222,7 @@ export class AgentSession {
 
 	// Tool registry and prompt builder for extensions
 	private _toolRegistry: Map<string, AgentTool>;
-	private _rebuildSystemPrompt: ((toolNames: string[]) => string) | undefined;
+	private _rebuildSystemPrompt: ((toolNames: string[], tools: Map<string, AgentTool>) => string) | undefined;
 	private _baseSystemPrompt: string;
 
 	// TTSR manager for time-traveling stream rules
@@ -232,6 +236,7 @@ export class AgentSession {
 		this.settingsManager = config.settingsManager;
 		this._scopedModels = config.scopedModels ?? [];
 		this._promptTemplates = config.promptTemplates ?? [];
+		this._slashCommands = config.slashCommands ?? [];
 		this._extensionRunner = config.extensionRunner;
 		this._customCommands = config.customCommands ?? [];
 		this._skillsSettings = config.skillsSettings;
@@ -598,7 +603,7 @@ export class AgentSession {
 
 		// Rebuild base system prompt with new tool set
 		if (this._rebuildSystemPrompt) {
-			this._baseSystemPrompt = this._rebuildSystemPrompt(validToolNames);
+			this._baseSystemPrompt = this._rebuildSystemPrompt(validToolNames, this._toolRegistry);
 			this.agent.setSystemPrompt(this._baseSystemPrompt);
 		}
 	}
@@ -684,6 +689,12 @@ export class AgentSession {
 				}
 				text = customResult;
 			}
+
+			// Try file-based slash commands (markdown files from commands/ directories)
+			// Only if text still starts with "/" (wasn't transformed by custom command)
+			if (text.startsWith("/")) {
+				text = expandSlashCommand(text, this._slashCommands);
+			}
 		}
 
 		// Expand file-based prompt templates if requested

package/src/core/auth-storage.ts

@@ -15,7 +15,7 @@ import {
 	loginOpenAICodex,
 	type OAuthCredentials,
 	type OAuthProvider,
-} from "@oh-my-pi/pi-ai";
+} from "@mariozechner/pi-ai";
 import { logger } from "./logger";
 
 export type ApiKeyCredential = {

package/src/core/compaction/branch-summarization.ts

@@ -5,9 +5,9 @@
  * a summary of the branch being left so context isn't lost.
  */
 
+import type { Model } from "@mariozechner/pi-ai";
+import { completeSimple } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import type { Model } from "@oh-my-pi/pi-ai";
-import { completeSimple } from "@oh-my-pi/pi-ai";
 import branchSummaryPrompt from "../../prompts/branch-summary.md" with { type: "text" };
 import branchSummaryPreamble from "../../prompts/branch-summary-preamble.md" with { type: "text" };
 import {

package/src/core/compaction/compaction.ts

@@ -5,9 +5,9 @@
  * and after compaction the session is reloaded.
  */
 
+import type { AssistantMessage, Model, Usage } from "@mariozechner/pi-ai";
+import { complete, completeSimple } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import type { AssistantMessage, Model, Usage } from "@oh-my-pi/pi-ai";
-import { complete, completeSimple } from "@oh-my-pi/pi-ai";
 import compactionSummaryPrompt from "../../prompts/compaction-summary.md" with { type: "text" };
 import compactionTurnPrefixPrompt from "../../prompts/compaction-turn-prefix.md" with { type: "text" };
 import compactionUpdateSummaryPrompt from "../../prompts/compaction-update-summary.md" with { type: "text" };

package/src/core/compaction/utils.ts

@@ -2,8 +2,8 @@
  * Shared utilities for compaction and branch summarization.
  */
 
+import type { Message } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import type { Message } from "@oh-my-pi/pi-ai";
 import summarizationSystemPrompt from "../../prompts/summarization-system.md" with { type: "text" };
 
 // ============================================================================

package/src/core/custom-tools/types.ts

@@ -5,8 +5,8 @@
  * They can provide custom rendering for tool calls and results in the TUI.
  */
 
+import type { Model } from "@mariozechner/pi-ai";
 import type { AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import type { Model } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import type { Static, TSchema } from "@sinclair/typebox";
 import type { Theme } from "../../modes/interactive/theme/theme";

package/src/core/custom-tools/wrapper.ts

@@ -16,7 +16,6 @@ export function wrapCustomTool(tool: CustomTool, getContext: () => CustomToolCon
 		label: tool.label,
 		description: tool.description,
 		parameters: tool.parameters,
-		hidden: tool.hidden,
 		execute: (toolCallId, params, signal, onUpdate, context) =>
 			tool.execute(toolCallId, params, onUpdate, context ?? getContext(), signal),
 		renderCall: tool.renderCall ? (args, theme) => tool.renderCall?.(args, theme as Theme) : undefined,

package/src/core/extensions/index.ts

@@ -92,9 +92,4 @@ export {
 	isReadToolResult,
 	isWriteToolResult,
 } from "./types";
-export {
-	wrapRegisteredTool,
-	wrapRegisteredTools,
-	wrapToolsWithExtensions,
-	wrapToolWithExtensions,
-} from "./wrapper";
+export { wrapRegisteredTool, wrapRegisteredTools, wrapToolWithExtensions } from "./wrapper";

package/src/core/extensions/runner.ts

@@ -2,8 +2,8 @@
  * Extension runner - executes extensions and manages their lifecycle.
  */
 
+import type { ImageContent, Model } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import type { ImageContent, Model } from "@oh-my-pi/pi-ai";
 import type { KeyId } from "@oh-my-pi/pi-tui";
 import { theme } from "../../modes/interactive/theme/theme";
 import type { ModelRegistry } from "../model-registry";

package/src/core/extensions/types.ts

@@ -8,8 +8,8 @@
  * - Interact with the user via UI primitives
  */
 
+import type { ImageContent, Model, TextContent, ToolResultMessage } from "@mariozechner/pi-ai";
 import type { AgentMessage, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import type { ImageContent, Model, TextContent, ToolResultMessage } from "@oh-my-pi/pi-ai";
 import type { Component, KeyId, TUI } from "@oh-my-pi/pi-tui";
 import type { Static, TSchema } from "@sinclair/typebox";
 import type { Theme } from "../../modes/interactive/theme/theme";

package/src/core/extensions/wrapper.ts

@@ -2,8 +2,8 @@
  * Tool wrappers for extensions.
  */
 
+import type { ImageContent, TextContent } from "@mariozechner/pi-ai";
 import type { AgentTool, AgentToolContext, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
 import type { Theme } from "../../modes/interactive/theme/theme";
 import type { ExtensionRunner } from "./runner";
 import type { ExtensionContext, RegisteredTool, ToolCallEventResult, ToolResultEventResult } from "./types";
@@ -138,10 +138,3 @@ export function wrapToolWithExtensions<T>(tool: AgentTool<any, T>, runner: Exten
 		},
 	};
 }
-
-/**
- * Wrap all tools with extension callbacks.
- */
-export function wrapToolsWithExtensions<T>(tools: AgentTool<any, T>[], runner: ExtensionRunner): AgentTool<any, T>[] {
-	return tools.map((tool) => wrapToolWithExtensions(tool, runner));
-}

package/src/core/file-mentions.ts

@@ -6,9 +6,9 @@
  * so the agent doesn't need to read them manually.
  */
 
+import path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { FileMentionMessage } from "./messages";
-import { createReadTool } from "./tools/read";
 
 /** Regex to match @filepath patterns in text */
 const FILE_MENTION_REGEX = /@((?:[^\s@]+\/)*[^\s@]+\.[a-zA-Z0-9]+)/g;
@@ -26,17 +26,14 @@ export function extractFileMentions(text: string): string[] {
 export async function generateFileMentionMessages(filePaths: string[], cwd: string): Promise<AgentMessage[]> {
 	if (filePaths.length === 0) return [];
 
-	const readTool = createReadTool(cwd);
 	const files: FileMentionMessage["files"] = [];
 
 	for (const filePath of filePaths) {
 		try {
-			const result = await readTool.execute("auto-read", { path: filePath });
-			const textContent = result.content.find((c) => c.type === "text");
-			if (textContent && textContent.type === "text") {
-				const lineCount = textContent.text.split("\n").length;
-				files.push({ path: filePath, content: textContent.text, lineCount });
-			}
+			const absolutePath = path.resolve(cwd, filePath);
+			const content = await Bun.file(absolutePath).text();
+			const lineCount = content.split("\n").length;
+			files.push({ path: filePath, content, lineCount });
 		} catch {
 			// File doesn't exist or isn't readable - skip silently
 		}

package/src/core/hooks/runner.ts

@@ -2,8 +2,8 @@
  * Hook runner - executes hooks and manages their lifecycle.
  */
 
+import type { Model } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import type { Model } from "@oh-my-pi/pi-ai";
 import { theme } from "../../modes/interactive/theme/theme";
 import type { ModelRegistry } from "../model-registry";
 import type { SessionManager } from "../session-manager";
@@ -400,7 +400,7 @@ export class HookRunner {
 	 */
 	async emitBeforeAgentStart(
 		prompt: string,
-		images?: import("@oh-my-pi/pi-ai").ImageContent[],
+		images?: import("@mariozechner/pi-ai").ImageContent[],
 	): Promise<BeforeAgentStartEventResult | undefined> {
 		const ctx = this.createContext();
 		let result: BeforeAgentStartEventResult | undefined;

package/src/core/hooks/types.ts

@@ -5,8 +5,8 @@
  * and interact with the user via UI primitives.
  */
 
+import type { ImageContent, Message, Model, TextContent, ToolResultMessage } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import type { ImageContent, Message, Model, TextContent, ToolResultMessage } from "@oh-my-pi/pi-ai";
 import type { Component, TUI } from "@oh-my-pi/pi-tui";
 import type { Theme } from "../../modes/interactive/theme/theme";
 import type { CompactionPreparation, CompactionResult } from "../compaction/index";

package/src/core/messages.ts

@@ -5,8 +5,8 @@
  * and provides a transformer to convert them to LLM-compatible messages.
  */
 
+import type { ImageContent, Message, TextContent } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import type { ImageContent, Message, TextContent } from "@oh-my-pi/pi-ai";
 
 export const COMPACTION_SUMMARY_PREFIX = `The conversation history before this point was compacted into the following summary:
 

package/src/core/model-registry.ts

@@ -11,7 +11,7 @@ import {
 	type KnownProvider,
 	type Model,
 	normalizeDomain,
-} from "@oh-my-pi/pi-ai";
+} from "@mariozechner/pi-ai";
 import { type Static, Type } from "@sinclair/typebox";
 import AjvModule from "ajv";
 import type { AuthStorage } from "./auth-storage";

package/src/core/model-resolver.ts

@@ -2,8 +2,8 @@
  * Model resolution, scoping, and initial selection
  */
 
+import { type Api, type KnownProvider, type Model, modelsAreEqual } from "@mariozechner/pi-ai";
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import { type Api, type KnownProvider, type Model, modelsAreEqual } from "@oh-my-pi/pi-ai";
 import chalk from "chalk";
 import { minimatch } from "minimatch";
 import { isValidThinkingLevel } from "../cli/args";

package/src/core/sdk.ts

@@ -18,7 +18,7 @@
  * const session = await createAgentSession({
  *   model: myModel,
  *   getApiKey: async () => process.env.MY_KEY,
- *   tools: [readTool, bashTool],
+ *   toolNames: ["read", "bash", "edit", "write"], // Filter tools
  *   extensions: [],
  *   skills: [],
  *   sessionFile: false,
@@ -27,8 +27,8 @@
  */
 
 import { join } from "node:path";
+import type { Model } from "@mariozechner/pi-ai";
 import { Agent, type AgentTool, type ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { Model } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import chalk from "chalk";
 // Import discovery to register all providers on startup
@@ -55,7 +55,7 @@ import {
 	loadExtensionFromFactory,
 	type ToolDefinition,
 	wrapRegisteredTools,
-	wrapToolsWithExtensions,
+	wrapToolWithExtensions,
 } from "./extensions/index";
 import { logger } from "./logger";
 import { discoverAndLoadMCPTools, type MCPManager, type MCPToolsLoadResult } from "./mcp/index";
@@ -66,6 +66,7 @@ import { loadPromptTemplates as loadPromptTemplatesInternal, type PromptTemplate
 import { SessionManager } from "./session-manager";
 import { type Settings, SettingsManager, type SkillsSettings } from "./settings-manager";
 import { loadSkills as loadSkillsInternal, type Skill } from "./skills";
+import { type FileSlashCommand, loadSlashCommands as loadSlashCommandsInternal } from "./slash-commands";
 import {
 	buildSystemPrompt as buildSystemPromptInternal,
 	loadProjectContextFiles as loadContextFilesInternal,
@@ -74,46 +75,34 @@ import { time } from "./timings";
 import { createToolContextStore } from "./tools/context";
 import { getGeminiImageTools } from "./tools/gemini-image";
 import {
-	allTools,
-	applyBashInterception,
-	baseCodingToolNames,
-	bashTool,
-	codingTools,
-	createAllTools,
+	BUILTIN_TOOLS,
 	createBashTool,
-	createCodingTools,
 	createEditTool,
 	createFindTool,
 	createGitTool,
 	createGrepTool,
 	createLsTool,
-	createReadOnlyTools,
 	createReadTool,
-	createRulebookTool,
+	createTools,
 	createWriteTool,
-	editTool,
 	filterRulebookRules,
-	findTool,
 	getWebSearchTools,
-	gitTool,
-	grepTool,
-	lsTool,
-	readOnlyTools,
-	readTool,
+	setPreferredImageProvider,
+	setPreferredWebSearchProvider,
 	type Tool,
-	type ToolName,
+	type ToolSession,
 	warmupLspServers,
-	writeTool,
 } from "./tools/index";
 import { createTtsrManager } from "./ttsr";
 
 // Types
-
 export interface CreateAgentSessionOptions {
 	/** Working directory for project-local discovery. Default: process.cwd() */
 	cwd?: string;
 	/** Global config directory. Default: ~/.omp/agent */
 	agentDir?: string;
+	/** Spawns to allow. Default: "*" */
+	spawns?: string;
 
 	/** Auth storage for credentials. Default: discoverAuthStorage(agentDir) */
 	authStorage?: AuthStorage;
@@ -130,8 +119,6 @@ export interface CreateAgentSessionOptions {
 	/** System prompt. String replaces default, function receives default and returns final. */
 	systemPrompt?: string | ((defaultPrompt: string) => string);
 
-	/** Built-in tools to use. Default: all coding tools (read, bash, edit, write, grep, find, ls, lsp, notebook, output, task, web_fetch, web_search) */
-	tools?: Tool[];
 	/** Custom tools to register (in addition to built-in tools). Accepts both CustomTool and ToolDefinition. */
 	customTools?: (CustomTool | ToolDefinition)[];
 	/** Inline extensions (merged with discovery). */
@@ -153,12 +140,14 @@ export interface CreateAgentSessionOptions {
 	contextFiles?: Array<{ path: string; content: string }>;
 	/** Prompt templates. Default: discovered from cwd/.omp/prompts/ + agentDir/prompts/ */
 	promptTemplates?: PromptTemplate[];
+	/** File-based slash commands. Default: discovered from commands/ directories */
+	slashCommands?: FileSlashCommand[];
 
 	/** Enable MCP server discovery from .mcp.json files. Default: true */
 	enableMCP?: boolean;
 
 	/** Tool names explicitly requested (enables disabled-by-default tools) */
-	explicitTools?: string[];
+	toolNames?: string[];
 
 	/** Session manager. Default: SessionManager.create(cwd) */
 	sessionManager?: SessionManager;
@@ -199,24 +188,15 @@ export type { MCPManager, MCPServerConfig, MCPServerConnection, MCPToolsLoadResu
 export type { PromptTemplate } from "./prompt-templates";
 export type { Settings, SkillsSettings } from "./settings-manager";
 export type { Skill } from "./skills";
+export type { FileSlashCommand } from "./slash-commands";
 export type { Tool } from "./tools/index";
 
 export {
-	// Pre-built tools (use process.cwd())
-	readTool,
-	bashTool,
-	editTool,
-	writeTool,
-	grepTool,
-	findTool,
-	gitTool,
-	lsTool,
-	codingTools,
-	readOnlyTools,
-	allTools as allBuiltInTools,
-	// Tool factories (for custom cwd)
-	createCodingTools,
-	createReadOnlyTools,
+	// Tool factories
+	BUILTIN_TOOLS,
+	createTools,
+	type ToolSession,
+	// Individual tool factories (for custom usage)
 	createReadTool,
 	createBashTool,
 	createEditTool,
@@ -315,6 +295,13 @@ export async function discoverPromptTemplates(cwd?: string, agentDir?: string):
 	});
 }
 
+/**
+ * Discover file-based slash commands from commands/ directories.
+ */
+export function discoverSlashCommands(cwd?: string): FileSlashCommand[] {
+	return loadSlashCommandsInternal({ cwd: cwd ?? process.cwd() });
+}
+
 /**
  * Discover custom commands (TypeScript slash commands) from cwd and agentDir.
  */
@@ -413,7 +400,6 @@ function customToolToDefinition(tool: CustomTool): ToolDefinition {
 		label: tool.label,
 		description: tool.description,
 		parameters: tool.parameters,
-		hidden: tool.hidden,
 		execute: (toolCallId, params, onUpdate, ctx, signal) =>
 			tool.execute(toolCallId, params, onUpdate, createCustomToolContext(ctx), signal),
 		onSession: tool.onSession ? (event, ctx) => tool.onSession?.(event, createCustomToolContext(ctx)) : undefined,
@@ -480,7 +466,7 @@ function createCustomToolsExtension(tools: CustomTool[]): ExtensionFactory {
  * const { session } = await createAgentSession();
  *
  * // With explicit model
- * import { getModel } from '@oh-my-pi/pi-ai';
+ * import { getModel } from '@mariozechner/pi-ai';
  * const { session } = await createAgentSession({
  *   model: getModel('anthropic', 'claude-opus-4-5'),
  *   thinkingLevel: 'high',
@@ -496,7 +482,7 @@ function createCustomToolsExtension(tools: CustomTool[]): ExtensionFactory {
  *   model: myModel,
  *   getApiKey: async () => process.env.MY_KEY,
  *   systemPrompt: 'You are helpful.',
- *   tools: [readTool, bashTool],
+ *   tools: codingTools({ cwd: process.cwd() }),
  *   skills: [],
  *   sessionManager: SessionManager.inMemory(),
  * });
@@ -517,6 +503,10 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	initializeWithSettings(settingsManager);
 	time("initializeWithSettings");
 
+	// Initialize provider preferences from settings
+	setPreferredWebSearchProvider(settingsManager.getWebSearchProvider());
+	setPreferredImageProvider(settingsManager.getImageProvider());
+
 	const sessionManager = options.sessionManager ?? SessionManager.create(cwd);
 	time("sessionManager");
 
@@ -613,22 +603,18 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	const contextFiles = options.contextFiles ?? discoverContextFiles(cwd, agentDir);
 	time("discoverContextFiles");
 
-	const sessionContext = {
+	const toolSession: ToolSession = {
+		cwd,
+		hasUI: options.hasUI ?? false,
+		rulebookRules,
+		eventBus,
 		getSessionFile: () => sessionManager.getSessionFile() ?? null,
+		getSessionSpawns: () => options.spawns ?? "*",
+		settings: settingsManager,
 	};
-	const allBuiltInToolsMap = await createAllTools(cwd, sessionContext, {
-		lspFormatOnWrite: settingsManager.getLspFormatOnWrite(),
-		lspDiagnosticsOnWrite: settingsManager.getLspDiagnosticsOnWrite(),
-		lspDiagnosticsOnEdit: settingsManager.getLspDiagnosticsOnEdit(),
-		editFuzzyMatch: settingsManager.getEditFuzzyMatch(),
-		readAutoResizeImages: settingsManager.getImageAutoResize(),
-	});
-	time("createAllTools");
 
-	const initialActiveToolNames: ToolName[] = options.tools
-		? options.tools.map((t) => t.name).filter((n): n is ToolName => n in allBuiltInToolsMap)
-		: baseCodingToolNames;
-	const initialActiveBuiltInTools = initialActiveToolNames.map((name) => allBuiltInToolsMap[name]);
+	const builtinTools = await createTools(toolSession, options.toolNames);
+	time("createAllTools");
 
 	// Discover MCP tools from .mcp.json files
 	let mcpManager: MCPManager | undefined;
@@ -815,61 +801,30 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		hasQueuedMessages: () => session.queuedMessageCount > 0,
 	}));
 
+	// All built-in tools are active (conditional tools like git/ask return null from factory if disabled)
 	const toolRegistry = new Map<string, AgentTool>();
-	for (const [name, tool] of Object.entries(allBuiltInToolsMap)) {
-		toolRegistry.set(name, tool as AgentTool);
+	for (const tool of builtinTools) {
+		toolRegistry.set(tool.name, tool as AgentTool);
 	}
-	for (const tool of wrappedExtensionTools as AgentTool[]) {
+	for (const tool of wrappedExtensionTools) {
 		toolRegistry.set(tool.name, tool);
 	}
-
-	let activeToolsArray: Tool[] = [...initialActiveBuiltInTools, ...wrappedExtensionTools];
-
-	if (rulebookRules.length > 0) {
-		activeToolsArray.push(createRulebookTool(rulebookRules));
-	}
-
-	if (options.explicitTools) {
-		const explicitSet = new Set(options.explicitTools);
-		activeToolsArray = activeToolsArray.filter((tool) => !tool.hidden || explicitSet.has(tool.name));
-	} else {
-		activeToolsArray = activeToolsArray.filter((tool) => !tool.hidden);
-	}
-	time("combineTools");
-
-	if (settingsManager.getBashInterceptorEnabled()) {
-		activeToolsArray = applyBashInterception(activeToolsArray);
-	}
-	time("applyBashInterception");
-
-	let wrappedToolRegistry: Map<string, AgentTool> | undefined;
 	if (extensionRunner) {
-		activeToolsArray = wrapToolsWithExtensions(activeToolsArray as AgentTool[], extensionRunner);
-		const allRegistryTools = Array.from(toolRegistry.values());
-		const wrappedAllTools = wrapToolsWithExtensions(allRegistryTools, extensionRunner);
-		wrappedToolRegistry = new Map<string, AgentTool>();
-		for (const tool of wrappedAllTools) {
-			wrappedToolRegistry.set(tool.name, tool);
+		for (const tool of toolRegistry.values()) {
+			toolRegistry.set(tool.name, wrapToolWithExtensions(tool, extensionRunner));
 		}
 	}
+	time("combineTools");
 
-	const rebuildSystemPrompt = (toolNames: string[]): string => {
-		const validToolNames = toolNames.filter((n): n is ToolName => n in allBuiltInToolsMap);
-		const extraToolDescriptions = toolNames
-			.filter((name) => !(name in allBuiltInToolsMap))
-			.map((name) => {
-				const tool = toolRegistry.get(name);
-				if (!tool) return null;
-				return { name, description: tool.description || tool.label || "Custom tool" };
-			})
-			.filter((tool): tool is { name: string; description: string } => tool !== null);
+	const rebuildSystemPrompt = (toolNames: string[], tools: Map<string, AgentTool>): string => {
+		toolContextStore.setToolNames(toolNames);
 		const defaultPrompt = buildSystemPromptInternal({
 			cwd,
 			skills,
 			contextFiles,
-			rulebookRules,
-			selectedTools: validToolNames,
-			extraToolDescriptions,
+			tools,
+			toolNames,
+			rules: rulebookRules,
 			skillsSettings: settingsManager.getSkillsSettings(),
 		});
 
@@ -881,9 +836,9 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				cwd,
 				skills,
 				contextFiles,
-				rulebookRules,
-				selectedTools: validToolNames,
-				extraToolDescriptions,
+				tools,
+				toolNames,
+				rules: rulebookRules,
 				skillsSettings: settingsManager.getSkillsSettings(),
 				customPrompt: options.systemPrompt,
 			});
@@ -891,12 +846,15 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		return options.systemPrompt(defaultPrompt);
 	};
 
-	const systemPrompt = rebuildSystemPrompt(initialActiveToolNames);
+	const systemPrompt = rebuildSystemPrompt(Array.from(toolRegistry.keys()), toolRegistry);
 	time("buildSystemPrompt");
 
 	const promptTemplates = options.promptTemplates ?? (await discoverPromptTemplates(cwd, agentDir));
 	time("discoverPromptTemplates");
 
+	const slashCommands = options.slashCommands ?? discoverSlashCommands(cwd);
+	time("discoverSlashCommands");
+
 	const baseSetUIContext = extensionsResult.setUIContext;
 	extensionsResult.setUIContext = (uiContext, hasUI) => {
 		baseSetUIContext(uiContext, hasUI);
@@ -908,7 +866,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			systemPrompt,
 			model,
 			thinkingLevel,
-			tools: activeToolsArray,
+			tools: Array.from(toolRegistry.values()),
 		},
 		convertToLlm,
 		transformContext: extensionRunner
@@ -951,11 +909,12 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		settingsManager,
 		scopedModels: options.scopedModels,
 		promptTemplates,
+		slashCommands,
 		extensionRunner,
 		customCommands: customCommandsResult.commands,
 		skillsSettings: settingsManager.getSkillsSettings(),
 		modelRegistry,
-		toolRegistry: wrappedToolRegistry ?? toolRegistry,
+		toolRegistry,
 		rebuildSystemPrompt,
 		ttsrManager,
 	});