icoa-cli 2.19.24 → 2.19.25

package/dist/lib/theme.js

@@ -1,17 +1,21 @@
-// Unified Darcula terminal theme — works identically on macOS Terminal.app,
-// iTerm2, GNOME Terminal, Konsole, Windows Terminal (cmd/PowerShell/WSL).
+// Unified Darcula terminal theme — works across macOS Terminal.app, iTerm2,
+// GNOME Terminal, Konsole, Windows Terminal (cmd/PowerShell/WSL).
 //
-// Two mechanisms are combined so every modern terminal gets the best it can:
+// Three mechanisms are combined so every modern terminal gets the best it can:
 //
 //   1. OSC 10/11/12 sets the terminal's *default* fg/bg/cursor colors.
 //      Honored by iTerm2, GNOME Terminal, Konsole, Windows Terminal → lossless
-//      background, no scrollback or resize artifacts. Ignored by macOS
-//      Terminal.app.
+//      background, no scrollback or resize artifacts. Ignored by Terminal.app.
 //
-//   2. SGR 38/48 + \x1b[2J paints the visible grid cells with Darcula colors.
-//      Works everywhere including Terminal.app. The known limits on Terminal.app
-//      (resize edge, scrollback of pre-launch history, copy-paste carrying bg)
-//      are protocol-level and accepted; fix path is importing a .terminal profile.
+//   2. SGR 38;2/48;2 + \x1b[2J paints with 24-bit truecolor Darcula on every
+//      terminal that supports truecolor. This is the default path.
+//
+//   3. SGR 38;5/48;5 + \x1b[2J paints with 256-color approximation on macOS
+//      Terminal.app. Terminal.app does NOT support truecolor SGR and mis-parses
+//      `\x1b[48;2;43;43;43m` as a sequence of 16-color codes — the trailing
+//      `43` becomes ANSI "bg yellow", which is why v2.19.23/24 rendered with a
+//      yellow background there. Color 235 ≈ #262626 (dark gray, ~#2B2B2B) and
+//      color 250 ≈ #BCBCBC (light gray, ~#A9B7C6) are close enough.
 //
 // Legacy cmd.exe (pre-Win10 1809) can't run Node 22 anyway, so no separate
 // fallback path is needed.
@@ -21,10 +25,14 @@ const OSC_INIT = '\x1b]10;#A9B7C6\x07' + // default fg
 const OSC_RESET = '\x1b]110\x07' + // reset default fg
     '\x1b]111\x07' + // reset default bg
     '\x1b]112\x07'; // reset cursor color
-const SGR_INIT = '\x1b[38;2;169;183;198m' + // fg #A9B7C6
+const SGR_INIT_TRUECOLOR = '\x1b[38;2;169;183;198m' + // fg #A9B7C6
     '\x1b[48;2;43;43;43m' + // bg #2B2B2B
-    '\x1b[2J' + // paint grid with current bg
-    '\x1b[H'; // cursor home
+    '\x1b[2J' +
+    '\x1b[H';
+const SGR_INIT_256 = '\x1b[38;5;250m' + // fg ≈ #BCBCBC
+    '\x1b[48;5;235m' + // bg ≈ #262626
+    '\x1b[2J' +
+    '\x1b[H';
 const SGR_RESET = '\x1b[0m\x1b[2J\x1b[H';
 function supportsAnsi() {
     if (!process.stdout.isTTY)
@@ -43,13 +51,20 @@ function supportsAnsi() {
 function isIcoaTerminal() {
     return process.env.ICOA_TERMINAL === '1';
 }
+// macOS Terminal.app does not implement SGR truecolor (\x1b[38;2;… / \x1b[48;2;…)
+// and mis-parses those sequences as 16-color codes, producing e.g. a yellow bg.
+// Detect it and fall back to 256-color SGR which Terminal.app handles correctly.
+function isAppleTerminal() {
+    return process.env.TERM_PROGRAM === 'Apple_Terminal';
+}
 let armed = false;
 export function setTerminalTheme() {
     if (!supportsAnsi())
         return;
     if (isIcoaTerminal())
         return; // host is already Darcula; nothing to do
-    process.stdout.write(OSC_INIT + SGR_INIT);
+    const sgr = isAppleTerminal() ? SGR_INIT_256 : SGR_INIT_TRUECOLOR;
+    process.stdout.write(OSC_INIT + sgr);
     if (!armed) {
         armed = true;
         // Belt-and-braces cleanup on every exit path. Without these, Ctrl+C leaves

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "icoa-cli",
-  "version": "2.19.24",
+  "version": "2.19.25",
   "description": "ICOA CLI — The world's first CLI-native CTF competition terminal",
   "type": "module",
   "bin": {