@underactive/pi-topping 0.6.0 → 0.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@underactive/pi-topping",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "A Pi extension that adds quality of life improvements to Pi's UX: a high-vis user prompt, a shimmering working loader with token activity meter and elapsed timer, and an end-of-turn completion marker",
   "keywords": ["pi-package", "pi-extension"],
   "license": "MIT",

package/src/menu.ts

@@ -355,6 +355,12 @@ export class MenuComponent implements Component {
 			const flat = this.flat[index]!;
 			if (flat.sectionIndex !== currentSection) {
 				const remaining = maxRows - lines.length;
+				// A section continued from above needs room for a blank separator
+				// row, its divider, and at least one item row; otherwise end the
+				// window here rather than crowd the divider against the previous
+				// section or fold the section into it. The window's first section
+				// always renders (a degenerate window may drop its divider).
+				if (lines.length > 0 && remaining < 3) break;
 				if (lines.length > 0 && remaining >= 3) lines.push(this.renderBlankRow(innerWidth));
 				if (maxRows - lines.length >= 2) lines.push(this.renderSectionDivider(this.sections[flat.sectionIndex]!.title, innerWidth));
 				currentSection = flat.sectionIndex;
@@ -380,18 +386,25 @@ export class MenuComponent implements Component {
 		if (this.cursor < this.scrollStart) this.scrollStart = this.cursor;
 		this.scrollStart = Math.max(0, Math.min(this.scrollStart, this.flat.length - 1));
 
-		let window = this.buildToggleWindow(innerWidth, this.scrollStart, contentRows);
-		while (window.end < this.cursor && this.scrollStart < this.cursor) {
-			this.scrollStart++;
-			window = this.buildToggleWindow(innerWidth, this.scrollStart, contentRows);
-		}
-		// Backfill from above whenever more context fits without hiding the cursor.
-		while (this.scrollStart > 0) {
-			const candidate = this.buildToggleWindow(innerWidth, this.scrollStart - 1, contentRows);
-			if (candidate.end < this.cursor) break;
-			this.scrollStart--;
-			window = candidate;
+		// Walk backward from cursor to find the lowest scrollStart that fits in contentRows.
+		{
+			let rowsUsed = 2; // 1 for cursor item + 1 for first-section divider
+			let section = this.flat[this.cursor]!.sectionIndex;
+			this.scrollStart = this.cursor;
+			for (let i = this.cursor - 1; i >= 0; i--) {
+				const sec = this.flat[i]!.sectionIndex;
+				if (sec !== section) {
+					if (rowsUsed + 3 > contentRows) break;
+					rowsUsed += 3;
+					section = sec;
+				} else {
+					if (rowsUsed + 1 > contentRows) break;
+					rowsUsed += 1;
+				}
+				this.scrollStart = i;
+			}
 		}
+		const window = this.buildToggleWindow(innerWidth, this.scrollStart, contentRows);
 
 		const rows = [...window.lines];
 		while (rows.length < contentRows) rows.push(this.renderBlankRow(innerWidth));