@oh-my-pi/pi-coding-agent 15.10.7 → 15.10.9

package/dist/types/web/search/providers/jina.d.ts

@@ -4,14 +4,18 @@
  * Uses the Jina Reader `s.jina.ai` endpoint to fetch search results with
  * cleaned content.
  */
-import { type AuthStorage } from "@oh-my-pi/pi-ai";
+import { type AuthStorage, type FetchImpl } from "@oh-my-pi/pi-ai";
 import type { SearchResponse } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+type SearchParamsWithFetch = SearchParams & {
+    fetch?: FetchImpl;
+};
 export interface JinaSearchParams {
     query: string;
     num_results?: number;
     signal?: AbortSignal;
+    fetch?: FetchImpl;
 }
 /** Find JINA_API_KEY from environment or .env files. */
 export declare function findApiKey(): string | null;
@@ -22,5 +26,6 @@ export declare class JinaProvider extends SearchProvider {
     readonly id = "jina";
     readonly label = "Jina";
     isAvailable(_authStorage: AuthStorage): boolean;
-    search(params: SearchParams): Promise<SearchResponse>;
+    search(params: SearchParamsWithFetch): Promise<SearchResponse>;
 }
+export {};

package/dist/types/web/search/providers/kagi.d.ts

@@ -3,10 +3,13 @@
  *
  * Thin wrapper that adapts shared Kagi API utilities to SearchResponse shape.
  */
