@howaboua/pi-codex-conversion 1.5.5 → 1.5.6-dev.32.699e826

package/src/codex-settings/ui.ts

@@ -1,67 +1,65 @@
-import { DynamicBorder, getSettingsListTheme, type ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { Box, Container, SettingsList, Spacer, Text, type SettingItem } from "@earendil-works/pi-tui";
-import { DEFAULT_CODEX_CONVERSION_CONFIG, normalizeCodexVerbosity, type CodexConversionConfig } from "../adapter/config.ts";
+import { getSettingsListTheme, type ExtensionContext, type Theme } from "@earendil-works/pi-coding-agent";
+import { SettingsList, truncateToWidth, type SettingItem } from "@earendil-works/pi-tui";
+import {
+	COMPACTION_MODELS,
+	COMPACTION_REASONING_LEVELS,
+	DEFAULT_CODEX_CONVERSION_CONFIG,
+	normalizeCodexVerbosity,
+	normalizeCompactionModel,
+	normalizeCompactionReasoning,
+	type CodexConversionConfig,
+} from "../adapter/config.ts";
 import { CHANGELOG_URL, DISCORD_URL, GITHUB_URL, ISSUE_URL, openExternalUrl } from "./links.ts";
 
 export interface CodexSettingsScreenOptions {
 	initialConfig: CodexConversionConfig;
 	onChange: (nextConfig: CodexConversionConfig) => boolean;
+	initialTab?: SettingsTab;
 }
 
+type SettingsTab = "general" | "compaction" | "overrides";
+
+const TAB_ORDER: readonly SettingsTab[] = ["general", "compaction", "overrides"];
+
 export async function openCodexSettingsScreen(ctx: ExtensionContext, options: CodexSettingsScreenOptions): Promise<void> {
 	let draft = { ...options.initialConfig };
+	let activeTab: SettingsTab = options.initialTab ?? "general";
+
 	await ctx.ui.custom<void>((tui, theme, _kb, done) => {
-		const buildItems = (): SettingItem[] => [
-			{ id: "useOnAllModels", label: "Use on all models", currentValue: draft.useOnAllModels ? "on" : "off", values: ["off", "on"] },
-			{ id: "statusLine", label: "Statusline", currentValue: draft.statusLine ? "on" : "off", values: ["off", "on"] },
-			{ id: "fast", label: "Fast mode", currentValue: draft.fast ? "on" : "off", values: ["off", "on"] },
-			{ id: "webSearch", label: "Web search", currentValue: draft.webSearch ? "on" : "off", values: ["off", "on"] },
-			{ id: "imageGeneration", label: "Image generation", currentValue: draft.imageGeneration ? "on" : "off", values: ["off", "on"] },
-			{ id: "verbosity", label: "Verbosity", currentValue: draft.verbosity, values: ["low", "medium", "high"] },
-		];
+		let settingsList = createSettingsList(activeTab, draft, options, (nextDraft) => {
+			draft = nextDraft;
+		}, done, () => tui.requestRender());
 
-		const container = new Container();
-		const panel = new Box(1, 0);
-		panel.addChild(new DynamicBorder((text) => theme.fg("accent", text)));
-		let settingsList: SettingsList;
-		settingsList = new SettingsList(buildItems(), 6, getSettingsListTheme(), (id, value) => {
-			const nextDraft = { ...draft };
-			const previousValue = buildItems().find((item) => item.id === id)?.currentValue;
-			if (id === "useOnAllModels") nextDraft.useOnAllModels = value === "on";
-			if (id === "statusLine") nextDraft.statusLine = value === "on";
-			if (id === "fast") nextDraft.fast = value === "on";
-			if (id === "webSearch") nextDraft.webSearch = value === "on";
-			if (id === "imageGeneration") nextDraft.imageGeneration = value === "on";
-			if (id === "verbosity") nextDraft.verbosity = normalizeCodexVerbosity(value) ?? DEFAULT_CODEX_CONVERSION_CONFIG.verbosity;
-			if (options.onChange(nextDraft)) {
+		const switchTab = () => {
+			const currentIndex = TAB_ORDER.indexOf(activeTab);
+			activeTab = TAB_ORDER[(currentIndex + 1) % TAB_ORDER.length] ?? "general";
+			settingsList = createSettingsList(activeTab, draft, options, (nextDraft) => {
 				draft = nextDraft;
-			} else if (previousValue !== undefined) {
-				settingsList.updateValue(id, previousValue);
-			}
+			}, done, () => tui.requestRender());
 			tui.requestRender();
-		}, () => done(undefined));
-		panel.addChild(settingsList);
-		panel.addChild(new DynamicBorder((text) => theme.fg("dim", text)));
-		panel.addChild(
-			new Text(
-				[
-					`${theme.bold("g")} github  ${theme.fg("dim", GITHUB_URL)}`,
-					`${theme.bold("c")} changes ${theme.fg("dim", CHANGELOG_URL)}`,
-					`${theme.bold("d")} discord ${theme.fg("dim", DISCORD_URL)}`,
-					`${theme.bold("i")} issue   ${theme.fg("dim", ISSUE_URL)}`,
-				].join("\n"),
-				0,
-				0,
-			),
-		);
-		panel.addChild(new DynamicBorder((text) => theme.fg("accent", text)));
-		container.addChild(new Spacer(1));
-		container.addChild(panel);
+		};
 
 		return {
-			render: (width: number) => container.render(width),
-			invalidate: () => container.invalidate(),
+			render: (width: number) =>
+				[
+					rule(width, theme, "accent"),
+					formatTabs(activeTab, theme),
+					rule(width, theme, "borderMuted"),
+					...(activeTab === "compaction" ? formatCompactionNotes(theme) : []),
+					...(activeTab === "overrides" ? formatOverridesNotes(theme) : []),
+					"",
+					...settingsList.render(width),
+					rule(width, theme, "borderMuted"),
+					...formatLinks(theme),
+					rule(width, theme, "accent"),
+					theme.fg("dim", "  Tab to switch sections · g/c/d/i open links"),
+				].map((line) => truncateToWidth(line, width, "")),
+			invalidate: () => settingsList.invalidate(),
 			handleInput: (data: string) => {
+				if (data === "\t") {
+					switchTab();
+					return;
+				}
 				if (handleLinkKey(data, ctx)) return;
 				settingsList.handleInput?.(data);
 				tui.requestRender();
@@ -70,6 +68,100 @@ export async function openCodexSettingsScreen(ctx: ExtensionContext, options: Co
 	});
 }
 
+function formatCompactionNotes(theme: Theme): string[] {
+	return [
+		theme.fg("dim", "  Beta: native OpenAI Responses compaction is experimental. Please report any issues."),
+		theme.fg("error", "  Warning: do not turn this off mid-session; old context may be much less reliable."),
+	];
+}
+
+function formatOverridesNotes(theme: Theme): string[] {
+	return [
+		theme.fg("dim", "  Advanced tool-surface overrides."),
+	];
+}
+
+function rule(width: number, theme: Theme, color: "accent" | "borderMuted"): string {
+	return theme.fg(color, "─".repeat(Math.max(0, width)));
+}
+
+function createSettingsList(
+	tab: SettingsTab,
+	draft: CodexConversionConfig,
+	options: CodexSettingsScreenOptions,
+	onDraftChanged: (draft: CodexConversionConfig) => void,
+	done: (value?: void) => void,
+	requestRender: () => void,
+): SettingsList {
+	let settingsList: SettingsList;
+	settingsList = new SettingsList(buildItems(tab, draft), 8, getSettingsListTheme(), (id, value) => {
+		const nextDraft = applySettingChange(id, value, draft);
+		const previousValue = buildItems(tab, draft).find((item) => item.id === id)?.currentValue;
+		if (options.onChange(nextDraft)) {
+			onDraftChanged(nextDraft);
+			draft = nextDraft;
+		} else if (previousValue !== undefined) {
+			settingsList.updateValue(id, previousValue);
+		}
+		requestRender();
+	}, () => done(undefined));
+	return settingsList;
+}
+
+function buildItems(tab: SettingsTab, draft: CodexConversionConfig): SettingItem[] {
+	if (tab === "compaction") {
+		return [
+			{ id: "responsesCompaction", label: "Responses compaction", currentValue: (draft.responsesCompaction ?? false) ? "on" : "off", values: ["off", "on"] },
+			{ id: "compactionModel", label: "Model", currentValue: draft.compactionModel, values: [...COMPACTION_MODELS] },
+			{ id: "compactionReasoning", label: "Reasoning", currentValue: draft.compactionReasoning, values: [...COMPACTION_REASONING_LEVELS] },
+		];
+	}
+
+	if (tab === "overrides") {
+		return [
+			{ id: "applyPatchOnly", label: "Apply patch only", currentValue: draft.applyPatchOnly ? "on" : "off", values: ["off", "on"] },
+		];
+	}
+
+	return [
+		{ id: "useOnAllModels", label: "Use on all models", currentValue: draft.useOnAllModels ? "on" : "off", values: ["off", "on"] },
+		{ id: "statusLine", label: "Statusline", currentValue: draft.statusLine ? "on" : "off", values: ["off", "on"] },
+		{ id: "fast", label: "Fast mode", currentValue: draft.fast ? "on" : "off", values: ["off", "on"] },
+		{ id: "webSearch", label: "Web search", currentValue: draft.webSearch ? "on" : "off", values: ["off", "on"] },
+		{ id: "imageGeneration", label: "Image generation", currentValue: draft.imageGeneration ? "on" : "off", values: ["off", "on"] },
+		{ id: "verbosity", label: "Verbosity", currentValue: draft.verbosity, values: ["low", "medium", "high"] },
+	];
+}
+
+function applySettingChange(id: string, value: string, draft: CodexConversionConfig): CodexConversionConfig {
+	const nextDraft = { ...draft };
+	if (id === "applyPatchOnly") nextDraft.applyPatchOnly = value === "on";
+	if (id === "useOnAllModels") nextDraft.useOnAllModels = value === "on";
+	if (id === "statusLine") nextDraft.statusLine = value === "on";
+	if (id === "fast") nextDraft.fast = value === "on";
+	if (id === "webSearch") nextDraft.webSearch = value === "on";
+	if (id === "imageGeneration") nextDraft.imageGeneration = value === "on";
+	if (id === "responsesCompaction") nextDraft.responsesCompaction = value === "on";
+	if (id === "compactionModel") nextDraft.compactionModel = normalizeCompactionModel(value) ?? DEFAULT_CODEX_CONVERSION_CONFIG.compactionModel;
+	if (id === "compactionReasoning") nextDraft.compactionReasoning = normalizeCompactionReasoning(value) ?? DEFAULT_CODEX_CONVERSION_CONFIG.compactionReasoning;
+	if (id === "verbosity") nextDraft.verbosity = normalizeCodexVerbosity(value) ?? DEFAULT_CODEX_CONVERSION_CONFIG.verbosity;
+	return nextDraft;
+}
+
+function formatTabs(activeTab: SettingsTab, theme: Theme): string {
+	const renderTab = (tab: SettingsTab, label: string) => activeTab === tab ? theme.bold(label) : theme.fg("dim", label);
+	return `  ${renderTab("general", "General")}  ${theme.fg("dim", "/")}  ${renderTab("compaction", "Compaction")}  ${theme.fg("dim", "/")}  ${renderTab("overrides", "Overrides")}`;
+}
+
+function formatLinks(theme: Theme): string[] {
+	return [
+		`${theme.bold("g")} github  ${theme.fg("dim", GITHUB_URL)}`,
+		`${theme.bold("c")} changes ${theme.fg("dim", CHANGELOG_URL)}`,
+		`${theme.bold("d")} discord ${theme.fg("dim", DISCORD_URL)}`,
+		`${theme.bold("i")} issue   ${theme.fg("dim", ISSUE_URL)}`,
+	];
+}
+
 function handleLinkKey(data: string, ctx: ExtensionContext): boolean {
 	const target = getLinkTarget(data);
 	if (!target) return false;

package/src/index.ts

@@ -1,26 +1,27 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Box, Text, truncateToWidth } from "@earendil-works/pi-tui";
 import { getCodexRuntimeShell } from "./adapter/runtime-shell.ts";
 import { clearApplyPatchRenderState, registerApplyPatchTool } from "./tools/apply-patch-tool.ts";
 import { createExecCommandTracker } from "./tools/exec-command-state.ts";
 import { registerExecCommandTool } from "./tools/exec-command-tool.ts";
 import { createExecSessionManager } from "./tools/exec-session-manager.ts";
-import {
-	IMAGE_SAVE_DISPLAY_MESSAGE_TYPE,
-	WEB_SEARCH_ACTIVITY_MESSAGE_TYPE,
-	registerOpenAICodexCustomProvider,
-} from "./providers/openai-codex-custom-provider.ts";
+import { registerOpenAICodexCustomProvider } from "./providers/openai-codex-custom-provider.ts";
 import { registerImageGenerationTool } from "./tools/image-generation-tool.ts";
 import { buildCodexSystemPrompt, extractPiPromptSkills, resolvePromptSkills } from "./prompt/build-system-prompt.ts";
 import { registerViewImageTool, supportsOriginalImageDetail } from "./tools/view-image-tool.ts";
-import { registerWebSearchTool, WEB_SEARCH_SESSION_NOTE_TYPE } from "./tools/web-search-tool.ts";
+import { registerWebSearchTool } from "./tools/web-search-tool.ts";
 import { registerWriteStdinTool } from "./tools/write-stdin-tool.ts";
 import { ensureBundledApplyPatchOnPath } from "./tools/apply-patch-binary.ts";
 import { readCodexConversionConfig } from "./adapter/config.ts";
 import { syncAdapter, mergeAdapterTools, restoreTools, stripAdapterTools, shouldUseCodexAdapter } from "./adapter/activation.ts";
 import { rewriteCodexProviderRequest } from "./adapter/provider-request.ts";
-import { getCodexSkillPaths } from "./adapter/skills.ts";
+import { handleCodexSessionBeforeCompact } from "./adapter/compaction.ts";
+import { isNativeCompactionDetails, NATIVE_COMPACTION_DISPLAY_MESSAGE_TYPE, NATIVE_COMPACTION_DISPLAY_TEXT } from "./adapter/types.ts";
+import { isAdapterContextExcludedCustomMessage } from "./adapter/context-filter.ts";
+import { getCodexSkillPaths, hasNoSkillsFlag } from "./adapter/skills.ts";
 import type { AdapterState } from "./adapter/state.ts";
 import { registerCodexCommand } from "./codex-settings/command.ts";
+import { WEB_SEARCH_TOOL_NAME } from "./adapter/tool-set.ts";
 
 function getCommandArg(args: unknown): string | undefined {
 	if (!args || typeof args !== "object" || !("cmd" in args) || typeof args.cmd !== "string") {
@@ -44,13 +45,16 @@ export default function codexConversion(pi: ExtensionAPI) {
 	const tracker = createExecCommandTracker();
 	const state: AdapterState = { enabled: false, cwd: process.cwd(), promptSkills: [], config: readCodexConversionConfig() };
 	const sessions = createExecSessionManager();
-	let nativeWebSearchRegistered = false;
+	const registeredNativeWebSearchTools = new Set<string>();
 	let nativeImageGenerationRegistered = false;
 
 	function ensureOptionalNativeToolsRegistered(config = state.config): void {
-		if (config.webSearch && !nativeWebSearchRegistered) {
-			registerWebSearchTool(pi);
-			nativeWebSearchRegistered = true;
+		if (config.webSearch) {
+			const webSearchToolName = WEB_SEARCH_TOOL_NAME;
+			if (!registeredNativeWebSearchTools.has(webSearchToolName)) {
+				registerWebSearchTool(pi, webSearchToolName);
+				registeredNativeWebSearchTools.add(webSearchToolName);
+			}
 		}
 		if (config.imageGeneration && !nativeImageGenerationRegistered) {
 			registerImageGenerationTool(pi);
@@ -60,6 +64,10 @@ export default function codexConversion(pi: ExtensionAPI) {
 
 	registerOpenAICodexCustomProvider(pi, {
 		getCurrentCwd: () => state.cwd,
+		getNativeToolRewriteConfig: () => ({
+			webSearch: !state.config.applyPatchOnly && state.config.webSearch,
+			imageGeneration: !state.config.applyPatchOnly && state.config.imageGeneration,
+		}),
 	});
 	registerApplyPatchTool(pi);
 	registerExecCommandTool(pi, tracker, sessions);
@@ -67,6 +75,16 @@ export default function codexConversion(pi: ExtensionAPI) {
 	ensureOptionalNativeToolsRegistered();
 	registerCodexCommand(pi, state, ensureOptionalNativeToolsRegistered);
 
+	pi.registerMessageRenderer(NATIVE_COMPACTION_DISPLAY_MESSAGE_TYPE, (message, _options, theme) => {
+		const box = new Box(1, 1, (text) => theme.bg("customMessageBg", text));
+		box.addChild(new Text(theme.fg("customMessageLabel", theme.bold("[compaction]")), 0, 0));
+		const content = typeof message.content === "string" ? message.content : NATIVE_COMPACTION_DISPLAY_TEXT;
+		box.addChild(new Text(`\n${theme.fg("customMessageText", content)}`, 0, 0));
+		const render = box.render.bind(box);
+		box.render = (width) => render(width).map((line) => truncateToWidth(line, width, ""));
+		return box;
+	});
+
 	sessions.onSessionExit((sessionId) => {
 		tracker.recordSessionFinished(sessionId);
 	});
@@ -83,6 +101,7 @@ export default function codexConversion(pi: ExtensionAPI) {
 	});
 
 	pi.on("resources_discover", async (event) => {
+		if (hasNoSkillsFlag()) return undefined;
 		const skillPaths = getCodexSkillPaths(event.cwd);
 		return skillPaths.length > 0 ? { skillPaths } : undefined;
 	});
@@ -124,7 +143,7 @@ export default function codexConversion(pi: ExtensionAPI) {
 		if (!shouldUseCodexAdapter(ctx, state.config)) {
 			return undefined;
 		}
-		const skills = resolvePromptSkills(event.systemPromptOptions?.skills, state.promptSkills);
+		const skills = resolvePromptSkills(event.systemPromptOptions?.skills, hasNoSkillsFlag() ? [] : state.promptSkills);
 		return {
 			systemPrompt: buildCodexSystemPrompt(event.systemPrompt, {
 				skills,
@@ -138,19 +157,25 @@ export default function codexConversion(pi: ExtensionAPI) {
 		return rewriteCodexProviderRequest(event.payload, ctx, state);
 	});
 
-	pi.on("context", async (event) => {
-		return {
-			messages: event.messages.filter(
-				(message) =>
-					!(
-						message.role === "custom" &&
-						(message.customType === WEB_SEARCH_SESSION_NOTE_TYPE ||
-							message.customType === WEB_SEARCH_ACTIVITY_MESSAGE_TYPE ||
-							message.customType === IMAGE_SAVE_DISPLAY_MESSAGE_TYPE)
-					),
-			),
-		};
+	pi.on("session_before_compact", async (event, ctx) => {
+		state.cwd = ctx.cwd;
+		return handleCodexSessionBeforeCompact(event, ctx, state, pi);
+	});
+
+	pi.on("session_compact", async (event) => {
+		if (!event.fromExtension || !isNativeCompactionDetails(event.compactionEntry.details)) return;
+		pi.sendMessage(
+			{
+				customType: NATIVE_COMPACTION_DISPLAY_MESSAGE_TYPE,
+				content: NATIVE_COMPACTION_DISPLAY_TEXT,
+				display: true,
+				details: { compactionEntryId: event.compactionEntry.id },
+			},
+			{ triggerTurn: false },
+		);
 	});
+
+	pi.on("context", async (event) => ({ messages: event.messages.filter((message) => !isAdapterContextExcludedCustomMessage(message)) }));
 }
 
 export { getCodexSkillPaths, mergeAdapterTools, restoreTools, stripAdapterTools };

package/src/providers/openai-codex-custom-provider.ts

@@ -17,8 +17,12 @@ import type { ResponseCreateParamsStreaming } from "openai/resources/responses/r
 import {
 	convertResponsesMessages,
 	convertResponsesTools,
+	CODEX_TOOL_CALL_PROVIDERS,
 	processResponsesStream,
 } from "./openai-responses-shared.ts";
+import { WEB_SEARCH_TOOL_NAME } from "../adapter/tool-set.ts";
+import { rewriteNativeImageGenerationTool } from "../tools/image-generation-tool.ts";
+import { rewriteNativeWebSearchTool } from "../tools/web-search-tool.ts";
 
 const DEFAULT_CODEX_BASE_URL = "https://chatgpt.com/backend-api";
 const JWT_CLAIM_PATH = "https://api.openai.com/auth";
@@ -28,7 +32,6 @@ const OPENAI_CODEX_IMAGE_DIR = ".pi/openai-codex-images";
 const OPENAI_CODEX_LATEST_IMAGE_NAME = "latest.png";
 const MAX_RETRIES = 3;
 const BASE_DELAY_MS = 1000;
-const CODEX_TOOL_CALL_PROVIDERS = new Set(["openai", "openai-codex", "opencode"]);
 const CODEX_RESPONSE_STATUSES = new Set(["completed", "incomplete", "failed", "cancelled", "queued", "in_progress"]);
 const OPENAI_BETA_RESPONSES_WEBSOCKETS = "responses_websockets=2026-02-06";
 const WEBSOCKET_MESSAGE_TOO_BIG_CLOSE_CODE = 1009;
@@ -109,6 +112,19 @@ interface SessionWebSocketCacheEntry {
 	continuation?: CachedWebSocketContinuationState;
 }
 
+export interface OpenAICodexWebSocketDebugStats {
+	requests: number;
+	connectionsCreated: number;
+	connectionsReused: number;
+	cachedContextRequests: number;
+	storeTrueRequests: number;
+	fullContextRequests: number;
+	deltaRequests: number;
+	lastInputItems: number;
+	lastDeltaInputItems?: number;
+	lastPreviousResponseId?: string;
+}
+
 interface AcquiredWebSocket {
 	socket: WebSocketLike;
 	entry?: SessionWebSocketCacheEntry;
@@ -166,6 +182,38 @@ interface ResponseEnvelope {
 type ServiceTier = ResponseCreateParamsStreaming["service_tier"];
 
 const websocketSessionCache = new Map<string, SessionWebSocketCacheEntry>();
+const websocketDebugStats = new Map<string, OpenAICodexWebSocketDebugStats>();
+
+function getOrCreateWebSocketDebugStats(sessionId: string): OpenAICodexWebSocketDebugStats {
+	let stats = websocketDebugStats.get(sessionId);
+	if (!stats) {
+		stats = {
+			requests: 0,
+			connectionsCreated: 0,
+			connectionsReused: 0,
+			cachedContextRequests: 0,
+			storeTrueRequests: 0,
+			fullContextRequests: 0,
+			deltaRequests: 0,
+			lastInputItems: 0,
+		};
+		websocketDebugStats.set(sessionId, stats);
+	}
+	return stats;
+}
+
+export function getOpenAICodexWebSocketDebugStats(sessionId: string): OpenAICodexWebSocketDebugStats | undefined {
+	const stats = websocketDebugStats.get(sessionId);
+	return stats ? { ...stats } : undefined;
+}
+
+export function resetOpenAICodexWebSocketDebugStats(sessionId?: string): void {
+	if (sessionId) {
+		websocketDebugStats.delete(sessionId);
+		return;
+	}
+	websocketDebugStats.clear();
+}
 
 class NonRetryableProviderError extends Error {}
 
@@ -550,7 +598,7 @@ export function buildRequestBody<TApi extends Api>(model: Model<TApi>, context:
 
 	if (context.tools && context.tools.length > 0) {
 		body.tools = convertResponsesTools(context.tools, { strict: null });
-		const hasWebSearchTool = context.tools.some((tool) => tool.name === "web_search");
+		const hasWebSearchTool = context.tools.some((tool) => tool.name === WEB_SEARCH_TOOL_NAME);
 		if (hasWebSearchTool) {
 			body.include.push("web_search_call.action.sources", "web_search_call.results");
 		}
@@ -680,6 +728,7 @@ export function closeOpenAICodexWebSocketSessions(sessionId?: string): void {
 		const entry = websocketSessionCache.get(sessionId);
 		if (entry) closeEntry(entry);
 		websocketSessionCache.delete(sessionId);
+		websocketDebugStats.delete(sessionId);
 		return;
 	}
 
@@ -687,6 +736,7 @@ export function closeOpenAICodexWebSocketSessions(sessionId?: string): void {
 		closeEntry(entry);
 	}
 	websocketSessionCache.clear();
+	websocketDebugStats.clear();
 }
 
 
@@ -1230,7 +1280,7 @@ async function processWebSocketStream<TApi extends Api>(
 	let streamStarted = false;
 
 	for (let attempt = 0; attempt < 2; attempt++) {
-		const { socket, entry, release } = await acquireWebSocket(url, headers, options?.sessionId, options?.signal);
+		const { socket, entry, reused, release } = await acquireWebSocket(url, headers, options?.sessionId, options?.signal);
 		let keepConnection = true;
 		let released = false;
 		let eventCount = 0;
@@ -1240,6 +1290,24 @@ async function processWebSocketStream<TApi extends Api>(
 		// WebSocket continuation still works via connection-scoped previous_response_id state.
 		const fullBody = body;
 		const requestBody = useCachedContext && entry ? buildCachedWebSocketRequestBody(entry, fullBody) : fullBody;
+		const stats = options?.sessionId ? getOrCreateWebSocketDebugStats(options.sessionId) : undefined;
+		if (stats) {
+			stats.requests++;
+			if (reused) stats.connectionsReused++;
+			else stats.connectionsCreated++;
+			if (useCachedContext) stats.cachedContextRequests++;
+			if (requestBody.store === true) stats.storeTrueRequests++;
+			stats.lastInputItems = requestBody.input?.length ?? 0;
+			if (requestBody.previous_response_id) {
+				stats.deltaRequests++;
+				stats.lastDeltaInputItems = requestBody.input?.length ?? 0;
+				stats.lastPreviousResponseId = requestBody.previous_response_id;
+			} else {
+				stats.fullContextRequests++;
+				stats.lastDeltaInputItems = undefined;
+				stats.lastPreviousResponseId = undefined;
+			}
+		}
 
 		const releaseOnce = (releaseOptions?: { keep?: boolean }) => {
 			if (released) return;
@@ -1472,6 +1540,7 @@ function createCodexStream<TApi extends Api>(
 	options: SimpleStreamOptions | undefined,
 	deps: {
 		getCurrentCwd: () => string;
+		getNativeToolRewriteConfig?: () => { webSearch: boolean; imageGeneration: boolean };
 		onImageSaved?: (savedImage: SavedGeneratedImage, imageData: { data: string; mimeType: string }) => void;
 		onWebSearchCaptured?: (search: SurfacedWebSearch) => void;
 	},
@@ -1495,6 +1564,13 @@ function createCodexStream<TApi extends Api>(
 			if (nextBody !== undefined) {
 				body = nextBody as ResponsesBody;
 			}
+			const nativeToolRewriteConfig = deps.getNativeToolRewriteConfig?.();
+			if (nativeToolRewriteConfig?.webSearch) {
+				body = rewriteNativeWebSearchTool(body, model) as ResponsesBody;
+			}
+			if (nativeToolRewriteConfig?.imageGeneration) {
+				body = rewriteNativeImageGenerationTool(body, model) as ResponsesBody;
+			}
 
 			const websocketRequestId = options?.sessionId || createCodexRequestId();
 			const sseHeaders = buildSSEHeaders(model.headers, options?.headers, accountId, apiKey, options?.sessionId);
@@ -1626,7 +1702,7 @@ function createCodexStream<TApi extends Api>(
 	return stream;
 }
 
-export function registerOpenAICodexCustomProvider(pi: ExtensionAPI, options: { getCurrentCwd: () => string }): void {
+export function registerOpenAICodexCustomProvider(pi: ExtensionAPI, options: { getCurrentCwd: () => string; getNativeToolRewriteConfig?: () => { webSearch: boolean; imageGeneration: boolean } }): void {
 	const pendingActivities: PendingActivity[] = [];
 	const imagePreviewCache = new Map<string, CachedImagePreview>();
 	let pendingFlushTimer: ReturnType<typeof setTimeout> | undefined;
@@ -1688,6 +1764,7 @@ export function registerOpenAICodexCustomProvider(pi: ExtensionAPI, options: { g
 		streamSimple: (model, context, streamOptions) =>
 			createCodexStream(model, context, streamOptions, {
 				getCurrentCwd: options.getCurrentCwd,
+				getNativeToolRewriteConfig: options.getNativeToolRewriteConfig,
 				onImageSaved: (savedImage, imageData) => {
 					pendingActivities.push({ kind: "image", savedImage, imageData });
 				},

package/src/providers/openai-responses-shared.ts

@@ -40,6 +40,8 @@ interface ConvertResponsesToolsOptions {
 	strict?: boolean | null;
 }
 
+export const CODEX_TOOL_CALL_PROVIDERS = new Set(["openai", "openai-codex", "opencode"]);
+
 function shortHash(str: string): string {
 	let h1 = 0xdeadbeef;
 	let h2 = 0x41c6ce57;

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

@@ -2,10 +2,11 @@ import type { ExtensionAPI, ExtensionContext, ToolDefinition } from "@earendil-w
 import { Type } from "typebox";
 import { Container, Text } from "@earendil-works/pi-tui";
 import { isOpenAICodexModel } from "../adapter/codex-model.ts";
+import { WEB_SEARCH_TOOL_NAME } from "../adapter/tool-set.ts";
 
-export const WEB_SEARCH_UNSUPPORTED_MESSAGE = "web_search is only available with the openai-codex provider";
+export const WEB_SEARCH_UNSUPPORTED_MESSAGE = "web.run 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";
+	"web.run is a native openai-codex provider tool and should not execute locally";
 export const WEB_SEARCH_SESSION_NOTE_TYPE = "codex-web-search-session-note";
 const WEB_SEARCH_MULTIMODAL_CONTENT_TYPES = ["text", "image"] as const;
 
@@ -20,6 +21,7 @@ interface FunctionToolPayload {
 }
 
 interface ResponsesPayload {
+	include?: unknown;
 	tools?: unknown[];
 	[key: string]: unknown;
 }
@@ -43,7 +45,7 @@ export function supportsMultimodalNativeWebSearch(model: ExtensionContext["model
 }
 
 function isWebSearchFunctionTool(tool: unknown): tool is FunctionToolPayload {
-	return !!tool && typeof tool === "object" && (tool as FunctionToolPayload).type === "function" && (tool as FunctionToolPayload).name === "web_search";
+	return !!tool && typeof tool === "object" && (tool as FunctionToolPayload).type === "function" && (tool as FunctionToolPayload).name === WEB_SEARCH_TOOL_NAME;
 }
 
 function createEmptyResultComponent(): Container {
@@ -80,17 +82,28 @@ export function rewriteNativeWebSearchTool(payload: unknown, model: ExtensionCon
 	if (!rewritten) {
 		return payload;
 	}
+	const existingInclude: unknown[] = Array.isArray((payload as ResponsesPayload).include)
+		? [...((payload as ResponsesPayload).include as unknown[])]
+		: [];
+	const include = [
+		...existingInclude,
+		...[
+			"web_search_call.action.sources",
+			"web_search_call.results",
+		].filter((item) => !existingInclude.includes(item)),
+	];
 
 	return {
 		...(payload as ResponsesPayload),
+		include,
 		tools: nextTools,
 	};
 }
 
-export function createWebSearchTool(): ToolDefinition<typeof WEB_SEARCH_PARAMETERS> {
+export function createWebSearchTool(name: string = WEB_SEARCH_TOOL_NAME): ToolDefinition<typeof WEB_SEARCH_PARAMETERS> {
 	return {
-		name: "web_search",
-		label: "web_search",
+		name,
+		label: name,
 		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:
@@ -104,7 +117,7 @@ export function createWebSearchTool(): ToolDefinition<typeof WEB_SEARCH_PARAMETE
 			throw new Error(WEB_SEARCH_LOCAL_EXECUTION_MESSAGE);
 		},
 		renderCall(_args, theme) {
-			return new Text(`${theme.fg("toolTitle", theme.bold("web_search"))}`, 0, 0);
+			return new Text(`${theme.fg("toolTitle", theme.bold(name))}`, 0, 0);
 		},
 		renderResult(result, { expanded }, theme) {
 			if (!expanded) {
@@ -117,6 +130,6 @@ export function createWebSearchTool(): ToolDefinition<typeof WEB_SEARCH_PARAMETE
 	};
 }
 
-export function registerWebSearchTool(pi: ExtensionAPI): void {
-	pi.registerTool(createWebSearchTool());
+export function registerWebSearchTool(pi: ExtensionAPI, name: string = WEB_SEARCH_TOOL_NAME): void {
+	pi.registerTool(createWebSearchTool(name));
 }