diff --git a/harness/STATE.md b/harness/STATE.md index e443b2f6..e66a2bb9 100644 --- a/harness/STATE.md +++ b/harness/STATE.md @@ -10,8 +10,10 @@ retained; direct drawing, explicit insertion, same-parent reorder and correlated activation rendering are implemented in d1d8f0b, with independent-review fixes in 7a66607 for stale scroll slots, actual Iced scroll coordinates, operand-specific activation segments and repeated picker cost, plus e7e37d4 for passive scroll -observations during async save. Final Windows desktop tests pass 283/283, -strict all-target desktop Clippy and optimized build pass. Exact artifact +observations during async save. DATA b35dede is integrated in dfd2e41 without +conflicts. Combined Windows desktop tests pass 286/286, strict all-target desktop +Clippy and optimized build pass; a copied artifact/manifest is frozen under +`D:/CodexBuilds/Capella2-release1-01a06e2e/ui-scenario-data-windows-dfd2e41`. Exact artifact hash, before/after failures and timings are in release-scenario-editing.md. Focused independent recheck reports no remaining medium/high finding. Native Windows/Linux trials remain pending and root-owned; this branch claims no native @@ -26,8 +28,10 @@ attachment10134df9-bea2-4c02-a820-67b53d6b86f7/goal-objective.md. PLAN.md retains the entire release scope; no subsystem acceptance completes it. Direct state-machine editing is accepted through production316dc55. The main -checkout was fast-forwarded to acceptance a8f451e. R6 data/interface contracts are now -being implemented in a separate checkout; they are not accepted or released. +checkout was fast-forwarded to acceptance a8f451e. R6 data/interface contracts +through b35dede are now integrated into the isolated direct-scenario checkout. +Root retains final main integration and acceptance; the combined direct scenario +has not yet completed native trials. Meaningful implementation and runtime progress continues; no external blocker exists. ## Accepted foundations @@ -152,7 +156,9 @@ plan and decision are recorded in that checkout. No overlapping writers or targe The user explicitly reauthorized native testing after Escape. Root's f5467e5 R6 window3476204 and exec93768 closed normally after verified source migration and 55-object recursive scenario reopen; no runtime output. The property-browser -replacement build is running. Original Capella is present. Older protected user7210312/6228978 were absent; +replacement build b35dede has passed the root's Windows native retest. The +combined direct-scenario binary is frozen for its separate pending native trial. +Original Capella is present. Older protected user7210312/6228978 were absent; do not reset/save/close them if they return. Re-inventory before switching apps. Evidence: D:/CodexBuilds/Capella2-release1-01a06e2e. State source checkout/target: @@ -165,12 +171,13 @@ Windows: cargo test --locked --workspace; cargo clippy --locked --workspace WSL Ubuntu24.04 uses target/linux-cargo.toml and Mesa software Vulkan for native WSLg. No remote push or usage reset authorized. No broad recursive target deletion. -Latest R6 checkpoint: Windows264 desktop tests and strict Clippy pass for the -one-record property browser; optimized build/native retest pending. Paging and +Latest R6 checkpoint: b35dede Windows264 desktop tests, strict Clippy, optimized +build and root-owned native retest pass for the one-record property browser. Paging and location changes retain accepted model and typed expressions. f5467e5 Windows and Linux263 desktop tests, strict Clippy and optimized release passed. Native Windows source3 migration preserved comments/nesting through explicit Save All and clean source4 reopen. Native recursive55-object scenario values and paired Call/Reply history were verified; flat property paths prompted the latest fix. -Linux native R6 workflows and final independent browser review remain. See +The independent bounded-browser review reports no remaining medium/high finding. +Linux native R6 workflows remain a root-owned acceptance gate. See release-data-verification.md. Main remains a8f451e; R6 is not yet accepted. diff --git a/harness/release-scenario-editing.md b/harness/release-scenario-editing.md index 354e74e4..c28ba909 100644 --- a/harness/release-scenario-editing.md +++ b/harness/release-scenario-editing.md @@ -4,7 +4,9 @@ Status: implementation and automated Windows checks passed in the isolated `codex/scenario-direct` checkout, based on ab661f2. Initial production is d1d8f0b; independent-review fixes are in 7a66607 and e7e37d4. The focused independent recheck reports no remaining medium/high finding. Root-owned Windows/Linux native -trials remain pending. This does not complete the release or process/chain work. +trials remain pending. DATA b35dede is integrated in dfd2e41 with 286 desktop +tests, strict Clippy and a fresh frozen Windows release artifact. This does not +complete the release or process/chain work. ## Decisions @@ -198,3 +200,37 @@ Latest Windows artifact, superseding both builds above: 20,349,952 bytes, SHA-256 `CEEB8E277DFC47C0D55DA43F903FCA45AFBF902AFA418B3924375910D699373A`. Native acceptance is pending. Include scrolling while saving in the root's native recovery task before accepting the direct scenario milestone. + + +## Combined DATA/scenario integration — 2026-09-06 + +Merge `dfd2e41259e73ef10a4e29a426569c08eaae215f` integrates `codex/data-contract-integration` at +`b35dede75fc8778ea695b9b2c023cfa2a1e49e09` into the isolated scenario branch. +The merge applied without conflicts and needed no manual code resolutions or new +semantic design. Direct scenario geometry/planners/tests and the existing +scenario evidence were unchanged by the merge. App's early passive-scroll handler +remains intact alongside DATA's source migration and property-browser handling. +The shared field-path API remains compatible: compact leaf-first labels and +deterministic sorting now feed the existing bounded scenario value picker, while +full qualified labels remain available for detail text. + +Combined verification on the dedicated scenario target: all 286 desktop tests +passed, no failures or ignored tests; strict desktop all-target Clippy passed; +optimized desktop build passed; staged diff --check passed. All commands used +`--locked --offline`. DATA's three new regressions are present together with the +283-test scenario suite, including source3 save/reopen and direct gesture/save +lifecycle coverage. No DATA checkout, Linux checkout or native application was +modified or operated in this integration task. + +Frozen artifact directory: `D:/CodexBuilds/Capella2-release1-01a06e2e/ui-scenario-data-windows-dfd2e41`. +It contains `arcadia-studio.exe`, the three combined verification logs and a +`manifest.json` identifying the source checkout, merge commit, target and hash. +The copied binary hash was checked against the release target binary. +Binary size: 20,411,392 bytes. SHA-256: `8BC031CF6124859D31082BB0FFB0335C406D54E12ECAD8493CE50A23923E5589`. + +Root reports DATA b35dede's Windows native trial and independent focused review +passed. This does not transfer native acceptance to the combined direct-scenario +workflow. Its Windows/Linux native tasks remain pending, including scroll/resize +cancellation, middle/operand insertion, execution spans and save recovery. Root +owns final integration into main and native acceptance; process editing remains +outside this task.