icoa-cli 1.8.5 → 1.9.1

package/dist/commands/env.js

@@ -61,9 +61,9 @@ const SYSTEM_TOOLS = [
     { name: 'as', check: CMD('as'), category: 'Compilers & Build' },
     { name: 'ld', check: CMD('ld'), category: 'Compilers & Build' },
     { name: 'pkg-config', check: CMD('pkg-config'), brew: 'pkg-config', apt: 'pkg-config', category: 'Compilers & Build' },
-    // Python (3)
-    { name: 'python3', check: W ? 'python --version' : 'python3 --version', brew: 'python@3.12', apt: 'python3', choco: 'python312', category: 'Python Runtime' },
-    { name: 'pip3', check: W ? 'pip --version' : 'pip3 --version', category: 'Python Runtime' },
+    // Python (3) — prefer brew 3.12 on macOS
+    { name: 'python3', check: process.platform === 'darwin' ? '/opt/homebrew/opt/python@3.12/bin/python3.12 --version' : (W ? 'python --version' : 'python3 --version'), brew: 'python@3.12', apt: 'python3', choco: 'python312', category: 'Python Runtime' },
+    { name: 'pip3', check: process.platform === 'darwin' ? '/opt/homebrew/opt/python@3.12/bin/pip3.12 --version' : (W ? 'pip --version' : 'pip3 --version'), category: 'Python Runtime' },
     { name: 'python3-venv', check: W ? 'python -c "import venv"' : 'python3 -c "import venv"', apt: 'python3-venv', category: 'Python Runtime' },
     // Networking (12)
     { name: 'curl', check: CMD('curl'), brew: 'curl', apt: 'curl', choco: 'curl', category: 'Networking' },
@@ -158,30 +158,92 @@ function isInstalled(check) {
     }
 }
 function getVersion(name) {
+    // Version commands for each tool
+    const versionCmds = {
+        'python3': process.platform === 'darwin' ? '/opt/homebrew/opt/python@3.12/bin/python3.12 --version' : 'python3 --version',
+        'pip3': process.platform === 'darwin' ? '/opt/homebrew/opt/python@3.12/bin/pip3.12 --version' : 'pip3 --version',
+        'gcc': 'gcc --version',
+        'g++': 'g++ --version',
+        'make': 'make --version',
+        'nasm': 'nasm --version',
+        'cmake': 'cmake --version',
+        'vim': 'vim --version',
+        'nano': 'nano --version',
+        'tmux': 'tmux -V',
+        'screen': 'screen --version',
+        'curl': 'curl --version',
+        'wget': 'wget --version',
+        'nmap': 'nmap --version',
+        'ssh': 'ssh -V',
+        'socat': 'socat -V',
+        'gdb': 'gdb --version',
+        'radare2': 'r2 -v',
+        'upx': 'upx --version',
+        'binwalk': 'binwalk --help',
+        'exiftool': 'exiftool -ver',
+        'john': 'john --help',
+        'hashcat': 'hashcat --version',
+        'openssl': 'openssl version',
+        'gpg': 'gpg --version',
+        'jq': 'jq --version',
+        'sqlite3': 'sqlite3 --version',
+        'git': 'git --version',
+        'docker': 'docker --version',
+        'tshark': 'tshark --version',
+        'tcpdump': 'tcpdump --version',
+        'pdftotext': 'pdftotext -v',
+        'pngcheck': 'pngcheck 2>&1',
+    };
+    const cmd = versionCmds[name];
+    if (!cmd)
+        return '';
     try {
-        if (name === 'python3')
-            return execSync('python3 --version', { encoding: 'utf-8' }).trim().replace('Python ', '');
-        if (name === 'gcc') {
-            const m = execSync('gcc --version', { encoding: 'utf-8' }).match(/(\d+\.\d+[\.\d]*)/);
-            return m?.[1] || '';
-        }
-        if (name === 'docker') {
-            const m = execSync('docker --version', { encoding: 'utf-8' }).match(/(\d+\.\d+\.\d+)/);
-            return m?.[1] || '';
+        const out = execSync(cmd + ' 2>&1', { encoding: 'utf-8', timeout: 3000 }).trim();
+        // Extract version number pattern
+        const m = out.match(/(\d+\.\d+[\.\d]*)/);
+        return m?.[1] || '';
+    }
+    catch { /* ignore */ }
+    return '';
+}
+function getOsInfo() {
+    const os = platform();
+    try {
+        if (os === 'darwin') {
+            const ver = execSync('sw_vers -productVersion', { encoding: 'utf-8' }).trim();
+            const arch = execSync('uname -m', { encoding: 'utf-8' }).trim();
+            return `macOS ${ver} (${arch})`;
         }
-        if (name === 'pip3') {
-            const m = execSync('pip3 --version', { encoding: 'utf-8' }).match(/(\d+\.\d+[\.\d]*)/);
-            return m?.[1] || '';
+        else if (os === 'linux') {
+            try {
+                const pretty = execSync('cat /etc/os-release | grep PRETTY_NAME', { encoding: 'utf-8' });
+                const m = pretty.match(/PRETTY_NAME="(.+)"/);
+                const arch = execSync('uname -m', { encoding: 'utf-8' }).trim();
+                return m ? `${m[1]} (${arch})` : `Linux (${arch})`;
+            }
+            catch {
+                return 'Linux';
+            }
         }
-        if (name === 'nmap') {
-            const m = execSync('nmap --version', { encoding: 'utf-8' }).match(/(\d+\.\d+)/);
-            return m?.[1] || '';
+        else if (os === 'win32') {
+            const ver = execSync('ver', { encoding: 'utf-8' }).trim();
+            return ver || 'Windows';
         }
     }
     catch { /* ignore */ }
-    return '';
+    return os;
+}
+function getNodeInfo() {
+    return `Node.js ${process.version}`;
 }
 function getPythonMajorMinor() {
+    // On macOS, prefer brew Python 3.12
+    if (process.platform === 'darwin') {
+        try {
+            return execSync('/opt/homebrew/opt/python@3.12/bin/python3.12 -c "import sys; print(f\'{sys.version_info.major}.{sys.version_info.minor}\')"', { encoding: 'utf-8' }).trim();
+        }
+        catch { /* fall through */ }
+    }
     try {
         return execSync('python3 -c "import sys; print(f\'{sys.version_info.major}.{sys.version_info.minor}\')"', { encoding: 'utf-8' }).trim();
     }
@@ -189,6 +251,20 @@ function getPythonMajorMinor() {
         return '';
     }
 }
+function getPythonFullVersion() {
+    if (process.platform === 'darwin') {
+        try {
+            return execSync('/opt/homebrew/opt/python@3.12/bin/python3.12 --version', { encoding: 'utf-8' }).trim().replace('Python ', '');
+        }
+        catch { /* fall through */ }
+    }
+    try {
+        return execSync('python3 --version', { encoding: 'utf-8' }).trim().replace('Python ', '');
+    }
+    catch {
+        return '';
+    }
+}
 export function registerEnvCommand(program) {
     const envCmd = program.command('env').description('Manage competition environment');
     envCmd.command('status').alias('check').description('Check all 109 tools').action(() => showStatus());
@@ -198,24 +274,22 @@ export function registerEnvCommand(program) {
 function showStatus() {
     console.log();
     const os = platform();
-    const osName = os === 'darwin' ? 'macOS' : os === 'linux' ? 'Linux' : 'Windows';
     const pm = os === 'darwin' ? 'brew' : os === 'linux' ? 'apt' : 'choco';
-    console.log(chalk.bold.white('  ICOA Competition Environment (109 commands)'));
-    console.log(chalk.gray(`  Platform: ${osName} | Package Manager: ${pm} | Python: ${PYTHON_TARGET}.x`));
+    console.log(chalk.bold.white('  ICOA Competition Environment'));
+    console.log(chalk.gray('  ─────────────────────────────────────────────'));
+    console.log(chalk.gray('  OS:       ') + chalk.white(getOsInfo()));
+    console.log(chalk.gray('  Node:     ') + chalk.white(getNodeInfo()));
+    console.log(chalk.gray('  Package:  ') + chalk.white(pm));
+    console.log(chalk.gray('  Target:   ') + chalk.white(`Python ${PYTHON_TARGET}.x`));
     console.log(chalk.gray('  ─────────────────────────────────────────────'));
-    // Python version check
+    // Python version check — use brew 3.12 on macOS
     const pyVer = getPythonMajorMinor();
-    if (pyVer) {
-        const fullVer = getVersion('python3');
-        if (pyVer === '3.12') {
-            console.log(chalk.green(`  ✓ Python ${fullVer}`) + chalk.gray(' (recommended)'));
-        }
-        else if (pyVer === '3.11' || pyVer === '3.13') {
-            console.log(chalk.yellow(`  ~ Python ${fullVer}`) + chalk.gray(' (3.12.x recommended for full compatibility)'));
-        }
-        else {
-            console.log(chalk.red(`  ✗ Python ${fullVer}`) + chalk.gray(' (3.12.x required — some tools may not work)'));
-        }
+    const fullVer = getPythonFullVersion();
+    if (pyVer === '3.12') {
+        console.log(chalk.green(`  ✓ Python ${fullVer}`) + chalk.gray(' (recommended)'));
+    }
+    else if (pyVer) {
+        console.log(chalk.yellow(`  ~ Python ${fullVer}`) + chalk.gray(' (3.12.x recommended)'));
     }
     else {
         console.log(chalk.red('  ✗ Python 3 not found'));
@@ -242,6 +316,7 @@ function showStatus() {
         }
     }
     currentCategory = '';
+    const pipExe = os === 'darwin' ? '/opt/homebrew/opt/python@3.12/bin/pip3.12' : 'pip3';
     for (const lib of PYTHON_LIBS) {
         if (lib.category !== currentCategory) {
             currentCategory = lib.category;
@@ -249,7 +324,21 @@ function showStatus() {
         }
         const ok = isInstalled(lib.check);
         if (ok) {
-            console.log(chalk.green(`    ✓ ${lib.name}`) + chalk.gray(` (${lib.install || 'latest'})`));
+            // Get actual installed version — try pip3.12, then pip3
+            let ver = '';
+            for (const pip of [pipExe, 'pip3']) {
+                try {
+                    const pkgName = lib.name.replace('python-magic', 'python_magic').replace('beautifulsoup4', 'beautifulsoup4');
+                    const out = execSync(`${pip} show ${pkgName} 2>/dev/null | grep Version`, { encoding: 'utf-8', timeout: 3000 });
+                    const m = out.match(/Version:\s*(\S+)/);
+                    if (m) {
+                        ver = m[1];
+                        break;
+                    }
+                }
+                catch { /* try next */ }
+            }
+            console.log(chalk.green(`    ✓ ${lib.name}`) + chalk.gray(ver ? ` (${ver})` : ''));
             installed++;
         }
         else {

package/dist/index.js

@@ -36,7 +36,7 @@ ${LINE}
    ${chalk.white('Sydney, Australia')}  ${chalk.gray('Jun 27 - Jul 2, 2026')}
    ${chalk.cyan.underline('https://icoa2026.au')}
 
-   ${chalk.gray('CLI-Native Competition Terminal  v1.8.5')}
+   ${chalk.gray('CLI-Native Competition Terminal  v1.9.1')}
 
 ${LINE}
 `;

package/dist/repl.js

@@ -8,7 +8,7 @@ import { ensureSandbox, runInSandbox, isDockerAvailable } from './lib/sandbox.js
 import { logCommand } from './lib/logger.js';
 import { startLogSync, stopLogSync } from './lib/log-sync.js';
 const INTERCEPT = '__REPL_NO_EXIT__';
-const VERSION = '1.8.5';
+const VERSION = '1.9.1';
 export async function startRepl(program, resumeMode) {
     const config = getConfig();
     const connected = isConnected();

package/package.json

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