fix rest script

Author: Deltachaos

.github/workflows/ci.yml

@@ -20,4 +20,4 @@ jobs:
           buildCache: false
 
       - name: Run tests
-        run: lua ./bin/test.lua
+        run: TEST_IGNORE_SLUGS=engine_consistency_integration lua ./bin/test.lua

README.md

@@ -46,7 +46,8 @@ Engines register with **DeltaChess.Engines** and implement:
   - `:Elo(elo)` – optional. Requested difficulty. Default: average of engine's ELO range.
   - `:TimeLimitMs(ms)` – optional. Max time in ms. Default: 20000 (20 seconds).
   - `:OnComplete(cb)` – `function(result, err)`. Required before `Run()`. If the engine returns an illegal move, the runner calls `onComplete(nil, err)` with `err` an object `{ message = "illegal move", move = "<uci>" }`.
-  - `:Scheduler(fn)` – optional. `function(next)`. Default: call `next()` immediately.
+  - `:DelayFn(fn)` – optional. `function(next)`. Default: call `next()` immediately.
+  - `:LoopFn(fn)` – optional. `function(stepFn, doneFn)` loop driver for async iteration. Default: runs all steps synchronously.
   - `:Run()` – start calculation.
 
 ## Global registration (WoW addon compatible)
@@ -102,10 +103,10 @@ DeltaChess.EngineRunner.Create("beat_highest_piece")
         if err then return end
         -- use result.move
     end)
-    :Scheduler(function(next) C_Timer.After(0, next) end)
+    :DelayFn(function(next) C_Timer.After(0, next) end)
     :Run()
 ```
-Engines receive `yieldFn(next)` and call it when they want to yield; the scheduler runs `next()` on the next frame so the game stays responsive.
+Engines receive `yieldFn(next)` and call it when they want to yield; the delay function runs `next()` on the next frame so the game stays responsive.
 
 **CLI game (bin/play.lua):** Run from repo root. Engine vs itself or engine1 vs engine2, with optional ELOs:
 ```bash

bin/benchmark.lua

@@ -50,7 +50,7 @@ local function randomLegalMove(board)
 end
 
 -- Run one test: engine vs random, up to MAX_ENGINE_MOVES engine moves; return average thinking time in ms or nil on error.
--- Runs synchronously via Scheduler(next) => next().
+-- Runs synchronously via DelayFn(next) => next().
 local function runOneTest(engineId, elo)
   local board = Board.New()
   local times = {}   -- list of thinking times in seconds (from os.clock())
@@ -85,7 +85,7 @@ local function runOneTest(engineId, elo)
     EngineRunner.Create(engineId)
       :Fen(fen)
       :Elo(elo)
-      :Scheduler(function(next) next() end)
+      :DelayFn(function(next) next() end)
       :OnComplete(function(res, err)
         local t1 = os.clock()
         if err or not res or not res.move then
@@ -120,7 +120,7 @@ local function runOneTest(engineId, elo)
       :Run()
   end
 
-  -- Engine plays white (first move); runs synchronously via Scheduler(next) next()
+  -- Engine plays white (first move); runs synchronously via DelayFn(next) => next()
   doEngineMove(function() end)
 
   if errMsg then return nil, errMsg end

bin/duel.lua

@@ -10,15 +10,39 @@
     TEST_WORKERS=4 lua bin/test.lua   -- spawn 4 parallel workers (main spawns, then workers run slice)
     lua bin/test.lua --lua=C:\path\to\lua.exe
     set LUA_BIN=C:\path\to\lua.exe && lua bin/test.lua
+    lua bin/test.lua --only=slug1,slug2   -- run only tests with these slugs
+    lua bin/test.lua --ignore=slug1,slug2 -- skip tests with these slugs
 ]]
 
--- Parse --lua=path and env LUA_BIN / LUA for Lua binary used when spawning workers
+-- Parse command-line arguments
 local luaBin = os.getenv("LUA_BIN") or os.getenv("LUA") or "lua"
