@oh-my-pi/pi-utils 14.5.11 → 14.5.13

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-utils",
-	"version": "14.5.11",
+	"version": "14.5.13",
 	"description": "Shared utilities for pi packages",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -38,7 +38,7 @@
 	},
 	"devDependencies": {
 		"@types/bun": "^1.3",
-		"@oh-my-pi/pi-natives": "14.5.11"
+		"@oh-my-pi/pi-natives": "14.5.13"
 	},
 	"engines": {
 		"bun": ">=1.3.7"

package/src/frontmatter.ts

@@ -8,23 +8,33 @@ function stripHtmlComments(content: string): string {
 
 /** Convert kebab-case to camelCase (e.g. "thinking-level" -> "thinkingLevel") */
 function kebabToCamel(key: string): string {
+	if (!key.includes("-")) return key;
 	return key.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
 }
 
 /** Recursively normalize object keys from kebab-case to camelCase */
 function normalizeKeys<T>(obj: T): T {
-	if (obj === null || typeof obj !== "object") {
-		return obj;
-	}
+	if (obj === null || typeof obj !== "object") return obj;
 	if (Array.isArray(obj)) {
-		return obj.map(normalizeKeys) as T;
+		let changed = false;
+		const out: unknown[] = new Array(obj.length);
+		for (let i = 0; i < obj.length; i++) {
+			const v = obj[i];
+			const nv = normalizeKeys(v);
+			out[i] = nv;
+			if (nv !== v) changed = true;
+		}
+		return (changed ? (out as unknown) : obj) as T;
 	}
+	let changed = false;
 	const result: Record<string, unknown> = {};
 	for (const [key, value] of Object.entries(obj as Record<string, unknown>)) {
-		const normalizedKey = kebabToCamel(key);
-		result[normalizedKey] = normalizeKeys(value);
+		const nk = key.includes("-") ? kebabToCamel(key) : key;
+		const nv = normalizeKeys(value);
+		result[nk] = nv;
+		if (nk !== key || nv !== value) changed = true;
 	}
-	return result as T;
+	return (changed ? result : obj) as T;
 }
 
 export class FrontmatterError extends Error {

package/src/index.ts

@@ -15,7 +15,6 @@ export * from "./mime";
 export * from "./peek-file";
 export * as postmortem from "./postmortem";
 export * as procmgr from "./procmgr";
-export { setNativeKillTree } from "./procmgr";
 export * as prompt from "./prompt";
 export * as ptree from "./ptree";
 export { AbortError, ChildProcess, Exception, NonZeroExitError } from "./ptree";

package/src/logger.ts

@@ -4,6 +4,7 @@
  * Logs to ~/.omp/logs/ with size-based rotation, supporting concurrent omp instances.
  * Each log entry includes process.pid for traceability.
  */
+import { AsyncLocalStorage } from "node:async_hooks";
 import * as fs from "node:fs";
 import winston from "winston";
 import DailyRotateFile from "winston-daily-rotate-file";
@@ -96,109 +97,260 @@ export function debug(message: string, context?: Record<string, unknown>): void
 	}
 }
 
-const LOGGED_TIMING_THRESHOLD_MS = 5;
+const LOGGED_TIMING_THRESHOLD_MS = 0.5;
 
-/** Sequential wall-clock markers (next marker closes the previous segment). */
-let gTimings: [op: string, ts: number][] = [];
-
-/** Await-accurate durations (safe for parallel work; sums can overlap). */
-let gAsyncSpans: [op: string, durationMs: number][] = [];
+interface Span {
+	op: string;
+	start: number;
+	end?: number;
+	parent?: Span;
+	children: Span[];
+	/** Marker / point event without a duration. */
+	point?: boolean;
+}
 
-/** Whether to record timings. */
+const spanStorage = new AsyncLocalStorage<Span>();
+let gRootSpan: Span | undefined;
 let gRecordTimings = false;
 
 /**
- * Print collected timings to stderr.
- * Wall segments are gaps between consecutive {@link time} markers only; they are wrong when
- * concurrent code also calls {@link time} (e.g. parallel capability loads). Use {@link timeAsync}
- * for those awaits instead.
+ * Print collected timings as an indented tree.
+ * Each span shows wall duration; parents with children also show "(self)" for unattributed time.
+ * Sibling spans are sorted by start time. Spans whose intervals overlap with siblings ran in parallel.
  */
 export function printTimings(): void {
-	if (!gRecordTimings || gTimings.length === 0) {
+	if (!gRecordTimings || !gRootSpan) {
 		console.error("\n--- Startup Timings ---\n(no markers)\n");
 		return;
 	}
 
-	const endTs = performance.now();
-	gTimings.push(["(end)", endTs]);
-
-	console.error("\n--- Startup timings (wall segments between time() markers) ---");
-	const firstTs = gTimings[0][1];
-	for (let i = 0; i < gTimings.length - 1; i++) {
-		const [op, ts] = gTimings[i];
-		const [, nextTs] = gTimings[i + 1];
-		const dur = nextTs - ts;
-		if (dur > LOGGED_TIMING_THRESHOLD_MS) {
-			console.error(`  ${op}: ${dur}ms`);
-		}
+	gRootSpan.end = performance.now();
+	const lines: string[] = [];
+	lines.push("");
+	lines.push("--- Startup timings (hierarchical) ---");
+	const work: Span[] = [];
+	const loads: Span[] = [];
+	for (const child of gRootSpan.children) {
+		if (isModuleLoadSpan(child)) loads.push(child);
+		else work.push(child);
 	}
-	console.error(`  span (first marker → end): ${endTs - firstTs}ms`);
-
-	if (gAsyncSpans.length > 0) {
-		console.error("\n--- Async (await-accurate; parallel spans may overlap) ---");
-		for (const [op, dur] of gAsyncSpans) {
-			if (dur > LOGGED_TIMING_THRESHOLD_MS) {
-				console.error(`  ${op}: ${dur}ms`);
-			}
-		}
+	for (const child of work.sort((a, b) => a.start - b.start)) {
+		printSpan(child, 0, lines);
 	}
-
-	console.error("------------------------\n");
-
-	gTimings.pop();
+	if (loads.length > 0) {
+		printModuleLoadSummary(loads, 0, lines);
+	}
+	const totalMs = (gRootSpan.end - gRootSpan.start).toFixed(1);
+	lines.push(`Total: ${totalMs}ms`);
+	lines.push("--------------------------------------");
+	lines.push("");
+	console.error(lines.join("\n"));
+	gRootSpan.end = undefined;
 }
 
 /**
- * Begin recording startup timings. Seeds the timeline so the first segment is meaningful.
+ * Begin recording startup timings under a new root span.
+ * Idempotent: a second call while already recording is a no-op so that side-effect
+ * starters (see module-timer.ts) and explicit starters (main.ts) can coexist.
  */
 export function startTiming(): void {
-	gTimings = [["(startup)", performance.now()]];
-	gAsyncSpans = [];
+	if (gRecordTimings) return;
+	gRootSpan = {
+		op: "(root)",
+		start: performance.now(),
+		parent: undefined,
+		children: [],
+	};
 	gRecordTimings = true;
 }
 
+/**
+ * Record an externally-measured span as a leaf child of the active span (or root
+ * when no span is active). Used by the module-load timing plugin to splice load
+ * events into the tree retroactively.
+ */
+export function recordModuleLoadSpan(path: string, start: number, durationMs: number): void {
+	if (!gRecordTimings || !gRootSpan) return;
+	const parent = spanStorage.getStore() ?? gRootSpan;
+	const span: Span = {
+		op: `load:${shortenLoadPath(path)}`,
+		start,
+		end: start + durationMs,
+		parent,
+		children: [],
+	};
+	parent.children.push(span);
+}
+
+function shortenLoadPath(p: string): string {
+	const cwd = process.cwd();
+	if (p.startsWith(`${cwd}/`)) return p.slice(cwd.length + 1);
+	const home = process.env.HOME;
+	if (home && p.startsWith(`${home}/`)) return `~/${p.slice(home.length + 1)}`;
+	return p;
+}
+
 /**
  * End timing window and clear buffers.
  */
 export function endTiming(): void {
-	gTimings = [];
-	gAsyncSpans = [];
+	gRootSpan = undefined;
 	gRecordTimings = false;
 }
 
-function recordAsyncSpan(op: string, start: number): void {
-	const dur = performance.now() - start;
-	if (dur > LOGGED_TIMING_THRESHOLD_MS) {
-		gAsyncSpans.push([op, dur]);
+function durationOf(span: Span): number {
+	if (span.point || span.end === undefined) return 0;
+	return span.end - span.start;
+}
+
+/** Self time = total - union of child intervals (handles parallel children correctly). */
+function selfTimeOf(span: Span): number {
+	const dur = durationOf(span);
+	if (span.children.length === 0 || span.point) return dur;
+	const intervals = span.children
+		.filter(c => !c.point && c.end !== undefined)
+		.map(c => [c.start, c.end as number] as const)
+		.sort((a, b) => a[0] - b[0]);
+	if (intervals.length === 0) return dur;
+	let union = 0;
+	let curStart = intervals[0][0];
+	let curEnd = intervals[0][1];
+	for (let i = 1; i < intervals.length; i++) {
+		const [s, e] = intervals[i];
+		if (s > curEnd) {
+			union += curEnd - curStart;
+			curStart = s;
+			curEnd = e;
+		} else if (e > curEnd) {
+			curEnd = e;
+		}
 	}
+	union += curEnd - curStart;
+	return Math.max(0, dur - union);
+}
+
+function fmtMs(ms: number): string {
+	if (ms < 1) return `${ms.toFixed(2)}ms`;
+	if (ms < 100) return `${ms.toFixed(1)}ms`;
+	return `${ms.toFixed(0)}ms`;
+}
+
+const MODULE_LOAD_PREFIX = "load:";
+const MODULE_LOAD_VERBOSE_TOP = 10;
+
+function isModuleLoadSpan(span: Span): boolean {
+	return span.op.startsWith(MODULE_LOAD_PREFIX);
+}
+
+function printSpan(span: Span, depth: number, lines: string[]): void {
+	const indent = "  ".repeat(depth);
+	if (span.point) {
+		lines.push(`${indent}• ${span.op}`);
+		return;
+	}
+	const dur = durationOf(span);
+	if (dur < LOGGED_TIMING_THRESHOLD_MS && span.children.length === 0) return;
+	const parallel = isParallel(span);
+	const tag = parallel ? " [parallel]" : "";
+	const self = selfTimeOf(span);
+	const selfStr = span.children.length > 0 && self > LOGGED_TIMING_THRESHOLD_MS ? ` (self ${fmtMs(self)})` : "";
+	lines.push(`${indent}${span.op}: ${fmtMs(dur)}${selfStr}${tag}`);
+
+	// Split children into work spans and module-load spans for summarization.
+	const work: Span[] = [];
+	const loads: Span[] = [];
+	for (const child of span.children) {
+		if (isModuleLoadSpan(child)) loads.push(child);
+		else work.push(child);
+	}
+	for (const child of work.sort((a, b) => a.start - b.start)) {
+		printSpan(child, depth + 1, lines);
+	}
+	if (loads.length > 0) {
+		printModuleLoadSummary(loads, depth + 1, lines);
+	}
+}
+
+/** Collapse the (typically hundreds of) module-load spans into one summary line. */
+function printModuleLoadSummary(loads: Span[], depth: number, lines: string[]): void {
+	const childIndent = "  ".repeat(depth);
+	const grandIndent = "  ".repeat(depth + 1);
+	let unionStart = Number.POSITIVE_INFINITY;
+	let unionEnd = 0;
+	let totalSelf = 0;
+	for (const span of loads) {
+		if (span.end === undefined) continue;
+		if (span.start < unionStart) unionStart = span.start;
+		if (span.end > unionEnd) unionEnd = span.end;
+		totalSelf += span.end - span.start;
+	}
+	const wall = unionEnd > unionStart ? unionEnd - unionStart : 0;
+	lines.push(`${childIndent}(modules): ${loads.length} loaded, wall ${fmtMs(wall)}, sum ${fmtMs(totalSelf)}`);
+	const showAll = process.env.PI_TIMING === "full";
+	const sorted = [...loads].sort((a, b) => durationOf(b) - durationOf(a));
+	const visible = showAll ? sorted : sorted.slice(0, MODULE_LOAD_VERBOSE_TOP);
+	for (const span of visible) {
+		const dur = durationOf(span);
+		if (dur < LOGGED_TIMING_THRESHOLD_MS) break;
+		const tag = isParallel(span) ? " [parallel]" : "";
+		lines.push(`${grandIndent}${span.op}: ${fmtMs(dur)}${tag}`);
+	}
+	if (!showAll && sorted.length > MODULE_LOAD_VERBOSE_TOP) {
+		lines.push(`${grandIndent}… ${sorted.length - MODULE_LOAD_VERBOSE_TOP} more (PI_TIMING=full to show all)`);
+	}
+}
+
+/** A span is parallel if it overlaps a sibling that started before it. */
+function isParallel(span: Span): boolean {
+	const parent = span.parent;
+	if (!parent || span.end === undefined) return false;
+	for (const sibling of parent.children) {
+		if (sibling === span || sibling.end === undefined || sibling.point) continue;
+		// Overlap test: A overlaps B iff A.start < B.end && B.start < A.end
+		if (sibling.start < span.end && span.start < sibling.end) return true;
+	}
+	return false;
 }
 
 /**
- * Wall-clock segment boundary: duration for this label runs until the next {@link time} call.
- * Do not use across `await` when other tasks may call {@link time}; use {@link timeAsync} for the awaited work.
+ * Time a span. Three forms:
+ *   time(op)                    — point event (zero-duration breadcrumb)
+ *   time(op, fn, ...args)        — wrap fn in a span; returns fn's return value (sync or Promise)
+ *
+ * Spans nest hierarchically via AsyncLocalStorage: a child started inside another span's fn
+ * (even across awaits) becomes that span's child. Parallel children are recorded as siblings
+ * with overlapping intervals.
  */
 export function time(op: string): void;
 export function time<T, A extends unknown[]>(op: string, fn: (...args: A) => T, ...args: A): T;
 export function time<T, A extends unknown[]>(op: string, fn?: (...args: A) => T, ...args: A): T | undefined {
+	if (!gRecordTimings || !gRootSpan) {
+		if (fn === undefined) return undefined as T;
+		return fn(...args);
+	}
+
+	const parent = spanStorage.getStore() ?? gRootSpan;
+	const span: Span = { op, start: performance.now(), parent, children: [] };
+	parent.children.push(span);
+
 	if (fn === undefined) {
-		if (gRecordTimings) {
-			gTimings.push([op, performance.now()]);
-		}
+		span.end = span.start;
+		span.point = true;
 		return undefined as T;
-	} else if (gRecordTimings) {
-		const start = performance.now();
-		try {
-			const result = fn(...args);
-			if (result instanceof Promise) {
-				return result.finally(recordAsyncSpan.bind(null, op, start)) as T;
-			}
-			recordAsyncSpan(op, start);
-			return result;
-		} catch (error) {
-			recordAsyncSpan(op, start);
-			throw error;
+	}
+
+	const finish = (): void => {
+		span.end = performance.now();
+	};
+	try {
+		const result = spanStorage.run(span, () => fn(...args));
+		if (result instanceof Promise) {
+			return result.finally(finish) as T;
 		}
-	} else {
-		return fn(...args);
+		finish();
+		return result;
+	} catch (error) {
+		finish();
+		throw error;
 	}
 }

package/src/procmgr.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
-import path from "node:path";
-import * as timers from "node:timers";
+import * as path from "node:path";
+import { Process, ProcessStatus } from "@oh-my-pi/pi-natives";
 import type { Subprocess } from "bun";
 import { $env } from "./env";
 import { $which } from "./which";
@@ -14,9 +14,6 @@ export interface ShellConfig {
 
 let cachedShellConfig: ShellConfig | null = null;
 
-const IS_WINDOWS = process.platform === "win32";
-const TERM_SIGNAL = IS_WINDOWS ? undefined : "SIGTERM";
-
 /**
  * Check if a shell binary is executable.
  */
@@ -174,64 +171,20 @@ export function getShellConfig(customShellPath?: string): ShellConfig {
 	return cachedShellConfig;
 }
 
-/**
- * Function signature for native process tree killing.
- * Returns the number of processes killed.
- */
-export type KillTreeFn = (pid: number, signal: number) => number;
-
-/**
- * Global native kill tree function, injected by pi-natives when loaded.
- * Falls back to platform-specific behavior if not set.
- */
-export let nativeKillTree: KillTreeFn | undefined;
-
-/**
- * Set the native kill tree function. Called by pi-natives on load.
- */
-export function setNativeKillTree(fn: KillTreeFn): void {
-	nativeKillTree = fn;
-}
-
-/**
- * Options for terminating a process and all its descendants.
- */
-export interface TerminateOptions {
-	/** The process to terminate */
-	target: Subprocess | number;
-	/** Whether to terminate the process tree (all descendants) */
-	group?: boolean;
-	/** Timeout in milliseconds */
-	timeout?: number;
-	/** Abort signal */
-	signal?: AbortSignal;
-}
-
 /**
  * Check if a process is running.
  */
 export function isPidRunning(pid: number | Subprocess): boolean {
-	try {
-		if (typeof pid === "number") {
-			process.kill(pid, 0);
-		} else {
-			if (pid.killed) return false;
-			if (pid.exitCode !== null) return false;
-		}
+	if (typeof pid !== "number") {
+		if (pid.killed) return false;
+		if (pid.exitCode !== null) return false;
 		return true;
-	} catch {
-		return false;
 	}
-}
 
-function joinSignals(...sigs: (AbortSignal | null | undefined)[]): AbortSignal | undefined {
-	const nn = sigs.filter(Boolean) as AbortSignal[];
-	if (nn.length === 0) return undefined;
-	if (nn.length === 1) return nn[0];
-	return AbortSignal.any(nn);
+	return Process.fromPid(pid)?.status() === ProcessStatus.Running;
 }
 
-export function onProcessExit(proc: Subprocess | number, abortSignal?: AbortSignal): Promise<boolean> {
+export async function onProcessExit(proc: Subprocess | number, abortSignal?: AbortSignal): Promise<boolean> {
 	if (typeof proc !== "number") {
 		return proc.exited.then(
 			() => true,
@@ -239,88 +192,5 @@ export function onProcessExit(proc: Subprocess | number, abortSignal?: AbortSign
 		);
 	}
 
-	if (!isPidRunning(proc)) {
-		return Promise.resolve(true);
-	}
-
-	const { promise, resolve, reject } = Promise.withResolvers<boolean>();
-	const localAbortController = new AbortController();
-
-	const timer = timers.promises.setInterval(300, null, {
-		signal: joinSignals(abortSignal, localAbortController.signal),
-	});
-	void (async () => {
-		try {
-			for await (const _ of timer) {
-				if (!isPidRunning(proc)) {
-					resolve(true);
-					break;
-				}
-			}
-		} catch (error) {
-			return reject(error);
-		} finally {
-			localAbortController.abort();
-		}
-		resolve(false);
-	})();
-
-	return promise;
-}
-
-/**
- * Terminate a process and all its descendants.
- */
-export async function terminate(options: TerminateOptions): Promise<boolean> {
-	const { target, group = false, timeout = 5000, signal } = options;
-
-	const abortController = new AbortController();
-	try {
-		const abortSignal = joinSignals(signal, abortController.signal);
-
-		// Determine PID
-		let pid: number | undefined;
-		const exitPromise = onProcessExit(target, abortSignal);
-		if (typeof target === "number") {
-			pid = target;
-		} else {
-			pid = target.pid;
-			if (target.killed) return true;
-		}
-
-		// Give it a moment to exit gracefully first.
-		try {
-			if (typeof target === "number") {
-				process.kill(target, TERM_SIGNAL);
-			} else {
-				target.kill(TERM_SIGNAL);
-			}
-
-			if (exitPromise) {
-				const exited = await Promise.race([Bun.sleep(1000).then(() => false), exitPromise]);
-				if (exited) return true;
-			}
-		} catch {}
-
-		if (nativeKillTree) {
-			nativeKillTree(pid, 9);
-		} else {
-			if (group && !IS_WINDOWS) {
-				try {
-					process.kill(-pid, "SIGKILL");
-				} catch {}
-			}
-			try {
-				if (typeof target === "number") {
-					process.kill(target, "SIGKILL");
-				} else {
-					target.kill("SIGKILL");
-				}
-			} catch {}
-		}
-
-		return await Promise.race([Bun.sleep(timeout).then(() => false), exitPromise]);
-	} finally {
-		abortController.abort();
-	}
+	return (await Process.fromPid(proc)?.waitForExit({ signal: abortSignal })) ?? true;
 }

package/src/prompt.ts

@@ -418,8 +418,17 @@ function disambiguateClosingBraces(template: string): string {
 	return template.replace(/\}\}(\}+)/g, "}}{{!---}}$1");
 }
 
+const compiledTemplateCache = new Map<string, (context: TemplateContext) => string>();
+
 export function compile(template: string): (context: TemplateContext) => string {
-	return handlebars.compile(disambiguateClosingBraces(template), { noEscape: true, strict: false });
+	const disambiguated = disambiguateClosingBraces(template);
+	const cached = compiledTemplateCache.get(disambiguated);
+	if (cached) return cached;
+	const compiled = handlebars.compile(disambiguated, { noEscape: true, strict: false }) as (
+		context: TemplateContext,
+	) => string;
+	compiledTemplateCache.set(disambiguated, compiled);
+	return compiled;
 }
 
 export function render(template: string, context: TemplateContext = {}): string {

package/src/ptree.ts

@@ -6,8 +6,9 @@
  * - Cross-platform tree kill for process groups (Windows taskkill, Unix -pid).
  * - Convenience helpers: captureText / execText, AbortSignal, timeouts.
  */
+
+import { Process } from "@oh-my-pi/pi-natives";
 import type { Spawn, Subprocess } from "bun";
-import { terminate } from "./procmgr";
 
 type InMask = "pipe" | "ignore" | Buffer | Uint8Array | null;
 
@@ -215,7 +216,10 @@ export class ChildProcess<In extends InMask = InMask> {
 
 	kill(reason?: Exception) {
 		if (reason && !this.#exitReasonPending) this.#exitReasonPending = reason;
-		if (!this.proc.killed) void terminate({ target: this.proc });
+		if (!this.proc.killed)
+			void Process.fromPid(this.proc.pid)
+				?.terminate()
+				?.catch(e => void e);
 	}
 
 	// ── Output helpers ───────────────────────────────────────────────────