@oh-my-pi/pi-utils 18.8.6 → 18.8.8

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## [Unreleased]
 
+## [18.8.8] - 2026-10-10
+
+### Fixed
+
+- Fixed `formatDuration` printing `60.0s` for durations just under a minute; they now read `1m` ([#15121](https://github.com/can1357/oh-my-pi/pull/15121) by [@H4vC](https://github.com/H4vC))
+
+## [18.8.7] - 2026-10-09
+
+### Added
+
+- Added `getNativeGrammarsDir()`, where the native addon loads downloaded tree-sitter grammars from (`~/.omp/natives/grammars`).
+
+### Fixed
+
+- Fixed the virtual terminal misreading private CSI sequences such as kitty keyboard `CSI < u` and modifyOtherKeys `CSI > 4;1 m` as cursor restores or text styling, which garbled replayed PTY output.
+
 ## [18.8.1] - 2026-10-07
 
 ### Added

package/dist/types/dirs.d.ts

@@ -247,6 +247,12 @@ export declare function getAvatarCacheDir(): string;
 export declare function getFastembedCacheDir(): string;
 /** Get the on-demand fastembed runtime install root (~/.omp/cache/fastembed-runtime). */
 export declare function getFastembedRuntimeDir(): string;
+/**
+ * Get the directory the native addon loads downloaded tree-sitter wasm grammars
+ * from (`<natives dir>/grammars`, ~/.omp/natives/grammars). The natives loader
+ * configures the addon with the same path.
+ */
+export declare function getNativeGrammarsDir(): string;
 /** Get the natives directory. PI_NATIVES_DIR overrides the usual cache root; relative values are ignored. */
 export declare function getNativesDir(): string;
 /** Get the stats database path (~/.omp/stats.db). */

package/dist/types/temp.d.ts

@@ -1,3 +1,10 @@
+/**
+ * Owned temporary directory, removed via `remove()` or `using`/`await using`.
+ *
+ * Prefixes follow `mkdtemp`: `"@name-"` creates under the OS temp dir, any other
+ * prefix is a path (a bare `"name-"` lands in the process cwd), and no prefix
+ * means `"@pi-temp-"`.
+ */
 export declare class TempDir {
     #private;
     private constructor();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-utils",
-	"version": "18.8.6",
+	"version": "18.8.8",
 	"description": "Shared utilities for pi packages",
 	"keywords": [
 		"cli",
@@ -57,7 +57,7 @@
 		"fmt": "oxfmt --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts'"
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-natives": "18.8.6"
+		"@oh-my-pi/pi-natives": "18.8.8"
 	},
 	"devDependencies": {
 		"@types/bun": "^1.3.14"

package/src/dirs.ts

@@ -865,6 +865,15 @@ export function getFastembedRuntimeDir(): string {
 	return dirs.rootSubdir(path.join("cache", "fastembed-runtime"), "cache");
 }
 
+/**
+ * Get the directory the native addon loads downloaded tree-sitter wasm grammars
+ * from (`<natives dir>/grammars`, ~/.omp/natives/grammars). The natives loader
+ * configures the addon with the same path.
+ */
+export function getNativeGrammarsDir(): string {
+	return path.join(getNativesDir(), "grammars");
+}
+
 /** Get the natives directory. PI_NATIVES_DIR overrides the usual cache root; relative values are ignored. */
 export function getNativesDir(): string {
 	return resolveAbsoluteDir(process.env.PI_NATIVES_DIR) ?? dirs.rootSubdir("natives", "cache");

package/src/format.ts

@@ -10,7 +10,11 @@ const DAY = 24 * HOUR;
 export function formatDuration(ms: number): string {
 	if (!Number.isFinite(ms) || ms <= 0) return "0ms";
 	if (ms < SEC) return `${Math.floor(ms)}ms`;
-	if (ms < MIN) return `${(ms / SEC).toFixed(1)}s`;
+	if (ms < MIN) {
+		// Round to tenths first: `toFixed(1)` alone turns 59.95s+ into an impossible `60.0s`.
+		const tenths = Math.round(ms / 100);
+		return tenths < 600 ? `${(tenths / 10).toFixed(1)}s` : "1m";
+	}
 	if (ms < HOUR) {
 		const mins = Math.floor(ms / MIN);
 		const secs = Math.floor((ms % MIN) / SEC);

package/src/temp.ts

@@ -3,6 +3,13 @@ import * as fsPromises from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
 
+/**
+ * Owned temporary directory, removed via `remove()` or `using`/`await using`.
+ *
+ * Prefixes follow `mkdtemp`: `"@name-"` creates under the OS temp dir, any other
+ * prefix is a path (a bare `"name-"` lands in the process cwd), and no prefix
+ * means `"@pi-temp-"`.
+ */
 export class TempDir {
 	#path: string;
 	private constructor(path: string) {

package/src/vterm/terminal.ts

@@ -319,17 +319,38 @@ export class Terminal {
 		}
 	}
 
+	/**
+	 * Dispatches a CSI sequence on its whole identifier (private prefix,
+	 * intermediates, final), dropping the ones without a handler as xterm does:
+	 * `CSI < u` pops the kitty keyboard stack rather than restoring the cursor,
+	 * `CSI > 4;1 m` sets modifyOtherKeys rather than SGR, and `CSI 0 SP q` sets
+	 * the cursor shape rather than anything this buffer models.
+	 */
 	#handleCsi(raw: string, final: string): void {
-		const privateMode = raw.startsWith("?");
-		const greater = raw.startsWith(">");
-		const body = privateMode || greater ? raw.slice(1) : raw;
-		const params =
-			parseCsiParams(body) ??
-			body
-				.replaceAll(":", ";")
-				.split(";")
-				.map(value => (value === "" ? 0 : Number(value)));
+		const marker = raw.charCodeAt(0);
+		// `<`, `=`, `>`, `?` open a private sequence family.
+		const prefixed = marker >= 0x3c && marker <= 0x3f;
+		// Null when intermediates or a misplaced private marker follow the parameters.
+		const params = parseCsiParams(prefixed ? raw.slice(1) : raw);
+		if (!params) return;
 		const first = params[0] ?? 0;
+		if (prefixed) {
+			if (marker !== 0x3f) return;
+			switch (final) {
+				case "h":
+				case "l":
+					this.#setModes(params, true, final === "h");
+					break;
+				// DECSED/DECSEL: no cell is ever protected, so selective erase is plain erase.
+				case "J":
+					this.#eraseDisplay(first);
+					break;
+				case "K":
+					this.#eraseLine(first);
+					break;
+			}
+			return;
+		}
 		const amount = Math.max(1, first);
 		switch (final) {
 			case "A":
@@ -399,7 +420,7 @@ export class Terminal {
 				this.#setRendition(params);
 				break;
 			case "r":
-				if (!privateMode) this.#setScrollRegion(params);
+				this.#setScrollRegion(params);
 				break;
 			case "s":
 				this.#saveCursor();
@@ -409,14 +430,13 @@ export class Terminal {
 				break;
 			case "h":
 			case "l":
-				this.#setModes(params, privateMode, final === "h");
+				this.#setModes(params, false, final === "h");
 				break;
 			case "n":
-				if (!privateMode && first === 6)
-					this.#emitData(`\x1b[${this.#active.cursorY + 1};${this.#active.cursorX + 1}R`);
+				if (first === 6) this.#emitData(`\x1b[${this.#active.cursorY + 1};${this.#active.cursorX + 1}R`);
 				break;
 			case "c":
-				if (!greater) this.#emitData("\x1b[?1;2c");
+				this.#emitData("\x1b[?1;2c");
 				break;
 		}
 	}