@oh-my-pi/pi-utils 18.0.0 → 18.0.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+## [18.0.1] - 2026-08-23
+
+### Fixed
+
+- Fixed the Mermaid ASCII renderer throwing on left-to-right diagrams containing a `subgraph`, which made the fenced block fall back to raw source in the terminal. `offsetDrawingForSubgraphs` shifts every drawing coordinate to make room for subgraph borders that extend past the origin, but the canvas had already been sized from the pre-shift grid extents, so edges routed to the outermost column wrote past the allocation and `drawLine` threw on the missing column. The canvas and role canvas now grow by the same shift. ([#9340](https://github.com/can1357/oh-my-pi/issues/9340))
+- Fixed child shell environments inheriting Bun-autoloaded `.env.<mode>.local` values from the launch directory. ([#9290](https://github.com/can1357/oh-my-pi/issues/9290))
+
 ## [17.4.2] - 2026-08-21
 
 ### Fixed

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-utils",
-	"version": "18.0.0",
+	"version": "18.0.1",
 	"description": "Shared utilities for pi packages",
 	"homepage": "https://omp.sh",
 	"author": "Stencil Labs, Inc.",
@@ -31,7 +31,7 @@
 		"fmt": "biome format --write ."
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-natives": "18.0.0"
+		"@oh-my-pi/pi-natives": "18.0.1"
 	},
 	"devDependencies": {
 		"@types/bun": "^1.3.14"

package/src/env.ts

@@ -102,16 +102,39 @@ export function filterChildShellEnv(
 ): Record<string, string> {
 	const result = filterProcessEnv(env);
 	const projectEnv = parseEnvFile(path.join(cwd, ".env"));
-	const nodeEnvName = `.env.${env.NODE_ENV || "development"}`;
+	const launchNodeEnv = launchEnvValues ? launchEnvValues.get("NODE_ENV") : env.NODE_ENV;
+	const nodeEnvName = `.env.${launchNodeEnv || "development"}`;
 	const modeEnv = parseEnvFile(path.join(cwd, nodeEnvName));
 	const localEnv = parseEnvFile(path.join(cwd, ".env.local"));
-	const launchEnv = { ...projectEnv, ...modeEnv, ...localEnv };
+	const modeLocalEnv = parseEnvFile(path.join(cwd, `${nodeEnvName}.local`));
+	const launchEnv = { ...projectEnv, ...modeEnv, ...localEnv, ...modeLocalEnv };
 	const expandedLaunchEnv = {
 		...expandDotenvValues(projectEnv, result),
 		...expandDotenvValues(modeEnv, result),
 		...expandDotenvValues(localEnv, result),
+		...expandDotenvValues(modeLocalEnv, result),
 	};
-	for (const key in launchEnv) {
+	let fallbackLaunchEnv: Record<string, string> | undefined;
+	let expandedFallbackLaunchEnv: Record<string, string> | undefined;
+	if (!launchEnvValues && nodeEnvName !== ".env.development") {
+		const fallbackModeEnv = parseEnvFile(path.join(cwd, ".env.development"));
+		const fallbackModeLocalEnv = parseEnvFile(path.join(cwd, ".env.development.local"));
+		const candidate = { ...projectEnv, ...fallbackModeEnv, ...localEnv, ...fallbackModeLocalEnv };
+		const expandedCandidate = {
+			...expandDotenvValues(projectEnv, result),
+			...expandDotenvValues(fallbackModeEnv, result),
+			...expandDotenvValues(localEnv, result),
+			...expandDotenvValues(fallbackModeLocalEnv, result),
+		};
+		if (candidate.NODE_ENV === env.NODE_ENV || expandedCandidate.NODE_ENV === env.NODE_ENV) {
+			// Without a launch snapshot, NODE_ENV may itself have come from dotenv.
+			// Bun chose the default mode before loading it, so retain both candidates.
+			fallbackLaunchEnv = candidate;
+			expandedFallbackLaunchEnv = expandedCandidate;
+		}
+	}
+	const allLaunchEnv = fallbackLaunchEnv ? { ...launchEnv, ...fallbackLaunchEnv } : launchEnv;
+	for (const key in allLaunchEnv) {
 		const launchValue = launchEnvValues?.get(key);
 		if (launchValue !== undefined) {
 			// Launcher-owned name: it keeps the launcher's own value. Bun overwrites
@@ -119,7 +142,10 @@ export function filterChildShellEnv(
 			// value whenever what survived is exactly what the dotenv file defines.
 			if (
 				result[key] !== launchValue &&
-				(result[key] === launchEnv[key] || result[key] === expandedLaunchEnv[key])
+				(result[key] === launchEnv[key] ||
+					result[key] === expandedLaunchEnv[key] ||
+					result[key] === fallbackLaunchEnv?.[key] ||
+					result[key] === expandedFallbackLaunchEnv?.[key])
 			) {
 				result[key] = launchValue;
 			}
@@ -130,7 +156,12 @@ export function filterChildShellEnv(
 			// absent from it, or OMP itself injected the value — either way it came
 			// from a project dotenv file, not the parent shell.
 			delete result[key];
-		} else if (result[key] === launchEnv[key] || result[key] === expandedLaunchEnv[key]) {
+		} else if (
+			result[key] === launchEnv[key] ||
+			result[key] === expandedLaunchEnv[key] ||
+			result[key] === fallbackLaunchEnv?.[key] ||
+			result[key] === expandedFallbackLaunchEnv?.[key]
+		) {
 			// No launch-env snapshot (dotenv autoloaded without procfs): best-effort
 			// value match against the Bun-parsed dotenv.
 			delete result[key];

package/src/vendor/mermaid-ascii/ascii/grid.ts

@@ -11,7 +11,14 @@ import type {
   GridCoord, DrawingCoord, Direction, AsciiGraph, AsciiNode, AsciiSubgraph,
 } from './types'
 import { gridKey } from './types'
-import { mkCanvas, setCanvasSizeToGrid, setRoleCanvasSizeToGrid } from './canvas'
+import {
+  getCanvasSize,
+  increaseRoleCanvasSize,
+  increaseSize,
+  mkCanvas,
+  setCanvasSizeToGrid,
+  setRoleCanvasSizeToGrid,
+} from './canvas'
 import { determinePath, determineLabelLine } from './edge-routing'
 import { analyzeEdgeBundles, processBundles } from './edge-bundling'
 import { drawBox } from './draw'
@@ -374,6 +381,14 @@ export function offsetDrawingForSubgraphs(graph: AsciiGraph): void {
       node.drawingCoord.y += offsetY
     }
   }
+
+  // The canvas was sized from the pre-shift grid extents, but every drawing
+  // coordinate — including edge path endpoints, which gridToDrawingCoord
+  // offsets on read — now sits `offset` cells further out. Grow it to match,
+  // or drawing the rightmost/bottom-most edges writes past the allocation.
+  const [maxX, maxY] = getCanvasSize(graph.canvas)
+  increaseSize(graph.canvas, maxX + offsetX, maxY + offsetY)
+  increaseRoleCanvasSize(graph.roleCanvas, maxX + offsetX, maxY + offsetY)
 }
 
 // ============================================================================