+local onlySlugs = {}
+local ignoreSlugs = {}
+
 for _, a in ipairs(arg) do
-  local path = a:match("^%-%-(lua)=(.+)$")
-  if path then
-    luaBin = path
-    break
+  local luaPath = a:match("^%-%-lua=(.+)$")
+  if luaPath then
+    luaBin = luaPath
+  end
+  
+  local only = a:match("^%-%-only=(.+)$")
+  if only then
+    for slug in only:gmatch("[^,]+") do
+      local trimmed = slug:gsub("^%s+", ""):gsub("%s+$", "")
+      if trimmed ~= "" then
+        table.insert(onlySlugs, trimmed)
+      end
+    end
+  end
+  
+  local ignore = a:match("^%-%-ignore=(.+)$")
+  if ignore then
+    for slug in ignore:gmatch("[^,]+") do
+      local trimmed = slug:gsub("^%s+", ""):gsub("%s+$", "")
+      if trimmed ~= "" then
+        table.insert(ignoreSlugs, trimmed)
+      end
+    end
   end
 end
 
@@ -85,6 +109,40 @@ require("init")
 -- Load test framework
 local Test = require("test")
 
+-- Apply slug filters from command-line arguments or environment variables
+local onlySlugsEnv = os.getenv("TEST_ONLY_SLUGS")
+local ignoreSlugsEnv = os.getenv("TEST_IGNORE_SLUGS")
+
+if onlySlugsEnv and onlySlugsEnv ~= "" then
+  for slug in onlySlugsEnv:gmatch("[^,]+") do
+    local trimmed = slug:gsub("^%s+", ""):gsub("%s+$", "")
+    if trimmed ~= "" then
+      table.insert(Test.onlySlugs, trimmed)
+    end
+  end
+elseif #onlySlugs > 0 then
+  Test.onlySlugs = onlySlugs
+end
+
+if ignoreSlugsEnv and ignoreSlugsEnv ~= "" then
+  for slug in ignoreSlugsEnv:gmatch("[^,]+") do
+    local trimmed = slug:gsub("^%s+", ""):gsub("%s+$", "")
+    if trimmed ~= "" then
+      table.insert(Test.ignoreSlugs, trimmed)
+    end
+  end
+elseif #ignoreSlugs > 0 then
+  Test.ignoreSlugs = ignoreSlugs
+end
+
+-- Debug output for slug filters
+if #Test.onlySlugs > 0 then
+  print("Only running tests with slugs: " .. table.concat(Test.onlySlugs, ", "))
+end
+if #Test.ignoreSlugs > 0 then
+  print("Ignoring tests with slugs: " .. table.concat(Test.ignoreSlugs, ", "))
+end
+
 -- Cross-platform: list immediate subdirectories (no find on Windows)
 local function discoverTestDirs(testsRoot)
   local dirs = {}
@@ -100,7 +158,8 @@ local function discoverTestDirs(testsRoot)
     for line in handle:lines() do
       local trimmed = line:gsub("^%s+", ""):gsub("%s+$", ""):gsub("\r", "")
       if trimmed ~= "" then
-        local full = pathForShell .. sep .. trimmed
+        -- find returns full paths; dir /b returns names only
+        local full = isAbsolute(trimmed) and trimmed or (pathForShell .. sep .. trimmed)
         table.insert(dirs, full)
       end
     end
@@ -151,7 +210,8 @@ local workerId = os.getenv("TEST_WORKER")  -- set when we are a worker
 -- Main process: spawn N workers in parallel when TEST_WORKERS > 1 and we are not already a worker
 if totalWorkers > 1 and workerId == nil then
   local scriptFull = projectRoot .. "bin" .. sep .. "test.lua"
