@xynogen/pix-ask 0.2.7 → 0.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-ask",
-	"version": "0.2.7",
+	"version": "0.2.9",
 	"description": "Pi tool — structured questionnaire UI (ask_user)",
 	"type": "module",
 	"main": "src/index.ts",
@@ -9,6 +9,7 @@
 	},
 	"files": [
 		"src",
+		"!src/**/*.test.ts",
 		"README.md",
 		"LICENSE"
 	],
@@ -34,8 +35,9 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"typebox": "^1.1.38",
-		"@xynogen/pix-pretty": "^1.7.9"
+		"@xynogen/pix-pretty": "^1.7.9",
+		"@xynogen/pix-runtime": "^0.1.1",
+		"typebox": "^1.1.38"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-coding-agent": "*",

package/src/index.ts

@@ -1,8 +1,7 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
-
+import { once } from "@xynogen/pix-runtime/once";
 import { buildResponseText } from "./helpers.js";
-import { once } from "./once.ts";
 import { AskQuestionnaire } from "./questionnaire.js";
 import { rpcFallback } from "./rpc.js";
 import type { Params } from "./schema.js";

package/src/questionnaire.ts

@@ -12,8 +12,8 @@ import {
 	truncateToWidth,
 	wrapTextWithAnsi,
 } from "@earendil-works/pi-tui";
+import { frameLines, modalWidth } from "@xynogen/pix-pretty/modal-frame";
 import { dim } from "./components.js";
-import { frameLines, modalWidth } from "./frame.js";
 import { checkboxGlyphs, selectionGlyph } from "./glyphs.js";
 import { safeMarkdownTheme, sentinelsFor } from "./helpers.js";
 import type { OptionData, Params, QuestionData } from "./schema.js";
@@ -22,6 +22,22 @@ import type { AnswerKind, QuestionAnswer, QuestionnaireResult } from "./types.js
 
 // ── AskQuestionnaire ───────────────────────────────────────────────────
 
