@howaboua/pi-codex-conversion 1.5.4 → 1.5.5-dev.22.90056d4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.5.5
+
+- Avoid registering disabled native `web_search` and `image_generation` tools so other extensions can own those names.
+- Preserve other extensions' `web_search` and `image_generation` tools when the matching Codex feature is off.
+- Added a `/codex status` toggle and settings UI option for hiding the Codex footer/statusline.
+
 ## 1.5.4
 
 - Added `/codex` settings UI.

package/README.md

@@ -42,6 +42,7 @@ Notably:
 Use `/codex` to change adapter settings.
 
 - `/codex all` — use the Codex tool and prompt adapter on every model
+- `/codex status` — toggle the footer/statusline entry
 - `/codex fast` — toggle priority service tier for the OpenAI Codex provider
 - `/codex search` — toggle native Codex web search
 - `/codex image` — toggle native Codex image generation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@howaboua/pi-codex-conversion",
-  "version": "1.5.4",
+  "version": "1.5.5-dev.22.90056d4",
   "description": "Codex-oriented tool and prompt adapter for pi coding agent",
   "type": "module",
   "repository": {

package/src/adapter/activation.ts

@@ -15,6 +15,7 @@ import { supportsNativeImageGeneration } from "../tools/image-generation-tool.ts
 import { supportsNativeWebSearch } from "../tools/web-search-tool.ts";
 
 const ADAPTER_TOOL_NAMES = [...CORE_ADAPTER_TOOL_NAMES, WEB_SEARCH_TOOL_NAME, IMAGE_GENERATION_TOOL_NAME, VIEW_IMAGE_TOOL_NAME];
+const ALWAYS_OWNED_ADAPTER_TOOL_NAMES = [...CORE_ADAPTER_TOOL_NAMES, VIEW_IMAGE_TOOL_NAME];
 
 export function syncAdapter(pi: ExtensionAPI, ctx: ExtensionContext, state: AdapterState): void {
 	if (shouldUseCodexAdapter(ctx, state.config)) {
@@ -29,32 +30,41 @@ export function shouldUseCodexAdapter(ctx: ExtensionContext, config: CodexConver
 }
 
 function enableAdapter(pi: ExtensionAPI, ctx: ExtensionContext, state: AdapterState): void {
-	const toolNames = mergeAdapterTools(pi.getActiveTools(), getAdapterToolNames(ctx, state.config));
+	const currentAdapterOwnedTools = getAdapterOwnedToolNames(state.config);
+	const adapterOwnedTools = state.enabled ? mergeToolNames(state.adapterOwnedToolNames ?? currentAdapterOwnedTools, currentAdapterOwnedTools) : currentAdapterOwnedTools;
+	const toolNames = mergeAdapterTools(pi.getActiveTools(), getAdapterToolNames(ctx, state.config), adapterOwnedTools);
 	if (!state.enabled) {
 		// Preserve the previous active set once so switching away from Codex-like
 		// models restores the user's existing Pi tool configuration. Strip adapter
 		// tools in case a fresh session starts from persisted/mixed active tools.
-		state.previousToolNames = stripAdapterTools(pi.getActiveTools());
+		state.previousToolNames = stripAdapterTools(pi.getActiveTools(), adapterOwnedTools);
 		state.enabled = true;
 	}
+	state.adapterOwnedToolNames = currentAdapterOwnedTools;
 	pi.setActiveTools(toolNames);
 	setStatus(ctx, true, state.config);
 }
 
 function disableAdapter(pi: ExtensionAPI, ctx: ExtensionContext, state: AdapterState): void {
 	const previousToolNames = state.previousToolNames && state.previousToolNames.length > 0 ? state.previousToolNames : DEFAULT_TOOL_NAMES;
-	const restoredTools = restoreTools(previousToolNames, pi.getActiveTools());
-	if (state.enabled || hasAdapterTools(pi.getActiveTools())) {
+	const adapterOwnedTools = state.adapterOwnedToolNames ?? getAdapterOwnedToolNames(state.config);
+	const restoredTools = restoreTools(previousToolNames, pi.getActiveTools(), adapterOwnedTools);
+	if (state.enabled || hasAdapterTools(pi.getActiveTools(), adapterOwnedTools)) {
 		pi.setActiveTools(restoredTools);
 	}
 	if (state.enabled) {
 		state.enabled = false;
+		state.adapterOwnedToolNames = undefined;
 	}
 	setStatus(ctx, false, state.config);
 }
 
 function setStatus(ctx: ExtensionContext, enabled: boolean, config: CodexConversionConfig): void {
 	if (!ctx.hasUI) return;
+	if (!config.statusLine) {
+		ctx.ui.setStatus(STATUS_KEY, undefined);
+		return;
+	}
 	const statusConfig = getStatusConfig(ctx, config);
 	ctx.ui.setStatus(STATUS_KEY, enabled ? buildStatusText(statusConfig) : undefined);
 }
@@ -85,25 +95,38 @@ function getAdapterToolNames(ctx: ExtensionContext, config: CodexConversionConfi
 	return toolNames;
 }
 
-export function mergeAdapterTools(activeTools: string[], adapterTools: string[]): string[] {
-	const preservedTools = activeTools.filter((toolName) => !DEFAULT_TOOL_NAMES.includes(toolName) && !ADAPTER_TOOL_NAMES.includes(toolName));
+function getAdapterOwnedToolNames(config: CodexConversionConfig): string[] {
+	return [
+		...ALWAYS_OWNED_ADAPTER_TOOL_NAMES,
+		...(config.webSearch ? [WEB_SEARCH_TOOL_NAME] : []),
+		...(config.imageGeneration ? [IMAGE_GENERATION_TOOL_NAME] : []),
+	];
+}
+
+function mergeToolNames(...toolNameGroups: string[][]): string[] {
+	return [...new Set(toolNameGroups.flat())];
+}
+
+export function mergeAdapterTools(activeTools: string[], adapterTools: string[], adapterOwnedTools: string[] = adapterTools): string[] {
+	const ownedTools = new Set([...ALWAYS_OWNED_ADAPTER_TOOL_NAMES, ...adapterTools, ...adapterOwnedTools]);
+	const preservedTools = activeTools.filter((toolName) => !DEFAULT_TOOL_NAMES.includes(toolName) && !ownedTools.has(toolName));
 	return [...adapterTools, ...preservedTools];
 }
 
-export function restoreTools(previousTools: string[], activeTools: string[]): string[] {
-	const restored = stripAdapterTools(previousTools);
+export function restoreTools(previousTools: string[], activeTools: string[], adapterOwnedTools: string[] = ADAPTER_TOOL_NAMES): string[] {
+	const restored = stripAdapterTools(previousTools, adapterOwnedTools);
 	for (const toolName of activeTools) {
-		if (!ADAPTER_TOOL_NAMES.includes(toolName) && !restored.includes(toolName)) {
+		if (!adapterOwnedTools.includes(toolName) && !restored.includes(toolName)) {
 			restored.push(toolName);
 		}
 	}
 	return restored;
 }
 
-export function stripAdapterTools(toolNames: string[]): string[] {
-	return toolNames.filter((toolName) => !ADAPTER_TOOL_NAMES.includes(toolName));
+export function stripAdapterTools(toolNames: string[], adapterOwnedTools: string[] = ADAPTER_TOOL_NAMES): string[] {
+	return toolNames.filter((toolName) => !adapterOwnedTools.includes(toolName));
 }
 
-function hasAdapterTools(activeTools: string[]): boolean {
-	return activeTools.some((toolName) => ADAPTER_TOOL_NAMES.includes(toolName));
+function hasAdapterTools(activeTools: string[], adapterOwnedTools: string[]): boolean {
+	return activeTools.some((toolName) => adapterOwnedTools.includes(toolName));
 }

package/src/adapter/config.ts

@@ -7,6 +7,7 @@ export type CodexVerbosity = "low" | "medium" | "high";
 export interface CodexConversionConfig {
 	fast: boolean;
 	imageGeneration: boolean;
+	statusLine: boolean;
 	useOnAllModels: boolean;
 	webSearch: boolean;
 	verbosity: CodexVerbosity;
@@ -16,6 +17,7 @@ export const CODEX_CONVERSION_CONFIG_BASENAME = "pi-codex-conversion.json";
 export const DEFAULT_CODEX_CONVERSION_CONFIG: CodexConversionConfig = {
 	fast: false,
 	imageGeneration: true,
+	statusLine: true,
 	useOnAllModels: false,
 	webSearch: true,
 	verbosity: "low",
@@ -47,6 +49,7 @@ export function readCodexConversionConfig(configPath: string = getCodexConversio
 		return {
 			fast: typeof parsed.fast === "boolean" ? parsed.fast : DEFAULT_CODEX_CONVERSION_CONFIG.fast,
 			imageGeneration: typeof parsed.imageGeneration === "boolean" ? parsed.imageGeneration : DEFAULT_CODEX_CONVERSION_CONFIG.imageGeneration,
+			statusLine: typeof parsed.statusLine === "boolean" ? parsed.statusLine : DEFAULT_CODEX_CONVERSION_CONFIG.statusLine,
 			useOnAllModels: typeof parsed.useOnAllModels === "boolean" ? parsed.useOnAllModels : DEFAULT_CODEX_CONVERSION_CONFIG.useOnAllModels,
 			webSearch: typeof parsed.webSearch === "boolean" ? parsed.webSearch : DEFAULT_CODEX_CONVERSION_CONFIG.webSearch,
 			verbosity: normalizeCodexVerbosity(parsed.verbosity) ?? DEFAULT_CODEX_CONVERSION_CONFIG.verbosity,

package/src/adapter/state.ts

@@ -4,6 +4,7 @@ import type { CodexConversionConfig } from "./config.ts";
 export interface AdapterState {
 	enabled: boolean;
 	cwd: string;
+	adapterOwnedToolNames?: string[];
 	previousToolNames?: string[];
 	promptSkills: PromptSkill[];
 	config: CodexConversionConfig;

package/src/codex-settings/command.ts

@@ -9,9 +9,9 @@ import { syncAdapter } from "../adapter/activation.ts";
 import type { AdapterState } from "../adapter/state.ts";
 import { openCodexSettingsScreen } from "./ui.ts";
 
-const CODEX_COMMAND_COMPLETIONS = ["all", "fast", "search", "image", "low", "medium", "high"] as const;
+const CODEX_COMMAND_COMPLETIONS = ["all", "status", "fast", "search", "image", "low", "medium", "high"] as const;
 
-export function registerCodexCommand(pi: ExtensionAPI, state: AdapterState): void {
+export function registerCodexCommand(pi: ExtensionAPI, state: AdapterState, onConfigApplied?: (config: CodexConversionConfig) => void): void {
 	function saveAndApply(ctx: ExtensionContext, nextConfig: CodexConversionConfig): boolean {
 		const writeResult = writeCodexConversionConfig(nextConfig);
 		if (!writeResult.ok) {
@@ -19,6 +19,7 @@ export function registerCodexCommand(pi: ExtensionAPI, state: AdapterState): voi
 			return false;
 		}
 		state.config = nextConfig;
+		onConfigApplied?.(nextConfig);
 		syncAdapter(pi, ctx, state);
 		return true;
 	}
@@ -37,7 +38,7 @@ export function registerCodexCommand(pi: ExtensionAPI, state: AdapterState): voi
 			}
 
 			if (arg) {
-				ctx.ui.notify("Usage: /codex, /codex all, /codex fast, /codex search, /codex image, /codex low|medium|high", "warning");
+				ctx.ui.notify("Usage: /codex, /codex all, /codex status, /codex fast, /codex search, /codex image, /codex low|medium|high", "warning");
 				return;
 			}
 
@@ -57,6 +58,7 @@ export function registerCodexCommand(pi: ExtensionAPI, state: AdapterState): voi
 function getCommandConfigUpdate(arg: string, config: CodexConversionConfig): CodexConversionConfig | undefined {
 	if (arg === "fast") return { ...config, fast: !config.fast };
 	if (arg === "all") return { ...config, useOnAllModels: !config.useOnAllModels };
+	if (arg === "status") return { ...config, statusLine: !config.statusLine };
 	if (arg === "search") return { ...config, webSearch: !config.webSearch };
 	if (arg === "image") return { ...config, imageGeneration: !config.imageGeneration };
 	const verbosity = normalizeCodexVerbosity(arg);
@@ -64,5 +66,5 @@ function getCommandConfigUpdate(arg: string, config: CodexConversionConfig): Cod
 }
 
 function formatCodexSettings(config: CodexConversionConfig): string {
-	return `Codex settings: all models ${config.useOnAllModels ? "on" : "off"}, fast ${config.fast ? "on" : "off"}, web search ${config.webSearch ? "on" : "off"}, image generation ${config.imageGeneration ? "on" : "off"}, verbosity ${config.verbosity}`;
+	return `Codex settings: all models ${config.useOnAllModels ? "on" : "off"}, statusline ${config.statusLine ? "on" : "off"}, fast ${config.fast ? "on" : "off"}, web search ${config.webSearch ? "on" : "off"}, image generation ${config.imageGeneration ? "on" : "off"}, verbosity ${config.verbosity}`;
 }

package/src/codex-settings/ui.ts

@@ -13,6 +13,7 @@ export async function openCodexSettingsScreen(ctx: ExtensionContext, options: Co
 	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"] },
@@ -27,6 +28,7 @@ export async function openCodexSettingsScreen(ctx: ExtensionContext, options: Co
 			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";

package/src/index.ts

@@ -44,6 +44,19 @@ 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;
+	let nativeImageGenerationRegistered = false;
+
+	function ensureOptionalNativeToolsRegistered(config = state.config): void {
+		if (config.webSearch && !nativeWebSearchRegistered) {
+			registerWebSearchTool(pi);
+			nativeWebSearchRegistered = true;
+		}
+		if (config.imageGeneration && !nativeImageGenerationRegistered) {
+			registerImageGenerationTool(pi);
+			nativeImageGenerationRegistered = true;
+		}
+	}
 
 	registerOpenAICodexCustomProvider(pi, {
 		getCurrentCwd: () => state.cwd,
@@ -51,9 +64,8 @@ export default function codexConversion(pi: ExtensionAPI) {
 	registerApplyPatchTool(pi);
 	registerExecCommandTool(pi, tracker, sessions);
 	registerWriteStdinTool(pi, sessions);
-	registerImageGenerationTool(pi);
-	registerWebSearchTool(pi);
-	registerCodexCommand(pi, state);
+	ensureOptionalNativeToolsRegistered();
+	registerCodexCommand(pi, state, ensureOptionalNativeToolsRegistered);
 
 	sessions.onSessionExit((sessionId) => {
 		tracker.recordSessionFinished(sessionId);
@@ -62,6 +74,7 @@ export default function codexConversion(pi: ExtensionAPI) {
 	pi.on("session_start", async (_event, ctx) => {
 		state.cwd = ctx.cwd;
 		state.config = readCodexConversionConfig();
+		ensureOptionalNativeToolsRegistered();
 		state.promptSkills = extractPiPromptSkills(ctx.getSystemPrompt());
 		registerViewImageTool(pi, { allowOriginalDetail: supportsOriginalImageDetail(ctx.model) });
 		clearApplyPatchRenderState();