-  local resultDir = (os.getenv("TEMP") or os.getenv("TMP") or ".") .. sep .. "deltachess_test_" .. tostring(math.random(100000, 999999))
+  local tmpBase = os.getenv("TEMP") or os.getenv("TMP") or (isWindows and "." or "/tmp")
+  local resultDir = tmpBase .. sep .. "deltachess_test_" .. tostring(math.random(100000, 999999))
   if isWindows then
     os.execute("mkdir " .. escapeshellarg(resultDir) .. " 2>nul")
   else
@@ -207,6 +267,12 @@ if totalWorkers > 1 and workerId == nil then
       if luaBin ~= "lua" then
         line = line .. 'set "LUA_BIN=' .. batStr(luaBin) .. '"\r\n'
       end
+      if #onlySlugs > 0 then
+        line = line .. 'set "TEST_ONLY_SLUGS=' .. batStr(table.concat(onlySlugs, ",")) .. '"\r\n'
+      end
+      if #ignoreSlugs > 0 then
+        line = line .. 'set "TEST_IGNORE_SLUGS=' .. batStr(table.concat(ignoreSlugs, ",")) .. '"\r\n'
+      end
       line = line .. 'cd /d "' .. batStr(projectRoot:gsub("/", sep)) .. '"\r\n'
         .. '"' .. batStr(luaBin:gsub("/", sep)) .. '" "' .. batStr(scriptFull:gsub("/", sep)) .. '"\r\n'
       local f = io.open(batPath, "wb")
@@ -228,6 +294,12 @@ if totalWorkers > 1 and workerId == nil then
       if luaBin ~= "lua" then
         shContent = shContent .. "export LUA_BIN=\"" .. forShDoubleQuotedValue(luaBin) .. "\"\n"
       end
+      if #onlySlugs > 0 then
+        shContent = shContent .. "export TEST_ONLY_SLUGS=\"" .. forShDoubleQuotedValue(table.concat(onlySlugs, ",")) .. "\"\n"
+      end
+      if #ignoreSlugs > 0 then
+        shContent = shContent .. "export TEST_IGNORE_SLUGS=\"" .. forShDoubleQuotedValue(table.concat(ignoreSlugs, ",")) .. "\"\n"
+      end
       shContent = shContent .. "cd \"" .. forShDoubleQuotedValue(projectRoot) .. "\" && exec \""
         .. forShDoubleQuotedValue(luaBin) .. "\" \"" .. forShDoubleQuotedValue(scriptFull) .. "\"\n"
       local f = io.open(shPath, "wb")

bin/rate.lua

