Update dependencies & add guards

mikeb26 · mikeb26 · commit 3c238e342f52 · 2025-07-24T11:19:34.000-04:00
This commit updates dependencies to ensure CorentinGS/chess#63 is included. Without this repmk misbehaves and skips positions in its output. Additionally this commit adds additional tests and guards to catch this.
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ test:
 deps:
 	rm -rf go.mod go.sum vendor
 	go mod init github.com/mikeb26/chesstools
-	go mod edit -replace=github.com/corentings/chess/v2=github.com/mikeb26/corentings-chess/v2@v2.0.10.mb3
+	go mod edit -replace=github.com/corentings/chess/v2=github.com/mikeb26/corentings-chess/v2@v2.1.0.mb4
 	GOPROXY=direct go mod tidy
 	go mod vendor
 	mkdir /tmp/openings
diff --git a/cmd/repmk/cache/0e/3e/f1/8b/fen.r1bqk2r@@@pp1pppbp@@@2n3pn@@@4P3@@@P2p1P2@@@2N2N1P@@@1PP3P1@@@R1BQKB1R___w___KQkq___-___0___1 b/cmd/repmk/cache/0e/3e/f1/8b/fen.r1bqk2r@@@pp1pppbp@@@2n3pn@@@4P3@@@P2p1P2@@@2N2N1P@@@1PP3P1@@@R1BQKB1R___w___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":0,"WinPct":0.026,"DrawPct":0.949,"LossPct":0.025,"Mate":0,"BestMove":"Nxd4","Depth":54,"EngVersion":17.1,"KNPS":"9050","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":302.427028377,"Type":0,"Atime":"2025-07-24T10:55:55.19221094-04:00"}
diff --git a/cmd/repmk/cache/30/7c/e5/e1/fen.rnbqkb1r@@@pp2pppp@@@2p2n2@@@3p4@@@2PP4@@@2N2N2@@@PP2PPPP@@@R1BQKB1R___b___KQkq___-___0___1 b/cmd/repmk/cache/30/7c/e5/e1/fen.rnbqkb1r@@@pp2pppp@@@2p2n2@@@3p4@@@2PP4@@@2N2N2@@@PP2PPPP@@@R1BQKB1R___b___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":11,"WinPct":0.019,"DrawPct":0.94,"LossPct":0.041,"Mate":0,"BestMove":"e6","Depth":50,"EngVersion":17.1,"KNPS":"8980","SearchTimeInSeconds":304.000476184,"ActualSearchTimeInSeconds":0,"Type":0,"Atime":"2025-07-24T11:11:41.204142711-04:00"}
diff --git a/cmd/repmk/cache/35/6b/0c/33/fen.rnbqkb1r@@@1p2pppp@@@p1p2n2@@@3p4@@@2PP4@@@2N2N2@@@PP2PPPP@@@R1BQKB1R___w___KQkq___-___0___1 b/cmd/repmk/cache/35/6b/0c/33/fen.rnbqkb1r@@@1p2pppp@@@p1p2n2@@@3p4@@@2PP4@@@2N2N2@@@PP2PPPP@@@R1BQKB1R___w___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":20,"WinPct":0.056,"DrawPct":0.93,"LossPct":0.014,"Mate":0,"BestMove":"c5","Depth":51,"EngVersion":17.1,"KNPS":"9238","SearchTimeInSeconds":304,"ActualSearchTimeInSeconds":306.430752709,"Type":0,"Atime":"2025-07-24T11:11:41.426819594-04:00"}
diff --git a/cmd/repmk/cache/35/81/3d/27/fen.r1bqk2r@@@pp1pppbp@@@2n3pn@@@2p1P3@@@P4P2@@@2N2N1P@@@1PPP2P1@@@R1BQKB1R___w___KQkq___-___0___1 b/cmd/repmk/cache/35/81/3d/27/fen.r1bqk2r@@@pp1pppbp@@@2n3pn@@@2p1P3@@@P4P2@@@2N2N1P@@@1PPP2P1@@@R1BQKB1R___w___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":0,"WinPct":0.028,"DrawPct":0.944,"LossPct":0.028,"Mate":0,"BestMove":"d4","Depth":62,"EngVersion":17.1,"KNPS":"8825","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":300.000587707,"Type":0,"Atime":"2025-07-24T10:55:55.016854078-04:00"}
diff --git a/cmd/repmk/cache/58/32/70/77/fen.r1bqk1nr@@@pp1pppbp@@@2n3p1@@@2p1P3@@@P4P2@@@2N2N2@@@1PPP2PP@@@R1BQKB1R___w___KQkq___-___0___1 b/cmd/repmk/cache/58/32/70/77/fen.r1bqk1nr@@@pp1pppbp@@@2n3p1@@@2p1P3@@@P4P2@@@2N2N2@@@1PPP2PP@@@R1BQKB1R___w___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":0,"WinPct":0.028,"DrawPct":0.944,"LossPct":0.028,"Mate":0,"BestMove":"Bb5","Depth":57,"EngVersion":17.1,"KNPS":"8982","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":300.00053488,"Type":0,"Atime":"2025-07-24T10:55:56.267225087-04:00"}
diff --git a/cmd/repmk/cache/6f/3f/4e/ee/fen.r1bqk2r@@@pp2ppbp@@@3p2pn@@@4P3@@@P4PP1@@@2N4P@@@1PP2Q2@@@R1B1KB1R___w___KQkq___-___0___1 b/cmd/repmk/cache/6f/3f/4e/ee/fen.r1bqk2r@@@pp2ppbp@@@3p2pn@@@4P3@@@P4PP1@@@2N4P@@@1PP2Q2@@@R1B1KB1R___w___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":378,"WinPct":1,"DrawPct":0,"LossPct":0,"Mate":0,"BestMove":"Be3","Depth":41,"EngVersion":17.1,"KNPS":"10164","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":300.000675954,"Type":0,"Atime":"2025-07-24T10:55:56.082867497-04:00"}
diff --git a/cmd/repmk/cache/79/99/9d/80/fen.r1bqk2r@@@pp1pppbp@@@2n3p1@@@2p1P3@@@P4Pn1@@@2N2N2@@@1PPP2PP@@@R1BQKB1R___w___KQkq___-___0___1 b/cmd/repmk/cache/79/99/9d/80/fen.r1bqk2r@@@pp1pppbp@@@2n3p1@@@2p1P3@@@P4Pn1@@@2N2N2@@@1PPP2PP@@@R1BQKB1R___w___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":11,"WinPct":0.041,"DrawPct":0.94,"LossPct":0.019,"Mate":0,"BestMove":"h3","Depth":50,"EngVersion":17.1,"KNPS":"9378","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":303.283593808,"Type":0,"Atime":"2025-07-24T10:55:54.840442386-04:00"}
diff --git a/cmd/repmk/cache/af/3c/29/ed/fen.r1bqk2r@@@pp1pppbp@@@6p1@@@4Pn2@@@P2Q1P2@@@2N4P@@@1PP3P1@@@R1B1KB1R___w___KQkq___-___0___1 b/cmd/repmk/cache/af/3c/29/ed/fen.r1bqk2r@@@pp1pppbp@@@6p1@@@4Pn2@@@P2Q1P2@@@2N4P@@@1PP3P1@@@R1B1KB1R___w___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":45,"WinPct":0.083,"DrawPct":0.915,"LossPct":0.002,"Mate":0,"BestMove":"Qf2","Depth":49,"EngVersion":17.1,"KNPS":"10512","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":300.001048471,"Type":0,"Atime":"2025-07-24T10:55:55.543863017-04:00"}
diff --git a/cmd/repmk/cache/b6/0a/65/84/fen.r1bqk2r@@@pp1pppbp@@@6pn@@@4P3@@@P2n1P2@@@2N4P@@@1PP3P1@@@R1BQKB1R___w___KQkq___-___0___1 b/cmd/repmk/cache/b6/0a/65/84/fen.r1bqk2r@@@pp1pppbp@@@6pn@@@4P3@@@P2n1P2@@@2N4P@@@1PP3P1@@@R1BQKB1R___w___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":48,"WinPct":0.109,"DrawPct":0.889,"LossPct":0.002,"Mate":0,"BestMove":"Qxd4","Depth":49,"EngVersion":17.1,"KNPS":"10015","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":300.000115414,"Type":0,"Atime":"2025-07-24T10:55:55.36679797-04:00"}
diff --git a/cmd/repmk/cache/d5/27/27/f9/fen.rnbqkbnr@@@pp2pppp@@@2p5@@@3p4@@@2PP4@@@8@@@PP2PPPP@@@RNBQKBNR___w___KQkq___-___0___1 b/cmd/repmk/cache/d5/27/27/f9/fen.rnbqkbnr@@@pp2pppp@@@2p5@@@3p4@@@2PP4@@@8@@@PP2PPPP@@@RNBQKBNR___w___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":15,"WinPct":0.047,"DrawPct":0.937,"LossPct":0.016,"Mate":0,"BestMove":"Nf3","Depth":48,"EngVersion":17.1,"KNPS":"8699","SearchTimeInSeconds":304,"ActualSearchTimeInSeconds":304.001644599,"Type":0,"Atime":"2025-07-24T11:11:40.812342305-04:00"}
diff --git a/cmd/repmk/cache/df/e8/c3/6b/fen.r1bqk2r@@@pp1pppb1@@@6p1@@@4Pn1p@@@P4P2@@@2N4P@@@1PP2QP1@@@R1B1KB1R___w___KQkq___-___0___1 b/cmd/repmk/cache/df/e8/c3/6b/fen.r1bqk2r@@@pp1pppb1@@@6p1@@@4Pn1p@@@P4P2@@@2N4P@@@1PP2QP1@@@R1B1KB1R___w___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":34,"WinPct":0.053,"DrawPct":0.944,"LossPct":0.003,"Mate":0,"BestMove":"Rg1","Depth":46,"EngVersion":17.1,"KNPS":"10728","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":300.000245773,"Type":0,"Atime":"2025-07-24T10:55:55.721174903-04:00"}
diff --git a/cmd/repmk/cache/e8/95/dc/cb/fen.r1bqk2r@@@pp1pppbp@@@2n3p1@@@2p1P2n@@@P4P2@@@2N2N2@@@1PPP2PP@@@R1BQKB1R___w___KQkq___-___0___1 b/cmd/repmk/cache/e8/95/dc/cb/fen.r1bqk2r@@@pp1pppbp@@@2n3p1@@@2p1P2n@@@P4P2@@@2N2N2@@@1PPP2PP@@@R1BQKB1R___w___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":142,"WinPct":0.814,"DrawPct":0.186,"LossPct":0,"Mate":0,"BestMove":"d4","Depth":48,"EngVersion":17.1,"KNPS":"9919","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":302.798857061,"Type":0,"Atime":"2025-07-24T10:55:56.449910385-04:00"}
diff --git a/cmd/repmk/cache/ed/74/25/a7/fen.r1bqk2r@@@pp2ppbp@@@3p2p1@@@4Pn2@@@P4P2@@@2N4P@@@1PP2QP1@@@R1B1KB1R___w___KQkq___-___0___1 b/cmd/repmk/cache/ed/74/25/a7/fen.r1bqk2r@@@pp2ppbp@@@3p2p1@@@4Pn2@@@P4P2@@@2N4P@@@1PP2QP1@@@R1B1KB1R___w___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":292,"WinPct":1,"DrawPct":0,"LossPct":0,"Mate":0,"BestMove":"g4","Depth":43,"EngVersion":17.1,"KNPS":"10278","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":300.001515251,"Type":0,"Atime":"2025-07-24T10:55:55.906750942-04:00"}
diff --git a/cmd/repmk/cache/fd/68/06/fa/fen.r1bqk2r@@@pp1pppbp@@@2n3p1@@@4P2n@@@P2p1P2@@@2N2N2@@@1PP3PP@@@R1BQKB1R___w___KQkq___-___0___1 b/cmd/repmk/cache/fd/68/06/fa/fen.r1bqk2r@@@pp1pppbp@@@2n3p1@@@4P2n@@@P2p1P2@@@2N2N2@@@1PP3PP@@@R1BQKB1R___w___KQkq___-___0___1
@@ -0,0 +1 @@
+{"CP":177,"WinPct":0.943,"DrawPct":0.057,"LossPct":0,"Mate":0,"BestMove":"Nxd4","Depth":46,"EngVersion":17.1,"KNPS":"9026","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":300.001325415,"Type":0,"Atime":"2025-07-24T10:55:56.624767769-04:00"}
diff --git a/cmd/repmk/dag.go b/cmd/repmk/dag.go
@@ -290,7 +290,7 @@ func (dag *Dag) emitGameToOutput(output io.Writer, node *DagNode) error {
 }
 
 func (node *DagNode) getEvalStr() string {
-	evalCtx := chesstools.NewEvalCtx(true).WithFEN(node.position.XFENString())
+	evalCtx := chesstools.NewEvalCtx(true).WithFEN(node.position.XFENString()).WithoutAtime()
 	defer evalCtx.Close()
 	evalCtx.InitEngine()
 	er := evalCtx.Eval()
diff --git a/cmd/repmk/main.go b/cmd/repmk/main.go
@@ -31,6 +31,7 @@ type RepBldOpts struct {
 	dark         bool
 	minGames     int
 	expandVar    bool
+	noAtime      bool
 }
 
 type MoveMapValue struct {
@@ -118,6 +119,9 @@ func mainWork(opts *RepBldOpts) {
 	dag = NewDag(opts.color, opts.outputMode)
 	if opts.engineSelect {
 		evalCtx = chesstools.NewEvalCtx(false).WithEvalTime(opts.engineTime)
+		if opts.noAtime {
+			evalCtx = evalCtx.WithoutAtime()
+		}
 		defer evalCtx.Close()
 		evalCtx.InitEngine()
 	}
diff --git a/cmd/repmk/main_test.go b/cmd/repmk/main_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/corentings/chess/v2"
 )
 
-func TestRepBld(t *testing.T) {
+func TestRepBldBasic(t *testing.T) {
 	tmpConsolidatedFile, err := os.CreateTemp("", "repbldtestc-*")
 	if err != nil {
 		t.Fatalf("Could not open temp file: %v", err)
@@ -27,11 +27,14 @@ func TestRepBld(t *testing.T) {
 		color:        chess.Black,
 		threshold:    0.99,
 		maxDepth:     14,
+		engineSelect: true,
+		engineTime:   300,
 		inputFile:    "tests/test1.input.pgn",
 		outputFile:   tmpConsolidatedFile.Name(),
 		outputMode:   Consolidated,
 		keepExisting: true,
 		expandVar:    true,
+		noAtime:      true,
 	}
 	mainWork(&opts)
 	opts.outputFile = tmpFlattenedFile.Name()
@@ -73,6 +76,51 @@ func TestRepBld(t *testing.T) {
 
 }
 
+func TestRepBldAdv(t *testing.T) {
+	fmt.Printf("DEBUG - TestRepBldAdv()\n")
+	tmpFlattenedFile, err := os.CreateTemp("", "repbldtestf2-*")
+	if err != nil {
+		t.Fatalf("Could not open temp file: %v", err)
+	}
+	tmpFlattenedFile.Close()
+	defer os.Remove(tmpFlattenedFile.Name())
+
+	opts := RepBldOpts{
+		color:        chess.White,
+		threshold:    0.10,
+		engineSelect: true,
+		engineTime:   300,
+		minGames:     1,
+		maxDepth:     14,
+		outputFile:   tmpFlattenedFile.Name(),
+		outputMode:   Flattened,
+		startMoves:   "1. e4 c5 2. Nc3 Nc6 3. f4 g6 4. Nf3 Bg7 5. a4 Nf6 6. e5",
+		noAtime:      true,
+	}
+	mainWork(&opts)
+	opts.outputFile = tmpFlattenedFile.Name()
+	opts.outputMode = Flattened
+
+	tmpFlattenedFile2, err := os.Open(tmpFlattenedFile.Name())
+	if err != nil {
+		t.Fatalf("Could not open temp file: %v", err)
+	}
+	defer tmpFlattenedFile2.Close()
+
+	expectedFlattenedPos := []string{
+		"r1bqk2r/pp1pppb1/6p1/4Pn1p/P4P2/2N4P/1PP2QP1/R1B1KBR1 b Qkq - 1 12",
+		"r1bqk2r/pp2ppbp/3p2pn/4P3/P4PP1/2N1B2P/1PP2Q2/R3KB1R b KQkq - 2 13",
+		"r1bqk1nr/pp1pppbp/2n3p1/1Bp1P3/P4P2/2N2N2/1PPP2PP/R1BQK2R b KQkq - 2 7",
+		"r1bqk2r/pp1pppbp/2n3p1/4P2n/P2N1P2/2N5/1PP3PP/R1BQKB1R b KQkq - 0 8",
+	}
+	err = processOneTestPGN(tmpFlattenedFile2, tmpFlattenedFile.Name(),
+		len(expectedFlattenedPos), expectedFlattenedPos)
+	if err != nil {
+		t.Fatalf("Flattened test failed: %v", err)
+	}
+
+}
+
 func processOneTestPGN(f io.Reader, pgnFilename string, numGames int,
 	expectedPos []string) error {
 
diff --git a/eval.go b/eval.go
@@ -38,7 +38,7 @@ const (
 	UnknownSearchTime        = 0.0
 	UnknownEngVer            = 0.0
 	FileNamePrefix           = "fen."
-	CacheFileDir             = "cache"
+	DefaultCacheFileDir      = "cache"
 )
 
 var ErrCacheMiss = errors.New("cache miss")
@@ -101,6 +101,7 @@ type EvalCtx struct {
 	cloudCache    bool
 	doLazyInit    bool
 	atime         bool
+	cacheFileDir  string
 
 	engine     *uci.Engine
 	engVersion float64
@@ -132,6 +133,7 @@ func NewEvalCtx(cacheOnlyIn bool) *EvalCtx {
 	rv.cloudCache = true
 	rv.doLazyInit = false
 	rv.atime = true
+	rv.cacheFileDir = DefaultCacheFileDir
 
 	var err error
 	rv.engine, err = uci.New("stockfish")
@@ -369,14 +371,14 @@ func (evalCtx *EvalCtx) loadResultFromLocalCache(
 		return nil, err
 	}
 	cacheFileName := fen2CacheFileName(fen)
-	cacheFilePath := fen2CacheFilePath(fen)
+	cacheFilePath := evalCtx.fen2CacheFilePath(fen)
 	cacheFileFullName := filepath.Join(cacheFilePath, cacheFileName)
 
 	encodedResult, err := ioutil.ReadFile(cacheFileFullName)
 	if os.IsNotExist(err) {
 		fen = evalCtx.position.XFENString()
 		cacheFileName = fen2CacheFileName(fen)
-		cacheFilePath = fen2CacheFilePath(fen)
+		cacheFilePath = evalCtx.fen2CacheFilePath(fen)
 		cacheFileFullName = filepath.Join(cacheFilePath, cacheFileName)
 		encodedResult, err = ioutil.ReadFile(cacheFileFullName)
 	}
@@ -591,7 +593,7 @@ func (evalCtx *EvalCtx) persistResultToCache(er *EvalResult) {
 		panic(err)
 	}
 	cacheFileName := fen2CacheFileName(fen)
-	cacheFilePath := fen2CacheFilePath(fen)
+	cacheFilePath := evalCtx.fen2CacheFilePath(fen)
 	cacheFileFullName := filepath.Join(cacheFilePath, cacheFileName)
 
 	_ = os.Remove(cacheFileFullName)
@@ -641,9 +643,9 @@ func cacheFileName2Fen(fileName string) string {
 	return fen
 }
 
-func fen2CacheFilePath(cacheFileName string) string {
+func (evalCtx *EvalCtx) fen2CacheFilePath(cacheFileName string) string {
 	xsum := crc32.ChecksumIEEE([]byte(cacheFileName))
-	return fmt.Sprintf("%v/%02x/%02x/%02x/%02x", CacheFileDir, xsum>>24,
+	return fmt.Sprintf("%v/%02x/%02x/%02x/%02x", evalCtx.cacheFileDir, xsum>>24,
 		(xsum>>16)&0xff, (xsum>>8)&0xff, xsum&0xff)
 }
 
@@ -685,12 +687,14 @@ func (evalCtx *EvalCtx) Eval() *EvalResult {
 
 	searchEndTime := time.Now()
 
-	if fromCache && results.Info.Depth < er.Depth {
+	if fromCache &&
+		((evalCtx.evalDepth != DefaultDepth && results.Info.Depth < er.Depth) ||
+			float64(evalCtx.evalTimeInSec) < er.SearchTimeInSeconds) {
 		// we had a cached result, searched with the engine anyway, and
-		// found a result with a weaker depth than what we had found in
-		// the cache. in this scenario, throw away the engine's result and
-		// keep the existing cached result. this can occur when the user
-		// requested a search by time and there wasn't enough time to find
+		// found a result with a weaker depth or shorter time than what we had
+		// found in the cache. in this scenario, throw away the engine's
+		// result and keep the existing cached result. this can occur when the
+		// user requested a search by time and there wasn't enough time to find
 		// a move that exceeded the depth of the cached entry
 
 		return er
@@ -703,6 +707,7 @@ func (evalCtx *EvalCtx) Eval() *EvalResult {
 
 	bestMvUciStr := uciNotation.Encode(evalCtx.position, results.BestMove)
 	bestMoveFixed, err := uciNotation.Decode(evalCtx.position, bestMvUciStr)
+
 	if err != nil {
 		panic(fmt.Sprintf("BUG: could not re-encode decoded uci str %v: %v",
 			bestMvUciStr, err))
@@ -782,7 +787,7 @@ func findAllCacheEvalFiles(dirPath string) (cachedEvalEntryList, error) {
 
 func (evalCtx *EvalCtx) loadAllERs() ([]*EvalResult, error) {
 	erList := make([]*EvalResult, 0)
-	entryList, err := findAllCacheEvalFiles(CacheFileDir)
+	entryList, err := findAllCacheEvalFiles(evalCtx.cacheFileDir)
 	if err != nil {
 		return erList, fmt.Errorf("Failed to find all cached evals: %w", err)
 	}
diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module github.com/mikeb26/chesstools
 
 go 1.22.3
 
-replace github.com/corentings/chess/v2 => github.com/mikeb26/corentings-chess/v2 v2.0.0-20250712194620-182a00f698f7
+replace github.com/corentings/chess/v2 => github.com/mikeb26/corentings-chess/v2 v2.0.0-20250718184350-5916ae7010b7
 
 require github.com/corentings/chess/v2 v2.0.0-00010101000000-000000000000
 
diff --git a/go.sum b/go.sum
@@ -1,4 +1,4 @@
-github.com/mikeb26/corentings-chess/v2 v2.0.0-20250712194620-182a00f698f7 h1:p8c92oXi+wZF9XfcRGSsgQP7L7wNDbPFugW/oGCIQSs=
-github.com/mikeb26/corentings-chess/v2 v2.0.0-20250712194620-182a00f698f7/go.mod h1:JhWYDbjY81/7NECXrLzz4g2r9taaMEXvyqS4gYZciVE=
+github.com/mikeb26/corentings-chess/v2 v2.0.0-20250718184350-5916ae7010b7 h1:zewJN0ra3sG8yKNKEup2JGv3/Acyt+QkLhRbGl0Pjhk=
+github.com/mikeb26/corentings-chess/v2 v2.0.0-20250718184350-5916ae7010b7/go.mod h1:JhWYDbjY81/7NECXrLzz4g2r9taaMEXvyqS4gYZciVE=
 golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c h1:KL/ZBHXgKGVmuZBZ01Lt57yE5ws8ZPSkkihmEyq7FXc=
 golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
diff --git a/openings.go b/openings.go
@@ -154,18 +154,8 @@ func (openingGame *OpeningGame) WithFEN(fen string) *OpeningGame {
 }
 
 func (openingGame *OpeningGame) WithParent(parent *OpeningGame) *OpeningGame {
-	if !parent.fromFen {
-		openingGame.G = parent.G.Clone()
-	} else {
-		parentFen := parent.G.Position().XFENString()
-		newGameArgs, err := chess.FEN(parentFen)
-		if err != nil {
-			panic(fmt.Sprintf("Could not parse parent err:%v fen:%v", err,
-				parentFen))
-		}
-		openingGame.G = chess.NewGame(newGameArgs)
-		openingGame.fromFen = true
-	}
+	openingGame.G = parent.G.Clone()
+	openingGame.fromFen = parent.fromFen
 	openingGame.opponent = parent.opponent
 	openingGame.opponentColor = parent.opponentColor
 	openingGame.Parent = parent
@@ -185,6 +175,9 @@ func (openingGame *OpeningGame) WithGame(game *chess.Game) *OpeningGame {
 
 func (openingGame *OpeningGame) WithMove(move string) *OpeningGame {
 	if move != "" {
+		startMlen := len(openingGame.G.Moves())
+		startPlen := len(openingGame.G.Positions())
+
 		err := openingGame.G.PushNotationMove(move, chess.UCINotation{}, nil)
 		if err != nil {
 			err = openingGame.G.PushNotationMove(move,
@@ -201,6 +194,15 @@ func (openingGame *OpeningGame) WithMove(move string) *OpeningGame {
 			panic(fmt.Sprintf("Could not parse move:%v in %v", move,
 				openingGame.G.Moves()))
 		}
+		// sanity check for https://github.com/CorentinGS/chess/pull/63
+		if len(openingGame.G.Moves()) != startMlen+1 {
+			panic(fmt.Sprintf("WARN: len(moves) unchanged after pushing:%v in game:%v",
+				move, openingGame.G.String()))
+		}
+		if len(openingGame.G.Positions()) != startPlen+1 {
+			panic(fmt.Sprintf("WARN len(positions) unchanged after pushing:%v in game:%v",
+				move, openingGame.G.String()))
+		}
 	}
 
 	return openingGame.withECO()
@@ -216,8 +218,8 @@ func (openingGame *OpeningGame) WithTopReplies(fetchTop bool) *OpeningGame {
 		openingGame.fullRatingRange, openingGame.allSpeeds, openingGame.opponent,
 		openingGame.opponentColor)
 	if err != nil {
-		panic(fmt.Sprintf("Could not fetch top moves err:%v in %v", err,
-			openingGame.String()))
+		panic(fmt.Sprintf("Could not fetch top moves err:'%v' fen:'%v' g:'%v'",
+			err, openingGame.G.Position().XFENString(), openingGame.String()))
 	}
 	openingGame.haveTopReplies = true
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"CP":0,"WinPct":0.026,"DrawPct":0.949,"LossPct":0.025,"Mate":0,"BestMove":"Nxd4","Depth":54,"EngVersion":17.1,"KNPS":"9050","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":302.427028377,"Type":0,"Atime":"2025-07-24T10:55:55.19221094-04:00"}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"CP":11,"WinPct":0.019,"DrawPct":0.94,"LossPct":0.041,"Mate":0,"BestMove":"e6","Depth":50,"EngVersion":17.1,"KNPS":"8980","SearchTimeInSeconds":304.000476184,"ActualSearchTimeInSeconds":0,"Type":0,"Atime":"2025-07-24T11:11:41.204142711-04:00"}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"CP":20,"WinPct":0.056,"DrawPct":0.93,"LossPct":0.014,"Mate":0,"BestMove":"c5","Depth":51,"EngVersion":17.1,"KNPS":"9238","SearchTimeInSeconds":304,"ActualSearchTimeInSeconds":306.430752709,"Type":0,"Atime":"2025-07-24T11:11:41.426819594-04:00"}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"CP":0,"WinPct":0.028,"DrawPct":0.944,"LossPct":0.028,"Mate":0,"BestMove":"d4","Depth":62,"EngVersion":17.1,"KNPS":"8825","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":300.000587707,"Type":0,"Atime":"2025-07-24T10:55:55.016854078-04:00"}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"CP":378,"WinPct":1,"DrawPct":0,"LossPct":0,"Mate":0,"BestMove":"Be3","Depth":41,"EngVersion":17.1,"KNPS":"10164","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":300.000675954,"Type":0,"Atime":"2025-07-24T10:55:56.082867497-04:00"}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"CP":11,"WinPct":0.041,"DrawPct":0.94,"LossPct":0.019,"Mate":0,"BestMove":"h3","Depth":50,"EngVersion":17.1,"KNPS":"9378","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":303.283593808,"Type":0,"Atime":"2025-07-24T10:55:54.840442386-04:00"}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"CP":45,"WinPct":0.083,"DrawPct":0.915,"LossPct":0.002,"Mate":0,"BestMove":"Qf2","Depth":49,"EngVersion":17.1,"KNPS":"10512","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":300.001048471,"Type":0,"Atime":"2025-07-24T10:55:55.543863017-04:00"}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"CP":48,"WinPct":0.109,"DrawPct":0.889,"LossPct":0.002,"Mate":0,"BestMove":"Qxd4","Depth":49,"EngVersion":17.1,"KNPS":"10015","SearchTimeInSeconds":300,"ActualSearchTimeInSeconds":300.000115414,"Type":0,"Atime":"2025-07-24T10:55:55.36679797-04:00"}`