@oh-my-pi/pi-coding-agent 12.17.2 → 12.18.0

package/src/system-prompt.ts

@@ -18,9 +18,6 @@ import customSystemPromptTemplate from "./prompts/system/custom-system-prompt.md
 import systemPromptTemplate from "./prompts/system/system-prompt.md" with { type: "text" };
 import type { ToolName } from "./tools";
 
-/** Conditional startup debug prints (stderr) when PI_DEBUG_STARTUP is set */
-const debugStartup = $env.PI_DEBUG_STARTUP ? (stage: string) => process.stderr.write(`[startup] ${stage}\n`) : () => {};
-
 interface GitContext {
 	isRepo: boolean;
 	currentBranch: string;
@@ -355,21 +352,15 @@ async function saveGpuCache(info: GpuCache): Promise<void> {
 }
 
 async function getCachedGpu(): Promise<string | undefined> {
-	debugStartup("system-prompt:getEnvironmentInfo:getCachedGpu:start");
-	const cached = await loadGpuCache();
+	const cached = await logger.timeAsync("getCachedGpu:loadGpuCache", loadGpuCache);
 	if (cached) return cached.gpu;
-	debugStartup("system-prompt:getEnvironmentInfo:getGpuModel");
-	const gpu = await getGpuModel();
-	debugStartup("system-prompt:getEnvironmentInfo:saveGpuCache");
-	if (gpu) await saveGpuCache({ gpu });
+	const gpu = await logger.timeAsync("getCachedGpu:getGpuModel", getGpuModel);
+	if (gpu) await logger.timeAsync("getCachedGpu:saveGpuCache", saveGpuCache, { gpu });
 	return gpu ?? undefined;
 }
 async function getEnvironmentInfo(): Promise<Array<{ label: string; value: string }>> {
-	debugStartup("system-prompt:getEnvironmentInfo:getCachedGpu");
-	const gpu = await getCachedGpu();
-	debugStartup("system-prompt:getEnvironmentInfo:getCpuInfo");
+	const gpu = await logger.timeAsync("getEnvironmentInfo:getCachedGpu", getCachedGpu);
 	const cpus = os.cpus();
-	debugStartup("system-prompt:getEnvironmentInfo:buildEntries");
 	const entries: Array<{ label: string; value: string | undefined }> = [
 		{ label: "OS", value: `${os.platform()} ${os.release()}` },
 		{ label: "Distro", value: os.type() },
@@ -381,7 +372,6 @@ async function getEnvironmentInfo(): Promise<Array<{ label: string; value: strin
 		{ label: "DE", value: getDesktopEnvironment() },
 		{ label: "WM", value: getWindowManager() },
 	];
-	debugStartup("system-prompt:getEnvironmentInfo:done");
 	return entries.filter((e): e is { label: string; value: string } => e.value != null && e.value !== "unknown");
 }
 
@@ -512,33 +502,23 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 	const preloadedSkills = providedPreloadedSkills;
 
 	const prepPromise = (async () => {
-		const systemPromptCustomizationPromise = (async () => {
-			const customization = await loadSystemPromptFiles({ cwd: resolvedCwd });
-			debugStartup("system-prompt:loadSystemPromptFiles:done");
-			return customization;
-		})();
+		const systemPromptCustomizationPromise = logger.timeAsync("loadSystemPromptFiles", loadSystemPromptFiles, {
+			cwd: resolvedCwd,
+		});
 		const contextFilesPromise = providedContextFiles
 			? Promise.resolve(providedContextFiles)
-			: loadProjectContextFiles({ cwd: resolvedCwd });
-		const agentsMdSearchPromise = buildAgentsMdSearch(resolvedCwd);
+			: logger.timeAsync("loadProjectContextFiles", loadProjectContextFiles, { cwd: resolvedCwd });
+		const agentsMdSearchPromise = logger.timeAsync("buildAgentsMdSearch", buildAgentsMdSearch, resolvedCwd);
 		const skillsPromise: Promise<Skill[]> =
 			providedSkills !== undefined
 				? Promise.resolve(providedSkills)
 				: skillsSettings?.enabled !== false
 					? loadSkills({ ...skillsSettings, cwd: resolvedCwd }).then(result => result.skills)
 					: Promise.resolve([]);
-		const preloadedSkillContentsPromise = (async () => {
-			debugStartup("system-prompt:loadPreloadedSkills:start");
-			const loaded = preloadedSkills ? await loadPreloadedSkillContents(preloadedSkills) : [];
-			debugStartup("system-prompt:loadPreloadedSkills:done");
-			return loaded;
-		})();
-		const gitPromise = (async () => {
-			debugStartup("system-prompt:loadGitContext:start");
-			const loaded = await loadGitContext(resolvedCwd);
-			debugStartup("system-prompt:loadGitContext:done");
-			return loaded;
-		})();
+		const preloadedSkillContentsPromise = preloadedSkills
+			? await logger.timeAsync("loadPreloadedSkills", loadPreloadedSkillContents, preloadedSkills)
+			: [];
+		const gitPromise = logger.timeAsync("loadGitContext", loadGitContext, resolvedCwd);
 
 		const [
 			resolvedCustomPrompt,
@@ -678,9 +658,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		});
 	}
 
-	debugStartup("system-prompt:getEnvironmentInfo:start");
-	const environment = await getEnvironmentInfo();
-	debugStartup("system-prompt:getEnvironmentInfo:done");
+	const environment = await logger.timeAsync("getEnvironmentInfo", getEnvironmentInfo);
 	return renderPromptTemplate(systemPromptTemplate, {
 		tools: toolNamesArray,
 		toolDescriptions,

package/src/tools/bash-interactive.ts

@@ -276,6 +276,50 @@ class BashInteractiveOverlayComponent implements Component {
 	}
 }
 
+const NO_PAGER_ENV = {
+	// Disable pagers so commands don't block on interactive views.
+	PAGER: "cat",
+	GIT_PAGER: "cat",
+	MANPAGER: "cat",
+	SYSTEMD_PAGER: "cat",
+	BAT_PAGER: "cat",
+	DELTA_PAGER: "cat",
+	GH_PAGER: "cat",
+	GLAB_PAGER: "cat",
+	PSQL_PAGER: "cat",
+	MYSQL_PAGER: "cat",
+	AWS_PAGER: "",
+	HOMEBREW_PAGER: "cat",
+	LESS: "FRX",
+	// Disable editor and terminal credential prompts.
+	GIT_EDITOR: "true",
+	VISUAL: "true",
+	EDITOR: "true",
+	GIT_TERMINAL_PROMPT: "0",
+	SSH_ASKPASS: "/usr/bin/false",
+	CI: "1",
+	// Package manager defaults for unattended execution.
+	npm_config_yes: "true",
+	npm_config_update_notifier: "false",
+	npm_config_fund: "false",
+	npm_config_audit: "false",
+	npm_config_progress: "false",
+	PNPM_DISABLE_SELF_UPDATE_CHECK: "true",
+	PNPM_UPDATE_NOTIFIER: "false",
+	YARN_ENABLE_TELEMETRY: "0",
+	YARN_ENABLE_PROGRESS_BARS: "0",
+	// Cross-language/tooling non-interactive defaults.
+	CARGO_TERM_PROGRESS_WHEN: "never",
+	DEBIAN_FRONTEND: "noninteractive",
+	PIP_NO_INPUT: "1",
+	PIP_DISABLE_PIP_VERSION_CHECK: "1",
+	TF_INPUT: "0",
+	TF_IN_AUTOMATION: "1",
+	GH_PROMPT_DISABLED: "1",
+	COMPOSER_NO_INTERACTION: "1",
+	CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
+};
+
 export async function runInteractiveBashPty(
 	ui: NonNullable<AgentToolContext["ui"]>,
 	options: {
@@ -346,54 +390,14 @@ export async function runInteractiveBashPty(
 						timeoutMs: options.timeoutMs,
 						env: {
 							...options.env,
-							// Disable pagers so commands don't block on interactive views.
-							PAGER: "cat",
-							GIT_PAGER: "cat",
-							MANPAGER: "cat",
-							SYSTEMD_PAGER: "cat",
-							BAT_PAGER: "cat",
-							DELTA_PAGER: "cat",
-							GH_PAGER: "cat",
-							GLAB_PAGER: "cat",
-							PSQL_PAGER: "cat",
-							MYSQL_PAGER: "cat",
-							AWS_PAGER: "",
-							HOMEBREW_PAGER: "cat",
-							LESS: "FRX",
-							// Disable editor and terminal credential prompts.
-							GIT_EDITOR: "true",
-							VISUAL: "true",
-							EDITOR: "true",
-							GIT_TERMINAL_PROMPT: "0",
-							SSH_ASKPASS: "/usr/bin/false",
-							CI: "1",
-							// Package manager defaults for unattended execution.
-							npm_config_yes: "true",
-							npm_config_update_notifier: "false",
-							npm_config_fund: "false",
-							npm_config_audit: "false",
-							npm_config_progress: "false",
-							PNPM_DISABLE_SELF_UPDATE_CHECK: "true",
-							PNPM_UPDATE_NOTIFIER: "false",
-							YARN_ENABLE_TELEMETRY: "0",
-							YARN_ENABLE_PROGRESS_BARS: "0",
-							// Cross-language/tooling non-interactive defaults.
-							CARGO_TERM_PROGRESS_WHEN: "never",
-							DEBIAN_FRONTEND: "noninteractive",
-							PIP_NO_INPUT: "1",
-							PIP_DISABLE_PIP_VERSION_CHECK: "1",
-							TF_INPUT: "0",
-							TF_IN_AUTOMATION: "1",
-							GH_PROMPT_DISABLED: "1",
-							COMPOSER_NO_INTERACTION: "1",
-							CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
+							...NO_PAGER_ENV,
 						},
 						signal: options.signal,
 						cols,
 						rows,
 					},
 					(err, chunk) => {
-						if (err || !chunk) return;
+						if (finished || err || !chunk) return;
 						component.appendOutput(chunk);
 						const normalizedChunk = normalizeCaptureChunk(chunk);
 						pendingChunks = pendingChunks.then(() => sink.push(normalizedChunk)).catch(() => {});

package/src/tools/gemini-image.ts

@@ -1,6 +1,6 @@
 import * as os from "node:os";
 import * as path from "node:path";
-import { getEnvApiKey, StringEnum } from "@oh-my-pi/pi-ai";
+import { getAntigravityHeaders, getEnvApiKey, StringEnum } from "@oh-my-pi/pi-ai";
 import { $env, ptree, readSseJson, Snowflake, untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import type { ModelRegistry } from "../config/model-registry";
@@ -17,15 +17,6 @@ const DEFAULT_TIMEOUT_SECONDS = 120;
 const MAX_IMAGE_SIZE = 20 * 1024 * 1024;
 
 const ANTIGRAVITY_ENDPOINT = "https://daily-cloudcode-pa.sandbox.googleapis.com";
-const ANTIGRAVITY_HEADERS = {
-	"User-Agent": "antigravity/1.11.5 darwin/arm64",
-	"X-Goog-Api-Client": "google-cloud-sdk vscode_cloudshelleditor/0.1",
-	"Client-Metadata": JSON.stringify({
-		ideType: "IDE_UNSPECIFIED",
-		platform: "PLATFORM_UNSPECIFIED",
-		pluginType: "GEMINI",
-	}),
-};
 const IMAGE_SYSTEM_INSTRUCTION =
 	"You are an AI image generator. Generate images based on user descriptions. Focus on creating high-quality, visually appealing images that match the user's request.";
 
@@ -678,7 +669,7 @@ export const geminiImageTool: CustomTool<typeof geminiImageSchema, GeminiImageTo
 						Authorization: `Bearer ${apiKey.apiKey}`,
 						"Content-Type": "application/json",
 						Accept: "text/event-stream",
-						...ANTIGRAVITY_HEADERS,
+						...getAntigravityHeaders(),
 					},
 					body: JSON.stringify(requestBody),
 					signal: requestSignal,

package/src/tools/index.ts

@@ -13,7 +13,6 @@ import type { ArtifactManager } from "../session/artifacts";
 import { TaskTool } from "../task";
 import type { AgentOutputManager } from "../task/output-manager";
 import type { EventBus } from "../utils/event-bus";
-import { time } from "../utils/timings";
 import { SearchTool } from "../web/search";
 import { AskTool } from "./ask";
 import { BashTool } from "./bash";
@@ -225,7 +224,6 @@ function getPythonModeFromEnv(): PythonToolMode | null {
  * Create tools from BUILTIN_TOOLS registry.
  */
 export async function createTools(session: ToolSession, toolNames?: string[]): Promise<Tool[]> {
-	time("createTools:start");
 	const includeSubmitResult = session.requireSubmitResultTool === true;
 	const enableLsp = session.enableLsp ?? true;
 	const requestedTools = toolNames && toolNames.length > 0 ? [...new Set(toolNames)] : undefined;
@@ -242,8 +240,11 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 	const isTestEnv = Bun.env.BUN_ENV === "test" || Bun.env.NODE_ENV === "test";
 	const skipPythonWarm = isTestEnv || $env.PI_PYTHON_SKIP_CHECK === "1";
 	if (shouldCheckPython) {
-		const availability = await checkPythonKernelAvailability(session.cwd);
-		time("createTools:pythonCheck");
+		const availability = await logger.timeAsync(
+			"createTools:pythonCheck",
+			checkPythonKernelAvailability,
+			session.cwd,
+		);
 		pythonAvailable = availability.ok;
 		if (!availability.ok) {
 			logger.warn("Python kernel unavailable, falling back to bash", {
@@ -253,8 +254,13 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 			const sessionFile = session.getSessionFile?.() ?? undefined;
 			const warmSessionId = sessionFile ? `session:${sessionFile}:cwd:${session.cwd}` : `cwd:${session.cwd}`;
 			try {
-				await warmPythonEnvironment(session.cwd, warmSessionId, session.settings.get("python.sharedGateway"));
-				time("createTools:warmPython");
+				await logger.timeAsync(
+					"createTools:warmPython",
+					warmPythonEnvironment,
+					session.cwd,
+					warmSessionId,
+					session.settings.get("python.sharedGateway"),
+				);
 			} catch (err) {
 				logger.warn("Failed to warm Python environment", {
 					error: err instanceof Error ? err.message : String(err),
@@ -310,30 +316,15 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 					...(includeSubmitResult ? ([["submit_result", HIDDEN_TOOLS.submit_result]] as const) : []),
 					...([["exit_plan_mode", HIDDEN_TOOLS.exit_plan_mode]] as const),
 				];
-	time("createTools:beforeFactories");
-	const slowTools: Array<{ name: string; ms: number }> = [];
+
 	const results = await Promise.all(
 		entries.map(async ([name, factory]) => {
-			const start = Bun.nanoseconds();
-			const tool = await factory(session);
-			const elapsed = (Bun.nanoseconds() - start) / 1e6;
-			if (elapsed > 5) {
-				slowTools.push({ name, ms: Math.round(elapsed) });
+			if (filteredRequestedTools && !filteredRequestedTools.includes(name)) {
+				return null;
 			}
-			return { name, tool };
+			const tool = await logger.timeAsync(`createTools:${name}`, factory, session);
+			return tool ? wrapToolWithMetaNotice(tool) : null;
 		}),
 	);
-	time("createTools:afterFactories");
-	if (slowTools.length > 0 && $env.PI_TIMING === "1") {
-		logger.debug("Tool factory timings", { slowTools });
-	}
-	const tools = results.filter(r => r.tool !== null).map(r => r.tool as Tool);
-	const wrappedTools = tools.map(wrapToolWithMetaNotice);
-
-	if (filteredRequestedTools !== undefined) {
-		const allowed = new Set(filteredRequestedTools);
-		return wrappedTools.filter(tool => allowed.has(tool.name));
-	}
-
-	return wrappedTools;
+	return results.filter((r): r is Tool => r !== null);
 }

package/src/web/search/providers/gemini.ts

@@ -5,7 +5,7 @@
  * Requires OAuth credentials stored in agent.db for provider "google-gemini-cli" or "google-antigravity".
  * Returns synthesized answers with citations and source metadata from grounding chunks.
  */
-import { refreshGoogleCloudToken } from "@oh-my-pi/pi-ai";
+import { getAntigravityHeaders, getGeminiCliHeaders, refreshGoogleCloudToken } from "@oh-my-pi/pi-ai";
 import { getAgentDbPath } from "@oh-my-pi/pi-utils/dirs";
 import { AgentStorage } from "../../../session/agent-storage";
 import type { SearchCitation, SearchResponse, SearchSource } from "../../../web/search/types";
@@ -17,28 +17,6 @@ const DEFAULT_ENDPOINT = "https://cloudcode-pa.googleapis.com";
 const ANTIGRAVITY_ENDPOINT = "https://daily-cloudcode-pa.sandbox.googleapis.com";
 const DEFAULT_MODEL = "gemini-2.5-flash";
 
-// Headers for Gemini CLI (prod endpoint)
-const GEMINI_CLI_HEADERS = {
-	"User-Agent": "google-cloud-sdk vscode_cloudshelleditor/0.1",
-	"X-Goog-Api-Client": "gl-node/22.17.0",
-	"Client-Metadata": JSON.stringify({
-		ideType: "IDE_UNSPECIFIED",
-		platform: "PLATFORM_UNSPECIFIED",
-		pluginType: "GEMINI",
-	}),
-};
-
-// Headers for Antigravity (sandbox endpoint)
-const ANTIGRAVITY_HEADERS = {
-	"User-Agent": "antigravity/1.11.5 darwin/arm64",
-	"X-Goog-Api-Client": "google-cloud-sdk vscode_cloudshelleditor/0.1",
-	"Client-Metadata": JSON.stringify({
-		ideType: "IDE_UNSPECIFIED",
-		platform: "PLATFORM_UNSPECIFIED",
-		pluginType: "GEMINI",
-	}),
-};
-
 export interface GeminiSearchParams {
 	query: string;
 	system_prompt?: string;
@@ -212,7 +190,7 @@ async function callGeminiSearch(
 }> {
 	const endpoint = auth.isAntigravity ? ANTIGRAVITY_ENDPOINT : DEFAULT_ENDPOINT;
 	const url = `${endpoint}/v1internal:streamGenerateContent?alt=sse`;
-	const headers = auth.isAntigravity ? ANTIGRAVITY_HEADERS : GEMINI_CLI_HEADERS;
+	const headers = auth.isAntigravity ? getAntigravityHeaders() : getGeminiCliHeaders();
 
 	const requestBody: Record<string, unknown> = {
 		project: auth.projectId,

package/src/utils/timings.ts

@@ -1,26 +0,0 @@
-/**
- * Central timing instrumentation for startup profiling.
- * Enable with PI_TIMING=1 or PI_TIMING=1 environment variable.
- */
-import { $env } from "@oh-my-pi/pi-utils";
-
-const ENABLED = $env.PI_TIMING === "1";
-const timings: Array<{ label: string; ms: number }> = [];
-let lastTime = Date.now();
-
-export function time(label: string): void {
-	if (!ENABLED) return;
-	const now = Date.now();
-	timings.push({ label, ms: now - lastTime });
-	lastTime = now;
-}
-
-export function printTimings(): void {
-	if (!ENABLED || timings.length === 0) return;
-	console.error("\n--- Startup Timings ---");
-	for (const t of timings) {
-		console.error(`  ${t.label}: ${t.ms}ms`);
-	}
-	console.error(`  TOTAL: ${timings.reduce((a, b) => a + b.ms, 0)}ms`);
-	console.error("------------------------\n");
-}