Merge branch 'FirePlank:main' into main

Author: Naviary2

sprt/README.md

@@ -140,8 +140,9 @@ The UI provides download buttons:
 | Button | Content |
 |--------|---------|
 | **Copy Log** | Copy game log to clipboard |
-| **Download Logs** | Save game log as `.txt` |
-| **Download Games (ICN)** | Save games in ICN format |
+| **Download Logs** | Save game logs in ICN format |
+| **Download Games (TXT)** | Save games as a `.txt` |
+| **Download Games (JSON)** | Save games as a `.json` |
 
 ICN format includes headers like:
 ```

sprt/web/index.html

@@ -479,10 +479,10 @@ <h2 class="card-title">
         <div class="sprt-status" id="sprtStatus">Status: -</div>
 
         <div class="btn-group" style="margin-top: 0.75rem">
-          <button class="btn btn-secondary" id="downloadGames" style="display: none">
-            Download Games (ICN)
+          <button class="btn btn-secondary" id="downloadGames-txt" disabled>
+            Download Games (TXT)
           </button>
-          <button class="btn btn-secondary" id="downloadGamesJson" style="display: none">
+          <button class="btn btn-secondary" id="downloadGames-json" disabled>
             Download Games (JSON)
           </button>
         </div>

sprt/web/main.js

@@ -2,6 +2,17 @@ import initOld, { Engine as EngineOld } from './pkg-old/hydrochess_wasm.js';
 import initNew, { Engine as EngineNew } from './pkg-new/hydrochess_wasm.js';
 import { VARIANTS, getVariantData } from './variants.js';
 
+// Map internal engine piece letters to infinitechess.org ICN codes (lowercase for ICN)
+function engineLetterToICNCode(letter) {
+    const map = {
+        'k': 'k', 'q': 'q', 'r': 'r', 'b': 'b', 'n': 'n', 'p': 'p',
+        'm': 'am', 'c': 'ch', 'a': 'ar', 'h': 'ha', 'g': 'gu',
+        'l': 'ca', 'i': 'gi', 'z': 'ze', 'e': 'ce', 'y': 'rq',
+        'd': 'rc', 's': 'nr', 'u': 'hu', 'o': 'ro', 'x': 'ob', 'v': 'vo'
+    };
+    return map[letter] || letter;
+}
+
 // UI Elements
 const statusDot = document.getElementById('statusDot');
 const statusText = document.getElementById('statusText');
@@ -28,8 +39,8 @@ const sprtOutput = document.getElementById('sprtOutput');
 const gameLogEl = document.getElementById('gameLog');
 const copyLogBtn = document.getElementById('copyLog');
 const downloadLogsBtn = document.getElementById('downloadLogs');
-const downloadGamesBtn = document.getElementById('downloadGames');
-const downloadGamesJsonBtn = document.getElementById('downloadGamesJson');
+const downloadGamesTxtBtn = document.getElementById('downloadGames-txt');
+const downloadGamesJsonBtn = document.getElementById('downloadGames-json');
 const icnOutputEl = document.getElementById('icnOutput');
 const icnTextEl = document.getElementById('icnText');
 const sprtStatusEl = document.getElementById('sprtStatus');
@@ -430,16 +441,23 @@ function generateICNFromWorkerLog(workerLog, gameIndex, result, newPlaysWhite, e
     }).filter(Boolean);
 
     const movesStr = moves.join('|');
-    // Determine promotion ranks for the variant (default to standard 8 for white, 1 for black)
+    // Determine promotion ranks and allowed promotions for the variant
+    // Default to standard 8 for white, 1 for black, with q,r,b,n allowed
     let whiteRank = '8';
     let blackRank = '1';
+    let promotionsAllowed = ['q', 'r', 'b', 'n'];
     let worldBoundsStr = '';
     try {
         const vdata = getVariantData(variantName);
-        if (vdata && vdata.game_rules && vdata.game_rules.promotion_ranks) {
-            const ranks = vdata.game_rules.promotion_ranks;
-            if (ranks.white && ranks.white.length > 0) whiteRank = ranks.white[0];
-            if (ranks.black && ranks.black.length > 0) blackRank = ranks.black[0];
+        if (vdata && vdata.game_rules) {
+            if (vdata.game_rules.promotion_ranks) {
+                const ranks = vdata.game_rules.promotion_ranks;
+                if (ranks.white && ranks.white.length > 0) whiteRank = ranks.white[0];
+                if (ranks.black && ranks.black.length > 0) blackRank = ranks.black[0];
+            }
+            if (vdata.game_rules.promotions_allowed && Array.isArray(vdata.game_rules.promotions_allowed)) {
+                promotionsAllowed = vdata.game_rules.promotions_allowed;
+            }
         }
         // Compute world bounds: if worldBorder is a number, calculate finite bounds
         // Otherwise, use infinite bounds
@@ -476,7 +494,10 @@ function generateICNFromWorkerLog(workerLog, gameIndex, result, newPlaysWhite, e
         // Use infinite bounds on error
         worldBoundsStr = '-999999999999999,1000000000000008,-999999999999999,1000000000000008';
     }
-    const promotionRanksToken = `(${whiteRank}|${blackRank})`;
+    // Build promotion token: (whiteRank;promo1,promo2,...|blackRank;promo1,promo2,...)
+    // Convert engine piece letters to ICN codes (e.g., 'm' -> 'am')
+    const promotionsICN = promotionsAllowed.map(p => engineLetterToICNCode(p)).join(',');
+    const promotionRanksToken = `(${whiteRank};${promotionsICN}|${blackRank};${promotionsICN})`;
     return `${headers} ${nextTurn} ${halfmove}/100 ${fullmove} ${promotionRanksToken} ${worldBoundsStr} ${startPositionStr}${movesStr ? ' ' + movesStr : ''}`;
 }
 
@@ -850,6 +871,10 @@ async function runSprt() {
     let llr = 0;
     gameLogs = [];
 
+    // Disable download buttons as logs are cleared
+    downloadGamesTxtBtn.disabled = true;
+    downloadGamesJsonBtn.disabled = true;
+
     sprtOutput.innerHTML = '';
     perVariantStats = {};
     clearLog();
@@ -925,6 +950,9 @@ async function runSprt() {
                             msg.variantName, // Add variant to ICN log
                         );
                         gameLogs.push(icnLog);
+                        // Enable download buttons immediately upon first result
+                        downloadGamesTxtBtn.disabled = false;
+                        downloadGamesJsonBtn.disabled = false;
                         // Global results
                         if (result === 'win') wins++;
                         else if (result === 'loss') losses++;
@@ -1085,12 +1113,6 @@ async function runSprt() {
     sprtRunning = false;
     runSprtBtn.disabled = false;
     stopSprtBtn.disabled = true;
-    // Show/enable download games if we have any ICN logs
-    const hasGames = gameLogs.length > 0;
-    downloadGamesBtn.disabled = !hasGames;
-    downloadGamesBtn.style.display = hasGames ? '' : 'none';
-    downloadGamesJsonBtn.disabled = !hasGames;
-    downloadGamesJsonBtn.style.display = hasGames ? '' : 'none';
 }
 
 function stopSprt() {
@@ -1136,12 +1158,10 @@ function stopSprt() {
             sprtLog('  Elo Difference: ' + (lastElo >= 0 ? '+' : '') + lastElo.toFixed(1) + ' ±' + lastEloError.toFixed(1));
         }
     }
-    // Allow downloads of games if any finished before abort
+    // Allow download of any completed games
     const hasGamesAbort = gameLogs.length > 0;
-    downloadGamesBtn.disabled = !hasGamesAbort;
-    downloadGamesBtn.style.display = hasGamesAbort ? '' : 'none';
+    downloadGamesTxtBtn.disabled = !hasGamesAbort;
     downloadGamesJsonBtn.disabled = !hasGamesAbort;
-    downloadGamesJsonBtn.style.display = hasGamesAbort ? '' : 'none';
 }
 
 function copyLog() {
@@ -1193,144 +1213,14 @@ function downloadGames() {
     URL.revokeObjectURL(url);
 }
 
-/**
- * Parse an ICN string and extract game metadata and moves into a JSON-friendly object.
- * ICN format after headers: turn halfmove/100 fullmove (whitePromo|blackPromo) worldBounds startPosition moves
- */
-function parseICNToJSON(icnString) {
-    if (!icnString || typeof icnString !== 'string') return null;
-
-    const result = {
-        headers: {},
-        startPosition: null,
-        worldBounds: null,
-        moves: [],
-        turn: 'w',
-        halfmoveClock: 0,
-        fullmoveNumber: 1,
-        promotionRanks: null
-    };
-
-    // Parse headers: [Key "Value"]
-    const headerRegex = /\[([^\]]+)\s+"([^"]*)"\]/g;
-    let match;
-    let lastHeaderEnd = 0;
-    while ((match = headerRegex.exec(icnString)) !== null) {
-        result.headers[match[1]] = match[2];
-        lastHeaderEnd = headerRegex.lastIndex;
-    }
-
-    const afterHeaders = icnString.slice(lastHeaderEnd).trim();
-    if (!afterHeaders) return result;
-
-    // Split by whitespace robustly
-    const tokens = afterHeaders.split(/\s+/);
-
-    let idx = 0;
-
-    // Token 0: turn (w or b)
-    if (tokens.length > idx && (tokens[idx] === 'w' || tokens[idx] === 'b')) {
-        result.turn = tokens[idx];
-        idx++;
-    }
-
-    // Token 1: halfmove/100
-    if (tokens.length > idx && tokens[idx].includes('/')) {
-        const halfmovePart = tokens[idx];
-        const slashIdx = halfmovePart.indexOf('/');
-        result.halfmoveClock = parseInt(halfmovePart.slice(0, slashIdx), 10) || 0;
-        idx++;
-    }
-
-    // Token 2: fullmove number
-    if (tokens.length > idx && /^\d+$/.test(tokens[idx])) {
-        result.fullmoveNumber = parseInt(tokens[idx], 10) || 1;
-        idx++;
-    }
-
-    // Token 3: promotion ranks like (8|1)
-    if (tokens.length > idx && tokens[idx].startsWith('(') && tokens[idx].includes('|')) {
-        result.promotionRanks = tokens[idx];
-        idx++;
-    }
-
-    // Token 4 might be world bounds (format: minX,maxX,minY,maxY - 4 numbers separated by 3 commas)
-    if (tokens.length > idx) {
-        const token = tokens[idx];
-        const commaCount = (token.match(/,/g) || []).length;
-        const hasLetterExceptE = /[a-df-zA-DF-Z]/.test(token);
-        const hasPipe = token.includes('|');
-        const hasGt = token.includes('>');
-
-        if (commaCount === 3 && !hasLetterExceptE && !hasPipe && !hasGt) {
-            result.worldBounds = token;
-            idx++;
-        }
-    }
-
-    // Remaining tokens: start position and moves
-    let positionParts = [];
-
-    for (let i = idx; i < tokens.length; i++) {
-        const token = tokens[i];
-        if (!token) continue;
-
-        if (token.includes('>')) {
-            // Moves token (pipe-separated)
-            const movesRaw = token.split('|');
-            for (const moveStr of movesRaw) {
-                if (!moveStr.includes('>')) continue;
-                const braceIdx = moveStr.indexOf('{');
-                const cleanMove = braceIdx !== -1 ? moveStr.slice(0, braceIdx).trim() : moveStr.trim();
-                if (cleanMove.includes('>')) {
-                    result.moves.push(cleanMove);
-                }
-            }
-        } else if (token.includes('|') || /[a-zA-Z]/.test(token)) {
-            // Position piece(s)
-            const pieces = token.split('|').filter(p => p.length > 0);
-            positionParts.push(...pieces);
-        } else if (token.includes(',')) {
-            // Possible world bounds if not already found, or coordinate-only piece
-            positionParts.push(token);
-        }
-    }
-
-    if (positionParts.length > 0) {
-        result.startPosition = positionParts.join('|');
-    }
-
-    return result;
-}
-
 
 function downloadGamesJson() {
     if (!gameLogs.length) {
         log('No games to download yet', 'warn');
         return;
     }
 
-    const games = gameLogs.map((icn, index) => {
-        const parsed = parseICNToJSON(icn);
-        return {
-            gameIndex: index + 1,
-            event: parsed?.headers?.Event || null,
-            variant: parsed?.headers?.Variant || 'Classical',
-            result: parsed?.headers?.Result || '*',
-            white: parsed?.headers?.White || null,
-            black: parsed?.headers?.Black || null,
-            termination: parsed?.headers?.Termination || null,
-            timeControl: parsed?.headers?.TimeControl || null,
-            utcDate: parsed?.headers?.UTCDate || null,
-            utcTime: parsed?.headers?.UTCTime || null,
-            worldBounds: parsed?.worldBounds || null,
-            startPosition: parsed?.startPosition || null,
-            moves: parsed?.moves || [],
-            rawICN: icn
-        };
-    });
-
-    const jsonOutput = JSON.stringify({ games, exportedAt: new Date().toISOString() }, null, 2);
+    const jsonOutput = JSON.stringify(gameLogs, null, 2);
     const blob = new Blob([jsonOutput], { type: 'application/json' });
     const url = URL.createObjectURL(blob);
     const a = document.createElement('a');
@@ -1348,7 +1238,7 @@ runSprtBtn.addEventListener('click', runSprt);
 stopSprtBtn.addEventListener('click', stopSprt);
 copyLogBtn.addEventListener('click', copyLog);
 downloadLogsBtn.addEventListener('click', downloadLogs);
-downloadGamesBtn.addEventListener('click', downloadGames);
+downloadGamesTxtBtn.addEventListener('click', downloadGames);
 downloadGamesJsonBtn.addEventListener('click', downloadGamesJson);
 sprtVariantsEl.addEventListener('change', updateSelectedVariants);
 
@@ -1425,11 +1315,6 @@ window.__sprt_compute_features = async (rawSamples) => {
 };
 
 initWasm();
-// Initially hide & disable games download until we have results
-downloadGamesBtn.disabled = true;
-downloadGamesBtn.style.display = 'none';
-downloadGamesJsonBtn.disabled = true;
-downloadGamesJsonBtn.style.display = 'none';
 
 /* UI Logic for TC Mode */
 if (typeof sprtTcMode !== 'undefined' && sprtTcMode) {