-import type { AuthStorage } from "@oh-my-pi/pi-ai";
+import type { AuthStorage, FetchImpl } from "@oh-my-pi/pi-ai";
 import type { SearchResponse } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+type SearchParamsWithFetch = SearchParams & {
+    fetch?: FetchImpl;
+};
 /** Execute Kagi web search. */
 export declare function searchKagi(params: {
     query: string;
@@ -15,11 +18,13 @@ export declare function searchKagi(params: {
     signal?: AbortSignal;
     authStorage: AuthStorage;
     sessionId?: string;
+    fetch?: FetchImpl;
 }): Promise<SearchResponse>;
 /** Search provider for Kagi web search. */
 export declare class KagiProvider extends SearchProvider {
     readonly id = "kagi";
     readonly label = "Kagi";
     isAvailable(authStorage: AuthStorage): boolean;
-    search(params: SearchParams): Promise<SearchResponse>;
+    search(params: SearchParamsWithFetch): Promise<SearchResponse>;
 }
+export {};

package/dist/types/web/search/providers/kimi.d.ts

@@ -4,10 +4,13 @@
  * Uses Moonshot Kimi Code search API to retrieve web results.
  * Endpoint: POST https://api.kimi.com/coding/v1/search
  */
-import { type AuthStorage } from "@oh-my-pi/pi-ai";
+import { type AuthStorage, type FetchImpl } from "@oh-my-pi/pi-ai";
 import type { SearchResponse } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+type SearchParamsWithFetch = SearchParams & {
+    fetch?: FetchImpl;
+};
 export interface KimiSearchParams {
     query: string;
     num_results?: number;
@@ -15,6 +18,7 @@ export interface KimiSearchParams {
     signal?: AbortSignal;
     authStorage: AuthStorage;
     sessionId?: string;
+    fetch?: FetchImpl;
 }
 /** Execute Kimi web search. */
 export declare function searchKimi(params: KimiSearchParams): Promise<SearchResponse>;
@@ -23,5 +27,6 @@ export declare class KimiProvider extends SearchProvider {
     readonly id = "kimi";
     readonly label = "Kimi";
     isAvailable(authStorage: AuthStorage): boolean;
-    search(params: SearchParams): Promise<SearchResponse>;
+    search(params: SearchParamsWithFetch): Promise<SearchResponse>;
 }
+export {};

package/dist/types/web/search/providers/parallel.d.ts

@@ -1,4 +1,4 @@
-import { type AuthStorage } from "@oh-my-pi/pi-ai";
+import { type AuthStorage, type FetchImpl } from "@oh-my-pi/pi-ai";
 import type { SearchResponse } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
@@ -6,6 +6,7 @@ export declare function searchParallel(params: {
     query: string;
     num_results?: number;
     signal?: AbortSignal;
+    fetch?: FetchImpl;
 }, authStorage: AuthStorage, sessionId?: string): Promise<SearchResponse>;
 export declare class ParallelProvider extends SearchProvider {
     readonly id = "parallel";

package/dist/types/web/search/providers/perplexity.d.ts

@@ -7,7 +7,7 @@
  * - API key (`PERPLEXITY_API_KEY`) via `api.perplexity.ai/chat/completions`
  * - Anonymous via `www.perplexity.ai/rest/sse/perplexity_ask`
  */
-import { type AuthStorage } from "@oh-my-pi/pi-ai";
+import { type AuthStorage, type FetchImpl } from "@oh-my-pi/pi-ai";
 import type { SearchResponse } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
@@ -25,6 +25,7 @@ export interface PerplexitySearchParams {
     num_search_results?: number;
     authStorage: AuthStorage;
     sessionId?: string;
+    fetch?: FetchImpl;
 }
 /** Find PERPLEXITY_API_KEY from environment or .env files (also checks PPLX_API_KEY) */
 export declare function findApiKey(): string | null;

package/dist/types/web/search/providers/searxng.d.ts

@@ -24,7 +24,7 @@
  *
  * Reference: https://docs.searxng.org/dev/search_api.html
  */
-import type { AuthStorage } from "@oh-my-pi/pi-ai";
+import type { AuthStorage, FetchImpl } from "@oh-my-pi/pi-ai";
 import type { SearchResponse } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
@@ -34,6 +34,7 @@ export declare function searchSearXNG(params: {
     num_results?: number;
     recency?: "day" | "week" | "month" | "year";
     signal?: AbortSignal;
+    fetch?: FetchImpl;
 }): Promise<SearchResponse>;
 /** Search provider for SearXNG web search. */
 export declare class SearXNGProvider extends SearchProvider {

package/dist/types/web/search/providers/synthetic.d.ts

@@ -4,18 +4,22 @@
  * Uses Synthetic's zero-data-retention web search API for coding agents.
  * Endpoint: POST https://api.synthetic.new/v2/search
  */
-import { type AuthStorage } from "@oh-my-pi/pi-ai";
+import { type AuthStorage, type FetchImpl } from "@oh-my-pi/pi-ai";
 import type { SearchResponse } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+type SearchParamsWithFetch = SearchParams & {
+    fetch?: FetchImpl;
+};
 /** Resolve Synthetic API key through the shared auth storage pipeline. */
 export declare function findApiKey(authStorage: AuthStorage, sessionId?: string, signal?: AbortSignal): Promise<string | undefined>;
 /** Execute Synthetic web search. */
-export declare function searchSynthetic(params: SearchParams): Promise<SearchResponse>;
+export declare function searchSynthetic(params: SearchParamsWithFetch): Promise<SearchResponse>;
 /** Search provider for Synthetic. */
 export declare class SyntheticProvider extends SearchProvider {
     readonly id = "synthetic";
     readonly label = "Synthetic";
     isAvailable(authStorage: AuthStorage): boolean;
-    search(params: SearchParams): Promise<SearchResponse>;
+    search(params: SearchParamsWithFetch): Promise<SearchResponse>;
 }
+export {};

package/dist/types/web/search/providers/tavily.d.ts

@@ -4,7 +4,7 @@
  * Uses Tavily's agent-focused search API to return structured results with an
  * optional synthesized answer.
  */
-import { type AuthStorage } from "@oh-my-pi/pi-ai";
+import { type AuthStorage, type FetchImpl } from "@oh-my-pi/pi-ai";
 import type { SearchResponse } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
@@ -13,6 +13,7 @@ export interface TavilySearchParams {
     num_results?: number;
     recency?: "day" | "week" | "month" | "year";
     signal?: AbortSignal;
+    fetch?: FetchImpl;
 }
 /** Find Tavily API key through AuthStorage's unified refresh pipeline. */
 export declare function findApiKey(authStorage: AuthStorage, sessionId: string | undefined, signal: AbortSignal | undefined): Promise<string | null>;

package/dist/types/web/search/providers/zai.d.ts

@@ -4,7 +4,7 @@
  * Calls Z.AI's remote MCP server (`webSearchPrime`) and adapts results into
  * the unified SearchResponse shape used by the web search tool.
  */
-import { type AuthStorage } from "@oh-my-pi/pi-ai";
+import { type AuthStorage, type FetchImpl } from "@oh-my-pi/pi-ai";
 import type { SearchResponse } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
@@ -12,6 +12,7 @@ export interface ZaiSearchParams {
     query: string;
     num_results?: number;
     signal?: AbortSignal;
+    fetch?: FetchImpl;
     authStorage: AuthStorage;
     sessionId?: string;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "15.10.7",
+	"version": "15.10.9",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -47,14 +47,14 @@
 		"@agentclientprotocol/sdk": "0.22.1",
 		"@babel/parser": "^7.29.7",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/hashline": "15.10.7",
-		"@oh-my-pi/omp-stats": "15.10.7",
-		"@oh-my-pi/pi-agent-core": "15.10.7",
-		"@oh-my-pi/pi-ai": "15.10.7",
-		"@oh-my-pi/pi-mnemopi": "15.10.7",
-		"@oh-my-pi/pi-natives": "15.10.7",
-		"@oh-my-pi/pi-tui": "15.10.7",
-		"@oh-my-pi/pi-utils": "15.10.7",
+		"@oh-my-pi/hashline": "15.10.9",
+		"@oh-my-pi/omp-stats": "15.10.9",
+		"@oh-my-pi/pi-agent-core": "15.10.9",
+		"@oh-my-pi/pi-ai": "15.10.9",
+		"@oh-my-pi/pi-mnemopi": "15.10.9",
+		"@oh-my-pi/pi-natives": "15.10.9",
+		"@oh-my-pi/pi-tui": "15.10.9",
+		"@oh-my-pi/pi-utils": "15.10.9",
 		"@opentelemetry/api": "^1.9.1",
 		"@opentelemetry/context-async-hooks": "^2.7.1",
 		"@opentelemetry/exporter-trace-otlp-proto": "^0.218.0",

package/src/config/model-registry.ts

@@ -95,7 +95,7 @@ const STARTUP_MODEL_CACHE_PROVIDER_IDS: readonly string[] = [
 	...SPECIAL_MODEL_MANAGER_PROVIDER_IDS,
 ];
 
-import type { ApiKeyResolver } from "@oh-my-pi/pi-ai";
+import type { ApiKeyResolver, FetchImpl } from "@oh-my-pi/pi-ai";
 import { registerOAuthProvider, unregisterOAuthProviders } from "@oh-my-pi/pi-ai/oauth";
 import type { OAuthCredentials, OAuthLoginCallbacks } from "@oh-my-pi/pi-ai/oauth/types";
 import { isRecord, logger } from "@oh-my-pi/pi-utils";
@@ -927,6 +927,7 @@ export class ModelRegistry {
 	#runtimeModelManagers: Map<string, { options: ModelManagerOptions<Api>; sourceId: string }> = new Map();
 	#rebuildPending: boolean = false;
 	#rebuildSuspended: number = 0;
+	#fetch: FetchImpl;
 
 	/**
 	 * @param authStorage - Auth storage for API key resolution
@@ -940,7 +941,9 @@ export class ModelRegistry {
 	constructor(
 		readonly authStorage: AuthStorage,
 		modelsPath?: string,
+		options?: { fetch?: FetchImpl },
 	) {
+		this.#fetch = options?.fetch ?? fetch;
 		this.#modelsConfigFile = ModelsConfigFile.relocate(modelsPath);
 		this.#cacheDbPath = modelsPath ? path.join(path.dirname(modelsPath), "models.db") : undefined;
 		// Set up fallback resolver for custom provider API keys
@@ -1629,6 +1632,7 @@ export class ModelRegistry {
 					googleAntigravityModelManagerOptions({
 						oauthToken,
 						endpoint: this.getProviderBaseUrl("google-antigravity"),
+						fetch: this.#fetch,
 					}),
 			},
 			{
@@ -1638,6 +1642,7 @@ export class ModelRegistry {
 					googleGeminiCliModelManagerOptions({
 						oauthToken,
 						endpoint: this.getProviderBaseUrl("google-gemini-cli"),
+						fetch: this.#fetch,
 					}),
 			},
 			{
@@ -1676,6 +1681,7 @@ export class ModelRegistry {
 					descriptor.createModelManagerOptions({
 						apiKey: isAuthenticated(apiKey) ? apiKey : undefined,
 						baseUrl: this.getProviderBaseUrl(descriptor.providerId),
+						fetch: this.#fetch,
 					}),
 				);
 			}
@@ -1727,7 +1733,7 @@ export class ModelRegistry {
 	): Promise<OllamaDiscoveredModelMetadata | null> {
 		const showUrl = `${endpoint}/api/show`;
 		try {
-			const response = await fetch(showUrl, {
+			const response = await this.#fetch(showUrl, {
 				method: "POST",
 				headers: { ...(headers ?? {}), "Content-Type": "application/json" },
 				body: JSON.stringify({ model: modelId }),
@@ -1775,7 +1781,7 @@ export class ModelRegistry {
 		const endpoint = this.#normalizeOllamaBaseUrl(providerConfig.baseUrl);
 		const tagsUrl = `${endpoint}/api/tags`;
 		const headers = { ...(providerConfig.headers ?? {}) };
-		const response = await fetch(tagsUrl, {
+		const response = await this.#fetch(tagsUrl, {
 			headers,
 			signal: AbortSignal.timeout(250),
 		});
@@ -1819,7 +1825,7 @@ export class ModelRegistry {
 	): Promise<LlamaCppDiscoveredServerMetadata | null> {
 		const propsUrl = `${this.#toLlamaCppNativeBaseUrl(baseUrl)}/props`;
 		try {
-			const response = await fetch(propsUrl, {
+			const response = await this.#fetch(propsUrl, {
 				headers,
 				signal: AbortSignal.timeout(150),
 			});
@@ -1850,7 +1856,7 @@ export class ModelRegistry {
 		}
 
 		const [response, serverMetadata] = await Promise.all([
-			fetch(modelsUrl, {
+			this.#fetch(modelsUrl, {
 				headers,
 				signal: AbortSignal.timeout(250),
 			}),
@@ -1902,7 +1908,7 @@ export class ModelRegistry {
 			headers.Authorization = `Bearer ${apiKey}`;
 		}
 
-		const response = await fetch(modelsUrl, {
+		const response = await this.#fetch(modelsUrl, {
 			headers,
 			signal: AbortSignal.timeout(10_000),
 		});
@@ -1964,7 +1970,7 @@ export class ModelRegistry {
 			headers.Authorization = `Bearer ${apiKey}`;
 		}
 
-		const response = await fetch(modelsUrl, {
+		const response = await this.#fetch(modelsUrl, {
 			headers,
 			signal: AbortSignal.timeout(10_000),
 		});

package/src/config/model-resolver.ts

@@ -118,6 +118,43 @@ function cloneModelWithRequestedId(model: Model<Api>, requestedId: string): Mode
 	};
 }
 
+const UPSTREAM_ROUTING_SLUG = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i;
+
+/**
+ * Split a trailing `@<upstream>` provider-routing selector off a model pattern.
+ *
+ * `openrouter/z-ai/glm-4.7@cerebras` -> base `openrouter/z-ai/glm-4.7`, upstream
+ * `cerebras`. A `:thinking` suffix after the slug is kept on the base
+ * (`...@cerebras:high` -> base `...:high`). Returns undefined when there is no
+ * `@` or the suffix is not a bare provider slug, so model ids that legitimately
+ * contain `@` (`claude-opus-4-8@default`, `workers-ai/@cf/...`) are never split.
+ */
+function splitUpstreamRouting(pattern: string): { base: string; upstream: string } | undefined {
+	const at = pattern.lastIndexOf("@");
+	if (at <= 0) return undefined;
+	const rest = pattern.slice(at + 1);
+	const colon = rest.indexOf(":");
+	const upstream = colon === -1 ? rest : rest.slice(0, colon);
+	if (!UPSTREAM_ROUTING_SLUG.test(upstream)) return undefined;
+	const trailing = colon === -1 ? "" : rest.slice(colon);
+	return { base: pattern.slice(0, at) + trailing, upstream };
+}
+
+/** OpenRouter and Vercel AI Gateway are the aggregators that honor per-request upstream routing. */
+function supportsUpstreamRouting(model: Model<Api>): boolean {
+	return model.baseUrl.includes("openrouter.ai") || model.baseUrl.includes("ai-gateway.vercel.sh");
+}
+
+/** Pin a resolved aggregator model to a single upstream provider via its compat routing block. */
+function applyUpstreamRouting(model: Model<Api>, upstream: string): Model<Api> {
+	const aggregatorModel = model as Model<"openai-completions">;
+	const routing = { only: [upstream] };
+	const compat = model.baseUrl.includes("ai-gateway.vercel.sh")
+		? { ...aggregatorModel.compat, vercelGatewayRouting: routing }
+		: { ...aggregatorModel.compat, openRouterRouting: routing };
+	return { ...model, compat } as Model<Api>;
+}
+
 const kProviderModelIndex = Symbol("model-resolver.providerIndex");
 type ModelsWithProviderIndex = readonly Model<Api>[] & {
 	[kProviderModelIndex]?: Map<string, Model<Api> | null>;
@@ -442,6 +479,8 @@ export interface ParsedModelResult {
 	model: Model<Api> | undefined;
 	/** Thinking level if explicitly specified in pattern, undefined otherwise */
 	thinkingLevel?: ThinkingLevel;
+	/** Upstream provider slug from an `@upstream` routing selector, if present. */
+	upstream?: string;
 	warning: string | undefined;
 	explicitThinkingLevel: boolean;
 }
@@ -523,7 +562,20 @@ export function parseModelPattern(
 	options?: { allowInvalidThinkingSelectorFallback?: boolean; modelRegistry?: CanonicalModelRegistry },
 ): ParsedModelResult {
 	const context = buildPreferenceContext(availableModels, preferences);
-	return parseModelPatternWithContext(pattern, availableModels, context, options);
+	const direct = parseModelPatternWithContext(pattern, availableModels, context, options);
+	if (direct.model) return direct;
+
+	// No direct match: a trailing `@upstream` may be a provider-routing selector.
+	// Only honor it when the base resolves to an aggregator model (OpenRouter /
+	// Vercel Gateway); otherwise `@` stays part of the id and `direct` stands.
+	const routing = splitUpstreamRouting(pattern);
+	if (routing) {
+		const routed = parseModelPatternWithContext(routing.base, availableModels, context, options);
+		if (routed.model && supportsUpstreamRouting(routed.model)) {
+			return { ...routed, model: applyUpstreamRouting(routed.model, routing.upstream), upstream: routing.upstream };
+		}
+	}
+	return direct;
 }
 
 const PREFIX_MODEL_ROLE = "pi/";
@@ -1143,7 +1195,7 @@ export function resolveCliModel(options: {
 	}
 
 	const candidates = provider ? availableModels.filter(model => model.provider === provider) : availableModels;
-	const { model, thinkingLevel, warning } = parseModelPattern(pattern, candidates, preferences, {
+	const { model, thinkingLevel, warning, upstream } = parseModelPattern(pattern, candidates, preferences, {
 		allowInvalidThinkingSelectorFallback: false,
 		modelRegistry,
 	});
@@ -1173,6 +1225,9 @@ export function resolveCliModel(options: {
 			}
 		}
 	}
+	if (selector !== undefined && upstream) {
+		selector = `${selector}@${upstream}`;
+	}
 
 	return {
 		model,

package/src/config/settings-schema.ts

@@ -2187,6 +2187,12 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
+	"bash.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Bash", description: "Enable the bash tool for shell command execution" },
+	},
+
 	// Search and AST tools
 	"find.enabled": {
 		type: "boolean",

package/src/extensibility/custom-tools/loader.ts

@@ -66,8 +66,10 @@ async function loadTool(
 	}
 }
 
-/** Tool path with optional source metadata */
-interface ToolPathWithSource {
+/** Tool path with optional source metadata, suitable for forwarding from a
+ * parent session to a subagent so the subagent can re-bind tools to its own
+ * `CustomToolAPI` without redoing the filesystem scan. */
+export interface ToolPathWithSource {
 	path: string;
 	source?: { provider: string; providerName: string; level: "user" | "project" };
 }
@@ -189,26 +191,19 @@ export async function loadCustomTools(
 }
 
 /**
- * Discover and load tools from standard locations via capability system:
- * 1. User and project tools discovered by capability providers
- * 2. Installed plugins (~/.omp/plugins/node_modules/*)
- * 3. Explicitly configured paths from settings or CLI
+ * Collect the absolute tool-source paths to load, without importing or
+ * binding factories. Hot path on session startup — the scan walks
+ * `.omp/tools/`, `.claude/tools/`, the plugin tree, and any configured paths.
+ *
+ * Subagents reuse the parent's collected paths via the SDK's
+ * `preloadedCustomToolPaths` option, then call `loadCustomTools` themselves
+ * so each session re-binds factories with its own session-scoped
+ * `CustomToolAPI` (cwd, exec, pushPendingAction, UI).
  *
  * @param configuredPaths - Explicit paths from settings.json and CLI --tool flags
  * @param cwd - Current working directory
- * @param builtInToolNames - Names of built-in tools to check for conflicts
  */
-export async function discoverAndLoadCustomTools(
-	configuredPaths: string[],
-	cwd: string,
-	builtInToolNames: string[],
-	pushPendingAction?: (action: {
-		label: string;
-		sourceToolName: string;
-		apply(reason: string): Promise<AgentToolResult<unknown>>;
-		reject?(reason: string): Promise<AgentToolResult<unknown> | undefined>;
-	}) => void,
-) {
+export async function discoverCustomToolPaths(configuredPaths: string[], cwd: string): Promise<ToolPathWithSource[]> {
 	const allPathsWithSources: ToolPathWithSource[] = [];
 	const seen = new Set<string>();
 
@@ -241,5 +236,34 @@ export async function discoverAndLoadCustomTools(
 		addPath(resolvePath(configPath, cwd), { provider: "config", providerName: "Config", level: "project" });
 	}
 
-	return loadCustomTools(allPathsWithSources, cwd, builtInToolNames, pushPendingAction);
+	return allPathsWithSources;
+}
+
+/**
+ * Discover and load tools from standard locations via capability system:
+ * 1. User and project tools discovered by capability providers
+ * 2. Installed plugins (~/.omp/plugins/node_modules/*)
+ * 3. Explicitly configured paths from settings or CLI
+ *
+ * Composed of {@link discoverCustomToolPaths} (FS scan) + {@link loadCustomTools}
+ * (per-session binding). Subagents skip the first step and just call
+ * `loadCustomTools` against the parent's collected paths.
+ *
+ * @param configuredPaths - Explicit paths from settings.json and CLI --tool flags
+ * @param cwd - Current working directory
+ * @param builtInToolNames - Names of built-in tools to check for conflicts
+ */
+export async function discoverAndLoadCustomTools(
+	configuredPaths: string[],
+	cwd: string,
+	builtInToolNames: string[],
+	pushPendingAction?: (action: {
+		label: string;
+		sourceToolName: string;
+		apply(reason: string): Promise<AgentToolResult<unknown>>;
+		reject?(reason: string): Promise<AgentToolResult<unknown> | undefined>;
+	}) => void,
+) {
+	const pathsWithSources = await discoverCustomToolPaths(configuredPaths, cwd);
+	return loadCustomTools(pathsWithSources, cwd, builtInToolNames, pushPendingAction);
 }

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

@@ -12,7 +12,7 @@ import type {
 	ToolTier,
 } from "@oh-my-pi/pi-agent-core";
 import type { CompactionResult } from "@oh-my-pi/pi-agent-core/compaction";
-import type { Model, Static, TSchema } from "@oh-my-pi/pi-ai";
+import type { FetchImpl, Model, Static, TSchema } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import type { Rule } from "../../capability/rule";
 import type { ModelRegistry } from "../../config/model-registry";
@@ -86,6 +86,8 @@ export interface CustomToolContext {
 	abort(): void;
 	/** Settings instance for the current session. Prefer over the global singleton. */
 	settings?: Settings;
+	/** Fetch implementation for outbound HTTP; defaults to global fetch when omitted. */
+	fetch?: FetchImpl;
 	/** Whether to auto-approve all destructive tool operations (--auto-approve CLI flag) */
 	autoApprove?: boolean;
 }

package/src/extensibility/extensions/index.ts

@@ -5,6 +5,7 @@
 export type { SlashCommandInfo, SlashCommandLocation, SlashCommandSource } from "../slash-commands";
 export {
 	discoverAndLoadExtensions,
+	discoverExtensionPaths,
 	ExtensionRuntimeNotInitializedError,
 	loadExtensionFromFactory,
 	loadExtensions,

package/src/extensibility/extensions/loader.ts

@@ -475,16 +475,24 @@ async function discoverExtensionsInDir(dir: string): Promise<string[]> {
 
 	return discovered;
 }
-
 /**
- * Discover and load extensions from standard locations.
+ * Discover absolute paths of extensions to load, without importing or
+ * binding factories. Hot path on session startup — the scan walks native
+ * `.omp`/`.pi` extension capabilities, the installed-plugin tree, and any
+ * configured paths.
+ *
+ * Subagents reuse the parent's collected paths via the SDK's
+ * `preloadedExtensionPaths` option, then call {@link loadExtensions} themselves
+ * so each session rebuilds Extension instances bound to its OWN
+ * `ExtensionAPI` (cwd, eventBus, runtime). Forwarding the parent's
+ * `LoadExtensionsResult` directly would reuse handlers/tools/commands that
+ * closed over the parent's `cwd` and event bus.
  */
-export async function discoverAndLoadExtensions(
+export async function discoverExtensionPaths(
 	configuredPaths: string[],
 	cwd: string,
-	eventBus?: EventBus,
 	disabledExtensionIds: string[] = [],
-): Promise<LoadExtensionsResult> {
+): Promise<string[]> {
 	const allPaths: string[] = [];
 	const seen = new Set<string>();
 	const disabled = new Set(disabledExtensionIds);
@@ -545,5 +553,20 @@ export async function discoverAndLoadExtensions(
 		addPath(resolved);
 	}
 
-	return loadExtensions(allPaths, cwd, eventBus);
+	return allPaths;
+}
+
+/**
+ * Discover and load extensions from standard locations. Composed of
+ * {@link discoverExtensionPaths} (FS scan) + {@link loadExtensions}
+ * (per-session binding).
+ */
+export async function discoverAndLoadExtensions(
+	configuredPaths: string[],
+	cwd: string,
+	eventBus?: EventBus,
+	disabledExtensionIds: string[] = [],
+): Promise<LoadExtensionsResult> {
+	const paths = await discoverExtensionPaths(configuredPaths, cwd, disabledExtensionIds);
+	return loadExtensions(paths, cwd, eventBus);
 }