@xynogen/pix-pretty 1.7.5 → 1.7.7

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-pretty",
-	"version": "1.7.5",
+	"version": "1.7.7",
 	"description": "Enhanced tool output rendering with syntax highlighting, file icons, tree views, FFF search, and paste chip formatting",
 	"type": "module",
 	"main": "src/index.ts",

package/src/diff.test.ts

@@ -0,0 +1,23 @@
+import { describe, expect, it } from "bun:test";
+
+import { parseDiff } from "./diff.js";
+
+const OLD = "line1\nline2\nline3";
+const NEW = "line1\nCHANGED\nline3";
+
+describe("parseDiff baseLine", () => {
+	it("is snippet-relative when baseLine omitted (default 0)", () => {
+		const { lines } = parseDiff(OLD, NEW);
+		const del = lines.find((l) => l.type === "del");
+		expect(del?.oldNum).toBe(2); // line2 is the 2nd line of the snippet
+	});
+
+	it("shifts gutter numbers to absolute when baseLine given", () => {
+		// Snippet begins at file line 84 → snippet line 2 becomes file line 85.
+		const { lines } = parseDiff(OLD, NEW, 3, 84);
+		const del = lines.find((l) => l.type === "del");
+		const add = lines.find((l) => l.type === "add");
+		expect(del?.oldNum).toBe(85);
+		expect(add?.newNum).toBe(85);
+	});
+});

package/src/diff.ts

@@ -22,6 +22,9 @@ export function parseDiff(
 	oldContent: string,
 	newContent: string,
 	ctx = 3,
+	// 1-based file line where the snippet begins; shifts gutter numbers from
+	// snippet-relative to absolute. 0 = no shift (snippet-relative, the default).
+	baseLine = 0,
 ): ParsedDiff {
 	const patch = Diff.structuredPatch("", "", oldContent, newContent, "", "", {
 		context: ctx,
@@ -42,8 +45,9 @@ export function parseDiff(
 			});
 		}
 		const h = patch.hunks[hi];
-		let oL = h.oldStart;
-		let nL = h.newStart;
+		const shift = baseLine > 0 ? baseLine - 1 : 0;
+		let oL = h.oldStart + shift;
+		let nL = h.newStart + shift;
 		for (const raw of h.lines) {
 			if (raw === "\") continue;
 			const ch = raw[0];

package/src/gate-overlay.test.ts

@@ -178,3 +178,56 @@ describe("showOverlay — sudo mode", () => {
 		expect(joined).toContain("●");
 	});
 });
+
+// ── Auto-deny timer (dead-man's switch) ───────────────────────────────────────
+//
+// Timer-aware mock: unlike makeUI, this keeps the promise pending and resolves
+// only when `done` fires — so a real setInterval expiry can drive the result.
+// `onReady` gets the live component to optionally feed input before expiry.
+function makeTimerUI(onReady?: (comp: Wired) => void): OverlayUI {
+	return {
+		custom: <T>(
+			cb: (
+				tui: { requestRender(): void },
+				th: typeof theme,
+				kb: unknown,
+				done: (v: T) => void,
+			) => Wired,
+		): Promise<T | undefined> =>
+			new Promise((resolve) => {
+				const comp = cb({ requestRender: () => {} }, theme, undefined, (v) =>
+					resolve(v),
+				);
+				comp.render(80);
+				onReady?.(comp);
+			}),
+	};
+}
+
+describe("showOverlay — auto-deny timer", () => {
+	test("expires to timeout when left untouched", async () => {
+		const result = await showOverlay(makeTimerUI(), {
+			mode: "confirm",
+			title: "T",
+			timeoutMs: 1000, // ceil → 1s, fires on first tick
+		});
+		expect(result.action).toBe("timeout");
+	});
+
+	test("first keypress cancels the timer (no auto-deny)", async () => {
+		let live: Wired | undefined;
+		const pending = showOverlay(
+			makeTimerUI((comp) => {
+				live = comp;
+				comp.handleInput(DOWN); // any key — cancels the dead-man's switch
+			}),
+			{ mode: "confirm", title: "T", timeoutMs: 1000 },
+		);
+		// Wait well past the 1s window. A live timer would have resolved "timeout";
+		// since the keypress cancelled it, the promise is still pending here.
+		await new Promise((r) => setTimeout(r, 1300));
+		live?.handleInput(ENTER); // now deny explicitly
+		const result = await pending;
+		expect(result.action).toBe("denied");
+	});
+});

package/src/gate-overlay.ts

@@ -24,7 +24,7 @@ import { frameLines, modalWidth, selectListTheme } from "./modal-frame.js";
 
 // ── Types ─────────────────────────────────────────────────────────────────────
 
-export type OverlayAction = "approved" | "denied" | "timeout"; // ponytail: timeout kept for back-compat; never emitted now
+export type OverlayAction = "approved" | "denied" | "timeout";
 
 export interface OverlayResult {
 	action: OverlayAction;
@@ -45,7 +45,11 @@ interface BaseConfig {
 	title: string;
 	/** Optional body lines under the title. */
 	body?: string[];
-	/** @deprecated No-op — timeout removed. Dialog waits indefinitely for user input. */
+	/**
+	 * Auto-deny after this many ms of NO user input (dead-man's switch). The
+	 * first keypress cancels the timer and the dialog then waits indefinitely.
+	 * 0 or omitted = no timer (wait forever). Resolves with action "timeout".
+	 */
 	timeoutMs?: number;
 	/**
 	 * Choices shown in the SelectList.
@@ -228,6 +232,18 @@ export function showOverlay(
 				let stage: Stage = "select";
 				let countdownLine: string | undefined;
 
+				// Dead-man's-switch timer: counts down only while untouched. The
+				// first keypress cancels it (user is present → let them decide). If
+				// it expires with no input, auto-deny so the agent isn't stuck.
+				const timeoutMs = config.timeoutMs ?? 0;
+				let remaining = Math.ceil(timeoutMs / 1000);
+				let timer: ReturnType<typeof setInterval> | undefined;
+				const cancelTimer = () => {
+					if (timer) clearInterval(timer);
+					timer = undefined;
+					countdownLine = undefined;
+				};
+
 				// ── components ──────────────────────────────────────────────────
 				const selectItems: SelectItem[] = choices.map((c) => ({
 					value: c.value,
@@ -243,7 +259,24 @@ export function showOverlay(
 				const maskedInput = new MaskedInput();
 
 				// ── finish ───────────────────────────────────────────────────────
-				const finish = (result: OverlayResult) => done(result);
+				const finish = (result: OverlayResult) => {
+					cancelTimer();
+					done(result);
+				};
+
+				// Arm the dead-man's switch (only when a timeout was requested).
+				if (timeoutMs > 0) {
+					countdownLine = theme.fg("dim", `auto-deny in ${remaining}s`);
+					timer = setInterval(() => {
+						remaining -= 1;
+						if (remaining <= 0) {
+							finish({ action: "timeout" });
+							return;
+						}
+						countdownLine = theme.fg("dim", `auto-deny in ${remaining}s`);
+						tui.requestRender();
+					}, 1000);
+				}
 
 				// ── event wiring ─────────────────────────────────────────────────
 				selectList.onSelect = (item) => {
@@ -285,6 +318,7 @@ export function showOverlay(
 					},
 					invalidate: () => {},
 					handleInput: (data) => {
+						cancelTimer(); // user is present — stop the auto-deny countdown
 						if (stage === "select") selectList.handleInput(data);
 						else maskedInput.handleInput(data);
 						tui.requestRender();