@oh-my-pi/pi-utils 12.10.1 → 12.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-utils",
-	"version": "12.10.1",
+	"version": "12.11.0",
 	"description": "Shared utilities for pi packages",
 	"keywords": ["utilities", "cli", "logging", "streams"],
 	"type": "module",

package/src/dirs.ts

@@ -9,7 +9,6 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { version } from "../package.json" with { type: "json" };
-import { $env } from "./env";
 
 /** App name (e.g. "omp") */
 export const APP_NAME: string = "omp";
@@ -54,16 +53,16 @@ export function setProjectDir(dir: string): void {
 
 /** Get the config root directory (~/.omp). */
 export function getConfigRootDir(): string {
-	return path.join(os.homedir(), $env.PI_CONFIG_DIR || CONFIG_DIR_NAME);
+	return path.join(os.homedir(), process.env.PI_CONFIG_DIR || CONFIG_DIR_NAME);
 }
 
-let agentDir = $env.PI_CODING_AGENT_DIR || path.join(getConfigRootDir(), "agent");
+let agentDir = process.env.PI_CODING_AGENT_DIR || path.join(getConfigRootDir(), "agent");
 
 /** Set the coding agent directory. */
 export function setAgentDir(dir: string): void {
 	agentDir = dir;
 	agentCache.clear();
-	$env.PI_CODING_AGENT_DIR = dir;
+	process.env.PI_CODING_AGENT_DIR = dir;
 }
 
 /** Get the agent config directory (~/.omp/agent). */
@@ -166,6 +165,11 @@ export function getPythonEnvDir(): string {
 	return getRootSubdir("python-env");
 }
 
+/** Get the puppeteer sandbox directory (~/.omp/puppeteer). */
+export function getPuppeteerDir(): string {
+	return getRootSubdir("puppeteer");
+}
+
 /** Get the worktree base directory (~/.omp/wt). */
 export function getWorktreeBaseDir(): string {
 	return getRootSubdir("wt");

package/src/env.ts

@@ -1,6 +1,7 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
+import { getAgentDir, getConfigRootDir } from "./dirs";
 
 /**
  * Parses a .env file synchronously and extracts key-value string pairs.
@@ -46,9 +47,11 @@ function parseEnvFile(filePath: string): Record<string, string> {
 
 // Eagerly parse the user's $HOME/.env and the current project's .env (from cwd)
 const homeEnv = parseEnvFile(path.join(os.homedir(), ".env"));
+const piEnv = parseEnvFile(path.join(getConfigRootDir(), ".env"));
+const agentEnv = parseEnvFile(path.join(getAgentDir(), ".env"));
 const projectEnv = parseEnvFile(path.join(process.cwd(), ".env"));
 
-for (const file of [projectEnv, homeEnv]) {
+for (const file of [projectEnv, agentEnv, piEnv, homeEnv]) {
 	for (const [key, value] of Object.entries(file)) {
 		if (!Bun.env[key]) {
 			Bun.env[key] = value;
@@ -64,3 +67,18 @@ for (const file of [projectEnv, homeEnv]) {
  * overrides (project, home) have been applied, so $env always reflects the correct values.
  */
 export const $env: Record<string, string> = Bun.env as Record<string, string>;
+
+/**
+ * Resolve the first environment variable value from the given keys.
+ * @param keys - The keys to resolve.
+ * @returns The first environment variable value, or undefined if no value is found.
+ */
+export function $pickenv(...keys: string[]): string | undefined {
+	for (const key of keys) {
+		const value = Bun.env[key]?.trim();
+		if (value) {
+			return value;
+		}
+	}
+	return undefined;
+}