@howaboua/pi-codex-conversion 1.0.4 → 1.0.6

package/README.md

@@ -10,6 +10,9 @@ This package replaces Pi's default Codex/GPT experience with a narrower Codex-li
 
 ![Available tools](./available-tools.png)
 
+> [!NOTE]
+> Native OpenAI Codex Responses web search runs silently. Pi does not expose native web-search usage events to extensions, so the adapter shows a one-time session notice instead of per-search tool-call history.
+
 ## Active tools in adapter mode
 
 When the adapter is active, the LLM sees these tools:
@@ -55,6 +58,7 @@ npm run check
 - `write_stdin({ session_id, chars: "y\\n" })` renders like `Interacted with background terminal`
 - `view_image({ path: "/absolute/path/to/screenshot.png" })` is available on image-capable models
 - `web_search` is surfaced only on `openai-codex`, and the adapter rewrites it into the native OpenAI Responses `type: "web_search"` payload instead of executing a local function tool
+- when native web search is available, the adapter shows a one-time session notice; individual searches are not surfaced because Pi does not expose native web-search execution events to extensions
 
 Raw command output is still available by expanding the tool result.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@howaboua/pi-codex-conversion",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Codex-oriented tool and prompt adapter for pi coding agent",
   "type": "module",
   "repository": {

package/src/index.ts

@@ -8,12 +8,13 @@ import { createExecSessionManager } from "./tools/exec-session-manager.ts";
 import { buildCodexSystemPrompt, extractPiPromptSkills, type PromptSkill } from "./prompt/build-system-prompt.ts";
 import { registerViewImageTool, supportsOriginalImageDetail } from "./tools/view-image-tool.ts";
 import {
-	WEB_SEARCH_ACTIVITY_MESSAGE_TYPE,
-	payloadContainsWebSearchTool,
-	registerWebSearchMessageRenderer,
 	registerWebSearchTool,
+	registerWebSearchSessionNoteRenderer,
 	rewriteNativeWebSearchTool,
+	shouldShowWebSearchSessionNote,
 	supportsNativeWebSearch,
+	WEB_SEARCH_SESSION_NOTE_TEXT,
+	WEB_SEARCH_SESSION_NOTE_TYPE,
 } from "./tools/web-search-tool.ts";
 import { registerWriteStdinTool } from "./tools/write-stdin-tool.ts";
 
@@ -21,7 +22,7 @@ interface AdapterState {
 	enabled: boolean;
 	previousToolNames?: string[];
 	promptSkills: PromptSkill[];
-	pendingWebSearchCount: number;
+	webSearchNoticeShown: boolean;
 }
 
 const ADAPTER_TOOL_NAMES = [...CORE_ADAPTER_TOOL_NAMES, VIEW_IMAGE_TOOL_NAME, WEB_SEARCH_TOOL_NAME];
@@ -35,20 +36,21 @@ function getCommandArg(args: unknown): string | undefined {
 
 export default function codexConversion(pi: ExtensionAPI) {
 	const tracker = createExecCommandTracker();
-	const state: AdapterState = { enabled: false, promptSkills: [], pendingWebSearchCount: 0 };
+	const state: AdapterState = { enabled: false, promptSkills: [], webSearchNoticeShown: false };
 	const sessions = createExecSessionManager();
 
 	registerApplyPatchTool(pi);
 	registerExecCommandTool(pi, tracker, sessions);
 	registerWriteStdinTool(pi, sessions);
 	registerWebSearchTool(pi);
-	registerWebSearchMessageRenderer(pi);
+	registerWebSearchSessionNoteRenderer(pi);
 
 	sessions.onSessionExit((_sessionId, command) => {
 		tracker.recordCommandFinished(command);
 	});
 
 	pi.on("session_start", async (_event, ctx) => {
+		state.webSearchNoticeShown = false;
 		syncAdapter(pi, ctx, state);
 	});
 
@@ -84,39 +86,19 @@ export default function codexConversion(pi: ExtensionAPI) {
 		};
 	});
 
-	pi.on("context", async (event) => {
-		return {
-			messages: event.messages.filter(
-				(message) => !(message.role === "custom" && message.customType === WEB_SEARCH_ACTIVITY_MESSAGE_TYPE),
-			),
-		};
-	});
-
-	pi.on("turn_start", async () => {
-		state.pendingWebSearchCount = 0;
-	});
-
 	pi.on("before_provider_request", async (event, ctx) => {
 		if (!isOpenAICodexContext(ctx)) {
 			return undefined;
 		}
-		if (payloadContainsWebSearchTool(event.payload)) {
-			state.pendingWebSearchCount += 1;
-		}
 		return rewriteNativeWebSearchTool(event.payload, ctx.model);
 	});
 
-	pi.on("agent_end", async () => {
-		if (state.pendingWebSearchCount <= 0) {
-			return;
-		}
-		pi.sendMessage({
-			customType: WEB_SEARCH_ACTIVITY_MESSAGE_TYPE,
-			content: "",
-			display: true,
-			details: { count: state.pendingWebSearchCount },
-		});
-		state.pendingWebSearchCount = 0;
+	pi.on("context", async (event) => {
+		return {
+			messages: event.messages.filter(
+				(message) => !(message.role === "custom" && message.customType === WEB_SEARCH_SESSION_NOTE_TYPE),
+			),
+		};
 	});
 }
 
@@ -124,6 +106,7 @@ function syncAdapter(pi: ExtensionAPI, ctx: ExtensionContext, state: AdapterStat
 	state.promptSkills = extractPiPromptSkills(ctx.getSystemPrompt());
 
 	registerViewImageTool(pi, { allowOriginalDetail: supportsOriginalImageDetail(ctx.model) });
+	maybeShowWebSearchSessionNote(pi, ctx, state);
 
 	if (isCodexLikeContext(ctx)) {
 		enableAdapter(pi, ctx, state);
@@ -190,3 +173,15 @@ export function restoreTools(previousTools: string[], activeTools: string[]): st
 function hasAdapterTools(activeTools: string[]): boolean {
 	return activeTools.some((toolName) => ADAPTER_TOOL_NAMES.includes(toolName));
 }
+
+function maybeShowWebSearchSessionNote(pi: ExtensionAPI, ctx: ExtensionContext, state: AdapterState): void {
+	if (!shouldShowWebSearchSessionNote(ctx.model, ctx.hasUI, state.webSearchNoticeShown)) {
+		return;
+	}
+	pi.sendMessage({
+		customType: WEB_SEARCH_SESSION_NOTE_TYPE,
+		content: WEB_SEARCH_SESSION_NOTE_TEXT,
+		display: true,
+	});
+	state.webSearchNoticeShown = true;
+}

package/src/prompt/build-system-prompt.ts

@@ -4,24 +4,12 @@ export interface PromptSkill {
 	filePath: string;
 }
 
-const PI_INTRO =
-	"You are an expert coding assistant operating inside pi, a coding agent harness. You help users by reading files, executing commands, editing code, and writing new files.";
-const CODEX_INTRO =
-	"You are Codex running inside pi, a coding agent harness. Work directly in the user's workspace and finish the task end-to-end when feasible.";
-
 const CODEX_GUIDELINES = [
 	"Use `parallel` only when tool calls are independent and can safely run at the same time.",
 	"Use `write_stdin` when an exec session returns `session_id`, and continue until `exit_code` is present.",
 	"Do not request `tty` unless interactive terminal behavior is required.",
 ];
 
-function rewriteIntro(prompt: string): string {
-	if (!prompt.startsWith(PI_INTRO)) {
-		return prompt;
-	}
-	return `${CODEX_INTRO}${prompt.slice(PI_INTRO.length)}`;
-}
-
 function insertBeforeTrailingContext(prompt: string, section: string): string {
 	const currentDateIndex = prompt.lastIndexOf("\nCurrent date:");
 	if (currentDateIndex !== -1) {
@@ -114,5 +102,5 @@ function injectGuidelines(prompt: string): string {
 }
 
 export function buildCodexSystemPrompt(basePrompt: string, options: { skills?: PromptSkill[]; shell?: string } = {}): string {
-	return injectShell(injectSkills(injectGuidelines(rewriteIntro(basePrompt)), options.skills ?? []), options.shell);
+	return injectShell(injectSkills(injectGuidelines(basePrompt), options.skills ?? []), options.shell);
 }

package/src/tools/codex-rendering.ts

@@ -32,14 +32,6 @@ export function renderWriteStdinCall(
 	return text;
 }
 
-export function renderWebSearchActivity(count: number, theme: RenderTheme, expanded = false): string {
-	let text = `${theme.fg("dim", "•")} ${theme.bold("Searched the web")}`;
-	if (expanded && count > 1) {
-		text += `\n${theme.fg("dim", "  └ ")}${theme.fg("muted", `${count} web searches in this turn`)}`;
-	}
-	return text;
-}
-
 function renderExplorationText(actions: ShellAction[], state: ExecCommandStatus, theme: RenderTheme): string {
 	const header = state === "running" ? "Exploring" : "Explored";
 	let text = `${theme.fg("dim", "•")} ${theme.bold(header)}`;

package/src/tools/web-search-tool.ts

@@ -2,14 +2,19 @@ import type { ExtensionAPI, ExtensionContext, ToolDefinition } from "@mariozechn
 import { Type } from "@sinclair/typebox";
 import { Box, Text } from "@mariozechner/pi-tui";
 import { isOpenAICodexModel } from "../adapter/codex-model.ts";
-import { renderWebSearchActivity } from "./codex-rendering.ts";
 
 export const WEB_SEARCH_UNSUPPORTED_MESSAGE = "web_search is only available with the openai-codex provider";
 const WEB_SEARCH_LOCAL_EXECUTION_MESSAGE =
 	"web_search is a native openai-codex provider tool and should not execute locally";
-export const WEB_SEARCH_ACTIVITY_MESSAGE_TYPE = "codex-web-search";
+export const WEB_SEARCH_SESSION_NOTE_TYPE = "codex-web-search-session-note";
+export const WEB_SEARCH_SESSION_NOTE_TEXT =
+	"Native OpenAI Codex web search is enabled for this session. Search runs silently and is not surfaced as a separate tool call.";
+const WEB_SEARCH_MULTIMODAL_CONTENT_TYPES = ["text", "image"] as const;
 
-const WEB_SEARCH_PARAMETERS = Type.Object({}, { additionalProperties: false });
+const WEB_SEARCH_PARAMETERS = Type.Unsafe<Record<string, never>>({
+	type: "object",
+	additionalProperties: false,
+});
 
 interface FunctionToolPayload {
 	type?: unknown;
@@ -21,14 +26,32 @@ interface ResponsesPayload {
 	[key: string]: unknown;
 }
 
-export interface WebSearchActivityDetails {
-	count: number;
+interface ResponsesWebSearchTool {
+	type: "web_search";
+	external_web_access: true;
+	search_content_types?: string[];
 }
 
 export function supportsNativeWebSearch(model: ExtensionContext["model"]): boolean {
 	return isOpenAICodexModel(model);
 }
 
+export function shouldShowWebSearchSessionNote(
+	model: ExtensionContext["model"],
+	hasUI: boolean,
+	alreadyShown: boolean,
+): boolean {
+	return hasUI && !alreadyShown && supportsNativeWebSearch(model);
+}
+
+export function supportsMultimodalNativeWebSearch(model: ExtensionContext["model"]): boolean {
+	if (!supportsNativeWebSearch(model)) {
+		return false;
+	}
+	const id = (model?.id ?? "").toLowerCase();
+	return !id.includes("spark");
+}
+
 function isWebSearchFunctionTool(tool: unknown): tool is FunctionToolPayload {
 	return !!tool && typeof tool === "object" && (tool as FunctionToolPayload).type === "function" && (tool as FunctionToolPayload).name === "web_search";
 }
@@ -50,10 +73,14 @@ export function rewriteNativeWebSearchTool(payload: unknown, model: ExtensionCon
 		}
 		rewritten = true;
 		// Match Codex's native tool shape rather than exposing a synthetic function tool.
-		return {
+		const nativeTool: ResponsesWebSearchTool = {
 			type: "web_search",
 			external_web_access: true,
 		};
+		if (supportsMultimodalNativeWebSearch(model)) {
+			nativeTool.search_content_types = [...WEB_SEARCH_MULTIMODAL_CONTENT_TYPES];
+		}
+		return nativeTool;
 	});
 
 	if (!rewritten) {
@@ -66,28 +93,14 @@ export function rewriteNativeWebSearchTool(payload: unknown, model: ExtensionCon
 	};
 }
 
-export function payloadContainsWebSearchTool(payload: unknown): boolean {
-	if (!payload || typeof payload !== "object") {
-		return false;
-	}
-	const tools = (payload as ResponsesPayload).tools;
-	if (!Array.isArray(tools)) {
-		return false;
-	}
-	return tools.some(
-		(tool) =>
-			!!tool &&
-			typeof tool === "object" &&
-			(("type" in tool && (tool as { type?: unknown }).type === "web_search") || isWebSearchFunctionTool(tool)),
-	);
-}
-
 export function createWebSearchTool(): ToolDefinition<typeof WEB_SEARCH_PARAMETERS> {
 	return {
 		name: "web_search",
 		label: "web_search",
-		description: "Search the internet for sources related to the prompt.",
-		promptSnippet: "Search the internet for sources related to the prompt.",
+		description:
+			"Search the web for sources relevant to the current task. Use it when you need up-to-date information, external references, or broader context beyond the workspace.",
+		promptSnippet:
+			"Search the web for sources relevant to the current task. Use it when you need up-to-date information, external references, or broader context beyond the workspace.",
 		parameters: WEB_SEARCH_PARAMETERS,
 		async execute(_toolCallId, _params, _signal, _onUpdate, ctx) {
 			if (!supportsNativeWebSearch(ctx.model)) {
@@ -113,11 +126,11 @@ export function registerWebSearchTool(pi: ExtensionAPI): void {
 	pi.registerTool(createWebSearchTool());
 }
 
-export function registerWebSearchMessageRenderer(pi: ExtensionAPI): void {
-	pi.registerMessageRenderer<WebSearchActivityDetails>(WEB_SEARCH_ACTIVITY_MESSAGE_TYPE, (message, { expanded }, theme) => {
-		const count = typeof message.details?.count === "number" ? message.details.count : 1;
+export function registerWebSearchSessionNoteRenderer(pi: ExtensionAPI): void {
+	pi.registerMessageRenderer(WEB_SEARCH_SESSION_NOTE_TYPE, (_message, _options, theme) => {
 		const box = new Box(1, 1, (text) => theme.bg("toolSuccessBg", text));
-		box.addChild(new Text(renderWebSearchActivity(count, theme, expanded), 0, 0));
+		box.addChild(new Text(theme.bold("Web search enabled"), 0, 0));
+		box.addChild(new Text(`\n${theme.fg("dim", WEB_SEARCH_SESSION_NOTE_TEXT)}`, 0, 0));
 		return box;
 	});
 }