pi-openai-toolkit 0.15.0 → 0.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-openai-toolkit",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "private": false,
   "type": "module",
   "engines": {

package/src/web-search/extension.ts

@@ -294,10 +294,12 @@ function createWebRunTool(deps: WebRunExecutorDependencies): ToolDefinition<
 	};
 }
 
+type StandaloneRegistrationState = "verified" | "excluded" | "unavailable";
+
 function verifyStandaloneRegistration(
 	pi: ExtensionAPI,
 	definition: ToolDefinition<typeof STANDALONE_WEB_RUN_PARAMETERS, AlphaSearchDetails>,
-): boolean {
+): StandaloneRegistrationState {
 	try {
 		const api = pi as ExtensionAPI & {
 			getAllTools?: () => Array<{
@@ -307,14 +309,17 @@ function verifyStandaloneRegistration(
 				promptGuidelines?: string[];
 			}>;
 		};
-		if (typeof api.getAllTools !== "function") return false;
+		if (typeof api.getAllTools !== "function") return "unavailable";
 		const actual = api.getAllTools().find((tool) => tool.name === WEB_RUN_TOOL_NAME);
-		return actual !== undefined &&
-			actual.description === definition.description &&
+		// Pi publishes only tools permitted by --tools/--exclude-tools/--no-tools.
+		// After successful registration, an absent definition means this session
+		// cannot use search; it is not a reason to abort ordinary model requests.
+		if (actual === undefined) return "excluded";
+		return actual.description === definition.description &&
 			actual.parameters === definition.parameters &&
-			actual.promptGuidelines === definition.promptGuidelines;
+			actual.promptGuidelines === definition.promptGuidelines ? "verified" : "unavailable";
 	} catch {
-		return false;
+		return "unavailable";
 	}
 }
 
@@ -399,8 +404,8 @@ export function registerWebSearchExtension(
 		standaloneRegistrationSucceeded = false;
 	}
 
-	function standaloneReady(): boolean {
-		if (!standaloneRegistrationSucceeded || !canManageActiveTools(pi)) return false;
+	function standaloneRegistrationState(): StandaloneRegistrationState {
+		if (!standaloneRegistrationSucceeded || !canManageActiveTools(pi)) return "unavailable";
 		// Recheck on every lifecycle boundary so a later extension cannot replace
 		// the definition after startup and leave a stale active name executable.
 		// Do not use getAllTools() during extension loading; lifecycle callbacks
@@ -408,6 +413,10 @@ export function registerWebSearchExtension(
 		return verifyStandaloneRegistration(pi, standaloneTool);
 	}
 
+	function standaloneReady(): boolean {
+		return standaloneRegistrationState() === "verified";
+	}
+
 	function readConfig(model: WebSearchModel | undefined, ctx?: ExtensionContext): ResolvedToolkitConfig {
 		const resolved = resolveToolkitConfig(loadConfig(), model);
 		if (ctx) notifyConfigIssues(ctx, resolved);
@@ -459,13 +468,15 @@ export function registerWebSearchExtension(
 		catch (error) { abortAndThrow(ctx, error instanceof Error ? error.message : "Invalid Web Search configuration."); }
 		const { config } = resolved;
 		const resolution = synchronizeResolved(ctx.model, resolved);
-		if (resolution.route === "standalone-alpha" && resolution.available && !standaloneReady()) {
+		const registration = standaloneRegistrationState();
+		if (resolution.route === "standalone-alpha" && resolution.available && registration === "unavailable") {
 			abortAndThrow(ctx, `${WEB_RUN_TOOL_NAME} is not registered by the toolkit; standalone Web Search request aborted.`);
 		}
 		const transformed = transformWebSearchPayload({
 			model: ctx.model,
 			config: config.webSearch,
 			payload: event.payload,
+			standaloneToolExcluded: registration === "excluded",
 		});
 		if (transformed.fatal) {
 			abortAndThrow(ctx, transformed.errorMessage ?? "Web Search route request aborted.");

package/src/web-search/payload.ts

@@ -49,8 +49,9 @@ function unavailableRouteTransform(
 function transformStandalonePayload(args: {
 	payload: JsonObject;
 	resolution: ReturnType<typeof resolveWebSearchRoute>;
+	standaloneToolExcluded?: boolean;
 }): WebSearchPayloadTransform {
-	const { payload, resolution } = args;
+	const { payload, resolution, standaloneToolExcluded = false } = args;
 	const toolsValue = payload.tools;
 	if (toolsValue !== undefined && !Array.isArray(toolsValue)) {
 		return {
@@ -77,6 +78,7 @@ function transformStandalonePayload(args: {
 	const normalizedTools = tools.filter((tool) => {
 		if (isLocalWebSearchFunction(tool) || isNativeWebSearchTool(tool)) return false;
 		if (!isStandaloneWebRunFunction(tool)) return true;
+		if (standaloneToolExcluded) return false;
 		standaloneToolCount += 1;
 		return standaloneToolCount === 1;
 	});
@@ -84,7 +86,7 @@ function transformStandalonePayload(args: {
 	const normalizedInclude = include.filter((item) => item !== WEB_SEARCH_SOURCE_INCLUDE);
 	const toolsChanged = normalizedTools.length !== tools.length;
 	const includeChanged = normalizedInclude.length !== include.length;
-	if (toolsValue !== undefined && !normalizedTools.some(isStandaloneWebRunFunction)) {
+	if (!standaloneToolExcluded && toolsValue !== undefined && !normalizedTools.some(isStandaloneWebRunFunction)) {
 		return {
 			payload,
 			outcome: "unavailable-route",
@@ -159,6 +161,8 @@ export function transformWebSearchPayload(args: {
 	model: WebSearchModel | undefined;
 	config: WebSearchConfig;
 	payload: unknown;
+	/** The host filtered a successfully registered web_run out of this session's tool catalog. */
+	standaloneToolExcluded?: boolean;
 }): WebSearchPayloadTransform {
 	const { model, config, payload } = args;
 	const resolution = resolveWebSearchRoute({ model, config });
@@ -195,7 +199,7 @@ export function transformWebSearchPayload(args: {
 				errorMessage: "Standalone Web Search requires an object provider payload.",
 			};
 		}
-		return transformStandalonePayload({ payload, resolution });
+		return transformStandalonePayload({ payload, resolution, standaloneToolExcluded: args.standaloneToolExcluded });
 	}
 
 	if (!isRecord(payload)) {