@milanglacier/pi-plan-mode 0.5.4 → 0.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@milanglacier/pi-plan-mode",
-	"version": "0.5.4",
+	"version": "0.5.5",
 	"description": "Planning mode extension for pi with persistent plan files and branch-aware planning.",
 	"keywords": [
 		"branch-planning",

package/qna/index.ts

@@ -1,3 +1,2 @@
-export * from "./pi-tui-loader.js";
 export * from "./qna-tui.js";
 export * from "./scroll-select.js";

package/qna/qna-tui.ts

@@ -1,4 +1,4 @@
-import { requirePiTuiModule } from "./pi-tui-loader.js";
+import { Editor, Key, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 
 type Component = {
 	handleInput: (data: string) => void;
@@ -18,35 +18,6 @@ type EditorTheme = {
 	};
 };
 
-function getPiTui() {
-	return requirePiTuiModule() as {
-		Editor: new (
-			tui: TUI,
-			theme: EditorTheme,
-		) => {
-			disableSubmit?: boolean;
-			onChange?: () => void;
-			setText: (text: string) => void;
-			getText: () => string;
-			render: (width: number) => string[];
-			handleInput: (data: string) => void;
-		};
-		Key: {
-			enter: string;
-			tab: string;
-			escape: string;
-			up: string;
-			down: string;
-			ctrl: (key: string) => string;
-			shift: (key: string) => string;
-		};
-		matchesKey: (input: string, key: string) => boolean;
-		truncateToWidth: (text: string, width: number) => string;
-		visibleWidth: (text: string) => number;
-		wrapTextWithAnsi: (text: string, width: number) => string[];
-	};
-}
-
 export interface QnAOption {
 	label: string;
 	description: string;
@@ -341,8 +312,18 @@ export class QnATuiComponent<TQuestion extends QnAQuestion> implements Component
 			},
 		};
 
-		const { Editor } = getPiTui();
-		this.editor = new Editor(tui, editorTheme);
+		const TuiEditor = Editor as unknown as new (
+			tui: TUI,
+			theme: EditorTheme,
+		) => {
+			disableSubmit?: boolean;
+			onChange?: () => void;
+			setText: (text: string) => void;
+			getText: () => string;
+			render: (width: number) => string[];
+			handleInput: (data: string) => void;
+		};
+		this.editor = new TuiEditor(tui, editorTheme);
 		this.editor.disableSubmit = true;
 		this.editor.onChange = () => {
 			this.saveCurrentResponse();
@@ -510,8 +491,6 @@ export class QnATuiComponent<TQuestion extends QnAQuestion> implements Component
 	}
 
 	handleInput(data: string): void {
-		const { Key, matchesKey } = getPiTui();
-
 		if (this.showingConfirmation) {
 			if (matchesKey(data, Key.enter)) {
 				this.submit();
@@ -640,8 +619,6 @@ export class QnATuiComponent<TQuestion extends QnAQuestion> implements Component
 	}
 
 	render(width: number): string[] {
-		const { truncateToWidth, visibleWidth, wrapTextWithAnsi } = getPiTui();
-
 		if (this.cachedLines && this.cachedWidth === width) {
 			return this.cachedLines;
 		}

package/qna/scroll-select.ts

@@ -1,41 +1,4 @@
-import { requirePiTuiModule } from "./pi-tui-loader.js";
-
-let cachedPiTui:
-	| {
-			Key: {
-				enter: string;
-				escape: string;
-				up: string;
-				down: string;
-				ctrl: (key: string) => string;
-			};
-			matchesKey: (input: string, key: string) => boolean;
-			truncateToWidth: (text: string, width: number) => string;
-			visibleWidth: (text: string) => number;
-			wrapTextWithAnsi: (text: string, width: number) => string[];
-	  }
-	| undefined;
-
-function getPiTui() {
-	if (cachedPiTui) {
-		return cachedPiTui;
-	}
-
-	cachedPiTui = requirePiTuiModule() as {
-		Key: {
-			enter: string;
-			escape: string;
-			up: string;
-			down: string;
-			ctrl: (key: string) => string;
-		};
-		matchesKey: (input: string, key: string) => boolean;
-		truncateToWidth: (text: string, width: number) => string;
-		visibleWidth: (text: string) => number;
-		wrapTextWithAnsi: (text: string, width: number) => string[];
-	};
-	return cachedPiTui;
-}
+import { Key, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 
 export interface ScrollSelectOption<T> {
 	value: T;
@@ -132,7 +95,6 @@ class ScrollSelectComponent<T> {
 	}
 
 	render(width: number): string[] {
-		const { truncateToWidth, visibleWidth, wrapTextWithAnsi } = getPiTui();
 		const safeWidth = Math.max(20, width);
 		const contentWidth = Math.max(12, safeWidth - 2);
 		const lines: string[] = [];
@@ -193,8 +155,6 @@ class ScrollSelectComponent<T> {
 	}
 
 	handleInput(data: string): void {
-		const { Key, matchesKey } = getPiTui();
-
 		if (matchesKey(data, Key.escape) || data === "q") {
 			this.done(null);
 			return;
@@ -225,7 +185,6 @@ class ScrollSelectComponent<T> {
 	dispose(): void {}
 
 	private renderSurfaceLine(line: string, contentWidth: number, options: { selected?: boolean } = {}): string {
-		const { visibleWidth } = getPiTui();
 		const paddedLine = `${line}${" ".repeat(Math.max(0, contentWidth - visibleWidth(line)))}`;
 		const boxedLine = ` ${paddedLine} `;
 		if (typeof this.theme.bg !== "function") {

package/request-user-input.ts

@@ -2,7 +2,8 @@ import type { QnAResponse, QnAResult } from "./qna";
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 
-import { QnATuiComponent, requirePiTuiModule } from "./qna";
+import { Text } from "@earendil-works/pi-tui";
+import { QnATuiComponent } from "./qna";
 
 import type {
 	NormalizedRequestUserInputQuestion,
@@ -16,9 +17,6 @@ import type {
 import { findDuplicateId } from "./utils";
 
 function createText(text: string) {
-	const { Text } = requirePiTuiModule() as {
-		Text: new (text: string, x: number, y: number) => unknown;
-	};
 	return new Text(text, 0, 0);
 }
 

package/state.ts

@@ -1,19 +1,12 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 
-import { requirePiTuiModule } from "./qna";
+import { truncateToWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 
 import type { PlanModeState } from "./types";
 
 import { resolveActivePlanFilePath } from "./plan-files";
 import { createInactivePlanModeState, isPlanModeState } from "./utils";
 
-function getPiTui() {
-	return requirePiTuiModule() as {
-		truncateToWidth: (text: string, width: number) => string;
-		wrapTextWithAnsi: (text: string, width: number) => string[];
-	};
-}
-
 export const STATE_ENTRY_TYPE = "pi-plan:state";
 export const CONTEXT_ENTRY_TYPE = "pi-plan:context";
 const BANNER_WIDGET_KEY = "pi-plan-banner";
@@ -104,7 +97,6 @@ export function createPlanModeStateManager(pi: ExtensionAPI) {
 			(_tui, theme) => ({
 				invalidate: () => {},
 				render: (width: number) => {
-					const { truncateToWidth, wrapTextWithAnsi } = getPiTui();
 					const safeWidth = Math.max(1, width);
 					const activePlanFilePath = resolveActivePlanFilePath(ctx, state.planFilePath);
 					const lines = [

package/qna/pi-tui-loader.ts

@@ -1,92 +0,0 @@
-/**
-<!-- {=sharedQnaPiTuiLoaderOverview} -->
-
-`local qna helpers` centralizes `@earendil-works/pi-tui` loading so first-party packages reuse one
-fallback strategy instead of embedding Bun-global lookup logic in multiple runtime modules.
-
-The shared loader returns pi's extension-provided `@earendil-works/pi-tui` module by default.
-Custom require functions can still exercise the normal package resolution path and Bun global
-fallback locations for tests or standalone callers running outside pi's extension loader.
-
-<!-- {/sharedQnaPiTuiLoaderOverview} -->
-*/
-import * as piTuiModule from "@earendil-works/pi-tui";
-import { createRequire } from "node:module";
-import os from "node:os";
-import path from "node:path";
-
-export type PiTuiRequire = (specifier: string) => unknown;
-
-export interface PiTuiLoaderOptions {
-	homeDir?: string;
-	bunInstallDir?: string | undefined;
-	requireFn?: PiTuiRequire;
-}
-
-/**
-<!-- {=sharedQnaGetPiTuiFallbackPathsDocs} -->
-
-Return the ordered list of Bun global fallback paths to try for `@earendil-works/pi-tui`.
-
-The list prefers an explicit `BUN_INSTALL` root when provided and always includes the default
-`~/.bun/install/global/node_modules/@earendil-works/pi-tui` fallback without duplicates.
-
-<!-- {/sharedQnaGetPiTuiFallbackPathsDocs} -->
-*/
-export function getPiTuiFallbackPaths(options: Omit<PiTuiLoaderOptions, "requireFn"> = {}): string[] {
-	const homeDir = options.homeDir ?? os.homedir();
-	const roots = new Set<string>();
-	if (options.bunInstallDir) {
-		roots.add(options.bunInstallDir);
-	}
-	roots.add(path.join(homeDir, ".bun"));
-	return [...roots].map((root) => path.join(root, "install", "global", "node_modules", "@earendil-works", "pi-tui"));
-}
-
-/**
-<!-- {=sharedQnaRequirePiTuiModuleDocs} -->
-
-Load `@earendil-works/pi-tui` with a shared fallback strategy.
-
-Pi exposes `@earendil-works/pi-tui` as an available extension import. Returning the static import
-keeps us on pi's module resolver; using `createRequire(import.meta.url)` in that path bypasses pi's
-resolver and can crash render callbacks when the peer dependency is not locally installed.
-
-When a custom `requireFn` or fallback path options are provided, the loader keeps the older
-standalone behavior: try normal package resolution, then walk Bun-global fallback locations, and
-finally throw a helpful error that names every checked location when none resolve.
-
-<!-- {/sharedQnaRequirePiTuiModuleDocs} -->
-*/
-export function requirePiTuiModule(options: PiTuiLoaderOptions = {}): unknown {
-	if (!options.requireFn && !options.homeDir && !options.bunInstallDir) {
-		return piTuiModule;
-	}
-
-	const requireFn = options.requireFn ?? createRequire(import.meta.url);
-	try {
-		return requireFn("@earendil-works/pi-tui");
-	} catch (error) {
-		const code = (error as { code?: string }).code;
-		if (code !== "MODULE_NOT_FOUND") {
-			throw error;
-		}
-
-		const fallbackPaths = getPiTuiFallbackPaths(options);
-		for (const fallbackPath of fallbackPaths) {
-			try {
-				return requireFn(fallbackPath);
-			} catch (fallbackError) {
-				const fallbackCode = (fallbackError as { code?: string }).code;
-				if (fallbackCode !== "MODULE_NOT_FOUND") {
-					throw fallbackError;
-				}
-			}
-		}
-
-		throw new Error(
-			`Unable to load @earendil-works/pi-tui. Checked the local dependency and Bun global fallbacks: ${fallbackPaths.join(", ")}`,
-			{ cause: error },
-		);
-	}
-}