@@ -97,19 +97,20 @@ function M.PlayGame(whiteEngineId, whiteElo, blackEngineId, blackElo, maxHalfMov
 
     local function doHalfMove(halfMoveNum, doneCb)
         local currentFen = board:GetFen()
-        local moves = board:GetMoveHistory()
+        local movesUci = board:GetMoveHistoryUci()
         local isWhite = board:IsWhiteToMove()
-        
+        local function lastMoveSan() return (board:GetLastMove() and board:GetLastMove():GetSan()) or nil end
+
         -- Check if board reports game has ended (checkmate, stalemate, 50-move rule)
         if board:IsEnded() then
             result = board:GetResult()
             endReason = board:GetEndReason()
-            notify({ 
-                fen = currentFen, 
-                moves = moves, 
-                halfMoveNum = #moves, 
-                lastMove = (moves[#moves] and moves[#moves]:GetUci()) or nil, 
-                lastMoveSan = (moves[#moves] and moves[#moves]:GetSan()) or nil,
+            notify({
+                fen = currentFen,
+                moves = movesUci,
+                halfMoveNum = #movesUci,
+                lastMove = movesUci[#movesUci],
+                lastMoveSan = lastMoveSan(),
                 result = result,
                 endReason = endReason
             })
@@ -121,12 +122,12 @@ function M.PlayGame(whiteEngineId, whiteElo, blackEngineId, blackElo, maxHalfMov
         if halfMoveNum > maxHalfMoves then
             result = Constants.TIMEOUT
             endReason = Constants.REASON_TIMEOUT
-            notify({ 
-                fen = currentFen, 
-                moves = moves, 
-                halfMoveNum = #moves, 
-                lastMove = (moves[#moves] and moves[#moves]:GetUci()) or nil, 
-                lastMoveSan = (moves[#moves] and moves[#moves]:GetSan()) or nil,
+            notify({
+                fen = currentFen,
+                moves = movesUci,
+                halfMoveNum = #movesUci,
+                lastMove = movesUci[#movesUci],
+                lastMoveSan = lastMoveSan(),
                 result = result,
                 endReason = endReason
             })
@@ -137,22 +138,22 @@ function M.PlayGame(whiteEngineId, whiteElo, blackEngineId, blackElo, maxHalfMov
         local engineId, elo = getEngineAndElo(isWhite)
         local builder = EngineRunner.Create(engineId)
             :Fen(currentFen)
-            :Moves(moves)
+            :Moves(movesUci)
             :OnComplete(function(res, err)
                 if not res and err then
                     -- Engine error
                     result = Constants.ERROR
                     errorMsg = err
                     endReason = Constants.REASON_ENGINE_ERROR
-                    notify({ 
-                        fen = currentFen, 
-                        moves = moves, 
-                        halfMoveNum = #moves, 
-                        lastMove = (moves[#moves] and moves[#moves]:GetUci()) or nil, 
-                        lastMoveSan = (moves[#moves] and moves[#moves]:GetSan()) or nil,
-                        result = result, 
+                    notify({
+                        fen = currentFen,
+                        moves = movesUci,
+                        halfMoveNum = #movesUci,
+                        lastMove = movesUci[#movesUci],
+                        lastMoveSan = lastMoveSan(),
+                        result = result,
                         endReason = endReason,
-                        errorMsg = errorMsg 
+                        errorMsg = errorMsg
                     })
                     if doneCb then doneCb() end
                     return
@@ -161,48 +162,47 @@ function M.PlayGame(whiteEngineId, whiteElo, blackEngineId, blackElo, maxHalfMov
                     -- No valid move returned (but no error message) - treat as draw
                     result = Constants.DRAWN
                     endReason = Constants.REASON_RESIGNATION
-                    notify({ 
-                        fen = currentFen, 
-                        moves = moves, 
-                        halfMoveNum = #moves, 
-                        lastMove = (moves[#moves] and moves[#moves]:GetUci()) or nil, 
-                        lastMoveSan = (moves[#moves] and moves[#moves]:GetSan()) or nil,
+                    notify({
+                        fen = currentFen,
+                        moves = movesUci,
+                        halfMoveNum = #movesUci,
+                        lastMove = movesUci[#movesUci],
+                        lastMoveSan = lastMoveSan(),
                         result = result,
                         endReason = endReason
                     })
                     if doneCb then doneCb() end
                     return
                 end
-                
+
                 local uci = res.move
                 local boardResult, boardErr = board:MakeMoveUci(uci)
                 if not boardResult then
                     result = Constants.ERROR
                     errorMsg = { message = "invalid move from engine", move = uci, detail = boardErr }
                     endReason = Constants.REASON_INVALID_MOVE
-                    notify({ 
-                        fen = currentFen, 
-                        moves = moves, 
-                        halfMoveNum = #moves, 
-                        lastMove = (moves[#moves] and moves[#moves]:GetUci()) or nil, 
-                        lastMoveSan = (moves[#moves] and moves[#moves]:GetSan()) or nil,
-                        result = result, 
+                    notify({
+                        fen = currentFen,
+                        moves = movesUci,
+                        halfMoveNum = #movesUci,
+                        lastMove = movesUci[#movesUci],
+                        lastMoveSan = lastMoveSan(),
+                        result = result,
                         endReason = endReason,
-                        errorMsg = errorMsg 
+                        errorMsg = errorMsg
                     })
                     if doneCb then doneCb() end
                     return
                 end
-                
-                local newMoves = board:GetMoveHistory()
-                local lastMoveObj = newMoves[#newMoves]
-                notify({ 
-                    fen = board:GetFen(), 
-                    moves = newMoves, 
-                    halfMoveNum = #newMoves, 
-                    lastMove = uci, 
-                    lastMoveSan = (lastMoveObj and lastMoveObj:GetSan()) or nil,
-                    result = nil 
+
+                local newMovesUci = board:GetMoveHistoryUci()
+                notify({
+                    fen = board:GetFen(),
+                    moves = newMovesUci,
+                    halfMoveNum = #newMovesUci,
+                    lastMove = uci,
+                    lastMoveSan = lastMoveSan(),
+                    result = nil
                 })
 
                 -- Schedule next move
@@ -211,7 +211,7 @@ function M.PlayGame(whiteEngineId, whiteElo, blackEngineId, blackElo, maxHalfMov
                 end)
                 runPending()
             end)
-            :Scheduler(function(next) next() end)
+            :DelayFn(function(next) next() end)
         if elo then builder:Elo(elo) end
         builder:Run()
     end

bin/test.lua

@@ -41,14 +41,18 @@ DeltaChess.Engines.defaultId = nil  -- No longer auto-set; default determined by
 --     Used to sort engines by efficiency (faster engines listed first).
 --     Return nil if unknown or not applicable.
 --
---   Calculate(state, loopFn, onComplete)
+--   Calculate(state, loopFn, stepFn, onComplete)
 --     state     - State table (see above). Use state.fen; never mutate state.
 --     loopFn    - function(stepFn, doneFn). Loop driver for async iteration.
 --                 stepFn() does one unit of work; returns false when done, truthy to continue.
 --                 doneFn() is called once after stepFn returns false.
 --                 The runner defers between steps (e.g. C_Timer.NewTicker in WoW) so
 --                 the call stack stays flat and the UI remains responsive.
 --                 Inside stepFn, check state.cancelled to detect abort requests.
+--     stepFn    - function(items). Deferred step executor provided by the runner.
+--                 Pass a single function to defer it via the runner's DelayFn,
+--                 or pass a list of functions to iterate them via the runner's LoopFn.
+--                 Errors are captured and forwarded to onComplete.
 --     onComplete - function(resultTable, err). Call when done. Do not return a result.
 --                  On success, err is nil and resultTable.move (string, UCI) is required.
 --                  Optional fields: .san, .ponder, .depth, .nodes, .score, .mate.

src/EngineDuel.lua

@@ -35,7 +35,7 @@ end
 --   :TimeLimitMs(ms)    - Optional. Max time in ms. Default: 20000 (20 seconds).
 --   :OnComplete(cb)     - Required before Run(). function(result, err).
 --   :LoopFn(fn)         - Optional. loopFn(stepFn, doneFn) loop driver. Default: syncLoop.
---   :Scheduler(fn)      - Deprecated alias for :LoopFn(). Kept for backward compatibility.
+--   :DelayFn(fn)        - Optional. function(next) to defer callbacks. Default: call next() immediately.
 --   :HandleError(cb)    - Optional. function(err) called on engine error. If returns false,
 --                         error propagates. Otherwise, a random legal move is returned.
 --   :Run()              - Start calculation.
@@ -261,7 +261,7 @@ local function Builder(engineId)
                 end
 
                 local ok, err = pcall(function()
-                    engine:Calculate(state, wrappedLoopFn, wrappedDelayFn, done)
+                    engine:Calculate(state, wrappedLoopFn, wrappedStepFn, done)
                 end)
                 if not ok then
                     onComplete(nil, { message = "engine error: " .. tostring(err), move = nil })

src/EngineInterface.lua

@@ -27,7 +27,7 @@ local function getEngineList()
   return list
 end
 
-Test.suite("EngineRunner integration (all engines)")
+Test.suite("EngineRunner consistency", "engine_consistency_integration")
 
 -- Sync loopFn: runs all steps in a tight while-loop. No stack growth.
 local function syncLoop(step, done)