icoa-cli 2.19.22 → 2.19.24

package/dist/lib/colors.d.ts

@@ -0,0 +1,15 @@
+export declare const c: {
+    fg: (s: string) => string;
+    muted: (s: string) => string;
+    red: (s: string) => string;
+    green: (s: string) => string;
+    yellow: (s: string) => string;
+    blue: (s: string) => string;
+    cyan: (s: string) => string;
+    orange: (s: string) => string;
+    white: (s: string) => string;
+};
+export declare const DARCULA_BG_HEX = "#2B2B2B";
+export declare const DARCULA_FG_HEX = "#A9B7C6";
+export declare const DARCULA_BG_RGB: readonly [43, 43, 43];
+export declare const DARCULA_FG_RGB: readonly [169, 183, 198];

package/dist/lib/colors.js

@@ -0,0 +1,21 @@
+// Darcula palette — from ICOA Terminal xterm.js theme spec.
+// Use c.* helpers when you need brand-accurate truecolor (e.g. the orange
+// accent #CC7832). For generic success/error/warning, chalk.green/.red/.yellow
+// remain fine — they render as the terminal's Darcula 16-color when using an
+// ICOA theme and as close-enough defaults elsewhere.
+const tc = (r, g, b) => (s) => `\x1b[38;2;${r};${g};${b}m${s}\x1b[39m`;
+export const c = {
+    fg: tc(169, 183, 198), // #A9B7C6 body text
+    muted: tc(85, 85, 85), // #555555 comments / secondary
+    red: tc(255, 107, 104), // #FF6B68 error
+    green: tc(168, 192, 35), // #A8C023 success
+    yellow: tc(214, 191, 85), // #D6BF55 warning
+    blue: tc(126, 174, 241), // #7EAEF1 link
+    cyan: tc(40, 123, 222), // #287BDE command / path
+    orange: tc(204, 120, 50), // #CC7832 brand accent
+    white: tc(255, 255, 255), // #FFFFFF highlight
+};
+export const DARCULA_BG_HEX = '#2B2B2B';
+export const DARCULA_FG_HEX = '#A9B7C6';
+export const DARCULA_BG_RGB = [43, 43, 43];
+export const DARCULA_FG_RGB = [169, 183, 198];

package/dist/lib/theme.js

