@howaboua/pi-codex-conversion 1.0.29 → 1.0.31-dev.3.4b87b70

package/README.md

@@ -9,7 +9,7 @@ This package replaces Pi's default Codex/GPT experience with a narrower Codex-li
 - preserves Pi's composed system prompt and applies a narrow Codex-oriented delta on top
 - renders exec activity with Codex-style command and background-terminal labels
 - renders `apply_patch` calls with Codex-style `Added` / `Edited` / `Deleted` diff blocks and Pi-style colored diff lines
-- targets modern Pi tool/rendering APIs and is aligned with Pi `0.72.x`
+- targets modern Pi tool/rendering APIs and is aligned with Pi `0.74.x` / the `@earendil-works/*` package scope
 
 ![Available tools](./available-tools.png)
 

package/bin/apply_patch

@@ -0,0 +1,30 @@
+#!/usr/bin/env node
+import { spawnSync } from "node:child_process";
+import { existsSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const root = dirname(dirname(fileURLToPath(import.meta.url)));
+const platform = process.platform;
+const arch = process.arch;
+const exe = platform === "win32" ? "apply_patch.exe" : "apply_patch";
+const platformArch = `${platform}-${arch}`;
+const binary = join(root, "vendor", "apply-patch", platformArch, exe);
+
+if (!existsSync(binary)) {
+  console.error(`apply_patch binary is not bundled for ${platformArch}.`);
+  console.error("Expected bundled binaries under vendor/apply-patch/<platform>-<arch>/.");
+  process.exit(127);
+}
+
+const result = spawnSync(binary, process.argv.slice(2), {
+  stdio: "inherit",
+  env: process.env,
+  cwd: process.cwd(),
+});
+
+if (result.error) {
+  console.error(result.error.message);
+  process.exit(1);
+}
+process.exit(result.status ?? 0);

package/bin/apply_patch.cmd

@@ -0,0 +1,2 @@
+@echo off
+node "%~dp0apply_patch" %*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@howaboua/pi-codex-conversion",
-  "version": "1.0.29",
+  "version": "1.0.31-dev.3.4b87b70",
   "description": "Codex-oriented tool and prompt adapter for pi coding agent",
   "type": "module",
   "repository": {
@@ -21,10 +21,6 @@
     "apply-patch"
   ],
   "license": "MIT",
-  "os": [
-    "darwin",
-    "linux"
-  ],
   "pi": {
     "extensions": [
       "./src/index.ts"
@@ -33,6 +29,9 @@
   "files": [
     "src/**/*.ts",
     "src/**/*.md",
+    "bin/apply_patch",
+    "bin/apply_patch.cmd",
+    "vendor/apply-patch/**",
     "available-tools.png",
     "README.md",
     "LICENSE"
@@ -45,21 +44,24 @@
     "publish:dev": "npm publish --tag dev",
     "release:dev": "npm version prerelease --preid dev && npm publish --tag dev",
     "prepack": "npm run check",
-    "prepublishOnly": "npm run check"
+    "prepublishOnly": "npm run verify:apply-patch-binaries && npm run check",
+    "build:apply-patch": "node scripts/build-apply-patch-binary.mjs",
+    "sync:apply-patch-source": "node scripts/sync-apply-patch-source.mjs",
+    "verify:apply-patch-binaries": "node scripts/verify-apply-patch-binaries.mjs"
   },
   "publishConfig": {
     "access": "public"
   },
   "peerDependencies": {
-    "@mariozechner/pi-ai": "^0.72.0",
-    "@mariozechner/pi-coding-agent": "^0.72.0",
-    "@mariozechner/pi-tui": "^0.72.0",
-    "typebox": "^1.1.24"
+    "@earendil-works/pi-ai": "*",
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*",
+    "typebox": "*"
   },
   "devDependencies": {
-    "@mariozechner/pi-ai": "^0.72.0",
-    "@mariozechner/pi-coding-agent": "^0.72.0",
-    "@mariozechner/pi-tui": "^0.72.0",
+    "@earendil-works/pi-ai": "^0.74.0",
+    "@earendil-works/pi-coding-agent": "^0.74.0",
+    "@earendil-works/pi-tui": "^0.74.0",
     "tsx": "^4.20.5",
     "typebox": "^1.1.24",
     "typescript": "^5.9.3"
@@ -69,5 +71,8 @@
     "partial-json": "^0.1.7",
     "tree-sitter-bash": "^0.25.1",
     "web-tree-sitter": "^0.26.7"
+  },
+  "bin": {
+    "apply_patch": "./bin/apply_patch"
   }
 }

package/src/adapter/codex-model.ts

@@ -1,4 +1,4 @@
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
 export interface CodexLikeModelDescriptor {
 	provider: string;

package/src/index.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { getCodexRuntimeShell } from "./adapter/runtime-shell.ts";
 import {
 	CORE_ADAPTER_TOOL_NAMES,
@@ -24,21 +24,18 @@ import { buildCodexSystemPrompt, extractPiPromptSkills, type PromptSkill } from
 import { registerViewImageTool, supportsOriginalImageDetail } from "./tools/view-image-tool.ts";
 import {
 	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";
+import { ensureBundledApplyPatchOnPath } from "./tools/apply-patch-binary.ts";
 
 interface AdapterState {
 	enabled: boolean;
 	cwd: string;
 	previousToolNames?: string[];
 	promptSkills: PromptSkill[];
-	webSearchNoticeShown: boolean;
 }
 
 const ADAPTER_TOOL_NAMES = [...CORE_ADAPTER_TOOL_NAMES, WEB_SEARCH_TOOL_NAME, IMAGE_GENERATION_TOOL_NAME, VIEW_IMAGE_TOOL_NAME];
@@ -61,8 +58,9 @@ function isToolCallOnlyAssistantMessage(message: unknown): boolean {
 }
 
 export default function codexConversion(pi: ExtensionAPI) {
+	ensureBundledApplyPatchOnPath();
 	const tracker = createExecCommandTracker();
-	const state: AdapterState = { enabled: false, cwd: process.cwd(), promptSkills: [], webSearchNoticeShown: false };
+	const state: AdapterState = { enabled: false, cwd: process.cwd(), promptSkills: [] };
 	const sessions = createExecSessionManager();
 
 	registerOpenAICodexCustomProvider(pi, {
@@ -73,7 +71,6 @@ export default function codexConversion(pi: ExtensionAPI) {
 	registerWriteStdinTool(pi, sessions);
 	registerImageGenerationTool(pi);
 	registerWebSearchTool(pi);
-	registerWebSearchSessionNoteRenderer(pi);
 
 	sessions.onSessionExit((sessionId) => {
 		tracker.recordSessionFinished(sessionId);
@@ -81,7 +78,6 @@ export default function codexConversion(pi: ExtensionAPI) {
 
 	pi.on("session_start", async (_event, ctx) => {
 		state.cwd = ctx.cwd;
-		state.webSearchNoticeShown = false;
 		clearApplyPatchRenderState();
 		tracker.clear();
 		syncAdapter(pi, ctx, state);
@@ -157,7 +153,6 @@ 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);
@@ -227,15 +222,3 @@ 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/providers/openai-codex-custom-provider.ts

@@ -1,8 +1,10 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { Box, Image, Spacer, Text } from "@mariozechner/pi-tui";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Box, Image, Spacer, Text } from "@earendil-works/pi-tui";
 import {
 	createAssistantMessageEventStream,
+	appendAssistantMessageDiagnostic,
 	clampThinkingLevel,
+	createAssistantMessageDiagnostic,
 	getEnvApiKey,
 	type Api,
 	type AssistantMessage,
@@ -10,7 +12,7 @@ import {
 	type Context,
 	type Model,
 	type SimpleStreamOptions,
-} from "@mariozechner/pi-ai";
+} from "@earendil-works/pi-ai";
 import type { ResponseCreateParamsStreaming } from "openai/resources/responses/responses.js";
 import {
 	convertResponsesMessages,
@@ -29,6 +31,7 @@ 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;
 const SESSION_WEBSOCKET_CACHE_TTL_MS = 5 * 60 * 1000;
 const dynamicImport = (specifier: string) => import(specifier);
 let _os: { platform(): string; release(): string; arch(): string } | null = null;
@@ -412,16 +415,6 @@ function headersToRecord(headers: Headers): Record<string, string> {
 	return Object.fromEntries(headers.entries());
 }
 
-function buildWebSocketCacheKey(url: string, headers: Headers, sessionId: string | undefined): string | undefined {
-	if (!sessionId) return undefined;
-	const headerFingerprint = Object.entries(headersToRecord(headers))
-		.map(([key, value]) => [key.toLowerCase(), value] as const)
-		.sort(([a], [b]) => a.localeCompare(b))
-		.map(([key, value]) => `${key}:${value}`)
-		.join("\n");
-	return `${sessionId}:${shortHash(`${url}\n${headerFingerprint}`)}`;
-}
-
 function createCodexRequestId(): string {
 	if (typeof globalThis.crypto?.randomUUID === "function") {
 		return globalThis.crypto.randomUUID();
@@ -523,7 +516,7 @@ function resolveCodexServiceTier(responseServiceTier: ServiceTier, requestServic
 	return responseServiceTier ?? requestServiceTier;
 }
 
-function buildRequestBody<TApi extends Api>(model: Model<TApi>, context: Context, options?: SimpleStreamOptions): ResponsesBody {
+export function buildRequestBody<TApi extends Api>(model: Model<TApi>, context: Context, options?: SimpleStreamOptions): ResponsesBody {
 	const messages = convertResponsesMessages(model, context, CODEX_TOOL_CALL_PROVIDERS, {
 		includeSystemPrompt: false,
 	});
@@ -532,7 +525,7 @@ function buildRequestBody<TApi extends Api>(model: Model<TApi>, context: Context
 		model: model.id,
 		store: false,
 		stream: true,
-		instructions: context.systemPrompt,
+		instructions: context.systemPrompt || "You are a helpful assistant.",
 		input: messages,
 		text: { verbosity: ((options as { textVerbosity?: string } | undefined)?.textVerbosity ?? "low") as string },
 		include: ["reasoning.encrypted_content"],
@@ -603,7 +596,7 @@ function sleep(ms: number, signal: AbortSignal | undefined): Promise<void> {
 	});
 }
 
-async function* parseSSE(response: Response): AsyncIterable<StreamEventShape> {
+export async function* parseSSE(response: Response): AsyncIterable<StreamEventShape> {
 	if (!response.body) return;
 
 	const reader = response.body.getReader();
@@ -630,8 +623,8 @@ async function* parseSSE(response: Response): AsyncIterable<StreamEventShape> {
 					if (data && data !== "[DONE]") {
 						try {
 							yield JSON.parse(data) as StreamEventShape;
-						} catch {
-							// Ignore malformed SSE chunks and continue consuming the stream.
+						} catch (error) {
+							throw new Error(`Invalid Codex SSE JSON: ${error instanceof Error ? error.message : String(error)}`);
 						}
 					}
 				}
@@ -674,6 +667,29 @@ function closeWebSocketSilently(socket: WebSocketLike, code = 1000, reason = "do
 	}
 }
 
+export function closeOpenAICodexWebSocketSessions(sessionId?: string): void {
+	const closeEntry = (entry: SessionWebSocketCacheEntry) => {
+		if (entry.idleTimer) {
+			clearTimeout(entry.idleTimer);
+			entry.idleTimer = undefined;
+		}
+		closeWebSocketSilently(entry.socket, 1000, "session_shutdown");
+	};
+
+	if (sessionId) {
+		const entry = websocketSessionCache.get(sessionId);
+		if (entry) closeEntry(entry);
+		websocketSessionCache.delete(sessionId);
+		return;
+	}
+
+	for (const entry of websocketSessionCache.values()) {
+		closeEntry(entry);
+	}
+	websocketSessionCache.clear();
+}
+
+
 function scheduleSessionWebSocketExpiry(cacheKey: string, entry: SessionWebSocketCacheEntry): void {
 	if (entry.idleTimer) {
 		clearTimeout(entry.idleTimer);
@@ -700,7 +716,10 @@ function extractWebSocketCloseError(event: unknown): Error {
 		const code = "code" in event ? (event as { code?: unknown }).code : undefined;
 		const reason = "reason" in event ? (event as { reason?: unknown }).reason : undefined;
 		const codeText = typeof code === "number" ? ` ${code}` : "";
-		const reasonText = typeof reason === "string" && reason.length > 0 ? ` ${reason}` : "";
+		let reasonText = typeof reason === "string" && reason.length > 0 ? ` ${reason}` : "";
+		if (!reasonText && code === WEBSOCKET_MESSAGE_TOO_BIG_CLOSE_CODE) {
+			reasonText = " message too big";
+		}
 		return new Error(`WebSocket closed${codeText}${reasonText}`.trim());
 	}
 	return new Error("WebSocket closed");
@@ -772,8 +791,7 @@ async function acquireWebSocket(
 	sessionId: string | undefined,
 	signal: AbortSignal | undefined,
 ): Promise<AcquiredWebSocket> {
-	const cacheKey = buildWebSocketCacheKey(url, headers, sessionId);
-	if (!cacheKey) {
+	if (!sessionId) {
 		const socket = await connectWebSocket(url, headers, signal);
 		return {
 			socket,
@@ -788,7 +806,7 @@ async function acquireWebSocket(
 		};
 	}
 
-	const cached = websocketSessionCache.get(cacheKey);
+	const cached = websocketSessionCache.get(sessionId);
 	if (cached) {
 		if (cached.idleTimer) {
 			clearTimeout(cached.idleTimer);
@@ -804,11 +822,11 @@ async function acquireWebSocket(
 				release: ({ keep } = {}) => {
 					if (!keep || !isWebSocketReusable(cached.socket)) {
 						closeWebSocketSilently(cached.socket);
-						websocketSessionCache.delete(cacheKey);
+						websocketSessionCache.delete(sessionId);
 						return;
 					}
 					cached.busy = false;
-					scheduleSessionWebSocketExpiry(cacheKey, cached);
+					scheduleSessionWebSocketExpiry(sessionId, cached);
 				},
 			};
 		}
@@ -826,13 +844,13 @@ async function acquireWebSocket(
 
 		if (!isWebSocketReusable(cached.socket)) {
 			closeWebSocketSilently(cached.socket);
-			websocketSessionCache.delete(cacheKey);
+			websocketSessionCache.delete(sessionId);
 		}
 	}
 
 	const socket = await connectWebSocket(url, headers, signal);
 	const entry: SessionWebSocketCacheEntry = { socket, busy: true };
-	websocketSessionCache.set(cacheKey, entry);
+	websocketSessionCache.set(sessionId, entry);
 	return {
 		socket,
 		entry,
@@ -841,13 +859,13 @@ async function acquireWebSocket(
 			if (!keep || !isWebSocketReusable(entry.socket)) {
 				closeWebSocketSilently(entry.socket);
 				if (entry.idleTimer) clearTimeout(entry.idleTimer);
-				if (websocketSessionCache.get(cacheKey) === entry) {
-					websocketSessionCache.delete(cacheKey);
+				if (websocketSessionCache.get(sessionId) === entry) {
+					websocketSessionCache.delete(sessionId);
 				}
 				return;
 			}
 			entry.busy = false;
-			scheduleSessionWebSocketExpiry(cacheKey, entry);
+			scheduleSessionWebSocketExpiry(sessionId, entry);
 		},
 	};
 }
@@ -951,8 +969,9 @@ async function* parseWebSocket(socket: WebSocketLike, signal: AbortSignal | unde
 						done = true;
 					}
 					queue.push(parsed);
-				} catch {
-					// ignore malformed websocket messages
+				} catch (error) {
+					failed = new Error(`Invalid Codex WebSocket JSON: ${error instanceof Error ? error.message : String(error)}`);
+					done = true;
 				}
 			})
 			.catch((error: unknown) => {
@@ -1033,9 +1052,27 @@ async function* countWebSocketEvents(
 	}
 }
 
+async function* startWebSocketOutputOnFirstEvent(
+	events: AsyncIterable<StreamEventShape>,
+	output: AssistantMessage,
+	stream: AssistantMessageEventStream,
+	onStart: () => void,
+): AsyncIterable<StreamEventShape> {
+	let started = false;
+	for await (const event of events) {
+		if (!started) {
+			started = true;
+			onStart();
+			stream.push({ type: "start", partial: output });
+		}
+		yield event;
+	}
+}
+
 function isRetryableEarlyWebSocketError(error: unknown): boolean {
 	const message = error instanceof Error ? error.message : String(error);
-	return /^WebSocket (error|closed)(?:\s|$)/.test(message);
+	if (/message too big/i.test(message)) return false;
+	return /^(?:WebSocket (?:error|closed)(?:\s|$)|Invalid Codex WebSocket JSON)/.test(message);
 }
 
 async function* mapCodexEvents(events: AsyncIterable<StreamEventShape>): AsyncIterable<StreamEventShape> {
@@ -1193,11 +1230,12 @@ async function processWebSocketStream<TApi extends Api>(
 	let streamStarted = false;
 
 	for (let attempt = 0; attempt < 2; attempt++) {
-		const { socket, entry, release, reused } = await acquireWebSocket(url, headers, options?.sessionId, options?.signal);
+		const { socket, entry, release } = await acquireWebSocket(url, headers, options?.sessionId, options?.signal);
 		let keepConnection = true;
 		let released = false;
 		let eventCount = 0;
-		const useCachedContext = (options as { transport?: string } | undefined)?.transport === "websocket-cached";
+		const transport = (options as { transport?: string } | undefined)?.transport ?? "auto";
+		const useCachedContext = transport === "websocket-cached" || transport === "auto";
 		// ChatGPT Codex Responses rejects `store: true` ("Store must be set to false").
 		// WebSocket continuation still works via connection-scoped previous_response_id state.
 		const fullBody = body;
@@ -1211,15 +1249,18 @@ async function processWebSocketStream<TApi extends Api>(
 
 		try {
 			socket.send(JSON.stringify({ type: "response.create", ...requestBody }));
-			if (!streamStarted) {
-				onStart();
-				stream.push({ type: "start", partial: output });
-				streamStarted = true;
-			}
 			await processCapturedResponsesStream(
-				countWebSocketEvents(parseWebSocket(socket, options?.signal), () => {
-					eventCount++;
-				}),
+				startWebSocketOutputOnFirstEvent(
+					countWebSocketEvents(parseWebSocket(socket, options?.signal), () => {
+						eventCount++;
+					}),
+					output,
+					stream,
+					() => {
+						streamStarted = true;
+						onStart();
+					},
+				),
 				output,
 				stream,
 				model,
@@ -1248,11 +1289,10 @@ async function processWebSocketStream<TApi extends Api>(
 			}
 			keepConnection = false;
 			releaseOnce({ keep: false });
-			// Pi's stock provider reuses session WebSockets. In practice the Codex
-			// backend sometimes cleanly closes an idle cached socket between turns;
-			// if that stale socket fails before any response event, retry once on a
-			// fresh WebSocket without changing request shape or falling back transports.
-			if (attempt === 0 && reused && eventCount === 0 && !options?.signal?.aborted && isRetryableEarlyWebSocketError(error)) {
+			// If WebSocket fails before the first response event, nothing has been
+			// emitted to the UI/history yet. Retry once on a fresh WebSocket; if that
+			// also fails, the caller can fall back to SSE for `auto` transport.
+			if (attempt === 0 && eventCount === 0 && !streamStarted && !options?.signal?.aborted && isRetryableEarlyWebSocketError(error)) {
 				continue;
 			}
 			throw error;
@@ -1460,7 +1500,7 @@ function createCodexStream<TApi extends Api>(
 			const sseHeaders = buildSSEHeaders(model.headers, options?.headers, accountId, apiKey, options?.sessionId);
 			const websocketHeaders = buildWebSocketHeaders(model.headers, options?.headers, accountId, apiKey, websocketRequestId);
 			const bodyJson = JSON.stringify(body);
-			const transport = options?.transport || "sse";
+			const transport = options?.transport || "auto";
 
 			if (transport !== "sse") {
 				let websocketStarted = false;
@@ -1488,6 +1528,16 @@ function createCodexStream<TApi extends Api>(
 					stream.end();
 					return;
 				} catch (error) {
+					appendAssistantMessageDiagnostic(
+						output,
+						createAssistantMessageDiagnostic("provider_transport_failure", error, {
+							configuredTransport: transport,
+							fallbackTransport: websocketStarted ? undefined : "sse",
+							eventsEmitted: websocketStarted,
+							phase: websocketStarted ? "after_message_stream_start" : "before_message_stream_start",
+							requestBytes: new TextEncoder().encode(bodyJson).byteLength,
+						}),
+					);
 					if (transport === "websocket" || transport === "websocket-cached" || websocketStarted) {
 						throw error;
 					}
@@ -1656,6 +1706,7 @@ export function registerOpenAICodexCustomProvider(pi: ExtensionAPI, options: { g
 			flushPendingMessages();
 		}
 		clearPendingMessages();
+		closeOpenAICodexWebSocketSessions();
 	});
 
 	pi.on("agent_end", async () => {

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

@@ -1,7 +1,7 @@
-import { calculateCost, type Api, type AssistantMessage, type Context, type Model, type Tool, type Usage } from "@mariozechner/pi-ai";
+import { calculateCost, type Api, type AssistantMessage, type Context, type Model, type Tool, type Usage } from "@earendil-works/pi-ai";
 import type { ResponseCreateParamsStreaming, ResponseInput, ResponseStreamEvent, Tool as OpenAITool } from "openai/resources/responses/responses.js";
 import { parse as partialParse } from "partial-json";
-import type { AssistantMessageEventStream } from "@mariozechner/pi-ai";
+import type { AssistantMessageEventStream } from "@earendil-works/pi-ai";
 
 type MessageRole = Context["messages"][number]["role"];
 type Message = Context["messages"][number];

package/src/tools/apply-patch-binary.ts

@@ -0,0 +1,21 @@
+import { existsSync } from "node:fs";
+import { dirname, delimiter, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+export function getBundledApplyPatchBinDir(): string {
+	return join(dirname(dirname(dirname(fileURLToPath(import.meta.url)))), "bin");
+}
+
+export function ensureBundledApplyPatchOnPath(env: NodeJS.ProcessEnv = process.env): string | undefined {
+	const binDir = getBundledApplyPatchBinDir();
+	const wrapperPath = join(binDir, process.platform === "win32" ? "apply_patch.cmd" : "apply_patch");
+	if (!existsSync(wrapperPath)) {
+		return undefined;
+	}
+	const currentPath = env.PATH ?? "";
+	const entries = currentPath.split(delimiter).filter(Boolean);
+	if (!entries.includes(binDir)) {
+		env.PATH = [binDir, ...entries].join(delimiter);
+	}
+	return binDir;
+}

package/src/tools/apply-patch-rendering.ts

@@ -1,5 +1,5 @@
 import { isAbsolute, relative } from "node:path";
-import { renderDiff } from "@mariozechner/pi-coding-agent";
+import { renderDiff } from "@earendil-works/pi-coding-agent";
 import { openFileAtPath } from "../patch/paths.ts";
 import { parsePatchActions } from "../patch/parser.ts";
 import type { ParsedPatchAction } from "../patch/types.ts";

package/src/tools/apply-patch-tool.ts

@@ -1,6 +1,6 @@
 import { Type } from "typebox";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { Container, Text } from "@mariozechner/pi-tui";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Container, Text } from "@earendil-works/pi-tui";
 import { executePatch } from "../patch/core.ts";
 import { ExecutePatchError, type ExecutePatchResult } from "../patch/types.ts";
 import { formatApplyPatchSummary, formatPatchTarget, renderApplyPatchCall } from "./apply-patch-rendering.ts";

package/src/tools/exec-command-tool.ts

@@ -1,6 +1,6 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
-import { Container, Text } from "@mariozechner/pi-tui";
+import { Container, Text } from "@earendil-works/pi-tui";
 import { renderExecCommandCall, renderGroupedExecCommandCall } from "./codex-rendering.ts";
 import type { ExecCommandTracker } from "./exec-command-state.ts";
 import type { ExecSessionManager, UnifiedExecResult } from "./exec-session-manager.ts";

package/src/tools/image-generation-tool.ts

@@ -1,6 +1,6 @@
-import type { ExtensionAPI, ExtensionContext, ToolDefinition } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext, ToolDefinition } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
-import { Container, Text } from "@mariozechner/pi-tui";
+import { Container, Text } from "@earendil-works/pi-tui";
 import { isOpenAICodexModel } from "../adapter/codex-model.ts";
 
 export const IMAGE_GENERATION_UNSUPPORTED_MESSAGE =

package/src/tools/view-image-tool.ts

@@ -6,9 +6,9 @@ import {
 	type ExtensionAPI,
 	type ExtensionContext,
 	type ToolDefinition,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import { Type, type TSchema } from "typebox";
-import { Text } from "@mariozechner/pi-tui";
+import { Text } from "@earendil-works/pi-tui";
 
 const VIEW_IMAGE_UNSUPPORTED_MESSAGE = "view_image is not allowed because you do not support image inputs";
 const DETAIL_DESCRIPTION =

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

@@ -1,14 +1,12 @@
-import type { ExtensionAPI, ExtensionContext, ToolDefinition } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext, ToolDefinition } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
-import { Box, Container, Text } from "@mariozechner/pi-tui";
+import { Container, Text } from "@earendil-works/pi-tui";
 import { isOpenAICodexModel } from "../adapter/codex-model.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_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 activity is surfaced as merged foldable status messages instead of native tool-call rows.";
 const WEB_SEARCH_MULTIMODAL_CONTENT_TYPES = ["text", "image"] as const;
 
 const WEB_SEARCH_PARAMETERS = Type.Unsafe<Record<string, never>>({
@@ -36,14 +34,6 @@ export function supportsNativeWebSearch(model: ExtensionContext["model"]): boole
 	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;
@@ -130,12 +120,3 @@ export function createWebSearchTool(): ToolDefinition<typeof WEB_SEARCH_PARAMETE
 export function registerWebSearchTool(pi: ExtensionAPI): void {
 	pi.registerTool(createWebSearchTool());
 }
-
-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(theme.bold("Web search enabled"), 0, 0));
-		box.addChild(new Text(`\n${theme.fg("dim", WEB_SEARCH_SESSION_NOTE_TEXT)}`, 0, 0));
-		return box;
-	});
-}

package/src/tools/write-stdin-tool.ts

@@ -1,6 +1,6 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
-import { Container, Text } from "@mariozechner/pi-tui";
+import { Container, Text } from "@earendil-works/pi-tui";
 import { renderWriteStdinCall } from "./codex-rendering.ts";
 import type { ExecSessionManager, UnifiedExecResult } from "./exec-session-manager.ts";
 import { formatUnifiedExecResult } from "./unified-exec-format.ts";