wip: cave planner squash-merged into wip/combined (L173, RED - not for main)
Five conflicts resolved (CURRENT-STATE, ResolvedLayoutInternal.h, StreamBenchmarkHeadless.cpp, StreamBenchmarkPipeline.h, WorldAssemblyPrototype.h) keeping liminal + cave planner; L156 band fit only; evaluator v239 with v239 baselines (18/18 Clang/GCC W1/W8/W12). Fast tier FAILS (FI upper arrival: 40 unsupported chamber samples, 10 chamber-floor shell violations); TN and VS composed sweeps 0/16 (passage, seam, shell gates). Living plane loads at PostConfigInit (UE smoke passes). Source/: VoxelForgeCoreAdapter.cpp; VoxelForge.uplugin. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_016dhxM43dnWvUu2B5Ph1iG1
This commit is contained in:
1 parent
82eb5b1c66
commit
b09728354d
243 files changed
+23019
-307
No files matched your search
@@ -0,0 +1,38 @@
|
||||
# L173 — combined branch verification and cave planner merge
|
||||
|
||||
`wip/combined` builds and the Linux UE smoke run passes, but the branch is not ready to merge to `assembler/world`: fast is red and both composed cave sweeps finished at 0/16. The cave route planners and their blocked-route controls passed on all Vertical Shafts seeds; the remaining failures are in host passage composition, seams, and shell fit.
|
||||
|
||||
## Merge and fixes
|
||||
|
||||
Resolved all five textual conflicts in the worktree:
|
||||
|
||||
- `CURRENT-STATE.md`: combined the cave planner history with the merged liminal, living-plane, speed, and early-admission state.
|
||||
- `Standalone/Core/src/ResolvedLayoutInternal.h`: retained the liminal lower-arrival tangent and the cave planner’s native route tangent.
|
||||
- `Standalone/Source/StreamBenchmarkHeadless.cpp`: retained liminal field detection and cave recipe selection.
|
||||
- `Standalone/Source/StreamBenchmarkPipeline.h`: retained the liminal road audit and cave chamber, tunnel, and shaft audits.
|
||||
- `Standalone/Source/WorldAssemblyPrototype.h`: retained the liminal `planPassages` guard and dispatched cave recipes to the Core planner.
|
||||
|
||||
Applied only the band-fit portion of `Standalone/Research/WorldAssemblerM3/Linux156/l156-headroom-landing.patch`. No L153–L159 landing-pad experiment patch or stamp was applied. The merged fast check still fails on the Floating Islands upper arrival, with 40 unsupported chamber samples (lower chamber: 0), 10 chamber-floor shell violations, and 465 blocked strate-0 route samples. The route summary is walkable 1/3. The streaming mid-pass refill check passes.
|
||||
|
||||
Three targeted edits for the same Floating Islands integration failure did not clear fast; they were reverted. I stopped further edits after the third failed attempt.
|
||||
|
||||
The cave branch already carries `WorldAssemblyEvaluatorVersion=239` (the `wip/combined` base was 227). Canonical owner outputs changed, so added v239 baselines for owner4 SurfaceWorld, owner2 SurfaceWorld, and owner2 Floating Islands, and updated `verify.py` to use them. The matrix is 18/18, identical across Clang/GCC and W1/W8/W12. Owner4’s checked-in resolved-layout snapshot fails the stable-identity import check; the matrix regenerated the Core plan with `--seed=0`. This limits that result to the regenerated-plan path.
|
||||
|
||||
## Builds and checks
|
||||
|
||||
- Clang 19 and GCC 14 headless builds pass at source stamp `d62251e728397859bf8c258fbcee819909e65888b5fb5d14b6c0f3e00eee8695` (`Saved/Linux/l173/headless-clang-final.log`, `headless-gcc.log`).
|
||||
- Five liminal fixtures pass; the Living Plane standalone runner builds (`liminal-fixtures-build.log`, `living-plane-build.log`).
|
||||
- Fast rerun against the final-source binary fails after 65.2 seconds on `owner-floating-islands-style2-clang`; the refill check passes. A first rerun to a new output directory stopped because that directory had no compiled executable; the recorded result uses the existing final-source binary.
|
||||
- Linux UE full build passes with all three plugin links pointing to this worktree. `VoxelWorld.cpp` compiled, `VoxelForgeLivingPlane` linked, and the DWARF gate passed at 600 bytes for each of its three measured objects. Owner-world default-on smoke passed: 47 moving samples and 106 dwell samples over 52.789 seconds; frame-resolution arrival was 1.611817 seconds, early-admission wait was 0, tick p99 was 7.0801 ms, and worst tick was 12.272 ms. The harness restored all three VFHost links to the main checkout afterward. See `Saved/Linux/l173/ue/result.json` and `ue/restored-main-links.json`.
|
||||
- Tunnel Network composed sweep: **0/16**. Passage and seam gates failed on all 16; shell and passage-count failed on 10; the Tunnel Network route gate failed on one seed; blocked-route controls passed 16/16.
|
||||
- Vertical Shafts composed sweep: **0/16**. Passage and seam gates failed on all 16; shell and passage-count failed on 10. The Vertical Shafts route gate and blocked-route controls passed 16/16. Seed 2 specifically passes the shaft route and negative control; a strate-0 host route has five unsupported samples, leaving route walkability at 2/3. Its shell audit passes.
|
||||
|
||||
The sweep summaries were regraded from captured logs with the current-source grader. Both are under `Saved/Linux/l173/cave-sweeps/seeds/`.
|
||||
|
||||
## Not run and remaining risk
|
||||
|
||||
- No Windows UE build was run. The owner should compile the changed Unreal source file `Source/VoxelForge/Private/VoxelForgeCoreAdapter.cpp`.
|
||||
- No performance timing matrix was run; the W1/W8/W12 matrix above checks canonical output identity.
|
||||
- Fast remains red, and neither composed sweep has an all-gates pass. The host content-band, route, seam, and chamber-floor failures need a root-cause fix before merging into `assembler/world`.
|
||||
|
||||
No commit, push, or merge to `assembler/world` was made. Changes remain in the `wip/combined` worktree for review.
|
||||
Reference in new issue
Block a user