@@ -1,52 +1,75 @@
-import { execSync } from 'node:child_process';
-import { platform } from 'node:os';
+// Unified Darcula terminal theme — works identically on 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:
+//
+//   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.
+//
+//   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.
+//
+// Legacy cmd.exe (pre-Win10 1809) can't run Node 22 anyway, so no separate
+// fallback path is needed.
+const OSC_INIT = '\x1b]10;#A9B7C6\x07' + // default fg
+    '\x1b]11;#2B2B2B\x07' + // default bg
+    '\x1b]12;#A9B7C6\x07'; // cursor color
+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
+    '\x1b[48;2;43;43;43m' + // bg #2B2B2B
+    '\x1b[2J' + // paint grid with current bg
+    '\x1b[H'; // cursor home
+const SGR_RESET = '\x1b[0m\x1b[2J\x1b[H';
+function supportsAnsi() {
+    if (!process.stdout.isTTY)
+        return false;
+    const depth = process.stdout.getColorDepth?.();
+    if (typeof depth === 'number')
+        return depth >= 8;
+    return true;
+}
+// When icoa-cli runs inside the ICOA Terminal (Tauri + xterm.js), the host is
+// already pre-themed to the exact Darcula palette we'd be setting. Every OSC
+// and SGR we'd emit is a no-op in terms of color, but the \x1b[2J inside our
+// init/reset sequences would clear the grid visibly. Skip the paint entirely
+// in that environment so the banner simply appears in the shell cursor
+// position and scrollback is preserved on exit.
+function isIcoaTerminal() {
+    return process.env.ICOA_TERMINAL === '1';
+}
+let armed = false;
 export function setTerminalTheme() {
-    const os = platform();
-    if (os === 'darwin') {
-        // macOS Terminal.app: use AppleScript to change colors
-        try {
-            execSync(`osascript -e '
-        tell application "Terminal"
-          set bg to {0, 0, 0}
-          set fg to {0, 65535, 16896}
-          set background color of selected tab of front window to bg
-          set normal text color of selected tab of front window to fg
-          set cursor color of selected tab of front window to fg
-        end tell
-      '`, { stdio: 'ignore' });
-        }
-        catch {
-            // Fallback to ANSI if AppleScript fails (e.g. not Terminal.app)
-            process.stdout.write('\x1b[0m\x1b[40m\x1b[38;2;0;255;65m\x1b[2J\x1b[H');
-        }
-    }
-    else {
-        // Linux / Windows: ANSI escape codes
-        process.stdout.write('\x1b[0m\x1b[40m\x1b[38;2;0;255;65m\x1b[2J\x1b[H');
+    if (!supportsAnsi())
+        return;
+    if (isIcoaTerminal())
+        return; // host is already Darcula; nothing to do
+    process.stdout.write(OSC_INIT + SGR_INIT);
+    if (!armed) {
+        armed = true;
+        // Belt-and-braces cleanup on every exit path. Without these, Ctrl+C leaves
+        // the user's shell stuck with our SGR state.
+        const cleanup = () => {
+            try {
+                process.stdout.write(OSC_RESET + SGR_RESET);
+            }
+            catch { }
+        };
+        process.on('exit', cleanup);
+        process.on('SIGINT', () => { cleanup(); process.exit(130); });
+        process.on('SIGTERM', () => { cleanup(); process.exit(143); });
+        process.on('SIGHUP', () => { cleanup(); process.exit(129); });
     }
-    // Clear screen
-    process.stdout.write('\x1b[2J\x1b[H');
 }
 export function resetTerminalTheme() {
-    const os = platform();
-    if (os === 'darwin') {
-        try {
-            // Reset to macOS Terminal.app default profile colors
-            execSync(`osascript -e '
-        tell application "Terminal"
-          set bg to {65535, 65535, 65535}
-          set fg to {0, 0, 0}
-          set background color of selected tab of front window to bg
-          set normal text color of selected tab of front window to fg
-          set cursor color of selected tab of front window to fg
-        end tell
-      '`, { stdio: 'ignore' });
-        }
-        catch {
-            process.stdout.write('\x1b[0m\x1b[2J\x1b[H');
-        }
-    }
-    else {
-        process.stdout.write('\x1b[0m\x1b[2J\x1b[H');
-    }
+    if (!supportsAnsi())
+        return;
+    if (isIcoaTerminal())
+        return; // nothing to undo
+    process.stdout.write(OSC_RESET + SGR_RESET);
 }

package/dist/lib/ui.js

@@ -3,18 +3,23 @@ import Table from 'cli-table3';
 import ora from 'ora';
 import { Marked } from 'marked';
 import { markedTerminal } from 'marked-terminal';
+import { c } from './colors.js';
 const marked = new Marked(markedTerminal());
+// Wrap the message body in explicit Darcula fg (#A9B7C6). Without this,
+// chalk.green('✓ ') emits \x1b[39m at the end and the unstyled msg falls
+// back to the terminal's profile fg — which is black on macOS Terminal.app
+// default, invisible on our forced #2B2B2B background.
 export function printSuccess(msg) {
-    console.log(chalk.green('✓ ') + msg);
+    console.log(chalk.green('✓ ') + c.fg(msg));
 }
 export function printError(msg) {
-    console.log(chalk.red('✗ ') + msg);
+    console.log(chalk.red('✗ ') + c.fg(msg));
 }
 export function printWarning(msg) {
-    console.log(chalk.yellow('⚠ ') + msg);
+    console.log(chalk.yellow('⚠ ') + c.fg(msg));
 }
 export function printInfo(msg) {
-    console.log(chalk.blue('ℹ ') + msg);
+    console.log(chalk.blue('ℹ ') + c.fg(msg));
 }
 export function printTable(headers, rows) {
     const table = new Table({
@@ -71,5 +76,5 @@ export function printHeader(title) {
     console.log(chalk.cyan('  ' + '─'.repeat(title.length + 4)));
 }
 export function printKeyValue(key, value) {
-    console.log(`  ${chalk.gray(key + ':')} ${value}`);
+    console.log(`  ${chalk.gray(key + ':')} ${c.fg(value)}`);
 }

package/package.json

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