omegon 0.7.1 → 0.7.2

package/extensions/00-splash/index.ts

@@ -14,7 +14,11 @@ import type { Component, TUI } from "@styrene-lab/pi-tui";
 import { truncateToWidth } from "@styrene-lab/pi-tui";
 import {
   LOGO_LINES,
+  WORDMARK_LINES,
   LINE_WIDTH,
+  COMPACT_LOGO_LINES,
+  COMPACT_LINE_WIDTH,
+  COMPACT_MARK_ROWS,
   FRAME_INTERVAL_MS,
   TOTAL_FRAMES,
   HOLD_FRAMES,
@@ -95,8 +99,9 @@ const PENDING_GLYPH = "· ";
 // ---------------------------------------------------------------------------
 class SplashHeader implements Component {
   private tui: TUI;
+  private lines: string[];
   private frame = 0;
-  private frameMap = assignUnlockFrames(LOGO_LINES, TOTAL_FRAMES, Date.now() & 0xffff);
+  private frameMap: ReturnType<typeof assignUnlockFrames>;
   private noiseSeed = (Date.now() * 7) & 0x7fffffff;
   private timer: ReturnType<typeof setInterval> | null = null;
   private scanFrame = 0;
@@ -107,9 +112,16 @@ class SplashHeader implements Component {
   private cachedLines: string[] | undefined;
   private cachedWidth: number | undefined;
 
-  constructor(tui: TUI, onTransition: () => void) {
+  private markRows: number;
+  private logoWidth: number;
+
+  constructor(tui: TUI, onTransition: () => void, lines: string[], markRows: number, logoWidth: number) {
     this.tui = tui;
     this.onTransition = onTransition;
+    this.lines = lines;
+    this.markRows = markRows;
+    this.logoWidth = logoWidth;
+    this.frameMap = assignUnlockFrames(lines, TOTAL_FRAMES, Date.now() & 0xffff);
   }
 
   start(): void {
@@ -147,14 +159,14 @@ class SplashHeader implements Component {
     const lines: string[] = [];
 
     // Centre the logo horizontally
-    const logoW = LINE_WIDTH;
+    const logoW = this.logoWidth;
     const pad = Math.max(0, Math.floor((width - logoW) / 2));
     const padStr = " ".repeat(pad);
 
     // Render logo frame
     const logoFrame = this.transitioned
-      ? renderFrame(TOTAL_FRAMES + 1, LOGO_LINES, this.frameMap, this.noiseSeed)
-      : renderFrame(Math.min(this.frame, TOTAL_FRAMES), LOGO_LINES, this.frameMap, this.noiseSeed);
+      ? renderFrame(TOTAL_FRAMES + 1, this.lines, this.frameMap, this.noiseSeed, this.markRows)
+      : renderFrame(Math.min(this.frame, TOTAL_FRAMES), this.lines, this.frameMap, this.noiseSeed, this.markRows);
 
     lines.push(""); // top spacer
     for (const row of logoFrame) {
@@ -295,15 +307,42 @@ export default function splashExtension(pi: ExtensionAPI): void {
     // after a version update), it renders as a one-liner below the splash.
     // This is acceptable — it only appears once per update.
     const termWidth = process.stdout.columns ?? 80;
-    if (termWidth < LINE_WIDTH + 4) {
-      // Too narrow for the ASCII art — use minimal header immediately
+    const termRows = process.stdout.rows ?? 24;
+
+    // Four tiers based on terminal size:
+    //   Full (sigil + wordmark): needs ~46 rows and LINE_WIDTH+4 cols (~84 cols)
+    //   Compact (smaller sigil + wordmark): needs ~34 rows and COMPACT_LINE_WIDTH+4 cols (~58 cols)
+    //   Wordmark only: needs ~14 rows and LINE_WIDTH+4 cols
+    //   Minimal (no animation): everything else
+    const canFitFull = termWidth >= LINE_WIDTH + 4 && termRows >= LOGO_LINES.length + 6;
+    const canFitCompact = termWidth >= COMPACT_LINE_WIDTH + 4 && termRows >= COMPACT_LOGO_LINES.length + 6;
+    const canFitWordmark = termWidth >= LINE_WIDTH + 4 && termRows >= WORDMARK_LINES.length + 6;
+
+    if (!canFitCompact && !canFitWordmark) {
+      // Too small for any animation — minimal branded header
       ctx.ui.setHeader(() => new BrandedHeader(version));
     } else {
+      let artLines: string[];
+      let markRows: number;
+      let logoWidth: number;
+      if (canFitFull) {
+        artLines = LOGO_LINES;
+        markRows = 31; // MARK_ROWS
+        logoWidth = LINE_WIDTH;
+      } else if (canFitCompact) {
+        artLines = COMPACT_LOGO_LINES;
+        markRows = COMPACT_MARK_ROWS;
+        logoWidth = COMPACT_LINE_WIDTH;
+      } else {
+        artLines = WORDMARK_LINES;
+        markRows = 0; // all wordmark
+        logoWidth = LINE_WIDTH;
+      }
       ctx.ui.setHeader((tui, _theme) => {
         const splash = new SplashHeader(tui, () => {
           // Transition to minimal branded header
           ctx.ui.setHeader((_, _t) => new BrandedHeader(version));
-        });
+        }, artLines, markRows, logoWidth);
         splash.start();
         return splash;
       });

package/extensions/00-splash/logo.ts

@@ -139,6 +139,7 @@ export function renderFrame(
   lines: string[],
   frameMap: FrameMap,
   noiseSeed: number,
+  markRows: number = MARK_ROWS,
 ): string[] {
   const rng = new SimpleRNG(noiseSeed + frame * 997);
   const output: string[] = [];
@@ -162,7 +163,7 @@ export function renderFrame(
         buf += " ";
       } else if (frame >= unlock) {
         // Resolved — final glyph
-        const color = y >= MARK_ROWS + 2 ? `${BOLD}${BRIGHT}` : PRIMARY;
+        const color = y >= markRows + 1 ? `${BOLD}${BRIGHT}` : PRIMARY;
         if (color !== lastColor) { buf += color; lastColor = color; }
         buf += ch;
       } else {
@@ -190,5 +191,56 @@ export function renderFrame(
 // ---------------------------------------------------------------------------
 // Pre-computed data for the default logo
 // ---------------------------------------------------------------------------
-export { LOGO_LINES, LINE_WIDTH, MARK_ROWS };
+/** Wordmark-only lines (spacer + 7 wordmark rows) for compact terminals. */
+const WORDMARK_LINES: string[] = LOGO_LINES.slice(MARK_ROWS + 1); // skip sigil + first spacer, keep second spacer + wordmark
+// Pad to same width
+for (let i = 0; i < WORDMARK_LINES.length; i++) {
+  WORDMARK_LINES[i] = WORDMARK_LINES[i].padEnd(LINE_WIDTH);
+}
+
+// ---------------------------------------------------------------------------
+// Compact logo — sigil + wordmark for mid-size terminals (~56 cols)
+// ---------------------------------------------------------------------------
+const COMPACT_MARK_ROWS = 23;
+
+const COMPACT_LOGO_LINES: string[] = [
+  "            *                      ```     #`          ",
+  "     ` ```##`                   ``````##` .#`          ",
+  "````##`#########             `############`##`         ",
+  "*`*##############           `##################`       ",
+  "##:````*`   `####`         `#########` *#######:##     ",
+  "`            #####        ``#######       ######`#`    ",
+  "            `#####         #######.        #########`  ",
+  "            ####``   ``*@@@@@@@@@@`*          `## #### ",
+  "           #####  `@@@@@@@@@@@@@@@@@@@          `#@ :` ",
+  "           #####`@@@@@@@@@@@@@@@@@@@@@@@@`        `#`  ",
+  "            ##*@@@@@@@@@@@@@@@@@@@@@@@@@@@`            ",
+  "             :@@@@@@@@@@@``##```@@@@@@@@@@@``          ",
+  "             @@@@@@@@*#:`  `#######`@@@@@@@@`  `   `   ",
+  "             @@@@@@@#####`  `########`@@@@@@@`####`#`  ",
+  "             @@@@@@ ######    `#`#####`@@@@@@########` ",
+  "             @@@@@  ######      `::``#*@@@@@`##`  #### ",
+  "             `@@@@@#######            `@@@@@`###` `*## ",
+  "        ``#`  .@@@@`#####            `@@@@@` ``###` `**",
+  "    ``:######```@@@@@#`            `.@@@@.   `#.##`    ",
+  "   ######`####`* `@@@@@@        ``@@@@@`  ``#####`     ",
+  "   #*       .@@@@@@@@@@@@@@   :@@@@@@@@@@@@@@##        ",
+  "   `        .@@@@@@@@@@@@@@   :@@@@@@@@@@@@@@`         ",
+  "         .@  `                              `          ",
+  // spacer
+  "                                                       ",
+  // wordmark (4 rows)
+  "   @@@@@@@ @@@` `@@@ @@@@@@``@@@@@@ `@@@@@@@`@@@` @@  ",
+  "   @@   @@ @@@@`@@@@ @@```` `@@`    `@@   @@ @@@@ @@  ",
+  "   @@   @@ @@ @*@`@@ @@@@`  `@@`@@@ `@@   @@ @@ *@@@  ",
+  "   @@@@@@@ @@ `@``@@ @@@@@@``@@@@@@ `@@@@@@@`@@  `@@  ",
+];
+
+const COMPACT_LINE_WIDTH = Math.max(...COMPACT_LOGO_LINES.map(l => l.length));
+for (let i = 0; i < COMPACT_LOGO_LINES.length; i++) {
+  COMPACT_LOGO_LINES[i] = COMPACT_LOGO_LINES[i].padEnd(COMPACT_LINE_WIDTH);
+}
+
+export { LOGO_LINES, WORDMARK_LINES, LINE_WIDTH, MARK_ROWS };
+export { COMPACT_LOGO_LINES, COMPACT_LINE_WIDTH, COMPACT_MARK_ROWS };
 export { PRIMARY, PRIMARY_DIM, DIM, BRIGHT, SUCCESS, ERROR_CLR, RESET, BOLD };

package/extensions/bootstrap/index.ts

@@ -471,9 +471,9 @@ function restartOmegon(): never {
 		"done",
 		// Extra grace period for fd/terminal release
 		"sleep 0.2",
-		// Pop kitty keyboard protocol and bracketed paste before resetting —
-		// stty sane only resets line discipline, not terminal protocol state
-		"printf '\\033[<u\\033[>4;0m\\033[?2004l' 2>/dev/null",
+		// Full terminal protocol reset — stty sane only resets line discipline,
+		// not terminal protocol state (kitty keyboard, bracketed paste, cursor, SGR)
+		"printf '\\033[<u\\033[>4;0m\\033[?2004l\\033[?25h\\033[0m\\033[r' 2>/dev/null",
 		"stty sane 2>/dev/null",
 		// Clean up this script
 		`rm -f "${script}"`,
@@ -484,15 +484,20 @@ function restartOmegon(): never {
 	// Reset terminal to cooked mode BEFORE exiting so the restart script
 	// (and the user) aren't stuck with raw-mode terminal if something goes wrong.
 	try {
-		// Pop kitty keyboard protocol and disable bracketed paste BEFORE
-		// releasing raw mode — the terminal needs these escape sequences to
-		// stop encoding keystrokes in CSI-u format. Without this, the restart
-		// script (and any keystrokes during the wait) dump raw kitty sequences.
+		// Full terminal protocol teardown: pop kitty keyboard protocol,
+		// disable modifyOtherKeys, disable bracketed paste, show cursor,
+		// reset SGR attributes, and clear any pending scroll region.
 		process.stdout.write(
 			"\x1b[<u" +        // Pop kitty keyboard protocol flags
 			"\x1b[>4;0m" +     // Disable modifyOtherKeys
-			"\x1b[?2004l"      // Disable bracketed paste
+			"\x1b[?2004l" +    // Disable bracketed paste
+			"\x1b[?25h" +      // Show cursor
+			"\x1b[0m" +        // Reset all SGR attributes
+			"\x1b[r"           // Reset scroll region to full screen
 		);
+		// Pause stdin to prevent buffered input from being re-interpreted
+		// after raw mode is disabled (prevents Ctrl+D from closing parent shell).
+		process.stdin.pause();
 		if (process.stdin.isTTY && typeof process.stdin.setRawMode === "function") {
 			process.stdin.setRawMode(false);
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "omegon",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"description": "Omegon — an opinionated distribution of pi (by Mario Zechner) with extensions for lifecycle management, memory, orchestration, and visualization",
 	"bin": {
 		"omegon": "bin/omegon.mjs",