@howaboua/pi-codex-conversion 1.0.5 → 1.0.7

package/package.json

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

package/src/patch/paths.ts

@@ -8,20 +8,17 @@ export function normalizePatchPath({ path }: { path: string }): string {
 	return withoutAt.replace(/^['"]|['"]$/g, "");
 }
 
-// Patch paths are intentionally confined to ctx.cwd so the adapter cannot write
-// outside the active workspace even if the incoming patch text is malicious.
+// Relative patch paths stay anchored to ctx.cwd. Absolute patch paths are
+// accepted as-is so the adapter can match Codex-style path usage.
 export function resolvePatchPath({ cwd, patchPath }: { cwd: string; patchPath: string }): string {
 	const normalized = normalizePatchPath({ path: patchPath });
 	if (!normalized) {
 		throw new DiffError("Patch path cannot be empty");
 	}
-	if (isAbsolute(normalized)) {
-		throw new DiffError("We do not support absolute paths.");
-	}
 
-	const absolutePath = resolve(cwd, normalized);
+	const absolutePath = isAbsolute(normalized) ? normalized : resolve(cwd, normalized);
 	const rel = relative(cwd, absolutePath);
-	if (rel.startsWith("..") || isAbsolute(rel)) {
+	if (!isAbsolute(normalized) && (rel.startsWith("..") || isAbsolute(rel))) {
 		throw new DiffError(`Path escapes working directory: ${normalized}`);
 	}
 	return absolutePath;

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/exec-session-manager.ts

@@ -65,7 +65,7 @@ export interface ExecSessionManager {
 }
 
 const DEFAULT_EXEC_YIELD_TIME_MS = 10_000;
-const DEFAULT_WRITE_YIELD_TIME_MS = 250;
+const DEFAULT_WRITE_YIELD_TIME_MS = 10_000;
 const DEFAULT_MAX_OUTPUT_TOKENS = 10_000;
 const MIN_YIELD_TIME_MS = 250;
 const MAX_YIELD_TIME_MS = 30_000;
@@ -292,18 +292,24 @@ export function createExecSessionManager(): ExecSessionManager {
 		notify(session);
 	}
 
-	function waitForActivity(session: ExecSession, yieldTimeMs: number): Promise<number> {
-		if (session.buffer !== session.emittedBuffer || session.exitCode !== undefined && session.exitCode !== null) {
+	function waitForExitOrTimeout(session: ExecSession, yieldTimeMs: number): Promise<number> {
+		if (session.exitCode !== undefined && session.exitCode !== null) {
 			return Promise.resolve(0);
 		}
 
 		const startedAt = Date.now();
 		return new Promise((resolvePromise) => {
 			const onWake = () => {
+				if (session.exitCode === undefined || session.exitCode === null) {
+					return;
+				}
 				cleanup();
 				resolvePromise(Date.now() - startedAt);
 			};
-			const timeout = setTimeout(onWake, yieldTimeMs);
+			const timeout = setTimeout(() => {
+				cleanup();
+				resolvePromise(Date.now() - startedAt);
+			}, yieldTimeMs);
 			const cleanup = () => {
 				clearTimeout(timeout);
 				session.listeners.delete(onWake);
@@ -432,7 +438,7 @@ export function createExecSessionManager(): ExecSessionManager {
 			sessions.set(session.id, session);
 			rememberCommand(session.id, session.command);
 
-			const waitedMs = await waitForActivity(session, clampYieldTime(input.yield_time_ms, DEFAULT_EXEC_YIELD_TIME_MS));
+			const waitedMs = await waitForExitOrTimeout(session, clampYieldTime(input.yield_time_ms, DEFAULT_EXEC_YIELD_TIME_MS));
 			return makeResult(session, waitedMs, input.max_output_tokens);
 		},
 		write: async (input) => {
@@ -450,7 +456,7 @@ export function createExecSessionManager(): ExecSessionManager {
 			}
 			const waitedMs =
 				session.exitCode === undefined
-					? await waitForActivity(session, clampYieldTime(input.yield_time_ms, DEFAULT_WRITE_YIELD_TIME_MS))
+					? await waitForExitOrTimeout(session, clampYieldTime(input.yield_time_ms, DEFAULT_WRITE_YIELD_TIME_MS))
 					: 0;
 			return makeResult(session, waitedMs, input.max_output_tokens);
 		},

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

@@ -9,8 +9,12 @@ const WEB_SEARCH_LOCAL_EXECUTION_MESSAGE =
 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;
@@ -22,6 +26,12 @@ interface ResponsesPayload {
 	[key: string]: unknown;
 }
 
+interface ResponsesWebSearchTool {
+	type: "web_search";
+	external_web_access: true;
+	search_content_types?: string[];
+}
+
 export function supportsNativeWebSearch(model: ExtensionContext["model"]): boolean {
 	return isOpenAICodexModel(model);
 }
@@ -34,6 +44,14 @@ export function shouldShowWebSearchSessionNote(
 	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";
 }
@@ -55,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) {
@@ -75,8 +97,10 @@ export function createWebSearchTool(): ToolDefinition<typeof WEB_SEARCH_PARAMETE
 	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)) {