20 KiB
Published contextual-source integration update — 2026-09-11
Codex-ytr83r /root/wsl_startup_review. Read-only preflight; root owns integration and validation. Import the cumulative 13 desktop paths below from the parent of df6 through b2c, plus the unchanged oracle and three-file fixture at b2c. Merge two narrow conflicts while preserving B4 and the header correction. No later semantic dependency was found. This updates the old df6 preflight; it does not execute or accept the merged application.
Frozen references and ancestry
- Published implementation:
b2c3e54001fc19a05423bcd5808ceea78d13ff59(b2c). - Exact packaged-input reconstruction:
d5650309a93f3d590a41f8a8f0322c6500568f69(d565), direct child of b2c. - Original contextual commit:
df6f59562643b7771ecf0c972f8655f3e3f1c4da; its parent and cumulative patch base is07eb3cd12b5d0f2fa19d94ea1f5d2f8aade240ec. - Linear df6 → b2c ancestry:
d95b1ab17852c2dbf8ff9cd1f47507b12493054e→c4bad4b8de4851be4d800104be8f019b99f54f78→ca53f574e57381a523e946d5277b4081cff74355→ b2c. First two add historical publication/native records, not production source. ca53 changes creation.rs and source_draft.rs; b2c subsequently changes source_draft.rs. Do not stop at the WIP ca53 snapshot. - Local starting HEAD was
fe8364e7eb47b9452b079bbf2507947dfe10b13e, with the header-only working correction present. During review root froze that correction as4da92ab481a2f5f9fcd88f29c90fa4785ac17c3a, which was directly read back as HEAD; root separately reported evidence checkpoint7831abe. Merge base of the original local HEAD and b2c:b6b76efc0d6092d96e793feadf529e281017c5a9. - Read current issue 2 comments including publication #406,
ContextualSourceDrafts20260911andAuthoring20260911Wiki. Publication supersedes the Wiki's earlier packaging-pending wording. The milestone tag isv0.2.0-preview.contextual.20260911, pointing to b2c; d565 reconstructs packaged raw inputs. This review did not download/reverify release assets.
Missing commit objects were fetched with git -c gc.auto=0 fetch --no-tags --no-write-fetch-head --no-auto-maintenance gitea b2c3e54001fc19a05423bcd5808ceea78d13ff59 d5650309a93f3d590a41f8a8f0322c6500568f69 (exit 0). No ref, FETCH_HEAD, config, source or intentional index update was performed. Git read/check operations subsequently used --no-optional-locks; no formal before/after index hash was taken.
Exact minimum source import
Use a path-scoped cumulative diff from 07eb to b2c, not an unqualified commit-range import. All paths below are relative to crates/oa-desktop/src/ and form one coherent implementation:
| Path | b2c blob bytes | b2c SHA256 | Current apply check |
|---|---|---|---|
| app.rs | 210565 | B10BFA57F331DA3928D5FE27D2AEBDB13F6054C6E3D48C4CFD24FF81726094AD | pass |
| app/checkpoints.rs | 29576 | 55E5BABDCABEF767AF3BC8BE9CC3153B3F5CC0695701B890820EC0225643852E | pass |
| behavior.rs | 131449 | C9E0AEA6A24CC982D0D82EE2B9B66F250CDFAC037B36BF6B1B9D7DD38246CD3C | module hunk conflict |
| behavior/contextual_source_tests.rs | 49386 | 5F05318A6533503B9D6FEBF1EC4DD7256F192394BC1B952A7904C8175BD8DDAE | pass |
| behavior/creation.rs | 29301 | 438A245EAD397060767C790C51A8F21CD5021342627999DEB4695CF3BD22091A | pass |
| behavior/scenario.rs | 149092 | D12A4B1CAA61C08F69C4D2A64BD15568C4B7158DEA91AAC5A52A58A35ADB863C | pass |
| behavior/scenario/workspace.rs | 31975 | 790A2917D7E7102BEEAE68FF43EF1693D11132573651265DB490B560E14B7062 | pass |
| behavior/source_draft.rs | 39485 | 85D543CC288E48B4C13001E4E386B5B54D9B1E349A5AC31E4E307572F2D8FB3C | pass |
| behavior/topology.rs | 83845 | D06B2F0FC39B4814E94200297E148F1D4D97E04CB167766030AC9DF18689E3B0 | pass |
| behavior/topology/contextual.rs | 28320 | 231610428B9066A92D7405C44E2474FCFE2350FA2998926E8CF502F3392C0A07 | pass |
| behavior/topology/direct.rs | 32036 | 413AA2009EE4CBA0941836B43E41F16A04C8FC8568B6E92DB5BB08516E95C287 | pass |
| behavior/topology/view.rs | 29176 | A7D806CD621BDF857C4E4861685CD3EB556B320DE3985B9CC3D9D131DAD370DC | pass |
| guide.rs | 112981 | 51F1ACDE885635E4D9B783B56A0251B3E7315DDE4C1C05317DB55D54A857B715 | scenario walkthrough conflict |
The exact selector is git --no-optional-locks diff --binary 07eb3cd12b5d0f2fa19d94ea1f5d2f8aade240ec b2c3e54001fc19a05423bcd5808ceea78d13ff59 -- followed by those 13 full paths. This excludes all packaging, harness/docs, live ledgers, platform evidence and peer navigation proposals. The entire range changes no other crates, Cargo files or generated API content. Its unqualified full-tree diff does include unrelated history and must not be used as the minimum import.
Checks used each exact binary diff in memory as stdin to git --no-optional-locks apply --check --whitespace=nowarn -, without applying it or writing a temporary patch. Eleven passed; behavior.rs failed at original line 14, guide.rs at original line 490. A final quiet diff confirms the other ten existing target files did not change between fe8364e and 4da92ab. The two new source paths were absent and their addition checks passed. Local behavior.rs with the checked clipping correction hashes B47E1DF6F88282D907CD5726A03DB0BF066B60B134962A223F11842482E75946.
Exact conflict resolution requirements
In behavior.rs, preserve mod scenario_lifecycle and add #[cfg(test)] mod contextual_source_tests and pub(crate) mod source_draft alongside existing modules. The other peer hunks add source-event predicates, source-state adapters, and the retained unavailable-owner view. They do not touch Scene drawing, the lifecycle implementation, box_text_clip, or the corrected with_clip title/detail rendering. Do not replace the complete peer behavior.rs over B4. Keep root's header rendering and new render/workspace regressions.
In guide.rs, keep current text and apply the peer's four subject changes: the two process/chain walkthrough sentences; contextual Lifeline source creation; the machine-owner paragraph plus adjacent new-owner sentence; and the existing draft explanation's child Back/Use/recovery prefix. The sole conflicting scenario hunk needs only this replacement of the current Use + Lifeline... sentence:
Use Add first lifeline on an empty scenario, or + Lifeline. Choose existing work/participant or Create new source. The explicit viewpoint limits its kinds; choose participant kinds deliberately. Source name and lifeline name are separate, and the source semantic parent is independent of the scenario. No allocation or capability involvement is inferred.
Preserve all current surrounding message-tool gestures, clicked fragment/operand placement, Add action/Observe state/Reuse scenario actions, Open definition/Back navigation, lifeline lifetime keywords, capsule/X selection, uncertain ? versus unanswered-call …, and stored-history guidance. Whole-file replacement would restore obsolete Draw message/Destination wording and lose B4 instructions. Current direct-canvas/F2 guide content also stays.
Keep workspace identity/reset, retained pending-source invocation, and existing same-size/new-owner viewport protections. No peer956 canvas/chooser or peer9e8 uncommitted/current text-navigation implementation belongs to this import.
Corrections after df6 and reconstruction boundary
Only two production files differ df6 → b2c (589 insertions, 38 deletions including tests). source_draft.rs places compact heading, Name, wrapped explicit kind choices and semantic-parent summary before explanatory text. A single permitted kind replaces its redundant button only when it equals the actual draft selection; incomplete recovery retains an explicit repair choice. Full long-parent text remains scrollable and the Back/Use footer stays pinned. Three tests use real Iced Paragraph measurement and a composed 340/500 × 215 host, exercise initial visibility, long-parent overflow and recovered raw names, and dispatch actual kind mouse events/Unicode Name input. The final test uses 32 repeated parent segments to establish actual overflow; an earlier eight-repeat fixture failed that condition and was corrected without weakening the containment checks.
creation.rs changes only the displayed existing-owner picker alternative when its selected ID exactly matches the staged owner: it suppresses a false missing accepted-catalog label, keeps the explicit New owner label and identifies existing participants as an alternative. Genuine missing accepted-owner and Context paths remain distinct. The layout correction does not alter source planning, ownership guards, tokens, accepted model, FormShown or canvas geometry.
All 11 b2c → d565 content changes compare exactly equal after CRLF-to-LF normalization: creation.rs; scenario/workspace.rs; topology/contextual.rs; guide.rs; semantic_review/{artifacts_view,attachments_view,keyed,keyed_rows,keyed_tests,ordered}.rs; and docs/openapi.json. The twelfth path is .gitattributes with the corresponding 11 -text rules. Thus d565 is raw-byte reconstruction, not an additional semantic prerequisite. Do not import unrelated semantic-review/OpenAPI restorations or those source-specific attribute overrides merely to obtain contextual behavior. Keep the branch's source newline convention and record new merged build inputs; the table identifies peer blobs, not expected merged hashes or inherited GUI identity.
Required oracle, fixture and attributes
Take these four exact b2c paths; this is the complete fixture. The oracle and both baseline files are unchanged since df6:
| Path | Bytes | SHA256 |
|---|---|---|
| harness/staged-source-authoring-contract.rs | 22693 | 9EB9DD3868B6CB772F907D16AE02995AD10A16F85C087012C24948E6E6FE775D |
| harness/fixtures/staged-source-authoring/README.md | 8380 | 711910A12D5F3960F32DA9AA7BC2E647F31D770C84B7FC26E232DCB3A76F8821 |
| harness/fixtures/staged-source-authoring/base/project.arcadia | 593 | AA844950EC4FB86F262A257E1FC370A26557EA7978D8A4CAB78265037660234C |
| harness/fixtures/staged-source-authoring/base/notes.arcadia | 63 | AD9DE02963C20D1F43856455A797DEB05CA674659E45F2C4B96B52783024F8BD |
Merge only these missing preservation rules into the current .gitattributes, retaining all root-owned rules:
harness/fixtures/staged-source-authoring/** -text whitespace=cr-at-eol
harness/staged-source-authoring-contract.rs -text whitespace=cr-at-eol
The corrected README is required knowledge: child Use stages, but App Save/Save As applies valid pending drafts. To prove no adoption, inspect before Save or Cancel the parent before Save. Save-adoption and direct parent Create are separate routes. Run the independently compiled oracle with the matching verified libunwind runtime available in the process-scoped PATH or beside it; inspect its exit, not merely an empty log. No machine-wide PATH change is necessary. Preserve separate first-commit UUID carriers for Undo/Redo comparisons and the exact retained-physical-file rule.
Pinned provenance; optional archival boundaries
Keep this report as the local integration record. Importing the peer's nine historical reports or ten archives is unnecessary for the minimum source/test import. Their exact b2c versions remain accessible here:
- Implementation and creation review.
- Layout review, independent layout review, and staged-owner caption.
- Oracle/procedure history, native v1, native v2 plan, and completed native v2/full-suite report.
Optional archives are all under the pinned b2c harness/experiments tree. Exact directory inventories were enumerated, not copied or fully rehashed:
| Directory | Committed files |
|---|---|
| contextual-source-20260911 | 40 |
| contextual-source-native-20260911 | 54 |
| contextual-source-reopen-20260911 | 11 |
| contextual-source-layout-reboot-20260911 | 15 |
| contextual-source-layout-postboot-20260911 | 11 |
| contextual-source-layout-verified-20260911 | 13 |
| contextual-source-layout-full-20260911 | 10 |
| contextual-source-recovery-20260911 | 27 |
| contextual-source-machine-v2-20260911 | 50 |
| contextual-source-lifeline-v2-20260911 | 25 |
If root later copies any such checksum-bound archive, preserve its exact bytes with that archive's scoped -text rule and the corresponding whitespace exceptions from b2c .gitattributes; do not copy the complete attribute file. Some historical .png files are JPEG despite their suffix and must retain their recorded original names/bytes. No archive import is needed now. Exclude peer AGENTS/PROJECT_GOAL/PLAN/STATE/TASK_LEDGER, WSL/capacity/platform evidence, CLI publication records, unrelated OA scenario archives and current navigation proposals.
Historical preflight evidence limits and next integration gate
The published GUI is 5657BAB5C841939B66F901EFE6C0FFB2D7CBBE8CC5F111A0CA3DE8073D3846CE; its test executable is 75AB0E151D85473631D5A145527F3F6B9768A3CD61CE66A0603A574E09557017. The pinned report records focused 26, full 679 (zero failed/ignored/filtered, exit 0 at 15:47:53 UTC), strict Clippy/fmt/build, minimum-window source visibility/recovery/cancellation, direct Lifeline Create/Save/Undo/Redo, and Machine owner/Create/Save/Undo/Redo/fresh-process reopen. These are peer artifact results, not executed merged results. Older GUI52 and intermediate layout hashes remain historical; they must not replace the final source hashes above.
After root's selective merge, inspect the complete union and conflicts, then run the required combined desktop/focused/full/strict gates once on frozen merged inputs. Preserve B4 lifecycle and header clipping regressions, contextual/admission/recovery and real-layout tests, guide and direct-canvas/workspace regressions. The native merged source/consumer Save/Undo/Redo/reopen acceptance still needs matching runtime and complete Project/reachable SourceBundle/physical file-map/UUID oracles. The unchanged core/server/CLI gate is independent of this 13-path desktop delta; it does not establish desktop acceptance.
After these read-only checks, root reported importing the 13 source paths and four fixture/oracle blobs, preserving the module union and exact guide sentence. Root also reported the independent server/CLI gate exit 0 at 17:28:56 UTC (68 passed across seven targets). Those are subsequent root actions, not this preflight execution; the report does not recheck or accept that now-modified desktop union.
This worker ran no Cargo, native UI, oracle, WSL, network configuration, merge, checkout, staging or source edit. A first attempted in-memory check used unavailable python and stopped before checks; the successful checks used .NET byte streams and Git. Only this new report was written. Root retains actual integration, Gitea consolidation, release and remaining workflow ownership.
Root integration and independent union review
Root applied the eleven clean source patches and merged only the documented behavior module insertion and guide Lifeline sentence. Scoped rustfmt passed. The complete behavior.rs suffix beginning struct BoxItem, including lifecycle rendering, marker arbitration, hit testing and the header correction, compares byte-identically with4da92ab. Core/server/CLI/Cargo have no diff. Four oracle/fixture files match the exact b2c bytes in the table above.
A separate GPT-6 Astra reviewer found no material integration issue: preserved B4/guide union, context-bound source Back, modal-first Escape, success-only consumer selection and atomic source/history paths remain coherent. Imported files match peer content; workspace retains only the existing omitted explanatory comment above unchanged sensor identity code. This is static review, not new desktop/native acceptance. At that review checkpoint the combined source still required its own frozen Windows desktop gate; the closed result follows below.
Live coordination moved to issue5 following owner issue1/comment421. Issue4 separately tracks the child-work failure and its reviewed private correction being integrated after this source freeze.
Closed Windows results for 321897f
Documentation readback by Codex-ytr83r /root/wsl_startup_review; execution belongs to root. Frozen source 321897fd55 passed cargo test --locked --offline -p oa-desktop --all-targets: 704 passed, zero failed/ignored/filtered, exit0 at 17:47:12.6688512 UTC. The archived before manifest lists 261 build inputs; the after record reports all 261 unchanged. This closes the combined desktop test gate described above, without transferring peer GUI acceptance or validating the later issue4 correction.
The matching Windows server manifest identifies binary ABA87A5FB795DEB995029A737C2EBB9D2B44C8D274EDAA2295363B226D9AF6BE. Actual semantic HTTP checks passed 204 schemas and 19 actual/typed values while rejecting 9 invalid shapes. The final REST source7-v2 probe passed 25 requests, exit0 at 17:47:04.6442463 UTC, including its source/model/restart comparisons. Its retained sequence-gap warning is not presented as resolved.
The closed runtime archive contains 137 exact payloads (265024 bytes), both input records, server manifest, desktop/HTTP log-status pairs and all three terminal REST directories. Original/copy hashes, second readback and directory inventories match. The initial probe failed because strict source bytes encountered source5→7 normalization; its outer log is empty and its status file absent. A retry named source7 still used source5 because root's first edit helper failed before writing (ca undefined), and failed the same check. The later correction record binds exactly three header changes5→7 and unchanged strict assertions; only source7-v2 is the passing corrected-input run. Both failures remain archived.
The separate earlier integration checkpoint archive preserves 11 payloads (137778 bytes): server/CLI 68 passes across 7 targets, the failed missing-jsonschema attempt and task-local dependency correction, schema 72 fixtures/204 components, and the old 47332A6E/production 29084050 wide-name passive Save checkpoint/oracle/screenshot. That old GUI result proves complete identity/model/reachable-source/physical-byte equality within its fixture, not corrected header pixels.
Matching corrected GUI/native checks, complete combined source/consumer acceptance, any remaining strict gate and packaged-milestone validation are still separate. The private issue4 child-work correction is not included in either closed archive or these 321897f results. No new execution, source change or archive mutation was performed for this documentation update; issue5 remains the authoritative live integration record.