@linxiraos/pi-utils 1.4.9 → 1.4.10

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [1.4.10] - 2026-11-05
+
+- Legacy OMP dotenv files are no longer loaded by default; set `ZETA_OMP_COMPAT=1` to opt into the read-only fallback. Zeta `.zeta` dotenv files keep precedence.
+
 ## [1.4.9] - 2026-11-03
 
 - Synced with upstream OMP v18.16.0; no package-specific user-visible changes.

package/dist/types/env.d.ts

@@ -44,6 +44,7 @@ export declare function getDotenvEnvValues(cwd?: string, env?: Record<string, st
  * only shell-identifier names and spawn-safe values.
  */
 export declare function parseEnvFile(filePath: string): Record<string, string>;
+export declare function isOmpCompatEnabled(env?: Record<string, string | undefined>): boolean;
 /**
  * Intentional re-export of Bun.env.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@linxiraos/pi-utils",
-	"version": "1.4.9",
+	"version": "1.4.10",
 	"description": "Shared utilities for pi packages",
 	"keywords": [
 		"utilities",
@@ -54,8 +54,8 @@
 		"fmt": "oxfmt --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts'"
 	},
 	"dependencies": {
-		"@linxiraos/pi-natives": "1.4.9",
-		"@linxiraos/pi-omptype": "1.4.9"
+		"@linxiraos/pi-natives": "1.4.10",
+		"@linxiraos/pi-omptype": "1.4.10"
 	},
 	"devDependencies": {
 		"@types/bun": "1.4.4"

package/src/env.ts

@@ -2,7 +2,7 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { parseEnv } from "node:util";
-import { getAgentDir, getConfigRootDir, getProjectDir, refreshDirsFromEnv } from "./dirs";
+import { getActiveProfile, getAgentDir, getConfigRootDir, getProjectDir, refreshDirsFromEnv } from "./dirs";
 import { isBunTestRuntime } from "./test-runtime";
 
 export * from "./test-runtime";
@@ -278,11 +278,55 @@ export function parseEnvFile(filePath: string): Record<string, string> {
 	return result;
 }
 
+// Read-only compatibility with the old OMP agent directory. Off by default:
+// external OMP configuration must be explicitly imported. Set
+// ZETA_OMP_COMPAT=1 in the shell or a Zeta dotenv file to enable both the
+// legacy dotenv fallback and the models.yml/agent.db overlay.
+export function isOmpCompatEnabled(env: Record<string, string | undefined> = Bun.env): boolean {
+	const value = env.ZETA_OMP_COMPAT;
+	if (!value) return false;
+	const normalized = value.toLowerCase();
+	return normalized === "1" || normalized === "true" || normalized === "yes" || normalized === "on";
+}
+
+function loadLegacyOmpEnv(): Record<string, string> {
+	const home = os.homedir();
+	const project = getProjectDir();
+	const profile = getActiveProfile();
+	const files = [
+		{ file: path.join(home, ".omp", ".env"), project: false },
+		{ file: path.join(home, ".omp", "agent", ".env"), project: false },
+		...(profile ? [{ file: path.join(home, ".omp", "profiles", profile, "agent", ".env"), project: false }] : []),
+		{ file: path.join(project, ".omp", ".env"), project: true },
+		{ file: path.join(project, ".omp", "agent", ".env"), project: true },
+	];
+	const merged: Record<string, string> = {};
+	const seen = new Set<string>();
+	for (const { file, project: projectFile } of files) {
+		if (seen.has(file)) continue;
+		seen.add(file);
+		for (const [key, value] of Object.entries(parseEnvFile(file))) {
+			merged[key] = value;
+			if (projectFile) projectEnvNamesLoadedByOmp.add(key);
+		}
+	}
+	return merged;
+}
+
 // 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(getProjectDir(), ".env"));
+// The switch itself may come from the shell or any Zeta dotenv file. Check the
+// same precedence before touching legacy OMP files; do not read them by default.
+const ompCompatValue =
+	Bun.env.ZETA_OMP_COMPAT ??
+	projectEnv.ZETA_OMP_COMPAT ??
+	agentEnv.ZETA_OMP_COMPAT ??
+	piEnv.ZETA_OMP_COMPAT ??
+	homeEnv.ZETA_OMP_COMPAT;
+const legacyOmpEnv = isOmpCompatEnabled({ ZETA_OMP_COMPAT: ompCompatValue }) ? loadLegacyOmpEnv() : {};
 
 for (const key of Object.keys(Bun.env)) {
 	const value = Bun.env[key];
@@ -291,7 +335,7 @@ for (const key of Object.keys(Bun.env)) {
 	}
 }
 
-for (const file of [projectEnv, agentEnv, piEnv, homeEnv]) {
+for (const file of [projectEnv, agentEnv, piEnv, homeEnv, legacyOmpEnv]) {
 	for (const key in file) {
 		if (!isMacosMallocStackLoggingEnvName(key) && !Bun.env[key]) {
 			Bun.env[key] = file[key];