icoa-cli 2.19.81 → 2.19.82

package/dist/commands/env.js

@@ -285,21 +285,37 @@ function showPythonInstallGuide() {
     console.log();
     let currentPy = '';
     let pyStatus = 'missing';
-    try {
-        const out = execSync('python3 --version', { encoding: 'utf-8', timeout: 3000 }).trim();
-        currentPy = out.replace('Python ', '');
-        const parts = currentPy.split('.').map(Number);
-        if (parts[0] === 3 && parts[1] === 12)
-            pyStatus = 'ok';
-        else if (parts[0] === 3 && parts[1] >= 10 && parts[1] < 12)
-            pyStatus = 'old';
-        else if (parts[0] === 3 && parts[1] > 12)
-            pyStatus = 'new';
-        else
-            pyStatus = 'missing';
-    }
-    catch {
-        pyStatus = 'missing';
+    // Prefer the versioned binary if available. On macOS with Homebrew, `python3`
+    // often points to the latest (e.g. 3.13) while python@3.12 is also installed
+    // at /opt/homebrew/opt/python@3.12/bin/python3.12. Don't force the user to
+    // reinstall just because the default changed.
+    const pyProbes = [
+        'python3.12 --version',
+        '/opt/homebrew/opt/python@3.12/bin/python3.12 --version',
+        '/usr/local/opt/python@3.12/bin/python3.12 --version',
+        'python3 --version',
+    ];
+    for (const cmd of pyProbes) {
+        try {
+            const out = execSync(cmd, { encoding: 'utf-8', timeout: 3000 }).trim();
+            const ver = out.replace('Python ', '');
+            const parts = ver.split('.').map(Number);
+            // Only accept as "ok" if this probe returned 3.12. Otherwise keep trying.
+            if (parts[0] === 3 && parts[1] === 12) {
+                currentPy = ver;
+                pyStatus = 'ok';
+                break;
+            }
+            // Remember the last-seen version for fallback reporting
+            currentPy = ver;
+            if (parts[0] === 3 && parts[1] >= 10 && parts[1] < 12)
+                pyStatus = 'old';
+            else if (parts[0] === 3 && parts[1] > 12)
+                pyStatus = 'new';
+            else
+                pyStatus = 'missing';
+        }
+        catch { /* try next probe */ }
     }
     if (pyStatus === 'ok') {
         console.log(chalk.green(`  ✓ Python ${currentPy} — you're good!`));

package/dist/repl.js

@@ -103,21 +103,35 @@ const VERSION = '2.5.1';
 // Quick Python version check (used in Selection menu startup warning).
 // Returns {ok, version, status}. Silent/defensive — any error means 'missing'.
 function checkPython() {
-    try {
-        const out = execSyncFn('python3 --version', { encoding: 'utf-8', timeout: 2000 }).trim();
-        const version = out.replace('Python ', '');
-        const [maj, min] = version.split('.').map(Number);
-        if (maj === 3 && min === 12)
-            return { ok: true, version, status: 'ok' };
-        if (maj === 3 && min >= 10 && min < 12)
-            return { ok: true, version, status: 'old' };
-        if (maj === 3 && min > 12)
-            return { ok: true, version, status: 'new' };
-        return { ok: false, version, status: 'missing' };
-    }
-    catch {
-        return { ok: false, version: '', status: 'missing' };
+    // Probe python3.12 first — macOS Homebrew installs python@3.12 alongside a
+    // newer default python3, and we don't want to flag a 3.12-ready machine just
+    // because the default alias moved to 3.13.
+    const probes = [
+        'python3.12 --version',
+        '/opt/homebrew/opt/python@3.12/bin/python3.12 --version',
+        '/usr/local/opt/python@3.12/bin/python3.12 --version',
+        'python3 --version',
+    ];
+    let lastVersion = '';
+    let lastStatus = 'missing';
+    for (const cmd of probes) {
+        try {
+            const out = execSyncFn(cmd, { encoding: 'utf-8', timeout: 2000 }).trim();
+            const version = out.replace('Python ', '');
+            const [maj, min] = version.split('.').map(Number);
+            if (maj === 3 && min === 12)
+                return { ok: true, version, status: 'ok' };
+            lastVersion = version;
+            if (maj === 3 && min >= 10 && min < 12)
+                lastStatus = 'old';
+            else if (maj === 3 && min > 12)
+                lastStatus = 'new';
+            else
+                lastStatus = 'missing';
+        }
+        catch { /* try next probe */ }
     }
+    return { ok: lastStatus !== 'missing', version: lastVersion, status: lastStatus };
 }
 function printSelectionMenu() {
     const stats = getDemoStats();

package/package.json

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