@oh-my-pi/pi-natives 10.0.0 → 10.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-natives",
-	"version": "10.0.0",
+	"version": "10.2.1",
 	"description": "Native Rust functionality via N-API",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -32,7 +32,7 @@
 		"directory": "packages/natives"
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-utils": "10.0.0"
+		"@oh-my-pi/pi-utils": "10.2.1"
 	},
 	"devDependencies": {
 		"@types/node": "^25.0.10"

package/src/bindings.ts

@@ -6,8 +6,18 @@
 /** Callback type for threadsafe functions from N-API. */
 export type TsFunc<T> = (error: Error | null, value: T) => void;
 
+/** Options for cancellable operations. */
+export interface Cancellable {
+	/** Timeout in milliseconds for the operation. */
+	timeoutMs?: number;
+	/** Abort signal for cancelling the operation. */
+	signal?: AbortSignal;
+}
+
 /**
  * Native bindings interface.
  * Extended by each module via declaration merging.
  */
-export interface NativeBindings {}
+export interface NativeBindings {
+	cancelWork(id: number): void;
+}

package/src/{find → glob}/index.ts

@@ -4,15 +4,16 @@
 
 import * as path from "node:path";
 import { native } from "../native";
-import type { FindMatch, FindOptions, FindResult } from "./types";
+import type { GlobMatch, GlobOptions, GlobResult } from "./types";
 
-export type { FindMatch, FindOptions, FindResult } from "./types";
+export type { GlobMatch, GlobOptions, GlobResult } from "./types";
+export { FileType } from "./types";
 
 /**
  * Find files matching a glob pattern.
  * Respects .gitignore by default.
  */
-export async function find(options: FindOptions, onMatch?: (match: FindMatch) => void): Promise<FindResult> {
+export async function glob(options: GlobOptions, onMatch?: (match: GlobMatch) => void): Promise<GlobResult> {
 	const searchPath = path.resolve(options.path);
 	const pattern = options.pattern || "*";
 
@@ -20,9 +21,9 @@ export async function find(options: FindOptions, onMatch?: (match: FindMatch) =>
 	const globPattern = pattern.includes("/") || pattern.startsWith("**") ? pattern : `**/${pattern}`;
 
 	// napi-rs ThreadsafeFunction passes (error, value) - skip callback on error
-	const cb = onMatch ? (err: Error | null, m: FindMatch) => !err && onMatch(m) : undefined;
+	const cb = onMatch ? (err: Error | null, m: GlobMatch) => !err && onMatch(m) : undefined;
 
-	return native.find(
+	return native.glob(
 		{
 			...options,
 			path: searchPath,

package/src/{find → glob}/types.ts

@@ -2,16 +2,25 @@
  * Types for native find API.
  */
 
-import type { TsFunc } from "../bindings";
+import type { Cancellable, TsFunc } from "../bindings";
+
+export const enum FileType {
+	/** A regular file. */
+	File = 1,
+	/** A directory. */
+	Dir = 2,
+	/** A symlink. */
+	Symlink = 3,
+}
 
 /** Options for discovering files and directories. */
-export interface FindOptions {
+export interface GlobOptions extends Cancellable {
 	/** Glob pattern to match (e.g., `*.ts`). */
 	pattern: string;
 	/** Directory to search. */
 	path: string;
 	/** Filter by file type: "file", "dir", or "symlink". */
-	fileType?: "file" | "dir" | "symlink";
+	fileType?: FileType;
 	/** Include hidden files (default: false). */
 	hidden?: boolean;
 	/** Maximum number of results to return. */
@@ -23,19 +32,19 @@ export interface FindOptions {
 }
 
 /** A single filesystem match. */
-export interface FindMatch {
+export interface GlobMatch {
 	/** Relative path from the search root. */
 	path: string;
 	/** Resolved filesystem type for the match. */
-	fileType: "file" | "dir" | "symlink";
+	fileType: FileType;
 	/** Modification time in milliseconds since epoch, if available. */
 	mtime?: number;
 }
 
 /** Result of a find operation. */
-export interface FindResult {
+export interface GlobResult {
 	/** Matched filesystem entries. */
-	matches: FindMatch[];
+	matches: GlobMatch[];
 	/** Number of matches returned after limits are applied. */
 	totalMatches: number;
 }
@@ -47,6 +56,6 @@ declare module "../bindings" {
 		 * @param options Search options that control globbing and filters.
 		 * @param onMatch Optional callback for streaming matches as they are found.
 		 */
-		find(options: FindOptions, onMatch?: TsFunc<FindMatch>): Promise<FindResult>;
+		glob(options: GlobOptions, onMatch?: TsFunc<GlobMatch>): Promise<GlobResult>;
 	}
 }

package/src/grep/index.ts

@@ -3,7 +3,6 @@
  */
 
 import { native } from "../native";
-import { wrapRequestOptions } from "../request-options";
 import type {
 	ContextLine,
 	FuzzyFindMatch,
@@ -36,7 +35,7 @@ export type {
 export async function grep(options: GrepOptions, onMatch?: (match: GrepMatch) => void): Promise<GrepResult> {
 	// napi-rs ThreadsafeFunction passes (error, value) - skip callback on error
 	const cb = onMatch ? (err: Error | null, m: GrepMatch) => !err && onMatch(m) : undefined;
-	return wrapRequestOptions(() => native.grep(options, cb), options);
+	return native.grep(options, cb);
 }
 
 /**
@@ -69,5 +68,5 @@ export function hasMatch(
  * (case-insensitive). Respects .gitignore by default.
  */
 export async function fuzzyFind(options: FuzzyFindOptions): Promise<FuzzyFindResult> {
-	return wrapRequestOptions(() => native.fuzzyFind(options), options);
+	return native.fuzzyFind(options);
 }

package/src/grep/types.ts

@@ -2,11 +2,10 @@
  * Types for grep/search operations.
  */
 
-import type { TsFunc } from "../bindings";
-import type { RequestOptions } from "../request-options";
+import type { Cancellable, TsFunc } from "../bindings";
 
 /** Options for searching files. */
-export interface GrepOptions extends RequestOptions {
+export interface GrepOptions extends Cancellable {
 	/** Regex pattern to search for */
 	pattern: string;
 	/** Directory or file to search */
@@ -129,7 +128,7 @@ export type WasmMatch = SearchMatch;
 export type WasmSearchResult = SearchResult;
 
 /** Options for fuzzy file path search. */
-export interface FuzzyFindOptions extends RequestOptions {
+export interface FuzzyFindOptions extends Cancellable {
 	/** Substring query to match against file paths (case-insensitive). */
 	query: string;
 	/** Directory to search. */

package/src/html/index.ts

@@ -3,7 +3,6 @@
  */
 
 import { native } from "../native";
-import { type RequestOptions, wrapRequestOptions } from "../request-options";
 import type { HtmlToMarkdownOptions } from "./types";
 
 export type { HtmlToMarkdownOptions } from "./types";
@@ -15,10 +14,6 @@ export type { HtmlToMarkdownOptions } from "./types";
  * @param options - Conversion options
  * @returns Markdown text
  */
-export async function htmlToMarkdown(
-	html: string,
-	options?: HtmlToMarkdownOptions,
-	req?: RequestOptions,
-): Promise<string> {
-	return wrapRequestOptions(() => native.htmlToMarkdown(html, options), req);
+export async function htmlToMarkdown(html: string, options?: HtmlToMarkdownOptions): Promise<string> {
+	return native.htmlToMarkdown(html, options);
 }

package/src/index.ts

@@ -2,8 +2,6 @@
  * Native utilities powered by N-API.
  */
 
-export type { RequestOptions } from "./request-options";
-
 // =============================================================================
 // Clipboard
 // =============================================================================
@@ -30,10 +28,16 @@ export {
 } from "./grep";
 
 // =============================================================================
-// Find (file discovery)
+// Glob (file discovery)
 // =============================================================================
 
-export { type FindMatch, type FindOptions, type FindResult, find } from "./find";
+export {
+	FileType,
+	type GlobMatch,
+	type GlobOptions,
+	type GlobResult,
+	glob,
+} from "./glob";
 
 // =============================================================================
 // Image processing (photon-compatible API)
@@ -98,7 +102,6 @@ export { getSystemInfo, type SystemInfo } from "./system-info";
 // =============================================================================
 
 export {
-	abortShellExecution,
 	executeShell,
 	Shell,
 	type ShellExecuteOptions,

package/src/native.ts

@@ -14,7 +14,7 @@ import { embeddedAddon } from "./embedded-addon";
 
 // Import types to trigger declaration merging
 import "./clipboard/types";
-import "./find/types";
+import "./glob/types";
 import "./grep/types";
 import "./highlight/types";
 import "./html/types";
@@ -24,6 +24,7 @@ import "./ps/types";
 import "./shell/types";
 import "./system-info/types";
 import "./text/types";
+import "./work/types";
 
 export type { NativeBindings, TsFunc } from "./bindings";
 
@@ -159,7 +160,7 @@ function validateNative(bindings: NativeBindings, source: string): void {
 
 	checkFn("copyToClipboard");
 	checkFn("readImageFromClipboard");
-	checkFn("find");
+	checkFn("glob");
 	checkFn("fuzzyFind");
 	checkFn("grep");
 	checkFn("search");
@@ -174,7 +175,6 @@ function validateNative(bindings: NativeBindings, source: string): void {
 	checkFn("extractSegments");
 	checkFn("matchesKittySequence");
 	checkFn("executeShell");
-	checkFn("abortShellExecution");
 	checkFn("Shell");
 	checkFn("parseKey");
 	checkFn("matchesLegacySequence");
@@ -184,6 +184,7 @@ function validateNative(bindings: NativeBindings, source: string): void {
 	checkFn("killTree");
 	checkFn("listDescendants");
 	checkFn("getSystemInfo");
+	checkFn("getWorkProfile");
 
 	if (missing.length) {
 		throw new Error(

package/src/shell/index.ts

@@ -3,20 +3,12 @@
  */
 
 import { native } from "../native";
-import type { ShellExecuteOptions, ShellExecuteResult, ShellOptions, ShellRunOptions, ShellRunResult } from "./types";
+import type { ShellExecuteOptions, ShellExecuteResult } from "./types";
 
 export type { ShellExecuteOptions, ShellExecuteResult, ShellOptions, ShellRunOptions, ShellRunResult } from "./types";
 
-export interface Shell {
-	run(options: ShellRunOptions, onChunk?: (error: Error | null, chunk: string) => void): Promise<ShellRunResult>;
-	abort(): void;
-}
-
-export interface ShellConstructor {
-	new (options?: ShellOptions): Shell;
-}
-
-export const Shell = native.Shell as ShellConstructor;
+export const { Shell } = native;
+export type Shell = import("./types").Shell;
 
 /**
  * Execute a shell command using brush-core.
@@ -32,12 +24,3 @@ export async function executeShell(
 	const wrappedCallback = onChunk ? (err: Error | null, chunk: string) => !err && onChunk(chunk) : undefined;
 	return native.executeShell(options, wrappedCallback);
 }
-
-/**
- * Abort a running shell execution.
- *
- * @param executionId - The execution ID to abort
- */
-export function abortShellExecution(executionId: string): void {
-	native.abortShellExecution(executionId);
-}

package/src/shell/types.ts

@@ -2,7 +2,7 @@
  * Types for shell execution via brush-core.
  */
 
-import type { TsFunc } from "../bindings";
+import type { Cancellable, TsFunc } from "../bindings";
 
 /**
  * Configuration for a persistent brush-core shell session.
@@ -17,15 +17,13 @@ export interface ShellOptions {
 /**
  * Options for running a single shell command.
  */
-export interface ShellRunOptions {
+export interface ShellRunOptions extends Cancellable {
 	/** The command to execute. */
 	command: string;
 	/** Working directory for command execution. */
 	cwd?: string;
 	/** Environment variables to apply for this command. */
 	env?: Record<string, string>;
-	/** Timeout in milliseconds. */
-	timeoutMs?: number;
 }
 
 /**
@@ -43,7 +41,7 @@ export interface ShellRunResult {
 /**
  * Internal options for the native brush-core binding.
  */
-export interface ShellExecuteOptions {
+export interface ShellExecuteOptions extends Cancellable {
 	/** The command to execute. */
 	command: string;
 	/** Working directory for command execution. */
@@ -52,12 +50,6 @@ export interface ShellExecuteOptions {
 	env?: Record<string, string>;
 	/** Environment variables to set once per session. */
 	sessionEnv?: Record<string, string>;
-	/** Timeout in milliseconds. */
-	timeoutMs?: number;
-	/** Unique identifier for this execution (used for abort). */
-	executionId: string;
-	/** Session key for persistent brush shell instances. */
-	sessionKey: string;
 	/** Optional snapshot path to source for bash sessions. */
 	snapshotPath?: string;
 }
@@ -67,7 +59,7 @@ export interface ShellExecuteOptions {
 export interface ShellExecuteResult extends ShellRunResult {}
 
 /** Native Shell class instance. */
-export interface NativeShell {
+export interface Shell {
 	/**
 	 * Run a command in the shell.
 	 * @param options Command execution options.
@@ -77,17 +69,18 @@ export interface NativeShell {
 	run(options: ShellRunOptions, onChunk?: TsFunc<string>): Promise<ShellRunResult>;
 	/**
 	 * Abort all running commands in this session.
+	 * @param reason Optional reason for the abort.
 	 */
-	abort(): void;
+	abort(reason?: string): void;
 }
 
 /** Native Shell class constructor. */
-export interface NativeShellConstructor {
+export interface ShellConstructor {
 	/**
 	 * Create a new shell session.
 	 * @param options Optional session configuration.
 	 */
-	new (options?: ShellOptions): NativeShell;
+	new (options?: ShellOptions): Shell;
 }
 
 declare module "../bindings" {
@@ -100,12 +93,8 @@ declare module "../bindings" {
 		 * @returns Promise resolving to the command result.
 		 */
 		executeShell(options: ShellExecuteOptions, onChunk?: TsFunc<string>): Promise<ShellExecuteResult>;
-		/**
-		 * Abort a running shell execution by ID.
-		 * @param executionId Execution identifier from ShellExecuteOptions.
-		 */
-		abortShellExecution(executionId: string): void;
+
 		/** Shell class constructor for creating sessions. */
-		Shell: NativeShellConstructor;
+		Shell: ShellConstructor;
 	}
 }

package/src/work/index.ts

@@ -0,0 +1,11 @@
+/**
+ * Work scheduling profiling via native instrumentation.
+ *
+ * Always-on profiling - samples are collected into a circular buffer.
+ * Call `getWorkProfile()` to retrieve recent activity.
+ */
+
+import { native } from "../native";
+
+export type { WorkProfile } from "./types";
+export const { getWorkProfile } = native;

package/src/work/types.ts

@@ -0,0 +1,31 @@
+/**
+ * Types for work scheduling profiling.
+ */
+
+/**
+ * Profiling results from work scheduling instrumentation.
+ */
+export interface WorkProfile {
+	/** Folded stack format for flamegraph tools. */
+	folded: string;
+	/** Markdown summary of profiling results. */
+	summary: string;
+	/** SVG flamegraph (if generation succeeded). */
+	svg: string | null;
+	/** Total work time in milliseconds. */
+	totalMs: number;
+	/** Number of samples collected. */
+	sampleCount: number;
+}
+
+declare module "../bindings" {
+	interface NativeBindings {
+		/**
+		 * Get work profile data from the last N seconds.
+		 *
+		 * Always-on profiling - samples are collected into a circular buffer.
+		 * Call this to retrieve recent activity.
+		 */
+		getWorkProfile(lastSeconds: number): WorkProfile;
+	}
+}

package/src/request-options.ts

@@ -1,94 +0,0 @@
-export interface RequestOptions {
-	timeoutMs?: number;
-	signal?: AbortSignal;
-}
-
-function abortReason(signal?: AbortSignal): Error {
-	if (!signal || !signal.reason) return new Error("Request aborted");
-	if (signal.reason instanceof Error) return signal.reason;
-	return new Error("Request aborted", { cause: signal.reason });
-}
-export async function wrapRequestOptions<T>(fn: () => Promise<T>, options?: RequestOptions): Promise<T> {
-	const timeoutMs = options?.timeoutMs ?? 0;
-	const signal = options?.signal;
-
-	// Fast path: no timeout + no signal
-	if (!signal && timeoutMs <= 0) return fn();
-
-	// If already aborted, fail immediately
-	if (signal?.aborted) throw abortReason(signal);
-
-	// If we only have an abort signal and no timeout, keep it simple.
-	if (signal && timeoutMs <= 0) {
-		return withAbortSignal(fn, signal);
-	}
-
-	return withTimeoutAndOptionalAbort(fn, timeoutMs, signal);
-}
-
-function withAbortSignal<T>(fn: () => Promise<T>, signal: AbortSignal): Promise<T> {
-	return new Promise<T>((resolve, reject) => {
-		const onAbort = () => {
-			signal.removeEventListener("abort", onAbort);
-			reject(abortReason(signal));
-		};
-
-		signal.addEventListener("abort", onAbort, { once: true });
-
-		// If it races and aborts right after addEventListener, `once` handles it,
-		// but we still want to short-circuit.
-		if (signal.aborted) return onAbort();
-
-		fn().then(
-			v => {
-				signal.removeEventListener("abort", onAbort);
-				resolve(v);
-			},
-			err => {
-				signal.removeEventListener("abort", onAbort);
-				reject(err);
-			},
-		);
-	});
-}
-
-function withTimeoutAndOptionalAbort<T>(fn: () => Promise<T>, timeoutMs: number, signal?: AbortSignal): Promise<T> {
-	return new Promise<T>((resolve, reject) => {
-		let settled = false;
-
-		let timeoutId: ReturnType<typeof setTimeout> | undefined;
-		const cleanup = () => {
-			if (timeoutId) {
-				clearTimeout(timeoutId);
-				timeoutId = undefined;
-			}
-			if (signal) signal.removeEventListener("abort", onAbort);
-		};
-
-		const settle = (ok: boolean, value: any) => {
-			if (settled) return;
-			settled = true;
-			cleanup();
-			ok ? resolve(value as T) : reject(value);
-		};
-
-		const onAbort = () => settle(false, abortReason(signal!));
-
-		// timeout
-		timeoutId = setTimeout(() => {
-			settle(false, new Error(`Request timed out after ${timeoutMs}ms`));
-		}, timeoutMs);
-
-		// abort (optional)
-		if (signal) {
-			signal.addEventListener("abort", onAbort, { once: true });
-			if (signal.aborted) return onAbort();
-		}
-
-		// run
-		fn().then(
-			v => settle(true, v),
-			err => settle(false, err),
-		);
-	});
-}