Derive save-schema grid sizes from LayoutMath and harden cross-field validation

[itsmiso-ai]

What

Derives save-schema grid sizing from LayoutMath instead of hard-coded defaults, and hardens save_game.validate_save_schema with cross-field consistency checks (active_goal, completed_goal_ids, colony_stance, active_rewards, tile-count vs. grid_w*grid_h).

Why

Issu…

Fixes #236

Opened by foreman on review GO (workload wl-misospace-windowstead-236).

[its-saffron]

AI Automated Review

Full PR review.

Analysis engine: MiniMax-M2.7@https://litellm.jory.dev/v1 (anthropic) — escalated (fast_low_confidence)

Recommendation: Approve

This PR fully addresses issue PR 236. All five acceptance criteria are met, tests are comprehensive, CI is green across all platforms, and the implementation is internally consistent.

Change-by-Change Findings

scripts/game_state.gd (+180/-5 lines)

1. Preloads added: LayoutMath, RotatingGoal, ColonyStance, GoalReward — all referenced by the new validation helpers.

2. Grid sizing derivation (_expected_grid_sizes()): Rather than a hardcoded [25, 36, 64, 100, 150, 160, 240] array, the function now:

   • Calls LayoutMath.grid_dims_for_anchor("bottom") and LayoutMath.grid_dims_for_anchor("side") to get per-anchor dimensions
   • Cross-validates against LayoutMath.BOTTOM_GRID_W * LayoutMath.BOTTOM_GRID_H and LayoutMath.SIDE_GRID_W * LayoutMath.SIDE_GRID_H
   • Appends legacy sizes (25/36/64/100/150) for historical save compatibility
   • The comment explicitly notes that new anchors added to layout_math.gd need to be appended here too — a reasonable maintenance constraint given the preload approach.

3. Internal consistency check: When both grid_w and grid_h are present, the validator now enforces tiles.size() == grid_w * grid_h. Type checks (int) and positivity checks (> 0) are applied before the comparison.

4. active_goal validation: Delegates to _validate_active_goal(), which accepts empty dicts (no active goal) and validates that id is present and exists in RotatingGoal.GOAL_CATALOG.

5. completed_goal_ids validation: Each entry must be a string and must appear in RotatingGoal.GOAL_CATALOG.

6. colony_stance validation: Must be a string, and if non-empty must be a member of ColonyStance.ALL_STANCES.

7. active_rewards validation: Each entry must be a dict with a known type (from GoalReward.REWARD_CATALOG and the REWARD_* constants), with string fields for type/label/resource and non-negative numerics for remaining/duration/trickle_ticks.

tests/test_save_backup.gd (+150/-1 lines)

8. flow_grid_sizing_consistency(): Tests:

   • Rejects 158 tiles with 32×5 grid (mismatch)
   • Rejects a tile count (1) outside LayoutMath-derived sizes
   • Accepts 160 tiles without grid_w/grid_h
   • Rejects zero grid_w

9. flow_goal_and_stance_validation(): Tests:

   • Rejects active_goal with unknown id
   • Accepts active_goal with known id (gather_wood)
   • Rejects completed_goal_ids with unknown entry
   • Rejects unknown colony_stance
   • Accepts empty colony_stance
   • Rejects active_rewards with unknown reward type
   • Rejects non-dict reward entries
   • Accepts valid completed_goal_ids

10. flow_validation_accepts_valid() updated: The base valid state now includes grid_w/grid_h/anchor_family/active_goal/completed_goal_ids/colony_stance/active_rewards, and the test exercises both bottom (32×5=160) and side (10×24=240) anchors.

11. Helper _minimal_valid_state(): Centralizes the base save structure used across new test flows.

Standards Compliance

• AGENTS.md / Review Notes: Save/version migration is migration-first; this PR correctly adds schema validation before migration in load_game().
• No regressions flagged: The changes are additive validation only; existing valid saves remain valid.
• No UX impact: This is purely internal save-schema hardening with no gameplay or UI surface changes.

Linked Issue Fit

Issue PR 236 acceptance criteria checklist:

• ✅ Grid size validation derived from layout configuration, not hardcoded — _expected_grid_sizes() derives from LayoutMath
• ✅ Internal consistency check: tiles.size() == grid_w * grid_h — implemented with type/positivity guards
• ✅ Invalid goal IDs rejected on load — active_goal and completed_goal_ids validated against RotatingGoal.GOAL_CATALOG
• ✅ Invalid colony stance rejected on load — validated against ColonyStance.ALL_STANCES
• ✅ tests/test_save_backup.gd updated with edge cases — two new test flows added covering all new validation paths

Tool Harness Findings

The tool harness ran read_file on scripts/game_state.gd and tests/test_save_backup.gd and git_log. All succeeded. The git log confirms this is the HEAD commit on the feature branch.

CI Check Results

All six CI checks passed:

• Headless smoke test
• macOS validation
• Export validation (macOS)
• Export validation (Linux)
• Script test suite
• Export validation (Windows)

Unknowns / Needs Verification

• LayoutMath.grid_dims_for_anchor(anchor: String) — called by _expected_grid_sizes() but not verified present in the truncated layout_math.gd view. However, the CI script-test-suite passed, which exercises this code path. Resolved: CI passed.
• RotatingGoal.GOAL_CATALOG and GoalReward.REWARD_CATALOG structures — assumed to match the validation logic; confirmed by CI passing.
• _known_reward_keys() returns ["type", "remaining", "duration", "label", "trickle_ticks", "resource"] which is a superset check (only validates keys that are present, does not reject missing keys). This matches the existing style in the file for permissive validation and is sufficient for the issue scope.