@oh-my-pi/pi-coding-agent 12.1.1 → 12.2.0

package/src/sdk.ts

@@ -1,8 +1,9 @@
 import { Agent, type AgentEvent, type AgentMessage, type AgentTool, type ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { type Message, type Model, supportsXhigh } from "@oh-my-pi/pi-ai";
+import { prewarmOpenAICodexResponses } from "@oh-my-pi/pi-ai/providers/openai-codex-responses";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { $env, logger, postmortem } from "@oh-my-pi/pi-utils";
-import { getAgentDbPath, getAgentDir } from "@oh-my-pi/pi-utils/dirs";
+import { getAgentDbPath, getAgentDir, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import chalk from "chalk";
 import { loadCapability } from "./capability";
 import { type Rule, ruleCapability } from "./capability/rule";
@@ -85,7 +86,7 @@ const debugStartup = $env.PI_DEBUG_STARTUP ? (stage: string) => process.stderr.w
 
 // Types
 export interface CreateAgentSessionOptions {
-	/** Working directory for project-local discovery. Default: process.cwd() */
+	/** Working directory for project-local discovery. Default: getProjectDir() */
 	cwd?: string;
 	/** Global config directory. Default: ~/.omp/agent */
 	agentDir?: string;
@@ -240,7 +241,7 @@ export async function discoverAuthStorage(agentDir: string = getDefaultAgentDir(
  * Discover extensions from cwd.
  */
 export async function discoverExtensions(cwd?: string): Promise<LoadExtensionsResult> {
-	const resolvedCwd = cwd ?? process.cwd();
+	const resolvedCwd = cwd ?? getProjectDir();
 
 	return discoverAndLoadExtensions([], resolvedCwd);
 }
@@ -255,7 +256,7 @@ export async function discoverSkills(
 ): Promise<{ skills: Skill[]; warnings: SkillWarning[] }> {
 	return await loadSkillsInternal({
 		...settings,
-		cwd: cwd ?? process.cwd(),
+		cwd: cwd ?? getProjectDir(),
 	});
 }
 
@@ -268,7 +269,7 @@ export async function discoverContextFiles(
 	_agentDir?: string,
 ): Promise<Array<{ path: string; content: string; depth?: number }>> {
 	return await loadContextFilesInternal({
-		cwd: cwd ?? process.cwd(),
+		cwd: cwd ?? getProjectDir(),
 	});
 }
 
@@ -277,7 +278,7 @@ export async function discoverContextFiles(
  */
 export async function discoverPromptTemplates(cwd?: string, agentDir?: string): Promise<PromptTemplate[]> {
 	return await loadPromptTemplatesInternal({
-		cwd: cwd ?? process.cwd(),
+		cwd: cwd ?? getProjectDir(),
 		agentDir: agentDir ?? getDefaultAgentDir(),
 	});
 }
@@ -286,14 +287,14 @@ export async function discoverPromptTemplates(cwd?: string, agentDir?: string):
  * Discover file-based slash commands from commands/ directories.
  */
 export async function discoverSlashCommands(cwd?: string): Promise<FileSlashCommand[]> {
-	return loadSlashCommandsInternal({ cwd: cwd ?? process.cwd() });
+	return loadSlashCommandsInternal({ cwd: cwd ?? getProjectDir() });
 }
 
 /**
  * Discover custom commands (TypeScript slash commands) from cwd and agentDir.
  */
 export async function discoverCustomTSCommands(cwd?: string, agentDir?: string): Promise<CustomCommandsLoadResult> {
-	const resolvedCwd = cwd ?? process.cwd();
+	const resolvedCwd = cwd ?? getProjectDir();
 	const resolvedAgentDir = agentDir ?? getDefaultAgentDir();
 
 	return loadCustomCommandsInternal({
@@ -307,7 +308,7 @@ export async function discoverCustomTSCommands(cwd?: string, agentDir?: string):
  * Returns the manager and loaded tools.
  */
 export async function discoverMCPServers(cwd?: string): Promise<MCPToolsLoadResult> {
-	const resolvedCwd = cwd ?? process.cwd();
+	const resolvedCwd = cwd ?? getProjectDir();
 	return discoverAndLoadMCPTools(resolvedCwd);
 }
 
@@ -469,7 +470,7 @@ function createCustomToolsExtension(tools: CustomTool[]): ExtensionFactory {
  *   model: myModel,
  *   getApiKey: async () => Bun.env.MY_KEY,
  *   systemPrompt: 'You are helpful.',
- *   tools: codingTools({ cwd: process.cwd() }),
+ *   tools: codingTools({ cwd: getProjectDir() }),
  *   skills: [],
  *   sessionManager: SessionManager.inMemory(),
  * });
@@ -477,7 +478,7 @@ function createCustomToolsExtension(tools: CustomTool[]): ExtensionFactory {
  */
 export async function createAgentSession(options: CreateAgentSessionOptions = {}): Promise<CreateAgentSessionResult> {
 	debugStartup("sdk:createAgentSession:entry");
-	const cwd = options.cwd ?? process.cwd();
+	const cwd = options.cwd ?? getProjectDir();
 	const agentDir = options.agentDir ?? getDefaultAgentDir();
 	const eventBus = options.eventBus ?? new EventBus();
 
@@ -1016,6 +1017,10 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		.map(name => toolRegistry.get(name))
 		.filter((tool): tool is AgentTool => tool !== undefined);
 
+	const openaiWebsocketSetting = settings.get("providers.openaiWebsockets") ?? "auto";
+	const preferOpenAICodexWebsockets =
+		openaiWebsocketSetting === "on" ? true : openaiWebsocketSetting === "off" ? false : undefined;
+
 	agent = new Agent({
 		initialState: {
 			systemPrompt,
@@ -1036,6 +1041,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		thinkingBudgets: settings.getGroup("thinkingBudgets"),
 		temperature: settings.get("temperature") >= 0 ? settings.get("temperature") : undefined,
 		kimiApiFormat: settings.get("providers.kimiApiFormat") ?? "anthropic",
+		preferWebsockets: preferOpenAICodexWebsockets,
 		getToolContext: tc => toolContextStore.getContext(tc),
 		getApiKey: async provider => {
 			// Use the provider argument from the in-flight request;
@@ -1087,6 +1093,26 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	debugStartup("sdk:createAgentSession");
 	time("createAgentSession");
 
+	if (model?.api === "openai-codex-responses") {
+		try {
+			debugStartup("sdk:prewarmCodexWebsocket:start");
+			await prewarmOpenAICodexResponses(model, {
+				apiKey: await modelRegistry.getApiKey(model, sessionId),
+				sessionId,
+				preferWebsockets: preferOpenAICodexWebsockets,
+				providerSessionState: session.providerSessionState,
+			});
+			debugStartup("sdk:prewarmCodexWebsocket:done");
+			time("prewarmCodexWebsocket");
+		} catch (error) {
+			logger.debug("Codex websocket prewarm failed", {
+				error: error instanceof Error ? error.message : String(error),
+				provider: model.provider,
+				model: model.id,
+			});
+		}
+	}
+
 	// Warm up LSP servers (connects to detected servers)
 	let lspServers: CreateAgentSessionResult["lspServers"];
 	if (enableLsp && settings.get("lsp.diagnosticsOnWrite")) {

package/src/session/agent-session.ts

@@ -21,6 +21,7 @@ import type {
 	ImageContent,
 	Message,
 	Model,
+	ProviderSessionState,
 	TextContent,
 	ToolCall,
 	ToolChoice,
@@ -339,6 +340,7 @@ export class AgentSession {
 	#streamingEditCheckedLineCounts = new Map<string, number>();
 	#streamingEditFileCache = new Map<string, string>();
 	#promptInFlight = false;
+	#providerSessionState = new Map<string, ProviderSessionState>();
 
 	constructor(config: AgentSessionConfig) {
 		this.agent = config.agent;
@@ -358,6 +360,7 @@ export class AgentSession {
 		this.#baseSystemPrompt = this.agent.state.systemPrompt;
 		this.#ttsrManager = config.ttsrManager;
 		this.#forceCopilotAgentInitiator = config.forceCopilotAgentInitiator ?? false;
+		this.agent.providerSessionState = this.#providerSessionState;
 
 		// Always subscribe to agent events for internal handling
 		// (session persistence, hooks, auto-compaction, retry logic)
@@ -369,6 +372,11 @@ export class AgentSession {
 		return this.#modelRegistry;
 	}
 
+	/** Provider-scoped mutable state store for transport/session caches. */
+	get providerSessionState(): Map<string, ProviderSessionState> {
+		return this.#providerSessionState;
+	}
+
 	/** TTSR manager for time-traveling stream rules */
 	get ttsrManager(): TtsrManager | undefined {
 		return this.#ttsrManager;
@@ -888,6 +896,10 @@ export class AgentSession {
 	async dispose(): Promise<void> {
 		await this.sessionManager.flush();
 		await cleanupSshResources();
+		for (const state of this.#providerSessionState.values()) {
+			state.close();
+		}
+		this.#providerSessionState.clear();
 		this.#disconnectFromAgent();
 		this.#eventListeners = [];
 	}

package/src/session/session-manager.ts

@@ -3,7 +3,7 @@ import * as path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Message, TextContent, Usage } from "@oh-my-pi/pi-ai";
 import { isEnoent, logger, parseJsonlLenient, Snowflake } from "@oh-my-pi/pi-utils";
-import { getBlobsDir, getAgentDir as getDefaultAgentDir } from "@oh-my-pi/pi-utils/dirs";
+import { getBlobsDir, getAgentDir as getDefaultAgentDir, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import { type BlobPutResult, BlobStore, externalizeImageData, isBlobRef, resolveImageData } from "./blob-store";
 import {
 	type BashExecutionMessage,
@@ -2153,10 +2153,10 @@ export class SessionManager {
 		sessionDir?: string,
 		storage: SessionStorage = new FileSessionStorage(),
 	): Promise<SessionManager> {
-		// Extract cwd from session header if possible, otherwise use process.cwd()
+		// Extract cwd from session header if possible, otherwise use getProjectDir()
 		const entries = await loadEntriesFromFile(filePath, storage);
 		const header = entries.find(e => e.type === "session") as SessionHeader | undefined;
-		const cwd = header?.cwd ?? process.cwd();
+		const cwd = header?.cwd ?? getProjectDir();
 		// If no sessionDir provided, derive from file's parent directory
 		const dir = sessionDir ?? path.resolve(filePath, "..");
 		const manager = new SessionManager(cwd, dir, true, storage);
@@ -2188,7 +2188,10 @@ export class SessionManager {
 	}
 
 	/** Create an in-memory session (no file persistence) */
-	static inMemory(cwd: string = process.cwd(), storage: SessionStorage = new MemorySessionStorage()): SessionManager {
+	static inMemory(
+		cwd: string = getProjectDir(),
+		storage: SessionStorage = new MemorySessionStorage(),
+	): SessionManager {
 		const manager = new SessionManager(cwd, "", false, storage);
 		manager.#initNewSession();
 		return manager;

package/src/system-prompt.ts

@@ -4,7 +4,7 @@
 import * as os from "node:os";
 import { getSystemInfo as getNativeSystemInfo, type SystemInfo } from "@oh-my-pi/pi-natives";
 import { $env, logger } from "@oh-my-pi/pi-utils";
-import { getGpuCachePath } from "@oh-my-pi/pi-utils/dirs";
+import { getGpuCachePath, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import { $ } from "bun";
 import { contextFileCapability } from "./capability/context-file";
 import { systemPromptCapability } from "./capability/system-prompt";
@@ -50,41 +50,54 @@ async function loadPreloadedSkillContents(preloadedSkills: Skill[]): Promise<Pre
  * Returns structured git data or null if not in a git repo.
  */
 export async function loadGitContext(cwd: string): Promise<GitContext | null> {
-	const git = (...args: string[]) =>
-		$`git ${args}`
-			.cwd(cwd)
-			.quiet()
-			.text()
-			.catch(() => null)
-			.then(text => text?.trim() ?? null);
+	const runGit = async (args: string[], timeoutMs = 1500): Promise<string | null> => {
+		const proc = Bun.spawn(["git", ...args], {
+			cwd,
+			stdout: "pipe",
+			stderr: "ignore",
+		});
+		const stdoutPromise = proc.stdout ? new Response(proc.stdout).text() : Promise.resolve("");
+		const race = await Promise.race([
+			proc.exited.then(() => "exited" as const),
+			Bun.sleep(timeoutMs).then(() => "timeout" as const),
+		]);
+
+		if (race === "timeout") {
+			proc.kill();
+			await stdoutPromise.catch(() => null);
+			logger.debug("Git context command timed out", { cwd, args, timeoutMs });
+			return null;
+		}
+
+		const exitCode = await proc.exited;
+		const stdout = await stdoutPromise.catch(() => "");
+		if (exitCode !== 0) return null;
 
+		const trimmed = stdout.trim();
+		return trimmed.length > 0 ? trimmed : "";
+	};
 	// Check if inside a git repo
-	const isGitRepo = await git("rev-parse", "--is-inside-work-tree");
+	const isGitRepo = await runGit(["rev-parse", "--is-inside-work-tree"]);
 	if (isGitRepo !== "true") return null;
-
-	// Get current branch
-	const currentBranch = await git("rev-parse", "--abbrev-ref", "HEAD");
+	const currentBranch = await runGit(["rev-parse", "--abbrev-ref", "HEAD"]);
 	if (!currentBranch) return null;
-
-	// Detect main branch (check for 'main' first, then 'master')
 	let mainBranch = "main";
-	const mainExists = await git("rev-parse", "--verify", "main");
+	const mainExists = await runGit(["rev-parse", "--verify", "main"]);
 	if (mainExists === null) {
-		const masterExists = await git("rev-parse", "--verify", "master");
+		const masterExists = await runGit(["rev-parse", "--verify", "master"]);
 		if (masterExists !== null) mainBranch = "master";
 	}
 
-	// Get git status (porcelain format for parsing)
-	const status = (await git("status", "--porcelain")) || "(clean)";
-
-	// Get recent commits
-	const commits = (await git("log", "--oneline", "-5")) || "(no commits)";
+	const [status, commits] = await Promise.all([
+		runGit(["status", "--porcelain", "--untracked-files=no"], 2000),
+		runGit(["log", "--oneline", "-5"]),
+	]);
 	return {
 		isRepo: true,
 		currentBranch,
 		mainBranch,
-		status,
-		commits,
+		status: status === "" ? "(clean)" : (status ?? "(status unavailable)"),
+		commits: commits && commits.length > 0 ? commits : "(no commits)",
 	};
 }
 
@@ -349,7 +362,7 @@ export async function resolvePromptInput(input: string | undefined, description:
 }
 
 export interface LoadContextFilesOptions {
-	/** Working directory to start walking up from. Default: process.cwd() */
+	/** Working directory to start walking up from. Default: getProjectDir() */
 	cwd?: string;
 }
 
@@ -361,7 +374,7 @@ export interface LoadContextFilesOptions {
 export async function loadProjectContextFiles(
 	options: LoadContextFilesOptions = {},
 ): Promise<Array<{ path: string; content: string; depth?: number }>> {
-	const resolvedCwd = options.cwd ?? process.cwd();
+	const resolvedCwd = options.cwd ?? getProjectDir();
 
 	const result = await loadCapability(contextFileCapability.id, { cwd: resolvedCwd });
 
@@ -391,7 +404,7 @@ export async function loadProjectContextFiles(
  * Returns combined content from all discovered SYSTEM.md files.
  */
 export async function loadSystemPromptFiles(options: LoadContextFilesOptions = {}): Promise<string | null> {
-	const resolvedCwd = options.cwd ?? process.cwd();
+	const resolvedCwd = options.cwd ?? getProjectDir();
 
 	const result = await loadCapability<SystemPromptFile>(systemPromptCapability.id, { cwd: resolvedCwd });
 
@@ -420,7 +433,7 @@ export interface BuildSystemPromptOptions {
 	appendSystemPrompt?: string;
 	/** Skills settings for discovery. */
 	skillsSettings?: SkillsSettings;
-	/** Working directory. Default: process.cwd() */
+	/** Working directory. Default: getProjectDir() */
 	cwd?: string;
 	/** Pre-loaded context files (skips discovery if provided). */
 	contextFiles?: Array<{ path: string; content: string; depth?: number }>;
@@ -450,7 +463,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		preloadedSkills: providedPreloadedSkills,
 		rules,
 	} = options;
-	const resolvedCwd = cwd ?? process.cwd();
+	const resolvedCwd = cwd ?? getProjectDir();
 	const resolvedCustomPrompt = await resolvePromptInput(customPrompt, "system prompt");
 	const resolvedAppendPrompt = await resolvePromptInput(appendSystemPrompt, "append system prompt");
 

package/src/tools/bash-normalize.ts

@@ -57,8 +57,8 @@ export function normalizeBashCommand(command: string): NormalizedCommand {
 		normalized = normalized.slice(0, -fullMatch.length);
 	}
 
-	// Clean up multiple horizontal spaces (preserve newlines for heredocs/multiline)
-	normalized = normalized.replace(/[ \t]{2,}/g, " ").trim();
+	// Preserve internal whitespace (important for heredocs / indentation-sensitive scripts)
+	normalized = normalized.trim();
 
 	return {
 		command: normalized,

package/src/tools/bash.ts

@@ -4,6 +4,7 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { $env, isEnoent } from "@oh-my-pi/pi-utils";
+import { getProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import { type Static, Type } from "@sinclair/typebox";
 import { renderPromptTemplate } from "../config/prompt-templates";
 import { type BashResult, executeBash } from "../exec/bash-executor";
@@ -205,7 +206,7 @@ interface BashRenderContext {
 function formatBashCommand(args: BashRenderArgs, _uiTheme: Theme): string {
 	const command = args.command || "…";
 	const prompt = "$";
-	const cwd = process.cwd();
+	const cwd = getProjectDir();
 	let displayWorkdir = args.cwd;
 
 	if (displayWorkdir) {

package/src/tools/fetch.ts

@@ -555,13 +555,13 @@ async function renderUrl(url: string, timeout: number, raw: boolean, signal?: Ab
 	if (!response.ok) {
 		return {
 			url,
-			finalUrl: url,
-			contentType: "unknown",
+			finalUrl: response.finalUrl || url,
+			contentType: response.contentType || "unknown",
 			method: "failed",
 			content: "",
 			fetchedAt,
 			truncated: false,
-			notes: ["Failed to fetch URL"],
+			notes: [response.status ? `Failed to fetch URL (HTTP ${response.status})` : "Failed to fetch URL"],
 		};
 	}
 

package/src/tools/python.ts

@@ -4,6 +4,7 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import type { ImageContent } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
+import { getProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import { type Static, Type } from "@sinclair/typebox";
 import { renderPromptTemplate } from "../config/prompt-templates";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
@@ -836,7 +837,7 @@ export const pythonToolRenderer = {
 	renderCall(args: PythonRenderArgs, uiTheme: Theme): Component {
 		const ui = new ToolUIKit(uiTheme);
 		const cells = args.cells ?? [];
-		const cwd = process.cwd();
+		const cwd = getProjectDir();
 		let displayWorkdir = args.cwd;
 
 		if (displayWorkdir) {