[apotema]

What

Pure, behavior-preserving extraction of src/game/save_load_mixin.zig (~1156 lines) along the SAVE vs LOAD seam. No logic, signature, or public-API changes — code moved verbatim, only shared-helper call sites re-pointed at the common mixin.

How it's split

File	Lines	Contents
src/game/save_load_mixin.zig	31	Thin composition barrel — re-exports the 5 public fns
src/game/save_load/common.zig	61	entityToU64, isRegistered, collectEntities, SAVE_VERSION (shared by both directions, not duplicated)
src/game/save_load/save.zig	303	saveGameState + private writeJsonString (save-only)
src/game/save_load/load.zig	849	loadGameState (Phase 1a/1b/1c → Phase 2 kept together), post-load render gate, load-only JSON accessors

Each is a Mixin(Game) instantiated by the barrel against the same Game — the exact idiom loop_mixin already uses for AtlasMixin/InputEventsMixin. Shared helpers are reached via Common.<fn>.

Public surface (unchanged)

game.zig aliases SaveLoadMixin.{saveGameState, loadGameState, armPostLoadRenderGate, updatePostLoadRenderGate, releaseLoadAcquired} — all still resolve, so every call site works unchanged. Load's phase sequence stays intact in one file (load-path symmetry preserved).

Verification

• zig build — compiles on 0.16.0
• zig build test — green (incl. save_load_mixin_test.zig + save_load_two_phase_test.zig)
• zig build spec — green
• zig fmt --check — clean on all new/changed files

Do not merge without review.

https://claude.ai/code/session_017pW3ifKf9wgxNg4viy6okw

[chatgpt-codex-connector]

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 2f54ac1d-a682-453b-8c86-f278da1a76a0

📥 Commits

Reviewing files that changed from the base of the PR and between d8a9f33 and 6e4c9e5.

📒 Files selected for processing (4)

• src/game/save_load/common.zig
• src/game/save_load/load.zig
• src/game/save_load/save.zig
• src/game/save_load_mixin.zig

---

📝 Walkthrough

Walkthrough

The monolithic save/load mixin implementation is refactored into three new files under src/game/save_load/: common.zig (shared helpers), save.zig (JSON serialization), and load.zig (JSON deserialization, entity reconstruction, and post-load render gating). save_load_mixin.zig becomes a thin re-export barrel.

Changes

Save/Load Module Split

Layer / File(s)	Summary
Shared helper mixin src/game/save_load/common.zig	Defines SAVE_VERSION and a Mixin providing entityToU64, isRegistered, and collectEntities for use by both save and load.
Save serialization src/game/save_load/save.zig	Implements saveGameState: entity collection via registry sweep and prefab-tag views, JSON string escaping, per-entity component writing with built-in-component guards, ref-array aggregation, and file writing.
Load reconstruction and component restoration src/game/save_load/load.zig	Implements loadGameState: JSON parsing/version checks, phased entity reconstruction (prefab roots, nested children, remaining entities), and restoration of Position, registered components, and built-in Parent/PrefabInstance/PrefabChild with ID remapping.
Post-load scene wiring and render gate src/game/save_load/load.zig	Restores ref arrays, registers entities into the scene, re-tracks renderer visuals, runs postLoad hooks, and adds armPostLoadRenderGate, releaseLoadAcquired, and updatePostLoadRenderGate to gate rendering until atlases are loaded.
Re-export barrel src/game/save_load_mixin.zig	Reduced to import and delegate saveGameState, loadGameState, and render-gate functions from save.Mixin and load.Mixin.

Estimated code review effort: 4 (Complex) | ~60 minutes

Sequence Diagram(s)

sequenceDiagram
  participant Game
  participant LoadMixin
  participant ECS
  participant Renderer
  participant AtlasManager
  Game->>LoadMixin: loadGameState(filename)
  LoadMixin->>LoadMixin: parse JSON, validate version
  LoadMixin->>ECS: spawn prefab roots, map children, create remaining entities
  LoadMixin->>ECS: restore components via id_map
  LoadMixin->>ECS: register entities into scene
  LoadMixin->>Renderer: re-track visual components
  LoadMixin->>LoadMixin: armPostLoadRenderGate(saved_scene)
  loop each frame until ready or deadline
    Game->>LoadMixin: updatePostLoadRenderGate()
    LoadMixin->>AtlasManager: isLoaded()?
    AtlasManager-->>LoadMixin: ready/failed status
  end
  LoadMixin-->>Game: render gate cleared

Loading

Poem

A rabbit split one burrow wide,
Into save and load, side by side,
Common paths for both to share,
Prefabs mapped with gentle care,
Gates held closed till atlases glow —
Then hop! The saved world starts to show. 🐇✨

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly summarizes the main refactor: splitting save_load_mixin.zig into save/load modules without behavior changes.
Description check	✅ Passed	The description is detailed and directly matches the refactor, module split, and preserved public surface described in the changes.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch refactor/split-saveload

---

_{Comment @coderabbitai help to get the list of available commands.}

[gemini-code-assist]

Code Review

This pull request refactors the save/load system by modularizing the monolithic save_load_mixin.zig file. The implementation is split into three new files under src/game/save_load/: common.zig for shared helpers, save.zig for serialization logic, and load.zig for deserialization and post-load render gating. The original save_load_mixin.zig is simplified into a thin composition barrel that re-exports the public API, preserving identical behavior. No review comments were provided, and the refactoring is clean and well-structured.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.