+function printableCharacter(data: string): string | undefined {
+	const decoded = decodeKittyPrintable(data) ?? data;
+	const characters = [...decoded];
+	if (characters.length !== 1) return undefined;
+	const codePoint = characters[0]?.codePointAt(0);
+	if (
+		codePoint === undefined ||
+		codePoint < 32 ||
+		codePoint === 127 ||
+		(codePoint >= 128 && codePoint <= 159)
+	) {
+		return undefined;
+	}
+	return characters[0];
+}
+
 export class AskQuestionnaire extends Container {
 	private params: Params;
 	private tui: TUI;
@@ -327,7 +343,10 @@ export class AskQuestionnaire extends Container {
 			return;
 		}
 
-		const numMatch = data.match(/^[1-9]$/);
+		// Decode CSI-u first: under Kitty flag 1 digits arrive as escape
+		// sequences, and the raw regex would miss them (digit would fall
+		// through into the search query instead of selecting an option).
+		const numMatch = (decodeKittyPrintable(data) ?? data).match(/^[1-9]$/);
 		if (numMatch && this.filteredOptions.length > 0) {
 			const idx = Number(numMatch[0]) - 1;
 			if (idx >= 0 && idx < this.filteredOptions.length) {
@@ -351,23 +370,13 @@ export class AskQuestionnaire extends Container {
 		}
 
 		if (!isMulti) {
-			const printable = decodeKittyPrintable(data);
+			// Accept Unicode text under both legacy and Kitty encodings, while
+			// rejecting C0, DEL, and C1 controls that corrupt filter queries.
+			const printable = printableCharacter(data);
 			if (printable !== undefined) {
 				this.searchQuery += printable;
 				this.selectedOptionIndex = 0;
 				this.refresh();
-				return;
-			}
-			const chars = [...data];
-			if (
-				chars.length === 1 &&
-				chars[0] &&
-				chars[0].charCodeAt(0) >= 32 &&
-				chars[0].charCodeAt(0) < 127
-			) {
-				this.searchQuery += chars[0];
-				this.selectedOptionIndex = 0;
-				this.refresh();
 			}
 		}
 	}

package/src/ask.test.ts

@@ -1,236 +0,0 @@
-/**
- * ask.test.ts — tests for the ask questionnaire tool
- *
- * Tests cover pure functions (schema validation, sentinel logic, answer
- * formatting). TUI components are not tested here.
- */
-
-import { describe, expect, test } from "bun:test";
-import {
-	buildResponseText,
-	formatAnswerScalar,
-	hasAnyPreview,
-	type OptionData,
-	type QuestionData,
-	sentinelsFor,
-} from "./index.ts";
-
-// ── Fixtures ──────────────────────────────────────────────────────────
-
-const opt = (label: string, description = "Test option", preview?: string): OptionData => ({
-	label,
-	description,
-	...(preview ? { preview } : {}),
-});
-
-const qSingle: QuestionData = {
-	question: "Which approach?",
-	header: "Approach",
-	options: [opt("REST", "Traditional REST API"), opt("GraphQL", "Query language for APIs")],
-};
-
-const qMulti: QuestionData = {
-	question: "Which features?",
-	header: "Features",
-	options: [
-		opt("Auth", "User authentication"),
-		opt("Search", "Full text search"),
-		opt("Export", "Data export"),
-	],
-	multiSelect: true,
-};
-
-const qWithPreview: QuestionData = {
-	question: "Pick a component?",
-	header: "Component",
-	options: [
-		opt("Button", "Clickable button", "<Button>Primary</Button>"),
-		opt("Card", "Container card", "<Card><Content/></Card>"),
-	],
-};
-
-const qSingleNoPreview: QuestionData = {
-	question: "Color?",
-	header: "Color",
-	options: [opt("Red", "Ruby red"), opt("Blue", "Ocean blue")],
-};
-
-// ── hasAnyPreview ─────────────────────────────────────────────────────
-
-describe("hasAnyPreview", () => {
-	test("returns false when no option has preview", () => {
-		expect(hasAnyPreview(qSingle)).toBe(false);
-		expect(hasAnyPreview(qMulti)).toBe(false);
-	});
-
-	test("returns true when at least one option has preview", () => {
-		expect(hasAnyPreview(qWithPreview)).toBe(true);
-	});
-
-	test("returns false for empty options", () => {
-		const q: QuestionData = { question: "?", header: "X", options: [] };
-		expect(hasAnyPreview(q)).toBe(false);
-	});
-});
-
-// ── sentinelsFor ──────────────────────────────────────────────────────
-
-describe("sentinelsFor", () => {
-	test('single-select without preview appends "Type something."', () => {
-		const r = sentinelsFor(qSingleNoPreview);
-		expect(r).toHaveLength(1);
-		expect(r[0]?.kind).toBe("other");
-		expect(r[0]?.label).toBe("Type something.");
-	});
-
-	test('single-select with preview appends nothing (only "Chat about this" is separate)', () => {
-		const r = sentinelsFor(qWithPreview);
-		expect(r).toHaveLength(0);
-	});
-
-	test('multi-select appends "Next"', () => {
-		const r = sentinelsFor(qMulti);
-		expect(r).toHaveLength(1);
-		expect(r[0]?.kind).toBe("next");
-		expect(r[0]?.label).toBe("Next");
-	});
-
-	test("multi-select never appends Type something.", () => {
-		const r = sentinelsFor({ ...qMulti, multiSelect: true });
-		expect(r.every((s) => s.kind !== "other")).toBe(true);
-	});
-
-	test("empty options still gets freeform sentinel (no preview = single-select)", () => {
-		const r = sentinelsFor({ question: "?", header: "X", options: [] });
-		expect(r).toHaveLength(1);
-		expect(r[0]?.kind).toBe("other");
-	});
-});
-
-// ── formatAnswerScalar ────────────────────────────────────────────────
-
-describe("formatAnswerScalar", () => {
-	test("option kind returns the answer string", () => {
-		const a = {
-			questionIndex: 0,
-			question: "Q",
-			kind: "option" as const,
-			answer: "REST",
-		};
-		expect(formatAnswerScalar(a)).toBe("REST");
-	});
-
-	test("multi kind joins selected with comma", () => {
-		const a = {
-			questionIndex: 0,
-			question: "Q",
-			kind: "multi" as const,
-			answer: null,
-			selected: ["Auth", "Search"],
-		};
-		expect(formatAnswerScalar(a)).toBe("Auth, Search");
-	});
-
-	test("custom kind returns the typed text", () => {
-		const a = {
-			questionIndex: 0,
-			question: "Q",
-			kind: "custom" as const,
-			answer: "my custom answer",
-		};
-		expect(formatAnswerScalar(a)).toBe("my custom answer");
-	});
-
-	test("chat kind returns (chat)", () => {
-		const a = {
-			questionIndex: 0,
-			question: "Q",
-			kind: "chat" as const,
-			answer: null,
-		};
-		expect(formatAnswerScalar(a)).toBe("(chat)");
-	});
-});
-
-// ── buildResponseText ─────────────────────────────────────────────────
-
-describe("buildResponseText", () => {
-	test("formats single answer", () => {
-		const answers = [
-			{
-				questionIndex: 0,
-				question: "Which approach?",
-				kind: "option" as const,
-				answer: "REST",
-			},
-		];
-		const text = buildResponseText(answers, [qSingle]);
-		expect(text).toContain("REST");
-		expect(text).toContain("Which approach?");
-	});
-
-	test("formats multi-select answer", () => {
-		const answers = [
-			{
-				questionIndex: 0,
-				question: "Which features?",
-				kind: "multi" as const,
-				answer: null,
-				selected: ["Auth", "Search"],
-			},
-		];
-		const text = buildResponseText(answers, [qMulti]);
-		expect(text).toContain("Auth, Search");
-		expect(text).toContain("Which features?");
-	});
-
-	test("includes preview in response when present", () => {
-		const answers = [
-			{
-				questionIndex: 0,
-				question: "Pick a component?",
-				kind: "option" as const,
-				answer: "Button",
-				preview: "<Button>Primary</Button>",
-			},
-		];
-		const text = buildResponseText(answers, [qWithPreview]);
-		expect(text).toContain("preview: <Button>Primary</Button>");
-	});
-
-	test("formats multiple answers", () => {
-		const qs = [qSingle, qMulti];
-		const answers = [
-			{
-				questionIndex: 0,
-				question: "Which approach?",
-				kind: "option" as const,
-				answer: "GraphQL",
-			},
-			{
-				questionIndex: 1,
-				question: "Which features?",
-				kind: "multi" as const,
-				answer: null,
-				selected: ["Export"],
-			},
-		];
-		const text = buildResponseText(answers, qs);
-		expect(text).toContain("GraphQL");
-		expect(text).toContain("Export");
-	});
-
-	test("shows declined message when no answers", () => {
-		const text = buildResponseText([], [qSingle]);
-		expect(text).toContain("declined");
-	});
-});
-
-// ── Tool registration shape ─────────────────────────────────────────
-
-describe("registerAsk", () => {
-	test("exports a default function", async () => {
-		const mod = await import("./index.ts");
-		expect(typeof mod.default).toBe("function");
-	});
-});

package/src/frame.test.ts

@@ -1,39 +0,0 @@
-import { expect, test } from "bun:test";
-import { visibleWidth } from "@earendil-works/pi-tui";
-import { frameLines, modalWidth } from "./frame.js";
-
-const noColor = (s: string) => s;
-
-test("modalWidth clamps to [40, 96] with 4-col margin", () => {
-	expect(modalWidth(200)).toBe(96);
-	expect(modalWidth(50)).toBe(46);
-	expect(modalWidth(10)).toBe(40);
-});
-
-test("frameLines draws rounded border with uniform width", () => {
-	const out = frameLines({
-		width: 40,
-		lines: ["hello", "world"],
-		color: noColor,
-	});
-	const first = out[0] ?? "";
-	const last = out[out.length - 1] ?? "";
-	expect(first.startsWith("╭")).toBe(true);
-	expect(first.endsWith("╮")).toBe(true);
-	expect(last.startsWith("╰")).toBe(true);
-	expect(last.endsWith("╯")).toBe(true);
-	for (const line of out) {
-		expect(visibleWidth(line)).toBe(40);
-	}
-});
-
-test("frameLines pads ANSI-colored input by visible width", () => {
-	const out = frameLines({
-		width: 40,
-		lines: ["\x1b[31mhi\x1b[0m"],
-		color: noColor,
-	});
-	for (const line of out) {
-		expect(visibleWidth(line)).toBe(40);
-	}
-});

package/src/frame.ts

@@ -1,72 +0,0 @@
-/**
- * Modal frame primitives — inlined from pix-pretty/modal-frame to avoid
- * cross-package subpath imports that break under Node CJS require.
- */
-
-import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-
-// ── Constants ─────────────────────────────────────────────────────────────────
-
-const MIN_WIDTH = 40;
-const MAX_WIDTH = 96;
-const MARGIN = 4;
-/** 2 border cols + 2 padding spaces */
-const CHROME = 4;
-
-// ── Width ─────────────────────────────────────────────────────────────────────
-
-/** Clamp terminal width to a sane modal width (40–96 cols). */
-export function modalWidth(termWidth: number): number {
-	return Math.min(MAX_WIDTH, Math.max(MIN_WIDTH, termWidth - MARGIN));
-}
-
-// ── Frame ─────────────────────────────────────────────────────────────────────
-
-export interface FrameOptions {
-	width: number;
-	lines: string[];
-	/** Color function for border glyphs — e.g. `(s) => theme.fg("accent", s)` */
-	color: (s: string) => string;
-	/** Background fill function — e.g. `(s) => theme.bg("customMessageBg", s)` */
-	bg?: (s: string) => string;
-	/** Optional pre-styled string rendered as the first content row (tab bar etc.) */
-	top?: string;
-}
-
-/**
- * Render a rounded modal box.
- *
- * Returns an array of full-width ANSI strings:
- *   ╭──────────────────╮
- *   │ [top row]        │   ← only if top is set
- *   │ content line 1   │
- *   │ content line 2   │
- *   ╰──────────────────╯
- */
-export function frameLines(opts: FrameOptions): string[] {
-	const { width, lines, color, top } = opts;
-	const bg = opts.bg ?? ((s: string) => s);
-	const inner = Math.max(1, width - CHROME);
-	const dashes = "─".repeat(width - 2);
-
-	const SENTINEL = "\x00";
-	const bgOpen = bg(SENTINEL).split(SENTINEL)[0] ?? "";
-	const reassert = (s: string): string =>
-		bgOpen
-			? s.replace(/\x1b\[([0-9;]*)m/g, (seq, p: string) =>
-					p === "0" || p.split(";").includes("49") ? `${seq}${bgOpen}` : seq,
-				)
-			: s;
-
-	const row = (content: string): string => {
-		const pad = inner - visibleWidth(content);
-		const padded = pad > 0 ? content + " ".repeat(pad) : truncateToWidth(content, inner);
-		return bg(`${color("│")} ${reassert(padded)} ${color("│")}`);
-	};
-
-	const out: string[] = [bg(color(`╭${dashes}╮`))];
-	if (top !== undefined) out.push(row(top));
-	for (const line of lines) out.push(row(line));
-	out.push(bg(color(`╰${dashes}╯`)));
-	return out;
-}

package/src/glyphs.test.ts

@@ -1,40 +0,0 @@
-import { describe, expect, test } from "bun:test";
-import { visibleWidth } from "@earendil-works/pi-tui";
-import { checkboxGlyphs, selectionGlyph } from "./glyphs.js";
-
-describe("selectionGlyph", () => {
-	test("multi checked → ▣ / success", () => {
-		expect(selectionGlyph({ multi: true, selected: false, checked: true })).toEqual({
-			glyph: "▣",
-			color: "success",
-		});
-	});
-
-	test("multi unchecked → ☐ / dim", () => {
-		expect(selectionGlyph({ multi: true, selected: true, checked: false })).toEqual({
-			glyph: "☐",
-			color: "dim",
-		});
-	});
-
-	test("radio selected → ◉ / accent", () => {
-		expect(selectionGlyph({ multi: false, selected: true, checked: false })).toEqual({
-			glyph: "◉",
-			color: "accent",
-		});
-	});
-
-	test("radio unselected → ○ / dim", () => {
-		expect(selectionGlyph({ multi: false, selected: false, checked: false })).toEqual({
-			glyph: "○",
-			color: "dim",
-		});
-	});
-});
-
-describe("checkboxGlyphs", () => {
-	test("checked and unchecked have equal display width", () => {
-		const { checked, unchecked } = checkboxGlyphs();
-		expect(visibleWidth(checked)).toBe(visibleWidth(unchecked));
-	});
-});

package/src/once.ts

@@ -1,27 +0,0 @@
-/**
- * Per-instance idempotency guard for extension activation.
- *
- * pix-core (the meta-package) invokes this package's factory, and a standalone
- * install makes Pi invoke it again — sometimes against the SAME `pi`. We must
- * dedupe that. But Pi rebuilds the extension runtime on /new, /resume, /fork,
- * and /reload, handing the factory a BRAND-NEW `pi`; that must re-register.
- *
- * Keying the registry on the `pi` instance satisfies both: same instance =>
- * skip, new instance => run. The registry lives on globalThis because jiti
- * (`moduleCache: false`) re-evaluates this module on every load pass, so a
- * module-scoped WeakMap would not be shared between the aggregator pass and the
- * standalone pass within a single session.
- */
-export function once(pi: object, key: string, fn: () => void): void {
-	const g = globalThis as { __pixOnce?: WeakMap<object, Set<string>> };
-	if (!g.__pixOnce) g.__pixOnce = new WeakMap<object, Set<string>>();
-	const registry = g.__pixOnce;
-	let loaded = registry.get(pi);
-	if (!loaded) {
-		loaded = new Set<string>();
-		registry.set(pi, loaded);
-	}
-	if (loaded.has(key)) return;
-	loaded.add(key);
-	fn();
-}