diff --git a/corpus/conflict-page/README.md b/corpus/conflict-page/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..ffe296770ee5a58ef7a9d29c5301215a1dbf9bfa
--- /dev/null
+++ b/corpus/conflict-page/README.md
@@ -0,0 +1,77 @@
+# Conflict pages
+
+What OneNote 2010 does when a sync finds that two clients changed the same object, and
+that it reads and deletes the conflict pages Rust writes. `tools/native_conflict.py`
+made every capture; `tools/test_conflict_page.py` checks them without a VM.
+
+`native` is two OneNote clients on one Samba notebook (`native_conflict.py sync`, fixture
+`native-ink/cold-ui-ink`): client A, offline, rewrote the first outline's paragraph and the
+second outline's; client B rewrote the same first paragraph and the left table cell and
+published (`b-published`); A reconnected and synced (`conflict`). A kept B's version of the
+paragraph both changed and merged its own disjoint edit into the page; its own version of the
+page became a conflict page:
+
+- its own object space, listed only in the page manifest's `ChildGraphSpaceElementNodes`
+ (`0x2c001d63`), never in the page series, with a copy of its metadata in the manifest's
+ `0x24003442` whose identity is the space's XOR the metadata salt (MS-ONE 2.2.81);
+- metadata root `jcidConflictPageMetaData` (`0x20038`): `CachedTitleString`, a fresh
+ `NotebookManagementEntityGuid`, `PageLevel`, both schema revisions (`0x28`),
+ `TopologyCreationTimeStamp` of the merge, `ConflictingUserName` and
+ `ConflictingUserInitials` of the client whose version it is;
+- a page node with `IsReadOnly`, `Deletable` and `IsConflictPage`, holding A's whole page;
+ only the rich text of the paragraph both changed has `IsConflictObjectForSelection` and
+ `IsConflictObjectForRender`;
+- the page's metadata and the section's copy of it gain `HasConflictPages`.
+
+Both clients show the same UI (`a/`, `b/`): the page's tab carries a conflict mark and a
+yellow bar reads "This page has changes that could not be merged during synchronization.
+Click here to show versions of the page with unmerged changes." Clicking it lists the
+conflict pages under the page, each as its date and user ("9/26/2026 snow"), and opens the
+first; that page's bar reads "Conflicting changes are highlighted in red. This page cannot be
+edited, but you can copy changes to the primary page. Click here for more options." over a
+light red highlight (RGB 255, 214, 214), and its menu offers Delete Conflict Page, Copy Page
+To..., Select Previous/Next Conflicting Change and Collapse Conflict Pages.
+
+`native-three` is `evidence/m8/conflict-abrupt-cold-01`: three clients' conflict pages under
+one page. OneNote appends each to `ChildGraphSpaceElementNodes` and lists them last first
+(`conflicts.png`); the metadata copies are in their own order.
+
+`native-delete` is OneNote's Delete Conflict Page on `native/conflict` in a fresh clone
+(`native_conflict.py cold --delete`): the manifest loses `ChildGraphSpaceElementNodes` (its
+last entry) but keeps the metadata copy, the page's metadata and the section's copy lose
+`HasConflictPages`, and the conflict page's space is left as it was.
+
+`native-pages` and `native-restore` are page-list merges (`native_conflict.py pages`,
+`restore`): client A, offline, moved pages through COM and edited `Target`'s body while
+client B moved pages and deleted `Target`; A reconnected (`merged`, both clients' `listed.json`
+and screenshots). OneNote merges page series, not page positions. A page a client moves
+gets a series of its own, and a COM move also re-series every page it jumps over (a drag
+re-series only the dragged pages, `page-lifecycle/movement`). The merge keeps each page in
+the series of the client that re-seriesed it, the server's where both did, leaving the
+other's series empty (`native-pages` keeps two, which MS-ONE's one-page minimum does not
+allow); series only A made go after the server's. `Target` comes back as a new page space
+holding A's edit, in a new series where A had it; B's version stays in the recycle bin.
+
+- `native-pages`: from One, Two, Three, Four, Target, A moved Four before One and Two last
+ (re-seriesing One, Two, Three), B moved Four last and Three before One (re-seriesing One,
+ Two, Four): One, Two, Four, Three, Target.
+- `native-restore`: from One, Two, Target, Three, Four, A moved Four before One
+ (re-seriesing One, Two, Target, Three) and B deleted Target: Four, One, Two, Target, Three.
+
+`page_moves_and_a_removed_page_merge_as_onenote_merges_them` in
+`crates/notebook/tests/sync_pages.rs` replays both with Snowbound's queue, A's moves as
+moves of the pages A re-seriesed, and reaches OneNote's order.
+
+`candidate` is `a_conflict_page_is_stored_as_onenote_stores_one` in
+`crates/onestore/tests/conflict.rs` (`ONESTORE_CONFLICT_EXPORT`): the remote renamed the
+first word of the fixture's first paragraph, this machine did too, and `SectionOp::Conflict`
+kept this machine's page for "Clover Snow", whose author objects carry her initials beside
+her name as OneNote's do. `cold` is OneNote's fresh read and the same UI
+walk, ending in Delete Conflict Page on the Rust-written page: its bar and list entry show,
+the conflict page opens (window title) with the paragraph highlighted, and the deletion
+stores what `native-delete` did.
+
+`candidate-delete` is `deleting_a_conflict_page_stores_what_onenote_stores`
+(`ONESTORE_CONFLICT_DELETE_EXPORT`): `SectionOp::Delete` of `native/conflict`'s conflict page,
+which stores the objects OneNote's deletion did; `cold-delete` is its fresh read, without a
+bar.
diff --git a/corpus/conflict-page/candidate-delete/Open Notebook.onetoc2 b/corpus/conflict-page/candidate-delete/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..c7beb44bf509f935090fe55e7549e4b50e0ae0e9
Binary files /dev/null and b/corpus/conflict-page/candidate-delete/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/candidate-delete/synthetic.one b/corpus/conflict-page/candidate-delete/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..ea2ecf61b9d305de11c694334fd94369e99b7eea
Binary files /dev/null and b/corpus/conflict-page/candidate-delete/synthetic.one differ
diff --git a/corpus/conflict-page/candidate/Open Notebook.onetoc2 b/corpus/conflict-page/candidate/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..c7beb44bf509f935090fe55e7549e4b50e0ae0e9
Binary files /dev/null and b/corpus/conflict-page/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/candidate/synthetic.one b/corpus/conflict-page/candidate/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..647cd9bc181046ab29ee4528aebd31fbb9dba4fd
Binary files /dev/null and b/corpus/conflict-page/candidate/synthetic.one differ
diff --git a/corpus/conflict-page/cold-delete/commands.jsonl b/corpus/conflict-page/cold-delete/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..059e40e61d665797d4683acc66d6459966fff285
--- /dev/null
+++ b/corpus/conflict-page/cold-delete/commands.jsonl
@@ -0,0 +1,3 @@
+{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-4D3235A0 -ExpectedPages 1 -KeepOpen", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\read -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/conflict-page/cold-delete/machine.json b/corpus/conflict-page/cold-delete/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..a1f05d8179bfaf87806c989ea93c89a231bd45af
--- /dev/null
+++ b/corpus/conflict-page/cold-delete/machine.json
@@ -0,0 +1 @@
+{"name": "m6-4d3235a0", "hostname": "ONE-M6-4D3235A0"}
diff --git a/corpus/conflict-page/cold-delete/read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment b/corpus/conflict-page/cold-delete/read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment
new file mode 100644
index 0000000000000000000000000000000000000000..66b6151e91f90df6a61a19ef2f4447da278e07b2
--- /dev/null
+++ b/corpus/conflict-page/cold-delete/read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment
@@ -0,0 +1 @@
+Fictitious attachment for native corpus.
\ No newline at end of file
diff --git a/corpus/conflict-page/cold-delete/read/environment.json b/corpus/conflict-page/cold-delete/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..d03335c154a59437cf873f38ab49810353d580b1
--- /dev/null
+++ b/corpus/conflict-page/cold-delete/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-4D3235A0",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/conflict-page/cold-delete/read/hierarchy.xml b/corpus/conflict-page/cold-delete/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8e71ea46462fed2239de01f765d60863222f3739
--- /dev/null
+++ b/corpus/conflict-page/cold-delete/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/cold-delete/read/page-000.navigation.json b/corpus/conflict-page/cold-delete/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..668f002c22e396d7530675ec44f659f85b6f6a86
--- /dev/null
+++ b/corpus/conflict-page/cold-delete/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Client B conflicting edit. - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/cold-delete/read/page-000.png b/corpus/conflict-page/cold-delete/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6d238e1b156fda4d252289eb13f6a8ed3ff0906
Binary files /dev/null and b/corpus/conflict-page/cold-delete/read/page-000.png differ
diff --git a/corpus/conflict-page/cold-delete/read/page-000.xml b/corpus/conflict-page/cold-delete/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..37567a5be70a94b48ee71b7e9676a697078dd76e
--- /dev/null
+++ b/corpus/conflict-page/cold-delete/read/page-000.xml
@@ -0,0 +1,21 @@
+
+AK4FHQSiAaIBAWAqABofi0JwRYR1gL7QRdkE+oeVMvLsF0G4wBa/8yv0et67E4vlXrNInJuhJVq3
+URK/7HHMzCKxQYkOuxMs7nqhWM9UiuaXxU+PBvi60uGbIsRmbacNslhJmh1OQDQGbBADBkgQRSNG
+IwUIC2VPZmdoZGkZFDIIAIAeAiHi4kEzCADwEAKLxeJBZAMVRgBACpUE/QGH81d3mq7mkzgM0mcB
+mk1gEBgEBgEBgE1mUAgMzmUAmsygE1mUzmkBmc0gMzmk1mUAmsyTOaTWZQCazKZgALSmiazKATWZ
+QCAwCAwBAZpM4DAJlNYBMprAJlNZpM4DNJmmU1mkzgM0mcBmkzmU1gEyAAFpTSAzOaQGZzRAYBAY
+BAYBMprAIDNJnAZpM0yms0mcBmkzgM0mcymsAmU1gEyms0maZAACZTSawCZTWATKawCAoBAYBAZn
+NIDAJrMoBNZlAJrMpnMoBNZlAJrMpnNIDM5pAZnNJrMkzmk1AACH8C7XgWnmkzgM0msAmU1gEBgE
+BgEBTOaQGATWZQCazKATWZTOaTWZTNNJrMpmmUzTSaplM00mqZTOaTVMpmmk1TKATKazSawCAzSZ
+wGAQFAIDAJrMoBAZnNIDM5pAZnMpnNJrMpmmk1mUzTSaplM00mqZTNNJrMpmmk1TKZplhuAzKATW
+ZQCazKAIDAIDAIDNJnAYBMprAJlM4DNJnMprNJnMk1mkzmSazRM5kms0TOZJnMprNEzmSazQtKaQ
+GZzRNZlAIDAIDAIDAJlNYAmU1gEymsAmU1mkzmU1miZzKazRM5kmcyTWaJnMk1mkzmSazRM5kAUU
+RgBAAAAJBAUURgAAAAASABEgXhT+65lz/EiPi+8SFvjqCAk+gEcDAa/89Qd0AxVGAEAKABEg2R87
+QQrSFUA=AOECHQJSegFgKgAaH4tCcEWEdYC+0EXZBPqHlTLy7BdBuMAWv/Mr9HreuxOL5V6zSJyboSVat1ES
+v+xxzMwisUGJDrsTLO56oVjPVIrml8VPjwb4utLhmyLEZm2nDbJYSZodTkA0BmwQAwZIEEUjRiMF
+CAtlT2ZnaGRpGRQyCACAHgIh4uJBMwgA8BACi8XiQWQDFUYAQArKAUuH88s3nkzmkzgM0mcBmkzg
+KAQGAQGATWZQCAzOaQGZzKATWZTOaQGZzSAzOaTWZQCazJM5pNZlAJrMpmAAAACH8D9XgeBJlM0z
+mRNZpNZpM4DAJlNYBAUAgMAgMzmkBgE1mUAmsyTOaTWZTOaTVMpnNJqmUzTSaplM00mqZTOZTNNJ
+qmUzTSagBRRGAIAAAAkEBRRGAAAAABIAESDPTQ4xwIZyTqQ8FVDbHxeKCj9AI5rARvPPUDugAxVG
+AEAKABEgLMlfQdkfI0A=iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAusB9Y9J1uoA
+AAAASUVORK5CYII=
diff --git a/corpus/conflict-page/cold-delete/read/payloads.json b/corpus/conflict-page/cold-delete/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..de140b63b49c11437c4b611e7bf1ba60bd5f31b3
--- /dev/null
+++ b/corpus/conflict-page/cold-delete/read/payloads.json
@@ -0,0 +1,10 @@
+[
+ {
+ "sha256": "af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7",
+ "name": "fictitious-attachment.txt",
+ "object": "{577D18B7-BF93-4AA8-9305-80E5A4F26E9B}{11}{B0}",
+ "kind": "InsertedFile",
+ "page": "{DE321CF1-6751-492B-959C-42BC27DEE80E}{1}{B0}",
+ "bytes": 43
+ }
+]
\ No newline at end of file
diff --git a/corpus/conflict-page/cold-delete/run.json b/corpus/conflict-page/cold-delete/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..7c3bfe43bd28d9130a244a2123cb5a1665748154
--- /dev/null
+++ b/corpus/conflict-page/cold-delete/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/gate/candidate-delete",
+ "expected_pages": 1,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": false,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "04013bfcccee40a17e2a225f9b9e96f40a3a8daad9e350609654f8eda3ccbb41"
+ }
+}
diff --git a/corpus/conflict-page/cold-delete/scripts/cold.ps1 b/corpus/conflict-page/cold-delete/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/conflict-page/cold-delete/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/conflict-page/cold-delete/scripts/read.ps1 b/corpus/conflict-page/cold-delete/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..476094ab1e0c47077988a6461db2080cf208642b
--- /dev/null
+++ b/corpus/conflict-page/cold-delete/scripts/read.ps1
@@ -0,0 +1,142 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ $payloads += @{ page = $id; object = $file.ParentNode.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/conflict-page/cold-delete/source.json b/corpus/conflict-page/cold-delete/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..c1ef9fe53decc033de306870451ed968b741f78c
--- /dev/null
+++ b/corpus/conflict-page/cold-delete/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 4944,
+ "sha256": "36274ad5cc077c6b1ad51ee4c4b90d3b6798a45ce446cbfd7c9d7ac504776b28",
+ "mtime_ns": 1790473161246592184
+ },
+ {
+ "path": "synthetic.one",
+ "bytes": 41728,
+ "sha256": "78e247a18c1fe2c8d4de66dd8bf79bf918636bfb42933a5533a91c8f21939de0",
+ "mtime_ns": 1790473248313861507
+ }
+]
diff --git a/corpus/conflict-page/cold-delete/teardown.json b/corpus/conflict-page/cold-delete/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/conflict-page/cold-delete/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/conflict-page/cold/before-read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment b/corpus/conflict-page/cold/before-read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment
new file mode 100644
index 0000000000000000000000000000000000000000..66b6151e91f90df6a61a19ef2f4447da278e07b2
--- /dev/null
+++ b/corpus/conflict-page/cold/before-read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment
@@ -0,0 +1 @@
+Fictitious attachment for native corpus.
\ No newline at end of file
diff --git a/corpus/conflict-page/cold/before-read/environment.json b/corpus/conflict-page/cold/before-read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..6f6316cb1e6b9b42bb515e8c9bb2673249eca696
--- /dev/null
+++ b/corpus/conflict-page/cold/before-read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-FA8F1E62",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/conflict-page/cold/before-read/hierarchy.xml b/corpus/conflict-page/cold/before-read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..712236a875d72e75cb8e64fa22404a7e7ad56182
--- /dev/null
+++ b/corpus/conflict-page/cold/before-read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/cold/before-read/page-000.xml b/corpus/conflict-page/cold/before-read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eb35bbfb1c1b8d416a12b3d07500528f3d87ad66
--- /dev/null
+++ b/corpus/conflict-page/cold/before-read/page-000.xml
@@ -0,0 +1,26 @@
+
+Remote: café, 東京, مرحبا]]>AK4FHQSiAaIBAWAqABofi0JwRYR1gL7QRdkE+oeVMvLsF0G4wBa/8yv0et67E4vlXrNInJuhJVq3
+URK/7HHMzCKxQYkOuxMs7nqhWM9UiuaXxU+PBvi60uGbIsRmbacNslhJmh1OQDQGbBADBkgQRSNG
+IwUIC2VPZmdoZGkZFDIIAIAeAiHi4kEzCADwEAKLxeJBZAMVRgBACpUE/QGH81d3mq7mkzgM0mcB
+mk1gEBgEBgEBgE1mUAgMzmUAmsygE1mUzmkBmc0gMzmk1mUAmsyTOaTWZQCazKZgALSmiazKATWZ
+QCAwCAwBAZpM4DAJlNYBMprAJlNZpM4DNJmmU1mkzgM0mcBmkzmU1gEyAAFpTSAzOaQGZzRAYBAY
+BAYBMprAIDNJnAZpM0yms0mcBmkzgM0mcymsAmU1gEyms0maZAACZTSawCZTWATKawCAoBAYBAZn
+NIDAJrMoBNZlAJrMpnMoBNZlAJrMpnNIDM5pAZnNJrMkzmk1AACH8C7XgWnmkzgM0msAmU1gEBgE
+BgEBTOaQGATWZQCazKATWZTOaTWZTNNJrMpmmUzTSaplM00mqZTOaTVMpmmk1TKATKazSawCAzSZ
+wGAQFAIDAJrMoBAZnNIDM5pAZnMpnNJrMpmmk1mUzTSaplM00mqZTNNJrMpmmk1TKZplhuAzKATW
+ZQCazKAIDAIDAIDNJnAYBMprAJlM4DNJnMprNJnMk1mkzmSazRM5kms0TOZJnMprNEzmSazQtKaQ
+GZzRNZlAIDAIDAIDAJlNYAmU1gEymsAmU1mkzmU1miZzKazRM5kmcyTWaJnMk1mkzmSazRM5kAUU
+RgBAAAAJBAUURgAAAAASABEgXhT+65lz/EiPi+8SFvjqCAk+gEcDAa/89Qd0AxVGAEAKABEg2R87
+QQrSFUA=AOECHQJSegFgKgAaH4tCcEWEdYC+0EXZBPqHlTLy7BdBuMAWv/Mr9HreuxOL5V6zSJyboSVat1ES
+v+xxzMwisUGJDrsTLO56oVjPVIrml8VPjwb4utLhmyLEZm2nDbJYSZodTkA0BmwQAwZIEEUjRiMF
+CAtlT2ZnaGRpGRQyCACAHgIh4uJBMwgA8BACi8XiQWQDFUYAQArKAUuH88s3nkzmkzgM0mcBmkzg
+KAQGAQGATWZQCAzOaQGZzKATWZTOaQGZzSAzOaTWZQCazJM5pNZlAJrMpmAAAACH8D9XgeBJlM0z
+mRNZpNZpM4DAJlNYBAUAgMAgMzmkBgE1mUAmsyTOaTWZTOaTVMpnNJqmUzTSaplM00mqZTOZTNNJ
+qmUzTSagBRRGAIAAAAkEBRRGAAAAABIAESDPTQ4xwIZyTqQ8FVDbHxeKCj9AI5rARvPPUDugAxVG
+AEAKABEgLMlfQdkfI0A=iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAusB9Y9J1uoA
+AAAASUVORK5CYII=
diff --git a/corpus/conflict-page/cold/before-read/payloads.json b/corpus/conflict-page/cold/before-read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..88ae247d1cd3dee9c2ac3f05912170135543e7cb
--- /dev/null
+++ b/corpus/conflict-page/cold/before-read/payloads.json
@@ -0,0 +1,10 @@
+[
+ {
+ "sha256": "af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7",
+ "name": "fictitious-attachment.txt",
+ "object": "{EEA4864A-EC4F-48DD-94E4-A54023F53C64}{11}{B0}",
+ "kind": "InsertedFile",
+ "page": "{67EB820C-348D-4B5E-927D-6719A0D9BAF1}{1}{B0}",
+ "bytes": 43
+ }
+]
\ No newline at end of file
diff --git a/corpus/conflict-page/cold/cold-conflict.json b/corpus/conflict-page/cold/cold-conflict.json
new file mode 100644
index 0000000000000000000000000000000000000000..2797bae39ee1a51a132ddf62bd0f0a7b5fb6f9e9
--- /dev/null
+++ b/corpus/conflict-page/cold/cold-conflict.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Snowbound: caf\u00e9, \u6771\u4eac, \u0645\u0631\u062d\u0628\u0627 - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/cold/cold-conflict.png b/corpus/conflict-page/cold/cold-conflict.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e581162febb7372e249109b1cc0fbc31e841ff2
Binary files /dev/null and b/corpus/conflict-page/cold/cold-conflict.png differ
diff --git a/corpus/conflict-page/cold/cold-delete.json b/corpus/conflict-page/cold/cold-delete.json
new file mode 100644
index 0000000000000000000000000000000000000000..61e9e7317ecda208a0500463bc8537e2a0328ff0
--- /dev/null
+++ b/corpus/conflict-page/cold/cold-delete.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Remote: caf\u00e9, \u6771\u4eac, \u0645\u0631\u062d\u0628\u0627 - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/cold/cold-delete.png b/corpus/conflict-page/cold/cold-delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d35fc6da74741e9c963466bd316d601d603ca2c
Binary files /dev/null and b/corpus/conflict-page/cold/cold-delete.png differ
diff --git a/corpus/conflict-page/cold/cold-main.json b/corpus/conflict-page/cold/cold-main.json
new file mode 100644
index 0000000000000000000000000000000000000000..61e9e7317ecda208a0500463bc8537e2a0328ff0
--- /dev/null
+++ b/corpus/conflict-page/cold/cold-main.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Remote: caf\u00e9, \u6771\u4eac, \u0645\u0631\u062d\u0628\u0627 - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/cold/cold-main.png b/corpus/conflict-page/cold/cold-main.png
new file mode 100644
index 0000000000000000000000000000000000000000..07962cb3e707d017176cdf0394b5e6866c78699b
Binary files /dev/null and b/corpus/conflict-page/cold/cold-main.png differ
diff --git a/corpus/conflict-page/cold/cold-menu.json b/corpus/conflict-page/cold/cold-menu.json
new file mode 100644
index 0000000000000000000000000000000000000000..f43854a7a42d5bb99c0b443513bc0c0993c2716c
--- /dev/null
+++ b/corpus/conflict-page/cold/cold-menu.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "",
+ "class": "Net UI Tool Window",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/cold/cold-menu.png b/corpus/conflict-page/cold/cold-menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae05c88ae8f99bca435602c2848815a8db493a97
Binary files /dev/null and b/corpus/conflict-page/cold/cold-menu.png differ
diff --git a/corpus/conflict-page/cold/cold-shown.json b/corpus/conflict-page/cold/cold-shown.json
new file mode 100644
index 0000000000000000000000000000000000000000..2797bae39ee1a51a132ddf62bd0f0a7b5fb6f9e9
--- /dev/null
+++ b/corpus/conflict-page/cold/cold-shown.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Snowbound: caf\u00e9, \u6771\u4eac, \u0645\u0631\u062d\u0628\u0627 - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/cold/cold-shown.png b/corpus/conflict-page/cold/cold-shown.png
new file mode 100644
index 0000000000000000000000000000000000000000..28b4db4798984a0b42158552a903406f50099aab
Binary files /dev/null and b/corpus/conflict-page/cold/cold-shown.png differ
diff --git a/corpus/conflict-page/cold/commands.jsonl b/corpus/conflict-page/cold/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..88a0fe416fa51778997f253463110777c3747341
--- /dev/null
+++ b/corpus/conflict-page/cold/commands.jsonl
@@ -0,0 +1,6 @@
+{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-FA8F1E62 -ExpectedPages -1 -KeepOpen", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Rename-Item C:\\one-tests\\runs\\capture\\read before-read\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-FA8F1E62 -UseCurrentCache -ExpectedPages -1", "exit": 0, "stdout": "Read 2 sections and 1 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/conflict-page/cold/machine.json b/corpus/conflict-page/cold/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..d0177b47e02f051df52127aafaa35425381a2411
--- /dev/null
+++ b/corpus/conflict-page/cold/machine.json
@@ -0,0 +1 @@
+{"name": "m6-fa8f1e62", "hostname": "ONE-M6-FA8F1E62"}
diff --git a/corpus/conflict-page/cold/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one b/corpus/conflict-page/cold/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one
new file mode 100644
index 0000000000000000000000000000000000000000..ffe604aa40452c5694188fa0042a52d1d9cf7da8
Binary files /dev/null and b/corpus/conflict-page/cold/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one differ
diff --git a/corpus/conflict-page/cold/notebook/OneNote_RecycleBin/Open Notebook.onetoc2 b/corpus/conflict-page/cold/notebook/OneNote_RecycleBin/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..e795d08b1ebc6d904ffba085f27ed57f2dfe90f6
Binary files /dev/null and b/corpus/conflict-page/cold/notebook/OneNote_RecycleBin/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/cold/notebook/Open Notebook.onetoc2 b/corpus/conflict-page/cold/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..6e5dfc82f4398ec9c92ff1009ceb7b20c199f700
Binary files /dev/null and b/corpus/conflict-page/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/cold/notebook/synthetic.one b/corpus/conflict-page/cold/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..deff07779000e935c7af2c07cc425e9a57e8c0bc
Binary files /dev/null and b/corpus/conflict-page/cold/notebook/synthetic.one differ
diff --git a/corpus/conflict-page/cold/read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment b/corpus/conflict-page/cold/read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment
new file mode 100644
index 0000000000000000000000000000000000000000..66b6151e91f90df6a61a19ef2f4447da278e07b2
--- /dev/null
+++ b/corpus/conflict-page/cold/read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment
@@ -0,0 +1 @@
+Fictitious attachment for native corpus.
\ No newline at end of file
diff --git a/corpus/conflict-page/cold/read/environment.json b/corpus/conflict-page/cold/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..7c72a2249c5bedec250b192ce0de0762aaa1dbde
--- /dev/null
+++ b/corpus/conflict-page/cold/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-FA8F1E62",
+ "cold": false,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/conflict-page/cold/read/hierarchy.xml b/corpus/conflict-page/cold/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..129b3d3fff6dbcbe8697a747320aeb5ae880165b
--- /dev/null
+++ b/corpus/conflict-page/cold/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/cold/read/page-000.xml b/corpus/conflict-page/cold/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..631b9d5bd28c3cfa00181deedba99f442f148656
--- /dev/null
+++ b/corpus/conflict-page/cold/read/page-000.xml
@@ -0,0 +1,26 @@
+
+Remote: café, 東京, مرحبا]]>AK4FHQSiAaIBAWAqABofi0JwRYR1gL7QRdkE+oeVMvLsF0G4wBa/8yv0et67E4vlXrNInJuhJVq3
+URK/7HHMzCKxQYkOuxMs7nqhWM9UiuaXxU+PBvi60uGbIsRmbacNslhJmh1OQDQGbBADBkgQRSNG
+IwUIC2VPZmdoZGkZFDIIAIAeAiHi4kEzCADwEAKLxeJBZAMVRgBACpUE/QGH81d3mq7mkzgM0mcB
+mk1gEBgEBgEBgE1mUAgMzmUAmsygE1mUzmkBmc0gMzmk1mUAmsyTOaTWZQCazKZgALSmiazKATWZ
+QCAwCAwBAZpM4DAJlNYBMprAJlNZpM4DNJmmU1mkzgM0mcBmkzmU1gEyAAFpTSAzOaQGZzRAYBAY
+BAYBMprAIDNJnAZpM0yms0mcBmkzgM0mcymsAmU1gEyms0maZAACZTSawCZTWATKawCAoBAYBAZn
+NIDAJrMoBNZlAJrMpnMoBNZlAJrMpnNIDM5pAZnNJrMkzmk1AACH8C7XgWnmkzgM0msAmU1gEBgE
+BgEBTOaQGATWZQCazKATWZTOaTWZTNNJrMpmmUzTSaplM00mqZTOaTVMpmmk1TKATKazSawCAzSZ
+wGAQFAIDAJrMoBAZnNIDM5pAZnMpnNJrMpmmk1mUzTSaplM00mqZTNNJrMpmmk1TKZplhuAzKATW
+ZQCazKAIDAIDAIDNJnAYBMprAJlM4DNJnMprNJnMk1mkzmSazRM5kms0TOZJnMprNEzmSazQtKaQ
+GZzRNZlAIDAIDAIDAJlNYAmU1gEymsAmU1mkzmU1miZzKazRM5kmcyTWaJnMk1mkzmSazRM5kAUU
+RgBAAAAJBAUURgAAAAASABEgXhT+65lz/EiPi+8SFvjqCAk+gEcDAa/89Qd0AxVGAEAKABEg2R87
+QQrSFUA=AOECHQJSegFgKgAaH4tCcEWEdYC+0EXZBPqHlTLy7BdBuMAWv/Mr9HreuxOL5V6zSJyboSVat1ES
+v+xxzMwisUGJDrsTLO56oVjPVIrml8VPjwb4utLhmyLEZm2nDbJYSZodTkA0BmwQAwZIEEUjRiMF
+CAtlT2ZnaGRpGRQyCACAHgIh4uJBMwgA8BACi8XiQWQDFUYAQArKAUuH88s3nkzmkzgM0mcBmkzg
+KAQGAQGATWZQCAzOaQGZzKATWZTOaQGZzSAzOaTWZQCazJM5pNZlAJrMpmAAAACH8D9XgeBJlM0z
+mRNZpNZpM4DAJlNYBAUAgMAgMzmkBgE1mUAmsyTOaTWZTOaTVMpnNJqmUzTSaplM00mqZTOZTNNJ
+qmUzTSagBRRGAIAAAAkEBRRGAAAAABIAESDPTQ4xwIZyTqQ8FVDbHxeKCj9AI5rARvPPUDugAxVG
+AEAKABEgLMlfQdkfI0A=iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAusB9Y9J1uoA
+AAAASUVORK5CYII=
diff --git a/corpus/conflict-page/cold/read/payloads.json b/corpus/conflict-page/cold/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..88ae247d1cd3dee9c2ac3f05912170135543e7cb
--- /dev/null
+++ b/corpus/conflict-page/cold/read/payloads.json
@@ -0,0 +1,10 @@
+[
+ {
+ "sha256": "af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7",
+ "name": "fictitious-attachment.txt",
+ "object": "{EEA4864A-EC4F-48DD-94E4-A54023F53C64}{11}{B0}",
+ "kind": "InsertedFile",
+ "page": "{67EB820C-348D-4B5E-927D-6719A0D9BAF1}{1}{B0}",
+ "bytes": 43
+ }
+]
\ No newline at end of file
diff --git a/corpus/conflict-page/cold/run.json b/corpus/conflict-page/cold/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..376f7384b0892afab7194adc1def657f070b7909
--- /dev/null
+++ b/corpus/conflict-page/cold/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/gate3/candidate",
+ "expected_pages": -1,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "04013bfcccee40a17e2a225f9b9e96f40a3a8daad9e350609654f8eda3ccbb41"
+ }
+}
diff --git a/corpus/conflict-page/cold/scripts/cold.ps1 b/corpus/conflict-page/cold/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/conflict-page/cold/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/conflict-page/cold/scripts/read.ps1 b/corpus/conflict-page/cold/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..476094ab1e0c47077988a6461db2080cf208642b
--- /dev/null
+++ b/corpus/conflict-page/cold/scripts/read.ps1
@@ -0,0 +1,142 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ $payloads += @{ page = $id; object = $file.ParentNode.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/conflict-page/cold/source.json b/corpus/conflict-page/cold/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..94cafa9cd7aff191a1fc72f639a1d752940f8906
--- /dev/null
+++ b/corpus/conflict-page/cold/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 4944,
+ "sha256": "36274ad5cc077c6b1ad51ee4c4b90d3b6798a45ce446cbfd7c9d7ac504776b28",
+ "mtime_ns": 1788585164198018949
+ },
+ {
+ "path": "synthetic.one",
+ "bytes": 43112,
+ "sha256": "ab763188e885724957e2440a78eb29c457f47d538f78c3cc40e9c1a396be5c3b",
+ "mtime_ns": 1790489509247358867
+ }
+]
diff --git a/corpus/conflict-page/cold/teardown.json b/corpus/conflict-page/cold/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/conflict-page/cold/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/conflict-page/native-delete/before-read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment b/corpus/conflict-page/native-delete/before-read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment
new file mode 100644
index 0000000000000000000000000000000000000000..66b6151e91f90df6a61a19ef2f4447da278e07b2
--- /dev/null
+++ b/corpus/conflict-page/native-delete/before-read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment
@@ -0,0 +1 @@
+Fictitious attachment for native corpus.
\ No newline at end of file
diff --git a/corpus/conflict-page/native-delete/before-read/environment.json b/corpus/conflict-page/native-delete/before-read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..9048ca4bd4e5ef3cdfc99810e0455a385a8556d2
--- /dev/null
+++ b/corpus/conflict-page/native-delete/before-read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-7691E04E",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/conflict-page/native-delete/before-read/hierarchy.xml b/corpus/conflict-page/native-delete/before-read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..22ff82ae69fa8483dea86f371739b36373c76aa2
--- /dev/null
+++ b/corpus/conflict-page/native-delete/before-read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-delete/before-read/page-000.xml b/corpus/conflict-page/native-delete/before-read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0fe04aa3c60ab810ec3f3dda7268469e20ca8065
--- /dev/null
+++ b/corpus/conflict-page/native-delete/before-read/page-000.xml
@@ -0,0 +1,21 @@
+
+AK4FHQSiAaIBAWAqABofi0JwRYR1gL7QRdkE+oeVMvLsF0G4wBa/8yv0et67E4vlXrNInJuhJVq3
+URK/7HHMzCKxQYkOuxMs7nqhWM9UiuaXxU+PBvi60uGbIsRmbacNslhJmh1OQDQGbBADBkgQRSNG
+IwUIC2VPZmdoZGkZFDIIAIAeAiHi4kEzCADwEAKLxeJBZAMVRgBACpUE/QGH81d3mq7mkzgM0mcB
+mk1gEBgEBgEBgE1mUAgMzmUAmsygE1mUzmkBmc0gMzmk1mUAmsyTOaTWZQCazKZgALSmiazKATWZ
+QCAwCAwBAZpM4DAJlNYBMprAJlNZpM4DNJmmU1mkzgM0mcBmkzmU1gEyAAFpTSAzOaQGZzRAYBAY
+BAYBMprAIDNJnAZpM0yms0mcBmkzgM0mcymsAmU1gEyms0maZAACZTSawCZTWATKawCAoBAYBAZn
+NIDAJrMoBNZlAJrMpnMoBNZlAJrMpnNIDM5pAZnNJrMkzmk1AACH8C7XgWnmkzgM0msAmU1gEBgE
+BgEBTOaQGATWZQCazKATWZTOaTWZTNNJrMpmmUzTSaplM00mqZTOaTVMpmmk1TKATKazSawCAzSZ
+wGAQFAIDAJrMoBAZnNIDM5pAZnMpnNJrMpmmk1mUzTSaplM00mqZTNNJrMpmmk1TKZplhuAzKATW
+ZQCazKAIDAIDAIDNJnAYBMprAJlM4DNJnMprNJnMk1mkzmSazRM5kms0TOZJnMprNEzmSazQtKaQ
+GZzRNZlAIDAIDAIDAJlNYAmU1gEymsAmU1mkzmU1miZzKazRM5kmcyTWaJnMk1mkzmSazRM5kAUU
+RgBAAAAJBAUURgAAAAASABEgXhT+65lz/EiPi+8SFvjqCAk+gEcDAa/89Qd0AxVGAEAKABEg2R87
+QQrSFUA=AOECHQJSegFgKgAaH4tCcEWEdYC+0EXZBPqHlTLy7BdBuMAWv/Mr9HreuxOL5V6zSJyboSVat1ES
+v+xxzMwisUGJDrsTLO56oVjPVIrml8VPjwb4utLhmyLEZm2nDbJYSZodTkA0BmwQAwZIEEUjRiMF
+CAtlT2ZnaGRpGRQyCACAHgIh4uJBMwgA8BACi8XiQWQDFUYAQArKAUuH88s3nkzmkzgM0mcBmkzg
+KAQGAQGATWZQCAzOaQGZzKATWZTOaQGZzSAzOaTWZQCazJM5pNZlAJrMpmAAAACH8D9XgeBJlM0z
+mRNZpNZpM4DAJlNYBAUAgMAgMzmkBgE1mUAmsyTOaTWZTOaTVMpnNJqmUzTSaplM00mqZTOZTNNJ
+qmUzTSagBRRGAIAAAAkEBRRGAAAAABIAESDPTQ4xwIZyTqQ8FVDbHxeKCj9AI5rARvPPUDugAxVG
+AEAKABEgLMlfQdkfI0A=iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAusB9Y9J1uoA
+AAAASUVORK5CYII=
diff --git a/corpus/conflict-page/native-delete/before-read/payloads.json b/corpus/conflict-page/native-delete/before-read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..f4ee299a7df5c6b52e3098b2bc5840a1996ec7e2
--- /dev/null
+++ b/corpus/conflict-page/native-delete/before-read/payloads.json
@@ -0,0 +1,10 @@
+[
+ {
+ "sha256": "af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7",
+ "name": "fictitious-attachment.txt",
+ "object": "{19686511-7C8F-4B47-BC86-55344C46A4DA}{11}{B0}",
+ "kind": "InsertedFile",
+ "page": "{90276157-A44D-48C4-BA1F-976DCF6A224F}{1}{B0}",
+ "bytes": 43
+ }
+]
\ No newline at end of file
diff --git a/corpus/conflict-page/native-delete/cold-conflict.json b/corpus/conflict-page/native-delete/cold-conflict.json
new file mode 100644
index 0000000000000000000000000000000000000000..2fd05a4a7938577ce0347213e7f3ed53dab2c0a4
--- /dev/null
+++ b/corpus/conflict-page/native-delete/cold-conflict.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Client A conflicting edit. - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-delete/cold-conflict.png b/corpus/conflict-page/native-delete/cold-conflict.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d522c209a274b0ad1076843186dd469c683d028
Binary files /dev/null and b/corpus/conflict-page/native-delete/cold-conflict.png differ
diff --git a/corpus/conflict-page/native-delete/cold-delete.json b/corpus/conflict-page/native-delete/cold-delete.json
new file mode 100644
index 0000000000000000000000000000000000000000..668f002c22e396d7530675ec44f659f85b6f6a86
--- /dev/null
+++ b/corpus/conflict-page/native-delete/cold-delete.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Client B conflicting edit. - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-delete/cold-delete.png b/corpus/conflict-page/native-delete/cold-delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa8b2818d72f6d10d67a3bfe8c11c73c2bb34d9c
Binary files /dev/null and b/corpus/conflict-page/native-delete/cold-delete.png differ
diff --git a/corpus/conflict-page/native-delete/cold-main.json b/corpus/conflict-page/native-delete/cold-main.json
new file mode 100644
index 0000000000000000000000000000000000000000..668f002c22e396d7530675ec44f659f85b6f6a86
--- /dev/null
+++ b/corpus/conflict-page/native-delete/cold-main.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Client B conflicting edit. - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-delete/cold-main.png b/corpus/conflict-page/native-delete/cold-main.png
new file mode 100644
index 0000000000000000000000000000000000000000..d82c666ffe306025e3f33d57ad6e47433bad0a59
Binary files /dev/null and b/corpus/conflict-page/native-delete/cold-main.png differ
diff --git a/corpus/conflict-page/native-delete/cold-menu.json b/corpus/conflict-page/native-delete/cold-menu.json
new file mode 100644
index 0000000000000000000000000000000000000000..f43854a7a42d5bb99c0b443513bc0c0993c2716c
--- /dev/null
+++ b/corpus/conflict-page/native-delete/cold-menu.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "",
+ "class": "Net UI Tool Window",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-delete/cold-menu.png b/corpus/conflict-page/native-delete/cold-menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..c740dbf75d89b9f347e3cead98f6b4f188fe0b1f
Binary files /dev/null and b/corpus/conflict-page/native-delete/cold-menu.png differ
diff --git a/corpus/conflict-page/native-delete/cold-shown.json b/corpus/conflict-page/native-delete/cold-shown.json
new file mode 100644
index 0000000000000000000000000000000000000000..2fd05a4a7938577ce0347213e7f3ed53dab2c0a4
--- /dev/null
+++ b/corpus/conflict-page/native-delete/cold-shown.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Client A conflicting edit. - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-delete/cold-shown.png b/corpus/conflict-page/native-delete/cold-shown.png
new file mode 100644
index 0000000000000000000000000000000000000000..3257684d36d68a5b5ff42b439cef7a97c793ad62
Binary files /dev/null and b/corpus/conflict-page/native-delete/cold-shown.png differ
diff --git a/corpus/conflict-page/native-delete/commands.jsonl b/corpus/conflict-page/native-delete/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..bf51e5ed90a7bdb52ff561231782da39c4669557
--- /dev/null
+++ b/corpus/conflict-page/native-delete/commands.jsonl
@@ -0,0 +1,6 @@
+{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-7691E04E -ExpectedPages -1 -KeepOpen", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Rename-Item C:\\one-tests\\runs\\capture\\read before-read\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-7691E04E -UseCurrentCache -ExpectedPages -1", "exit": 0, "stdout": "Read 2 sections and 1 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/conflict-page/native-delete/machine.json b/corpus/conflict-page/native-delete/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..a5cd39156d6dc01d0e333458bf636f41fdff0721
--- /dev/null
+++ b/corpus/conflict-page/native-delete/machine.json
@@ -0,0 +1 @@
+{"name": "m6-7691e04e", "hostname": "ONE-M6-7691E04E"}
diff --git a/corpus/conflict-page/native-delete/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one b/corpus/conflict-page/native-delete/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one
new file mode 100644
index 0000000000000000000000000000000000000000..1cd05d71d4fe210c8010abf2a4a08bfd8c4abba9
Binary files /dev/null and b/corpus/conflict-page/native-delete/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one differ
diff --git a/corpus/conflict-page/native-delete/notebook/OneNote_RecycleBin/Open Notebook.onetoc2 b/corpus/conflict-page/native-delete/notebook/OneNote_RecycleBin/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..94d5ec410cd4d8d0de874baaa40fe256f0a686bb
Binary files /dev/null and b/corpus/conflict-page/native-delete/notebook/OneNote_RecycleBin/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native-delete/notebook/Open Notebook.onetoc2 b/corpus/conflict-page/native-delete/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..5d8fb2d3a1d1c39967d3a3260efd997006aaf554
Binary files /dev/null and b/corpus/conflict-page/native-delete/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native-delete/notebook/synthetic.one b/corpus/conflict-page/native-delete/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..2d9ecaa8a40f17d391c48d15af3eb5ca56563ca4
Binary files /dev/null and b/corpus/conflict-page/native-delete/notebook/synthetic.one differ
diff --git a/corpus/conflict-page/native-delete/read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment b/corpus/conflict-page/native-delete/read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment
new file mode 100644
index 0000000000000000000000000000000000000000..66b6151e91f90df6a61a19ef2f4447da278e07b2
--- /dev/null
+++ b/corpus/conflict-page/native-delete/read/af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7.attachment
@@ -0,0 +1 @@
+Fictitious attachment for native corpus.
\ No newline at end of file
diff --git a/corpus/conflict-page/native-delete/read/environment.json b/corpus/conflict-page/native-delete/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..5f02dc66163bb072e2494050996e4b456ee3b69a
--- /dev/null
+++ b/corpus/conflict-page/native-delete/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-7691E04E",
+ "cold": false,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/conflict-page/native-delete/read/hierarchy.xml b/corpus/conflict-page/native-delete/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d9c3291f114855dddea2bd070799775265dd86e0
--- /dev/null
+++ b/corpus/conflict-page/native-delete/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-delete/read/page-000.xml b/corpus/conflict-page/native-delete/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6c687224b62d5cb559633435c7772dc6de9e40a4
--- /dev/null
+++ b/corpus/conflict-page/native-delete/read/page-000.xml
@@ -0,0 +1,21 @@
+
+AK4FHQSiAaIBAWAqABofi0JwRYR1gL7QRdkE+oeVMvLsF0G4wBa/8yv0et67E4vlXrNInJuhJVq3
+URK/7HHMzCKxQYkOuxMs7nqhWM9UiuaXxU+PBvi60uGbIsRmbacNslhJmh1OQDQGbBADBkgQRSNG
+IwUIC2VPZmdoZGkZFDIIAIAeAiHi4kEzCADwEAKLxeJBZAMVRgBACpUE/QGH81d3mq7mkzgM0mcB
+mk1gEBgEBgEBgE1mUAgMzmUAmsygE1mUzmkBmc0gMzmk1mUAmsyTOaTWZQCazKZgALSmiazKATWZ
+QCAwCAwBAZpM4DAJlNYBMprAJlNZpM4DNJmmU1mkzgM0mcBmkzmU1gEyAAFpTSAzOaQGZzRAYBAY
+BAYBMprAIDNJnAZpM0yms0mcBmkzgM0mcymsAmU1gEyms0maZAACZTSawCZTWATKawCAoBAYBAZn
+NIDAJrMoBNZlAJrMpnMoBNZlAJrMpnNIDM5pAZnNJrMkzmk1AACH8C7XgWnmkzgM0msAmU1gEBgE
+BgEBTOaQGATWZQCazKATWZTOaTWZTNNJrMpmmUzTSaplM00mqZTOaTVMpmmk1TKATKazSawCAzSZ
+wGAQFAIDAJrMoBAZnNIDM5pAZnMpnNJrMpmmk1mUzTSaplM00mqZTNNJrMpmmk1TKZplhuAzKATW
+ZQCazKAIDAIDAIDNJnAYBMprAJlM4DNJnMprNJnMk1mkzmSazRM5kms0TOZJnMprNEzmSazQtKaQ
+GZzRNZlAIDAIDAIDAJlNYAmU1gEymsAmU1mkzmU1miZzKazRM5kmcyTWaJnMk1mkzmSazRM5kAUU
+RgBAAAAJBAUURgAAAAASABEgXhT+65lz/EiPi+8SFvjqCAk+gEcDAa/89Qd0AxVGAEAKABEg2R87
+QQrSFUA=AOECHQJSegFgKgAaH4tCcEWEdYC+0EXZBPqHlTLy7BdBuMAWv/Mr9HreuxOL5V6zSJyboSVat1ES
+v+xxzMwisUGJDrsTLO56oVjPVIrml8VPjwb4utLhmyLEZm2nDbJYSZodTkA0BmwQAwZIEEUjRiMF
+CAtlT2ZnaGRpGRQyCACAHgIh4uJBMwgA8BACi8XiQWQDFUYAQArKAUuH88s3nkzmkzgM0mcBmkzg
+KAQGAQGATWZQCAzOaQGZzKATWZTOaQGZzSAzOaTWZQCazJM5pNZlAJrMpmAAAACH8D9XgeBJlM0z
+mRNZpNZpM4DAJlNYBAUAgMAgMzmkBgE1mUAmsyTOaTWZTOaTVMpnNJqmUzTSaplM00mqZTOZTNNJ
+qmUzTSagBRRGAIAAAAkEBRRGAAAAABIAESDPTQ4xwIZyTqQ8FVDbHxeKCj9AI5rARvPPUDugAxVG
+AEAKABEgLMlfQdkfI0A=iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAusB9Y9J1uoA
+AAAASUVORK5CYII=
diff --git a/corpus/conflict-page/native-delete/read/payloads.json b/corpus/conflict-page/native-delete/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..f4ee299a7df5c6b52e3098b2bc5840a1996ec7e2
--- /dev/null
+++ b/corpus/conflict-page/native-delete/read/payloads.json
@@ -0,0 +1,10 @@
+[
+ {
+ "sha256": "af1af4b8987109ce1e335e538910fb3860b7c57eb3b6110a06aa2114e06d69a7",
+ "name": "fictitious-attachment.txt",
+ "object": "{19686511-7C8F-4B47-BC86-55344C46A4DA}{11}{B0}",
+ "kind": "InsertedFile",
+ "page": "{90276157-A44D-48C4-BA1F-976DCF6A224F}{1}{B0}",
+ "bytes": 43
+ }
+]
\ No newline at end of file
diff --git a/corpus/conflict-page/native-delete/run.json b/corpus/conflict-page/native-delete/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..8bbfce1033d107da6ca6bc60347fa5c2614f6a2e
--- /dev/null
+++ b/corpus/conflict-page/native-delete/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/gate/native-conflict",
+ "expected_pages": -1,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "04013bfcccee40a17e2a225f9b9e96f40a3a8daad9e350609654f8eda3ccbb41"
+ }
+}
diff --git a/corpus/conflict-page/native-delete/scripts/cold.ps1 b/corpus/conflict-page/native-delete/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/conflict-page/native-delete/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/conflict-page/native-delete/scripts/read.ps1 b/corpus/conflict-page/native-delete/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..476094ab1e0c47077988a6461db2080cf208642b
--- /dev/null
+++ b/corpus/conflict-page/native-delete/scripts/read.ps1
@@ -0,0 +1,142 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ $payloads += @{ page = $id; object = $file.ParentNode.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/conflict-page/native-delete/source.json b/corpus/conflict-page/native-delete/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..c7bc810c8304aa1ca14df7b60ab0c9dcfaffb63c
--- /dev/null
+++ b/corpus/conflict-page/native-delete/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 4944,
+ "sha256": "36274ad5cc077c6b1ad51ee4c4b90d3b6798a45ce446cbfd7c9d7ac504776b28",
+ "mtime_ns": 1790472520423354873
+ },
+ {
+ "path": "synthetic.one",
+ "bytes": 40600,
+ "sha256": "e8d43dd57e02fe76e88c8ef45a7e18487bbf28928d0baf077288a4bb1415692c",
+ "mtime_ns": 1790472520423873581
+ }
+]
diff --git a/corpus/conflict-page/native-delete/teardown.json b/corpus/conflict-page/native-delete/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/conflict-page/native-delete/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/conflict-page/native-pages/a/a-merged.json b/corpus/conflict-page/native-pages/a/a-merged.json
new file mode 100644
index 0000000000000000000000000000000000000000..2f394e7eaf1defcfe3e06e321b5af76be4f84054
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/a-merged.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Fictitious: caf\u00e9, \u6771\u4eac, \u0645\u0631\u062d\u0628\u0627 - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/a-merged.png b/corpus/conflict-page/native-pages/a/a-merged.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bf9f7a8336aac9401d21ad0614e03e51551d83e
Binary files /dev/null and b/corpus/conflict-page/native-pages/a/a-merged.png differ
diff --git a/corpus/conflict-page/native-pages/a/command-0001.json b/corpus/conflict-page/native-pages/a/command-0001.json
new file mode 100644
index 0000000000000000000000000000000000000000..d79cc0093fa7c789c925d193b3110c4da6523951
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0001.json
@@ -0,0 +1 @@
+{"action": "pages", "titles": ["One", "Two", "Three", "Four", "Target"]}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/command-0002.json b/corpus/conflict-page/native-pages/a/command-0002.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0002.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/command-0003.json b/corpus/conflict-page/native-pages/a/command-0003.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0003.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/command-0004.json b/corpus/conflict-page/native-pages/a/command-0004.json
new file mode 100644
index 0000000000000000000000000000000000000000..8bd5839cfa379b0117fb5154acd9d20bc06b5cda
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0004.json
@@ -0,0 +1 @@
+{"action": "move", "page": "Four", "before": "One"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/command-0005.json b/corpus/conflict-page/native-pages/a/command-0005.json
new file mode 100644
index 0000000000000000000000000000000000000000..39953577e616d0ad2af01c7227449b427efdf5e5
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0005.json
@@ -0,0 +1 @@
+{"action": "move", "page": "Two", "before": null}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/command-0006.json b/corpus/conflict-page/native-pages/a/command-0006.json
new file mode 100644
index 0000000000000000000000000000000000000000..3f6f2524a6523bec79f8152f3340d2ae649729a0
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0006.json
@@ -0,0 +1 @@
+{"action": "edit", "expected": "Body Target.", "text": "Body Target edited offline."}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/command-0007.json b/corpus/conflict-page/native-pages/a/command-0007.json
new file mode 100644
index 0000000000000000000000000000000000000000..554ff0ef8a35478d74f3e5388f75789140b158b8
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0007.json
@@ -0,0 +1 @@
+{"action": "snapshot"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/command-0008.json b/corpus/conflict-page/native-pages/a/command-0008.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0008.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/command-0009.json b/corpus/conflict-page/native-pages/a/command-0009.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0009.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/command-0010.json b/corpus/conflict-page/native-pages/a/command-0010.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0010.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/command-0011.json b/corpus/conflict-page/native-pages/a/command-0011.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0011.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/command-0012.json b/corpus/conflict-page/native-pages/a/command-0012.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0012.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/command-0013.json b/corpus/conflict-page/native-pages/a/command-0013.json
new file mode 100644
index 0000000000000000000000000000000000000000..554ff0ef8a35478d74f3e5388f75789140b158b8
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0013.json
@@ -0,0 +1 @@
+{"action": "snapshot"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/command-0014.json b/corpus/conflict-page/native-pages/a/command-0014.json
new file mode 100644
index 0000000000000000000000000000000000000000..7adf980027ef43cc77767d4fd1b1d67ad1541ab4
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/command-0014.json
@@ -0,0 +1 @@
+{"action": "close"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/commands.jsonl b/corpus/conflict-page/native-pages/a/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..a0ec79a71dfef56ca2cfd608ba91f4a17561c1c6
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/commands.jsonl
@@ -0,0 +1,16 @@
+{"command": "mkdir C:\\one-tests\\runs\\capture", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -ExecutionPolicy Bypass -File C:\\one-tests\\network.ps1 -LabMac 52:54:02:a8:e9:55", "exit": 0, "stdout": "{\"renewalResult\":0,\"releaseResult\":0,\"mac\":\"52:54:02:a8:e9:55\",\"address\":\"192.168.77.42\"}\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0001.tmp C:\\one-tests\\runs\\capture\\inbox\\0001.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0002.tmp C:\\one-tests\\runs\\capture\\inbox\\0002.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0003.tmp C:\\one-tests\\runs\\capture\\inbox\\0003.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0004.tmp C:\\one-tests\\runs\\capture\\inbox\\0004.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0005.tmp C:\\one-tests\\runs\\capture\\inbox\\0005.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0006.tmp C:\\one-tests\\runs\\capture\\inbox\\0006.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0007.tmp C:\\one-tests\\runs\\capture\\inbox\\0007.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0008.tmp C:\\one-tests\\runs\\capture\\inbox\\0008.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0009.tmp C:\\one-tests\\runs\\capture\\inbox\\0009.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0010.tmp C:\\one-tests\\runs\\capture\\inbox\\0010.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0011.tmp C:\\one-tests\\runs\\capture\\inbox\\0011.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0012.tmp C:\\one-tests\\runs\\capture\\inbox\\0012.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0013.tmp C:\\one-tests\\runs\\capture\\inbox\\0013.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0014.tmp C:\\one-tests\\runs\\capture\\inbox\\0014.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
diff --git a/corpus/conflict-page/native-pages/a/hierarchy-0007.xml b/corpus/conflict-page/native-pages/a/hierarchy-0007.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ef20a1ea257cde476594b8c089fec60f01448292
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/hierarchy-0007.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-pages/a/hierarchy-0013.xml b/corpus/conflict-page/native-pages/a/hierarchy-0013.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1b7acda08daec45d584097dfb24cc17574ae24c1
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/hierarchy-0013.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-pages/a/listed.json b/corpus/conflict-page/native-pages/a/listed.json
new file mode 100644
index 0000000000000000000000000000000000000000..67a675a4f64d48e4266aa24db7ca7731d86ad8c6
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/listed.json
@@ -0,0 +1 @@
+["Fictitious: café, 東京, مرحبا", "One", "Two", "Four", "Three", "Target"]
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/a/machine.json b/corpus/conflict-page/native-pages/a/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..8078699df47e7da61dfbd6d7fcafb6d2f7114e2d
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/machine.json
@@ -0,0 +1 @@
+{"name": "m6-327953db", "hostname": "ONE-M6-327953DB"}
diff --git a/corpus/conflict-page/native-pages/a/teardown.json b/corpus/conflict-page/native-pages/a/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/conflict-page/native-pages/a/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/conflict-page/native-pages/b-published/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one b/corpus/conflict-page/native-pages/b-published/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one
new file mode 100644
index 0000000000000000000000000000000000000000..4af78d7a2dbe5360b92dcd980204e841a09ba37d
Binary files /dev/null and b/corpus/conflict-page/native-pages/b-published/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one differ
diff --git a/corpus/conflict-page/native-pages/b-published/notebook/OneNote_RecycleBin/Open Notebook.onetoc2 b/corpus/conflict-page/native-pages/b-published/notebook/OneNote_RecycleBin/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..6e4b6c9be779af4e6515e1c9facf29cf6c5b792e
Binary files /dev/null and b/corpus/conflict-page/native-pages/b-published/notebook/OneNote_RecycleBin/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native-pages/b-published/notebook/Open Notebook.onetoc2 b/corpus/conflict-page/native-pages/b-published/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..c5257a0970c051ac5c96357e05cdd9b0f242ee38
Binary files /dev/null and b/corpus/conflict-page/native-pages/b-published/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native-pages/b-published/notebook/synthetic.one b/corpus/conflict-page/native-pages/b-published/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..1d3f7dc3f9b4db4d434241133067f9942301fb88
Binary files /dev/null and b/corpus/conflict-page/native-pages/b-published/notebook/synthetic.one differ
diff --git a/corpus/conflict-page/native-pages/b/b-merged.json b/corpus/conflict-page/native-pages/b/b-merged.json
new file mode 100644
index 0000000000000000000000000000000000000000..2f394e7eaf1defcfe3e06e321b5af76be4f84054
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/b-merged.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Fictitious: caf\u00e9, \u6771\u4eac, \u0645\u0631\u062d\u0628\u0627 - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/b/b-merged.png b/corpus/conflict-page/native-pages/b/b-merged.png
new file mode 100644
index 0000000000000000000000000000000000000000..33bdd9945f10bcec0adcd5e541085aa7e14e86e6
Binary files /dev/null and b/corpus/conflict-page/native-pages/b/b-merged.png differ
diff --git a/corpus/conflict-page/native-pages/b/command-0001.json b/corpus/conflict-page/native-pages/b/command-0001.json
new file mode 100644
index 0000000000000000000000000000000000000000..554ff0ef8a35478d74f3e5388f75789140b158b8
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/command-0001.json
@@ -0,0 +1 @@
+{"action": "snapshot"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/b/command-0002.json b/corpus/conflict-page/native-pages/b/command-0002.json
new file mode 100644
index 0000000000000000000000000000000000000000..dc7bcbe3a9d3ab7ff629841610b3af0459d3ffce
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/command-0002.json
@@ -0,0 +1 @@
+{"action": "move", "page": "Four", "before": null}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/b/command-0003.json b/corpus/conflict-page/native-pages/b/command-0003.json
new file mode 100644
index 0000000000000000000000000000000000000000..4b88e6612d0b555ffdaf5d84fc00c75de4937491
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/command-0003.json
@@ -0,0 +1 @@
+{"action": "move", "page": "Three", "before": "One"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/b/command-0004.json b/corpus/conflict-page/native-pages/b/command-0004.json
new file mode 100644
index 0000000000000000000000000000000000000000..eff482c021828f4924fb0845aa6043a8312745ea
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/command-0004.json
@@ -0,0 +1 @@
+{"action": "delete-page", "page": "Target"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/b/command-0005.json b/corpus/conflict-page/native-pages/b/command-0005.json
new file mode 100644
index 0000000000000000000000000000000000000000..554ff0ef8a35478d74f3e5388f75789140b158b8
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/command-0005.json
@@ -0,0 +1 @@
+{"action": "snapshot"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/b/command-0006.json b/corpus/conflict-page/native-pages/b/command-0006.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/command-0006.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/b/command-0007.json b/corpus/conflict-page/native-pages/b/command-0007.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/command-0007.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/b/command-0008.json b/corpus/conflict-page/native-pages/b/command-0008.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/command-0008.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/b/command-0009.json b/corpus/conflict-page/native-pages/b/command-0009.json
new file mode 100644
index 0000000000000000000000000000000000000000..554ff0ef8a35478d74f3e5388f75789140b158b8
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/command-0009.json
@@ -0,0 +1 @@
+{"action": "snapshot"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/b/command-0010.json b/corpus/conflict-page/native-pages/b/command-0010.json
new file mode 100644
index 0000000000000000000000000000000000000000..7adf980027ef43cc77767d4fd1b1d67ad1541ab4
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/command-0010.json
@@ -0,0 +1 @@
+{"action": "close"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/b/commands.jsonl b/corpus/conflict-page/native-pages/b/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..b01eb35abba6cfb0631130c1778f33d75ea7ae3e
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/commands.jsonl
@@ -0,0 +1,12 @@
+{"command": "mkdir C:\\one-tests\\runs\\capture", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -ExecutionPolicy Bypass -File C:\\one-tests\\network.ps1 -LabMac 52:54:02:19:c7:6d", "exit": 0, "stdout": "{\"renewalResult\":0,\"releaseResult\":0,\"mac\":\"52:54:02:19:c7:6d\",\"address\":\"192.168.77.210\"}\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0001.tmp C:\\one-tests\\runs\\capture\\inbox\\0001.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0002.tmp C:\\one-tests\\runs\\capture\\inbox\\0002.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0003.tmp C:\\one-tests\\runs\\capture\\inbox\\0003.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0004.tmp C:\\one-tests\\runs\\capture\\inbox\\0004.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0005.tmp C:\\one-tests\\runs\\capture\\inbox\\0005.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0006.tmp C:\\one-tests\\runs\\capture\\inbox\\0006.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0007.tmp C:\\one-tests\\runs\\capture\\inbox\\0007.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0008.tmp C:\\one-tests\\runs\\capture\\inbox\\0008.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0009.tmp C:\\one-tests\\runs\\capture\\inbox\\0009.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0010.tmp C:\\one-tests\\runs\\capture\\inbox\\0010.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
diff --git a/corpus/conflict-page/native-pages/b/hierarchy-0001.xml b/corpus/conflict-page/native-pages/b/hierarchy-0001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..109b3296412c627c6a42b9c2d44d5ce4dcdc8709
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/hierarchy-0001.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-pages/b/hierarchy-0005.xml b/corpus/conflict-page/native-pages/b/hierarchy-0005.xml
new file mode 100644
index 0000000000000000000000000000000000000000..633860ac88594b8ebd31efd814b5032cda6b6ff7
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/hierarchy-0005.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-pages/b/hierarchy-0009.xml b/corpus/conflict-page/native-pages/b/hierarchy-0009.xml
new file mode 100644
index 0000000000000000000000000000000000000000..95e5b0fbf2cd7769d2f9edc187df53611350f2f2
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/hierarchy-0009.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-pages/b/listed.json b/corpus/conflict-page/native-pages/b/listed.json
new file mode 100644
index 0000000000000000000000000000000000000000..67a675a4f64d48e4266aa24db7ca7731d86ad8c6
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/listed.json
@@ -0,0 +1 @@
+["Fictitious: café, 東京, مرحبا", "One", "Two", "Four", "Three", "Target"]
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/b/machine.json b/corpus/conflict-page/native-pages/b/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..4c203c09d03f32d2e43453d8cd7f643f38ad7c96
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/machine.json
@@ -0,0 +1 @@
+{"name": "m6-39da335d", "hostname": "ONE-M6-39DA335D"}
diff --git a/corpus/conflict-page/native-pages/b/teardown.json b/corpus/conflict-page/native-pages/b/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/conflict-page/native-pages/b/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/conflict-page/native-pages/clients.json b/corpus/conflict-page/native-pages/clients.json
new file mode 100644
index 0000000000000000000000000000000000000000..d931d1ff7f174fc34ff42841be4fca8f0991ad66
--- /dev/null
+++ b/corpus/conflict-page/native-pages/clients.json
@@ -0,0 +1,4 @@
+{
+ "a": "m6-327953db",
+ "b": "m6-39da335d"
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/initial/notebook/Open Notebook.onetoc2 b/corpus/conflict-page/native-pages/initial/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..c7beb44bf509f935090fe55e7549e4b50e0ae0e9
Binary files /dev/null and b/corpus/conflict-page/native-pages/initial/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native-pages/initial/notebook/synthetic.one b/corpus/conflict-page/native-pages/initial/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..9d00682a40e27f509b734b04bdbe10e25e7d3d56
Binary files /dev/null and b/corpus/conflict-page/native-pages/initial/notebook/synthetic.one differ
diff --git a/corpus/conflict-page/native-pages/linux-teardown.json b/corpus/conflict-page/native-pages/linux-teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/conflict-page/native-pages/linux-teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/conflict-page/native-pages/linux.json b/corpus/conflict-page/native-pages/linux.json
new file mode 100644
index 0000000000000000000000000000000000000000..f81354b6eed97724307d4606252c29ab86b6bbfa
--- /dev/null
+++ b/corpus/conflict-page/native-pages/linux.json
@@ -0,0 +1,11 @@
+{
+ "cpus": 2,
+ "disk_gb": 16,
+ "hostname": "one-conflict2",
+ "lab_address": "192.168.77.1",
+ "lab_mac": "52:54:04:00:03:8c",
+ "memory_mb": 2048,
+ "samba_port": 14450,
+ "ssh_port": 22000,
+ "wan_mac": "52:54:03:c3:23:a2"
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/merged.json b/corpus/conflict-page/native-pages/merged.json
new file mode 100644
index 0000000000000000000000000000000000000000..72ed0278337d84924b221fde7086fa5f092b024f
--- /dev/null
+++ b/corpus/conflict-page/native-pages/merged.json
@@ -0,0 +1,49 @@
+{
+ "order": [
+ "",
+ "One",
+ "Two",
+ "Four",
+ "Three",
+ "Target"
+ ],
+ "pages": [
+ [
+ "",
+ "Fictitious positioned outline.",
+ "Fictitious: café, 東京, مرحبا",
+ "Left cell",
+ "Right cell"
+ ],
+ [
+ "2:20 AM",
+ "Body One.",
+ "One",
+ "Sunday, September 27, 2026"
+ ],
+ [
+ "2:20 AM",
+ "Body Two.",
+ "Sunday, September 27, 2026",
+ "Two"
+ ],
+ [
+ "2:20 AM",
+ "Body Four.",
+ "Four",
+ "Sunday, September 27, 2026"
+ ],
+ [
+ "2:20 AM",
+ "Body Three.",
+ "Sunday, September 27, 2026",
+ "Three"
+ ],
+ [
+ "2:20 AM",
+ "Body Target edited offline.",
+ "Sunday, September 27, 2026",
+ "Target"
+ ]
+ ]
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-pages/merged/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one b/corpus/conflict-page/native-pages/merged/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one
new file mode 100644
index 0000000000000000000000000000000000000000..2b5107aef4cdfdc82bea6f5069c97e40d26506eb
Binary files /dev/null and b/corpus/conflict-page/native-pages/merged/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one differ
diff --git a/corpus/conflict-page/native-pages/merged/notebook/OneNote_RecycleBin/Open Notebook.onetoc2 b/corpus/conflict-page/native-pages/merged/notebook/OneNote_RecycleBin/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..6e4b6c9be779af4e6515e1c9facf29cf6c5b792e
Binary files /dev/null and b/corpus/conflict-page/native-pages/merged/notebook/OneNote_RecycleBin/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native-pages/merged/notebook/Open Notebook.onetoc2 b/corpus/conflict-page/native-pages/merged/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..c5257a0970c051ac5c96357e05cdd9b0f242ee38
Binary files /dev/null and b/corpus/conflict-page/native-pages/merged/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native-pages/merged/notebook/synthetic.one b/corpus/conflict-page/native-pages/merged/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..8343d60ee07dc07bdcb875b18eb5c9d07c7c293c
Binary files /dev/null and b/corpus/conflict-page/native-pages/merged/notebook/synthetic.one differ
diff --git a/corpus/conflict-page/native-pages/native_conflict.py b/corpus/conflict-page/native-pages/native_conflict.py
new file mode 100644
index 0000000000000000000000000000000000000000..ccb4026acf69f3df84fdfbb01e9b6e39461762d3
--- /dev/null
+++ b/corpus/conflict-page/native-pages/native_conflict.py
@@ -0,0 +1,362 @@
+#!/usr/bin/env python3
+"""OneNote 2010 conflict pages: how they arise, what they store and how OneNote shows them.
+
+`sync LINUX OUTPUT` runs two disposable OneNote clients on one Samba notebook: client A edits
+two paragraphs offline while client B edits one of them and a table cell online; A then
+reconnects, which makes OneNote write a conflict page. The server file is kept before and
+after, A and B are screenshotted with the information bar, the page list shown, the conflict
+page open and its menu open, and A then deletes the conflict page through that menu.
+
+`pages LINUX OUTPUT` runs the same two clients on page-list changes: client A, offline, moves
+a page that client B also moves, moves another page, and edits a page B deletes; A then
+reconnects. The server's page order and pages, with the recycle bin, are kept at each step.
+
+`restore LINUX OUTPUT` runs them on a page in the middle of the list: client A, offline, edits
+it and moves a page B leaves alone while B deletes it; A then reconnects.
+
+`cold NOTEBOOK OUTPUT [--delete]` cold-opens a notebook holding a conflict page in a fresh
+clone and screenshots the same views; `--delete` deletes the conflict page through the menu
+and captures the notebook OneNote leaves.
+"""
+import argparse
+from contextlib import ExitStack
+from concurrent.futures import ThreadPoolExecutor
+import base64
+import json
+from pathlib import Path
+import shutil
+import subprocess
+import sys
+import time
+import xml.etree.ElementTree as ET
+
+sys.path.insert(0, str(Path(__file__).resolve().parent))
+sys.path.insert(0, str(Path(__file__).resolve().parent / 'w7'))
+import native_runner as runner
+from native_runner import ROOT, clone, command, windows, vm
+import linux_vm
+
+FIXTURE = ROOT / 'corpus/native-ink/cold-ui-ink/notebook'
+SHARE = 'm6-conflict'
+ORIGINAL = 'Fictitious: café, 東京, مرحبا'
+OTHER_OUTLINE = 'Fictitious positioned outline.'
+CELL = 'Left cell'
+
+# Coordinates on OneNote 2010 maximized at 800x600, from the stage-5, m8 and sync-01 captures:
+# the information bar's text, and the first conflict page listed under its page.
+BAR = (332, 100)
+FIRST_CONFLICT = (725, 142)
+# Delete Conflict Page, first in the menu the bar opens on a conflict page.
+DELETE = (420, 113)
+
+
+def shot(name, output, label, script):
+ """Runs an AutoHotkey step on the clone, keeping its screenshot as `label.png`."""
+ (output / f'{label}.ahk').write_text(script)
+ result = windows.do_exec(script, target=name, timeout_ms=120000, shot_delay_ms=1500)
+ screenshot = result.pop('png_b64', None)
+ if screenshot:
+ (output / f'{label}.png').write_bytes(base64.b64decode(screenshot))
+ (output / f'{label}.json').write_text(json.dumps(result, indent=2))
+ if result.get('error') or result.get('exit') != 0:
+ raise RuntimeError(f'{label}: {result}')
+ return result
+
+
+def click(x, y):
+ return ('WinActivate("ahk_exe ONENOTE.EXE")\nCoordMode("Mouse", "Screen")\n'
+ f'Click({x}, {y})\nSleep(1200)\n')
+
+
+# Reports any dialog OneNote raised, so a confirmation shows in the step's record.
+DIALOG = ('if WinExist("ahk_class #32770 ahk_exe ONENOTE.EXE") {\n'
+ ' FileAppend("dialog: " WinGetTitle() " | " WinGetText() "`n", "*", "UTF-8")\n'
+ '}\n')
+
+
+def conflict_views(name, output, page, prefix, delete=False):
+ """Screenshots a page with a conflict page: the bar, the list shown, the conflict page and
+ its menu; `delete` then chooses Delete Conflict Page."""
+ shot(name, output, f'{prefix}-main', runner.navigation_script(page) + 'Sleep(2000)\n')
+ shot(name, output, f'{prefix}-shown', click(*BAR))
+ shot(name, output, f'{prefix}-conflict', click(*FIRST_CONFLICT))
+ shot(name, output, f'{prefix}-menu', click(*BAR))
+ if delete:
+ shot(name, output, f'{prefix}-delete', click(*DELETE) + DIALOG)
+ else:
+ shot(name, output, f'{prefix}-closed', 'WinActivate("ahk_exe ONENOTE.EXE")\nSend("{Esc}")\nSleep(800)\n')
+
+
+def cold(notebook, output, delete):
+ def interaction(name, output):
+ page = ET.parse(sorted((output / 'read').glob('page-*.xml'))[0]).getroot().attrib['ID']
+ conflict_views(name, output, page, 'cold', delete)
+ if delete:
+ # OneNote writes the deletion in the background; give it time before the re-read.
+ time.sleep(20)
+ runner.capture(notebook, output, collect_notebook=True, interaction=interaction)
+
+
+class Lab:
+ """Two OneNote clients on one Samba notebook: `action` runs a controller command,
+ `state` copies the share and exports its section, `settle` syncs until a check holds."""
+
+
+def page_list(model):
+ """The section's pages in order, each as its sorted texts."""
+ from document_model import ordered_pages, walk
+ return [sorted(node['kind']['text'] for _, node in walk(page, oid) if node['kind']['type'] == 'RichText')
+ for _, _, page, oid in ordered_pages(model)]
+
+
+def edits(lab):
+ from native_collaboration import reachable_page_text
+ a, b, output, action, settle = lab.a, lab.b, lab.output, lab.action, lab.settle
+ state = lambda label: reachable_page_text(lab.state(label))
+ texts = lambda state: {text for values in state.values() for text in values}
+ state('initial')
+ vm.qmp(a['name'], 'set_link', {'name': 'lab', 'up': False})
+ try:
+ action(a, 'edit', expected=ORIGINAL, text='Client A conflicting edit.')
+ action(a, 'edit', expected=OTHER_OUTLINE, text='Client A disjoint edit.')
+ action(a, 'snapshot')
+ action(b, 'edit', expected=ORIGINAL, text='Client B conflicting edit.')
+ action(b, 'edit', expected=CELL, text='Client B disjoint cell.')
+ settle(b, lambda label: {'Client B conflicting edit.', 'Client B disjoint cell.'} <= texts(state(label)), 'b-published')
+ finally:
+ vm.qmp(a['name'], 'set_link', {'name': 'lab', 'up': True})
+ settle(a, lambda label: len(found := state(label)) > 1 and 'Client A disjoint edit.' in texts(found), 'conflict')
+ (output / 'conflict.json').write_text(json.dumps(state('conflict'), indent=2, ensure_ascii=False))
+ page = action(a, 'snapshot')[0].attrib['ID']
+ conflict_views(a['name'], output / 'a', page, 'a')
+ action(b, 'sync')
+ time.sleep(5)
+ page_b = action(b, 'snapshot')[0].attrib['ID']
+ conflict_views(b['name'], output / 'b', page_b, 'b')
+ conflict_views(a['name'], output / 'a', page, 'a-again', delete=True)
+ settle(a, lambda label: len(state(label)) == 1, 'deleted')
+ action(b, 'sync')
+ time.sleep(5)
+ shot(b['name'], output / 'b', 'b-after-delete', runner.navigation_script(page_b) + 'Sleep(2000)\n')
+
+
+PAGES = ['One', 'Two', 'Three', 'Four', 'Target']
+
+
+def titled(model, titles):
+ """The section's pages in order, each named by the title among `titles` it holds."""
+ return [next((text for text in texts if text in titles), '') for texts in page_list(model)]
+
+
+def offline(lab, titles, a_actions, b_actions):
+ """Creates the titled pages; A runs its actions offline while B runs and publishes its
+ own; A then reconnects. Keeps the merged order and pages, and what each client lists."""
+ a, b, output, action = lab.a, lab.b, lab.output, lab.action
+ action(a, 'pages', titles=titles)
+ lab.settle(a, lambda label: 'Body Target.' in str(page_list(lab.state(label))), 'initial')
+ deadline = time.monotonic() + 300
+ while not any(node.get('name') == 'Target' for node in action(b, 'snapshot')):
+ action(b, 'sync')
+ if time.monotonic() > deadline: raise TimeoutError('B never listed the new pages')
+ vm.qmp(a['name'], 'set_link', {'name': 'lab', 'up': False})
+ try:
+ for kind, parameters in a_actions:
+ action(a, kind, **parameters)
+ action(a, 'snapshot')
+ for kind, parameters in b_actions:
+ action(b, kind, **parameters)
+ action(b, 'snapshot')
+ lab.settle(b, lambda label: 'Body Target.' not in str(page_list(lab.state(label))), 'b-published')
+ finally:
+ vm.qmp(a['name'], 'set_link', {'name': 'lab', 'up': True})
+ # A's changes reach the server when its sync writes; wait until the file stops changing.
+ previous, steady = None, 0
+ deadline = time.monotonic() + 300
+ while steady < 3 and time.monotonic() < deadline:
+ action(a, 'sync')
+ time.sleep(10)
+ current = page_list(lab.state('merged'))
+ steady = steady + 1 if current == previous else 0
+ previous = current
+ (output / 'merged.json').write_text(json.dumps({'order': titled(lab.state('merged'), titles), 'pages': previous}, indent=2, ensure_ascii=False))
+ for client, label in ((a, 'a'), (b, 'b')):
+ action(client, 'sync')
+ time.sleep(5)
+ listed = action(client, 'snapshot')
+ (output / label / 'listed.json').write_text(json.dumps([node.get('name') for node in listed], ensure_ascii=False))
+ if listed:
+ shot(client['name'], output / label, f'{label}-merged', runner.navigation_script(listed[0].get('ID')) + 'Sleep(2000)\n')
+
+
+def pages(lab):
+ """Competing page moves, and an offline edit of a page the other client deletes."""
+ offline(lab, PAGES, [
+ ('move', {'page': 'Four', 'before': 'One'}),
+ ('move', {'page': 'Two', 'before': None}),
+ ('edit', {'expected': 'Body Target.', 'text': 'Body Target edited offline.'}),
+ ], [
+ ('move', {'page': 'Four', 'before': None}),
+ ('move', {'page': 'Three', 'before': 'One'}),
+ ('delete-page', {'page': 'Target'}),
+ ])
+
+
+def restore(lab):
+ """An offline edit of a page in the middle of the list the other client deletes, with an
+ offline move of a page the other client leaves alone."""
+ offline(lab, ['One', 'Two', 'Target', 'Three', 'Four'], [
+ ('edit', {'expected': 'Body Target.', 'text': 'Body Target edited offline.'}),
+ ('move', {'page': 'Four', 'before': 'One'}),
+ ], [
+ ('delete-page', {'page': 'Target'}),
+ ])
+
+
+def sync(server, output, scenario):
+ from document_model import EXPORTER
+
+ if linux_vm.instance_path(server).exists():
+ raise ValueError('Choose a new Linux VM name; existing machines are not owned by this run.')
+ output = output.resolve()
+ output.mkdir(parents=True, exist_ok=False)
+ scripts = output / 'scripts'
+ scripts.mkdir()
+ for name in ('cold.ps1', 'collaborate.ps1', 'network.ps1', 'text.ps1', 'stress.ps1'):
+ shutil.copyfile(ROOT / 'tools/native' / name, scripts / name)
+ shutil.copyfile(Path(__file__), output / 'native_conflict.py')
+
+ def ssh(text, timeout=90):
+ result = linux_vm.run_ssh(server, text, timeout=timeout)
+ with (output / 'server.jsonl').open('a') as log:
+ log.write(json.dumps({'command': text, 'exit': result.returncode, 'stdout': result.stdout, 'stderr': result.stderr}) + '\n')
+ result.check_returncode()
+ return result.stdout
+
+ def server_state(label):
+ """Copies the server's notebook, recycle bin included, until its section parses,
+ keeping it as `label/notebook`; returns the section's exported model."""
+ deadline = time.monotonic() + 120
+ while True:
+ target = output / label
+ shutil.rmtree(target, ignore_errors=True)
+ (target / 'notebook').mkdir(parents=True)
+ archive = subprocess.run(linux_vm.ssh_argv(server, f"tar cf - -C '/srv/agent/{SHARE}' ."), capture_output=True, check=True, timeout=60).stdout
+ subprocess.run(['tar', 'xf', '-', '-C', target / 'notebook'], input=archive, check=True)
+ result = subprocess.run([EXPORTER, target / 'notebook/synthetic.one', target / 'model'], capture_output=True, text=True)
+ if result.returncode == 0:
+ return json.loads((target / 'model/document.json').read_text())
+ if time.monotonic() > deadline:
+ raise RuntimeError(f'{label}: {result.stderr}')
+ time.sleep(1)
+
+ linux_vm.create_instance(server)
+ try:
+ linux_vm.launch(server)
+ linux_vm.wait_instance(server, 600)
+ (output / 'linux.json').write_text(json.dumps(linux_vm.load_instance(server), indent=2))
+ ssh(f'mkdir /srv/agent/{SHARE}')
+ for name in ('synthetic.one', 'Open Notebook.onetoc2'):
+ with (FIXTURE / name).open('rb') as stream:
+ subprocess.run(linux_vm.ssh_argv(server, f"cat > '/srv/agent/{SHARE}/{name}'"), stdin=stream, check=True)
+ ssh(f'chmod u+w /srv/agent/{SHARE}/*')
+ with ExitStack() as stack:
+ labels = ['a', 'b']
+ for label in labels:
+ (output / label).mkdir()
+
+ def start(label):
+ manager = clone(output / label)
+ name = manager.__enter__()
+ return label, name, manager
+ with ThreadPoolExecutor(max_workers=2) as pool:
+ started = list(pool.map(start, labels))
+ for _, _, manager in started:
+ stack.push(manager)
+ clients = {}
+ for label, name, _ in started:
+ folder = output / label
+ for local in scripts.iterdir():
+ remote = 'cold-current.ps1' if local.name == 'cold.ps1' else local.name
+ result = windows.do_put(local, 'C:\\one-tests\\' + remote, name)
+ if result.get('error'): raise RuntimeError(result['error'])
+ command(name, 'mkdir C:\\one-tests\\runs\\capture', folder)
+ command(name, 'powershell -NoProfile -ExecutionPolicy Bypass -File C:\\one-tests\\network.ps1 -LabMac ' + vm.lab_mac(name), folder)
+ result = windows.do_spawn('cmd /c powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\collaborate.ps1 -Root C:\\one-tests\\runs\\capture -SharedPath \\\\192.168.77.1\\agent\\' + SHARE + ' -CloneHost ONE-' + name.upper() + ' > C:\\one-tests\\runs\\capture\\controller.log 2>&1', name)
+ if result.get('error'): raise RuntimeError(result['error'])
+ deadline = time.monotonic() + 180
+ while windows.do_cmd('if exist C:\\one-tests\\runs\\capture\\ready (echo ready)', target=name).get('stdout', '').find('ready') < 0:
+ if time.monotonic() > deadline: raise RuntimeError('The collaboration controller did not open the notebook')
+ time.sleep(1)
+ clients[label] = {'name': name, 'folder': folder, 'sequence': 0}
+ (output / 'clients.json').write_text(json.dumps({label: client['name'] for label, client in clients.items()}, indent=2))
+
+ def action(client, kind, **parameters):
+ client['sequence'] += 1
+ sequence = client['sequence']
+ local = client['folder'] / f'command-{sequence:04}.json'
+ local.write_text(json.dumps({'action': kind, **parameters}, ensure_ascii=False))
+ inbox = f'C:\\one-tests\\runs\\capture\\inbox\\{sequence:04}'
+ result = windows.do_put(local, inbox + '.tmp', client['name'])
+ if result.get('error'): raise RuntimeError(result['error'])
+ command(client['name'], f'move {inbox}.tmp {inbox}.json', client['folder'])
+ remote = f'C:\\one-tests\\runs\\capture\\outbox\\{sequence}'
+ deadline = time.monotonic() + 600
+ while True:
+ result = windows.do_cmd(f'if exist {remote}\\error (type {remote}\\error & exit /b 1) else (if exist {remote}\\done (echo complete))', target=client['name'])
+ if result.get('exit') != 0: raise RuntimeError(str(result))
+ if 'complete' in result.get('stdout', ''): break
+ if time.monotonic() > deadline: raise TimeoutError(f'{kind} did not complete')
+ time.sleep(.5)
+ if kind != 'snapshot':
+ return None
+ hierarchy = client['folder'] / f'hierarchy-{sequence:04}.xml'
+ windows.do_get(remote + '\\hierarchy.xml', hierarchy, client['name'])
+ pages = [node for node in ET.fromstring(hierarchy.read_text(encoding='utf-8-sig').strip()).iter() if node.tag.endswith('}Page')]
+ for i in range(len(pages)):
+ windows.do_get(remote + f'\\page-{i}.xml', client['folder'] / f'snapshot-{sequence:04}-{i}.xml', client['name'])
+ return pages
+
+ def settle(client, check, label):
+ deadline = time.monotonic() + 300
+ while True:
+ action(client, 'sync')
+ if check(label): return
+ if time.monotonic() > deadline: raise TimeoutError(label)
+ time.sleep(2)
+
+ lab = Lab()
+ lab.a, lab.b, lab.output = clients['a'], clients['b'], output
+ lab.action, lab.state, lab.settle = action, server_state, settle
+ scenario(lab)
+
+ for client in clients.values():
+ try:
+ action(client, 'close')
+ except Exception as error:
+ (client['folder'] / 'close-failure.txt').write_text(str(error))
+ server_state('final')
+ finally:
+ if linux_vm.running(server):
+ linux_vm.shutdown(server, 120)
+ linux_vm.delete_instance(server)
+ (output / 'linux-teardown.json').write_text(json.dumps({'absent': not linux_vm.instance_path(server).exists()}) + '\n')
+
+
+if __name__ == '__main__':
+ parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
+ commands = parser.add_subparsers(dest='mode', required=True)
+ scenarios = {'sync': edits, 'pages': pages, 'restore': restore}
+ for mode in scenarios:
+ lab = commands.add_parser(mode)
+ lab.add_argument('linux')
+ lab.add_argument('output', type=Path)
+ reopen = commands.add_parser('cold')
+ reopen.add_argument('notebook', type=Path)
+ reopen.add_argument('output', type=Path)
+ reopen.add_argument('--delete', action='store_true')
+ args = parser.parse_args()
+ if args.mode in scenarios:
+ sync(args.linux, args.output, scenarios[args.mode])
+ else:
+ cold(args.notebook, args.output, args.delete)
+ print('Captured', args.output)
diff --git a/corpus/conflict-page/native-pages/scripts/cold.ps1 b/corpus/conflict-page/native-pages/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/conflict-page/native-pages/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/conflict-page/native-pages/scripts/collaborate.ps1 b/corpus/conflict-page/native-pages/scripts/collaborate.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..6a42a3d526db486f022b032583704b0f4aee26d3
--- /dev/null
+++ b/corpus/conflict-page/native-pages/scripts/collaborate.ps1
@@ -0,0 +1,145 @@
+param([Parameter(Mandatory=$true)][string]$Root,
+ [Parameter(Mandatory=$true)][string]$SharedPath,
+ [Parameter(Mandatory=$true)][string]$CloneHost,
+ [switch]$ResumeCache,
+ [int]$StartSequence = 1)
+function Keep-Container($page, $target) {
+ $container = $target
+ while ($container.ParentNode -ne $page.DocumentElement) { $container = $container.ParentNode }
+ foreach ($sibling in @($page.DocumentElement.ChildNodes)) {
+ if ($sibling -ne $container -and $sibling.LocalName -in @('Outline', 'Title', 'Image', 'InkDrawing')) {
+ [void]$page.DocumentElement.RemoveChild($sibling)
+ }
+ }
+}
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+. "$PSScriptRoot\text.ps1"
+if ($SharedPath -notmatch '^\\\\192\.168\.77\.1\\agent\\m6-[a-z0-9-]+$') { throw 'Choose a disposable Linux lab notebook.' }
+if ($env:COMPUTERNAME -ne $CloneHost) { throw 'The collaboration controller requires its owned clone.' }
+if (-not $ResumeCache) { & "$PSScriptRoot\cold-current.ps1" -Root $Root -CloneHost $CloneHost }
+$shared = $SharedPath
+if (-not (Test-Path "$shared\synthetic.one")) { throw 'Create the shared fixture first.' }
+New-Item -ItemType Directory "$Root\inbox", "$Root\outbox" -Force | Out-Null
+$user = 'HKCU:\Software\Microsoft\Office\Common\UserInfo'
+New-Item $user -Force | Out-Null
+New-ItemProperty $user -Name UserName -Value $CloneHost -PropertyType String -Force | Out-Null
+New-ItemProperty $user -Name UserInitials -Value $CloneHost.Substring($CloneHost.Length - 3) -PropertyType String -Force | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebook = ''
+try {
+ $app.OpenHierarchy($shared, '', [ref]$notebook, 0)
+ $section = ''
+ $app.OpenHierarchy('synthetic.one', $notebook, [ref]$section, 0)
+ [IO.File]::WriteAllText("$Root\ready", 'ready')
+ $deadline = [DateTime]::UtcNow.AddMinutes(30)
+ $sequence = $StartSequence
+ while ([DateTime]::UtcNow -lt $deadline) {
+ $name = '{0:d4}.json' -f $sequence
+ $input = "$Root\inbox\$name"
+ if (-not (Test-Path $input)) { Start-Sleep -Milliseconds 100; continue }
+ $command = Get-Content -Raw -Encoding UTF8 $input | ConvertFrom-Json
+ $output = "$Root\outbox\$sequence"
+ New-Item -ItemType Directory $output | Out-Null
+ try {
+ if ($command.action -in @('prepare-stress', 'stress')) {
+ . "$PSScriptRoot\stress.ps1"
+ Invoke-Stress $app $section $command $output $shared
+ }
+ elseif ($command.action -eq 'sync') { $app.SyncHierarchy($notebook) }
+ elseif ($command.action -in @('pages', 'move', 'delete-page')) {
+ $namespace = 'http://schemas.microsoft.com/office/onenote/2010/onenote'
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$tree = $hierarchy
+ $listed = @($tree.SelectNodes('//*[local-name()="Page"]'))
+ $named = { param($title) @($listed | Where-Object { $_.GetAttribute('name') -eq $title }) }
+ if ($command.action -eq 'pages') {
+ # New titled pages with one body paragraph each, appended in order.
+ foreach ($title in $command.titles) {
+ $page = ''
+ $app.CreateNewPage($section, [ref]$page, 2)
+ $body = [Security.SecurityElement]::Escape('Body ' + $title + '.')
+ $name = [Security.SecurityElement]::Escape($title)
+ $xml = '' + $name + '' + $body + ''
+ $app.UpdatePageContent($xml, [DateTime]::MinValue, 1, $false)
+ }
+ } elseif ($command.action -eq 'move') {
+ # Moves the page titled `page` before the one titled `before`, or last.
+ $moved = @(& $named $command.page)
+ if ($moved.Count -ne 1) { throw 'Expected one page to move.' }
+ $order = [Collections.ArrayList]@($listed | Where-Object { $_ -ne $moved[0] })
+ $at = $order.Count
+ if ($command.before) {
+ $anchor = @(& $named $command.before)
+ if ($anchor.Count -ne 1) { throw 'Expected one anchor page.' }
+ $at = $order.IndexOf($anchor[0])
+ }
+ $order.Insert($at, $moved[0])
+ $xml = ''
+ foreach ($node in $order) {
+ $xml += ''
+ }
+ $app.UpdateHierarchy($xml + '', 1)
+ } else {
+ $doomed = @(& $named $command.page)
+ if ($doomed.Count -ne 1) { throw 'Expected one page to delete.' }
+ $app.DeleteHierarchy($doomed[0].GetAttribute('ID'), [DateTime]::MinValue, $false)
+ }
+ }
+ elseif ($command.action -eq 'kill-process') {
+ Get-Process ONENOTE | Stop-Process -Force
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ $app = New-Object -ComObject OneNote.Application
+ $app.OpenHierarchy($shared, '', [ref]$notebook, 0)
+ $app.OpenHierarchy('synthetic.one', $notebook, [ref]$section, 0)
+ }
+ elseif ($command.action -eq 'edit' -or $command.action -eq 'snapshot') {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText("$output\hierarchy.xml", $hierarchy, [Text.Encoding]::UTF8)
+ [xml]$tree = $hierarchy
+ $matches = 0
+ $editedPage = $null
+ $i = 0
+ foreach ($node in $tree.SelectNodes('//*[local-name()="Page"]')) {
+ $content = ''
+ $app.GetPageContent($node.GetAttribute('ID'), [ref]$content, 1, 1)
+ [IO.File]::WriteAllText("$output\page-$i.xml", $content, [Text.Encoding]::UTF8)
+ [xml]$page = $content
+ if ($command.action -eq 'edit') {
+ $targets = @($page.SelectNodes('//*[local-name()="T"]') | Where-Object {
+ (Get-ParagraphText $_.InnerText) -eq $command.expected
+ })
+ if ($targets.Count -gt 1) { throw 'Expected one matching text object.' }
+ if ($targets.Count -eq 1) {
+ $matches++
+ if ($matches -gt 1) { throw 'The text occurs on multiple pages.' }
+ $targets[0].InnerText = [Security.SecurityElement]::Escape($command.text)
+ Keep-Container $page $targets[0]
+ $editedPage = $page
+ }
+ }
+ $i++
+ }
+ if ($command.action -eq 'edit' -and $matches -ne 1) { throw 'Expected one matching text object.' }
+ if ($editedPage) { $app.UpdatePageContent($editedPage.OuterXml, [DateTime]::MinValue, 1, $false) }
+ } elseif ($command.action -ne 'close') { throw 'Unknown collaboration command.' }
+ [IO.File]::WriteAllText("$output\done", 'ok')
+ } catch {
+ [IO.File]::WriteAllText("$output\error", $_.Exception.ToString())
+ }
+ if ($command.action -eq 'close') { break }
+ $sequence++
+ }
+} finally {
+ try { if ($notebook) { $app.CloseNotebook($notebook, $false) } }
+ finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ [IO.File]::WriteAllText("$Root\closed", 'closed')
+ }
+}
diff --git a/corpus/conflict-page/native-pages/scripts/network.ps1 b/corpus/conflict-page/native-pages/scripts/network.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..95fa83d5243ee6a2a653cc075128b063e2f09cf2
--- /dev/null
+++ b/corpus/conflict-page/native-pages/scripts/network.ps1
@@ -0,0 +1,20 @@
+param([Parameter(Mandatory=$true)][string]$LabMac)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$adapter = @(Get-WmiObject Win32_NetworkAdapterConfiguration | Where-Object { $_.MACAddress -eq $LabMac })
+if ($adapter.Count -ne 1) { throw 'The clone lab adapter is ambiguous.' }
+$enabled = $adapter[0].EnableDHCP()
+if ($enabled.ReturnValue -notin @(0, 1)) {
+ throw ('Unable to enable DHCP on the clone lab adapter; result ' + $enabled.ReturnValue)
+}
+$release = $adapter[0].ReleaseDHCPLease()
+$result = $adapter[0].RenewDHCPLease()
+$deadline = [DateTime]::UtcNow.AddSeconds(60)
+do {
+ $adapter = @(Get-WmiObject Win32_NetworkAdapterConfiguration | Where-Object { $_.MACAddress -eq $LabMac })
+ $addresses = @($adapter[0].IPAddress | Where-Object { $_ -match '^192\.168\.77\.\d+$' -and $_ -ne '192.168.77.1' })
+ if ($addresses.Count -eq 1) { break }
+ Start-Sleep -Milliseconds 250
+} while ([DateTime]::UtcNow -lt $deadline)
+if ($addresses.Count -ne 1) { throw ('The clone did not receive a lab IPv4 address; renewal result ' + $result.ReturnValue + '; adapter ' + ($adapter[0] | Select-Object MACAddress,DHCPEnabled,IPEnabled,IPAddress | ConvertTo-Json -Compress)) }
+@{mac=$LabMac;address=$addresses[0];releaseResult=$release.ReturnValue;renewalResult=$result.ReturnValue} | ConvertTo-Json -Compress
diff --git a/corpus/conflict-page/native-pages/scripts/stress.ps1 b/corpus/conflict-page/native-pages/scripts/stress.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0ab5bc69b4dabe970373e481873dfd951a1a69a
--- /dev/null
+++ b/corpus/conflict-page/native-pages/scripts/stress.ps1
@@ -0,0 +1,83 @@
+function Invoke-Stress($app, $section, $command, $output, $shared) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText("$output\hierarchy.xml", $hierarchy, [Text.Encoding]::UTF8)
+ [xml]$tree = $hierarchy
+ $pages = @($tree.SelectNodes('//*[local-name()="Page"]'))
+ if ($pages.Count -ne 1) { throw 'Expected one stress-test page.' }
+ $pageId = $pages[0].GetAttribute('ID')
+ if ($command.action -eq 'prepare-stress') {
+ for ($i = 0; $i -lt $command.clients; $i++) {
+ $xml = ''
+ $app.UpdatePageContent($xml, [DateTime]::MinValue, 1, $false)
+ }
+ return
+ }
+ $random = New-Object Random([int]$command.seed)
+ $events = New-Object IO.StreamWriter("$output\events.jsonl", $false, [Text.Encoding]::UTF8)
+ $events.AutoFlush = $true
+ try {
+ [IO.File]::WriteAllText("$output\ready", 'ready')
+ $deadline = [DateTime]::UtcNow.AddMinutes(10)
+ while (-not (Test-Path "$shared\stress-start")) {
+ if ([DateTime]::UtcNow -gt $deadline) { throw 'Stress start timed out.' }
+ Start-Sleep -Milliseconds 20
+ }
+ for ($i = 0; $i -lt $command.operations; $i++) {
+ if (($command.PSObject.Properties.Name -contains 'maintenance') -and $command.maintenance -and $i -eq [Math]::Floor($command.operations / 2)) {
+ [IO.File]::WriteAllText("$shared\maintenance-paused-n$($command.actor)", 'paused')
+ while (-not (Test-Path "$shared\maintenance-resume")) {
+ if ([DateTime]::UtcNow -gt $deadline) { throw 'Maintenance pause timed out.' }
+ Start-Sleep -Milliseconds 100
+ }
+ }
+ Start-Sleep -Milliseconds $random.Next(10, 100)
+ $started = [DateTime]::UtcNow.Ticks
+ $content = ''
+ $app.GetPageContent($pageId, [ref]$content, 1, 1)
+ [xml]$page = $content
+ $matches = @($page.SelectNodes('//*[local-name()="T"]') | Where-Object {
+ (Get-ParagraphText $_.InnerText).StartsWith($command.prefix)
+ })
+ if ($matches.Count -ne 1) { throw 'Expected one stress-test paragraph.' }
+ $before = Get-ParagraphText $matches[0].InnerText
+ $token = ' [n' + $command.actor + ':' + $i + ']'
+ $start = $end = $before.Length
+ $replacement = $token
+ $bold = $italic = $false
+ if ($command.edit) {
+ $boundaries = New-Object 'Collections.Generic.List[int]'
+ for ($at = $command.prefix.Length; $at -le $before.Length; $at++) {
+ $boundaries.Add($at)
+ if ($at -lt $before.Length -and [char]::IsHighSurrogate($before[$at])) { $at++ }
+ }
+ $first = $boundaries[$random.Next($boundaries.Count)]
+ $second = $boundaries[$random.Next($boundaries.Count)]
+ $start = [Math]::Min($first, $second)
+ $end = [Math]::Max($first, $second)
+ $replacement = ' caf' + [char]0xe9 + ' ' + [char]::ConvertFromUtf32(0x1f980) + $token
+ $bold = $random.Next(2) -eq 1
+ $italic = $random.Next(2) -eq 1
+ }
+ $after = $before.Substring(0, $start) + $replacement + $before.Substring($end)
+ $html = [Security.SecurityElement]::Escape($after)
+ if ($command.edit) {
+ $weight = if ($bold) { 'bold' } else { 'normal' }
+ $style = if ($italic) { 'italic' } else { 'normal' }
+ $html = '' + $html + ''
+ }
+ $matches[0].InnerText = $html
+ Keep-Container $page $matches[0]
+ $updateStarted = [DateTime]::UtcNow.Ticks
+ $app.UpdatePageContent($page.OuterXml, [DateTime]::MinValue, 1, $false)
+ $updated = [DateTime]::UtcNow.Ticks
+ $events.WriteLine((@{ operation=$i; before=$before; token=$token; started_ticks=$started;
+ range=@($start, $end); replacement=$replacement; bold=$bold; italic=$italic;
+ update_started_ticks=$updateStarted; updated_ticks=$updated } | ConvertTo-Json -Compress))
+ if ($i -eq 0) { [IO.File]::WriteAllText("$output\editing", 'editing') }
+ if ($command.sync_every -gt 0 -and (($i + 1) % $command.sync_every) -eq 0) {
+ $app.SyncHierarchy($section)
+ }
+ }
+ } finally { $events.Dispose() }
+}
diff --git a/corpus/conflict-page/native-pages/scripts/text.ps1 b/corpus/conflict-page/native-pages/scripts/text.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..75e9e71207b599d16eaaf68824ca30831860610a
--- /dev/null
+++ b/corpus/conflict-page/native-pages/scripts/text.ps1
@@ -0,0 +1,13 @@
+function Get-ParagraphText([string]$html) {
+ $plain = [regex]::Replace($html, '<[^>]*>', '')
+ $plain = [regex]::Replace($plain, '&#(?:x([0-9a-fA-F]+)|([0-9]+));', {
+ param($match)
+ $value = if ($match.Groups[1].Success) {
+ [Convert]::ToInt32($match.Groups[1].Value, 16)
+ } else { [int]$match.Groups[2].Value }
+ # The Win7 framework leaves supplementary numeric entities undecoded.
+ if ($value -gt 0xffff -and $value -le 0x10ffff) { [char]::ConvertFromUtf32($value) }
+ else { $match.Value }
+ })
+ [Net.WebUtility]::HtmlDecode($plain)
+}
diff --git a/corpus/conflict-page/native-pages/server.jsonl b/corpus/conflict-page/native-pages/server.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..d5df993564a30ddaea1b427699648ff9b1a1417d
--- /dev/null
+++ b/corpus/conflict-page/native-pages/server.jsonl
@@ -0,0 +1,2 @@
+{"command": "mkdir /srv/agent/m6-conflict", "exit": 0, "stdout": "", "stderr": ""}
+{"command": "chmod u+w /srv/agent/m6-conflict/*", "exit": 0, "stdout": "", "stderr": ""}
diff --git a/corpus/conflict-page/native-restore/a/a-merged.json b/corpus/conflict-page/native-restore/a/a-merged.json
new file mode 100644
index 0000000000000000000000000000000000000000..2f394e7eaf1defcfe3e06e321b5af76be4f84054
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/a-merged.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Fictitious: caf\u00e9, \u6771\u4eac, \u0645\u0631\u062d\u0628\u0627 - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/a-merged.png b/corpus/conflict-page/native-restore/a/a-merged.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1de0c6ef0b01ae79888f9cbead1ac135d60d788
Binary files /dev/null and b/corpus/conflict-page/native-restore/a/a-merged.png differ
diff --git a/corpus/conflict-page/native-restore/a/command-0001.json b/corpus/conflict-page/native-restore/a/command-0001.json
new file mode 100644
index 0000000000000000000000000000000000000000..e473ce8f2c61fdf632e44de1f4a834d605faaece
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0001.json
@@ -0,0 +1 @@
+{"action": "pages", "titles": ["One", "Two", "Target", "Three", "Four"]}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0002.json b/corpus/conflict-page/native-restore/a/command-0002.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0002.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0003.json b/corpus/conflict-page/native-restore/a/command-0003.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0003.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0004.json b/corpus/conflict-page/native-restore/a/command-0004.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0004.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0005.json b/corpus/conflict-page/native-restore/a/command-0005.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0005.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0006.json b/corpus/conflict-page/native-restore/a/command-0006.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0006.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0007.json b/corpus/conflict-page/native-restore/a/command-0007.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0007.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0008.json b/corpus/conflict-page/native-restore/a/command-0008.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0008.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0009.json b/corpus/conflict-page/native-restore/a/command-0009.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0009.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0010.json b/corpus/conflict-page/native-restore/a/command-0010.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0010.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0011.json b/corpus/conflict-page/native-restore/a/command-0011.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0011.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0012.json b/corpus/conflict-page/native-restore/a/command-0012.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0012.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0013.json b/corpus/conflict-page/native-restore/a/command-0013.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0013.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0014.json b/corpus/conflict-page/native-restore/a/command-0014.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0014.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0015.json b/corpus/conflict-page/native-restore/a/command-0015.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0015.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0016.json b/corpus/conflict-page/native-restore/a/command-0016.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0016.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0017.json b/corpus/conflict-page/native-restore/a/command-0017.json
new file mode 100644
index 0000000000000000000000000000000000000000..3f6f2524a6523bec79f8152f3340d2ae649729a0
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0017.json
@@ -0,0 +1 @@
+{"action": "edit", "expected": "Body Target.", "text": "Body Target edited offline."}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0018.json b/corpus/conflict-page/native-restore/a/command-0018.json
new file mode 100644
index 0000000000000000000000000000000000000000..8bd5839cfa379b0117fb5154acd9d20bc06b5cda
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0018.json
@@ -0,0 +1 @@
+{"action": "move", "page": "Four", "before": "One"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0019.json b/corpus/conflict-page/native-restore/a/command-0019.json
new file mode 100644
index 0000000000000000000000000000000000000000..554ff0ef8a35478d74f3e5388f75789140b158b8
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0019.json
@@ -0,0 +1 @@
+{"action": "snapshot"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0020.json b/corpus/conflict-page/native-restore/a/command-0020.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0020.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0021.json b/corpus/conflict-page/native-restore/a/command-0021.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0021.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0022.json b/corpus/conflict-page/native-restore/a/command-0022.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0022.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0023.json b/corpus/conflict-page/native-restore/a/command-0023.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0023.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0024.json b/corpus/conflict-page/native-restore/a/command-0024.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0024.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0025.json b/corpus/conflict-page/native-restore/a/command-0025.json
new file mode 100644
index 0000000000000000000000000000000000000000..554ff0ef8a35478d74f3e5388f75789140b158b8
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0025.json
@@ -0,0 +1 @@
+{"action": "snapshot"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/command-0026.json b/corpus/conflict-page/native-restore/a/command-0026.json
new file mode 100644
index 0000000000000000000000000000000000000000..7adf980027ef43cc77767d4fd1b1d67ad1541ab4
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/command-0026.json
@@ -0,0 +1 @@
+{"action": "close"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/commands.jsonl b/corpus/conflict-page/native-restore/a/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..636ed5f31cb52c0cd0e9552fa99ebf892dc44dd1
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/commands.jsonl
@@ -0,0 +1,28 @@
+{"command": "mkdir C:\\one-tests\\runs\\capture", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -ExecutionPolicy Bypass -File C:\\one-tests\\network.ps1 -LabMac 52:54:02:b6:9a:97", "exit": 0, "stdout": "{\"renewalResult\":0,\"releaseResult\":0,\"mac\":\"52:54:02:b6:9a:97\",\"address\":\"192.168.77.119\"}\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0001.tmp C:\\one-tests\\runs\\capture\\inbox\\0001.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0002.tmp C:\\one-tests\\runs\\capture\\inbox\\0002.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0003.tmp C:\\one-tests\\runs\\capture\\inbox\\0003.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0004.tmp C:\\one-tests\\runs\\capture\\inbox\\0004.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0005.tmp C:\\one-tests\\runs\\capture\\inbox\\0005.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0006.tmp C:\\one-tests\\runs\\capture\\inbox\\0006.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0007.tmp C:\\one-tests\\runs\\capture\\inbox\\0007.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0008.tmp C:\\one-tests\\runs\\capture\\inbox\\0008.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0009.tmp C:\\one-tests\\runs\\capture\\inbox\\0009.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0010.tmp C:\\one-tests\\runs\\capture\\inbox\\0010.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0011.tmp C:\\one-tests\\runs\\capture\\inbox\\0011.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0012.tmp C:\\one-tests\\runs\\capture\\inbox\\0012.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0013.tmp C:\\one-tests\\runs\\capture\\inbox\\0013.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0014.tmp C:\\one-tests\\runs\\capture\\inbox\\0014.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0015.tmp C:\\one-tests\\runs\\capture\\inbox\\0015.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0016.tmp C:\\one-tests\\runs\\capture\\inbox\\0016.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0017.tmp C:\\one-tests\\runs\\capture\\inbox\\0017.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0018.tmp C:\\one-tests\\runs\\capture\\inbox\\0018.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0019.tmp C:\\one-tests\\runs\\capture\\inbox\\0019.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0020.tmp C:\\one-tests\\runs\\capture\\inbox\\0020.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0021.tmp C:\\one-tests\\runs\\capture\\inbox\\0021.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0022.tmp C:\\one-tests\\runs\\capture\\inbox\\0022.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0023.tmp C:\\one-tests\\runs\\capture\\inbox\\0023.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0024.tmp C:\\one-tests\\runs\\capture\\inbox\\0024.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0025.tmp C:\\one-tests\\runs\\capture\\inbox\\0025.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0026.tmp C:\\one-tests\\runs\\capture\\inbox\\0026.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
diff --git a/corpus/conflict-page/native-restore/a/hierarchy-0019.xml b/corpus/conflict-page/native-restore/a/hierarchy-0019.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d33204b027aaa0d60fe105c9a70d960b28be1bb
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/hierarchy-0019.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-restore/a/hierarchy-0025.xml b/corpus/conflict-page/native-restore/a/hierarchy-0025.xml
new file mode 100644
index 0000000000000000000000000000000000000000..11e06fe95607fb8908a394804a20cbb4d93601b0
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/hierarchy-0025.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-restore/a/listed.json b/corpus/conflict-page/native-restore/a/listed.json
new file mode 100644
index 0000000000000000000000000000000000000000..559836710a7579ea1e2c4dd98dff086a1d6bf2b3
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/listed.json
@@ -0,0 +1 @@
+["Fictitious: café, 東京, مرحبا", "Four", "One", "Two", "Target", "Three"]
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/a/machine.json b/corpus/conflict-page/native-restore/a/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..084bcf445566e4a984e4a5465bf8a0ceabf53384
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/machine.json
@@ -0,0 +1 @@
+{"name": "m6-d281b38e", "hostname": "ONE-M6-D281B38E"}
diff --git a/corpus/conflict-page/native-restore/a/teardown.json b/corpus/conflict-page/native-restore/a/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/conflict-page/native-restore/a/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/conflict-page/native-restore/b-published/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one b/corpus/conflict-page/native-restore/b-published/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one
new file mode 100644
index 0000000000000000000000000000000000000000..753afa4aa521f599083936966e3e96226937d4e6
Binary files /dev/null and b/corpus/conflict-page/native-restore/b-published/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one differ
diff --git a/corpus/conflict-page/native-restore/b-published/notebook/OneNote_RecycleBin/Open Notebook.onetoc2 b/corpus/conflict-page/native-restore/b-published/notebook/OneNote_RecycleBin/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..810bfcc34d55bf600d42219614d17db63df60ef9
Binary files /dev/null and b/corpus/conflict-page/native-restore/b-published/notebook/OneNote_RecycleBin/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native-restore/b-published/notebook/Open Notebook.onetoc2 b/corpus/conflict-page/native-restore/b-published/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..b49e1ce4cfca70df24a2af81ac03d97caca48955
Binary files /dev/null and b/corpus/conflict-page/native-restore/b-published/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native-restore/b-published/notebook/synthetic.one b/corpus/conflict-page/native-restore/b-published/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..7f97f031472ec657a2563be65149f4de16f5466e
Binary files /dev/null and b/corpus/conflict-page/native-restore/b-published/notebook/synthetic.one differ
diff --git a/corpus/conflict-page/native-restore/b/b-merged.json b/corpus/conflict-page/native-restore/b/b-merged.json
new file mode 100644
index 0000000000000000000000000000000000000000..2f394e7eaf1defcfe3e06e321b5af76be4f84054
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/b-merged.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Fictitious: caf\u00e9, \u6771\u4eac, \u0645\u0631\u062d\u0628\u0627 - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/b-merged.png b/corpus/conflict-page/native-restore/b/b-merged.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2c8f6396508393f4488c326a9d2d6959a14abae
Binary files /dev/null and b/corpus/conflict-page/native-restore/b/b-merged.png differ
diff --git a/corpus/conflict-page/native-restore/b/command-0001.json b/corpus/conflict-page/native-restore/b/command-0001.json
new file mode 100644
index 0000000000000000000000000000000000000000..554ff0ef8a35478d74f3e5388f75789140b158b8
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0001.json
@@ -0,0 +1 @@
+{"action": "snapshot"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/command-0002.json b/corpus/conflict-page/native-restore/b/command-0002.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0002.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/command-0003.json b/corpus/conflict-page/native-restore/b/command-0003.json
new file mode 100644
index 0000000000000000000000000000000000000000..554ff0ef8a35478d74f3e5388f75789140b158b8
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0003.json
@@ -0,0 +1 @@
+{"action": "snapshot"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/command-0004.json b/corpus/conflict-page/native-restore/b/command-0004.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0004.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/command-0005.json b/corpus/conflict-page/native-restore/b/command-0005.json
new file mode 100644
index 0000000000000000000000000000000000000000..554ff0ef8a35478d74f3e5388f75789140b158b8
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0005.json
@@ -0,0 +1 @@
+{"action": "snapshot"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/command-0006.json b/corpus/conflict-page/native-restore/b/command-0006.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0006.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/command-0007.json b/corpus/conflict-page/native-restore/b/command-0007.json
new file mode 100644
index 0000000000000000000000000000000000000000..554ff0ef8a35478d74f3e5388f75789140b158b8
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0007.json
@@ -0,0 +1 @@
+{"action": "snapshot"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/command-0008.json b/corpus/conflict-page/native-restore/b/command-0008.json
new file mode 100644
index 0000000000000000000000000000000000000000..eff482c021828f4924fb0845aa6043a8312745ea
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0008.json
@@ -0,0 +1 @@
+{"action": "delete-page", "page": "Target"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/command-0009.json b/corpus/conflict-page/native-restore/b/command-0009.json
new file mode 100644
index 0000000000000000000000000000000000000000..554ff0ef8a35478d74f3e5388f75789140b158b8
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0009.json
@@ -0,0 +1 @@
+{"action": "snapshot"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/command-0010.json b/corpus/conflict-page/native-restore/b/command-0010.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0010.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/command-0011.json b/corpus/conflict-page/native-restore/b/command-0011.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0011.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/command-0012.json b/corpus/conflict-page/native-restore/b/command-0012.json
new file mode 100644
index 0000000000000000000000000000000000000000..2272087176d433cd1d42b77fb18efd145b9bbbf5
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0012.json
@@ -0,0 +1 @@
+{"action": "sync"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/command-0013.json b/corpus/conflict-page/native-restore/b/command-0013.json
new file mode 100644
index 0000000000000000000000000000000000000000..554ff0ef8a35478d74f3e5388f75789140b158b8
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0013.json
@@ -0,0 +1 @@
+{"action": "snapshot"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/command-0014.json b/corpus/conflict-page/native-restore/b/command-0014.json
new file mode 100644
index 0000000000000000000000000000000000000000..7adf980027ef43cc77767d4fd1b1d67ad1541ab4
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/command-0014.json
@@ -0,0 +1 @@
+{"action": "close"}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/commands.jsonl b/corpus/conflict-page/native-restore/b/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..2335dad6840245c83e266c7e5d6601001755f2d0
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/commands.jsonl
@@ -0,0 +1,16 @@
+{"command": "mkdir C:\\one-tests\\runs\\capture", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -ExecutionPolicy Bypass -File C:\\one-tests\\network.ps1 -LabMac 52:54:02:7b:1a:4d", "exit": 0, "stdout": "{\"renewalResult\":0,\"releaseResult\":0,\"mac\":\"52:54:02:7b:1a:4d\",\"address\":\"192.168.77.40\"}\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0001.tmp C:\\one-tests\\runs\\capture\\inbox\\0001.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0002.tmp C:\\one-tests\\runs\\capture\\inbox\\0002.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0003.tmp C:\\one-tests\\runs\\capture\\inbox\\0003.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0004.tmp C:\\one-tests\\runs\\capture\\inbox\\0004.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0005.tmp C:\\one-tests\\runs\\capture\\inbox\\0005.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0006.tmp C:\\one-tests\\runs\\capture\\inbox\\0006.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0007.tmp C:\\one-tests\\runs\\capture\\inbox\\0007.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0008.tmp C:\\one-tests\\runs\\capture\\inbox\\0008.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0009.tmp C:\\one-tests\\runs\\capture\\inbox\\0009.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0010.tmp C:\\one-tests\\runs\\capture\\inbox\\0010.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0011.tmp C:\\one-tests\\runs\\capture\\inbox\\0011.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0012.tmp C:\\one-tests\\runs\\capture\\inbox\\0012.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0013.tmp C:\\one-tests\\runs\\capture\\inbox\\0013.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0014.tmp C:\\one-tests\\runs\\capture\\inbox\\0014.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
diff --git a/corpus/conflict-page/native-restore/b/hierarchy-0001.xml b/corpus/conflict-page/native-restore/b/hierarchy-0001.xml
new file mode 100644
index 0000000000000000000000000000000000000000..831d1d427c0ef26e4d79ed1c8f185ea22c942068
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/hierarchy-0001.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-restore/b/hierarchy-0003.xml b/corpus/conflict-page/native-restore/b/hierarchy-0003.xml
new file mode 100644
index 0000000000000000000000000000000000000000..18798800a4f9f74d5296ac80adbf8348f81d6f43
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/hierarchy-0003.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-restore/b/hierarchy-0005.xml b/corpus/conflict-page/native-restore/b/hierarchy-0005.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5c16c8efeebe230903ed784409d50d7c039c87fd
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/hierarchy-0005.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-restore/b/hierarchy-0007.xml b/corpus/conflict-page/native-restore/b/hierarchy-0007.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2a44e1e49093e9f699bfa6eaa4821e4d3c1de3f8
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/hierarchy-0007.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-restore/b/hierarchy-0009.xml b/corpus/conflict-page/native-restore/b/hierarchy-0009.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e5aeaf4af2852eaea5d8f51cd321eb61baf23cfb
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/hierarchy-0009.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-restore/b/hierarchy-0013.xml b/corpus/conflict-page/native-restore/b/hierarchy-0013.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dd73cb16e07cd7840fbd0e3ed63ad9d52459e1e1
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/hierarchy-0013.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/conflict-page/native-restore/b/listed.json b/corpus/conflict-page/native-restore/b/listed.json
new file mode 100644
index 0000000000000000000000000000000000000000..559836710a7579ea1e2c4dd98dff086a1d6bf2b3
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/listed.json
@@ -0,0 +1 @@
+["Fictitious: café, 東京, مرحبا", "Four", "One", "Two", "Target", "Three"]
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/b/machine.json b/corpus/conflict-page/native-restore/b/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..54a3c6b9ac2277847928cb46fb3d062726a4070a
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/machine.json
@@ -0,0 +1 @@
+{"name": "m6-a205cc61", "hostname": "ONE-M6-A205CC61"}
diff --git a/corpus/conflict-page/native-restore/b/teardown.json b/corpus/conflict-page/native-restore/b/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/conflict-page/native-restore/b/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/conflict-page/native-restore/clients.json b/corpus/conflict-page/native-restore/clients.json
new file mode 100644
index 0000000000000000000000000000000000000000..0c922a99bf3f3f13b0eb03af843301a714be0c4c
--- /dev/null
+++ b/corpus/conflict-page/native-restore/clients.json
@@ -0,0 +1,4 @@
+{
+ "a": "m6-d281b38e",
+ "b": "m6-a205cc61"
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/initial/notebook/Open Notebook.onetoc2 b/corpus/conflict-page/native-restore/initial/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..c7beb44bf509f935090fe55e7549e4b50e0ae0e9
Binary files /dev/null and b/corpus/conflict-page/native-restore/initial/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native-restore/initial/notebook/synthetic.one b/corpus/conflict-page/native-restore/initial/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..058b8cd4a335818630c0305bf44d2ba394abd270
Binary files /dev/null and b/corpus/conflict-page/native-restore/initial/notebook/synthetic.one differ
diff --git a/corpus/conflict-page/native-restore/linux-teardown.json b/corpus/conflict-page/native-restore/linux-teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/conflict-page/native-restore/linux-teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/conflict-page/native-restore/linux.json b/corpus/conflict-page/native-restore/linux.json
new file mode 100644
index 0000000000000000000000000000000000000000..51be344e66ab7a2c56327e2ce949f3785fedee54
--- /dev/null
+++ b/corpus/conflict-page/native-restore/linux.json
@@ -0,0 +1,11 @@
+{
+ "cpus": 2,
+ "disk_gb": 16,
+ "hostname": "one-conflict3",
+ "lab_address": "192.168.77.1",
+ "lab_mac": "52:54:04:08:6d:03",
+ "memory_mb": 2048,
+ "samba_port": 14450,
+ "ssh_port": 22000,
+ "wan_mac": "52:54:03:bb:9c:87"
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/merged.json b/corpus/conflict-page/native-restore/merged.json
new file mode 100644
index 0000000000000000000000000000000000000000..889578b037833da0bb993bcb332e6377ca5fbb09
--- /dev/null
+++ b/corpus/conflict-page/native-restore/merged.json
@@ -0,0 +1,49 @@
+{
+ "order": [
+ "",
+ "Four",
+ "One",
+ "Two",
+ "Target",
+ "Three"
+ ],
+ "pages": [
+ [
+ "",
+ "Fictitious positioned outline.",
+ "Fictitious: café, 東京, مرحبا",
+ "Left cell",
+ "Right cell"
+ ],
+ [
+ "2:55 AM",
+ "Body Four.",
+ "Four",
+ "Sunday, September 27, 2026"
+ ],
+ [
+ "2:55 AM",
+ "Body One.",
+ "One",
+ "Sunday, September 27, 2026"
+ ],
+ [
+ "2:55 AM",
+ "Body Two.",
+ "Sunday, September 27, 2026",
+ "Two"
+ ],
+ [
+ "2:55 AM",
+ "Body Target edited offline.",
+ "Sunday, September 27, 2026",
+ "Target"
+ ],
+ [
+ "2:55 AM",
+ "Body Three.",
+ "Sunday, September 27, 2026",
+ "Three"
+ ]
+ ]
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native-restore/merged/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one b/corpus/conflict-page/native-restore/merged/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one
new file mode 100644
index 0000000000000000000000000000000000000000..d58aedc6e4ba0cee7324ec43ffa4997e89ac864a
Binary files /dev/null and b/corpus/conflict-page/native-restore/merged/notebook/OneNote_RecycleBin/OneNote_DeletedPages.one differ
diff --git a/corpus/conflict-page/native-restore/merged/notebook/OneNote_RecycleBin/Open Notebook.onetoc2 b/corpus/conflict-page/native-restore/merged/notebook/OneNote_RecycleBin/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..810bfcc34d55bf600d42219614d17db63df60ef9
Binary files /dev/null and b/corpus/conflict-page/native-restore/merged/notebook/OneNote_RecycleBin/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native-restore/merged/notebook/Open Notebook.onetoc2 b/corpus/conflict-page/native-restore/merged/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..b49e1ce4cfca70df24a2af81ac03d97caca48955
Binary files /dev/null and b/corpus/conflict-page/native-restore/merged/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native-restore/merged/notebook/synthetic.one b/corpus/conflict-page/native-restore/merged/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..82effac1ffff4519beccb2392a513f3985fa7916
Binary files /dev/null and b/corpus/conflict-page/native-restore/merged/notebook/synthetic.one differ
diff --git a/corpus/conflict-page/native-restore/native_conflict.py b/corpus/conflict-page/native-restore/native_conflict.py
new file mode 100644
index 0000000000000000000000000000000000000000..ccb4026acf69f3df84fdfbb01e9b6e39461762d3
--- /dev/null
+++ b/corpus/conflict-page/native-restore/native_conflict.py
@@ -0,0 +1,362 @@
+#!/usr/bin/env python3
+"""OneNote 2010 conflict pages: how they arise, what they store and how OneNote shows them.
+
+`sync LINUX OUTPUT` runs two disposable OneNote clients on one Samba notebook: client A edits
+two paragraphs offline while client B edits one of them and a table cell online; A then
+reconnects, which makes OneNote write a conflict page. The server file is kept before and
+after, A and B are screenshotted with the information bar, the page list shown, the conflict
+page open and its menu open, and A then deletes the conflict page through that menu.
+
+`pages LINUX OUTPUT` runs the same two clients on page-list changes: client A, offline, moves
+a page that client B also moves, moves another page, and edits a page B deletes; A then
+reconnects. The server's page order and pages, with the recycle bin, are kept at each step.
+
+`restore LINUX OUTPUT` runs them on a page in the middle of the list: client A, offline, edits
+it and moves a page B leaves alone while B deletes it; A then reconnects.
+
+`cold NOTEBOOK OUTPUT [--delete]` cold-opens a notebook holding a conflict page in a fresh
+clone and screenshots the same views; `--delete` deletes the conflict page through the menu
+and captures the notebook OneNote leaves.
+"""
+import argparse
+from contextlib import ExitStack
+from concurrent.futures import ThreadPoolExecutor
+import base64
+import json
+from pathlib import Path
+import shutil
+import subprocess
+import sys
+import time
+import xml.etree.ElementTree as ET
+
+sys.path.insert(0, str(Path(__file__).resolve().parent))
+sys.path.insert(0, str(Path(__file__).resolve().parent / 'w7'))
+import native_runner as runner
+from native_runner import ROOT, clone, command, windows, vm
+import linux_vm
+
+FIXTURE = ROOT / 'corpus/native-ink/cold-ui-ink/notebook'
+SHARE = 'm6-conflict'
+ORIGINAL = 'Fictitious: café, 東京, مرحبا'
+OTHER_OUTLINE = 'Fictitious positioned outline.'
+CELL = 'Left cell'
+
+# Coordinates on OneNote 2010 maximized at 800x600, from the stage-5, m8 and sync-01 captures:
+# the information bar's text, and the first conflict page listed under its page.
+BAR = (332, 100)
+FIRST_CONFLICT = (725, 142)
+# Delete Conflict Page, first in the menu the bar opens on a conflict page.
+DELETE = (420, 113)
+
+
+def shot(name, output, label, script):
+ """Runs an AutoHotkey step on the clone, keeping its screenshot as `label.png`."""
+ (output / f'{label}.ahk').write_text(script)
+ result = windows.do_exec(script, target=name, timeout_ms=120000, shot_delay_ms=1500)
+ screenshot = result.pop('png_b64', None)
+ if screenshot:
+ (output / f'{label}.png').write_bytes(base64.b64decode(screenshot))
+ (output / f'{label}.json').write_text(json.dumps(result, indent=2))
+ if result.get('error') or result.get('exit') != 0:
+ raise RuntimeError(f'{label}: {result}')
+ return result
+
+
+def click(x, y):
+ return ('WinActivate("ahk_exe ONENOTE.EXE")\nCoordMode("Mouse", "Screen")\n'
+ f'Click({x}, {y})\nSleep(1200)\n')
+
+
+# Reports any dialog OneNote raised, so a confirmation shows in the step's record.
+DIALOG = ('if WinExist("ahk_class #32770 ahk_exe ONENOTE.EXE") {\n'
+ ' FileAppend("dialog: " WinGetTitle() " | " WinGetText() "`n", "*", "UTF-8")\n'
+ '}\n')
+
+
+def conflict_views(name, output, page, prefix, delete=False):
+ """Screenshots a page with a conflict page: the bar, the list shown, the conflict page and
+ its menu; `delete` then chooses Delete Conflict Page."""
+ shot(name, output, f'{prefix}-main', runner.navigation_script(page) + 'Sleep(2000)\n')
+ shot(name, output, f'{prefix}-shown', click(*BAR))
+ shot(name, output, f'{prefix}-conflict', click(*FIRST_CONFLICT))
+ shot(name, output, f'{prefix}-menu', click(*BAR))
+ if delete:
+ shot(name, output, f'{prefix}-delete', click(*DELETE) + DIALOG)
+ else:
+ shot(name, output, f'{prefix}-closed', 'WinActivate("ahk_exe ONENOTE.EXE")\nSend("{Esc}")\nSleep(800)\n')
+
+
+def cold(notebook, output, delete):
+ def interaction(name, output):
+ page = ET.parse(sorted((output / 'read').glob('page-*.xml'))[0]).getroot().attrib['ID']
+ conflict_views(name, output, page, 'cold', delete)
+ if delete:
+ # OneNote writes the deletion in the background; give it time before the re-read.
+ time.sleep(20)
+ runner.capture(notebook, output, collect_notebook=True, interaction=interaction)
+
+
+class Lab:
+ """Two OneNote clients on one Samba notebook: `action` runs a controller command,
+ `state` copies the share and exports its section, `settle` syncs until a check holds."""
+
+
+def page_list(model):
+ """The section's pages in order, each as its sorted texts."""
+ from document_model import ordered_pages, walk
+ return [sorted(node['kind']['text'] for _, node in walk(page, oid) if node['kind']['type'] == 'RichText')
+ for _, _, page, oid in ordered_pages(model)]
+
+
+def edits(lab):
+ from native_collaboration import reachable_page_text
+ a, b, output, action, settle = lab.a, lab.b, lab.output, lab.action, lab.settle
+ state = lambda label: reachable_page_text(lab.state(label))
+ texts = lambda state: {text for values in state.values() for text in values}
+ state('initial')
+ vm.qmp(a['name'], 'set_link', {'name': 'lab', 'up': False})
+ try:
+ action(a, 'edit', expected=ORIGINAL, text='Client A conflicting edit.')
+ action(a, 'edit', expected=OTHER_OUTLINE, text='Client A disjoint edit.')
+ action(a, 'snapshot')
+ action(b, 'edit', expected=ORIGINAL, text='Client B conflicting edit.')
+ action(b, 'edit', expected=CELL, text='Client B disjoint cell.')
+ settle(b, lambda label: {'Client B conflicting edit.', 'Client B disjoint cell.'} <= texts(state(label)), 'b-published')
+ finally:
+ vm.qmp(a['name'], 'set_link', {'name': 'lab', 'up': True})
+ settle(a, lambda label: len(found := state(label)) > 1 and 'Client A disjoint edit.' in texts(found), 'conflict')
+ (output / 'conflict.json').write_text(json.dumps(state('conflict'), indent=2, ensure_ascii=False))
+ page = action(a, 'snapshot')[0].attrib['ID']
+ conflict_views(a['name'], output / 'a', page, 'a')
+ action(b, 'sync')
+ time.sleep(5)
+ page_b = action(b, 'snapshot')[0].attrib['ID']
+ conflict_views(b['name'], output / 'b', page_b, 'b')
+ conflict_views(a['name'], output / 'a', page, 'a-again', delete=True)
+ settle(a, lambda label: len(state(label)) == 1, 'deleted')
+ action(b, 'sync')
+ time.sleep(5)
+ shot(b['name'], output / 'b', 'b-after-delete', runner.navigation_script(page_b) + 'Sleep(2000)\n')
+
+
+PAGES = ['One', 'Two', 'Three', 'Four', 'Target']
+
+
+def titled(model, titles):
+ """The section's pages in order, each named by the title among `titles` it holds."""
+ return [next((text for text in texts if text in titles), '') for texts in page_list(model)]
+
+
+def offline(lab, titles, a_actions, b_actions):
+ """Creates the titled pages; A runs its actions offline while B runs and publishes its
+ own; A then reconnects. Keeps the merged order and pages, and what each client lists."""
+ a, b, output, action = lab.a, lab.b, lab.output, lab.action
+ action(a, 'pages', titles=titles)
+ lab.settle(a, lambda label: 'Body Target.' in str(page_list(lab.state(label))), 'initial')
+ deadline = time.monotonic() + 300
+ while not any(node.get('name') == 'Target' for node in action(b, 'snapshot')):
+ action(b, 'sync')
+ if time.monotonic() > deadline: raise TimeoutError('B never listed the new pages')
+ vm.qmp(a['name'], 'set_link', {'name': 'lab', 'up': False})
+ try:
+ for kind, parameters in a_actions:
+ action(a, kind, **parameters)
+ action(a, 'snapshot')
+ for kind, parameters in b_actions:
+ action(b, kind, **parameters)
+ action(b, 'snapshot')
+ lab.settle(b, lambda label: 'Body Target.' not in str(page_list(lab.state(label))), 'b-published')
+ finally:
+ vm.qmp(a['name'], 'set_link', {'name': 'lab', 'up': True})
+ # A's changes reach the server when its sync writes; wait until the file stops changing.
+ previous, steady = None, 0
+ deadline = time.monotonic() + 300
+ while steady < 3 and time.monotonic() < deadline:
+ action(a, 'sync')
+ time.sleep(10)
+ current = page_list(lab.state('merged'))
+ steady = steady + 1 if current == previous else 0
+ previous = current
+ (output / 'merged.json').write_text(json.dumps({'order': titled(lab.state('merged'), titles), 'pages': previous}, indent=2, ensure_ascii=False))
+ for client, label in ((a, 'a'), (b, 'b')):
+ action(client, 'sync')
+ time.sleep(5)
+ listed = action(client, 'snapshot')
+ (output / label / 'listed.json').write_text(json.dumps([node.get('name') for node in listed], ensure_ascii=False))
+ if listed:
+ shot(client['name'], output / label, f'{label}-merged', runner.navigation_script(listed[0].get('ID')) + 'Sleep(2000)\n')
+
+
+def pages(lab):
+ """Competing page moves, and an offline edit of a page the other client deletes."""
+ offline(lab, PAGES, [
+ ('move', {'page': 'Four', 'before': 'One'}),
+ ('move', {'page': 'Two', 'before': None}),
+ ('edit', {'expected': 'Body Target.', 'text': 'Body Target edited offline.'}),
+ ], [
+ ('move', {'page': 'Four', 'before': None}),
+ ('move', {'page': 'Three', 'before': 'One'}),
+ ('delete-page', {'page': 'Target'}),
+ ])
+
+
+def restore(lab):
+ """An offline edit of a page in the middle of the list the other client deletes, with an
+ offline move of a page the other client leaves alone."""
+ offline(lab, ['One', 'Two', 'Target', 'Three', 'Four'], [
+ ('edit', {'expected': 'Body Target.', 'text': 'Body Target edited offline.'}),
+ ('move', {'page': 'Four', 'before': 'One'}),
+ ], [
+ ('delete-page', {'page': 'Target'}),
+ ])
+
+
+def sync(server, output, scenario):
+ from document_model import EXPORTER
+
+ if linux_vm.instance_path(server).exists():
+ raise ValueError('Choose a new Linux VM name; existing machines are not owned by this run.')
+ output = output.resolve()
+ output.mkdir(parents=True, exist_ok=False)
+ scripts = output / 'scripts'
+ scripts.mkdir()
+ for name in ('cold.ps1', 'collaborate.ps1', 'network.ps1', 'text.ps1', 'stress.ps1'):
+ shutil.copyfile(ROOT / 'tools/native' / name, scripts / name)
+ shutil.copyfile(Path(__file__), output / 'native_conflict.py')
+
+ def ssh(text, timeout=90):
+ result = linux_vm.run_ssh(server, text, timeout=timeout)
+ with (output / 'server.jsonl').open('a') as log:
+ log.write(json.dumps({'command': text, 'exit': result.returncode, 'stdout': result.stdout, 'stderr': result.stderr}) + '\n')
+ result.check_returncode()
+ return result.stdout
+
+ def server_state(label):
+ """Copies the server's notebook, recycle bin included, until its section parses,
+ keeping it as `label/notebook`; returns the section's exported model."""
+ deadline = time.monotonic() + 120
+ while True:
+ target = output / label
+ shutil.rmtree(target, ignore_errors=True)
+ (target / 'notebook').mkdir(parents=True)
+ archive = subprocess.run(linux_vm.ssh_argv(server, f"tar cf - -C '/srv/agent/{SHARE}' ."), capture_output=True, check=True, timeout=60).stdout
+ subprocess.run(['tar', 'xf', '-', '-C', target / 'notebook'], input=archive, check=True)
+ result = subprocess.run([EXPORTER, target / 'notebook/synthetic.one', target / 'model'], capture_output=True, text=True)
+ if result.returncode == 0:
+ return json.loads((target / 'model/document.json').read_text())
+ if time.monotonic() > deadline:
+ raise RuntimeError(f'{label}: {result.stderr}')
+ time.sleep(1)
+
+ linux_vm.create_instance(server)
+ try:
+ linux_vm.launch(server)
+ linux_vm.wait_instance(server, 600)
+ (output / 'linux.json').write_text(json.dumps(linux_vm.load_instance(server), indent=2))
+ ssh(f'mkdir /srv/agent/{SHARE}')
+ for name in ('synthetic.one', 'Open Notebook.onetoc2'):
+ with (FIXTURE / name).open('rb') as stream:
+ subprocess.run(linux_vm.ssh_argv(server, f"cat > '/srv/agent/{SHARE}/{name}'"), stdin=stream, check=True)
+ ssh(f'chmod u+w /srv/agent/{SHARE}/*')
+ with ExitStack() as stack:
+ labels = ['a', 'b']
+ for label in labels:
+ (output / label).mkdir()
+
+ def start(label):
+ manager = clone(output / label)
+ name = manager.__enter__()
+ return label, name, manager
+ with ThreadPoolExecutor(max_workers=2) as pool:
+ started = list(pool.map(start, labels))
+ for _, _, manager in started:
+ stack.push(manager)
+ clients = {}
+ for label, name, _ in started:
+ folder = output / label
+ for local in scripts.iterdir():
+ remote = 'cold-current.ps1' if local.name == 'cold.ps1' else local.name
+ result = windows.do_put(local, 'C:\\one-tests\\' + remote, name)
+ if result.get('error'): raise RuntimeError(result['error'])
+ command(name, 'mkdir C:\\one-tests\\runs\\capture', folder)
+ command(name, 'powershell -NoProfile -ExecutionPolicy Bypass -File C:\\one-tests\\network.ps1 -LabMac ' + vm.lab_mac(name), folder)
+ result = windows.do_spawn('cmd /c powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\collaborate.ps1 -Root C:\\one-tests\\runs\\capture -SharedPath \\\\192.168.77.1\\agent\\' + SHARE + ' -CloneHost ONE-' + name.upper() + ' > C:\\one-tests\\runs\\capture\\controller.log 2>&1', name)
+ if result.get('error'): raise RuntimeError(result['error'])
+ deadline = time.monotonic() + 180
+ while windows.do_cmd('if exist C:\\one-tests\\runs\\capture\\ready (echo ready)', target=name).get('stdout', '').find('ready') < 0:
+ if time.monotonic() > deadline: raise RuntimeError('The collaboration controller did not open the notebook')
+ time.sleep(1)
+ clients[label] = {'name': name, 'folder': folder, 'sequence': 0}
+ (output / 'clients.json').write_text(json.dumps({label: client['name'] for label, client in clients.items()}, indent=2))
+
+ def action(client, kind, **parameters):
+ client['sequence'] += 1
+ sequence = client['sequence']
+ local = client['folder'] / f'command-{sequence:04}.json'
+ local.write_text(json.dumps({'action': kind, **parameters}, ensure_ascii=False))
+ inbox = f'C:\\one-tests\\runs\\capture\\inbox\\{sequence:04}'
+ result = windows.do_put(local, inbox + '.tmp', client['name'])
+ if result.get('error'): raise RuntimeError(result['error'])
+ command(client['name'], f'move {inbox}.tmp {inbox}.json', client['folder'])
+ remote = f'C:\\one-tests\\runs\\capture\\outbox\\{sequence}'
+ deadline = time.monotonic() + 600
+ while True:
+ result = windows.do_cmd(f'if exist {remote}\\error (type {remote}\\error & exit /b 1) else (if exist {remote}\\done (echo complete))', target=client['name'])
+ if result.get('exit') != 0: raise RuntimeError(str(result))
+ if 'complete' in result.get('stdout', ''): break
+ if time.monotonic() > deadline: raise TimeoutError(f'{kind} did not complete')
+ time.sleep(.5)
+ if kind != 'snapshot':
+ return None
+ hierarchy = client['folder'] / f'hierarchy-{sequence:04}.xml'
+ windows.do_get(remote + '\\hierarchy.xml', hierarchy, client['name'])
+ pages = [node for node in ET.fromstring(hierarchy.read_text(encoding='utf-8-sig').strip()).iter() if node.tag.endswith('}Page')]
+ for i in range(len(pages)):
+ windows.do_get(remote + f'\\page-{i}.xml', client['folder'] / f'snapshot-{sequence:04}-{i}.xml', client['name'])
+ return pages
+
+ def settle(client, check, label):
+ deadline = time.monotonic() + 300
+ while True:
+ action(client, 'sync')
+ if check(label): return
+ if time.monotonic() > deadline: raise TimeoutError(label)
+ time.sleep(2)
+
+ lab = Lab()
+ lab.a, lab.b, lab.output = clients['a'], clients['b'], output
+ lab.action, lab.state, lab.settle = action, server_state, settle
+ scenario(lab)
+
+ for client in clients.values():
+ try:
+ action(client, 'close')
+ except Exception as error:
+ (client['folder'] / 'close-failure.txt').write_text(str(error))
+ server_state('final')
+ finally:
+ if linux_vm.running(server):
+ linux_vm.shutdown(server, 120)
+ linux_vm.delete_instance(server)
+ (output / 'linux-teardown.json').write_text(json.dumps({'absent': not linux_vm.instance_path(server).exists()}) + '\n')
+
+
+if __name__ == '__main__':
+ parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
+ commands = parser.add_subparsers(dest='mode', required=True)
+ scenarios = {'sync': edits, 'pages': pages, 'restore': restore}
+ for mode in scenarios:
+ lab = commands.add_parser(mode)
+ lab.add_argument('linux')
+ lab.add_argument('output', type=Path)
+ reopen = commands.add_parser('cold')
+ reopen.add_argument('notebook', type=Path)
+ reopen.add_argument('output', type=Path)
+ reopen.add_argument('--delete', action='store_true')
+ args = parser.parse_args()
+ if args.mode in scenarios:
+ sync(args.linux, args.output, scenarios[args.mode])
+ else:
+ cold(args.notebook, args.output, args.delete)
+ print('Captured', args.output)
diff --git a/corpus/conflict-page/native-restore/scripts/cold.ps1 b/corpus/conflict-page/native-restore/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/conflict-page/native-restore/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/conflict-page/native-restore/scripts/collaborate.ps1 b/corpus/conflict-page/native-restore/scripts/collaborate.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..6a42a3d526db486f022b032583704b0f4aee26d3
--- /dev/null
+++ b/corpus/conflict-page/native-restore/scripts/collaborate.ps1
@@ -0,0 +1,145 @@
+param([Parameter(Mandatory=$true)][string]$Root,
+ [Parameter(Mandatory=$true)][string]$SharedPath,
+ [Parameter(Mandatory=$true)][string]$CloneHost,
+ [switch]$ResumeCache,
+ [int]$StartSequence = 1)
+function Keep-Container($page, $target) {
+ $container = $target
+ while ($container.ParentNode -ne $page.DocumentElement) { $container = $container.ParentNode }
+ foreach ($sibling in @($page.DocumentElement.ChildNodes)) {
+ if ($sibling -ne $container -and $sibling.LocalName -in @('Outline', 'Title', 'Image', 'InkDrawing')) {
+ [void]$page.DocumentElement.RemoveChild($sibling)
+ }
+ }
+}
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+. "$PSScriptRoot\text.ps1"
+if ($SharedPath -notmatch '^\\\\192\.168\.77\.1\\agent\\m6-[a-z0-9-]+$') { throw 'Choose a disposable Linux lab notebook.' }
+if ($env:COMPUTERNAME -ne $CloneHost) { throw 'The collaboration controller requires its owned clone.' }
+if (-not $ResumeCache) { & "$PSScriptRoot\cold-current.ps1" -Root $Root -CloneHost $CloneHost }
+$shared = $SharedPath
+if (-not (Test-Path "$shared\synthetic.one")) { throw 'Create the shared fixture first.' }
+New-Item -ItemType Directory "$Root\inbox", "$Root\outbox" -Force | Out-Null
+$user = 'HKCU:\Software\Microsoft\Office\Common\UserInfo'
+New-Item $user -Force | Out-Null
+New-ItemProperty $user -Name UserName -Value $CloneHost -PropertyType String -Force | Out-Null
+New-ItemProperty $user -Name UserInitials -Value $CloneHost.Substring($CloneHost.Length - 3) -PropertyType String -Force | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebook = ''
+try {
+ $app.OpenHierarchy($shared, '', [ref]$notebook, 0)
+ $section = ''
+ $app.OpenHierarchy('synthetic.one', $notebook, [ref]$section, 0)
+ [IO.File]::WriteAllText("$Root\ready", 'ready')
+ $deadline = [DateTime]::UtcNow.AddMinutes(30)
+ $sequence = $StartSequence
+ while ([DateTime]::UtcNow -lt $deadline) {
+ $name = '{0:d4}.json' -f $sequence
+ $input = "$Root\inbox\$name"
+ if (-not (Test-Path $input)) { Start-Sleep -Milliseconds 100; continue }
+ $command = Get-Content -Raw -Encoding UTF8 $input | ConvertFrom-Json
+ $output = "$Root\outbox\$sequence"
+ New-Item -ItemType Directory $output | Out-Null
+ try {
+ if ($command.action -in @('prepare-stress', 'stress')) {
+ . "$PSScriptRoot\stress.ps1"
+ Invoke-Stress $app $section $command $output $shared
+ }
+ elseif ($command.action -eq 'sync') { $app.SyncHierarchy($notebook) }
+ elseif ($command.action -in @('pages', 'move', 'delete-page')) {
+ $namespace = 'http://schemas.microsoft.com/office/onenote/2010/onenote'
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$tree = $hierarchy
+ $listed = @($tree.SelectNodes('//*[local-name()="Page"]'))
+ $named = { param($title) @($listed | Where-Object { $_.GetAttribute('name') -eq $title }) }
+ if ($command.action -eq 'pages') {
+ # New titled pages with one body paragraph each, appended in order.
+ foreach ($title in $command.titles) {
+ $page = ''
+ $app.CreateNewPage($section, [ref]$page, 2)
+ $body = [Security.SecurityElement]::Escape('Body ' + $title + '.')
+ $name = [Security.SecurityElement]::Escape($title)
+ $xml = '' + $name + '' + $body + ''
+ $app.UpdatePageContent($xml, [DateTime]::MinValue, 1, $false)
+ }
+ } elseif ($command.action -eq 'move') {
+ # Moves the page titled `page` before the one titled `before`, or last.
+ $moved = @(& $named $command.page)
+ if ($moved.Count -ne 1) { throw 'Expected one page to move.' }
+ $order = [Collections.ArrayList]@($listed | Where-Object { $_ -ne $moved[0] })
+ $at = $order.Count
+ if ($command.before) {
+ $anchor = @(& $named $command.before)
+ if ($anchor.Count -ne 1) { throw 'Expected one anchor page.' }
+ $at = $order.IndexOf($anchor[0])
+ }
+ $order.Insert($at, $moved[0])
+ $xml = ''
+ foreach ($node in $order) {
+ $xml += ''
+ }
+ $app.UpdateHierarchy($xml + '', 1)
+ } else {
+ $doomed = @(& $named $command.page)
+ if ($doomed.Count -ne 1) { throw 'Expected one page to delete.' }
+ $app.DeleteHierarchy($doomed[0].GetAttribute('ID'), [DateTime]::MinValue, $false)
+ }
+ }
+ elseif ($command.action -eq 'kill-process') {
+ Get-Process ONENOTE | Stop-Process -Force
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ $app = New-Object -ComObject OneNote.Application
+ $app.OpenHierarchy($shared, '', [ref]$notebook, 0)
+ $app.OpenHierarchy('synthetic.one', $notebook, [ref]$section, 0)
+ }
+ elseif ($command.action -eq 'edit' -or $command.action -eq 'snapshot') {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText("$output\hierarchy.xml", $hierarchy, [Text.Encoding]::UTF8)
+ [xml]$tree = $hierarchy
+ $matches = 0
+ $editedPage = $null
+ $i = 0
+ foreach ($node in $tree.SelectNodes('//*[local-name()="Page"]')) {
+ $content = ''
+ $app.GetPageContent($node.GetAttribute('ID'), [ref]$content, 1, 1)
+ [IO.File]::WriteAllText("$output\page-$i.xml", $content, [Text.Encoding]::UTF8)
+ [xml]$page = $content
+ if ($command.action -eq 'edit') {
+ $targets = @($page.SelectNodes('//*[local-name()="T"]') | Where-Object {
+ (Get-ParagraphText $_.InnerText) -eq $command.expected
+ })
+ if ($targets.Count -gt 1) { throw 'Expected one matching text object.' }
+ if ($targets.Count -eq 1) {
+ $matches++
+ if ($matches -gt 1) { throw 'The text occurs on multiple pages.' }
+ $targets[0].InnerText = [Security.SecurityElement]::Escape($command.text)
+ Keep-Container $page $targets[0]
+ $editedPage = $page
+ }
+ }
+ $i++
+ }
+ if ($command.action -eq 'edit' -and $matches -ne 1) { throw 'Expected one matching text object.' }
+ if ($editedPage) { $app.UpdatePageContent($editedPage.OuterXml, [DateTime]::MinValue, 1, $false) }
+ } elseif ($command.action -ne 'close') { throw 'Unknown collaboration command.' }
+ [IO.File]::WriteAllText("$output\done", 'ok')
+ } catch {
+ [IO.File]::WriteAllText("$output\error", $_.Exception.ToString())
+ }
+ if ($command.action -eq 'close') { break }
+ $sequence++
+ }
+} finally {
+ try { if ($notebook) { $app.CloseNotebook($notebook, $false) } }
+ finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ [IO.File]::WriteAllText("$Root\closed", 'closed')
+ }
+}
diff --git a/corpus/conflict-page/native-restore/scripts/network.ps1 b/corpus/conflict-page/native-restore/scripts/network.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..95fa83d5243ee6a2a653cc075128b063e2f09cf2
--- /dev/null
+++ b/corpus/conflict-page/native-restore/scripts/network.ps1
@@ -0,0 +1,20 @@
+param([Parameter(Mandatory=$true)][string]$LabMac)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$adapter = @(Get-WmiObject Win32_NetworkAdapterConfiguration | Where-Object { $_.MACAddress -eq $LabMac })
+if ($adapter.Count -ne 1) { throw 'The clone lab adapter is ambiguous.' }
+$enabled = $adapter[0].EnableDHCP()
+if ($enabled.ReturnValue -notin @(0, 1)) {
+ throw ('Unable to enable DHCP on the clone lab adapter; result ' + $enabled.ReturnValue)
+}
+$release = $adapter[0].ReleaseDHCPLease()
+$result = $adapter[0].RenewDHCPLease()
+$deadline = [DateTime]::UtcNow.AddSeconds(60)
+do {
+ $adapter = @(Get-WmiObject Win32_NetworkAdapterConfiguration | Where-Object { $_.MACAddress -eq $LabMac })
+ $addresses = @($adapter[0].IPAddress | Where-Object { $_ -match '^192\.168\.77\.\d+$' -and $_ -ne '192.168.77.1' })
+ if ($addresses.Count -eq 1) { break }
+ Start-Sleep -Milliseconds 250
+} while ([DateTime]::UtcNow -lt $deadline)
+if ($addresses.Count -ne 1) { throw ('The clone did not receive a lab IPv4 address; renewal result ' + $result.ReturnValue + '; adapter ' + ($adapter[0] | Select-Object MACAddress,DHCPEnabled,IPEnabled,IPAddress | ConvertTo-Json -Compress)) }
+@{mac=$LabMac;address=$addresses[0];releaseResult=$release.ReturnValue;renewalResult=$result.ReturnValue} | ConvertTo-Json -Compress
diff --git a/corpus/conflict-page/native-restore/scripts/stress.ps1 b/corpus/conflict-page/native-restore/scripts/stress.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0ab5bc69b4dabe970373e481873dfd951a1a69a
--- /dev/null
+++ b/corpus/conflict-page/native-restore/scripts/stress.ps1
@@ -0,0 +1,83 @@
+function Invoke-Stress($app, $section, $command, $output, $shared) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText("$output\hierarchy.xml", $hierarchy, [Text.Encoding]::UTF8)
+ [xml]$tree = $hierarchy
+ $pages = @($tree.SelectNodes('//*[local-name()="Page"]'))
+ if ($pages.Count -ne 1) { throw 'Expected one stress-test page.' }
+ $pageId = $pages[0].GetAttribute('ID')
+ if ($command.action -eq 'prepare-stress') {
+ for ($i = 0; $i -lt $command.clients; $i++) {
+ $xml = ''
+ $app.UpdatePageContent($xml, [DateTime]::MinValue, 1, $false)
+ }
+ return
+ }
+ $random = New-Object Random([int]$command.seed)
+ $events = New-Object IO.StreamWriter("$output\events.jsonl", $false, [Text.Encoding]::UTF8)
+ $events.AutoFlush = $true
+ try {
+ [IO.File]::WriteAllText("$output\ready", 'ready')
+ $deadline = [DateTime]::UtcNow.AddMinutes(10)
+ while (-not (Test-Path "$shared\stress-start")) {
+ if ([DateTime]::UtcNow -gt $deadline) { throw 'Stress start timed out.' }
+ Start-Sleep -Milliseconds 20
+ }
+ for ($i = 0; $i -lt $command.operations; $i++) {
+ if (($command.PSObject.Properties.Name -contains 'maintenance') -and $command.maintenance -and $i -eq [Math]::Floor($command.operations / 2)) {
+ [IO.File]::WriteAllText("$shared\maintenance-paused-n$($command.actor)", 'paused')
+ while (-not (Test-Path "$shared\maintenance-resume")) {
+ if ([DateTime]::UtcNow -gt $deadline) { throw 'Maintenance pause timed out.' }
+ Start-Sleep -Milliseconds 100
+ }
+ }
+ Start-Sleep -Milliseconds $random.Next(10, 100)
+ $started = [DateTime]::UtcNow.Ticks
+ $content = ''
+ $app.GetPageContent($pageId, [ref]$content, 1, 1)
+ [xml]$page = $content
+ $matches = @($page.SelectNodes('//*[local-name()="T"]') | Where-Object {
+ (Get-ParagraphText $_.InnerText).StartsWith($command.prefix)
+ })
+ if ($matches.Count -ne 1) { throw 'Expected one stress-test paragraph.' }
+ $before = Get-ParagraphText $matches[0].InnerText
+ $token = ' [n' + $command.actor + ':' + $i + ']'
+ $start = $end = $before.Length
+ $replacement = $token
+ $bold = $italic = $false
+ if ($command.edit) {
+ $boundaries = New-Object 'Collections.Generic.List[int]'
+ for ($at = $command.prefix.Length; $at -le $before.Length; $at++) {
+ $boundaries.Add($at)
+ if ($at -lt $before.Length -and [char]::IsHighSurrogate($before[$at])) { $at++ }
+ }
+ $first = $boundaries[$random.Next($boundaries.Count)]
+ $second = $boundaries[$random.Next($boundaries.Count)]
+ $start = [Math]::Min($first, $second)
+ $end = [Math]::Max($first, $second)
+ $replacement = ' caf' + [char]0xe9 + ' ' + [char]::ConvertFromUtf32(0x1f980) + $token
+ $bold = $random.Next(2) -eq 1
+ $italic = $random.Next(2) -eq 1
+ }
+ $after = $before.Substring(0, $start) + $replacement + $before.Substring($end)
+ $html = [Security.SecurityElement]::Escape($after)
+ if ($command.edit) {
+ $weight = if ($bold) { 'bold' } else { 'normal' }
+ $style = if ($italic) { 'italic' } else { 'normal' }
+ $html = '' + $html + ''
+ }
+ $matches[0].InnerText = $html
+ Keep-Container $page $matches[0]
+ $updateStarted = [DateTime]::UtcNow.Ticks
+ $app.UpdatePageContent($page.OuterXml, [DateTime]::MinValue, 1, $false)
+ $updated = [DateTime]::UtcNow.Ticks
+ $events.WriteLine((@{ operation=$i; before=$before; token=$token; started_ticks=$started;
+ range=@($start, $end); replacement=$replacement; bold=$bold; italic=$italic;
+ update_started_ticks=$updateStarted; updated_ticks=$updated } | ConvertTo-Json -Compress))
+ if ($i -eq 0) { [IO.File]::WriteAllText("$output\editing", 'editing') }
+ if ($command.sync_every -gt 0 -and (($i + 1) % $command.sync_every) -eq 0) {
+ $app.SyncHierarchy($section)
+ }
+ }
+ } finally { $events.Dispose() }
+}
diff --git a/corpus/conflict-page/native-restore/scripts/text.ps1 b/corpus/conflict-page/native-restore/scripts/text.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..75e9e71207b599d16eaaf68824ca30831860610a
--- /dev/null
+++ b/corpus/conflict-page/native-restore/scripts/text.ps1
@@ -0,0 +1,13 @@
+function Get-ParagraphText([string]$html) {
+ $plain = [regex]::Replace($html, '<[^>]*>', '')
+ $plain = [regex]::Replace($plain, '&#(?:x([0-9a-fA-F]+)|([0-9]+));', {
+ param($match)
+ $value = if ($match.Groups[1].Success) {
+ [Convert]::ToInt32($match.Groups[1].Value, 16)
+ } else { [int]$match.Groups[2].Value }
+ # The Win7 framework leaves supplementary numeric entities undecoded.
+ if ($value -gt 0xffff -and $value -le 0x10ffff) { [char]::ConvertFromUtf32($value) }
+ else { $match.Value }
+ })
+ [Net.WebUtility]::HtmlDecode($plain)
+}
diff --git a/corpus/conflict-page/native-restore/server.jsonl b/corpus/conflict-page/native-restore/server.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..d5df993564a30ddaea1b427699648ff9b1a1417d
--- /dev/null
+++ b/corpus/conflict-page/native-restore/server.jsonl
@@ -0,0 +1,2 @@
+{"command": "mkdir /srv/agent/m6-conflict", "exit": 0, "stdout": "", "stderr": ""}
+{"command": "chmod u+w /srv/agent/m6-conflict/*", "exit": 0, "stdout": "", "stderr": ""}
diff --git a/corpus/conflict-page/native-three/commands.jsonl b/corpus/conflict-page/native-three/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..bd094dd5fa92bff9cd29a895346604fd12f198af
--- /dev/null
+++ b/corpus/conflict-page/native-three/commands.jsonl
@@ -0,0 +1,6 @@
+{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-C6F6C14F -ExpectedPages -1 -Pdf -KeepOpen", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\read -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Rename-Item C:\\one-tests\\runs\\capture\\read before-read\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-C6F6C14F -UseCurrentCache -ExpectedPages -1 -Pdf", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/conflict-page/native-three/conflicts.png b/corpus/conflict-page/native-three/conflicts.png
new file mode 100644
index 0000000000000000000000000000000000000000..05b2a356d3b39f7a6660730662dc6aabbbb107f0
Binary files /dev/null and b/corpus/conflict-page/native-three/conflicts.png differ
diff --git a/corpus/conflict-page/native-three/expand.png b/corpus/conflict-page/native-three/expand.png
new file mode 100644
index 0000000000000000000000000000000000000000..2996fb0cf1da7b204973c3ba4e08a9c4c6f4df53
Binary files /dev/null and b/corpus/conflict-page/native-three/expand.png differ
diff --git a/corpus/conflict-page/native-three/machine.json b/corpus/conflict-page/native-three/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..45055b0c57355c25e302d24c46f2f498763ea030
--- /dev/null
+++ b/corpus/conflict-page/native-three/machine.json
@@ -0,0 +1 @@
+{"name": "m6-c6f6c14f", "hostname": "ONE-M6-C6F6C14F"}
diff --git a/corpus/conflict-page/native-three/notebook/Open Notebook.onetoc2 b/corpus/conflict-page/native-three/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..c4a2b9c6013a262a0c6d4d71d2a50d67c98131e8
Binary files /dev/null and b/corpus/conflict-page/native-three/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native-three/notebook/synthetic.one b/corpus/conflict-page/native-three/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..1db8bd91ac5b4eb9c3623ca701e9773b66d6010e
Binary files /dev/null and b/corpus/conflict-page/native-three/notebook/synthetic.one differ
diff --git a/corpus/conflict-page/native-three/run.json b/corpus/conflict-page/native-three/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..ee5c95acf2fb14729ddaece26555e5eb5face4bb
--- /dev/null
+++ b/corpus/conflict-page/native-three/run.json
@@ -0,0 +1,17 @@
+{
+ "notebook": "/Users/clo/dev/one/evidence/m8/conflict-abrupt-01/conflict-closed/notebook",
+ "expected_pages": -1,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "086789e467779add0fc071ad8c524c2b02d3d0d609aea4a41f3128cadba371e8"
+ }
+}
diff --git a/corpus/conflict-page/native-three/source.json b/corpus/conflict-page/native-three/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..e6bfda307ffe01e66ae1cd42a2465e9173d9ca69
--- /dev/null
+++ b/corpus/conflict-page/native-three/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 3780,
+ "sha256": "f21c6d4eefc25ce78aee0420fdee0b409da52fdf3119b66302ac6ca4690c55ae",
+ "mtime_ns": 1788733155312083279
+ },
+ {
+ "path": "synthetic.one",
+ "bytes": 46416,
+ "sha256": "7ac7a42932848380b90aa478800ab141fce4fb591aae2bf1e167f1e516e5edc0",
+ "mtime_ns": 1788733155311971612
+ }
+]
diff --git a/corpus/conflict-page/native-three/teardown.json b/corpus/conflict-page/native-three/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/conflict-page/native-three/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/conflict-page/native/a/a-conflict.json b/corpus/conflict-page/native/a/a-conflict.json
new file mode 100644
index 0000000000000000000000000000000000000000..2fd05a4a7938577ce0347213e7f3ed53dab2c0a4
--- /dev/null
+++ b/corpus/conflict-page/native/a/a-conflict.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Client A conflicting edit. - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native/a/a-conflict.png b/corpus/conflict-page/native/a/a-conflict.png
new file mode 100644
index 0000000000000000000000000000000000000000..779f4bd296c5f9cf5aa32b4c8b81d4d7704a8095
Binary files /dev/null and b/corpus/conflict-page/native/a/a-conflict.png differ
diff --git a/corpus/conflict-page/native/a/a-main.json b/corpus/conflict-page/native/a/a-main.json
new file mode 100644
index 0000000000000000000000000000000000000000..668f002c22e396d7530675ec44f659f85b6f6a86
--- /dev/null
+++ b/corpus/conflict-page/native/a/a-main.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Client B conflicting edit. - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native/a/a-main.png b/corpus/conflict-page/native/a/a-main.png
new file mode 100644
index 0000000000000000000000000000000000000000..160e31b2ff70f2b56ede40769422db0f0e81083d
Binary files /dev/null and b/corpus/conflict-page/native/a/a-main.png differ
diff --git a/corpus/conflict-page/native/a/a-menu.json b/corpus/conflict-page/native/a/a-menu.json
new file mode 100644
index 0000000000000000000000000000000000000000..f43854a7a42d5bb99c0b443513bc0c0993c2716c
--- /dev/null
+++ b/corpus/conflict-page/native/a/a-menu.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "",
+ "class": "Net UI Tool Window",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native/a/a-menu.png b/corpus/conflict-page/native/a/a-menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..3dff58a0556eab58682e8cb6c2a28e3ab6aff07d
Binary files /dev/null and b/corpus/conflict-page/native/a/a-menu.png differ
diff --git a/corpus/conflict-page/native/a/a-shown.json b/corpus/conflict-page/native/a/a-shown.json
new file mode 100644
index 0000000000000000000000000000000000000000..2fd05a4a7938577ce0347213e7f3ed53dab2c0a4
--- /dev/null
+++ b/corpus/conflict-page/native/a/a-shown.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Client A conflicting edit. - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native/a/a-shown.png b/corpus/conflict-page/native/a/a-shown.png
new file mode 100644
index 0000000000000000000000000000000000000000..324161780c3b6bc1d4a76ead6a5e5c567c003dda
Binary files /dev/null and b/corpus/conflict-page/native/a/a-shown.png differ
diff --git a/corpus/conflict-page/native/a/commands.jsonl b/corpus/conflict-page/native/a/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..71a20b5a21782c6d65840a920e949089a97e2520
--- /dev/null
+++ b/corpus/conflict-page/native/a/commands.jsonl
@@ -0,0 +1,124 @@
+{"command": "mkdir C:\\one-tests\\runs\\capture", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -ExecutionPolicy Bypass -File C:\\one-tests\\network.ps1 -LabMac 52:54:02:a3:5c:e3", "exit": 0, "stdout": "{\"renewalResult\":0,\"releaseResult\":0,\"mac\":\"52:54:02:a3:5c:e3\",\"address\":\"192.168.77.180\"}\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0001.tmp C:\\one-tests\\runs\\capture\\inbox\\0001.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0002.tmp C:\\one-tests\\runs\\capture\\inbox\\0002.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0003.tmp C:\\one-tests\\runs\\capture\\inbox\\0003.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0004.tmp C:\\one-tests\\runs\\capture\\inbox\\0004.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0005.tmp C:\\one-tests\\runs\\capture\\inbox\\0005.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0006.tmp C:\\one-tests\\runs\\capture\\inbox\\0006.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0007.tmp C:\\one-tests\\runs\\capture\\inbox\\0007.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0008.tmp C:\\one-tests\\runs\\capture\\inbox\\0008.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0009.tmp C:\\one-tests\\runs\\capture\\inbox\\0009.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0010.tmp C:\\one-tests\\runs\\capture\\inbox\\0010.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0011.tmp C:\\one-tests\\runs\\capture\\inbox\\0011.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0012.tmp C:\\one-tests\\runs\\capture\\inbox\\0012.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0013.tmp C:\\one-tests\\runs\\capture\\inbox\\0013.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0014.tmp C:\\one-tests\\runs\\capture\\inbox\\0014.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0015.tmp C:\\one-tests\\runs\\capture\\inbox\\0015.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0016.tmp C:\\one-tests\\runs\\capture\\inbox\\0016.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0017.tmp C:\\one-tests\\runs\\capture\\inbox\\0017.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0018.tmp C:\\one-tests\\runs\\capture\\inbox\\0018.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0019.tmp C:\\one-tests\\runs\\capture\\inbox\\0019.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0020.tmp C:\\one-tests\\runs\\capture\\inbox\\0020.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0021.tmp C:\\one-tests\\runs\\capture\\inbox\\0021.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0022.tmp C:\\one-tests\\runs\\capture\\inbox\\0022.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0023.tmp C:\\one-tests\\runs\\capture\\inbox\\0023.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0024.tmp C:\\one-tests\\runs\\capture\\inbox\\0024.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0025.tmp C:\\one-tests\\runs\\capture\\inbox\\0025.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0026.tmp C:\\one-tests\\runs\\capture\\inbox\\0026.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0027.tmp C:\\one-tests\\runs\\capture\\inbox\\0027.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0028.tmp C:\\one-tests\\runs\\capture\\inbox\\0028.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0029.tmp C:\\one-tests\\runs\\capture\\inbox\\0029.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0030.tmp C:\\one-tests\\runs\\capture\\inbox\\0030.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0031.tmp C:\\one-tests\\runs\\capture\\inbox\\0031.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0032.tmp C:\\one-tests\\runs\\capture\\inbox\\0032.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0033.tmp C:\\one-tests\\runs\\capture\\inbox\\0033.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0034.tmp C:\\one-tests\\runs\\capture\\inbox\\0034.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0035.tmp C:\\one-tests\\runs\\capture\\inbox\\0035.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0036.tmp C:\\one-tests\\runs\\capture\\inbox\\0036.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0037.tmp C:\\one-tests\\runs\\capture\\inbox\\0037.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0038.tmp C:\\one-tests\\runs\\capture\\inbox\\0038.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0039.tmp C:\\one-tests\\runs\\capture\\inbox\\0039.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0040.tmp C:\\one-tests\\runs\\capture\\inbox\\0040.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0041.tmp C:\\one-tests\\runs\\capture\\inbox\\0041.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0042.tmp C:\\one-tests\\runs\\capture\\inbox\\0042.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0043.tmp C:\\one-tests\\runs\\capture\\inbox\\0043.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0044.tmp C:\\one-tests\\runs\\capture\\inbox\\0044.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0045.tmp C:\\one-tests\\runs\\capture\\inbox\\0045.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0046.tmp C:\\one-tests\\runs\\capture\\inbox\\0046.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0047.tmp C:\\one-tests\\runs\\capture\\inbox\\0047.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0048.tmp C:\\one-tests\\runs\\capture\\inbox\\0048.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0049.tmp C:\\one-tests\\runs\\capture\\inbox\\0049.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0050.tmp C:\\one-tests\\runs\\capture\\inbox\\0050.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0051.tmp C:\\one-tests\\runs\\capture\\inbox\\0051.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0052.tmp C:\\one-tests\\runs\\capture\\inbox\\0052.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0053.tmp C:\\one-tests\\runs\\capture\\inbox\\0053.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0054.tmp C:\\one-tests\\runs\\capture\\inbox\\0054.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0055.tmp C:\\one-tests\\runs\\capture\\inbox\\0055.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0056.tmp C:\\one-tests\\runs\\capture\\inbox\\0056.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0057.tmp C:\\one-tests\\runs\\capture\\inbox\\0057.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0058.tmp C:\\one-tests\\runs\\capture\\inbox\\0058.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0059.tmp C:\\one-tests\\runs\\capture\\inbox\\0059.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0060.tmp C:\\one-tests\\runs\\capture\\inbox\\0060.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0061.tmp C:\\one-tests\\runs\\capture\\inbox\\0061.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0062.tmp C:\\one-tests\\runs\\capture\\inbox\\0062.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0063.tmp C:\\one-tests\\runs\\capture\\inbox\\0063.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0064.tmp C:\\one-tests\\runs\\capture\\inbox\\0064.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0065.tmp C:\\one-tests\\runs\\capture\\inbox\\0065.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0066.tmp C:\\one-tests\\runs\\capture\\inbox\\0066.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0067.tmp C:\\one-tests\\runs\\capture\\inbox\\0067.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0068.tmp C:\\one-tests\\runs\\capture\\inbox\\0068.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0069.tmp C:\\one-tests\\runs\\capture\\inbox\\0069.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0070.tmp C:\\one-tests\\runs\\capture\\inbox\\0070.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0071.tmp C:\\one-tests\\runs\\capture\\inbox\\0071.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0072.tmp C:\\one-tests\\runs\\capture\\inbox\\0072.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0073.tmp C:\\one-tests\\runs\\capture\\inbox\\0073.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0074.tmp C:\\one-tests\\runs\\capture\\inbox\\0074.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0075.tmp C:\\one-tests\\runs\\capture\\inbox\\0075.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0076.tmp C:\\one-tests\\runs\\capture\\inbox\\0076.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0077.tmp C:\\one-tests\\runs\\capture\\inbox\\0077.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0078.tmp C:\\one-tests\\runs\\capture\\inbox\\0078.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0079.tmp C:\\one-tests\\runs\\capture\\inbox\\0079.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0080.tmp C:\\one-tests\\runs\\capture\\inbox\\0080.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0081.tmp C:\\one-tests\\runs\\capture\\inbox\\0081.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0082.tmp C:\\one-tests\\runs\\capture\\inbox\\0082.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0083.tmp C:\\one-tests\\runs\\capture\\inbox\\0083.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0084.tmp C:\\one-tests\\runs\\capture\\inbox\\0084.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0085.tmp C:\\one-tests\\runs\\capture\\inbox\\0085.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0086.tmp C:\\one-tests\\runs\\capture\\inbox\\0086.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0087.tmp C:\\one-tests\\runs\\capture\\inbox\\0087.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0088.tmp C:\\one-tests\\runs\\capture\\inbox\\0088.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0089.tmp C:\\one-tests\\runs\\capture\\inbox\\0089.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0090.tmp C:\\one-tests\\runs\\capture\\inbox\\0090.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0091.tmp C:\\one-tests\\runs\\capture\\inbox\\0091.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0092.tmp C:\\one-tests\\runs\\capture\\inbox\\0092.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0093.tmp C:\\one-tests\\runs\\capture\\inbox\\0093.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0094.tmp C:\\one-tests\\runs\\capture\\inbox\\0094.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0095.tmp C:\\one-tests\\runs\\capture\\inbox\\0095.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0096.tmp C:\\one-tests\\runs\\capture\\inbox\\0096.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0097.tmp C:\\one-tests\\runs\\capture\\inbox\\0097.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0098.tmp C:\\one-tests\\runs\\capture\\inbox\\0098.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0099.tmp C:\\one-tests\\runs\\capture\\inbox\\0099.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0100.tmp C:\\one-tests\\runs\\capture\\inbox\\0100.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0101.tmp C:\\one-tests\\runs\\capture\\inbox\\0101.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0102.tmp C:\\one-tests\\runs\\capture\\inbox\\0102.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0103.tmp C:\\one-tests\\runs\\capture\\inbox\\0103.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0104.tmp C:\\one-tests\\runs\\capture\\inbox\\0104.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0105.tmp C:\\one-tests\\runs\\capture\\inbox\\0105.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0106.tmp C:\\one-tests\\runs\\capture\\inbox\\0106.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0107.tmp C:\\one-tests\\runs\\capture\\inbox\\0107.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0108.tmp C:\\one-tests\\runs\\capture\\inbox\\0108.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0109.tmp C:\\one-tests\\runs\\capture\\inbox\\0109.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0110.tmp C:\\one-tests\\runs\\capture\\inbox\\0110.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0111.tmp C:\\one-tests\\runs\\capture\\inbox\\0111.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0112.tmp C:\\one-tests\\runs\\capture\\inbox\\0112.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0113.tmp C:\\one-tests\\runs\\capture\\inbox\\0113.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0114.tmp C:\\one-tests\\runs\\capture\\inbox\\0114.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0115.tmp C:\\one-tests\\runs\\capture\\inbox\\0115.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0116.tmp C:\\one-tests\\runs\\capture\\inbox\\0116.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0117.tmp C:\\one-tests\\runs\\capture\\inbox\\0117.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0118.tmp C:\\one-tests\\runs\\capture\\inbox\\0118.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0119.tmp C:\\one-tests\\runs\\capture\\inbox\\0119.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0120.tmp C:\\one-tests\\runs\\capture\\inbox\\0120.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0121.tmp C:\\one-tests\\runs\\capture\\inbox\\0121.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "ZipArchiveHelper : The process cannot access the file \r\n'C:\\one-tests\\runs\\capture\\controller.log' because it is being used by another \r\nprocess.\r\nAt C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\Modules\\Microsoft.PowerShell.Arch\r\nive\\Microsoft.PowerShell.Archive.psm1:631 char:30\r\n+ ... sArchived = ZipArchiveHelper $sourceFilePaths $destinationPath $compr ...\r\n+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n + CategoryInfo : PermissionDenied: (C:\\one-tests\\runs\\capture\\con \r\n troller.log:String) [Write-Error], IOException\r\n + FullyQualifiedErrorId : CompressArchiveUnauthorizedAccessError,ZipArchiv \r\n eHelper\r\n \r\n", "error": null}
diff --git a/corpus/conflict-page/native/a/machine.json b/corpus/conflict-page/native/a/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..0f864b281e1b3fddd8d8f15005c6783a803b8317
--- /dev/null
+++ b/corpus/conflict-page/native/a/machine.json
@@ -0,0 +1 @@
+{"name": "m6-8a93780a", "hostname": "ONE-M6-8A93780A"}
diff --git a/corpus/conflict-page/native/a/teardown.json b/corpus/conflict-page/native/a/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/conflict-page/native/a/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/conflict-page/native/b-published/notebook/Open Notebook.onetoc2 b/corpus/conflict-page/native/b-published/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..c7beb44bf509f935090fe55e7549e4b50e0ae0e9
Binary files /dev/null and b/corpus/conflict-page/native/b-published/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native/b-published/notebook/synthetic.one b/corpus/conflict-page/native/b-published/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..7a6d1f09e1619db43158817a0fd6f9fab64b486f
Binary files /dev/null and b/corpus/conflict-page/native/b-published/notebook/synthetic.one differ
diff --git a/corpus/conflict-page/native/b/b-main.json b/corpus/conflict-page/native/b/b-main.json
new file mode 100644
index 0000000000000000000000000000000000000000..668f002c22e396d7530675ec44f659f85b6f6a86
--- /dev/null
+++ b/corpus/conflict-page/native/b/b-main.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Client B conflicting edit. - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native/b/b-main.png b/corpus/conflict-page/native/b/b-main.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fc48cfee0af3e8e1a5eb28b9554a742fd124c56
Binary files /dev/null and b/corpus/conflict-page/native/b/b-main.png differ
diff --git a/corpus/conflict-page/native/b/b-shown.json b/corpus/conflict-page/native/b/b-shown.json
new file mode 100644
index 0000000000000000000000000000000000000000..2fd05a4a7938577ce0347213e7f3ed53dab2c0a4
--- /dev/null
+++ b/corpus/conflict-page/native/b/b-shown.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Client A conflicting edit. - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native/b/b-shown.png b/corpus/conflict-page/native/b/b-shown.png
new file mode 100644
index 0000000000000000000000000000000000000000..df913522858ab019e71ed65ae817e86cb56570ad
Binary files /dev/null and b/corpus/conflict-page/native/b/b-shown.png differ
diff --git a/corpus/conflict-page/native/b/commands.jsonl b/corpus/conflict-page/native/b/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..4281870e093fd1993182f6602b819b2e68c183ff
--- /dev/null
+++ b/corpus/conflict-page/native/b/commands.jsonl
@@ -0,0 +1,21 @@
+{"command": "mkdir C:\\one-tests\\runs\\capture", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -ExecutionPolicy Bypass -File C:\\one-tests\\network.ps1 -LabMac 52:54:02:e7:d0:a7", "exit": 0, "stdout": "{\"renewalResult\":0,\"releaseResult\":0,\"mac\":\"52:54:02:e7:d0:a7\",\"address\":\"192.168.77.42\"}\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0001.tmp C:\\one-tests\\runs\\capture\\inbox\\0001.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0002.tmp C:\\one-tests\\runs\\capture\\inbox\\0002.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0003.tmp C:\\one-tests\\runs\\capture\\inbox\\0003.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0004.tmp C:\\one-tests\\runs\\capture\\inbox\\0004.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0005.tmp C:\\one-tests\\runs\\capture\\inbox\\0005.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0006.tmp C:\\one-tests\\runs\\capture\\inbox\\0006.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0007.tmp C:\\one-tests\\runs\\capture\\inbox\\0007.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0008.tmp C:\\one-tests\\runs\\capture\\inbox\\0008.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0009.tmp C:\\one-tests\\runs\\capture\\inbox\\0009.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0010.tmp C:\\one-tests\\runs\\capture\\inbox\\0010.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0011.tmp C:\\one-tests\\runs\\capture\\inbox\\0011.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0012.tmp C:\\one-tests\\runs\\capture\\inbox\\0012.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0013.tmp C:\\one-tests\\runs\\capture\\inbox\\0013.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0014.tmp C:\\one-tests\\runs\\capture\\inbox\\0014.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0015.tmp C:\\one-tests\\runs\\capture\\inbox\\0015.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0016.tmp C:\\one-tests\\runs\\capture\\inbox\\0016.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0017.tmp C:\\one-tests\\runs\\capture\\inbox\\0017.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "move C:\\one-tests\\runs\\capture\\inbox\\0018.tmp C:\\one-tests\\runs\\capture\\inbox\\0018.json", "exit": 0, "stdout": " 1 file(s) moved.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "ZipArchiveHelper : The process cannot access the file \r\n'C:\\one-tests\\runs\\capture\\controller.log' because it is being used by another \r\nprocess.\r\nAt C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\Modules\\Microsoft.PowerShell.Arch\r\nive\\Microsoft.PowerShell.Archive.psm1:631 char:30\r\n+ ... sArchived = ZipArchiveHelper $sourceFilePaths $destinationPath $compr ...\r\n+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n + CategoryInfo : PermissionDenied: (C:\\one-tests\\runs\\capture\\con \r\n troller.log:String) [Write-Error], IOException\r\n + FullyQualifiedErrorId : CompressArchiveUnauthorizedAccessError,ZipArchiv \r\n eHelper\r\n \r\n", "error": null}
diff --git a/corpus/conflict-page/native/b/machine.json b/corpus/conflict-page/native/b/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..844bc51f2eafc6db25c8e50620b8e329eb173289
--- /dev/null
+++ b/corpus/conflict-page/native/b/machine.json
@@ -0,0 +1 @@
+{"name": "m6-d63654a2", "hostname": "ONE-M6-D63654A2"}
diff --git a/corpus/conflict-page/native/b/teardown.json b/corpus/conflict-page/native/b/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/conflict-page/native/b/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/conflict-page/native/clients.json b/corpus/conflict-page/native/clients.json
new file mode 100644
index 0000000000000000000000000000000000000000..3d33f0e3408a7aaa0ca6279a8db3983cbb55d9f5
--- /dev/null
+++ b/corpus/conflict-page/native/clients.json
@@ -0,0 +1,4 @@
+{
+ "a": "m6-8a93780a",
+ "b": "m6-d63654a2"
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native/conflict.json b/corpus/conflict-page/native/conflict.json
new file mode 100644
index 0000000000000000000000000000000000000000..8a1442378c5f28dc3b321c2f15c3f17c5c7e68cb
--- /dev/null
+++ b/corpus/conflict-page/native/conflict.json
@@ -0,0 +1,15 @@
+{
+ "{64183EF4-4E19-0CBE-3D3B-88FF17D58B1C},1": [
+ "Client A disjoint edit.",
+ "Client B conflicting edit.",
+ "Client B disjoint cell.",
+ "Right cell"
+ ],
+ "{9C2E0DE1-2E23-094F-3F9F-A919195FC40D},1": [
+ "",
+ "Client A conflicting edit.",
+ "Client A disjoint edit.",
+ "Left cell",
+ "Right cell"
+ ]
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native/conflict/notebook/Open Notebook.onetoc2 b/corpus/conflict-page/native/conflict/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..c7beb44bf509f935090fe55e7549e4b50e0ae0e9
Binary files /dev/null and b/corpus/conflict-page/native/conflict/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native/conflict/notebook/synthetic.one b/corpus/conflict-page/native/conflict/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..8d01b4f2cf195178b1f688fe06874ed37eeab86c
Binary files /dev/null and b/corpus/conflict-page/native/conflict/notebook/synthetic.one differ
diff --git a/corpus/conflict-page/native/initial/notebook/Open Notebook.onetoc2 b/corpus/conflict-page/native/initial/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..c7beb44bf509f935090fe55e7549e4b50e0ae0e9
Binary files /dev/null and b/corpus/conflict-page/native/initial/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/conflict-page/native/initial/notebook/synthetic.one b/corpus/conflict-page/native/initial/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..e46d7a24cead34b8521bc6e1d117d68a9ff70f09
Binary files /dev/null and b/corpus/conflict-page/native/initial/notebook/synthetic.one differ
diff --git a/corpus/conflict-page/native/linux-teardown.json b/corpus/conflict-page/native/linux-teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/conflict-page/native/linux-teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/conflict-page/native/linux.json b/corpus/conflict-page/native/linux.json
new file mode 100644
index 0000000000000000000000000000000000000000..51c769af931eb724e1a4f34d25afa486513f27ae
--- /dev/null
+++ b/corpus/conflict-page/native/linux.json
@@ -0,0 +1,11 @@
+{
+ "cpus": 2,
+ "disk_gb": 16,
+ "hostname": "one-conflict",
+ "lab_address": "192.168.77.1",
+ "lab_mac": "52:54:04:69:39:00",
+ "memory_mb": 2048,
+ "samba_port": 14450,
+ "ssh_port": 22000,
+ "wan_mac": "52:54:03:76:a2:ae"
+}
\ No newline at end of file
diff --git a/corpus/conflict-page/native/native_conflict.py b/corpus/conflict-page/native/native_conflict.py
new file mode 100644
index 0000000000000000000000000000000000000000..ba5057280e4efb096969c86293a53973fdb8a19d
--- /dev/null
+++ b/corpus/conflict-page/native/native_conflict.py
@@ -0,0 +1,261 @@
+#!/usr/bin/env python3
+"""OneNote 2010 conflict pages: how they arise, what they store and how OneNote shows them.
+
+`sync LINUX OUTPUT` runs two disposable OneNote clients on one Samba notebook: client A edits
+two paragraphs offline while client B edits one of them and a table cell online; A then
+reconnects, which makes OneNote write a conflict page. The server file is kept before and
+after, A and B are screenshotted with the information bar, the page list shown, the conflict
+page open and its menu open, and A then deletes the conflict page through that menu.
+
+`cold NOTEBOOK OUTPUT [--delete]` cold-opens a notebook holding a conflict page in a fresh
+clone and screenshots the same views; `--delete` deletes the conflict page through the menu
+and captures the notebook OneNote leaves.
+"""
+import argparse
+from contextlib import ExitStack
+from concurrent.futures import ThreadPoolExecutor
+import base64
+import json
+from pathlib import Path
+import shutil
+import subprocess
+import sys
+import time
+import xml.etree.ElementTree as ET
+
+sys.path.insert(0, str(Path(__file__).resolve().parent))
+sys.path.insert(0, str(Path(__file__).resolve().parent / 'w7'))
+import native_runner as runner
+from native_runner import ROOT, clone, command, windows, vm
+import linux_vm
+
+FIXTURE = ROOT / 'corpus/native-ink/cold-ui-ink/notebook'
+SHARE = 'm6-conflict'
+ORIGINAL = 'Fictitious: café, 東京, مرحبا'
+OTHER_OUTLINE = 'Fictitious positioned outline.'
+CELL = 'Left cell'
+
+# Coordinates on OneNote 2010 maximized at 800x600, from the stage-5 and m8 captures: the
+# information bar's text, and the first conflict page listed under its page.
+BAR = (332, 100)
+FIRST_CONFLICT = (725, 142)
+
+
+def shot(name, output, label, script):
+ """Runs an AutoHotkey step on the clone, keeping its screenshot as `label.png`."""
+ (output / f'{label}.ahk').write_text(script)
+ result = windows.do_exec(script, target=name, timeout_ms=120000, shot_delay_ms=1500)
+ screenshot = result.pop('png_b64', None)
+ if screenshot:
+ (output / f'{label}.png').write_bytes(base64.b64decode(screenshot))
+ (output / f'{label}.json').write_text(json.dumps(result, indent=2))
+ if result.get('error') or result.get('exit') != 0:
+ raise RuntimeError(f'{label}: {result}')
+ return result
+
+
+def click(x, y):
+ return ('WinActivate("ahk_exe ONENOTE.EXE")\nCoordMode("Mouse", "Screen")\n'
+ f'Click({x}, {y})\nSleep(1200)\n')
+
+
+# Reports any dialog OneNote raised, so a confirmation shows in the step's record.
+DIALOG = ('if WinExist("ahk_class #32770 ahk_exe ONENOTE.EXE") {\n'
+ ' FileAppend("dialog: " WinGetTitle() " | " WinGetText() "`n", "*", "UTF-8")\n'
+ '}\n')
+
+
+def conflict_views(name, output, page, prefix, delete=False):
+ """Screenshots a page with a conflict page: the bar, the list shown, the conflict page and
+ its menu; `delete` then chooses Delete Conflict Page."""
+ shot(name, output, f'{prefix}-main', runner.navigation_script(page) + 'Sleep(2000)\n')
+ shot(name, output, f'{prefix}-shown', click(*BAR))
+ shot(name, output, f'{prefix}-conflict', click(*FIRST_CONFLICT))
+ shot(name, output, f'{prefix}-menu', click(*BAR))
+ if delete:
+ shot(name, output, f'{prefix}-delete', 'WinActivate("ahk_exe ONENOTE.EXE")\nSend("d")\nSleep(1500)\n' + DIALOG)
+ else:
+ shot(name, output, f'{prefix}-closed', 'WinActivate("ahk_exe ONENOTE.EXE")\nSend("{Esc}")\nSleep(800)\n')
+
+
+def cold(notebook, output, delete):
+ def interaction(name, output):
+ page = ET.parse(sorted((output / 'read').glob('page-*.xml'))[0]).getroot().attrib['ID']
+ conflict_views(name, output, page, 'cold', delete)
+ if delete:
+ # OneNote writes the deletion in the background; give it time before the re-read.
+ time.sleep(20)
+ runner.capture(notebook, output, collect_notebook=True, interaction=interaction)
+
+
+def sync(server, output):
+ from native_collaboration import reachable_page_text
+ from document_model import EXPORTER
+
+ if linux_vm.instance_path(server).exists():
+ raise ValueError('Choose a new Linux VM name; existing machines are not owned by this run.')
+ output = output.resolve()
+ output.mkdir(parents=True, exist_ok=False)
+ scripts = output / 'scripts'
+ scripts.mkdir()
+ for name in ('cold.ps1', 'collaborate.ps1', 'network.ps1', 'text.ps1', 'stress.ps1'):
+ shutil.copyfile(ROOT / 'tools/native' / name, scripts / name)
+ shutil.copyfile(Path(__file__), output / 'native_conflict.py')
+
+ def ssh(text, timeout=90):
+ result = linux_vm.run_ssh(server, text, timeout=timeout)
+ with (output / 'server.jsonl').open('a') as log:
+ log.write(json.dumps({'command': text, 'exit': result.returncode, 'stdout': result.stdout, 'stderr': result.stderr}) + '\n')
+ result.check_returncode()
+ return result.stdout
+
+ def server_state(label):
+ """Copies the server's notebook until it parses, keeping it as `label/notebook`."""
+ deadline = time.monotonic() + 120
+ while True:
+ target = output / label
+ shutil.rmtree(target, ignore_errors=True)
+ (target / 'notebook').mkdir(parents=True)
+ for name in ('synthetic.one', 'Open Notebook.onetoc2'):
+ with (target / 'notebook' / name).open('wb') as stream:
+ subprocess.run(linux_vm.ssh_argv(server, f"cat '/srv/agent/{SHARE}/{name}'"), stdout=stream, check=True, timeout=60)
+ result = subprocess.run([EXPORTER, target / 'notebook/synthetic.one', target / 'model'], capture_output=True, text=True)
+ if result.returncode == 0:
+ model = json.loads((target / 'model/document.json').read_text())
+ return reachable_page_text(model)
+ if time.monotonic() > deadline:
+ raise RuntimeError(f'{label}: {result.stderr}')
+ time.sleep(1)
+
+ linux_vm.create_instance(server)
+ try:
+ linux_vm.launch(server)
+ linux_vm.wait_instance(server, 600)
+ (output / 'linux.json').write_text(json.dumps(linux_vm.load_instance(server), indent=2))
+ ssh(f'mkdir /srv/agent/{SHARE}')
+ for name in ('synthetic.one', 'Open Notebook.onetoc2'):
+ with (FIXTURE / name).open('rb') as stream:
+ subprocess.run(linux_vm.ssh_argv(server, f"cat > '/srv/agent/{SHARE}/{name}'"), stdin=stream, check=True)
+ ssh(f'chmod u+w /srv/agent/{SHARE}/*')
+ with ExitStack() as stack:
+ labels = ['a', 'b']
+ for label in labels:
+ (output / label).mkdir()
+
+ def start(label):
+ manager = clone(output / label)
+ name = manager.__enter__()
+ return label, name, manager
+ with ThreadPoolExecutor(max_workers=2) as pool:
+ started = list(pool.map(start, labels))
+ for _, _, manager in started:
+ stack.push(manager)
+ clients = {}
+ for label, name, _ in started:
+ folder = output / label
+ for local in scripts.iterdir():
+ remote = 'cold-current.ps1' if local.name == 'cold.ps1' else local.name
+ result = windows.do_put(local, 'C:\\one-tests\\' + remote, name)
+ if result.get('error'): raise RuntimeError(result['error'])
+ command(name, 'mkdir C:\\one-tests\\runs\\capture', folder)
+ command(name, 'powershell -NoProfile -ExecutionPolicy Bypass -File C:\\one-tests\\network.ps1 -LabMac ' + vm.lab_mac(name), folder)
+ result = windows.do_spawn('cmd /c powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\collaborate.ps1 -Root C:\\one-tests\\runs\\capture -SharedPath \\\\192.168.77.1\\agent\\' + SHARE + ' -CloneHost ONE-' + name.upper() + ' > C:\\one-tests\\runs\\capture\\controller.log 2>&1', name)
+ if result.get('error'): raise RuntimeError(result['error'])
+ deadline = time.monotonic() + 180
+ while windows.do_cmd('if exist C:\\one-tests\\runs\\capture\\ready (echo ready)', target=name).get('stdout', '').find('ready') < 0:
+ if time.monotonic() > deadline: raise RuntimeError('The collaboration controller did not open the notebook')
+ time.sleep(1)
+ clients[label] = {'name': name, 'folder': folder, 'sequence': 0}
+ (output / 'clients.json').write_text(json.dumps({label: client['name'] for label, client in clients.items()}, indent=2))
+
+ def action(client, kind, **parameters):
+ client['sequence'] += 1
+ sequence = client['sequence']
+ local = client['folder'] / f'command-{sequence:04}.json'
+ local.write_text(json.dumps({'action': kind, **parameters}, ensure_ascii=False))
+ inbox = f'C:\\one-tests\\runs\\capture\\inbox\\{sequence:04}'
+ result = windows.do_put(local, inbox + '.tmp', client['name'])
+ if result.get('error'): raise RuntimeError(result['error'])
+ command(client['name'], f'move {inbox}.tmp {inbox}.json', client['folder'])
+ remote = f'C:\\one-tests\\runs\\capture\\outbox\\{sequence}'
+ deadline = time.monotonic() + 600
+ while True:
+ result = windows.do_cmd(f'if exist {remote}\\error (type {remote}\\error & exit /b 1) else (if exist {remote}\\done (echo complete))', target=client['name'])
+ if result.get('exit') != 0: raise RuntimeError(str(result))
+ if 'complete' in result.get('stdout', ''): break
+ if time.monotonic() > deadline: raise TimeoutError(f'{kind} did not complete')
+ time.sleep(.5)
+ if kind != 'snapshot':
+ return None
+ hierarchy = client['folder'] / f'hierarchy-{sequence:04}.xml'
+ windows.do_get(remote + '\\hierarchy.xml', hierarchy, client['name'])
+ pages = [node for node in ET.fromstring(hierarchy.read_text(encoding='utf-8-sig').strip()).iter() if node.tag.endswith('}Page')]
+ for i in range(len(pages)):
+ windows.do_get(remote + f'\\page-{i}.xml', client['folder'] / f'snapshot-{sequence:04}-{i}.xml', client['name'])
+ return pages
+
+ def settle(client, check, label):
+ deadline = time.monotonic() + 300
+ while True:
+ action(client, 'sync')
+ state = server_state(label)
+ if check(state): return state
+ if time.monotonic() > deadline: raise TimeoutError(f'{label}: {state}')
+ time.sleep(2)
+
+ a, b = clients['a'], clients['b']
+ texts = lambda state: {text for values in state.values() for text in values}
+ server_state('initial')
+ vm.qmp(a['name'], 'set_link', {'name': 'lab', 'up': False})
+ try:
+ action(a, 'edit', expected=ORIGINAL, text='Client A conflicting edit.')
+ action(a, 'edit', expected=OTHER_OUTLINE, text='Client A disjoint edit.')
+ action(a, 'snapshot')
+ action(b, 'edit', expected=ORIGINAL, text='Client B conflicting edit.')
+ action(b, 'edit', expected=CELL, text='Client B disjoint cell.')
+ settle(b, lambda state: {'Client B conflicting edit.', 'Client B disjoint cell.'} <= texts(state), 'b-published')
+ finally:
+ vm.qmp(a['name'], 'set_link', {'name': 'lab', 'up': True})
+ state = settle(a, lambda state: len(state) > 1 and 'Client A disjoint edit.' in texts(state), 'conflict')
+ (output / 'conflict.json').write_text(json.dumps(state, indent=2, ensure_ascii=False))
+ page = action(a, 'snapshot')[0].attrib['ID']
+ conflict_views(a['name'], output / 'a', page, 'a')
+ action(b, 'sync')
+ time.sleep(5)
+ page_b = action(b, 'snapshot')[0].attrib['ID']
+ conflict_views(b['name'], output / 'b', page_b, 'b')
+ conflict_views(a['name'], output / 'a', page, 'a-again', delete=True)
+ state = settle(a, lambda state: len(state) == 1, 'deleted')
+ (output / 'deleted.json').write_text(json.dumps(state, indent=2, ensure_ascii=False))
+ action(b, 'sync')
+ time.sleep(5)
+ shot(b['name'], output / 'b', 'b-after-delete', runner.navigation_script(page_b) + 'Sleep(2000)\n')
+ for client in clients.values():
+ try:
+ action(client, 'close')
+ except Exception as error:
+ (client['folder'] / 'close-failure.txt').write_text(str(error))
+ server_state('final')
+ finally:
+ if linux_vm.running(server):
+ linux_vm.shutdown(server, 120)
+ linux_vm.delete_instance(server)
+ (output / 'linux-teardown.json').write_text(json.dumps({'absent': not linux_vm.instance_path(server).exists()}) + '\n')
+
+
+if __name__ == '__main__':
+ parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
+ commands = parser.add_subparsers(dest='mode', required=True)
+ lab = commands.add_parser('sync')
+ lab.add_argument('linux')
+ lab.add_argument('output', type=Path)
+ reopen = commands.add_parser('cold')
+ reopen.add_argument('notebook', type=Path)
+ reopen.add_argument('output', type=Path)
+ reopen.add_argument('--delete', action='store_true')
+ args = parser.parse_args()
+ if args.mode == 'sync':
+ sync(args.linux, args.output)
+ else:
+ cold(args.notebook, args.output, args.delete)
+ print('Captured', args.output)
diff --git a/corpus/conflict-page/native/scripts/cold.ps1 b/corpus/conflict-page/native/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/conflict-page/native/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/conflict-page/native/scripts/collaborate.ps1 b/corpus/conflict-page/native/scripts/collaborate.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..4a13a4320675250d49eac958bd3a020ca3b882f6
--- /dev/null
+++ b/corpus/conflict-page/native/scripts/collaborate.ps1
@@ -0,0 +1,105 @@
+param([Parameter(Mandatory=$true)][string]$Root,
+ [Parameter(Mandatory=$true)][string]$SharedPath,
+ [Parameter(Mandatory=$true)][string]$CloneHost,
+ [switch]$ResumeCache,
+ [int]$StartSequence = 1)
+function Keep-Container($page, $target) {
+ $container = $target
+ while ($container.ParentNode -ne $page.DocumentElement) { $container = $container.ParentNode }
+ foreach ($sibling in @($page.DocumentElement.ChildNodes)) {
+ if ($sibling -ne $container -and $sibling.LocalName -in @('Outline', 'Title', 'Image', 'InkDrawing')) {
+ [void]$page.DocumentElement.RemoveChild($sibling)
+ }
+ }
+}
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+. "$PSScriptRoot\text.ps1"
+if ($SharedPath -notmatch '^\\\\192\.168\.77\.1\\agent\\m6-[a-z0-9-]+$') { throw 'Choose a disposable Linux lab notebook.' }
+if ($env:COMPUTERNAME -ne $CloneHost) { throw 'The collaboration controller requires its owned clone.' }
+if (-not $ResumeCache) { & "$PSScriptRoot\cold-current.ps1" -Root $Root -CloneHost $CloneHost }
+$shared = $SharedPath
+if (-not (Test-Path "$shared\synthetic.one")) { throw 'Create the shared fixture first.' }
+New-Item -ItemType Directory "$Root\inbox", "$Root\outbox" -Force | Out-Null
+$user = 'HKCU:\Software\Microsoft\Office\Common\UserInfo'
+New-Item $user -Force | Out-Null
+New-ItemProperty $user -Name UserName -Value $CloneHost -PropertyType String -Force | Out-Null
+New-ItemProperty $user -Name UserInitials -Value $CloneHost.Substring($CloneHost.Length - 3) -PropertyType String -Force | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebook = ''
+try {
+ $app.OpenHierarchy($shared, '', [ref]$notebook, 0)
+ $section = ''
+ $app.OpenHierarchy('synthetic.one', $notebook, [ref]$section, 0)
+ [IO.File]::WriteAllText("$Root\ready", 'ready')
+ $deadline = [DateTime]::UtcNow.AddMinutes(30)
+ $sequence = $StartSequence
+ while ([DateTime]::UtcNow -lt $deadline) {
+ $name = '{0:d4}.json' -f $sequence
+ $input = "$Root\inbox\$name"
+ if (-not (Test-Path $input)) { Start-Sleep -Milliseconds 100; continue }
+ $command = Get-Content -Raw -Encoding UTF8 $input | ConvertFrom-Json
+ $output = "$Root\outbox\$sequence"
+ New-Item -ItemType Directory $output | Out-Null
+ try {
+ if ($command.action -in @('prepare-stress', 'stress')) {
+ . "$PSScriptRoot\stress.ps1"
+ Invoke-Stress $app $section $command $output $shared
+ }
+ elseif ($command.action -eq 'sync') { $app.SyncHierarchy($notebook) }
+ elseif ($command.action -eq 'kill-process') {
+ Get-Process ONENOTE | Stop-Process -Force
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ $app = New-Object -ComObject OneNote.Application
+ $app.OpenHierarchy($shared, '', [ref]$notebook, 0)
+ $app.OpenHierarchy('synthetic.one', $notebook, [ref]$section, 0)
+ }
+ elseif ($command.action -eq 'edit' -or $command.action -eq 'snapshot') {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText("$output\hierarchy.xml", $hierarchy, [Text.Encoding]::UTF8)
+ [xml]$tree = $hierarchy
+ $matches = 0
+ $editedPage = $null
+ $i = 0
+ foreach ($node in $tree.SelectNodes('//*[local-name()="Page"]')) {
+ $content = ''
+ $app.GetPageContent($node.GetAttribute('ID'), [ref]$content, 1, 1)
+ [IO.File]::WriteAllText("$output\page-$i.xml", $content, [Text.Encoding]::UTF8)
+ [xml]$page = $content
+ if ($command.action -eq 'edit') {
+ $targets = @($page.SelectNodes('//*[local-name()="T"]') | Where-Object {
+ (Get-ParagraphText $_.InnerText) -eq $command.expected
+ })
+ if ($targets.Count -gt 1) { throw 'Expected one matching text object.' }
+ if ($targets.Count -eq 1) {
+ $matches++
+ if ($matches -gt 1) { throw 'The text occurs on multiple pages.' }
+ $targets[0].InnerText = [Security.SecurityElement]::Escape($command.text)
+ Keep-Container $page $targets[0]
+ $editedPage = $page
+ }
+ }
+ $i++
+ }
+ if ($command.action -eq 'edit' -and $matches -ne 1) { throw 'Expected one matching text object.' }
+ if ($editedPage) { $app.UpdatePageContent($editedPage.OuterXml, [DateTime]::MinValue, 1, $false) }
+ } elseif ($command.action -ne 'close') { throw 'Unknown collaboration command.' }
+ [IO.File]::WriteAllText("$output\done", 'ok')
+ } catch {
+ [IO.File]::WriteAllText("$output\error", $_.Exception.ToString())
+ }
+ if ($command.action -eq 'close') { break }
+ $sequence++
+ }
+} finally {
+ try { if ($notebook) { $app.CloseNotebook($notebook, $false) } }
+ finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ [IO.File]::WriteAllText("$Root\closed", 'closed')
+ }
+}
diff --git a/corpus/conflict-page/native/scripts/network.ps1 b/corpus/conflict-page/native/scripts/network.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..95fa83d5243ee6a2a653cc075128b063e2f09cf2
--- /dev/null
+++ b/corpus/conflict-page/native/scripts/network.ps1
@@ -0,0 +1,20 @@
+param([Parameter(Mandatory=$true)][string]$LabMac)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$adapter = @(Get-WmiObject Win32_NetworkAdapterConfiguration | Where-Object { $_.MACAddress -eq $LabMac })
+if ($adapter.Count -ne 1) { throw 'The clone lab adapter is ambiguous.' }
+$enabled = $adapter[0].EnableDHCP()
+if ($enabled.ReturnValue -notin @(0, 1)) {
+ throw ('Unable to enable DHCP on the clone lab adapter; result ' + $enabled.ReturnValue)
+}
+$release = $adapter[0].ReleaseDHCPLease()
+$result = $adapter[0].RenewDHCPLease()
+$deadline = [DateTime]::UtcNow.AddSeconds(60)
+do {
+ $adapter = @(Get-WmiObject Win32_NetworkAdapterConfiguration | Where-Object { $_.MACAddress -eq $LabMac })
+ $addresses = @($adapter[0].IPAddress | Where-Object { $_ -match '^192\.168\.77\.\d+$' -and $_ -ne '192.168.77.1' })
+ if ($addresses.Count -eq 1) { break }
+ Start-Sleep -Milliseconds 250
+} while ([DateTime]::UtcNow -lt $deadline)
+if ($addresses.Count -ne 1) { throw ('The clone did not receive a lab IPv4 address; renewal result ' + $result.ReturnValue + '; adapter ' + ($adapter[0] | Select-Object MACAddress,DHCPEnabled,IPEnabled,IPAddress | ConvertTo-Json -Compress)) }
+@{mac=$LabMac;address=$addresses[0];releaseResult=$release.ReturnValue;renewalResult=$result.ReturnValue} | ConvertTo-Json -Compress
diff --git a/corpus/conflict-page/native/scripts/stress.ps1 b/corpus/conflict-page/native/scripts/stress.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0ab5bc69b4dabe970373e481873dfd951a1a69a
--- /dev/null
+++ b/corpus/conflict-page/native/scripts/stress.ps1
@@ -0,0 +1,83 @@
+function Invoke-Stress($app, $section, $command, $output, $shared) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText("$output\hierarchy.xml", $hierarchy, [Text.Encoding]::UTF8)
+ [xml]$tree = $hierarchy
+ $pages = @($tree.SelectNodes('//*[local-name()="Page"]'))
+ if ($pages.Count -ne 1) { throw 'Expected one stress-test page.' }
+ $pageId = $pages[0].GetAttribute('ID')
+ if ($command.action -eq 'prepare-stress') {
+ for ($i = 0; $i -lt $command.clients; $i++) {
+ $xml = ''
+ $app.UpdatePageContent($xml, [DateTime]::MinValue, 1, $false)
+ }
+ return
+ }
+ $random = New-Object Random([int]$command.seed)
+ $events = New-Object IO.StreamWriter("$output\events.jsonl", $false, [Text.Encoding]::UTF8)
+ $events.AutoFlush = $true
+ try {
+ [IO.File]::WriteAllText("$output\ready", 'ready')
+ $deadline = [DateTime]::UtcNow.AddMinutes(10)
+ while (-not (Test-Path "$shared\stress-start")) {
+ if ([DateTime]::UtcNow -gt $deadline) { throw 'Stress start timed out.' }
+ Start-Sleep -Milliseconds 20
+ }
+ for ($i = 0; $i -lt $command.operations; $i++) {
+ if (($command.PSObject.Properties.Name -contains 'maintenance') -and $command.maintenance -and $i -eq [Math]::Floor($command.operations / 2)) {
+ [IO.File]::WriteAllText("$shared\maintenance-paused-n$($command.actor)", 'paused')
+ while (-not (Test-Path "$shared\maintenance-resume")) {
+ if ([DateTime]::UtcNow -gt $deadline) { throw 'Maintenance pause timed out.' }
+ Start-Sleep -Milliseconds 100
+ }
+ }
+ Start-Sleep -Milliseconds $random.Next(10, 100)
+ $started = [DateTime]::UtcNow.Ticks
+ $content = ''
+ $app.GetPageContent($pageId, [ref]$content, 1, 1)
+ [xml]$page = $content
+ $matches = @($page.SelectNodes('//*[local-name()="T"]') | Where-Object {
+ (Get-ParagraphText $_.InnerText).StartsWith($command.prefix)
+ })
+ if ($matches.Count -ne 1) { throw 'Expected one stress-test paragraph.' }
+ $before = Get-ParagraphText $matches[0].InnerText
+ $token = ' [n' + $command.actor + ':' + $i + ']'
+ $start = $end = $before.Length
+ $replacement = $token
+ $bold = $italic = $false
+ if ($command.edit) {
+ $boundaries = New-Object 'Collections.Generic.List[int]'
+ for ($at = $command.prefix.Length; $at -le $before.Length; $at++) {
+ $boundaries.Add($at)
+ if ($at -lt $before.Length -and [char]::IsHighSurrogate($before[$at])) { $at++ }
+ }
+ $first = $boundaries[$random.Next($boundaries.Count)]
+ $second = $boundaries[$random.Next($boundaries.Count)]
+ $start = [Math]::Min($first, $second)
+ $end = [Math]::Max($first, $second)
+ $replacement = ' caf' + [char]0xe9 + ' ' + [char]::ConvertFromUtf32(0x1f980) + $token
+ $bold = $random.Next(2) -eq 1
+ $italic = $random.Next(2) -eq 1
+ }
+ $after = $before.Substring(0, $start) + $replacement + $before.Substring($end)
+ $html = [Security.SecurityElement]::Escape($after)
+ if ($command.edit) {
+ $weight = if ($bold) { 'bold' } else { 'normal' }
+ $style = if ($italic) { 'italic' } else { 'normal' }
+ $html = '' + $html + ''
+ }
+ $matches[0].InnerText = $html
+ Keep-Container $page $matches[0]
+ $updateStarted = [DateTime]::UtcNow.Ticks
+ $app.UpdatePageContent($page.OuterXml, [DateTime]::MinValue, 1, $false)
+ $updated = [DateTime]::UtcNow.Ticks
+ $events.WriteLine((@{ operation=$i; before=$before; token=$token; started_ticks=$started;
+ range=@($start, $end); replacement=$replacement; bold=$bold; italic=$italic;
+ update_started_ticks=$updateStarted; updated_ticks=$updated } | ConvertTo-Json -Compress))
+ if ($i -eq 0) { [IO.File]::WriteAllText("$output\editing", 'editing') }
+ if ($command.sync_every -gt 0 -and (($i + 1) % $command.sync_every) -eq 0) {
+ $app.SyncHierarchy($section)
+ }
+ }
+ } finally { $events.Dispose() }
+}
diff --git a/corpus/conflict-page/native/scripts/text.ps1 b/corpus/conflict-page/native/scripts/text.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..75e9e71207b599d16eaaf68824ca30831860610a
--- /dev/null
+++ b/corpus/conflict-page/native/scripts/text.ps1
@@ -0,0 +1,13 @@
+function Get-ParagraphText([string]$html) {
+ $plain = [regex]::Replace($html, '<[^>]*>', '')
+ $plain = [regex]::Replace($plain, '&#(?:x([0-9a-fA-F]+)|([0-9]+));', {
+ param($match)
+ $value = if ($match.Groups[1].Success) {
+ [Convert]::ToInt32($match.Groups[1].Value, 16)
+ } else { [int]$match.Groups[2].Value }
+ # The Win7 framework leaves supplementary numeric entities undecoded.
+ if ($value -gt 0xffff -and $value -le 0x10ffff) { [char]::ConvertFromUtf32($value) }
+ else { $match.Value }
+ })
+ [Net.WebUtility]::HtmlDecode($plain)
+}
diff --git a/corpus/conflict-page/native/server.jsonl b/corpus/conflict-page/native/server.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..d5df993564a30ddaea1b427699648ff9b1a1417d
--- /dev/null
+++ b/corpus/conflict-page/native/server.jsonl
@@ -0,0 +1,2 @@
+{"command": "mkdir /srv/agent/m6-conflict", "exit": 0, "stdout": "", "stderr": ""}
+{"command": "chmod u+w /srv/agent/m6-conflict/*", "exit": 0, "stdout": "", "stderr": ""}
diff --git a/corpus/extended-ascii/README.md b/corpus/extended-ascii/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..873405ca5918c84f20bd12c78c2bef1eb7adb4cb
--- /dev/null
+++ b/corpus/extended-ascii/README.md
@@ -0,0 +1,9 @@
+# Extended ASCII text
+
+`TextExtendedAscii` (`0x1c003498`, MS-ONE 2.2.89) names no code page. Each `candidate`
+is `m6/ansi/notebook` with the paragraph's `RichEditTextLangID` (`0x10001cfe`) set to
+0x0409 (`en`), 0x0419 (`ru`, ANSI code page 1251) or 0x0411 (`ja`, code page 932); its
+text holds the bytes 0x80–0xFF. `cold` is each one's fresh OneNote 2010 read: all three
+export U+0080–U+00FF, so OneNote reads the bytes as Latin-1 whatever the language, and
+`read/page-000.png` shows 0x80–0x9F as nothing and 0xC0 as À rather than Cyrillic А.
+OneNote left the section files unchanged.
diff --git a/corpus/extended-ascii/en/candidate/Open Notebook.onetoc2 b/corpus/extended-ascii/en/candidate/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..a33d3bfd210f844e3db618e648ac898adeee09c6
Binary files /dev/null and b/corpus/extended-ascii/en/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/extended-ascii/en/candidate/synthetic.one b/corpus/extended-ascii/en/candidate/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..d2ed44f1e9f620a51ba6e44d52867ebcb5d9ee16
Binary files /dev/null and b/corpus/extended-ascii/en/candidate/synthetic.one differ
diff --git a/corpus/extended-ascii/en/cold/commands.jsonl b/corpus/extended-ascii/en/cold/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..1b14b83ce031e1dc4b11a4d3f159a39c13615d7a
--- /dev/null
+++ b/corpus/extended-ascii/en/cold/commands.jsonl
@@ -0,0 +1,3 @@
+{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-A375E105 -ExpectedPages 1 -KeepOpen", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/extended-ascii/en/cold/machine.json b/corpus/extended-ascii/en/cold/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..57863a786fdc66a1bf4d1f75151759a2f20903fc
--- /dev/null
+++ b/corpus/extended-ascii/en/cold/machine.json
@@ -0,0 +1 @@
+{"name": "m6-a375e105", "hostname": "ONE-M6-A375E105"}
diff --git a/corpus/extended-ascii/en/cold/notebook/Open Notebook.onetoc2 b/corpus/extended-ascii/en/cold/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..a33d3bfd210f844e3db618e648ac898adeee09c6
Binary files /dev/null and b/corpus/extended-ascii/en/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/extended-ascii/en/cold/notebook/synthetic.one b/corpus/extended-ascii/en/cold/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..d2ed44f1e9f620a51ba6e44d52867ebcb5d9ee16
Binary files /dev/null and b/corpus/extended-ascii/en/cold/notebook/synthetic.one differ
diff --git a/corpus/extended-ascii/en/cold/read/environment.json b/corpus/extended-ascii/en/cold/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..fcb5a8538909915c2c9f4a7c9e1a70717a4d7647
--- /dev/null
+++ b/corpus/extended-ascii/en/cold/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-A375E105",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/extended-ascii/en/cold/read/hierarchy.xml b/corpus/extended-ascii/en/cold/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fa4d29784012bad3829a8ecd7052cd044813a56f
--- /dev/null
+++ b/corpus/extended-ascii/en/cold/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/extended-ascii/en/cold/read/page-000.navigation.json b/corpus/extended-ascii/en/cold/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..f55849761016bf753db6dc26da07ab49553ce0a6
--- /dev/null
+++ b/corpus/extended-ascii/en/cold/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Extended bytes: \u0080 \u0081 \u0082 \u0083 \u0084 \u0085 \u0086 \u0087 \u0088 \u0089 \u008a \u008b \u008c \u008d \u008e \u008f \u0090 - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/extended-ascii/en/cold/read/page-000.png b/corpus/extended-ascii/en/cold/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa6b6e3797f63f2489c730ddf74e2ee8fc18f279
Binary files /dev/null and b/corpus/extended-ascii/en/cold/read/page-000.png differ
diff --git a/corpus/extended-ascii/en/cold/read/page-000.xml b/corpus/extended-ascii/en/cold/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4a5baca4877801b2a1b4c88c5df1fda85d1d80f1
--- /dev/null
+++ b/corpus/extended-ascii/en/cold/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/extended-ascii/en/cold/read/payloads.json b/corpus/extended-ascii/en/cold/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/extended-ascii/en/cold/read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/extended-ascii/en/cold/run.json b/corpus/extended-ascii/en/cold/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..7d96357217a412779632df1272e8d93361ea1931
--- /dev/null
+++ b/corpus/extended-ascii/en/cold/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/ansi-lang/en/notebook",
+ "expected_pages": 1,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "04013bfcccee40a17e2a225f9b9e96f40a3a8daad9e350609654f8eda3ccbb41"
+ }
+}
diff --git a/corpus/extended-ascii/en/cold/scripts/cold.ps1 b/corpus/extended-ascii/en/cold/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/extended-ascii/en/cold/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/extended-ascii/en/cold/scripts/read.ps1 b/corpus/extended-ascii/en/cold/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..476094ab1e0c47077988a6461db2080cf208642b
--- /dev/null
+++ b/corpus/extended-ascii/en/cold/scripts/read.ps1
@@ -0,0 +1,142 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ $payloads += @{ page = $id; object = $file.ParentNode.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/extended-ascii/en/cold/source.json b/corpus/extended-ascii/en/cold/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..d3e5ffe17dfc9c590b42235a151cbd45cbf9aab2
--- /dev/null
+++ b/corpus/extended-ascii/en/cold/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 4816,
+ "sha256": "b2f857961b76258a1582b402c048b340e89962257681426b3bfc58df8e0adbfa",
+ "mtime_ns": 1790487072902156985
+ },
+ {
+ "path": "synthetic.one",
+ "bytes": 12456,
+ "sha256": "aa6f1188773f1cc41cc5c619f213ce04b30592320c6b2e32b2b4c91639423ab4",
+ "mtime_ns": 1790487072902335569
+ }
+]
diff --git a/corpus/extended-ascii/en/cold/teardown.json b/corpus/extended-ascii/en/cold/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/extended-ascii/en/cold/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/extended-ascii/ja/candidate/Open Notebook.onetoc2 b/corpus/extended-ascii/ja/candidate/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..a33d3bfd210f844e3db618e648ac898adeee09c6
Binary files /dev/null and b/corpus/extended-ascii/ja/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/extended-ascii/ja/candidate/synthetic.one b/corpus/extended-ascii/ja/candidate/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..c15b622081fc5df7733206820860626a18c0521f
Binary files /dev/null and b/corpus/extended-ascii/ja/candidate/synthetic.one differ
diff --git a/corpus/extended-ascii/ja/cold/commands.jsonl b/corpus/extended-ascii/ja/cold/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..09a67abb1857d332e99ed1eadf88fdf023df14c0
--- /dev/null
+++ b/corpus/extended-ascii/ja/cold/commands.jsonl
@@ -0,0 +1,3 @@
+{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-8DC7DCC7 -ExpectedPages 1 -KeepOpen", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/extended-ascii/ja/cold/machine.json b/corpus/extended-ascii/ja/cold/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..7a96f7cfbb857707e13a4e759dd5cb9664973b3f
--- /dev/null
+++ b/corpus/extended-ascii/ja/cold/machine.json
@@ -0,0 +1 @@
+{"name": "m6-8dc7dcc7", "hostname": "ONE-M6-8DC7DCC7"}
diff --git a/corpus/extended-ascii/ja/cold/notebook/Open Notebook.onetoc2 b/corpus/extended-ascii/ja/cold/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..a33d3bfd210f844e3db618e648ac898adeee09c6
Binary files /dev/null and b/corpus/extended-ascii/ja/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/extended-ascii/ja/cold/notebook/synthetic.one b/corpus/extended-ascii/ja/cold/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..c15b622081fc5df7733206820860626a18c0521f
Binary files /dev/null and b/corpus/extended-ascii/ja/cold/notebook/synthetic.one differ
diff --git a/corpus/extended-ascii/ja/cold/read/environment.json b/corpus/extended-ascii/ja/cold/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..5d25d66b05678d093c31c8611399998b97e017a9
--- /dev/null
+++ b/corpus/extended-ascii/ja/cold/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-8DC7DCC7",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/extended-ascii/ja/cold/read/hierarchy.xml b/corpus/extended-ascii/ja/cold/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f007d2a89ff7d4305b16385dd20d179cbe89c671
--- /dev/null
+++ b/corpus/extended-ascii/ja/cold/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/extended-ascii/ja/cold/read/page-000.navigation.json b/corpus/extended-ascii/ja/cold/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..f55849761016bf753db6dc26da07ab49553ce0a6
--- /dev/null
+++ b/corpus/extended-ascii/ja/cold/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Extended bytes: \u0080 \u0081 \u0082 \u0083 \u0084 \u0085 \u0086 \u0087 \u0088 \u0089 \u008a \u008b \u008c \u008d \u008e \u008f \u0090 - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/extended-ascii/ja/cold/read/page-000.png b/corpus/extended-ascii/ja/cold/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..32aeda3c9e3dea9b2d0a652414d228d486b0f4f2
Binary files /dev/null and b/corpus/extended-ascii/ja/cold/read/page-000.png differ
diff --git a/corpus/extended-ascii/ja/cold/read/page-000.xml b/corpus/extended-ascii/ja/cold/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..10ac23b6e39ed1116912c93e9a83d1994aa09335
--- /dev/null
+++ b/corpus/extended-ascii/ja/cold/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/extended-ascii/ja/cold/read/payloads.json b/corpus/extended-ascii/ja/cold/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/extended-ascii/ja/cold/read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/extended-ascii/ja/cold/run.json b/corpus/extended-ascii/ja/cold/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..5e2d4b5264e879413dc43a7e9f6a66cbfdf9dd19
--- /dev/null
+++ b/corpus/extended-ascii/ja/cold/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/ansi-lang/ja/notebook",
+ "expected_pages": 1,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "04013bfcccee40a17e2a225f9b9e96f40a3a8daad9e350609654f8eda3ccbb41"
+ }
+}
diff --git a/corpus/extended-ascii/ja/cold/scripts/cold.ps1 b/corpus/extended-ascii/ja/cold/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/extended-ascii/ja/cold/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/extended-ascii/ja/cold/scripts/read.ps1 b/corpus/extended-ascii/ja/cold/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..476094ab1e0c47077988a6461db2080cf208642b
--- /dev/null
+++ b/corpus/extended-ascii/ja/cold/scripts/read.ps1
@@ -0,0 +1,142 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ $payloads += @{ page = $id; object = $file.ParentNode.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/extended-ascii/ja/cold/source.json b/corpus/extended-ascii/ja/cold/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..741eec391e4355839f257cefd01dd18b8a7df53b
--- /dev/null
+++ b/corpus/extended-ascii/ja/cold/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 4816,
+ "sha256": "b2f857961b76258a1582b402c048b340e89962257681426b3bfc58df8e0adbfa",
+ "mtime_ns": 1790487072903313695
+ },
+ {
+ "path": "synthetic.one",
+ "bytes": 12456,
+ "sha256": "b792b045a793ef97ded2a9d6ab456070fb5d9d3f48763067ed5e24bde482358a",
+ "mtime_ns": 1790487072903438737
+ }
+]
diff --git a/corpus/extended-ascii/ja/cold/teardown.json b/corpus/extended-ascii/ja/cold/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/extended-ascii/ja/cold/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/extended-ascii/ru/candidate/Open Notebook.onetoc2 b/corpus/extended-ascii/ru/candidate/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..a33d3bfd210f844e3db618e648ac898adeee09c6
Binary files /dev/null and b/corpus/extended-ascii/ru/candidate/Open Notebook.onetoc2 differ
diff --git a/corpus/extended-ascii/ru/candidate/synthetic.one b/corpus/extended-ascii/ru/candidate/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..45c40a62a8fa360a8ffe1cf02ed36a71ddbf91c0
Binary files /dev/null and b/corpus/extended-ascii/ru/candidate/synthetic.one differ
diff --git a/corpus/extended-ascii/ru/cold/commands.jsonl b/corpus/extended-ascii/ru/cold/commands.jsonl
new file mode 100644
index 0000000000000000000000000000000000000000..fd5f5a24943070a800781a23db1508f1cceaf637
--- /dev/null
+++ b/corpus/extended-ascii/ru/cold/commands.jsonl
@@ -0,0 +1,3 @@
+{"command": "powershell -NoProfile -Command \"Expand-Archive -LiteralPath C:\\one-tests\\transfer.zip -DestinationPath C:\\one-tests\\runs\\capture\\notebook\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File C:\\one-tests\\read-current.ps1 -Root C:\\one-tests\\runs\\capture -CloneHost ONE-M6-2B8202A3 -ExpectedPages 1 -KeepOpen", "exit": 0, "stdout": "Read 1 sections and 1 pages.\r\n", "stderr": "", "error": null}
+{"command": "powershell -NoProfile -Command \"Compress-Archive -Force -Path C:\\one-tests\\runs\\capture\\* -DestinationPath C:\\one-tests\\captured.zip\"", "exit": 0, "stdout": "", "stderr": "", "error": null}
diff --git a/corpus/extended-ascii/ru/cold/machine.json b/corpus/extended-ascii/ru/cold/machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..c0c1f5fced309e8a81ce576ebbe21e6841635728
--- /dev/null
+++ b/corpus/extended-ascii/ru/cold/machine.json
@@ -0,0 +1 @@
+{"name": "m6-2b8202a3", "hostname": "ONE-M6-2B8202A3"}
diff --git a/corpus/extended-ascii/ru/cold/notebook/Open Notebook.onetoc2 b/corpus/extended-ascii/ru/cold/notebook/Open Notebook.onetoc2
new file mode 100644
index 0000000000000000000000000000000000000000..a33d3bfd210f844e3db618e648ac898adeee09c6
Binary files /dev/null and b/corpus/extended-ascii/ru/cold/notebook/Open Notebook.onetoc2 differ
diff --git a/corpus/extended-ascii/ru/cold/notebook/synthetic.one b/corpus/extended-ascii/ru/cold/notebook/synthetic.one
new file mode 100644
index 0000000000000000000000000000000000000000..45c40a62a8fa360a8ffe1cf02ed36a71ddbf91c0
Binary files /dev/null and b/corpus/extended-ascii/ru/cold/notebook/synthetic.one differ
diff --git a/corpus/extended-ascii/ru/cold/read/environment.json b/corpus/extended-ascii/ru/cold/read/environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..7bebbff19e046fca4248fbe1866abe0aded53b6e
--- /dev/null
+++ b/corpus/extended-ascii/ru/cold/read/environment.json
@@ -0,0 +1,7 @@
+{
+ "powershell": "5.1.14409.1005",
+ "schema": "xs2010",
+ "hostname": "ONE-M6-2B8202A3",
+ "cold": true,
+ "onenote": "14.0.4763.1000"
+}
diff --git a/corpus/extended-ascii/ru/cold/read/hierarchy.xml b/corpus/extended-ascii/ru/cold/read/hierarchy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4bacc530ba83fcb77bd446d98f5f7235a277ca21
--- /dev/null
+++ b/corpus/extended-ascii/ru/cold/read/hierarchy.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/extended-ascii/ru/cold/read/page-000.navigation.json b/corpus/extended-ascii/ru/cold/read/page-000.navigation.json
new file mode 100644
index 0000000000000000000000000000000000000000..f55849761016bf753db6dc26da07ab49553ce0a6
--- /dev/null
+++ b/corpus/extended-ascii/ru/cold/read/page-000.navigation.json
@@ -0,0 +1,13 @@
+{
+ "exit": 0,
+ "stdout": "",
+ "stderr": "",
+ "w": 800,
+ "h": 600,
+ "error": null,
+ "win": {
+ "title": "Extended bytes: \u0080 \u0081 \u0082 \u0083 \u0084 \u0085 \u0086 \u0087 \u0088 \u0089 \u008a \u008b \u008c \u008d \u008e \u008f \u0090 - Microsoft OneNote",
+ "class": "Framework::CFrame",
+ "dialog": false
+ }
+}
\ No newline at end of file
diff --git a/corpus/extended-ascii/ru/cold/read/page-000.png b/corpus/extended-ascii/ru/cold/read/page-000.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa6b6e3797f63f2489c730ddf74e2ee8fc18f279
Binary files /dev/null and b/corpus/extended-ascii/ru/cold/read/page-000.png differ
diff --git a/corpus/extended-ascii/ru/cold/read/page-000.xml b/corpus/extended-ascii/ru/cold/read/page-000.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c4553c063a192e9509c702e94a3b772ef09903b4
--- /dev/null
+++ b/corpus/extended-ascii/ru/cold/read/page-000.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/corpus/extended-ascii/ru/cold/read/payloads.json b/corpus/extended-ascii/ru/cold/read/payloads.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ce91a413d6fff4d58765187b76756f0e97ae843
--- /dev/null
+++ b/corpus/extended-ascii/ru/cold/read/payloads.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/corpus/extended-ascii/ru/cold/run.json b/corpus/extended-ascii/ru/cold/run.json
new file mode 100644
index 0000000000000000000000000000000000000000..ad6463bfc4bfb47f16fdb81a0794cba65ee794e6
--- /dev/null
+++ b/corpus/extended-ascii/ru/cold/run.json
@@ -0,0 +1,18 @@
+{
+ "notebook": "/private/tmp/ansi-lang/ru/notebook",
+ "expected_pages": 1,
+ "author": null,
+ "author_timeout_seconds": 600,
+ "inspect": false,
+ "collect_notebook": true,
+ "base": {
+ "file": "win7-office-base.qcow2",
+ "format": "qcow2",
+ "sha256": "a1a4f8fab782ee14885ff801ca2f6347c208fdcfc3513637096f314315c89346",
+ "virtual_size": 68719476736
+ },
+ "scripts": {
+ "cold.ps1": "c177fc72ae6c2634d186f5671a880de20b09f9716532c37c69cb13aa15c7e331",
+ "read.ps1": "04013bfcccee40a17e2a225f9b9e96f40a3a8daad9e350609654f8eda3ccbb41"
+ }
+}
diff --git a/corpus/extended-ascii/ru/cold/scripts/cold.ps1 b/corpus/extended-ascii/ru/cold/scripts/cold.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..a0b99e7aeb86f4dc10032537800501a52ad65b4f
--- /dev/null
+++ b/corpus/extended-ascii/ru/cold/scripts/cold.ps1
@@ -0,0 +1,27 @@
+param([Parameter(Mandatory=$true)][string]$Root, [string]$CloneHost = '')
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+if (Get-Process ONENOTE -ErrorAction SilentlyContinue) { throw 'Close OneNote before resetting its test cache.' }
+$key = 'HKCU:\Software\Microsoft\Office\14.0\OneNote'
+if ($CloneHost) {
+ if ($CloneHost -notmatch '^ONE-[A-Z0-9-]+$' -or [Environment]::MachineName -ne $CloneHost) {
+ throw 'The disposable clone hostname does not match this machine.'
+ }
+ New-Item "$key\Options\Paths" -Force | Out-Null
+ New-ItemProperty "$key\Options\Paths" -Name UnfiledNotesSection -PropertyType ExpandString -Value 'C:\one-tests\Loose.one' -Force | Out-Null
+} elseif ((Get-ItemProperty "$key\Options\Paths").UnfiledNotesSection -ne 'C:\one-tests\Loose.one' -or
+ -not (Test-Path 'C:\one-tests\profile-original-cache')) {
+ throw 'Park the personal OneNote profile before resetting the test cache.'
+}
+$cache = Join-Path $env:LOCALAPPDATA 'Microsoft\OneNote\14.0'
+$parked = Join-Path 'C:\one-tests\caches' ([IO.Path]::GetFileName($root))
+if (Test-Path $parked) { throw 'Choose a new run; its parked cache already exists.' }
+New-Item -ItemType Directory -Path 'C:\one-tests\caches' -Force | Out-Null
+if (Test-Path $cache) { Move-Item -LiteralPath $cache -Destination $parked }
+if (Test-Path "$key\OpenNotebooks") { Remove-Item "$key\OpenNotebooks" -Recurse }
+New-Item "$key\OpenNotebooks" | Out-Null
+New-ItemProperty "$key\OpenNotebooks" -Name '1' -PropertyType String -Value "$root\notebook" | Out-Null
diff --git a/corpus/extended-ascii/ru/cold/scripts/read.ps1 b/corpus/extended-ascii/ru/cold/scripts/read.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..476094ab1e0c47077988a6461db2080cf208642b
--- /dev/null
+++ b/corpus/extended-ascii/ru/cold/scripts/read.ps1
@@ -0,0 +1,142 @@
+param(
+ [Parameter(Mandatory=$true)][string]$Root,
+ [int]$ExpectedPages = -1,
+ [switch]$UseCurrentCache,
+ [switch]$Pdf,
+ [switch]$KeepOpen,
+ [string]$CloneHost = ''
+)
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+$root = [IO.Path]::GetFullPath($Root).TrimEnd('\')
+if ([IO.Path]::GetDirectoryName($root) -ne 'C:\one-tests\runs') {
+ throw 'Choose a run directly below C:\one-tests\runs.'
+}
+$notebook = Join-Path $root 'notebook'
+$output = Join-Path $root 'read'
+if (Test-Path $output) { throw 'Choose a new read destination.' }
+if ($UseCurrentCache) {
+ if ((Get-ItemProperty 'HKCU:\Software\Microsoft\Office\14.0\OneNote\Options\Paths').UnfiledNotesSection -ne 'C:\one-tests\Loose.one') {
+ throw 'Park the personal OneNote profile before reading test notebooks.'
+ }
+} else {
+ & "$PSScriptRoot\cold-current.ps1" -Root $root -CloneHost $CloneHost
+}
+New-Item -ItemType Directory -Path $output | Out-Null
+$app = New-Object -ComObject OneNote.Application
+$notebookId = ''
+$failure = $null
+try {
+ $app.OpenHierarchy($notebook, '', [ref]$notebookId, 0)
+ $process = Get-Process ONENOTE
+ @{ hostname = [Environment]::MachineName; onenote = $process.MainModule.FileVersionInfo.FileVersion;
+ powershell = $PSVersionTable.PSVersion.ToString(); schema = 'xs2010'; cold = (-not $UseCurrentCache.IsPresent) } |
+ ConvertTo-Json | Set-Content (Join-Path $output 'environment.json') -Encoding UTF8
+ $sections = @()
+ foreach ($file in @(Get-ChildItem $notebook -Recurse | Where-Object { $_.Extension -eq '.one' })) {
+ $id = ''
+ $app.OpenHierarchy($file.FullName, '', [ref]$id, 0)
+ $sections += $id
+ }
+ $deadline = [DateTime]::UtcNow.AddSeconds(300)
+ $previous = ''
+ $lastChange = ''
+ $stableSince = [DateTime]::UtcNow
+ $settled = $false
+ do {
+ $pages = @{}
+ foreach ($section in $sections) {
+ $hierarchy = ''
+ $app.GetHierarchy($section, 4, [ref]$hierarchy, 1)
+ [xml]$xml = $hierarchy
+ foreach ($node in $xml.SelectNodes('//*[@path]')) {
+ if (-not $node.GetAttribute('path').StartsWith("$notebook\", [StringComparison]::OrdinalIgnoreCase)) {
+ throw 'OneNote opened a section outside the copied notebook.'
+ }
+ }
+ foreach ($node in $xml.SelectNodes('//*[local-name()="Page"]')) {
+ $id = $node.GetAttribute('ID')
+ $content = ''
+ $app.GetPageContent($id, [ref]$content, 1, 1)
+ $pages[$id] = $content
+ }
+ }
+ $signature = [String]::Join('|', @($pages.Keys | Sort-Object | ForEach-Object { $_ + $pages[$_] }))
+ if ($signature -ne $previous) {
+ $lastChange = $previous
+ $previous = $signature
+ $stableSince = [DateTime]::UtcNow
+ }
+ if ((($ExpectedPages -ge 0 -and $pages.Count -eq $ExpectedPages) -or
+ ($ExpectedPages -lt 0 -and $pages.Count -gt 0)) -and
+ ([DateTime]::UtcNow - $stableSince).TotalSeconds -ge 2) { $settled = $true; break }
+ Start-Sleep -Milliseconds 250
+ } while ([DateTime]::UtcNow -lt $deadline)
+ if (-not $settled -or ($ExpectedPages -ge 0 -and $pages.Count -ne $ExpectedPages) -or ($ExpectedPages -lt 0 -and $pages.Count -eq 0)) {
+ [IO.File]::WriteAllText((Join-Path $output 'previous-signature.txt'), $lastChange, [Text.Encoding]::UTF8)
+ $index = 0
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('unsettled-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ $index++
+ }
+ $hierarchy = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$hierarchy, 1)
+ [IO.File]::WriteAllText((Join-Path $output 'unsettled-hierarchy.xml'), $hierarchy, [Text.Encoding]::UTF8)
+ throw "Expected $ExpectedPages stable pages; OneNote returned $($pages.Count), settled=$settled."
+ }
+ $index = 0
+ $payloads = @()
+ foreach ($id in @($pages.Keys | Sort-Object)) {
+ [IO.File]::WriteAllText((Join-Path $output ('page-{0:d3}.xml' -f $index)), $pages[$id], [Text.Encoding]::UTF8)
+ if ($Pdf) {
+ $pdfPath = Join-Path $output ('page-{0:d3}.pdf' -f $index)
+ $app.NavigateTo($id, '', $false)
+ $app.Publish($id, $pdfPath, 3, '')
+ if (-not (Test-Path $pdfPath) -or (Get-Item $pdfPath).Length -eq 0) { throw 'OneNote did not publish the page PDF.' }
+ }
+ [xml]$page = $pages[$id]
+ foreach ($file in $page.SelectNodes('//*[local-name()="InsertedFile" or local-name()="MediaFile"]')) {
+ $bytes = [IO.File]::ReadAllBytes($file.GetAttribute('pathCache'))
+ $hash = [BitConverter]::ToString([Security.Cryptography.SHA256]::Create().ComputeHash($bytes)).Replace('-', '').ToLowerInvariant()
+ [IO.File]::WriteAllBytes((Join-Path $output ($hash + '.attachment')), $bytes)
+ $payloads += @{ page = $id; object = $file.ParentNode.GetAttribute('objectID');
+ kind = $file.LocalName; name = $file.GetAttribute('preferredName');
+ sha256 = $hash; bytes = $bytes.Length }
+ }
+ $index++
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'payloads.json'), (ConvertTo-Json -InputObject $payloads -Depth 4), [Text.Encoding]::UTF8)
+ $all = ''
+ $app.GetHierarchy($notebookId, 4, [ref]$all, 1)
+ [xml]$finalTree = $all
+ $finalIds = @($finalTree.SelectNodes('//*[local-name()="Page"]') | ForEach-Object { $_.GetAttribute('ID') } | Sort-Object -Unique)
+ if ($finalIds.Count -ne $pages.Count -or @($finalIds | Where-Object { -not $pages.ContainsKey($_) }).Count -ne 0) {
+ throw 'The notebook hierarchy changed while collecting page evidence; repeat the cold read.'
+ }
+ [IO.File]::WriteAllText((Join-Path $output 'hierarchy.xml'), $all, [Text.Encoding]::UTF8)
+ Write-Output "Read $($sections.Count) sections and $($pages.Count) pages."
+} catch {
+ $failure = $_
+ [IO.File]::WriteAllText((Join-Path $output 'failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ throw
+} finally {
+ try {
+ try {
+ if ($notebookId -and $CloneHost) { $app.SyncHierarchy($notebookId) }
+ if ($notebookId -and -not $KeepOpen -and (-not $UseCurrentCache -or $CloneHost)) {
+ $app.CloseNotebook($notebookId, $false)
+ }
+ } catch {
+ if ($null -eq $failure) { throw }
+ [IO.File]::WriteAllText((Join-Path $output 'cleanup-failure.txt'), ($_ | Out-String), [Text.Encoding]::UTF8)
+ }
+ } finally {
+ [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($app)
+ }
+ $app = $null
+ [GC]::Collect()
+ [GC]::WaitForPendingFinalizers()
+ if (-not $UseCurrentCache -and -not $CloneHost) {
+ Get-Process ONENOTE -ErrorAction SilentlyContinue | Wait-Process -Timeout 10
+ }
+}
diff --git a/corpus/extended-ascii/ru/cold/source.json b/corpus/extended-ascii/ru/cold/source.json
new file mode 100644
index 0000000000000000000000000000000000000000..c9a2d1f495428e88c662543b6ae55467d85b3f88
--- /dev/null
+++ b/corpus/extended-ascii/ru/cold/source.json
@@ -0,0 +1,14 @@
+[
+ {
+ "path": "Open Notebook.onetoc2",
+ "bytes": 4816,
+ "sha256": "b2f857961b76258a1582b402c048b340e89962257681426b3bfc58df8e0adbfa",
+ "mtime_ns": 1790487072902780320
+ },
+ {
+ "path": "synthetic.one",
+ "bytes": 12456,
+ "sha256": "3d9562625271091ff5c85c24325ab2bf12a670e81aab2caffb6b00c724d7e19f",
+ "mtime_ns": 1790487072903016820
+ }
+]
diff --git a/corpus/extended-ascii/ru/cold/teardown.json b/corpus/extended-ascii/ru/cold/teardown.json
new file mode 100644
index 0000000000000000000000000000000000000000..05a47793de40f322e745c4c4183727e3590ecf70
--- /dev/null
+++ b/corpus/extended-ascii/ru/cold/teardown.json
@@ -0,0 +1 @@
+{"absent": true}
diff --git a/corpus/m6/native-template-controls-01/ORACLE.md b/corpus/m6/native-template-controls-01/ORACLE.md
index 1398b8768f069f10b066deef297000096e66ef90..0b45ecc81398e040e4768509d5e6da38c37ab811 100644
--- a/corpus/m6/native-template-controls-01/ORACLE.md
+++ b/corpus/m6/native-template-controls-01/ORACLE.md
@@ -1,7 +1,9 @@
# Native default page template and unaligned image container
-The captured UI operations selected Hearts from the native Templates pane, selected Hearts - Decorative as the section default, and created a new page. The default background appeared automatically; `default-template.png` and `ui-operations.json` record that result. `read/` contains the three native page exports and PDFs. The clone was deleted.
+The captured UI operations selected Hearts from the native Templates pane, selected Hearts - Decorative as the section default, and created a new page. The default background appeared automatically; `default-template.png` and `ui-operations.json` record that result. The clone was deleted.
The section property 0x2c001d62 refers to a separate page object space whose role-2 metadata has JCID 0x2003e. Property 0x1c001ca5 contains the UTF-16 template name Hearts. These native template fields are not in the published MS-ONE object list; the typed model identifies them as observed native metadata. The original personal notebook uses the same relationship with the name Ivy.
-The embedded image object starts at byte 11396, four bytes past an eight-byte file boundary. Its payload is 10056 bytes; the footer begins at 21492 after four padding bytes. Native XML exports the same image bytes (SHA-256 2035407a0540e1c4f7934db08ba4add750fcb9a62863ddd9553e7871c81a99e3). MS-ONESTORE 2.6.13 pads the object length, independent of its file position. This fixture exposed the reader's incorrect absolute-offset alignment. The regression relocates the object through all eight offsets and separately corrupts its footer.
+The embedded image object starts at byte 11396, four bytes past an eight-byte file boundary. Its payload is 10056 bytes; the footer begins at 21492 after four padding bytes. MS-ONESTORE 2.6.13 pads the object length, independent of its file position. This fixture exposed the reader's incorrect absolute-offset alignment. The regression relocates the object through all eight offsets and separately corrupts its footer.
+
+The stored picture is Snowbound's rendering of Hearts (SHA-256 6a0593db927c1a34a94cf11093e5bd8700843323ed4fe8c905df0c595cb09c26), written over Microsoft's at the same length with a PNG comment as padding, so the file is otherwise native. `read/` is a cold OneNote read of that notebook, whose XML exports the same image bytes; `default-template.png` still shows Microsoft's art as OneNote drew it during the capture.
diff --git a/corpus/m6/native-template-controls-01/notebook/synthetic.one b/corpus/m6/native-template-controls-01/notebook/synthetic.one
index cebce593d432621558945ae7b5a7c38df5f0edd9..f4383ebafc3d7ba7debaeb1bd0b749220679923b 100644
Binary files a/corpus/m6/native-template-controls-01/notebook/synthetic.one and b/corpus/m6/native-template-controls-01/notebook/synthetic.one differ
diff --git a/corpus/m6/native-template-controls-01/read/environment.json b/corpus/m6/native-template-controls-01/read/environment.json
index 00b1c91c33877bb34f0dc2cf539d0a5a33ea3403..5f136cd4ef1353e4b1f1e9c219aef40a69ad2a86 100644
--- a/corpus/m6/native-template-controls-01/read/environment.json
+++ b/corpus/m6/native-template-controls-01/read/environment.json
@@ -1,7 +1,7 @@
{
"powershell": "5.1.14409.1005",
"schema": "xs2010",
- "hostname": "ONE-M6-A33C1CD2",
- "cold": false,
+ "hostname": "ONE-M6-F782B029",
+ "cold": true,
"onenote": "14.0.4763.1000"
}
diff --git a/corpus/m6/native-template-controls-01/read/hierarchy.xml b/corpus/m6/native-template-controls-01/read/hierarchy.xml
index ec464dcc8c5f9366feae4ca0516afde08819b5fc..a55855c144608eded7f667f6382bf012aa5ead4c 100644
--- a/corpus/m6/native-template-controls-01/read/hierarchy.xml
+++ b/corpus/m6/native-template-controls-01/read/hierarchy.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/corpus/m6/native-template-controls-01/read/page-000.pdf b/corpus/m6/native-template-controls-01/read/page-000.pdf
index 6de9701a0cc8f7ec5a0296425c0521a3b8b0db5b..683072610667c97b348d7454745f6ddc75d03733 100644
Binary files a/corpus/m6/native-template-controls-01/read/page-000.pdf and b/corpus/m6/native-template-controls-01/read/page-000.pdf differ
diff --git a/corpus/m6/native-template-controls-01/read/page-000.xml b/corpus/m6/native-template-controls-01/read/page-000.xml
index f790c5cdcb93e85fafeaa6348f8119a9e748dfbf..36138ba823e2dbcc3096ab3ca02ed671b81ac8a7 100644
--- a/corpus/m6/native-template-controls-01/read/page-000.xml
+++ b/corpus/m6/native-template-controls-01/read/page-000.xml
@@ -1,179 +1,2 @@
-iVBORw0KGgoAAAANSUhEUgAAAKsAAAIoCAMAAAAhjet0AAADAFBMVEX////d0dncvM/S6+W+4qyw
-3t7akbqZ06ir2qrewNLB5OHcxtTr9/fp1eH9+/z9+fvcmL7tyN274avlzdu44d/cvc/jydjP6uTE
-5ub25O779/n58/bbscncw9Lbuc2f1q3Y7++03quy3t6i1qncztez3r7gxNXm9Oq14ODu3ufbpsTJ
-5+Pcz9jak7v6/f327vPcwdHcydXam7/F5uLjrcvy5u35/PrcvtDcy9bL6OPO6uq/5OT1+/vczdf7
-8ve24N/cv9D46/L06vDcxdPw4uqf1aiq0rS84uDbtsyb06jfn8Os27jw+fm64uLhpsew3KrM6dTa
-lrzaocHD5eGm2Knamb20397outTZ79/x1uXbq8fbs8vs9+/n0d7z+vTi8/Pqwdjr2eTcytXcwtK/
-5MnN6eTT7Ozd8fHansCy3aq64uC54Kvcx9S336um2bPao8Ok16n03erbrsjbqcWp2anG5s7H5uK7
-0sDJ6Oid1Kjf8eTp9fLn9fW+4+Gt26q54cPvz+HmtNDM0cyd0qvZvs/U0dLJobXQ0c+y293Y0dW/
-0cPOxtOu0rey0rr0+vnTpbbA0djYlrnd8OzT7NnRnLfLyNS12dy419u71drH0cni8u7SwtHRxNKh
-0q7Gzda20r3m9PDY7ujD0cb8/v22yK7h1t3KvrLg8vDWwNDDz9el0rG9rbLNnbb7/frexNTIw7HP
-r7TMubPV7Of7+fq909m2yLnq4uepzbHPpMPWm7i/3Ky6srHFza/d2eSxuq6dzqnn9OC+17LGyLDb
-79Du4Oju5+vKsMi8yrzIytXL6Mru+PW1tq/Gq7Ot267A47r9/P273cTewtPk0dzf1Nvh4uDfq8Xy
-7vHp2OLy6e7M6eiq1Kr6/fzFytXQ6sXz+vDr9vTVqsbZ3dm02KvS7OnY1+HD0q7B16339PbBqbPa
-7+rCxMDXm77T7Oeu3LjYydLL6ejQpLvKuc3G5snXp7za1dfx+ffgzdne0dq94rCy2dvE2t+lxqvA
-ysDRqrXNtLPU7OkRzzSdAAAAAWJLR0QAiAUdSAAAAAxjbVBQSkNtcDA3MTIAAAADSABzvAAAI95J
-REFUeF7NnXdgFMe9x/eW050k1AtCgBoCgYSECiAJ05Gw6YhmejXVgOk2YGxckzixndhOc3p7qS8v
-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
-NkH/HxtpiBH77U/NAAAAAElFTkSuQmCC
-
+
diff --git a/corpus/m6/native-template-controls-01/read/page-001.pdf b/corpus/m6/native-template-controls-01/read/page-001.pdf
index 0ac8ed808bfd97720ab024f2ebba2dee3cfb7589..11040ee567fdefb86570164433198d26730369f1 100644
Binary files a/corpus/m6/native-template-controls-01/read/page-001.pdf and b/corpus/m6/native-template-controls-01/read/page-001.pdf differ
diff --git a/corpus/m6/native-template-controls-01/read/page-001.xml b/corpus/m6/native-template-controls-01/read/page-001.xml
index ac17667115fd7991586c55deaa29fafb18625258..389fbd0fe6d35248578195aec4831642d6ccba71 100644
--- a/corpus/m6/native-template-controls-01/read/page-001.xml
+++ b/corpus/m6/native-template-controls-01/read/page-001.xml
@@ -1,179 +1,179 @@
-iVBORw0KGgoAAAANSUhEUgAAAKsAAAIoCAMAAAAhjet0AAADAFBMVEX////d0dncvM/S6+W+4qyw
-3t7akbqZ06ir2qrewNLB5OHcxtTr9/fp1eH9+/z9+fvcmL7tyN274avlzdu44d/cvc/jydjP6uTE
-5ub25O779/n58/bbscncw9Lbuc2f1q3Y7++03quy3t6i1qncztez3r7gxNXm9Oq14ODu3ufbpsTJ
-5+Pcz9jak7v6/f327vPcwdHcydXam7/F5uLjrcvy5u35/PrcvtDcy9bL6OPO6uq/5OT1+/vczdf7
-8ve24N/cv9D46/L06vDcxdPw4uqf1aiq0rS84uDbtsyb06jfn8Os27jw+fm64uLhpsew3KrM6dTa
-lrzaocHD5eGm2Knamb20397outTZ79/x1uXbq8fbs8vs9+/n0d7z+vTi8/Pqwdjr2eTcytXcwtK/
-5MnN6eTT7Ozd8fHansCy3aq64uC54Kvcx9S336um2bPao8Ok16n03erbrsjbqcWp2anG5s7H5uK7
-0sDJ6Oid1Kjf8eTp9fLn9fW+4+Gt26q54cPvz+HmtNDM0cyd0qvZvs/U0dLJobXQ0c+y293Y0dW/
-0cPOxtOu0rey0rr0+vnTpbbA0djYlrnd8OzT7NnRnLfLyNS12dy419u71drH0cni8u7SwtHRxNKh
-0q7Gzda20r3m9PDY7ujD0cb8/v22yK7h1t3KvrLg8vDWwNDDz9el0rG9rbLNnbb7/frexNTIw7HP
-r7TMubPV7Of7+fq909m2yLnq4uepzbHPpMPWm7i/3Ky6srHFza/d2eSxuq6dzqnn9OC+17LGyLDb
-79Du4Oju5+vKsMi8yrzIytXL6Mru+PW1tq/Gq7Ot267A47r9/P273cTewtPk0dzf1Nvh4uDfq8Xy
-7vHp2OLy6e7M6eiq1Kr6/fzFytXQ6sXz+vDr9vTVqsbZ3dm02KvS7OnY1+HD0q7B16339PbBqbPa
-7+rCxMDXm77T7Oeu3LjYydLL6ejQpLvKuc3G5snXp7za1dfx+ffgzdne0dq94rCy2dvE2t+lxqvA
-ysDRqrXNtLPU7OkRzzSdAAAAAWJLR0QAiAUdSAAAAAxjbVBQSkNtcDA3MTIAAAADSABzvAAAI95J
-REFUeF7NnXdgFMe9x/eW050k1AtCgBoCgYSECiAJ05Gw6YhmejXVgOk2YGxckzixndhOc3p7qS8v
-eekvyeu9l7zee++9vzd9Z+vM7MzsZf4B3e3dfva33/m1mbtzHJujZrC3urHCJWPGkcnZNs+m8d7r
-T/RQSu/fnt5ZGm9p56Wzq5k5g8AnauycMuW7DjaGLeo9UrE+5dtaeNnsRFLIfMLCWVO9ZW+STclz
-1ane2fSLamZIoLrutwPs7NgpFbiEXtNGUn4/aVTXLbWrVUB1ZygbwugLaiKcf7x6lxk9t+qbCX2V
-D7xH9e1NHj8p5QG8g0po2BpZF8ByGZOGUnuvakWzum7J0phZyqjupJoxzB2tbla30dzZld6pJs6s
-Q0PT4ZgYGgsfoXQGcwdHOYG1Eyfn5bzRf7ItgDto7vwq7xRKWcYu8pyEuH96M49bGsEGZ9bQOGdQ
-/r/zhjjY0uSxy3x3dyyOFFJP9w4tzeQ6wrNOxNiUPDzMji1N/sJlLc0nk1FzuQkGqzIjTB3LybV5
-lQg1l2OaNXV+7n1mD072wjE5GJMhDzJLyaDm5lFvYJZ19mS13x3NOBFRMnv14LDYqtz8Msg6GNU6
-cd2K6qATP0HtKphW9EL6iWFNsdb0JqT5M/zJJ82yx/qlzJrLkQhmhrWmV5COzuBtS1mT/KrvKlbh
-G2GEdb1E4lztNaaIpIckrQoOw5mMAdYauQSvh5mWyFXarFQE+qySvRMASJMPzDomb9YcDl7arPKo
-rNeDWS8qsM6DL9COsSqoFBazRiSB8fTwBdq5C/OVLBYl/gd10ZQlgOPsEU0NeOFSjhW1/NChknGA
-mBqy6jbglPo8iBHAon/lwitVBUy2NOuC9ZLW5A9b5iBvLJFgcfKFKbdmveVLmgPcQxPD43j+zBu/
-2MbVpbjrruAFSPqit8oRWzqPTYQc/byLFLcHxq21yqwVelMrRgIPxeT6J7lKTyHAkrJL02VFLkwM
-JTjOYSaFh5TtqlnGRrRQBfVTP62epiuzaq5zhVnXCqPRSZw4q7Nq9glDHmutRPa8CsEqsg65uo3t
-IKsMai7XvzYNq+4aV5BV0r9DWEW7rnV1e/CBCCt9flBFSx+L56B+W9s/t5olxEpm/6pmNdZ52nJ1
-/KwqmdOwysG53Lj+Yrc/FkiqFZtW2Mby+d/prqZ3dRxfjG1W8+5KR7dpJgMglfD1fBUjvBLrWl2P
-BWB5R6A2W5RQc/oScBy+M2CRdVxfAn7BWmSdbkACDi5H8LDIOqRZvuAsnROBRVbdvAWzzvbsqubd
-VebWSd1qm1Q/Xhvbns9q00xdaaHmLVXZiwW/plcVeq/2XKywJFC579yxq4zMLEjsGVatkyIP/kum
-zMrFrjb50ysd+evmWJlhLQn2W+ZQHYe5ArU8T9a2v2qSlfU1FfsTcrDf+nmTrA7rwJnyBC+8/hgY
-r78Ar+YrRlEdttfKTOh6/qUiGS8+k8t90Swrqw8UqsN4AXzkWYoK/r3/DwyjOkwFBvIXZlRCfNM0
-LFVBs7ZiP8gZFf93y1HDtNQX6MaDj4RQi8WOw4ZhafmtsHAZIdnnea162PsNw5K+hmJvPcB7f4RZ
-4UOGYek2YZ3p9UwMqnFYuv1aqf3it+v7Y1mLhjVLujDpVfB6PGqxw7A3IBlX6ugVp1bsugzPLwKb
-Mt96PsGs4CnTQQGX4FK7rsIe67Fk1uICw5bFsHLrBkFafmZtKAfjyiYfvWkVkOZGmvnFSaD7Qh6N
-hh23eVrDXtZx8OaHFLH2zQzrSUyKRjkH+4hhEdDCVh32RUq1g0PN5y9tsBdrU8NSpHIfKhBCN4M1
-rljQ5ELdQ0XLvpEQbQiggj/3MFjD0QtqahYqbdVgqVwvhVk9WNM+FsLirXBKsCTJ3hOBms9fIZY1
-P7tQ6wjqYEh+dS5HAizxVkHN0glmOCsgjmU22ikin3ThLLs70qz5/AUSFoy7WEILSwXx1nESvV7A
-d/l8DGt+B37ehmBx0xuaVjL3xmn2pjjUfB57rvnGwwF7w0mgWvFWDWhazBo9s9AFXEAH2JlcmBc6
-hGaZHZmPIRR/yPIbGXtZ3q5HX7v3CDL2zTujRuwNd45JTDHM2hCvAWJYj2n/FixhNDpOmfEQg0C2
-EyLvhVhvJ6ASxdLIdQdZlB+nzNh2WY9QCChzSZAruArkCnDCPXovSApte8eIEJz1je5Y4noCCgV8
-Mhg2cQNjXdARgQoeOmUG1hmsTqRFrF2JGsjD4AXtuj+aFDy6xYwOQEbT2zM2HKdbxBodYNkF3ACH
-ANRTsagGYcG6+JHmiehWImJNNmv+ScSahGq2UVezrHEoyriQNSJ19dF3QdZkVBAtTMkAaX/W5Iy2
-UAsBssYlLhQYhK75ryEB3L7RBV3xpR00WeRkYUyzZKKGcWVY8+AWQ6hubg42lPsLc/C0+ZwhgAtZ
-g5VWSL7IepsCuVhDyLY2krHZ1d5Mg8sEUqxXwnH4fNC0hoKC31uDz1I9hNPxxyRZI6/nkq/lAZRi
-dH4x5FlH3DbocyVZYxKxBq6JAHViQwW4MhsDpoVlrEgDl+JzxiCsmawrHLJBO2EY5doi1q6EfKHB
-LwNTmUGIFnxW6aQMa1J2m7/kn2C2DAsaNc2rJOyaHILP+9KEKUMpV/htBt21oOa+IcgHBE/D1IYN
-i4VZr/tVcYwVsPola82uYHPHl7VZaQ8B29Yi6+BfisotCYHwvsAiq/PPwBYSOImHkOaMbbs6s8AZ
-BHWB8FJQRUaGTbs684X1lpCVNJKs29W5KQ5cQlhuJcSqXe+I+gNC0nyeiwdWWUfFBZeQFlZkWejV
-Af0pIYzggMxYgWAFzQzhpXisHVY14CzQn1yeXk0nhbWt9ceX4lF/tdZxOoRVt8iwnh8wuih+9fjm
-gm883QqafyIYwfNsidHgCmNtfQAUUf/9f8WvbUhdhBe3zJm1vs5vUvbX9+mlsCwfMNbOWLc9hhQ8
-/DNS9os7iOZZxjbyHIgnBc98XAOWmdXUil0yaqHwzdSwDbQ6NOWvRKiF70nNSvtapnzAukQBoCc/
-lxIWdpLhMNXTrI1yVQH8lIalYjWF6hwXm7VQ+KE0hqWo80213VbLoBY+n4KVopqaVo6zT4r1FXVW
-kgd0mHJWjlMrhVoo/IkiLO1sbzG4decpP+veywfnbAQ7DNrnHNw1wD+lGA9oW9toC2spBzRysJ3/
-RoD2gxzt/6rY9QJxq/ONdgY5CYwc4kHR/9vPsSt5qzwrXYZ5xFxihQqKqxRm4FqIFD6wiz4vzcpI
-zc0pUvrUE5a9vrvPYTNYObte2IMTgPkpl13WHahfuhRmp6AsObDaX58Rucaiuu07ydVIlIgNO/By
-RsfNdDq9ui+QQ29/ClRRbOC0dSDOqsDAcwiraOHgUjkBPZXOpKuPRyb7+zzjYpA5kVolD+7Fx+yJ
-F8Gl8+WkqNpyM+V8qo0tS+rqqWERxq4kVPcgZmWLyF1Pwr3QZOzp7iYZ6iP3phakjvtJZUlhOzYt
-Tgeh848f7TxrF/Kc833j3tTUnZTmJCZbF1fr4VPXXYXHtYrN6rpIBG+HdgWB895+g0FTDhWc/QBl
-DccAv5EvQ9Y3AL1e2DCV+i4ntIdqk62KTAtgoV13JioAPIkE+4byfMPfpHNFoi6WVKZ3ALFeFrEi
-r/WZroZ/FJ003fNyCXRhHWSNDq7cBRyCrN/I/2Q6FOGros26d1cfGudoLKqDfkAkV9eFrB/7HeFJ
-Ux4QVuvOy7zD33gd48IQK5IAZv3Bz6ZEEb0sVEWPhG/0QWJc4dRCrK/8gOicaZ9nmR72pQPXI23X
-h54ckbLrr6RFEb6OZnoYdW+cIg/BvF/MuhEcxYKy8NyqB/hYd8YnUe0gJIlZoc9qVUWQPt7HmjTP
-AawcK59HSmNIHcizJrv69p1i1uvAX0idNtVBfOMvOYlyD50Tzi0wB+3JFadPeAhRxKFgpFBYl8pk
-ci/yWPuEZhMeMFDYLHfWdEd53f/E8kSICQ8ALut4Ogq5V3l9Sn3Wa3YlwAlWn/WyXQk4Dkte9Fl3
-2vQCUCZMBMLsVKRZINdA/0NOhvJHsWRb2w9ctxkI8AU9LetfRXY9V0AVr81Bw8GAiEXwfLvtmQWN
-QJvAmoK9jmpzy4PWBrv0DLu3zl6K5VmA1IdJPUDxZRyy7bAwL21nHBQTxR+xKxOzOg5ZYpEo/mJZ
-2wcsZoO+SUCml4Zh+zIyq+OsxpE2oeASOayBpyx7AO/tSe2dOnYdtJq4BsxA0gJx7h9p4PYBe+Vr
-xP3Ckt2bzhX0Pe2srFqZmQrIRoZUKmj/sf8sg2PFmYx4SSs+RRr7lnciUjTuy4YWww4ISu+QSJ57
-m0cK/9eZiRRwxhW/Mhip5efe5UcFSsjEtLizIe6vcNBh1LKyhVuzMG0rkoFKwhUQALbxwmNZwGLN
-ysP+RFAA5O9sYNEeLFnYT74phrUsExnUok7MuYT1bE6t745DzUizuAqX8gbvi0UFml2chWadq1C0
-AxKpARcDwtQrMmF1VqPkQBhu35Jg1syCguMcgKYdEYSweLXii6jKxrJOLSwYBxJN+95ks5aVbcuI
-FexugELYmZDKRIYBH382qQGySCv0tSNxtM9xvvWBR6eBsfyJB/2mzsgX4Nt3IIH2HYyr6TQkRWPJ
-XB/tfZmpANkWKmEkqsD9EqV6gJGC/7Q87IPNxskyi6yG+7Z2Xg75hEhUQLubh81QsaQvcwD2Pfde
-9+FS5+qzKtYBB5udK/DUtvopmCbsve6lCZ/CRGtaeAUQ0XKwdzNVLD0Zxj1H3QIpBxaFUX2WzXZ2
-cYZBO/nw7tfnsO3CCkDsnmYXlsSunheD0QzLdW6EAhDsA0wGmSSycQYBS+MgFf8AgqmMUgB8rGUN
-hT1bQsOC4FsHdmrhvMULAkHo5ZS1ZIIlPmx74RoKsDFqRdyVBHZmSe0KW6B/hUginQCxcAvNDUrM
-6rR+DaI+GKdWX0goNavzx5D1iUTWacSwJXUE0FCdkHV5MitxsllVB7H37xZ0rsmo01rw7Co560wA
-8bCAdRpOD/2sK6uOdXZWZcq/AkDsFrHihIvjOnZrIXW7M89mltpKyHXatNM+1pWdDBQDZ9RWduC5
-RGadhj0B7sYuDpLCp7LJxMGJmsSsSLAI9e42evN9/67IwKGtBGcUeFcaZ2FSuPhMJCl4MINObZXM
-1MI5N8gHVsKZGDes52GQNSkZIPJYBGeQszUwpwLUthMxyBqfDzIhQ9azx5JRrc8wyCqeWtOQXRPu
-P3nKbsNegRXzzH24chEYj1ayeoG/BKvFLmCVcFnIrnA0LfFuwulKfxsJPm91kUmJtSkwC1u8wpEa
-d4XFgLtYzq6PwrsfkTYsCpn2jMWMPLnWoncc1FxrIt2FV+ZSy1rMvBLKbc4/PFD2QEwDoaUp4B62
-2VOBHGtTbP9g2rSgQ7CXx8yMb2NwduWmf8gbB2Ww0NrquBxrYrhgRTlRg7VYe0bKrsmhbXnAG9hS
-bGdiz0Ui/MJD+KYyzBws+a27UnFLxOxfW7C1KFplhLXFrwJbs8sIq38dxJoItok6GaL7j5/3Ld7d
-siTYmTL5q5jXN71sCbZTpi4Qs07zKdaSXY/J1FsSrE/weYEl1q3iFpEE6TSWjiNkS6zOwoS8RIqS
-HJSBXZ2ZMkWMBDSfHNqya2dyB16CEh/CFTTW1u2qyuLW4aQx0YF0vQZowd6SjSFHwLFaTLfNTC6O
-1V7N1SnswUuJwWO1uNdgq5mMwPMD9iTgOAsFa0ZSZuWCrK2UEHrC+3bL0SQexdaYy2y2M5xjJgTL
-8gG7e7kWm0gLWQJrtVfoOLfQbjetwfJXaxU3idtnJZY3kq+EFVy20myWYazUTgloMmCzp0lwV2h6
-LaqADFCdTr0wSxsvWaA6W9foTCyKestWc8ifDm+TWDiKuxyKajO08rQaoetRXMFus5dcBaqM9KGL
-pFdnsrn/EJvmWsslFjx5LZzG2dXMzIwKYfH+nJakTWUResVLXNvsrheGCs0VS1B9pxRsl6AcIGtS
-x5kJPeyjKvELk97K9O5jE98HuwRN0ons6UpIuu2szbQ6tsnQCViXS1bfLUtgH3tFZwb7RiJ5zwDW
-J2Ry7uW7wdRfceZudj4qxDsTzK0HoQRe/dDjcLzn1b8IzftFSyqbts08c7YEEuV5P/rXcBfW8i88
-/lH+0Zdffvn3EPnjn/jEJ85WVVWV0JiM66e+AIy4pOxDPlJbDbSk962q6uz8u9/4o/9bsmgRTlM/
-/Oqr73n88X95+bfwq17+0IfRw5UWexDi615c1XlrW1lT5aLY7tqHX/VUWWmvZSZC3doJdlPNVYhE
-TSVivXsf3KCkAAo1UArWlWfgpr+5lYp91RKwVsGtwmUPolxEaSzJem5VwY3C6jaFF7Xc2vJJ5NTC
-pGXcZ/FULJvNZ7cx+GK8jS5qc5IU8sPZ5cx38d7ENan7Ertt96KoFohRIz/fJmVVkBBkNLm2km20
-igWT/yoezCR1riJ7U/XWAJ+wtVOFdwTHyGJo1AccJQWAvFYGkYuizk09rcgFzbWeoMINt2hIl3Zx
-tn7AttdaSfdRazX7EP6jtnaqUMGyjfSK/Z0I47ZYW6HGsOgTWChdUZhFcYc2WV1FgZ+8MKRWcAF2
-QxfOVuDQaPcyMy+3Gbo8s5pZAZ5rsZnifUJBL2RRyz5sMXR5n/uQafCIZ5/FQoaFAbl912LWRfaK
-A+awTLG22Pu4pucFzOwNBQ24TlHjIe3z3Ie/zMytafY6Gsy5gv+IxShzRKW1MMuz6iaE+EqWWKtm
-eVbtTQCIdVGZrbyQ/1ididwFLHFZ21vD+QGpDzlKKNbabkDfhwDNeII1tibXWV6wZjYxNpVZKrq2
-+lj1ixigkSZrkcv/8Wrt4hCwVlpzBP4PWGsX3YjVVpT1cm2kBs1mBnQTlWXWilmf15L7pGOy46q0
-5rQcLoNFlk3cvdQiUZNVWvyKv4Bhy5bEm61FxlGADSxpsz7h6wKKLYuHbVlTalavmUF9bYxlwT4q
-mZoM2NViLRv6toXIjAtuTpLZigeOs7joHv6+hfCawSL0kdvSszq0/8oF3Cd8i4anyZ5PmW1CYNuF
-RbuCnTW+tAD/wRZjT+9mH2OW6STaZnWCjgvjrmkCg35gDapahhVcmFW7OouTvs0Eca+4K8kKDrPL
-KoRdsRimuhJ6hV9AZZlVAHvfYgdmZBJ+AH41hm3WRFjY/IOSlmCFW6+tszrIclFjG4pDMCuXqMjg
-5y8yYHXI6nGAtxPXT/BRibIcbmjNgjXqe5jYF3GhKxBvK4FHCfMlMwesPMO3N7Zxv5uBWBMSRpxK
-oo8LmUGReZeqzpnQ28685dtICb7JBQzhMjj6fj+Zs9g8BlfnwgUQuFs0gxVkwZXiGScSAYzI3y6s
-Aq8Fv8zHWs0tLxviyZLTF5Q7/kMWv2uWCE46NMmGRUnZ156Wt4CdI2namJS/4M82/X5hnx0E6Xel
-EfjBhHiAPoXxJndvqWFZ+zPex55GZn23u3GgsNTyr1wmm9hrf8b6LVyVfcB1D+0s1GX1s3GR1Cz4
-xnUTycdx3wK+dbv9XKGwub50/sArIGMkSz6R/Rz63Zg54DePC/us/zBnjBa4yjyy9Um+6vdd9Cdu
-Nl4Gvz9fVyJcLgOLgKUfxfsU93M813aB33Sv25fpb8hhS/NdhNBXzbGvF3uv/9e5EO7m+qzdgq+j
-ONcfbBnqm0I/JNZ+EPwGfeHpjI3r73jwbaTlrDXztqgfPZsD3EJhcwY/1epNtUAPfO5uEsJauO+6
-gB4rYmzclTUt2iLPj4crweC/VSwsAQqOnNjm7JTAth4GmdnfvBcImvca8GEZBl9uf0w07ieTfm+y
-/TL82anMwll0Q5FxR84sDn8ONG1WQhCo4H2in/Fsh3OscDybTAG2NmPHl0So4PnrEHb7Oum8WedA
-/zK+HztRrcwhgEBWqMvG2cZ/STLIXGXGIQhbOK5jMOnXxsG+E2eD4oFhsynKYmADWUsCM4bdnskM
-i4R9h9ig7IgsYSMmmAoqqMigYTOybFXwu/3VUF33YIaw/q/3f6cwCIQEguJtIaMWzUr0WU84/uO3
-ZT0ATwwz8Ky8AfBxdztvgZby96b7/XnQ8YDjKWlfaeLAzSl/fh5F20Ihu5TWcepT/u6468LsG4Tb
-7OrG2rqUZnXdjdiwS03cXKn3OJ5OrWiWYV9QyKr1tbqQ2qyg7YWnVyGbDNHZN6AQWkOH9mHW7VJ3
-UPeg1eJf7U26FqLYbBzXvoLqz8770WGTA/qCDFKu1YVzOhJw3WuYNYvMu15nZqGrJKwF6062tq4g
-91vj8cYnIrBfJRzQlYDrEk9gX7HbtSXgzqEisJzDrCtoegEgDca6Wdd9Jr/+eCF12sIE3E7tajl4
-wd8O1R6M1WrD4GqhcE0bFReJ1gMt+PV2vaAFL5TptVCwGbvqCuK8Reh+qc8ClrVYIAAvMCKUwGUR
-LK4Q0bDotfBvCAtGn+AQmmhBVospN/jla/jjzMmjT3AMLrnwsMdaC95dXBIAOV5PuBpSymJWe32N
-VvDu9PfE42ng1ImXAW4U2bcrkKsEK1oeGImZYJwPsKqBz/6TFCvW40CUDtDiHD+steV/+BUF1kJh
-58GAbQ8GSe1Vs7/7h9AiYr2Cg45j2w3sOoh+gB5U2nP6aIbNm9VWojX67x+TYoXus5XAIq6REdIS
-CNx/8Kcll3X05/I/LcUKS79W5+kwWPgRS6Xs4Z/Nd30Dni3JdaLbDd1Aq1MLwoZwWDHr6NSefP7J
-P4cnF6avcPkVpCQSsDYacEenOm7k8/nyNyD1CSIsSvhg+lQrkoH++tHoAt/YP3VqS7G7C6DmryBW
-UcWNpjtO9WDoiB9LNXLXo3em7s3vKIZG9w1EyliT6wKcR5O0tHVzPGpqrS6YIpS3u8vLu7oIHEZk
-o/w70ZmTO0TY3dOOSm19XTTtvnQ9l9H997Atu8u7GgJ4flZy2qQihiRRXi0cRbv5eCpSCrppz/lE
-TgjdhfWaZFjSVvOHo6v7OCnULa1P1yU+egrrs3tHkj3Zc4Q1vpKdQwJUyBnVtrbWg3G1Ne18WjAf
-3/s9F6RI8/m3EhEMkCAf9F4si049b2L6KJS0XHjv2ZVQ1sJAVAKz0cuizG4rPUpsekXWphD4u705
-3RdMpdEmNzrS3ukos45O4bt/O9o5xUni4xzOQB/nDub0cWW02SJqwSMY9Yb87Uf43/T7yp0jl/v6
-+i6P+DjhIQaTfWLUTeclp5R3WFLI9J6rM9apHN1C7v8lZdT8/0jBGvMCh0nE36B4/9GFfU6G1VgC
-rYWa/zosDkXDlFop6qY0VgWG/bwI1NwKNkUtptAqEsGfCg272ZBvZajl6tOKvIILB5EmrkuXmIQ8
-B/UAxQ2pUb2cIFoMplCdUzTlV4tW/gv7+tsTJKtTlvhMu4CidmuYNZ//TVwdRAyDHzMigbVYlEtW
-4y7o/Pd/Jho1ZVkSFeT2s6JPy6z5hmLxx5eGaLc/ZWj+I3RmVj0J5PPdxQ5n3XGurbJ934FU9VNs
-2nCHmTW9w8I3pLxYPAxP0wrqkqutrWYxET+pVQHxk3oayHcVi1PGMqnIN/KaFDoeC11msbjFLqvX
-TtFm3VAsjlqF9Vh1NZDfUyzeyYhVd27lnywWb2bEquuz4OSanxFrUdMPwGhQrLEJy7Uq1WvCwNWB
-9/rljFi1RdBdLP63TcPyLWBdrwVYv1xt0bA8q65hbxSLX3UH7cGy1AVCayoWZATF5h57KrjJG3aT
-Ssct7DYg69+6R6wZ9jDPqlVxoUyr+Eyba0+ypIlJkPckONkGkUQg6+s5i7BeAotw42EbNoj8xHnw
-+sdyAPaILc36DRubxjbsKUqy5oabeyx5A79i4yzbADI+ESvUwIs5MOYBHcyyMsV8rgDKIKKpdQmg
-FkVeArLeD1kt0pLOK/MIG0JtrR2b4JOixhzHmsv1D689st68bY+GVlv9XfgLIHjCIaMBYlds3Ivf
-VW0cd4HPycI/Nt1gtj1/BT7QAaagKqsdXK+h4VHfvlJeXn6jG939YsdhCVZoft6uRLoXf9GsdaNg
-OWN3HHaAqEVVTjQrIB5vqzgx25x2E2EBqgPIbwgqB3gLwnZF1u2/ODZj0liESICFqJBV1J+FNyKG
-FeAOj7nVpoy7IGLvBZLBFtT6ETstUBsmsSLaRkN+ga7FBpzCKdyggI8mdz1BzZ3Mimh7lpkR7lTY
-tI/Q9gQEuZIoWNDLELHmctObTdEeZf14bNyOKdb1QX8nRi4YhhP0ij1Yrr/NdQ2lNqOveRH33n7u
-diHWJK91AR0BckLRGB9z3UZDs2x0wRQYry3w6wqljklrdTtkWXP9E2DnxgljHiysf5zmJhgWheLi
-R0RWRc+PN7tuhSGXEDFVyYp97Moi7BCB8YwUa65/CJi20U6O6zgkVsTGAyyB4vNyrMAhANiKSTP+
-K/guRzFLbKBFXqBYlEUFvhbowFZlRrse0QEBBS0Jl8VdyyoI22PIIfhNm7wUStLxl+TtmsshWNeG
-DlhxvilifhG1Ft+swprrXwthbfQ+vNZXSAYNOCMvFt+oxEpgZ5h3tcRrRblZMrGKz6qhgoiLLDvD
-uPMa5TKbbj4zAG0OMlB3QGlgzVYYn2GcYYubvCWmC9SqRUW5oouyBMsblpW6l5hRVSIBZ/txtK3T
-uGVfo/ea/nvbMyl86NNKt58ePGwHNtihCbCreSx2YSCjtWBZtuMoaGD89wup7EqcgVth2BskluZK
-QYu/rHnIGbim/WywqcgbWDEQcLRYsu4Mw2lXoCLjWONbA2JpPIRhTYfb2PklnbpGoPdjFZhOZEa9
-bSe+GSZRFSbY9yJmNb6UFymDT6d0ApQfJQYgJpjOY/hgS2z7bPqJhWlx+AJFmOH55YR6X9qouRyZ
-XqYl6zijv+DTqgHU3DxiWNd4zvUdz9zv0b6oqVWsAmpY0172z8B7P//BT0Pc97+kK1UyvahiTavg
-K2L3rn4EcQWGE4MvqoNIvIJEWsPh60clzqx+SD+dXSYjQs2/qYPIvILOLpNO9kdkTpziGCYCg4b9
-1xQcMi9hLtacYZetkjlxmmNItmUwh2lMgyH1GtiVxcPQDp9ZE1LnTXMQbMqSYab4OnEyDYbUazjW
-E0byrQqp06Y66KRn1x4TrOuHUmFIvYilBIDZRLpVPV3qtKkO4lkNiKDGHU+FIfUiWnVBKRgQwTK3
-X+q0qQ7i5pbr6nuCI2tTUci9iCUE0LD6a3XuQ3KnTXWUF7cAa6+uJ1jvqk2ti/MUoFd5LstERVut
-OLWmr1WQN25u0qFdd/W4aonLdLdN2rBemoVxNTUwy3WlT40OBF5IGtY3s/RZl6myQu8uCetl2kQF
-mnatdhUjLIpEUrD+iWVAAz2qrDgSPSSeYHD7Q2Do2RXIVdGuJBKtFc1IProS5Ao91vXARGpzi0XN
-RLc8zysIPNtqdgx7XcVQgLZf4DE2HHeVYMt01NBMtBqVWaEf6mG0UbIdDroqyq2ZD1Qos8KbWzFJ
-T9/cNuyLueMX40DBKzQ73HBKq+kVUTpHuHvcPNQ2HY6JIdpri1SA7prMIHhXNT+Aw6ZTMyOaJ+lR
-zY8ogKilyHoSszqzgHrUhm6DALgBd0xJA3A3HkpCZivCai/OnoAnVmIF2xwxqyqs9i5Z4LJcpZyQ
-xHgUgJQsq+lbwekQa6xLjzA4lgBJRGfJTzAD67LoZCrdLJKPkMBew7uupJlmYnsZen+FyUUzUpaE
-TMrMMDO7jrEt5Ks9PLP4YmQWklHi6NWMV8Qw+BzShSzNW3xF3mAyrbHPfWFWWRGQnSGh5eB4WoMf
-7XDIvZP0BCzch2b1rMmwS6g4MqnfFOKyc8IqZ1gvKY1qoNSs7z1C1dDY2LvMRAfTV0fQOSGjWC5/
-1kxE05Uy7M6J25p8qm/03sqSsyncLCj1+vkUWrPGk4ULHOe5m2RY+MkMb+hmd+lgYU5IRnO8DOYF
-6hLtlCkVLMy12WiL7k+Mh4rSksjVgTUMZ9qJULQdn/DdfXSsZpmfyqjwRcFAPjYxTLSwavziRFRD
-wnVLIwGSwCanHsFnS+MFgF25ySVLrN31TyuC2bKE7Djje+7k0Wm7R5q5ZGZVF4GBxT95QwaOrJE2
-KD7QePqkQl6tBFtCBYCLqpGp7uj1GCidVewYOpb1J8UG1l5M0wKFLxZXouQqGs0UpDrAsiootQDk
-G1MVpUoDArdBootm7aOvyoqoEWi2pyTVYNxlJDWmGr9Nbj9jr+mNdrQ9J0pTBiRro2bZkQDujOpl
-NkH/HxtpiBH77U/NAAAAAElFTkSuQmCC
+iVBORw0KGgoAAAANSUhEUgAAAKsAAAIoCAMAAAAhjet0AAADAFBMVEUAAAABAQECAgIDAwMXHhna
+kbrakbrakbrakbrakbrakbrakbrakbrakbrakrvakrvblr3bmr/TnLjbnMDcn8LdosPPo7bdpsXd
+q8jdr8ncssqEtpHdt83duc7du8/evNDdvNDcvM/cvM/cvM/cvM/cvM/cvM/cvM/cvM/cvM/cvM/c
+vM/cvc/cvc/avc/TvtDTv9DTv9DUv9DYwNHbwNHcwNHcwdLewdLcwtLdw9PdxNPdxtS6yK7dyNXd
+ydXeydbgydfizNrnzd3lztzd0Nnd0Nnd0Njd0Nnd0Nnd0Nnd0Nno0d/d0dnd0dnd0dnd0dnd0dnd
+0dnd0dnd0dnd0dnd0dnd0dmY0qeh0q2Z06iZ06iZ06iZ06iZ06iZ06iZ06iZ06iZ06ia06ie06mZ
+06ig06uk1LTq1OHh1Nyc1Kib1Kie1ana1duq1sHt1+Tl1+Dr2+Ss287u3Oex3Kux3Ku03auz3auw
+3t6w3t6w3t7v3uiw3t6w3t6w3t6x3t6x3t6w3t6w3t6w3t6w3t7V3uC938i737+937m336uy396z
+39+939W9387U3+C24N/y4Ory4Oq64Ku54Ku/4La/4LS94Ni44d+84ay94ay64uC+4qy+4qy74uC8
+4uC94q694q++4qy+4qy+4qy+4qy+4qy+4qzy4uu+4ty+4qy+4q2+4qy+4qy+4+C+4+K+49+94+G/
+5OHQ5OPN6eXN6eLN6ebP6uXR6+TS6+LS6+XS6+XS6+XS6+XS6+XS6+XS6+XS6+XS6+XT7OHT7N/T
+7N/T7ODT7OLT7OLT7OTT7OLX7ujc8Ovl8/Hm9PHn9PPp9fTs9vXy9vfw9/fv9/f09/j39/j5+vr7
+/fz9/f39/f39/f78/v79/v79/v79/v79/v79/v79/v78/v79/v79/v79/v7/////////////////
+////////////////////////////////////////////////////////////////////////////
+//////////////+3cRl2AAAAGXRFWHRTbm93Ym91bmQgdGVtcGxhdGUAaGVhcnRzVrgCNgAAGoNJ
+REFUeNrt3btPI1uaAHBSR+AxWhsEInLoXd0AjMwFDNeZI0czEzkCjahtQFhNYMlkyyKkJeAO9BJc
+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
+kL0MGX+b0JsCkHuaCJ1rGWSfkLBJtIHRrM6NbW5rHAm74trSBD2HKeE2K+j5FnASGKdGWxqElVBh
+gacEq1nPJ22Cnh2zJkHo129mPc0qYB2In24UIjIgPwCyAhwZrBRCqd5bWgLWjnDDrgR+g0n1XtUD
+vvPE1rD6AmWF+B3mnf7iANBK6F1sKxmjp+f8p7jWnU0fVew+YUHw/Ni6I7BaIjQqgQp+pzRXYrbq
+2vG/YWnduupSBL6jRzyRY9mDcyZPYW1jfa1g39A7ID1qIGYlXdOjP5Y9kEnPKGWzQbfhBd+3Qbqq
+ST0tkDV1iyTdovzsetbBKy+QssZg3/FptwIf4hF9jwnxwQ067F+GeXToKCf5sA8qEH7nCikLlku0
+zWqFKh8dbG1tHcpCz8NQZEGRs2UPmH+V+LtseqTOnIvuYO/fwEp+3CyydHF8gAbEO4LI2JVSeL1i
+j/8H9g/ABkdaki4AAAlPdEVYdENvbW1lbnQAICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICBmyrzgAAAAAElFTkSuQmCC
diff --git a/corpus/m6/native-template-controls-01/read/page-002.pdf b/corpus/m6/native-template-controls-01/read/page-002.pdf
index 89fb7d27fbbdb4a03794effd961c4b799aec3ba8..954a2453d2cd802238876a912ee02bc70a42ff6f 100644
Binary files a/corpus/m6/native-template-controls-01/read/page-002.pdf and b/corpus/m6/native-template-controls-01/read/page-002.pdf differ
diff --git a/corpus/m6/native-template-controls-01/read/page-002.xml b/corpus/m6/native-template-controls-01/read/page-002.xml
index e44203ad99d6e09579fd00769eadf953830dd469..21905ddc3b9598c677be8fa3e97c2a8e680b0db9 100644
--- a/corpus/m6/native-template-controls-01/read/page-002.xml
+++ b/corpus/m6/native-template-controls-01/read/page-002.xml
@@ -1,2 +1,179 @@
-
+iVBORw0KGgoAAAANSUhEUgAAAKsAAAIoCAMAAAAhjet0AAADAFBMVEUAAAABAQECAgIDAwMXHhna
+kbrakbrakbrakbrakbrakbrakbrakbrakbrakrvakrvblr3bmr/TnLjbnMDcn8LdosPPo7bdpsXd
+q8jdr8ncssqEtpHdt83duc7du8/evNDdvNDcvM/cvM/cvM/cvM/cvM/cvM/cvM/cvM/cvM/cvM/c
+vM/cvc/cvc/avc/TvtDTv9DTv9DUv9DYwNHbwNHcwNHcwdLewdLcwtLdw9PdxNPdxtS6yK7dyNXd
+ydXeydbgydfizNrnzd3lztzd0Nnd0Nnd0Njd0Nnd0Nnd0Nnd0Nno0d/d0dnd0dnd0dnd0dnd0dnd
+0dnd0dnd0dnd0dnd0dnd0dmY0qeh0q2Z06iZ06iZ06iZ06iZ06iZ06iZ06iZ06iZ06ia06ie06mZ
+06ig06uk1LTq1OHh1Nyc1Kib1Kie1ana1duq1sHt1+Tl1+Dr2+Ss287u3Oex3Kux3Ku03auz3auw
+3t6w3t6w3t7v3uiw3t6w3t6w3t6x3t6x3t6w3t6w3t6w3t6w3t7V3uC938i737+937m336uy396z
+39+939W9387U3+C24N/y4Ory4Oq64Ku54Ku/4La/4LS94Ni44d+84ay94ay64uC+4qy+4qy74uC8
+4uC94q694q++4qy+4qy+4qy+4qy+4qy+4qzy4uu+4ty+4qy+4q2+4qy+4qy+4+C+4+K+49+94+G/
+5OHQ5OPN6eXN6eLN6ebP6uXR6+TS6+LS6+XS6+XS6+XS6+XS6+XS6+XS6+XS6+XS6+XT7OHT7N/T
+7N/T7ODT7OLT7OLT7OTT7OLX7ujc8Ovl8/Hm9PHn9PPp9fTs9vXy9vfw9/fv9/f09/j39/j5+vr7
+/fz9/f39/f39/f78/v79/v79/v79/v79/v79/v79/v78/v79/v79/v79/v7/////////////////
+////////////////////////////////////////////////////////////////////////////
+//////////////+3cRl2AAAAGXRFWHRTbm93Ym91bmQgdGVtcGxhdGUAaGVhcnRzVrgCNgAAGoNJ
+REFUeNrt3btPI1uaAHBSR+AxWhsEInLoXd0AjMwFDNeZI0czEzkCjahtQFhNYMlkyyKkJeAO9BJc
+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
+kL0MGX+b0JsCkHuaCJ1rGWSfkLBJtIHRrM6NbW5rHAm74trSBD2HKeE2K+j5FnASGKdGWxqElVBh
+gacEq1nPJ22Cnh2zJkHo129mPc0qYB2In24UIjIgPwCyAhwZrBRCqd5bWgLWjnDDrgR+g0n1XtUD
+vvPE1rD6AmWF+B3mnf7iANBK6F1sKxmjp+f8p7jWnU0fVew+YUHw/Ni6I7BaIjQqgQp+pzRXYrbq
+2vG/YWnduupSBL6jRzyRY9mDcyZPYW1jfa1g39A7ID1qIGYlXdOjP5Y9kEnPKGWzQbfhBd+3Qbqq
+ST0tkDV1iyTdovzsetbBKy+QssZg3/FptwIf4hF9jwnxwQ067F+GeXToKCf5sA8qEH7nCikLlku0
+zWqFKh8dbG1tHcpCz8NQZEGRs2UPmH+V+LtseqTOnIvuYO/fwEp+3CyydHF8gAbEO4LI2JVSeL1i
+j/8H9g/ABkdaki4AAAlPdEVYdENvbW1lbnQAICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICBmyrzgAAAAAElFTkSuQmCC
+
diff --git a/corpus/outline-edit/README.md b/corpus/outline-edit/README.md
index 92f9b0d0a9aba3b94b0dedcaddeeab5a1b48d6df..42b3c1c4fe77b26dd0d0d650724244199eef7875 100644
--- a/corpus/outline-edit/README.md
+++ b/corpus/outline-edit/README.md
@@ -46,7 +46,7 @@ The controller selects the target again after activating the native window and
transfers XML as UTF-8 data. Captured authoring scripts retain their exact source;
identical immutable artifacts link to one canonical corpus copy.
-`layout/candidate` applies `PreparedEdit::outline` to the five geometry and saved
+`layout/candidate` applies Rust outline edits to the five geometry and saved
collapse cases in `before`. `layout/cold` captures that Rust output through a fresh
OneNote cache. Every active identity, child/content/structure reference, child level,
and collapse default survives; text, fields, tags and explicit formatting compare
diff --git a/corpus/page-model/README.md b/corpus/page-model/README.md
index c1307cf93d91157ea6b88a82ede89a3b253f182d..6445e48b1851d4f3aa2066d2641789c74d1609ea 100644
--- a/corpus/page-model/README.md
+++ b/corpus/page-model/README.md
@@ -1,6 +1,6 @@
# Page-model edits through a cold native reopen
-`candidate` is `corpus/outline-edit/before` after eight compound `PreparedEdit::page`
+`candidate` is `corpus/outline-edit/before` after eight compound page-model
publications, one per edited page, each combining several kinds of change in a single
transaction: paragraph reorder and Unicode replacement with a bold range; a subtree
move with a new nested child and an italic/colored/resized range; a subtree deletion
diff --git a/corpus/paragraph-edit/README.md b/corpus/paragraph-edit/README.md
index 13ebe199e69cb9b6431fcd8a29d23a249168f47b..652844d8e69cde9043718ec511614cebed57fcc4 100644
--- a/corpus/paragraph-edit/README.md
+++ b/corpus/paragraph-edit/README.md
@@ -26,7 +26,7 @@ notebook before completing inspection. Cold-open the split notebook for the join
pass. Captured COM IDs belong to their originating sessions; discover fresh IDs
when regenerating the corpus.
-`rust-split` retains twelve `ParagraphSplit` outputs, their cold native captures,
+`rust-split` retains twelve Rust paragraph-split outputs, their cold native captures,
and a second native session typing into four empty boundary paragraphs. The
hyperlink case has no output: the operation rejected fields when this row was
captured, and the writer now splits before a link as OneNote does. The Rust
diff --git a/corpus/protected-edit/README.md b/corpus/protected-edit/README.md
index 21d294a63600c317ebb157826b4e0d042aeecc67..bc7dc43bc32e6c0817ecf781b64e2f6c3445e44a 100644
--- a/corpus/protected-edit/README.md
+++ b/corpus/protected-edit/README.md
@@ -1,7 +1,7 @@
# Protected page edit
`candidate/notebook` is `native-encrypted/encrypted-01` after
-`Notebook::save_unlocked` appended text to the first paragraph and added a
+a Rust edit of the unlocked page appended text to the first paragraph and added a
paragraph, exported by `an_unlocked_page_is_saved_under_the_section_key`
(`ONESTORE_PROTECTED_EXPORT`). `candidate/read` is OneNote 2010's COM read from a
fresh clone with an empty cache after unlocking the section in its UI with the
diff --git a/corpus/table-edit/README.md b/corpus/table-edit/README.md
index 24f1e88e56ac8043ec15f6b143fd8f39a5785ec6..5c413768c060e666a9906f88746c6aa4d26685f0 100644
--- a/corpus/table-edit/README.md
+++ b/corpus/table-edit/README.md
@@ -27,7 +27,7 @@ modification time, the indent array copied from a sibling cell (OneNote's
default without one), and the flags every native cell carries, rebuilds each table's row and cell order to the
model's, and writes the column count, widths, locks and border flag. New
tables start as an empty paragraph whose content the structure pass replaces.
-An emptied cell keeps a replacement paragraph, as the tree writer provides.
+An edit that ends with an empty cell is refused; its ops refill the cell themselves.
`tools/test_table_edit.py` checks all three captures without a VM. Regenerate
with `ONESTORE_TABLE_EXPORT`, `ONESTORE_TABLE_EDIT_EXPORT` and
`ONESTORE_NESTED_TABLE_EXPORT` set to new absolute directories while running
diff --git a/crates/notebook/Cargo.toml b/crates/notebook/Cargo.toml
index 798548ff3a48fc39ae90b621a5de01e91b23c191..be20d9945a195e6b3cecd1af67c01d0e0a5df09a 100644
--- a/crates/notebook/Cargo.toml
+++ b/crates/notebook/Cargo.toml
@@ -36,3 +36,7 @@ required-features = ["smb"]
[[example]]
name = "smb_concurrent_client"
required-features = ["smb"]
+
+[[example]]
+name = "smb_publish_probe"
+required-features = ["smb"]
diff --git a/crates/notebook/README.md b/crates/notebook/README.md
index aca6350886a28468c7c89088df71beb923831914..dd79930b674765da96546172bb80dfbba09d5144 100644
--- a/crates/notebook/README.md
+++ b/crates/notebook/README.md
@@ -11,7 +11,7 @@ each by hash. Local success does not acknowledge publication to a shared noteboo
editor ── Edit ──► section thread ─ Section::apply, INSERT edit ─┐
(the parsed section: base + sealed + open) │ one fsync per burst
sync thread: remote.stamp() == base ? publish(sealed batch) ──────┤ base chunks += transaction
- otherwise read once, replay the queue on it ─────────┘ conflict, or base := remote
+ otherwise read once, replay the queue on it ─────────┘ base := remote, conflict pages queued
```
## Edits
@@ -56,15 +56,11 @@ same queue after a relaunch. A section is `Send + Sync`: `apply(author, edit)`
returns at once and reports a refusal as `Event::Rejected`; `events()` drains
remote changes (`Changed(spaces)`), publication outcomes, unreachable files and
failures; `notify` runs on a background thread whenever an event waits.
-`conflict()`, `remote_page(space)` and `resolve(id, Resolution)` present and end a
-conflict; `release(id, archive, Resolution)` ends an uncertain attempt.
+`conflicts()` lists each page's conflict pages, which `page` reads and `delete_pages`
+removes; `release(id, archive, Resolution)` ends an uncertain attempt. The author an
+edit names is the host's: the app passes the account's full name.
`import_page` creates a page holding a copy of another; `delete_pages` removes pages.
-Until the application emits ops, `save`, `queue_save`, `saved`, `saving`,
-`conflicts`, `queue`, `review` and `Event::Refreshed` keep the whole-page API: a
-save lowers the page it is given against the stored page (`onestore::op::lower_page`)
-and applies the ops.
-
`Section::resume(file, replica, notify)` starts from an owned `Replica` without
consulting the remote file; with the `smb` feature, `Section::resume_smb(path,
replica, limit, connect, notify)` binds a share-relative path, `connect` running on
@@ -81,10 +77,15 @@ queue replays on it (`merge.rs`): an op whose objects the remote left alone appl
as it is; a text op shifts past the remote's changes to the same text when its
range stays clear of them; a move, deletion or property the remote already made is
done; a page the remote already holds as the local edits leave it drops their ops.
-Anything else is a `Conflict` on the batch: the queue stays on its base and the
-remote image is kept for review. `resolve(id, Mine)` rewrites the remote page to the
-local one (`lower_page`, once), `Theirs` drops the local ops on that page; either
-applies from the conflicted batch on.
+Anything else conflicts, as in OneNote 2010: the op is dropped with every later op naming
+what it named, the remote's version stays the page, and the local version becomes a
+conflict page under it (`SectionOp::Conflict`, queued as one more edit and published with
+the rest), its conflicting objects marked, named for the author of the first edit that did
+not replay. Page lists merge as OneNote 2010 merges page series: a page the remote moved
+keeps the remote's place, a page moved here goes before the next page in the local order
+the remote left in place, or last, and a page the remote removed comes back as a new copy
+of the local one, placed the same way (`corpus/conflict-page/native-pages`,
+`native-restore`). Nothing blocks the queue.
Publication attempts are recorded before network I/O. An attempt confirms only
when the remote holds its revisions, or every page it changed as it changed them,
@@ -96,7 +97,9 @@ A durable `Published` receipt survives reopening.
A schema-14 cache is converted when opened: it is exported to
`.v14-recovery`, each queued page is lowered against the page the conversion
has so far, and every converted page must equal the page in the old working image,
-or the conversion rolls back and the open fails naming the archive.
+or the conversion rolls back and the open fails naming the archive; a page it held in
+conflict becomes a conflict page. A schema-15 cache's batches lose the review conflict
+they recorded when opened.
With the optional `smb` feature, `SmbRemote::new(client, path, limit)` binds an
`notebook::smb::Client` to one share-relative file and snapshot limit. Remote identity uses the logical root
@@ -161,7 +164,7 @@ conflict policy lives in the client.
## Recovery archives
`export_recovery(new_path)` captures the base and remote images, the edit queue,
-uncertain attempts, conflicts, receipts, downloaded media and the edit-ID sequence in one
+uncertain attempts, receipts, downloaded media and the edit-ID sequence in one
SQLite snapshot. It refuses existing destinations and leaves the live queue
unchanged. Export to a local directory from a background thread: copying holds
the cache mutex while capturing the database. Failure after the final rename can
@@ -261,16 +264,16 @@ targets are `None`.
With the optional `protected` feature, `Notebook::unlock(path, password)`
reads a `Locked` section as `Unlocked { pages, .. }`, and
-`Notebook::save_unlocked(path, password, &mut unlocked, space, page, author)`
-saves an edited page under the section's key, straight to the file: nothing of
-a protected section is cached or queued, a section written since `unlocked`
-was read fails the save, and a wrong password is
+`Notebook::apply_unlocked(path, password, &mut unlocked, author, edit)`
+applies page ops and stores them under the section's key, straight to the file:
+nothing of a protected section is cached or queued, a section written since
+`unlocked` was read refuses the edit, and a wrong password is
`Error::Protected(PasswordMismatch)`.
`Section::import_page(page, author)` copies a page, usually read from another
-section, to the end of this one as a page creation and a save queued like the
+section, to the end of this one as one `SectionOp::Import` queued like the
user's own edits, under fresh identities (`Page::copy`); payloads travel with
-the model, so the copy publishes offline later like any save. Content outside
+the model, so the copy publishes offline later like any edit. Content outside
the model refuses to copy. A move is an import here followed by
`Section::delete_pages` there.
@@ -309,15 +312,20 @@ let document = onestore::document::Document::parse(&revisions)?;
```
Paths are relative to the share. The read limit bounds the complete physical
-snapshot. Call from a background thread outside a Tokio runtime. Use identities
-from the document and the same snapshot with `Client::commit_text` or
-`Client::commit_property_bytes`; their errors retain `onestore::CommitState`.
-`PreparedEdit::page` separates preparation from I/O: inspect the immutable image
-and persist the intended revision identity before `Client::commit_transaction` publishes
-its `transaction()`. `Client::stamp` reads a file's header and length without coordination,
-for polling. `Client::confirm_snapshot` checks and flushes an observed image's stamp, then refreshes
-its header version metadata without adding a revision. The caller must first
-establish which intents that image contains and reread before another commit.
+snapshot. Call from a background thread outside a Tokio runtime.
+`Client::commit_transaction` publishes a `Transaction` from `Section::seal`; its errors
+retain `onestore::CommitState`. `Client::stamp` reads a file's header and length in one
+round trip without coordination, for polling. `Client::confirm` checks and flushes a
+stamp, then refreshes its header version metadata without adding a revision. The caller
+must first establish which intents that image contains and reread before another commit.
+
+A commit is eight round trips while its appended bytes and patches fit fifteen 64 KiB
+writes: open; the coordination locks, identity queries and the stamp check's reads as one
+compound request; the path's identity; the appended bytes and patches, the header, the
+counter (twice at a carry) and the version, each as its writes and a flush in one
+compound; close. The server
+performs a compound in order and answers its flush once the writes are durable, so the
+writes carry no write-through flag.
Readers use shared native guards while writers publish under native write-open
and byte-lock exclusion. Maintenance is excluded during each operation; pathname
diff --git a/crates/notebook/examples/cache_probe.rs b/crates/notebook/examples/cache_probe.rs
index 0e1df5bad63a10f9728981594fcb4ff3c34eeeb9..2176f33a28e75d22cf3bf794055d64bede8f1517 100644
--- a/crates/notebook/examples/cache_probe.rs
+++ b/crates/notebook/examples/cache_probe.rs
@@ -32,6 +32,17 @@ fn content(bytes: &[u8]) -> (ExGuid, ExGuid, String) {
.unwrap()
}
+/// The images the queue leaves and started from, as a recovery archive records them.
+fn images(cache: &Replica, path: &Path) -> Result<(Vec, Vec), Box> {
+ let archive = path.with_extension(format!("probe-{}", std::process::id()));
+ cache.export_recovery(&archive)?;
+ let recovery = notebook::Recovery::open(&archive)?;
+ let images = (recovery.snapshot()?, recovery.remote_snapshot()?);
+ drop(recovery);
+ std::fs::remove_file(&archive)?;
+ Ok(images)
+}
+
fn payload(operation: u64, size: usize) -> String {
format!("{operation}:🦀{}", "x".repeat(size))
}
@@ -73,8 +84,7 @@ fn main() -> Result<(), Box> {
}
let cache = Replica::open(path)?;
if mode == "read" {
- let snapshot = cache.snapshot()?;
- let base = cache.remote_snapshot()?;
+ let (snapshot, base) = images(&cache, path)?;
let (sid, target, mut expected) = content(&base);
let store = Store::parse(&snapshot)?;
assert!(store.checksum_mismatches.is_empty());
@@ -164,8 +174,7 @@ fn main() -> Result<(), Box> {
let instruction = lines.next().unwrap()?;
let (operation, acknowledgement) = instruction.split_once(' ').unwrap();
let operation: u64 = operation.parse()?;
- let source = cache.snapshot()?;
- let (sid, oid, text) = content(&source);
+ let (sid, oid, text) = content(&images(&cache, path)?.0);
let replacement = payload(operation, size);
println!("editing {operation}");
io::stdout().flush()?;
diff --git a/crates/notebook/examples/keystroke_probe.rs b/crates/notebook/examples/keystroke_probe.rs
index b7829a358d5851bbc136d47c7f89db3861f717b1..d0579cd7c47d4792a6888875e22b1a5cecafc4d5 100644
--- a/crates/notebook/examples/keystroke_probe.rs
+++ b/crates/notebook/examples/keystroke_probe.rs
@@ -66,15 +66,15 @@ impl Remote for Memory {
self.read += self.bytes.len() as u64;
Ok(self.bytes.clone())
}
- fn stamp(&mut self) -> io::Result> {
+ fn stamp(&mut self) -> io::Result {
self.read += 1024;
- Ok(Stamp::of(&self.bytes).ok())
+ Stamp::of(&self.bytes).map_err(io::Error::other)
}
fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
transaction.commit(self)
}
- fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
- onestore::confirm_snapshot(self, snapshot)
+ fn confirm(&mut self, base: &Stamp) -> Result<(), CommitError> {
+ onestore::confirm(self, base)
}
}
@@ -135,6 +135,7 @@ fn main() -> Result<(), Box> {
identity: None,
created: None,
margin_origin: [0.0; 2],
+ color: None,
objects: vec![PageObject::Outline(Outline {
id: new_id()?,
title: false,
diff --git a/crates/notebook/examples/migrate_probe.rs b/crates/notebook/examples/migrate_probe.rs
index c26e8032a9628e230bad606ae71ce34f6ca22908..fa449976cf8984da3df03528e0f9076106b1bc73 100644
--- a/crates/notebook/examples/migrate_probe.rs
+++ b/crates/notebook/examples/migrate_probe.rs
@@ -28,14 +28,14 @@ impl Remote for Memory {
fn read(&mut self) -> io::Result> {
Ok(self.0.clone())
}
- fn stamp(&mut self) -> io::Result> {
- Ok(Stamp::of(&self.0).ok())
+ fn stamp(&mut self) -> io::Result {
+ Stamp::of(&self.0).map_err(io::Error::other)
}
fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
transaction.commit(self)
}
- fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
- onestore::confirm_snapshot(self, snapshot)
+ fn confirm(&mut self, base: &Stamp) -> Result<(), CommitError> {
+ onestore::confirm(self, base)
}
}
@@ -72,11 +72,11 @@ fn main() -> Result<(), Box> {
let pending = replica.pending()?;
let summary = replica.recovery_summary()?;
println!(
- "{path}: converted in {:.1} ms; {} edits; {:?}; conflict {:?}",
+ "{path}: converted in {:.1} ms; {} edits; {:?}; conflict pages {:?}",
elapsed.as_secs_f64() * 1e3,
pending.len(),
summary,
- replica.conflict()?
+ replica.conflicts()?
);
for edit in &pending {
println!(
@@ -89,11 +89,15 @@ fn main() -> Result<(), Box> {
for (space, title, level) in replica.pages()? {
println!(" page {space} {level} {title:?}");
}
- let blocked = replica.conflict()?.is_some()
- || replica.recovery_summary()?.uncertain_edits > 0;
+ let blocked = replica.recovery_summary()?.uncertain_edits > 0;
if !pending.is_empty() && !blocked {
let local = pages(&replica)?;
- let mut remote = Memory(replica.remote_snapshot()?);
+ // The remote the queue was made on, as a recovery archive records it.
+ let archive = copy.with_extension("probe-recovery");
+ replica.export_recovery(&archive)?;
+ let mut remote =
+ Memory(notebook::Recovery::open(&archive)?.remote_snapshot()?);
+ std::fs::remove_file(&archive)?;
let synced = replica.sync_once(&mut remote)?;
let published = {
let arena = onestore::Arena::default();
diff --git a/crates/notebook/examples/open_probe.rs b/crates/notebook/examples/open_probe.rs
index d093914bf64d997dbad657b4246d415fcf8f7639..d3370a13769574a67c332621068a8b3520e5cd34 100644
--- a/crates/notebook/examples/open_probe.rs
+++ b/crates/notebook/examples/open_probe.rs
@@ -44,6 +44,7 @@ fn generated(count: usize) -> Result, Box> {
identity: None,
created: None,
margin_origin: [0.0; 2],
+ color: None,
objects: vec![PageObject::Outline(Outline {
id: new_id()?,
title: false,
@@ -106,14 +107,14 @@ impl Remote for Memory {
fn read(&mut self) -> io::Result> {
Ok(self.0.clone())
}
- fn stamp(&mut self) -> io::Result> {
- Ok(Stamp::of(&self.0).ok())
+ fn stamp(&mut self) -> io::Result {
+ Stamp::of(&self.0).map_err(io::Error::other)
}
fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
transaction.commit(self)
}
- fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
- onestore::confirm_snapshot(self, snapshot)
+ fn confirm(&mut self, base: &Stamp) -> Result<(), CommitError> {
+ onestore::confirm(self, base)
}
}
diff --git a/crates/notebook/examples/queue_scale.rs b/crates/notebook/examples/queue_scale.rs
index 4b5e4393cc08bab0482a7c7d57993a199014e4eb..28833b139bc2dbd89b4429e5a73f9aa2ce4f2d10 100644
--- a/crates/notebook/examples/queue_scale.rs
+++ b/crates/notebook/examples/queue_scale.rs
@@ -1,8 +1,8 @@
use notebook::{EditStatus, Remote, Replica};
use onestore::{
- CommitError, PageCreation, PreparedEdit, RevisionIndex, Store, Transaction,
- document::Document,
- page::{Page, PageObject, Paragraph, text::Edit},
+ Arena, CommitError, ExGuid, PageCreation, Section, Stamp, Transaction,
+ op::{Edit, Op, PageOp, SectionOp},
+ page::PageObject,
};
use std::{io, path::PathBuf, time::Instant};
@@ -12,11 +12,14 @@ impl Remote for FileRemote {
fn read(&mut self) -> io::Result> {
onestore::read_file(&self.0)
}
+ fn stamp(&mut self) -> io::Result {
+ Stamp::of(&self.read()?).map_err(io::Error::other)
+ }
fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
transaction.commit_file(&self.0)
}
- fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
- onestore::confirm_file_snapshot(&self.0, snapshot)
+ fn confirm(&mut self, base: &Stamp) -> Result<(), CommitError> {
+ onestore::confirm_file(&self.0, base)
}
}
@@ -29,13 +32,14 @@ fn main() -> Result<(), Box> {
std::fs::create_dir(&directory)?;
let source = onestore::create_section("queue.one", "First", "Fixture")?;
let creation = PageCreation::new(None, Some("Second"), "Fixture")?;
- let source = PreparedEdit::create_page(&source, &creation)?
- .as_bytes()
- .to_vec();
- let pages = {
- let store = Store::parse(&source)?;
- let index = RevisionIndex::parse(&store)?;
- Document::parse(&index)?.pages()?
+ let (source, pages) = {
+ let arena = Arena::default();
+ let mut section = Section::open(&arena, source)?;
+ let ops = vec![Op::Section(SectionOp::Create(creation))];
+ section.apply("Fixture", &Edit { at: 133_000_000_000_000_000, ops })?;
+ section.seal()?;
+ let pages: Vec = section.pages()?.into_iter().map(|(space, ..)| space).collect();
+ (section.image(), pages)
};
assert_eq!(pages.len(), 2);
let path = directory.join("cache.sqlite");
@@ -48,40 +52,32 @@ fn main() -> Result<(), Box> {
for n in 0..count {
let edit_start = Instant::now();
let slot = n % 2;
- let space = pages[slot].0;
- let mut page = cache.page(space)?;
+ let space = pages[slot];
+ let page = cache.page(space)?;
let text = page
.objects
- .iter_mut()
+ .iter()
.find_map(|object| match object {
- PageObject::Outline(outline) => {
- outline.paragraphs.iter_mut().find_map(|p| p.text_mut())
- }
PageObject::Title(title) => title
.outlines
- .iter_mut()
- .flat_map(|outline| &mut outline.paragraphs)
- .find_map(|p| p.text_mut().filter(|text| text.date_field.is_none())),
+ .iter()
+ .flat_map(|outline| &outline.paragraphs)
+ .find_map(|p| p.text().filter(|text| text.date_field.is_none())),
_ => None,
})
.unwrap();
expected[slot] = format!("Edit {n} 🦀 e\u{301}");
let end = u32::try_from(text.text.text().encode_utf16().count())?;
- let format = text.text.format_at(0)?.clone();
- text.text.apply(Edit {
+ let op = PageOp::Text {
+ text: text.id,
range: 0..end,
- replacement: Paragraph::new(expected[slot].clone(), format),
- })?;
- let before = cache.page(space)?;
- let ops = onestore::op::lower_page(&before, &page)?;
+ with: expected[slot].clone(),
+ };
let id = cache.apply(
"Fixture",
- onestore::op::Edit {
+ Edit {
at: 133_000_000_000_000_000,
- ops: ops
- .into_iter()
- .map(|op| onestore::op::Op::Page { space, op })
- .collect(),
+ ops: vec![Op::Page { space, op }],
},
)?;
assert!(ids.last().is_none_or(|previous| *previous < id));
@@ -108,8 +104,7 @@ fn main() -> Result<(), Box> {
.collect::>(),
ids
);
- let source = cache.snapshot()?;
- verify(&source, &pages, &expected)?;
+ verify(&cache, &pages, &expected)?;
println!(
"{}",
serde_json::json!({"phase":"reopen","seconds":start.elapsed().as_secs_f64()})
@@ -132,9 +127,13 @@ fn main() -> Result<(), Box> {
serde_json::json!({"phase":"publish","count":ids.len(),"ms":step.elapsed().as_secs_f64()*1000.0})
);
assert!(cache.pending()?.is_empty());
- let published = cache.snapshot()?;
- assert_eq!(onestore::read_file(&remote.0)?, published);
- verify(&published, &pages, &expected)?;
+ let published = onestore::read_file(&remote.0)?;
+ verify(&cache, &pages, &expected)?;
+ let arena = Arena::default();
+ let section = Section::open(&arena, published.clone())?;
+ for space in &pages {
+ assert_eq!(section.page(*space)?, cache.page(*space)?);
+ }
drop(cache);
let cache = Replica::open(&path)?;
for id in &ids {
@@ -152,7 +151,11 @@ fn main() -> Result<(), Box> {
.collect::>(),
ids
);
- verify(&archive.snapshot()?, &pages, &expected)?;
+ let arena = Arena::default();
+ let section = Section::open(&arena, archive.snapshot()?)?;
+ for (slot, space) in pages.iter().enumerate() {
+ assert_eq!(section.page(*space)?.title, expected[slot]);
+ }
println!(
"{}",
serde_json::json!({"phase":"complete","count":count,
@@ -163,17 +166,12 @@ fn main() -> Result<(), Box> {
}
fn verify(
- bytes: &[u8],
- pages: &[(onestore::ExGuid, onestore::ExGuid)],
+ cache: &Replica,
+ pages: &[ExGuid],
expected: &[String; 2],
) -> Result<(), Box> {
- let store = Store::parse(bytes)?;
- assert!(store.checksum_mismatches.is_empty());
- let index = RevisionIndex::parse(&store)?;
- index.validate_current()?;
- let document = Document::parse(&index)?;
- for (slot, (space, _)) in pages.iter().enumerate() {
- assert_eq!(Page::from_space(&document, *space)?.title, expected[slot]);
+ for (slot, space) in pages.iter().enumerate() {
+ assert_eq!(cache.page(*space)?.title, expected[slot]);
}
Ok(())
}
diff --git a/crates/notebook/examples/recovery_probe.rs b/crates/notebook/examples/recovery_probe.rs
index 6a14689bbdde8f6ab1b9263621432439cbc10a44..fe95596907bcbfc4cbc8c7415f8f88ae21fb822f 100644
--- a/crates/notebook/examples/recovery_probe.rs
+++ b/crates/notebook/examples/recovery_probe.rs
@@ -1,10 +1,10 @@
mod support {
pub mod view;
}
-use support::view::view;
+use support::view::{cached, view};
use notebook::{EditStatus, Remote, Replica};
-use onestore::{CommitError, CommitIo, Transaction};
+use onestore::{CommitError, CommitIo, Stamp, Transaction};
use serde_json::json;
use std::{
env,
@@ -73,16 +73,19 @@ impl Remote for Disk {
phase("publish-after");
result
}
- fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
+ fn stamp(&mut self) -> io::Result {
+ Stamp::of(&self.read()?).map_err(io::Error::other)
+ }
+ fn confirm(&mut self, base: &Stamp) -> Result<(), CommitError> {
phase("confirm-before");
- let result = onestore::confirm_snapshot(self, snapshot);
+ let result = onestore::confirm(self, base);
phase("confirm-after");
result
}
}
fn report(cache: &Replica, root: &Path) -> Result<(), Box> {
- let local = view(&cache.snapshot()?)?;
+ let (_, _, local) = cached(cache)?;
let remote = view(&fs::read(root.join("remote.one"))?)?;
let (status, revision) = match cache.status(1)? {
Some(EditStatus::Pending) => ("pending", None),
@@ -90,14 +93,13 @@ fn report(cache: &Replica, root: &Path) -> Result<(), Box
("uncertain", Some(revision.to_string()))
}
Some(EditStatus::Published { revision }) => ("published", Some(revision.to_string())),
- Some(EditStatus::Conflict(_)) => ("conflict", None),
Some(EditStatus::Archived { archive }) => ("archived", Some(archive)),
None => ("missing", None),
};
println!(
"{}",
json!({"event":"state", "status":status, "revision":revision,
- "local_text":local.text, "remote_text":remote.text, "remote_revision":remote.revision.to_string(),
+ "local_text":local, "remote_text":remote.text, "remote_revision":remote.revision.to_string(),
"pending":cache.pending()?.iter().map(|pending| match &pending.edit.ops[..] {
[onestore::op::Op::Page { op: onestore::op::PageOp::Text { range, with, .. }, .. }] =>
json!({"id":pending.id,"replacement":with,"range":[range.start,range.end]}),
diff --git a/crates/notebook/examples/save_probe.rs b/crates/notebook/examples/save_probe.rs
index 1e2af9eb89cb96d0fe96b23bf5c22000557ec5e2..6020ced7fe383cb16bb0df7a32a740613cf93674 100644
--- a/crates/notebook/examples/save_probe.rs
+++ b/crates/notebook/examples/save_probe.rs
@@ -1,12 +1,13 @@
-//! Times importing a generated page into a copy of a section, then saving a one-character
-//! edit of it: `save_probe SECTION PARAGRAPHS`.
+//! Times importing a generated page into a copy of a section, then typing one character
+//! into it until durable and queued: `save_probe SECTION PARAGRAPHS`.
use notebook::session::Section;
use onestore::{
document::{Format, Layout},
+ op::{Edit, Op, PageOp},
page::{
Outline, Page, PageObject, PageParagraph, Paragraph, ParagraphContent, TextObject,
- text::{Edit, new_id},
+ text::new_id,
},
};
use std::time::{Duration, Instant};
@@ -49,6 +50,7 @@ fn main() -> Result<(), Box> {
identity: None,
created: None,
margin_origin: [0.0; 2],
+ color: None,
objects: vec![PageObject::Outline(Outline {
id: new_id()?,
title: false,
@@ -67,38 +69,38 @@ fn main() -> Result<(), Box> {
let start = Instant::now();
let space = section.import_page(&imported, "Probe")?;
println!("import {count}: {:?}", start.elapsed());
- let before = section.page(space)?;
- let edit = |page: &Page, word: &str| -> Result> {
- let mut after = page.clone();
- let text = after
- .objects
- .iter_mut()
- .find_map(|object| match object {
- PageObject::Outline(outline) if outline.paragraphs.len() == count => {
- outline.paragraphs[count / 2].text_mut()
- }
- _ => None,
- })
- .ok_or("the imported outline is missing")?;
- let format = text.text.format_at(0)?.clone();
- text.text.apply(Edit {
- range: 0..0,
- replacement: Paragraph::new(word.into(), format),
- })?;
- Ok(after)
+ let text = section
+ .page(space)?
+ .objects
+ .iter()
+ .find_map(|object| match object {
+ PageObject::Outline(outline) if outline.paragraphs.len() == count => {
+ outline.paragraphs[count / 2].text().map(|text| text.id)
+ }
+ _ => None,
+ })
+ .ok_or("the imported outline is missing")?;
+ let typed = |word: &str| Edit {
+ at: 133_000_000_000_000_000,
+ ops: vec![Op::Page {
+ space,
+ op: PageOp::Text {
+ text,
+ range: 0..0,
+ with: word.into(),
+ },
+ }],
};
- let after = edit(&before, "x")?;
let start = Instant::now();
- section.save(space, &before, &after, "Probe")?;
- println!("save: {:?}", start.elapsed());
- let next = edit(&after, "y")?;
+ section.replica().apply("Probe", typed("x"))?;
+ println!("typed, durable: {:?}", start.elapsed());
let start = Instant::now();
- section.queue_save(space, after, next, "Probe")?;
- println!("queue_save: {:?}", start.elapsed());
+ section.apply("Probe", typed("y"))?;
+ println!("typed, queued: {:?}", start.elapsed());
let deadline = start + Duration::from_secs(600);
while Instant::now() < deadline {
- if let Some((_, save)) = section.saved().pop() {
- println!("queued save done: {:?} {save:?}", start.elapsed());
+ if section.replica().pending()?.len() == 2 {
+ println!("queued edit durable: {:?}", start.elapsed());
break;
}
std::thread::sleep(Duration::from_millis(1));
diff --git a/crates/notebook/examples/session_client.rs b/crates/notebook/examples/session_client.rs
index 2cae639fd49e77790f6457afab66f52ee6067608..06f0f0109f87f17dd635bc9b32977647d1e28a95 100644
--- a/crates/notebook/examples/session_client.rs
+++ b/crates/notebook/examples/session_client.rs
@@ -1,15 +1,16 @@
-//! Drives a section the way the application does: open it through a session, save
-//! page-model edits, wait for their publication and report the page texts.
+//! Drives a section the way the application does: open it through a session, apply
+//! edits, wait for their publication and report the page texts.
//! `session_client SECTION CACHE_DIR LABEL` edits the first body paragraph of every
//! page whose title starts with "Move" and adds one outline per page; each launch
//! reports the pending queue it found and the receipts it obtained.
use notebook::{
EditStatus,
- session::{Event, Save, Section},
+ session::{Event, Section},
};
use onestore::{
ExGuid,
+ op::PageOp,
page::{Outline, Page, PageObject, PageParagraph, ParagraphContent, TextObject, text::new_id},
};
use std::{
@@ -46,28 +47,9 @@ fn texts(page: &Page) -> Vec {
out
}
-fn edit(page: &mut Page, label: &str) {
+/// Types `label` before the first body paragraph and adds an outline below the body.
+fn edit(page: &Page, label: &str) -> Vec {
let text = body_text(page).expect("a body paragraph");
- for object in &mut page.objects {
- let PageObject::Outline(outline) = object else {
- continue;
- };
- if let Some(paragraph) = outline
- .paragraphs
- .iter_mut()
- .find(|p| p.text().is_some_and(|t| t.id == text))
- {
- let target = paragraph.text_mut().unwrap();
- let format = target.text.format_at(0).unwrap().clone();
- target
- .text
- .apply(onestore::page::text::Edit {
- range: 0..0,
- replacement: onestore::page::Paragraph::new(format!("{label} "), format),
- })
- .unwrap();
- }
- }
let template = page
.objects
.iter()
@@ -110,12 +92,21 @@ fn edit(page: &mut Page, label: &str) {
paragraphs: vec![paragraph],
unsupported: Vec::new(),
};
- let at = page
- .objects
- .iter()
- .position(|o| matches!(o, PageObject::Title(_)))
- .unwrap_or(page.objects.len());
- page.objects.insert(at, PageObject::Outline(outline));
+ let title = page.objects.iter().find_map(|object| match object {
+ PageObject::Title(title) => Some(title.id),
+ _ => None,
+ });
+ vec![
+ PageOp::Text {
+ text,
+ range: 0..0,
+ with: format!("{label} "),
+ },
+ PageOp::Add {
+ object: PageObject::Outline(outline),
+ before: title,
+ },
+ ]
}
fn main() -> Result<(), Box> {
@@ -138,13 +129,21 @@ fn main() -> Result<(), Box> {
.iter()
.filter(|(_, title, _)| title.starts_with("Move"))
{
- let before = section.page(*space)?;
- let mut after = before.clone();
- edit(&mut after, label);
- match section.save(*space, &before, &after, "session client")? {
- Save::Queued(id) => queued.push((id, *space, title.clone(), texts(&after))),
- other => return Err(format!("{title}: {other:?}").into()),
+ let mut page = section.page(*space)?;
+ let ops = edit(&page, label);
+ for op in &ops {
+ onestore::op::predict(&mut page, op)?;
}
+ let unix = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH)?;
+ let edit = onestore::op::Edit {
+ at: (unix.as_secs() + 11_644_473_600) * 10_000_000,
+ ops: ops
+ .into_iter()
+ .map(|op| onestore::op::Op::Page { space: *space, op })
+ .collect(),
+ };
+ let id = section.replica().apply("session client", edit)?;
+ queued.push((id, *space, title.clone(), texts(&page)));
}
let deadline = Instant::now() + Duration::from_secs(120);
let mut receipts = Vec::new();
@@ -176,7 +175,7 @@ fn main() -> Result<(), Box> {
}
Event::Failed(error) => return Err(error.into()),
Event::Rejected { error, .. } => return Err(error.into()),
- Event::Refreshed | Event::Changed(_) => {}
+ Event::Changed(_) => {}
}
}
// A batch reports its newest edit; each edit's receipt is its own.
diff --git a/crates/notebook/examples/smb_concurrent_client.rs b/crates/notebook/examples/smb_concurrent_client.rs
index 9c55d513e961b1c553f0b0957032c8fb94cd6d2e..797684d46afed217caf77c0488bf72ccd9fde4f2 100644
--- a/crates/notebook/examples/smb_concurrent_client.rs
+++ b/crates/notebook/examples/smb_concurrent_client.rs
@@ -1,5 +1,7 @@
#[path = "../../onestore/examples/support/concurrent.rs"]
mod concurrent;
+#[path = "support/edit.rs"]
+mod edit;
use notebook::smb::{Client, Credentials};
use std::{env, time::Duration};
@@ -16,7 +18,10 @@ fn main() -> Result<(), Box> {
&args,
|path| client.read(path, 256 * 1024 * 1024),
|path, source, space, object, range, replacement| {
- client.commit_text(path, source, space, object, range, replacement)
+ client.commit_transaction(
+ path,
+ &edit::replaced(source, space, object, range, replacement)?,
+ )
},
)
}
diff --git a/crates/notebook/examples/smb_offline_client.rs b/crates/notebook/examples/smb_offline_client.rs
index 73e90b9eb2bfb40e097ca0813d8695c521943bb3..dbf7ceeae4fe935f5bb7c558ffbca12d6b1de756 100644
--- a/crates/notebook/examples/smb_offline_client.rs
+++ b/crates/notebook/examples/smb_offline_client.rs
@@ -3,7 +3,7 @@ mod concurrent;
use notebook::smb::{Client, Credentials};
use notebook::{EditStatus, Error, Remote, Replica, SmbRemote};
-use onestore::{CommitError, CommitState, ExGuid, RevisionIndex, Store, Transaction};
+use onestore::{CommitError, CommitState, ExGuid, RevisionIndex, Stamp, Store, Transaction};
use serde_json::json;
use std::{
env,
@@ -18,7 +18,7 @@ mod support {
pub mod view;
}
use concurrent::{DocumentView, document_view};
-use support::view::view;
+use support::view::{cached, view};
impl DocumentView {
fn changes(&self, before: &Self) -> Self {
@@ -79,6 +79,13 @@ impl Remote for Traced {
Ok(bytes)
}
fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
+ // Publication reads nothing while the stamp holds; observe an unseen base once.
+ if Stamp::of(&self.read).ok().as_ref() != Some(transaction.base()) {
+ self.read().map_err(|error| CommitError {
+ state: CommitState::NotCommitted,
+ error,
+ })?;
+ }
let mut image = self.read.clone();
transaction.apply(&mut image).map_err(|error| CommitError {
state: CommitState::NotCommitted,
@@ -193,10 +200,22 @@ impl Remote for Traced {
thread::sleep(Duration::from_millis(10));
}
}
+ if result.is_ok() {
+ self.read = image;
+ self.before = Some((after.text, documents));
+ }
result
}
- fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
+ fn stamp(&mut self) -> io::Result {
+ self.remote.stamp()
+ }
+ fn confirm(&mut self, base: &Stamp) -> Result<(), CommitError> {
let captured = (|| -> Result<_, Box> {
+ // A confirmation follows the read of its image, except for edits that changed nothing.
+ if Stamp::of(&self.read).ok().as_ref() != Some(base) {
+ self.read = self.remote.read()?;
+ }
+ let snapshot = &self.read[..];
let store = Store::parse(snapshot)?;
let index = RevisionIndex::parse(&store)?;
let revisions = index
@@ -240,7 +259,7 @@ impl Remote for Traced {
error: io::Error::other(error.to_string()),
})?;
let started = now();
- let result = self.remote.confirm(snapshot);
+ let result = self.remote.confirm(base);
println!(
"{}",
json!({"event":"remote_confirm", "started_us":started, "finished_us":now(), "revisions":revisions, "current_revisions":current, "capture":capture.as_ref().and_then(|path| path.file_name()).map(|name| name.to_string_lossy()), "text":self.before.as_ref().map(|(text,_)|text),
@@ -343,6 +362,7 @@ fn main() -> Result<(), Box> {
}
})?;
let mut ids = Vec::new();
+ let mut tokens = Vec::new();
let result = (|| -> Result<(), Box> {
let mut generated = 0;
let mut received = 0;
@@ -380,62 +400,46 @@ fn main() -> Result<(), Box> {
8
};
if generated < operations && pending.len() < capacity {
- let source = cache.snapshot()?;
- let target = view(&source)?;
- let at = u32::try_from(target.text.encode_utf16().count())?;
+ let (space, object, text) = cached(&cache)?;
+ let at = u32::try_from(text.encode_utf16().count())?;
let token = format!(" [{}:{}]", args[2], generated);
let started = now();
match cache.apply(
"Offline document writer",
- append(target.space, target.object, at, &token),
+ append(space, object, at, &token),
) {
Ok(id) => {
println!(
"{}",
- json!({"event":"local_commit", "id":id, "operation":generated, "space":target.space.to_string(), "object":target.object.to_string(), "before":target.text, "token":token, "started_us":started, "finished_us":now()})
+ json!({"event":"local_commit", "id":id, "operation":generated, "space":space.to_string(), "object":object.to_string(), "before":text, "token":token, "started_us":started, "finished_us":now()})
);
ids.push(id);
+ tokens.push(token);
generated += 1;
}
other => return Err(format!("Unexpected local result: {other:?}").into()),
}
}
- if let Some(conflict) = cache.conflict()? {
- // Concurrent appends meet at the end of the text: take the remote text and
- // append the queued tokens it lacks after it again.
- let remote = view(&cache.remote_snapshot()?)?;
- let tokens: Vec = cache
- .pending()?
+ if received == ids.len() && cache.pending()?.is_empty() {
+ // Concurrent appends meet at the end of the text: a merge keeps the remote's
+ // text and this writer's on a conflict page. Append the published tokens
+ // the text lacks after it again.
+ let (space, object, text) = cached(&cache)?;
+ let missing: Vec = tokens
.iter()
- .flat_map(|queued| queued.edit.ops.iter())
- .filter_map(|op| match op {
- onestore::op::Op::Page {
- op: onestore::op::PageOp::Text { with, .. },
- ..
- } => Some(with.clone()),
- _ => None,
- })
- .filter(|token| !remote.text.contains(token.as_str()))
+ .filter(|token| !text.contains(token.as_str()))
+ .cloned()
.collect();
- match cache.resolve(conflict.id, notebook::Resolution::Theirs) {
- Ok(()) => {
- let mut at = u32::try_from(remote.text.encode_utf16().count())?;
- for token in &tokens {
- cache.apply(
- "Offline document writer",
- append(remote.space, remote.object, at, token),
- )?;
- at += u32::try_from(token.encode_utf16().count())?;
- }
- println!(
- "{}",
- json!({"event":"reviewed_append", "id":conflict.id, "remote":remote.text, "tokens":tokens, "at_us":now()})
- );
- }
- Err(Error::Io(error))
- if [io::ErrorKind::WouldBlock, io::ErrorKind::InvalidInput]
- .contains(&error.kind()) => {}
- Err(error) => return Err(error.into()),
+ let mut at = u32::try_from(text.encode_utf16().count())?;
+ for token in &missing {
+ ids.push(cache.apply("Offline document writer", append(space, object, at, token))?);
+ at += u32::try_from(token.encode_utf16().count())?;
+ }
+ if !missing.is_empty() {
+ println!(
+ "{}",
+ json!({"event":"reviewed_append", "remote":text, "tokens":missing, "at_us":now()})
+ );
}
}
if generated == operations && received == ids.len() {
diff --git a/crates/notebook/examples/smb_publish_probe.rs b/crates/notebook/examples/smb_publish_probe.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a6f5cb71cc1562cc4f18d06d39f695c82ab16be6
--- /dev/null
+++ b/crates/notebook/examples/smb_publish_probe.rs
@@ -0,0 +1,110 @@
+//! Publishes typed keystrokes to a Samba lab one at a time and reports each publication's
+//! wall time: `smb_publish_probe ADDRESS KEYSTROKES [CONTROL]`. With `CONTROL`, the
+//! `tools/smb-proxy.py` control file, each publication is marked in the proxy's trace.
+
+use notebook::{
+ EditStatus, Replica, SmbRemote,
+ smb::{Client, Credentials},
+};
+use onestore::op::{Edit, Op, PageOp};
+use std::{
+ env, fs,
+ time::{Duration, Instant, SystemTime, UNIX_EPOCH},
+};
+
+fn main() -> Result<(), Box> {
+ let args: Vec<_> = env::args().skip(1).collect();
+ let [address, count, control @ ..] = &args[..] else {
+ return Err("smb_publish_probe ADDRESS KEYSTROKES [CONTROL]".into());
+ };
+ let count: u32 = count.parse()?;
+ let mark = |phase: String| -> std::io::Result<()> {
+ if let [control] = control {
+ fs::write(
+ format!("{control}.tmp"),
+ format!("{{\"phase\":\"{phase}\"}}"),
+ )?;
+ fs::rename(format!("{control}.tmp"), control)?;
+ // The proxy polls its control file every 50 ms.
+ std::thread::sleep(Duration::from_millis(120));
+ }
+ Ok(())
+ };
+ let connect = || {
+ Client::connect(
+ address,
+ "agent",
+ Credentials::default(),
+ Duration::from_secs(5),
+ )
+ };
+ let path = format!(
+ "probe-{}.one",
+ SystemTime::now().duration_since(UNIX_EPOCH)?.as_nanos()
+ );
+ let source = onestore::create_section(&path, "Body", "Probe")?;
+ connect()?.create(&path, &source)?;
+ let directory = tempfile::tempdir()?;
+ let replica = Replica::create(directory.path().join("cache.sqlite"), &source)?;
+ let space = replica.pages()?[0].0;
+ let text = replica
+ .page(space)?
+ .objects
+ .iter()
+ .find_map(|object| match object {
+ onestore::page::PageObject::Outline(outline) => outline
+ .paragraphs
+ .iter()
+ .find_map(|p| p.text().map(|t| t.id)),
+ _ => None,
+ })
+ .ok_or("no text")?;
+ let mut remote = SmbRemote::new(connect()?, path.clone(), 1 << 24);
+ mark("idle".into())?;
+ let mut idle = Vec::new();
+ for _ in 0..count {
+ let started = Instant::now();
+ assert_eq!(replica.sync_once(&mut remote)?.edit, None);
+ idle.push(started.elapsed());
+ }
+ let mut published = Vec::new();
+ for n in 0..count {
+ replica.apply(
+ "Probe",
+ Edit {
+ at: 133_000_000_000_000_000,
+ ops: vec![Op::Page {
+ space,
+ op: PageOp::Text {
+ text,
+ range: 4 + n..4 + n,
+ with: "x".into(),
+ },
+ }],
+ },
+ )?;
+ mark(format!("publish-{n}"))?;
+ let started = Instant::now();
+ let synced = replica.sync_once(&mut remote)?;
+ published.push(started.elapsed());
+ assert!(matches!(
+ synced.edit,
+ Some((_, EditStatus::Published { .. }))
+ ));
+ }
+ mark("done".into())?;
+ let quantiles = |mut times: Vec| {
+ times.sort();
+ let at = |q: f64| times[((times.len() - 1) as f64 * q) as usize].as_secs_f64() * 1000.0;
+ format!(
+ "p50 {:.2} ms, p90 {:.2} ms, max {:.2} ms",
+ at(0.5),
+ at(0.9),
+ at(1.0)
+ )
+ };
+ println!("idle poll: {}", quantiles(idle));
+ println!("publish: {}", quantiles(published));
+ connect()?.delete(&path)?;
+ Ok(())
+}
diff --git a/crates/notebook/examples/smb_reconnect_client.rs b/crates/notebook/examples/smb_reconnect_client.rs
index d72a42c9c0a88db608811c8e5b08601222c2f8ee..814635fe985b4894d77a70be1ce638c7078c4012 100644
--- a/crates/notebook/examples/smb_reconnect_client.rs
+++ b/crates/notebook/examples/smb_reconnect_client.rs
@@ -1,9 +1,11 @@
#[path = "../../onestore/examples/support/concurrent.rs"]
mod concurrent;
+#[path = "support/edit.rs"]
+mod edit;
use notebook::smb::{Client, Credentials};
use onestore::{
- CommitError, CommitState, ExGuid, RevisionIndex, Store,
+ CommitError, CommitState, ExGuid, RevisionIndex, Stamp, Store,
document::{Document, Kind},
};
use serde_json::json;
@@ -155,14 +157,14 @@ fn main() -> Result<(), Box> {
&args,
read,
|path, source, space, object, range, replacement| {
- let outcome = client.borrow().as_ref().unwrap().commit_text(
- path,
- source,
- space,
- object,
- range,
- replacement,
- );
+ let outcome =
+ edit::replaced(source, space, object, range, replacement).and_then(|transaction| {
+ client
+ .borrow()
+ .as_ref()
+ .unwrap()
+ .commit_transaction(path, &transaction)
+ });
let Err(error) = outcome else {
return Ok(());
};
@@ -209,14 +211,12 @@ fn main() -> Result<(), Box> {
error: io::Error::other(failure.to_string()),
})?;
if published {
- let confirmation = client.borrow().as_ref().unwrap().commit_text(
- path,
- ¤t,
- space,
- object,
- 0..0,
- "",
- );
+ let confirmation = Stamp::of(¤t)
+ .map_err(|failure| CommitError {
+ state: CommitState::NotCommitted,
+ error: io::Error::other(failure.to_string()),
+ })
+ .and_then(|base| client.borrow().as_ref().unwrap().confirm(path, &base));
if let Err(failure) = confirmation
&& failure.state != CommitState::Committed
{
diff --git a/crates/notebook/examples/support/edit.rs b/crates/notebook/examples/support/edit.rs
new file mode 100644
index 0000000000000000000000000000000000000000..888dc0d03cfc8e27b2af03972a7da368d7b7d05c
--- /dev/null
+++ b/crates/notebook/examples/support/edit.rs
@@ -0,0 +1,49 @@
+use onestore::{
+ Arena, CommitError, CommitState, ExGuid, Section, Transaction,
+ op::{Edit, Op, PageOp},
+};
+use std::{
+ io,
+ ops::Range,
+ time::{SystemTime, UNIX_EPOCH},
+};
+
+/// The transaction replacing `range` of `text` in `image`, typed now.
+pub fn replaced(
+ image: &[u8],
+ space: ExGuid,
+ text: ExGuid,
+ range: Range,
+ with: &str,
+) -> Result {
+ let failed = |error: String| CommitError {
+ state: CommitState::NotCommitted,
+ error: io::Error::new(io::ErrorKind::InvalidData, error),
+ };
+ let arena = Arena::default();
+ let mut section = Section::open(&arena, image.to_vec()).map_err(|e| failed(e.to_string()))?;
+ let at = SystemTime::now()
+ .duration_since(UNIX_EPOCH)
+ .map_err(|e| failed(e.to_string()))?
+ .as_nanos() as u64
+ / 100
+ + 116_444_736_000_000_000;
+ let edit = Edit {
+ at,
+ ops: vec![Op::Page {
+ space,
+ op: PageOp::Text {
+ text,
+ range,
+ with: with.to_owned(),
+ },
+ }],
+ };
+ section
+ .apply("Concurrent client", &edit)
+ .map_err(|e| failed(format!("{e:?}")))?;
+ section
+ .seal()
+ .map_err(|e| failed(e.to_string()))?
+ .ok_or_else(|| failed("The edit changed nothing".into()))
+}
diff --git a/crates/notebook/examples/support/view.rs b/crates/notebook/examples/support/view.rs
index 280be0443d90acca9f8db8dd3d7f0dc63d1b5ecc..96977f14d8ccb470793b81099e4be8aeff8c4785 100644
--- a/crates/notebook/examples/support/view.rs
+++ b/crates/notebook/examples/support/view.rs
@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
use onestore::{
ExGuid, RevisionIndex, Store,
document::{Document, Kind},
@@ -55,3 +57,42 @@ pub fn view(bytes: &[u8]) -> Result> {
}
Ok(found.pop().unwrap())
}
+
+/// The concurrent-edit paragraph of `page`: its text object and text.
+fn in_page(page: &onestore::page::Page) -> Option<(ExGuid, String)> {
+ let mut pending: Vec<&onestore::page::PageParagraph> = page
+ .objects
+ .iter()
+ .flat_map(|object| match object {
+ onestore::page::PageObject::Outline(outline) => outline.paragraphs.iter().collect(),
+ _ => Vec::new(),
+ })
+ .collect();
+ pending.reverse();
+ while let Some(paragraph) = pending.pop() {
+ if let Some(text) = paragraph.text()
+ && text.text.text().starts_with("Concurrent edits:")
+ {
+ return Some((text.id, text.text.text().to_owned()));
+ }
+ if let onestore::page::ParagraphContent::Table(table) = ¶graph.content {
+ pending.extend(table.rows.iter().flat_map(|row| &row.cells).flat_map(|cell| &cell.paragraphs).rev());
+ }
+ }
+ None
+}
+
+/// The concurrent-edit paragraph as the queued edits leave it: its page, text object and
+/// text.
+pub fn cached(cache: ¬ebook::Replica) -> Result<(ExGuid, ExGuid, String), Box> {
+ let mut found = Vec::new();
+ for (space, ..) in cache.pages()? {
+ if let Some((object, text)) = in_page(&cache.page(space)?) {
+ found.push((space, object, text));
+ }
+ }
+ match <[_; 1]>::try_from(found) {
+ Ok([found]) => Ok(found),
+ Err(_) => Err("Expected one concurrent-edit paragraph".into()),
+ }
+}
diff --git a/crates/notebook/src/bin/onestore-diagnostic.rs b/crates/notebook/src/bin/onestore-diagnostic.rs
index cb5fbe8ecd9e720d60238cfec56dd06c59a8ad46..f5bc0fa7ff1552d0572fb5b56ede701b2c139ffd 100644
--- a/crates/notebook/src/bin/onestore-diagnostic.rs
+++ b/crates/notebook/src/bin/onestore-diagnostic.rs
@@ -1,4 +1,11 @@
-use onestore::{ExGuid, Insertion, PreparedEdit, TextAttribute};
+use onestore::{
+ Arena, ExGuid, Section, TextAttribute,
+ document::{Format, Layout},
+ op::{Op, PageOp},
+ page::{
+ Outline, PageObject, PageParagraph, Paragraph, ParagraphContent, TextObject, text::new_id,
+ },
+};
use serde::Deserialize;
use serde_json::{Value, json};
use std::{
@@ -40,6 +47,33 @@ enum Action {
},
}
+/// A new paragraph holding `text` in OneNote's default text style.
+fn paragraph(text: String) -> Result> {
+ let format = Format {
+ font: Some("Calibri".into()),
+ font_size: Some(11.0),
+ language: Some(0x409),
+ ..Default::default()
+ };
+ Ok(PageParagraph {
+ id: new_id()?,
+ parent: None,
+ level: 1,
+ style: None,
+ format: Format::default(),
+ content: ParagraphContent::Text(TextObject {
+ id: new_id()?,
+ date_field: None,
+ text: Paragraph::new(text, format),
+ tags: Vec::new(),
+ }),
+ lists: Vec::new(),
+ tags: Vec::new(),
+ media: Default::default(),
+ collapsed: false,
+ })
+}
+
fn run(args: &[std::ffi::OsString]) -> Result> {
if let [mode, root] = args
&& mode == "catalog"
@@ -79,34 +113,93 @@ fn run(args: &[std::ffi::OsString]) -> Result>
let edit: Edit = serde_json::from_reader(io::stdin().lock())?;
let sid = edit.space;
let oid = edit.object;
- let prepared = match edit.action {
+ let (op, author) = match edit.action {
Action::Text {
start,
end,
replacement,
- } => PreparedEdit::text(&bytes, sid, oid, start..end, &replacement)?,
+ } => (
+ PageOp::Text {
+ text: oid,
+ range: start..end,
+ with: replacement,
+ },
+ String::new(),
+ ),
Action::Format {
start,
end,
attributes,
- } => PreparedEdit::format(&bytes, sid, oid, start..end, &attributes)?,
+ } => (
+ PageOp::Format {
+ text: oid,
+ range: start..end,
+ set: attributes,
+ clear: Vec::new(),
+ },
+ String::new(),
+ ),
Action::Paragraph {
before,
text,
author,
- } => PreparedEdit::insert(
- &bytes,
- sid,
- &Insertion::paragraph(oid, before, &text, &author)?,
- )?,
+ } => (
+ PageOp::Insert {
+ container: oid,
+ before,
+ paragraphs: vec![paragraph(text)?],
+ },
+ author,
+ ),
Action::Outline { x, y, text, author } => {
- PreparedEdit::insert(&bytes, sid, &Insertion::outline(oid, x, y, &text, &author)?)?
+ let store = onestore::Store::parse(&bytes)?;
+ let index = onestore::RevisionIndex::parse(&store)?;
+ if !onestore::document::Document::parse(&index)?
+ .pages()?
+ .contains(&(sid, oid))
+ {
+ return Err("Choose the page to hold the outline".into());
+ }
+ (
+ PageOp::Add {
+ object: PageObject::Outline(Outline {
+ id: new_id()?,
+ title: false,
+ min_width: None,
+ layout: Layout {
+ x: Some(x),
+ y: Some(y),
+ ..Default::default()
+ },
+ indents: Vec::new(),
+ paragraphs: vec![paragraph(text)?],
+ unsupported: Vec::new(),
+ }),
+ before: None,
+ },
+ author,
+ )
}
};
+ let arena = Arena::default();
+ let mut section = Section::open(&arena, bytes)?;
+ let unix = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH)?;
+ let at = (unix.as_secs() + 11_644_473_600) * 10_000_000 + u64::from(unix.subsec_nanos() / 100);
+ section.apply(
+ &author,
+ &onestore::op::Edit {
+ at,
+ ops: vec![Op::Page { space: sid, op }],
+ },
+ )?;
+ let transaction = section.seal()?;
if check {
return Ok(json!({"ok": true}));
}
- Ok(match prepared.commit_file(&args[1]) {
+ let Some(transaction) = transaction else {
+ return Ok(json!({"ok": true, "state": "Unchanged"}));
+ };
+ Ok(match transaction.commit_file(&args[1]) {
Ok(()) => json!({"ok": true, "state": "Committed"}),
Err(error) => json!({"ok": false, "state": format!("{:?}", error.state),
"kind": format!("{:?}", error.error.kind()), "error": error.error.to_string()}),
diff --git a/crates/notebook/src/lib.rs b/crates/notebook/src/lib.rs
index 75c9457dbe646828d4687291cc1c9576df7e6a4c..4456baadbf222a8b4ae28e3c6e6907bf5ec88a94 100644
--- a/crates/notebook/src/lib.rs
+++ b/crates/notebook/src/lib.rs
@@ -29,7 +29,7 @@ mod schema;
pub mod session;
pub use recovery::{Recovery, RecoverySummary};
mod sync;
-pub use sync::{ConflictKind, EditStatus, Remote, Synced};
+pub use sync::{EditStatus, Remote, Synced};
mod worker;
mod working;
#[cfg(feature = "smb")]
@@ -72,19 +72,8 @@ pub struct PendingEdit {
pub edit: Edit,
}
-/// Unpublished work the remote section no longer accepts: the batch holding edit `id`
-/// changed page `space` where the remote changed it too.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Conflict {
- pub id: u64,
- pub space: ExGuid,
- pub kind: ConflictKind,
-}
-
-/// How a conflict or an uncertain attempt ends. `Mine` keeps the local pages: a conflicted
-/// page is rewritten from the remote page to the local one; a released attempt publishes
-/// again. `Theirs` drops the local edits to the conflicted page, or the whole unpublished
-/// branch of a released attempt.
+/// How an uncertain attempt ends after review: `Mine` publishes it again, `Theirs` drops
+/// the whole unpublished branch.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Resolution {
Mine,
@@ -161,6 +150,7 @@ impl Replica {
// the file as it was.
match version {
migrate::VERSION => migrate::migrate(&mut connection, path)?,
+ schema::PREVIOUS => schema::upgrade(&mut connection)?,
schema::VERSION => {}
_ => {
return Err(io::Error::new(
@@ -248,9 +238,14 @@ impl Replica {
self.ask(|reply| working::Request::Pages { reply })
}
+ /// The conflict pages of each page that has them (`onestore::Section::conflicts`).
+ pub fn conflicts(&self) -> Result)>> {
+ self.ask(|reply| working::Request::Conflicts { reply })
+ }
+
/// The section image the queued edits leave, the unsealed ones sealed as one more
- /// revision whose identities differ per call: O(section), for tests and diagnostics.
- pub fn snapshot(&self) -> Result> {
+ /// revision whose identities differ per call: O(section).
+ pub(crate) fn snapshot(&self) -> Result> {
self.ask(|reply| working::Request::Flush { reply })?;
working::image(&*self.lock()?)
}
diff --git a/crates/notebook/src/merge.rs b/crates/notebook/src/merge.rs
index c29a016bd5a9f1af16ffb12c22e80e5860801cd5..f2f21fbb893ad8d4e23e8610011bb64d7c09838a 100644
--- a/crates/notebook/src/merge.rs
+++ b/crates/notebook/src/merge.rs
@@ -2,11 +2,16 @@
//! section when the objects it reads are as the base image had them; text ops on a text
//! the remote also changed shift past the remote's changes when they stay clear of them;
//! a move, deletion or outline setting the remote already made is dropped as done.
-//! Anything else is a conflict: the queue stays on its base until it is resolved.
+//! An op on a page the remote changed where it did is dropped, with every later op naming
+//! the objects it named, and the page conflicts: as OneNote 2010 does, the remote's version
+//! stays the page and the local one becomes a conflict page under it (`conflict_page`).
+//! Page-list edits merge as OneNote 2010 merges page series: a page the remote moved keeps
+//! the remote's place, and a page the queue placed goes before the next page in the queue's
+//! order the remote left in place (`corpus/conflict-page/native-pages`, `native-restore`).
//! Objects the queue itself created are not in the base, so nothing remote can have
//! changed them.
-use crate::{ConflictKind, PendingEdit, Result};
+use crate::{PendingEdit, Result};
use onestore::{
ExGuid, OutlineEdit, PageCreation, PageEdit, PagePosition, Section,
document::{Format, Layout, Tag},
@@ -21,143 +26,113 @@ use std::{
ops::Range,
};
-/// A conflict being resolved: from edit `first` on, ops on `space` are dropped. Keeping
-/// mine replaces the first of them by the ops rewriting the remote page to `target` (or
-/// putting `target` back as a page where the remote removed it), or, for the section's
-/// page list, keeps what of each section op still applies.
-pub(crate) struct Resolving<'p> {
- pub first: u64,
- pub space: ExGuid,
- pub mine: bool,
- pub target: Option<&'p Page>,
-}
+/// The remote changed what an op reads: the op does not replay.
+struct Conflicting;
-pub(crate) enum Outcome {
- /// Every edit applied; these edits' ops changed. An edit whose ops were all dropped
- /// stays, empty, to be published and acknowledged with its batch.
- Applied(Vec<(u64, Edit)>),
- Conflict {
- id: u64,
- space: ExGuid,
- kind: ConflictKind,
- },
+/// The queue replayed on the remote section.
+pub(crate) struct Merged {
+ /// Edits whose ops changed. An edit whose ops were all dropped stays, empty, to be
+ /// published and acknowledged with its batch.
+ pub rewritten: Vec<(u64, Edit)>,
+ /// Pages whose local version the remote could not take, with who made the first edit
+ /// that did not replay and the objects the dropped ops named.
+ pub conflicts: BTreeMap)>,
}
/// Replays `edits` on `new`, the remote section; `old` is the base they were made on.
+/// Ops on the pages in `converged`, which the remote holds as the edits leave them, are done.
pub(crate) fn rebase(
old: &mut Section<'_>,
new: &mut Section<'_>,
edits: &[PendingEdit],
converged: &BTreeSet,
- resolving: Option>,
-) -> Result {
- let root = new.root();
+) -> Result {
let before: BTreeMap = old.revisions().collect();
let after: BTreeMap = new.revisions().collect();
let orders = (order(old)?, order(new)?);
let mut state = Replay {
before,
after,
+ local: orders.0.clone(),
+ unmoved: unmoved(old, new)?,
orders,
created: BTreeSet::new(),
diffs: BTreeMap::new(),
};
- let mut rewritten = Vec::new();
- let mut resolved = false;
+ let mut merged = Merged {
+ rewritten: Vec::new(),
+ conflicts: BTreeMap::new(),
+ };
for queued in edits {
- let branch = resolving
- .as_ref()
- .filter(|resolving| queued.id >= resolving.first);
let mut ops = Vec::new();
let mut changed = false;
for op in &queued.edit.ops {
- let conflict = |kind, space| Outcome::Conflict {
- id: queued.id,
- space,
- kind,
+ let apply = |state: &mut Replay, new: &mut Section<'_>, op: &Op| {
+ state.apply(new, &queued.author, queued.edit.at, op)
};
- if let Some(resolving) = branch {
- let dropped = match op {
- Op::Page { space, .. } => *space == resolving.space,
- Op::Section(_) => resolving.space == root,
- };
- if dropped {
- changed = true;
- let rewrite = match op {
- Op::Page { space, .. } if !resolved && resolving.mine => {
- resolving.target.map(|target| (*space, target))
- }
- _ => None,
- };
- resolved |= matches!(op, Op::Page { .. });
- if let Some((space, target)) = rewrite {
- if !state.listed(space) {
- // Kept while the remote removed it: the page comes back.
- match state.restore(
- new,
- space,
- target,
- &queued.author,
- queued.edit.at,
- )? {
- Ok(restored) => ops.extend(restored),
- Err(kind) => return Ok(conflict(kind, space)),
- }
+ match op {
+ Op::Page { space, op: page_op } => {
+ if converged.contains(space) {
+ changed = true;
+ continue;
+ }
+ // An op naming what a dropped op named would build on it.
+ let named = named(page_op);
+ if let Some((_, dropped)) = merged.conflicts.get_mut(space)
+ && named.iter().any(|id| dropped.contains(id))
+ {
+ dropped.extend(named);
+ changed = true;
+ continue;
+ }
+ let replayed = match state.check(old, new, *space, page_op)? {
+ Ok(None) => {
+ changed = true;
continue;
}
- let current = new.page(space)?;
- for op in onestore::op::lower_page(¤t, target)
- .map_err(|error| OpError::Unsupported(error.message))?
- {
- let op = Op::Page { space, op };
- if let Some(kind) =
- state.apply(new, &queued.author, queued.edit.at, &op)?
- {
- return Ok(conflict(kind, space));
- }
- ops.push(op);
+ Ok(Some(mapped)) => {
+ let mapped = Op::Page {
+ space: *space,
+ op: mapped,
+ };
+ apply(&mut state, new, &mapped)?.then_some(mapped)
}
- }
- if let (Op::Section(op), true) = (op, resolving.mine) {
- // Keeping mine for the section list: the first form that applies.
- for op in state.salvage(new, op) {
- let op = Op::Section(op);
- if state
- .apply(new, &queued.author, queued.edit.at, &op)?
- .is_none()
- {
- ops.push(op);
- break;
- }
+ Err(Conflicting) => None,
+ };
+ match replayed {
+ Some(mapped) => {
+ changed |= mapped != *op;
+ ops.push(mapped);
+ }
+ None => {
+ changed = true;
+ merged
+ .conflicts
+ .entry(*space)
+ .or_insert_with(|| (queued.author.clone(), BTreeSet::new()))
+ .1
+ .extend(named);
}
}
- continue;
}
- }
- let space = match op {
- Op::Page { space, .. } => *space,
- Op::Section(_) => root,
- };
- if matches!(op, Op::Page { .. }) && converged.contains(&space) {
- changed = true;
- continue;
- }
- let mapped = match state.check(old, new, op)? {
- Ok(Some(mapped)) => mapped,
- Ok(None) => {
- changed = true;
- continue;
+ Op::Section(section_op) => {
+ advance(&mut state.local, section_op);
+ // The first form of the edit the remote's page list takes, or none.
+ let mut kept = None;
+ for form in state.forms(new, section_op)? {
+ let form = Op::Section(form);
+ if apply(&mut state, new, &form)? {
+ kept = Some(form);
+ break;
+ }
+ }
+ changed |= kept.as_ref() != Some(op);
+ ops.extend(kept);
}
- Err(kind) => return Ok(conflict(kind, space)),
- };
- changed |= mapped != *op;
- if let Some(kind) = state.apply(new, &queued.author, queued.edit.at, &mapped)? {
- return Ok(conflict(kind, space));
}
- ops.push(mapped);
}
if changed {
- rewritten.push((
+ merged.rewritten.push((
queued.id,
Edit {
at: queued.edit.at,
@@ -166,7 +141,176 @@ pub(crate) fn rebase(
));
}
}
- Ok(Outcome::Applied(rewritten))
+ Ok(merged)
+}
+
+/// The stored objects a page op names; a conflict page marks those it holds.
+fn named(op: &PageOp) -> Vec {
+ match op {
+ PageOp::Text { text, .. }
+ | PageOp::Format { text, .. }
+ | PageOp::Link { text, .. }
+ | PageOp::Equation { text, .. }
+ | PageOp::Split { text, .. } => vec![*text],
+ PageOp::Date { fields, .. } => fields.iter().map(|(text, _)| *text).collect(),
+ PageOp::Color(_) => Vec::new(),
+ PageOp::Join { left, right } => vec![*left, *right],
+ PageOp::Insert { container, .. } => vec![*container],
+ PageOp::Move { object, .. } | PageOp::Delete { object } | PageOp::Outline { object, .. } => {
+ vec![*object]
+ }
+ PageOp::Level { paragraph, .. }
+ | PageOp::Paragraph { paragraph, .. }
+ | PageOp::Style { paragraph, .. }
+ | PageOp::List { paragraph, .. } => vec![*paragraph],
+ PageOp::Tags { target, .. } => vec![*target],
+ PageOp::Add { object, .. } => vec![object.id()],
+ PageOp::Picture { picture: object, .. }
+ | PageOp::Attachment {
+ attachment: object, ..
+ }
+ | PageOp::Strokes { ink: object, .. } => vec![*object],
+ PageOp::Table { table, edit } => match edit {
+ TableEdit::Cell { cell, .. } => vec![*cell],
+ TableEdit::DeleteRow(row) => vec![*row],
+ _ => vec![*table],
+ },
+ }
+}
+
+/// The edit keeping `page`, the version of page `space` the remote could not take, and
+/// applies it to `new`: a conflict page under the remote's page marking `objects` where
+/// `page` holds them, or, where the remote removed the page, the page put back as a copy
+/// where `local`, the section as the queue leaves it, has it. Content outside the page
+/// model stays on the remote's page only; `at` is now.
+#[allow(clippy::too_many_arguments)]
+pub(crate) fn conflict_page(
+ new: &mut Section<'_>,
+ old: &mut Section<'_>,
+ local: &mut Section<'_>,
+ space: ExGuid,
+ page: &Page,
+ author: &str,
+ objects: &BTreeSet,
+ at: u64,
+) -> Result {
+ let mut page = page.clone();
+ page.objects.retain(|object| !matches!(object, PageObject::Unsupported(_)));
+ let listed = order(new)?;
+ let ops = if listed.iter().any(|(listed, _)| *listed == space) {
+ let index = Index::of(&page);
+ let mut marked: Vec = objects
+ .iter()
+ .copied()
+ .filter(|id| index.nodes.contains_key(id))
+ .collect();
+ let copy = page.copy_with(&mut marked)?;
+ let titled = page
+ .objects
+ .iter()
+ .any(|object| matches!(object, PageObject::Title(_)));
+ vec![Op::Section(SectionOp::Conflict {
+ of: space,
+ creation: PageCreation::new(None, titled.then_some(page.title.as_str()), author)?,
+ page: copy,
+ objects: marked,
+ })]
+ } else {
+ // A copy under fresh identities, as OneNote 2010 puts a removed page back.
+ let (base, unmoved) = (order(old)?, unmoved(old, new)?);
+ let queued = order(local)?;
+ let at = queued.iter().position(|(queued, _)| *queued == space);
+ let before = at
+ .map_or(&[][..], |at| &queued[at + 1..])
+ .iter()
+ .map(|(next, _)| *next)
+ .find(|next| {
+ listed.iter().any(|(listed, _)| listed == next)
+ && (unmoved.contains(next) || base.iter().all(|(page, _)| page != next))
+ });
+ let creation = PageCreation::new(before, Some(&page.title), author)?;
+ let mut ops = vec![Op::Section(SectionOp::Import {
+ creation: creation.clone(),
+ page: page.copy()?,
+ })];
+ if let Some(level) = at.map(|at| queued[at].1).filter(|level| *level > 1) {
+ ops.push(Op::Section(SectionOp::Pages(vec![PageEdit::set_level(
+ creation.space(),
+ level,
+ )?])));
+ }
+ ops
+ };
+ let edit = Edit { at, ops };
+ new.apply(author, &edit)?;
+ Ok(edit)
+}
+
+/// Pages the base and the remote both list that the remote left in place: in the same
+/// series at the same level, in base order among themselves. OneNote 2010 gives a page it
+/// moves a series of its own; a page moved within its series is out of base order.
+fn unmoved(old: &mut Section<'_>, new: &mut Section<'_>) -> Result> {
+ let series = (old.series()?, new.series()?);
+ let base: BTreeMap = order(old)?
+ .into_iter()
+ .enumerate()
+ .map(|(at, (space, level))| (space, (at, level)))
+ .collect();
+ let kept: Vec<(ExGuid, usize)> = order(new)?
+ .into_iter()
+ .filter_map(|(space, level)| {
+ let (at, before) = base.get(&space)?;
+ (*before == level && series.0.get(&space) == series.1.get(&space)).then_some((space, *at))
+ })
+ .collect();
+ // A longest subsequence of `kept` in base order (patience sorting).
+ let mut tails: Vec = Vec::new();
+ let mut previous = vec![None; kept.len()];
+ for (i, (_, at)) in kept.iter().enumerate() {
+ let k = tails.partition_point(|tail| kept[*tail].1 < *at);
+ previous[i] = k.checked_sub(1).map(|k| tails[k]);
+ if k == tails.len() {
+ tails.push(i);
+ } else {
+ tails[k] = i;
+ }
+ }
+ let mut unmoved = BTreeSet::new();
+ let mut next = tails.last().copied();
+ while let Some(i) = next {
+ unmoved.insert(kept[i].0);
+ next = previous[i];
+ }
+ Ok(unmoved)
+}
+
+/// Applies a queued page-list edit to `local`, the page order as the queue leaves it.
+fn advance(local: &mut Order, op: &SectionOp) {
+ let insert = |local: &mut Order, page: (ExGuid, u32), before: Option| {
+ let at = before
+ .and_then(|before| local.iter().position(|(space, _)| *space == before))
+ .unwrap_or(local.len());
+ local.insert(at, page);
+ };
+ match op {
+ SectionOp::Create(creation) | SectionOp::Import { creation, .. } => {
+ insert(local, (creation.space(), 1), creation.before());
+ }
+ SectionOp::Pages(edits) => {
+ for edit in edits {
+ let Some(at) = local.iter().position(|(space, _)| *space == edit.space()) else {
+ continue;
+ };
+ local[at].1 = edit.level();
+ if let PagePosition::Before(before) = edit.position() {
+ let page = local.remove(at);
+ insert(local, page, before);
+ }
+ }
+ }
+ SectionOp::Delete(spaces) => local.retain(|(space, _)| !spaces.contains(space)),
+ SectionOp::Conflict { .. } | SectionOp::Color(_) => {}
+ }
}
fn order(section: &mut Section<'_>) -> Result {
@@ -186,6 +330,10 @@ struct Replay {
after: BTreeMap,
/// Page order of the base and the remote.
orders: (Order, Order),
+ /// Page order as the queue leaves it, up to the op replaying.
+ local: Order,
+ /// Pages the remote left in place (`unmoved`).
+ unmoved: BTreeSet,
/// Page spaces the replayed edits created.
created: BTreeSet,
/// Per page the remote changed, what it changed; `None` when it left the page alone.
@@ -193,14 +341,8 @@ struct Replay {
}
impl Replay {
- /// Applies one op to the remote section; `Some` names why it did not apply.
- fn apply(
- &mut self,
- new: &mut Section<'_>,
- author: &str,
- at: u64,
- op: &Op,
- ) -> Result> {
+ /// Applies one op to the remote section; false when the section refused it.
+ fn apply(&mut self, new: &mut Section<'_>, author: &str, at: u64, op: &Op) -> Result {
match new.apply(
author,
&Edit {
@@ -210,64 +352,49 @@ impl Replay {
) {
Ok(()) => {
if let Op::Section(
- SectionOp::Create(creation) | SectionOp::Import { creation, .. },
+ SectionOp::Create(creation)
+ | SectionOp::Import { creation, .. }
+ | SectionOp::Conflict { creation, .. },
) = op
{
self.created.insert(creation.space());
}
- Ok(None)
+ Ok(true)
}
Err(OpError::Failed(error)) => Err(error.into()),
- Err(error) => Ok(Some(match op {
- // A page list the remote reordered refuses the op, however it says so.
- Op::Section(_) => ConflictKind::StructureChanged,
- Op::Page { .. } if matches!(error, OpError::Unsupported(_)) => {
- ConflictKind::UnsupportedEdit
- }
- Op::Page { space, .. } if !self.listed(*space) => ConflictKind::TargetUnavailable,
- Op::Page { .. } => ConflictKind::ContentChanged,
- })),
+ Err(_) => Ok(false),
}
}
- /// The op as it replays on the remote section, or why it cannot.
+ /// The page op as it replays on the remote section; `None` when the remote made it.
fn check(
&mut self,
old: &mut Section<'_>,
new: &mut Section<'_>,
- op: &Op,
- ) -> Result, ConflictKind>> {
- match op {
- Op::Page { space, op } => {
- if !self.listed(*space) {
- return Ok(Err(ConflictKind::TargetUnavailable));
- }
- let diff = match self.diffs.get_mut(space) {
- Some(diff) => diff,
- None => {
- let diff = match (self.before.get(space), self.after.get(space)) {
- (Some(before), Some(after)) if before != after => Some(Diff {
- old: Index::of(&old.page(*space)?),
- new: Index::of(&new.page(*space)?),
- regions: BTreeMap::new(),
- }),
- _ => None,
- };
- self.diffs.entry(*space).or_insert(diff)
- }
+ space: ExGuid,
+ op: &PageOp,
+ ) -> Result, Conflicting>> {
+ if !self.listed(space) {
+ return Ok(Err(Conflicting));
+ }
+ let diff = match self.diffs.get_mut(&space) {
+ Some(diff) => diff,
+ None => {
+ let diff = match (self.before.get(&space), self.after.get(&space)) {
+ (Some(before), Some(after)) if before != after => Some(Diff {
+ old: Index::of(&old.page(space)?),
+ new: Index::of(&new.page(space)?),
+ regions: BTreeMap::new(),
+ }),
+ _ => None,
};
- Ok(match diff {
- None => Ok(Some(Op::Page {
- space: *space,
- op: op.clone(),
- })),
- Some(diff) => diff
- .check(op)
- .map(|op| op.map(|op| Op::Page { space: *space, op })),
- })
+ self.diffs.entry(space).or_insert(diff)
}
- Op::Section(section) => Ok(self.section(section).map(|()| Some(op.clone()))),
- }
+ };
+ Ok(match diff {
+ None => Ok(Some(op.clone())),
+ Some(diff) => diff.check(op),
+ })
}
/// Whether the remote section lists the page, or the replayed edits created it; a page
@@ -276,151 +403,82 @@ impl Replay {
self.created.contains(&space) || self.orders.1.iter().any(|(page, _)| *page == space)
}
- /// Puts `page`, which the remote removed, back into the section and returns the ops
- /// that did: a copy under fresh identities at its level, before the first page after it
- /// that the remote still has and that can take a page before it, or last.
- fn restore(
- &mut self,
- new: &mut Section<'_>,
- space: ExGuid,
- page: &Page,
- author: &str,
- at: u64,
- ) -> Result, ConflictKind>> {
- let old = self.orders.0.clone();
- let position = old.iter().position(|(listed, _)| *listed == space);
- let anchors = position
- .map_or(&[][..], |position| &old[position + 1..])
- .iter()
- .map(|(next, _)| Some(*next))
- .filter(|next| next.is_some_and(|next| self.listed(next)))
- .chain([None])
- .collect::>();
- let copy = page.copy()?;
- let mut refusal = ConflictKind::StructureChanged;
- for before in anchors {
- let creation = PageCreation::new(before, Some(&page.title), author)?;
- let import = Op::Section(SectionOp::Import {
- creation: creation.clone(),
- page: copy.clone(),
- });
- match self.apply(new, author, at, &import)? {
- Some(kind) => refusal = kind,
- None => {
- let mut ops = vec![import];
- if let Some(level) = position.map(|at| old[at].1).filter(|level| *level > 1) {
- let indent = Op::Section(SectionOp::Pages(vec![PageEdit::set_level(
- creation.space(),
- level,
- )?]));
- if let Some(kind) = self.apply(new, author, at, &indent)? {
- return Ok(Err(kind));
- }
- ops.push(indent);
- }
- return Ok(Ok(ops));
- }
- }
- }
- Ok(Err(refusal))
+ /// Whether the remote moved or re-leveled a page the base listed.
+ fn placed(&self, page: ExGuid) -> bool {
+ !self.unmoved.contains(&page) && self.orders.0.iter().any(|(listed, _)| *listed == page)
+ }
+
+ /// Where a page the queue put before `before` goes on the remote: before the first page
+ /// from `before` on, in the queue's order, that the remote lists where the base had it,
+ /// or last, as OneNote 2010 places a page series only one side changed.
+ fn anchor(&self, listed: &Order, page: ExGuid, before: Option) -> Option {
+ let from = self.local.iter().position(|(space, _)| Some(*space) == before)?;
+ self.local[from..].iter().map(|(space, _)| *space).find(|space| {
+ *space != page && !self.placed(*space) && listed.iter().any(|(listed, _)| listed == space)
+ })
}
- fn section(&self, op: &SectionOp) -> std::result::Result<(), ConflictKind> {
- let (old, new) = &self.orders;
- let find =
- |list: &[(ExGuid, u32)], space: ExGuid| list.iter().position(|(s, _)| *s == space);
- match op {
- SectionOp::Create(_) | SectionOp::Import { .. } => Ok(()),
- SectionOp::Delete(pages) => {
- for page in pages {
- if find(new, *page).is_none() && !self.created.contains(page) {
- return Err(ConflictKind::TargetUnavailable);
- }
- if self.before.get(page) != self.after.get(page) {
- return Err(ConflictKind::ContentChanged);
- }
+ /// Forms of a section op to try on the remote section, in order: a page placed by
+ /// `anchor`, the page edits of pages the remote still has and did not move, removals of
+ /// pages the remote still has (a page it changed is not removed), a conflict page's
+ /// content as a page of its own where the remote removed its page.
+ fn forms(&self, new: &mut Section<'_>, op: &SectionOp) -> Result> {
+ let conflicts: BTreeSet = new
+ .conflicts()?
+ .into_iter()
+ .flat_map(|(_, pages)| pages.into_iter().map(|page| page.space))
+ .collect();
+ let listed = order(new)?;
+ let placed = |creation: &PageCreation| {
+ creation.reposition(self.anchor(&listed, creation.space(), creation.before()))
+ };
+ Ok(match op {
+ SectionOp::Create(creation) => vec![SectionOp::Create(placed(creation)?)],
+ SectionOp::Import { creation, page } => vec![SectionOp::Import {
+ creation: placed(creation)?,
+ page: page.clone(),
+ }],
+ SectionOp::Color(_) => vec![op.clone()],
+ SectionOp::Conflict {
+ of, creation, page, ..
+ } => vec![if self.listed(*of) {
+ op.clone()
+ } else {
+ SectionOp::Import {
+ creation: creation.clone(),
+ page: page.clone(),
}
- Ok(())
- }
+ }],
+ // A page the remote moved or re-leveled keeps the remote's placement.
SectionOp::Pages(edits) => {
- // Where the batch puts each page, from the base order.
- let mut wanted: Vec = old.iter().map(|(space, _)| *space).collect();
+ let mut kept = Vec::new();
for edit in edits {
- if let PagePosition::Before(before) = edit.position()
- && let Some(at) = wanted.iter().position(|space| *space == edit.space())
+ if self.placed(edit.space())
+ || listed.iter().all(|(listed, _)| *listed != edit.space())
{
- let space = wanted.remove(at);
- let at = before
- .and_then(|before| wanted.iter().position(|space| *space == before))
- .unwrap_or(wanted.len());
- wanted.insert(at, space);
- }
- }
- let wanted: Vec<(ExGuid, u32)> =
- wanted.into_iter().map(|space| (space, 0)).collect();
- for edit in edits {
- let space = edit.space();
- let Some(at) = find(old, space) else {
continue;
- };
- let Some(now) = find(new, space) else {
- return Err(ConflictKind::TargetUnavailable);
- };
- if old[at].1 != new[now].1 && new[now].1 != edit.level() {
- return Err(ConflictKind::StructureChanged);
- }
- if edit.position() != PagePosition::Keep {
- // Each page the remote also has must keep its side of the moved page,
- // or already be on the side the batch wants.
- let side = |list: &[(ExGuid, u32)], peer: ExGuid| {
- Some(find(list, peer)? < find(list, space)?)
- };
- let conflicting = old.iter().any(|(peer, _)| {
- *peer != space
- && find(new, *peer).is_some()
- && side(new, *peer) != side(old, *peer)
- && side(new, *peer) != side(&wanted, *peer)
- });
- if conflicting {
- return Err(ConflictKind::StructureChanged);
- }
}
+ kept.push(match edit.position() {
+ PagePosition::Keep => edit.clone(),
+ PagePosition::Before(before) => edit.reposition(
+ PagePosition::Before(self.anchor(&listed, edit.space(), before)),
+ edit.level(),
+ )?,
+ });
}
- Ok(())
- }
- }
- }
-
- /// Forms of a section op to try on the remote section list, in order: as it is, a
- /// creation appended instead, moves and removals of the pages still there.
- fn salvage(&self, new: &mut Section<'_>, op: &SectionOp) -> Vec {
- let pages: BTreeSet = new
- .pages()
- .map(|pages| pages.into_iter().map(|(space, ..)| space).collect())
- .unwrap_or_default();
- let present = |space: &ExGuid| pages.contains(space) || self.created.contains(space);
- match op {
- SectionOp::Create(creation) => std::iter::once(creation.clone())
- .chain(creation.reposition(None).ok())
- .map(SectionOp::Create)
- .collect(),
- SectionOp::Import { .. } => vec![op.clone()],
- SectionOp::Pages(edits) => {
- let edits: Vec = edits
- .iter()
- .filter(|edit| present(&edit.space()))
- .cloned()
- .collect();
- if edits.is_empty() {
+ if kept.is_empty() {
Vec::new()
} else {
- vec![SectionOp::Pages(edits)]
+ vec![SectionOp::Pages(kept)]
}
}
SectionOp::Delete(deleted) => {
let deleted: Vec = deleted
.iter()
- .filter(|space| present(space))
+ .filter(|space| {
+ self.listed(**space) && self.before.get(space) == self.after.get(space)
+ || conflicts.contains(space)
+ })
.copied()
.collect();
if deleted.is_empty() {
@@ -429,7 +487,7 @@ impl Replay {
vec![SectionOp::Delete(deleted)]
}
}
- }
+ })
}
}
@@ -491,7 +549,7 @@ impl Diff {
/// Where the remote changed a text's characters and formats; its tags and date field
/// are not positions an op names.
- fn region(&mut self, text: ExGuid) -> std::result::Result, ConflictKind> {
+ fn region(&mut self, text: ExGuid) -> std::result::Result, Conflicting> {
if !self.regions.contains_key(&text) {
if self.ours(text) {
return Ok(None);
@@ -500,7 +558,7 @@ impl Diff {
self.old.nodes.get(&text).map(|node| &node.own),
self.new.nodes.get(&text).map(|node| &node.own),
) else {
- return Err(ConflictKind::ContentChanged);
+ return Err(Conflicting);
};
if a.text == b.text {
return Ok(None);
@@ -512,21 +570,20 @@ impl Diff {
}
/// The op as it replays on the remote page; `None` when the remote already made it.
- fn check(&mut self, op: &PageOp) -> std::result::Result, ConflictKind> {
- use ConflictKind::ContentChanged as Changed;
- let require = |ok: bool| if ok { Ok(()) } else { Err(Changed) };
+ fn check(&mut self, op: &PageOp) -> std::result::Result, Conflicting> {
+ let require = |ok: bool| if ok { Ok(()) } else { Err(Conflicting) };
let mut op = op.clone();
match &mut op {
PageOp::Text { text, range, with } => {
if let Some(region) = self.region(*text)? {
- let mapped = region.map(range).ok_or(Changed)?;
+ let mapped = region.map(range).ok_or(Conflicting)?;
region.replaced(range, with.encode_utf16().count() as u32);
*range = mapped;
}
}
PageOp::Format { text, range, .. } => {
if let Some(region) = self.region(*text)? {
- *range = region.map(range).ok_or(Changed)?;
+ *range = region.map(range).ok_or(Conflicting)?;
}
}
PageOp::Link { text, .. } | PageOp::Equation { text, .. } => {
@@ -547,7 +604,7 @@ impl Diff {
if let Some(region) = self.region(*text)? {
// The cut moves with the character after it: text the remote typed at
// the cut stays left of it.
- let cut = region.map(&(*at..*at + 1)).ok_or(Changed)?;
+ let cut = region.map(&(*at..*at + 1)).ok_or(Conflicting)?;
let right_changes = region.split(*at);
if !right_changes.0.is_empty() {
self.regions.insert(*right, right_changes);
@@ -565,7 +622,8 @@ impl Diff {
self.region(text)?;
}
}
- PageOp::Insert { .. } | PageOp::Add { .. } => {}
+ // A page's colour is the latest one set, whichever side set it.
+ PageOp::Insert { .. } | PageOp::Add { .. } | PageOp::Color(_) => {}
PageOp::Move {
object,
parent,
@@ -633,7 +691,7 @@ impl Diff {
}
_ => false,
};
- return if done { Ok(None) } else { Err(Changed) };
+ return if done { Ok(None) } else { Err(Conflicting) };
}
require(before.is_some())?
}
diff --git a/crates/notebook/src/migrate.rs b/crates/notebook/src/migrate.rs
index 86fd430ad49763b4647863ad309e110a0d511387..6b139418ac872ac7f2b224a24230a8a13ac09fc3 100644
--- a/crates/notebook/src/migrate.rs
+++ b/crates/notebook/src/migrate.rs
@@ -1,7 +1,8 @@
//! Converts a schema-14 cache, whose queue holds whole-page edits over a working image,
//! to this schema's op queue. The cache is exported first; each queued page is lowered to
//! ops against the page the conversion has so far, and every converted page must equal
-//! the page in the old working image, or nothing changes.
+//! the page in the old working image, or nothing changes. A page edit schema 14 held in
+//! conflict becomes the conflict page a merge makes now, the remote's page staying.
use crate::{Result, base, queue, schema};
use onestore::{
@@ -87,7 +88,6 @@ struct Converted {
edit: Edit,
/// Schema 14's publication evidence, when this edit was attempted.
attempted: Option,
- conflict: Option<(i64, ExGuid)>,
}
pub(crate) fn migrate(connection: &mut Connection, path: &Path) -> Result<()> {
@@ -107,6 +107,53 @@ pub(crate) fn migrate(connection: &mut Connection, path: &Path) -> Result<()> {
Ok(())
}
+/// The conflict page keeping `local`, the version of page `space` its merge with `remote`
+/// did not take, marking the texts `remote` does not hold as they are.
+fn conflict(space: ExGuid, remote: &Page, local: &Page, author: &str) -> Result {
+ let texts = |page: &Page| -> BTreeMap {
+ let mut texts = BTreeMap::new();
+ let mut pending: Vec<&onestore::page::PageParagraph> = Vec::new();
+ for object in &page.objects {
+ match object {
+ onestore::page::PageObject::Outline(outline) => pending.extend(&outline.paragraphs),
+ onestore::page::PageObject::Title(title) => {
+ pending.extend(title.outlines.iter().flat_map(|outline| &outline.paragraphs))
+ }
+ _ => {}
+ }
+ }
+ while let Some(paragraph) = pending.pop() {
+ match ¶graph.content {
+ onestore::page::ParagraphContent::Text(text) => {
+ texts.insert(text.id, format!("{:?}", text.text));
+ }
+ onestore::page::ParagraphContent::Table(table) => pending.extend(
+ table.rows.iter().flat_map(|row| &row.cells).flat_map(|cell| &cell.paragraphs),
+ ),
+ _ => {}
+ }
+ }
+ texts
+ };
+ let kept = texts(remote);
+ let mut objects: Vec = texts(local)
+ .into_iter()
+ .filter(|(id, text)| kept.get(id) != Some(text))
+ .map(|(id, _)| id)
+ .collect();
+ let page = local.copy_with(&mut objects)?;
+ let titled = local
+ .objects
+ .iter()
+ .any(|object| matches!(object, onestore::page::PageObject::Title(_)));
+ Ok(Op::Section(SectionOp::Conflict {
+ of: space,
+ creation: PageCreation::new(None, titled.then_some(local.title.as_str()), author)?,
+ page,
+ objects,
+ }))
+}
+
fn convert(transaction: &rusqlite::Transaction<'_>) -> Result<()> {
let (base, patch): (Vec, Vec) =
transaction.query_row("SELECT base, working FROM replica WHERE id=1", [], |row| {
@@ -118,9 +165,9 @@ fn convert(transaction: &rusqlite::Transaction<'_>) -> Result<()> {
Ok((row.get(0)?, row.get(1)?))
})
.optional()?;
- let conflicts: BTreeMap = transaction
- .prepare("SELECT edit_id, kind FROM conflicts")?
- .query_map([], |row| Ok((row.get(0)?, row.get(1)?)))?
+ let conflicts: std::collections::BTreeSet = transaction
+ .prepare("SELECT edit_id FROM conflicts")?
+ .query_map([], |row| row.get(0))?
.collect::>()?;
let queued: Vec<(i64, String, String)> = transaction
.prepare("SELECT id, space, operation FROM edits ORDER BY id")?
@@ -146,6 +193,11 @@ fn convert(transaction: &rusqlite::Transaction<'_>) -> Result<()> {
let operation: Operation = serde_json::from_str(&operation)
.map_err(|error| invalid(format!("Queued edit {id} is unreadable: {error}")))?;
let (author, ops) = match operation {
+ Operation::Page(intent) if conflicts.contains(&id) => {
+ let current = section.page(space)?;
+ let op = conflict(space, ¤t, &intent.after, &intent.author)?;
+ (intent.author, vec![op])
+ }
Operation::Page(intent) => {
let current = section.page(space)?;
let ops = onestore::op::lower_page(¤t, &intent.after)?;
@@ -185,17 +237,12 @@ fn convert(transaction: &rusqlite::Transaction<'_>) -> Result<()> {
}
sealed = Some(section.seal()?);
}
- // A conflicting page-list edit is the section's conflict, whichever page it names.
- let conflicted = match edit.ops.first() {
- Some(Op::Section(_)) => section.root(),
- _ => space,
- };
+ // A schema-14 conflict is queued work: the next rebase keeps both versions.
converted.push(Converted {
id,
author,
edit,
attempted,
- conflict: conflicts.get(&id).map(|kind| (*kind, conflicted)),
});
}
let listed = |image: &[u8]| -> Result> {
@@ -258,12 +305,6 @@ fn convert(transaction: &rusqlite::Transaction<'_>) -> Result<()> {
} else {
batch = Some(current);
}
- if let Some((kind, space)) = edit.conflict {
- transaction.execute(
- "UPDATE batches SET conflict=?1, space=?2 WHERE id=?3",
- params![kind, space.to_string(), current],
- )?;
- }
queue::insert(
transaction,
Some(crate::unsigned(edit.id)?),
diff --git a/crates/notebook/src/queue.rs b/crates/notebook/src/queue.rs
index 66bf8399eca6aa71097a5da93af31e98521d8d66..c4c9c89b5528b285f766a886c53a50780d3b996b 100644
--- a/crates/notebook/src/queue.rs
+++ b/crates/notebook/src/queue.rs
@@ -74,7 +74,7 @@ fn slots(edit: &mut Edit, mut visit: impl FnMut(&mut Payload)) {
} => cells(list, &mut visit),
_ => {}
},
- Op::Section(SectionOp::Import { page, .. }) => {
+ Op::Section(SectionOp::Import { page, .. } | SectionOp::Conflict { page, .. }) => {
for added in &mut page.objects {
object(added, &mut visit);
}
@@ -235,8 +235,12 @@ pub(crate) fn spaces(edit: &Edit, root: onestore::ExGuid) -> Vec {
spaces.push(creation.space());
}
+ SectionOp::Conflict { of, creation, .. } => {
+ spaces.extend([*of, creation.space()]);
+ }
SectionOp::Pages(edits) => spaces.extend(edits.iter().map(|edit| edit.space())),
SectionOp::Delete(pages) => spaces.extend(pages),
+ SectionOp::Color(_) => {}
}
}
}
diff --git a/crates/notebook/src/recovery.rs b/crates/notebook/src/recovery.rs
index 1999ad76d2bfd6f289551327e43762fcf59c86cd..dbb9a08142bc220b206d48227810a44d2b36bf01 100644
--- a/crates/notebook/src/recovery.rs
+++ b/crates/notebook/src/recovery.rs
@@ -8,7 +8,6 @@ const RECOVERY_ID: u32 = 0x4f4e4552;
#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
pub struct RecoverySummary {
pub queued_edits: u64,
- pub conflicts: u64,
pub uncertain_edits: u64,
pub published_receipts: u64,
/// Bytes of the image the queued edits apply to.
@@ -38,7 +37,8 @@ impl Recovery {
io::Error::new(io::ErrorKind::InvalidData, "Not a recovery archive").into(),
);
}
- if version != schema::VERSION {
+ // A schema-15 archive differs only in columns nothing reads.
+ if ![schema::PREVIOUS, schema::VERSION].contains(&version) {
return Err(io::Error::new(
io::ErrorKind::InvalidData,
format!(
@@ -166,18 +166,16 @@ fn summary(connection: &Connection) -> Result {
let length = |image| -> Result {
Ok(base::stamp(connection, image)?.map_or(0, |stamp| stamp.length))
};
- let (queued_edits, conflicts, uncertain_edits, published_receipts): (i64, i64, i64, i64) =
+ let (queued_edits, uncertain_edits, published_receipts): (i64, i64, i64) =
connection.query_row(
"SELECT (SELECT count(*) FROM edits),
- (SELECT count(*) FROM edits JOIN batches ON batches.id=edits.batch WHERE conflict IS NOT NULL),
(SELECT count(*) FROM edits JOIN batches ON batches.id=edits.batch WHERE attempted=1),
(SELECT count(*) FROM receipts)",
[],
- |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?, row.get(3)?)),
+ |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?)),
)?;
Ok(RecoverySummary {
queued_edits: unsigned(queued_edits)?,
- conflicts: unsigned(conflicts)?,
uncertain_edits: unsigned(uncertain_edits)?,
published_receipts: unsigned(published_receipts)?,
base_bytes: length(base::Image::Base)?,
diff --git a/crates/notebook/src/schema.rs b/crates/notebook/src/schema.rs
index cb9a5628939f7337a71909d976fac544e94dae94..7dd045367f88e1540d262fca1571008c21eebce3 100644
--- a/crates/notebook/src/schema.rs
+++ b/crates/notebook/src/schema.rs
@@ -1,7 +1,9 @@
use super::*;
-use rusqlite::Transaction;
+use rusqlite::{OptionalExtension, Transaction};
-pub(crate) const VERSION: u32 = 15;
+pub(crate) const VERSION: u32 = 16;
+/// The schema whose batches still recorded review conflicts.
+pub(crate) const PREVIOUS: u32 = 15;
/// Tables a schema-14 cache shares with this one.
pub(crate) const KEPT: &str = "
@@ -28,11 +30,8 @@ pub(crate) const QUEUE: &str = "
sealed TEXT,
revisions TEXT,
attempted INTEGER NOT NULL DEFAULT 0 CHECK(attempted IN (0,1)),
- conflict INTEGER CHECK(conflict BETWEEN 0 AND 3),
- space TEXT,
CHECK((sealed IS NULL) = (revisions IS NULL)),
- CHECK(attempted=0 OR sealed IS NOT NULL),
- CHECK((conflict IS NULL) = (space IS NULL))
+ CHECK(attempted=0 OR sealed IS NOT NULL)
) STRICT;
CREATE TABLE edits (
id INTEGER PRIMARY KEY AUTOINCREMENT CHECK(id>0),
@@ -51,3 +50,57 @@ pub(crate) fn create(transaction: &Transaction<'_>) -> Result<()> {
transaction.execute_batch(KEPT)?;
Ok(())
}
+
+/// Converts a schema-15 cache: its batches lose the review conflict and its page, which
+/// a merge no longer records. A conflict it held is queued work the next rebase keeps as
+/// conflict pages. Foreign keys stay off while `edits` briefly references the old table.
+pub(crate) fn upgrade(connection: &mut Connection) -> Result<()> {
+ connection.execute_batch("PRAGMA foreign_keys=OFF")?;
+ let upgraded = (|| -> Result<()> {
+ let transaction = connection.transaction_with_behavior(TransactionBehavior::Exclusive)?;
+ let sequence: Option = transaction
+ .query_row(
+ "SELECT seq FROM sqlite_sequence WHERE name='batches'",
+ [],
+ |row| row.get(0),
+ )
+ .optional()?;
+ transaction.execute_batch(
+ "CREATE TABLE upgraded (
+ id INTEGER PRIMARY KEY AUTOINCREMENT CHECK(id>0),
+ sealed TEXT,
+ revisions TEXT,
+ attempted INTEGER NOT NULL DEFAULT 0 CHECK(attempted IN (0,1)),
+ CHECK((sealed IS NULL) = (revisions IS NULL)),
+ CHECK(attempted=0 OR sealed IS NOT NULL)
+ ) STRICT;
+ INSERT INTO upgraded(id, sealed, revisions, attempted)
+ SELECT id, sealed, revisions, attempted FROM batches;
+ DROP TABLE batches;
+ ALTER TABLE upgraded RENAME TO batches;",
+ )?;
+ if let Some(sequence) = sequence {
+ transaction.execute(
+ "UPDATE sqlite_sequence SET seq=max(seq, ?1) WHERE name='batches'",
+ [sequence],
+ )?;
+ }
+ let dangling: bool = transaction.query_row(
+ "SELECT EXISTS(SELECT 1 FROM pragma_foreign_key_check)",
+ [],
+ |row| row.get(0),
+ )?;
+ if dangling {
+ return Err(io::Error::new(
+ io::ErrorKind::InvalidData,
+ "The schema-15 cache holds edits without their batch",
+ )
+ .into());
+ }
+ transaction.pragma_update(None, "user_version", VERSION)?;
+ transaction.commit()?;
+ Ok(())
+ })();
+ connection.execute_batch("PRAGMA foreign_keys=ON")?;
+ upgraded
+}
diff --git a/crates/notebook/src/session.rs b/crates/notebook/src/session.rs
index 3ae33747104978bd0a241b0c381789626d3ebb3f..2e78dc28de2e40d27939f19b774898dd0e1041c9 100644
--- a/crates/notebook/src/session.rs
+++ b/crates/notebook/src/session.rs
@@ -2,11 +2,11 @@
//! publishes their edits to the section file in the background.
use crate::{
- Conflict, ConflictKind, EditStatus, Error, PendingEdit, Remote, Replica, Resolution, Result,
+ EditStatus, Error, PendingEdit, Remote, Replica, Resolution, Result,
SyncWorker, discover,
};
use onestore::{
- CommitError, ExGuid, PageCreation, PreparedEdit, RevisionIndex, Stamp, Store, Transaction,
+ CommitError, ExGuid, PageCreation, RevisionIndex, Stamp, Store, Transaction,
document::Document,
op::{Edit, Op, SectionOp},
page::Page,
@@ -18,7 +18,6 @@ use std::{
path::{Path, PathBuf},
sync::{
Arc, Mutex,
- atomic::{AtomicUsize, Ordering},
mpsc::{self, Receiver, Sender},
},
time::Duration,
@@ -81,25 +80,19 @@ pub trait Storage: Send + Sync {
fn create_directory(&self, path: &str) -> Result<()>;
/// Renames or moves a file or directory; an existing target is an error.
fn rename(&self, from: &str, to: &str) -> Result<()>;
+ /// Deletes a file or an empty directory.
+ fn delete(&self, path: &str) -> Result<()>;
/// Names a section or TOC file for its notebook, as `onestore::place`.
fn place(&self, path: &str, ancestor: [u8; 16], name: &str) -> Result<()>;
- fn commit(&self, path: &str, edit: &PreparedEdit<'_>) -> Result<()>;
- fn set_property(
- &self,
- path: &str,
- source: &[u8],
- space: ExGuid,
- object: ExGuid,
- property: u32,
- value: &[u8],
- ) -> Result<()>;
+ /// Publishes a transaction made on the file's current image.
+ fn commit(&self, path: &str, transaction: &Transaction) -> Result<()>;
}
/// A password-protected section as `Notebook::unlock` read it.
#[cfg(feature = "protected")]
pub struct Unlocked {
pub pages: Vec<(ExGuid, Page)>,
- /// The stored section the pages came from, which a save must still find in place.
+ /// The stored section the pages came from, which an edit must still find in place.
snapshot: Vec,
}
@@ -145,31 +138,21 @@ impl Storage for Directory {
Ok(std::fs::rename(self.path(from), self.path(to))?)
}
+ fn delete(&self, path: &str) -> Result<()> {
+ let path = self.path(path);
+ Ok(if path.is_dir() {
+ std::fs::remove_dir(path)?
+ } else {
+ std::fs::remove_file(path)?
+ })
+ }
+
fn place(&self, path: &str, ancestor: [u8; 16], name: &str) -> Result<()> {
Ok(onestore::place_file(self.path(path), ancestor, name)?)
}
- fn commit(&self, path: &str, edit: &PreparedEdit<'_>) -> Result<()> {
- Ok(edit.commit_file(self.path(path))?)
- }
-
- fn set_property(
- &self,
- path: &str,
- source: &[u8],
- space: ExGuid,
- object: ExGuid,
- property: u32,
- value: &[u8],
- ) -> Result<()> {
- Ok(onestore::commit_file_property(
- self.path(path),
- source,
- space,
- object,
- property,
- value,
- )?)
+ fn commit(&self, path: &str, transaction: &Transaction) -> Result<()> {
+ Ok(transaction.commit_file(self.path(path))?)
}
}
@@ -225,33 +208,18 @@ impl Storage for Share {
Ok(self.client.rename(&self.path(from), &self.path(to))?)
}
+ fn delete(&self, path: &str) -> Result<()> {
+ Ok(self.client.delete(&self.path(path))?)
+ }
+
fn place(&self, path: &str, ancestor: [u8; 16], name: &str) -> Result<()> {
Ok(self.client.place(&self.path(path), ancestor, name)?)
}
- fn commit(&self, path: &str, edit: &PreparedEdit<'_>) -> Result<()> {
+ fn commit(&self, path: &str, transaction: &Transaction) -> Result<()> {
Ok(self
.client
- .commit_transaction(&self.path(path), &edit.transaction())?)
- }
-
- fn set_property(
- &self,
- path: &str,
- source: &[u8],
- space: ExGuid,
- object: ExGuid,
- property: u32,
- value: &[u8],
- ) -> Result<()> {
- Ok(self.client.commit_property_bytes(
- &self.path(path),
- source,
- space,
- object,
- property,
- value,
- )?)
+ .commit_transaction(&self.path(path), transaction)?)
}
}
@@ -279,6 +247,22 @@ impl Notebook {
Self::with(Box::new(Directory(root.clone())), Some(root), cache)
}
+ /// Creates a notebook in the new folder `root`, as OneNote 2010 creates one: a table of
+ /// contents in the notebook colour `color` (COLORREF) and "New Section 1" holding the
+ /// page `page` creates.
+ pub fn create(
+ root: impl AsRef,
+ cache: impl AsRef,
+ color: u32,
+ page: &PageCreation,
+ ) -> Result {
+ std::fs::create_dir(root.as_ref())?;
+ let mut notebook = Self::open(root, cache)?;
+ notebook.edit_toc("", &[onestore::TocEdit::Color(color)])?;
+ notebook.create_section("", "New Section 1", page)?;
+ Ok(notebook)
+ }
+
/// Opens the notebook at `root` on the share `client` is connected to. Sections open
/// through `Section::resume_smb` with the catalog's paths.
#[cfg(feature = "smb")]
@@ -393,18 +377,38 @@ impl Notebook {
fn edit_toc(&self, folder: &str, edits: &[onestore::TocEdit]) -> Result<()> {
let (toc, _) = self.toc(folder)?;
- let source = self.storage.read(&toc)?;
- self.storage
- .commit(&toc, &PreparedEdit::table_of_contents(&source, edits)?)
+ self.commit_toc(&toc, edits)
}
- /// Creates `name.one` in `folder` with one empty page and lists it last in the folder's
- /// TOC, as OneNote creates a section. Returns the new catalog path.
- pub fn create_section(&mut self, folder: &str, name: &str, author: &str) -> Result {
+ fn commit_toc(&self, toc: &str, edits: &[onestore::TocEdit]) -> Result<()> {
+ let source = self.storage.read(toc)?;
+ match onestore::edit_table_of_contents(&source, edits)? {
+ Some(transaction) => self.storage.commit(toc, &transaction),
+ None => Ok(()),
+ }
+ }
+
+ /// Creates `name.one` in `folder` holding the page `page` creates, in the next of
+ /// OneNote's section colours, and lists it last in the folder's TOC, as OneNote creates
+ /// a section. Returns the new catalog path.
+ pub fn create_section(&mut self, folder: &str, name: &str, page: &PageCreation) -> Result {
let filename = format!("{name}.one");
- self.folder(folder)?;
+ let color = next_color(self.folder(folder)?);
let (_, ancestor) = self.toc(folder)?;
- let bytes = onestore::create_section(&filename, "", author)?;
+ let mut bytes = onestore::create_empty_section(&filename, Some(color))?;
+ let transaction = {
+ let arena = onestore::Arena::default();
+ let mut section = onestore::Section::open(&arena, bytes.clone())?;
+ let edit = Edit {
+ at: crate::now(),
+ ops: vec![Op::Section(SectionOp::Create(page.clone()))],
+ };
+ section.apply(page.author(), &edit)?;
+ section.seal()?
+ };
+ if let Some(transaction) = transaction {
+ transaction.apply(&mut bytes)?;
+ }
let path = catalog_path(folder, &filename);
self.storage.create(&path, &bytes)?;
self.storage.place(&path, ancestor, &filename)?;
@@ -483,23 +487,16 @@ impl Notebook {
/// Sets a section's colour (COLORREF) in its own metadata, where OneNote keeps it.
pub fn set_section_color(&mut self, path: &str, color: Option) -> Result<()> {
let path = self.section_path(path)?.path.clone();
- let source = self.storage.read(&path)?;
- let store = onestore::Store::parse(&source)?;
- let index = onestore::RevisionIndex::parse(&store)?;
- let document = Document::parse(&index)?;
- let revision = document.active(document.root)?;
- let metadata = *revision
- .roots
- .get(&2)
- .ok_or_else(|| io::Error::from(io::ErrorKind::InvalidData))?;
- self.storage.set_property(
- &path,
- &source,
- document.root,
- metadata,
- 0x14001cbe,
- &color.unwrap_or(0xffff_ffff).to_le_bytes(),
- )?;
+ let arena = onestore::Arena::default();
+ let mut section = onestore::Section::open(&arena, self.storage.read(&path)?)?;
+ let edit = Edit {
+ at: crate::now(),
+ ops: vec![Op::Section(SectionOp::Color(color))],
+ };
+ section.apply("", &edit)?;
+ if let Some(transaction) = section.seal()? {
+ self.storage.commit(&path, &transaction)?;
+ }
self.refresh()?;
Ok(())
}
@@ -518,15 +515,51 @@ impl Notebook {
self.refresh().map(drop)
}
- /// Deletes a section the way OneNote does: the file moves into the notebook's
- /// `OneNote_RecycleBin` folder, a section group with its own TOC that lists it (and that
- /// the root TOC lists), and its own folder's TOC entry goes.
+ /// Deletes a section or section group the way OneNote 2010 does. A section's file moves
+ /// into the notebook's `OneNote_RecycleBin` folder, a section group with its own TOC that
+ /// lists it (and that the root TOC lists). A group's sections, in its groups too, move
+ /// there the same way, then its folders go. Either way its folder's TOC entry goes.
pub fn delete(&mut self, path: &str) -> Result<()> {
let (folder, entry) = split(path);
let (filename, identity) = self.entry(folder, entry)?;
- if !filename.to_ascii_lowercase().ends_with(".one") {
+ if path == RECYCLE_BIN {
return Err(io::Error::from(io::ErrorKind::InvalidInput).into());
}
+ if filename.to_ascii_lowercase().ends_with(".one") {
+ self.bin_section(path, &filename, identity)?;
+ } else {
+ // Sections first, then each folder once it is empty, deepest first.
+ let mut sections = Vec::new();
+ let mut folders = Vec::new();
+ let mut pending = vec![self.folder(path)?];
+ while let Some(group) = pending.pop() {
+ sections.extend(
+ group
+ .sections
+ .iter()
+ .map(|section| (section.path.clone(), section.file_id)),
+ );
+ folders.push((group.path.clone(), group.toc.as_ref().map(|toc| toc.filename.clone())));
+ pending.extend(&group.groups);
+ }
+ for (section, identity) in sections {
+ let (_, name) = split(§ion);
+ self.bin_section(§ion, name, identity)?;
+ }
+ for (group, toc) in folders.into_iter().rev() {
+ if let Some(toc) = toc {
+ self.storage.delete(&catalog_path(&group, &toc))?;
+ }
+ self.storage.delete(&group)?;
+ }
+ }
+ self.edit_toc(folder, &[onestore::TocEdit::Remove { identity }])?;
+ self.refresh().map(drop)
+ }
+
+ /// The recycle bin's TOC path and file identity, creating the bin as OneNote does: a
+ /// section group the root TOC lists.
+ fn bin(&self) -> Result<(String, [u8; 16])> {
let bin_toc = catalog_path(RECYCLE_BIN, TOC);
if !self.storage.exists(&bin_toc) {
if !self.storage.exists(RECYCLE_BIN) {
@@ -545,37 +578,116 @@ impl Notebook {
}],
)?;
}
- let mut target = filename.clone();
+ let source = self.storage.read(&bin_toc)?;
+ Ok((bin_toc, onestore::Store::parse(&source)?.header.file_id))
+ }
+
+ /// Moves the section file at `path` into the recycle bin, under a name no binned
+ /// section has, and lists it there; its own folder's TOC is the caller's.
+ fn bin_section(&self, path: &str, filename: &str, identity: [u8; 16]) -> Result<()> {
+ let (bin_toc, bin_identity) = self.bin()?;
+ let mut target = filename.to_owned();
let mut attempt = 1;
while self.storage.exists(&catalog_path(RECYCLE_BIN, &target)) {
attempt += 1;
- let (stem, extension) = filename.rsplit_once('.').unwrap_or((&filename, ""));
+ let (stem, extension) = filename.rsplit_once('.').unwrap_or((filename, ""));
target = format!("{stem} ({attempt}).{extension}");
}
let binned = catalog_path(RECYCLE_BIN, &target);
- self.storage
- .rename(&catalog_path(folder, &filename), &binned)?;
- let source = self.storage.read(&bin_toc)?;
- self.storage.place(
- &binned,
- onestore::Store::parse(&source)?.header.file_id,
- &target,
- )?;
- self.storage.commit(
+ self.storage.rename(path, &binned)?;
+ self.storage.place(&binned, bin_identity, &target)?;
+ self.commit_toc(
&bin_toc,
- &PreparedEdit::table_of_contents(
- &source,
+ &[onestore::TocEdit::Add {
+ filename: target,
+ identity,
+ group: false,
+ }],
+ )
+ }
+
+ /// Keeps copies of `pages` in the notebook's recycle bin, as OneNote 2010 does with a
+ /// page it deletes: in `OneNote_RecycleBin/OneNote_DeletedPages.one`, each at the top
+ /// level with its identity, title, date and creation time. The caller then deletes the
+ /// pages from their section.
+ pub fn recycle_pages(&mut self, pages: &[Page], author: &str) -> Result<()> {
+ const DELETED: &str = "OneNote_DeletedPages.one";
+ let (bin_toc, bin_identity) = self.bin()?;
+ let path = catalog_path(RECYCLE_BIN, DELETED);
+ if !self.storage.exists(&path) {
+ // OneNote's "Deleted Pages" section is grey.
+ let bytes = onestore::create_empty_section(DELETED, Some(0x00e1e1e1))?;
+ self.storage.create(&path, &bytes)?;
+ self.storage.place(&path, bin_identity, DELETED)?;
+ self.commit_toc(
+ &bin_toc,
&[onestore::TocEdit::Add {
- filename: target,
- identity,
+ filename: DELETED.into(),
+ identity: onestore::Store::parse(&bytes)?.header.file_id,
group: false,
}],
- )?,
- )?;
- self.edit_toc(folder, &[onestore::TocEdit::Remove { identity }])?;
+ )?;
+ }
+ let arena = onestore::Arena::default();
+ let mut section = onestore::Section::open(&arena, self.storage.read(&path)?)?;
+ let mut ops = Vec::new();
+ for page in pages {
+ let mut creation = PageCreation::new(None, Some(&page.title), author)?;
+ if let (Some(identity), Some(created)) = (page.identity, page.created) {
+ creation = creation.keeping(identity, created)?;
+ }
+ if let Some([date, time]) = page.date_text() {
+ creation = creation.dated(&date, &time)?;
+ }
+ ops.push(Op::Section(SectionOp::Import {
+ creation,
+ page: page.copy()?,
+ }));
+ }
+ section.apply(author, &Edit { at: crate::now(), ops })?;
+ if let Some(transaction) = section.seal()? {
+ self.storage.commit(&path, &transaction)?;
+ }
self.refresh().map(drop)
}
+ /// Moves a section or section group into the folder at catalog path `folder`, last, as
+ /// OneNote moves one dragged onto a group: the file or folder moves and each TOC's
+ /// entry follows it. Returns its new catalog path.
+ pub fn move_entry(&mut self, path: &str, folder: &str) -> Result {
+ let (from, entry) = split(path);
+ let (filename, identity) = self.entry(from, entry)?;
+ self.folder(folder)?;
+ let group = !filename.to_ascii_lowercase().ends_with(".one");
+ let target = catalog_path(folder, &filename);
+ if from == folder
+ || path == RECYCLE_BIN
+ || group && (folder == path || folder.starts_with(&format!("{path}/")))
+ || self.storage.exists(&target)
+ {
+ return Err(io::Error::from(io::ErrorKind::InvalidInput).into());
+ }
+ let (_, ancestor) = self.toc(folder)?;
+ self.storage.rename(path, &target)?;
+ let placed = if group {
+ catalog_path(&target, TOC)
+ } else {
+ target.clone()
+ };
+ self.storage.place(&placed, ancestor, &filename)?;
+ self.edit_toc(
+ folder,
+ &[onestore::TocEdit::Add {
+ filename,
+ identity,
+ group,
+ }],
+ )?;
+ self.edit_toc(from, &[onestore::TocEdit::Remove { identity }])?;
+ self.refresh()?;
+ Ok(target)
+ }
+
/// The stored filename and TOC identity of a folder's section or group.
fn entry(&self, folder: &str, name: &str) -> Result<(String, [u8; 16])> {
let parent = self.folder(folder)?;
@@ -660,30 +772,31 @@ impl Notebook {
Ok(Unlocked { pages, snapshot })
}
- /// Saves an edited page of `unlocked` under the section's key, straight to the file:
- /// nothing of a protected section is cached or queued. A section written since
- /// `unlocked` was read fails the save; unlock again for its pages.
+ /// Applies `edit` to pages of `unlocked` and stores it under the section's key, straight
+ /// to the file: nothing of a protected section is cached or queued. A section written
+ /// since `unlocked` was read refuses the edit; unlock again for its pages.
#[cfg(feature = "protected")]
- pub fn save_unlocked(
+ pub fn apply_unlocked(
&self,
path: &str,
password: &str,
unlocked: &mut Unlocked,
- space: ExGuid,
- page: &Page,
author: &str,
+ edit: &Edit,
) -> Result<()> {
let path = self.section_path(path)?.path.clone();
- let edit = onestore::PreparedEdit::page_protected(
- &unlocked.snapshot,
- password,
- space,
- page,
- author,
- )?;
- self.storage.commit(&path, &edit)?;
- let written = edit.as_bytes().to_vec();
- unlocked.snapshot = written;
+ let transaction = {
+ let store = Store::parse(&unlocked.snapshot)?;
+ let index = RevisionIndex::parse(&store)?;
+ onestore::protected::UnlockedSection::open(
+ &index,
+ password,
+ onestore::protected::Limits::default(),
+ )?
+ .apply(author, edit)?
+ };
+ self.storage.commit(&path, &transaction)?;
+ transaction.apply(&mut unlocked.snapshot)?;
Ok(())
}
@@ -706,6 +819,27 @@ impl Notebook {
}
}
+/// The section colours OneNote 2010 gives new sections, COLORREF, in the order it gives
+/// them (`evidence/notebook-management/new-notebook`).
+const SECTION_COLORS: [u32; 3] = [0x00e4a88a, 0x0078b0f6, 0x00bba4d5];
+
+/// The colour OneNote gives a new section in `folder`: the first of its colours none of
+/// the folder's sections has, or the next in turn when all are taken.
+fn next_color(folder: &discover::Folder) -> u32 {
+ let taken: Vec = folder
+ .sections
+ .iter()
+ .filter_map(|section| match section.state {
+ discover::SectionState::Readable { color, .. } => color,
+ _ => None,
+ })
+ .collect();
+ SECTION_COLORS
+ .into_iter()
+ .find(|color| !taken.contains(color))
+ .unwrap_or(SECTION_COLORS[folder.sections.len() % SECTION_COLORS.len()])
+}
+
fn component(name: &str) -> bool {
!name.is_empty() && !name.contains(['/', '\\', '\0']) && name != "." && name != ".."
}
@@ -733,8 +867,6 @@ pub enum Event {
/// The section refused an edit `apply` handed it; the pages it names are as they were
/// before it, so an editor showing them should reload them.
Rejected { spaces: Vec, error: String },
- /// Old session API, until the application reloads on `Changed`: pages changed remotely.
- Refreshed,
/// A publication attempt finished with this durable state.
Attempt { id: u64, status: EditStatus },
/// The section file could not be reached; the replica keeps its state.
@@ -743,25 +875,6 @@ pub enum Event {
Failed(String),
}
-/// The outcome of saving an edited page (old session API).
-#[derive(Debug, PartialEq, Eq)]
-pub enum Save {
- /// The model equals the stored page.
- Unchanged,
- /// The edit is durable locally under this id.
- Queued(u64),
- /// The stored page no longer matches `before`; reload it before saving again.
- Stale,
-}
-
-/// A queued edit and its durable state.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct QueuedEdit {
- pub id: u64,
- pub space: ExGuid,
- pub status: EditStatus,
-}
-
type Notify = Arc;
/// A section file with its replica and background publication. `Send + Sync`: edits
@@ -773,10 +886,6 @@ pub struct Section {
events: Mutex>,
sender: Sender,
notify: Notify,
- saved: Mutex)>>,
- saves: Sender<(ExGuid, std::result::Result)>,
- /// Saves queued and not yet reported.
- unsaved: Arc,
}
impl Section {
@@ -850,7 +959,6 @@ impl Section {
) -> Result {
let replica = Arc::new(replica);
let (sender, events) = mpsc::channel();
- let (saves, saved) = mpsc::channel();
let notify = Mutex::new(notify);
let notify: Notify = Arc::new(move || {
if let Ok(notify) = notify.lock() {
@@ -865,7 +973,6 @@ impl Section {
Ok(synced) => {
if !synced.changed.is_empty() {
events.push(Event::Changed(synced.changed.clone()));
- events.push(Event::Refreshed);
}
if let Some((id, status)) = &synced.edit {
events.push(Event::Attempt {
@@ -899,9 +1006,6 @@ impl Section {
events: Mutex::new(events),
sender,
notify,
- saved: Mutex::new(saved),
- saves,
- unsaved: Arc::new(AtomicUsize::new(0)),
})
}
@@ -971,8 +1075,8 @@ impl Section {
Ok(space)
}
- /// Removes pages permanently, queued like the user's own edits (a move across
- /// sections is `import_page` there, then this here).
+ /// Removes pages or conflict pages permanently, queued like the user's own edits (a
+ /// move across sections is `import_page` there, then this here).
pub fn delete_pages(&self, pages: &[ExGuid]) -> Result {
self.replica.apply(
"",
@@ -991,23 +1095,10 @@ impl Section {
self.replica.pending()
}
- /// The unpublished batch the remote no longer accepts, if any. Show `remote_page`
- /// against `page` for its space, then `resolve`.
- pub fn conflict(&self) -> Result> {
- self.replica.conflict()
- }
-
- /// The page as last observed in the section file, for reviewing a conflict.
- pub fn remote_page(&self, space: ExGuid) -> Result {
- let snapshot = self.replica.remote_snapshot()?;
- let arena = onestore::Arena::default();
- Ok(onestore::Section::open(&arena, snapshot)?.page(space)?)
- }
-
- /// Ends a conflict: `Mine` publishes the local page over the remote change, `Theirs`
- /// drops the local edits to the conflicted page (and its later ones).
- pub fn resolve(&self, id: u64, resolution: Resolution) -> Result<()> {
- self.replica.resolve(id, resolution)
+ /// The conflict pages of each page that has them, as the local edits leave them
+ /// (`onestore::Section::conflicts`); `page` reads one, `delete_pages` removes it.
+ pub fn conflicts(&self) -> Result)>> {
+ self.replica.conflicts()
}
/// Retires an uncertain attempt after review, exporting the queue to `archive` first:
@@ -1056,114 +1147,6 @@ impl Section {
None => Ok(()),
}
}
-
- // Old whole-page session API, kept until the application emits ops.
-
- /// Saves an edited page. `before` is the model the edit started from; a stored page
- /// that differs from it means the section changed underneath the editor.
- pub fn save(&self, space: ExGuid, before: &Page, after: &Page, author: &str) -> Result {
- let outcome = self.replica.ask(|reply| crate::working::Request::Save {
- space,
- before: before.clone(),
- after: after.clone(),
- author: author.to_owned(),
- reply,
- })?;
- Ok(outcome.unwrap_or(Save::Unchanged))
- }
-
- /// `save` on the section thread, returning at once; `saved` reports the outcome.
- /// Saves queue in order, and one whose `before` is the previous save's `after`
- /// continues it: pass each save's `after` as the next one's `before`.
- pub fn queue_save(&self, space: ExGuid, before: Page, after: Page, author: &str) -> Result<()> {
- let (saves, notify, unsaved) = (
- self.saves.clone(),
- Arc::clone(&self.notify),
- Arc::clone(&self.unsaved),
- );
- self.unsaved.fetch_add(1, Ordering::Relaxed);
- self.replica.send(crate::working::Request::Save {
- space,
- before,
- after,
- author: author.to_owned(),
- reply: Box::new(move |outcome| {
- unsaved.fetch_sub(1, Ordering::Release);
- let outcome = match outcome {
- Ok(None) => return,
- Ok(Some(save)) => Ok(save),
- Err(error) => Err(error.to_string()),
- };
- if saves.send((space, outcome)).is_ok() {
- notify();
- }
- }),
- })
- }
-
- /// Whether a queued save has yet to report, so the stored page may trail the editor's.
- pub fn saving(&self) -> bool {
- self.unsaved.load(Ordering::Acquire) > 0
- }
-
- /// Outcomes of queued saves since the last poll, oldest first; `notify` runs for each.
- /// Consecutive saves continuing one another finish as one, reported once.
- pub fn saved(&self) -> Vec<(ExGuid, std::result::Result)> {
- self.saved
- .lock()
- .map(|saved| saved.try_iter().collect())
- .unwrap_or_default()
- }
-
- /// Every queued edit with its state: pending, awaiting confirmation of a retained
- /// attempt, or a conflict awaiting review. `space` is the first page it edits.
- pub fn queue(&self) -> Result> {
- self.replica
- .pending()?
- .into_iter()
- .map(|edit| {
- Ok(QueuedEdit {
- id: edit.id,
- space: edit
- .edit
- .ops
- .iter()
- .find_map(|op| match op {
- Op::Page { space, .. } => Some(*space),
- Op::Section(_) => None,
- })
- .unwrap_or(self.replica.root),
- status: self.replica.status(edit.id)?.unwrap_or(EditStatus::Pending),
- })
- })
- .collect()
- }
-
- /// The conflict as a queue entry, for the review dialog.
- pub fn conflicts(&self) -> Result> {
- Ok(self
- .replica
- .conflict()?
- .map(|conflict| {
- (
- QueuedEdit {
- id: conflict.id,
- space: conflict.space,
- status: EditStatus::Conflict(conflict.kind),
- },
- conflict.kind,
- )
- })
- .into_iter()
- .collect())
- }
-
- /// Resolves the conflict holding `id` with a page reviewed against `remote_page`: the
- /// remote page is rewritten to `after`.
- pub fn review(&self, id: u64, after: &Page) -> Result<()> {
- self.replica
- .resolve_with(id, Resolution::Mine, Some(after.clone()))
- }
}
/// The section file itself as the publication target, under OneNote-compatible exclusion.
@@ -1176,21 +1159,21 @@ impl Remote for FileRemote {
/// Read without the whole-file lock, which would block OneNote's readers: a change
/// detector, never a snapshot to edit.
- fn stamp(&mut self) -> io::Result> {
+ fn stamp(&mut self) -> io::Result {
use std::io::Read;
let mut file = std::fs::File::open(&self.0)?;
let mut header = [0; 1024];
file.read_exact(&mut header)?;
let length = file.metadata()?.len();
- Ok(Some(Stamp { header, length }))
+ Ok(Stamp { header, length })
}
fn publish(&mut self, transaction: &Transaction) -> std::result::Result<(), CommitError> {
transaction.commit_file(&self.0)
}
- fn confirm(&mut self, snapshot: &[u8]) -> std::result::Result<(), CommitError> {
- onestore::confirm_file_snapshot(&self.0, snapshot)
+ fn confirm(&mut self, base: &Stamp) -> std::result::Result<(), CommitError> {
+ onestore::confirm_file(&self.0, base)
}
}
diff --git a/crates/notebook/src/smb/directory.rs b/crates/notebook/src/smb/directory.rs
index d947b6d92e1baebad2130624677e690ef8a76847..1649cc9e07b18c39b8a8c2d0899c51d5e90b4a5b 100644
--- a/crates/notebook/src/smb/directory.rs
+++ b/crates/notebook/src/smb/directory.rs
@@ -35,11 +35,7 @@ impl Client {
create_contexts: Vec::new(),
},
)?;
- let file = File {
- client: self,
- id: Some(response.file_id),
- length: response.end_of_file,
- };
+ let file = File::new(self, &response);
let mut entries = BTreeMap::new();
loop {
let response: io::Result =
diff --git a/crates/notebook/src/smb/mod.rs b/crates/notebook/src/smb/mod.rs
index 6b10a7fcc89c548290c3cfa4826a38bccdf57e38..051352e80331ccf33c6ac38f4967b4937fc6f773 100644
--- a/crates/notebook/src/smb/mod.rs
+++ b/crates/notebook/src/smb/mod.rs
@@ -1,9 +1,9 @@
//! Blocking SMB access to OneNote sections, table-of-contents files and payloads.
-use onestore::{CommitError, CommitIo, CommitState, ExGuid};
+use onestore::{CommitError, CommitIo, CommitState};
use smb2::{
Session, Tree,
- client::connection::{Connection, NegotiatedParams},
+ client::connection::{CompoundOp, Connection, Frame, NegotiatedParams},
msg::{
close::{CloseRequest, CloseResponse},
create::{
@@ -22,7 +22,7 @@ use smb2::{
flags::{Capabilities, FileAccessMask},
},
};
-use std::{io, ops::Range, sync::Mutex, time::Duration};
+use std::{io, sync::Mutex, time::Duration};
use tokio::runtime::{Handle, Runtime};
mod directory;
@@ -149,6 +149,54 @@ impl Client {
.map_err(|_| io::Error::from(io::ErrorKind::TimedOut))
.and_then(|result| result.map_err(io::Error::other))
.inspect_err(|_| self.retire())?;
+ self.unpack(&self.body(command, frame)?)
+ }
+
+ /// Sends `requests` as one related compound request, which the server performs in order,
+ /// and returns each response body or status error. A request after a CREATE names the
+ /// file it opened as `FileId::SENTINEL`; each request fits one credit.
+ fn compound(&self, requests: &[(Command, &dyn Pack)]) -> io::Result>>> {
+ if Handle::try_current().is_ok() {
+ return Err(io::ErrorKind::InvalidInput.into());
+ }
+ let connection = self
+ .connection
+ .lock()
+ .map_err(|_| io::ErrorKind::Other)?
+ .clone()
+ .ok_or(io::ErrorKind::NotConnected)?;
+ let operations: Vec<_> = requests
+ .iter()
+ .map(|(command, body)| CompoundOp::new(*command, *body, Some(self.tree.tree_id)))
+ .collect();
+ let frames = {
+ let runtime = self.runtime.lock().map_err(|_| io::ErrorKind::Other)?;
+ runtime
+ .as_ref()
+ .ok_or(io::ErrorKind::NotConnected)?
+ .block_on(async {
+ tokio::time::timeout(self.timeout, connection.execute_compound(&operations))
+ .await
+ })
+ };
+ let frames = frames
+ .map_err(|_| io::Error::from(io::ErrorKind::TimedOut))
+ .and_then(|result| result.map_err(io::Error::other))
+ .inspect_err(|_| self.retire())?;
+ Ok(frames
+ .into_iter()
+ .zip(requests)
+ .map(|(frame, (command, _))| {
+ let frame = frame
+ .map_err(io::Error::other)
+ .inspect_err(|_| self.retire())?;
+ self.body(*command, frame)
+ })
+ .collect())
+ }
+
+ /// The body of a response to `command`, or its status as an error.
+ fn body(&self, command: Command, frame: Frame) -> io::Result> {
if frame.header.command != command {
self.retire();
return Err(io::ErrorKind::InvalidData.into());
@@ -170,12 +218,17 @@ impl Client {
},
));
}
- T::unpack(&mut ReadCursor::new(&frame.body)).map_err(|error| {
+ Ok(frame.body)
+ }
+
+ fn unpack(&self, body: &[u8]) -> io::Result {
+ T::unpack(&mut ReadCursor::new(body)).map_err(|error| {
self.retire();
io::Error::new(io::ErrorKind::InvalidData, error)
})
}
+ /// Opens as OneNote 2010 does: readers share everything, a writer denies other writers.
fn open(&self, path: &str, write: bool) -> io::Result> {
self.open_shared(path, write, if write { 5 } else { 7 })
}
@@ -186,7 +239,7 @@ impl Client {
if write { 0xc0000000 } else { 0x80000000 },
sharing,
CreateDisposition::FileOpen,
- 0x42,
+ 0x40,
)
}
@@ -198,28 +251,11 @@ impl Client {
disposition: CreateDisposition,
options: u32,
) -> io::Result> {
- if path.is_empty() || path.contains('\0') || path.encode_utf16().count() > 32767 {
- return Err(io::ErrorKind::InvalidInput.into());
- }
let response: CreateResponse = self.request(
Command::Create,
- CreateRequest {
- requested_oplock_level: OplockLevel::None,
- impersonation_level: ImpersonationLevel::Impersonation,
- desired_access: FileAccessMask::new(access),
- file_attributes: 0,
- share_access: ShareAccess(sharing),
- create_disposition: disposition,
- create_options: options,
- name: smb2::encode_path(&path.replace('\\', "/")),
- create_contexts: Vec::new(),
- },
+ create_request(path, access, sharing, disposition, options)?,
)?;
- Ok(File {
- client: self,
- id: Some(response.file_id),
- length: response.end_of_file,
- })
+ Ok(File::new(self, &response))
}
/// Creates a file holding `bytes`; an existing file is an error.
@@ -286,7 +322,7 @@ impl Client {
/// Names a section or TOC file for its notebook (`onestore::place`) under native
/// writer coordination.
pub fn place(&self, path: &str, ancestor: [u8; 16], name: &str) -> Result<(), CommitError> {
- self.commit(path, |file| {
+ self.commit(path, &[(0, 1024)], |file| {
onestore::place(file, ancestor, name).map_err(|error| CommitError {
state: CommitState::NotCommitted,
error,
@@ -338,7 +374,9 @@ impl Client {
path: &str,
snapshot: impl FnOnce(&mut File<'_>) -> io::Result>>,
) -> io::Result> {
- let mut file = self.open(path, false)?.coordinate(path, false)?;
+ let mut file = self
+ .open(path, false)?
+ .coordinate(path, false, &[(0, 1024)])?;
let result = snapshot(&mut file)
.and_then(|snapshot| snapshot.ok_or_else(|| io::ErrorKind::WouldBlock.into()));
let closed = file.close();
@@ -347,79 +385,67 @@ impl Client {
Ok(snapshot)
}
- pub fn commit_text(
- &self,
- path: &str,
- source: &[u8],
- space: ExGuid,
- object: ExGuid,
- range: Range,
- replacement: &str,
- ) -> Result<(), CommitError> {
- self.commit(path, |file| {
- onestore::commit_text(file, source, space, object, range, replacement)
- })
- }
-
- pub fn commit_property_bytes(
- &self,
- path: &str,
- source: &[u8],
- space: ExGuid,
- object: ExGuid,
- property: u32,
- value: &[u8],
- ) -> Result<(), CommitError> {
- self.commit(path, |file| {
- onestore::commit_property_bytes(file, source, space, object, property, value)
- })
- }
-
/// Publishes a transaction using the same native writer coordination as text commits.
pub fn commit_transaction(
&self,
path: &str,
transaction: &onestore::Transaction,
) -> Result<(), CommitError> {
- self.commit(path, |file| transaction.commit(file))
+ self.commit(path, &checked(transaction.base()), |file| {
+ transaction.commit(file)
+ })
}
- /// The header and length of a revision store, read without writer coordination or path
- /// identity checks: a change detector for polling, never a snapshot to edit.
+ /// The header and length of a revision store, in one round trip, without writer
+ /// coordination or path identity checks: a change detector for polling, never a snapshot
+ /// to edit.
pub fn stamp(&self, path: &str) -> io::Result {
- let mut file = self.open(path, false)?;
- let mut header = [0; 1024];
- let mut read = 0;
- let result = loop {
- match file.read_at(read as u64, &mut header[read..]) {
- Ok(0) => break Err(io::ErrorKind::UnexpectedEof.into()),
- Ok(count) => read += count,
- Err(error) => break Err(error),
- }
- if read == header.len() {
- break Ok(());
- }
+ let create = create_request(path, 0x80000000, 7, CreateDisposition::FileOpen, 0x40)?;
+ let read = read_request(FileId::SENTINEL, 0, 1024);
+ let close = CloseRequest {
+ file_id: FileId::SENTINEL,
+ flags: 0,
};
- let length = file.length;
- let closed = file.close();
- result?;
+ let [created, read, closed]: [_; 3] = self
+ .compound(&[
+ (Command::Create, &create),
+ (Command::Read, &read),
+ (Command::Close, &close),
+ ])?
+ .try_into()
+ .map_err(|_| io::ErrorKind::InvalidData)?;
+ let created: CreateResponse = self.unpack(&created?)?;
+ if closed.is_err() {
+ self.retire();
+ }
+ let read: ReadResponse = self.unpack(&read?)?;
closed?;
- Ok(onestore::Stamp { header, length })
+ let header = read
+ .data
+ .try_into()
+ .map_err(|_| io::ErrorKind::UnexpectedEof)?;
+ Ok(onestore::Stamp {
+ header,
+ length: created.end_of_file,
+ })
}
- /// Confirms an observed snapshot's durability under native writer coordination.
- pub fn confirm_snapshot(&self, path: &str, source: &[u8]) -> Result<(), CommitError> {
- self.commit(path, |file| onestore::confirm_snapshot(file, source))
+ /// Confirms that the file still has `base`'s stamp and is durable, then refreshes its
+ /// version, under native writer coordination.
+ pub fn confirm(&self, path: &str, base: &onestore::Stamp) -> Result<(), CommitError> {
+ self.commit(path, &checked(base), |file| onestore::confirm(file, base))
}
+ /// Opens `path` for writing under OneNote's coordination, making `reads` with the locks.
fn commit(
&self,
path: &str,
+ reads: &[(u64, usize)],
operation: impl FnOnce(&mut File<'_>) -> Result<(), CommitError>,
) -> Result<(), CommitError> {
let mut file = self
.open(path, true)
- .and_then(|file| file.coordinate(path, true))
+ .and_then(|file| file.coordinate(path, true, reads))
.map_err(|error| CommitError {
state: CommitState::NotCommitted,
error,
@@ -443,24 +469,103 @@ impl Drop for Client {
struct File<'a> {
client: &'a Client,
id: Option,
- /// The end of file when opened.
- length: u64,
+ /// Writes `flush` sends ahead of its flush, in order.
+ writes: Vec<(u64, Vec)>,
+ /// Reads made under the coordination locks, each returned once to the same `read_at`.
+ prefetched: Vec<(u64, usize, Vec)>,
}
-impl File<'_> {
- fn coordinate(self, path: &str, write: bool) -> io::Result {
- self.lock(0xfffffffb, 0x11)?;
+impl<'a> File<'a> {
+ fn new(client: &'a Client, created: &CreateResponse) -> Self {
+ Self {
+ client,
+ id: Some(created.file_id),
+ writes: Vec::new(),
+ prefetched: Vec::new(),
+ }
+ }
+
+ /// Takes OneNote 2010's coordination locks in one request (the shared reader byte, and
+ /// to write the exclusive writer byte), makes `reads` under them, then checks that the
+ /// handle is still the file at `path`: maintenance replaces a file while holding its
+ /// locks.
+ fn coordinate(mut self, path: &str, write: bool, reads: &[(u64, usize)]) -> io::Result {
+ let id = self.id.unwrap();
+ let mut locks = vec![LockElement {
+ offset: 0xfffffffb,
+ length: 1,
+ flags: 0x11,
+ }];
if write {
- self.lock(0xfffffffd, 0x12)?;
+ locks.push(LockElement {
+ offset: 0xfffffffd,
+ length: 1,
+ flags: 0x12,
+ });
}
- let current = self.client.open(path, false)?;
- let same = self.identity()? == current.identity()?;
- current.close()?;
- if !same {
+ let lock = LockRequest {
+ file_id: id,
+ lock_sequence: 0,
+ locks,
+ };
+ let [index, volume] = identity_requests(id);
+ let reading: Vec<_> = reads
+ .iter()
+ .map(|(offset, length)| read_request(id, *offset, *length))
+ .collect();
+ let mut requests: Vec<(Command, &dyn Pack)> = vec![
+ (Command::Lock, &lock),
+ (Command::QueryInfo, &index),
+ (Command::QueryInfo, &volume),
+ ];
+ requests.extend(
+ reading
+ .iter()
+ .map(|read| (Command::Read, read as &dyn Pack)),
+ );
+ let mut responses = self.client.compound(&requests)?.into_iter();
+ let mut next = || responses.next().ok_or(io::ErrorKind::InvalidData);
+ let _: LockResponse = self.client.unpack(&next()??)?;
+ let own = self.client.identity(next()?, next()?)?;
+ for (offset, length) in reads {
+ let data = match next()? {
+ Err(error) if error.kind() == io::ErrorKind::UnexpectedEof => Vec::new(),
+ body => self.client.unpack::(&body?)?.data,
+ };
+ if data.len() > *length {
+ self.client.retire();
+ return Err(io::ErrorKind::InvalidData.into());
+ }
+ self.prefetched.push((*offset, *length, data));
+ }
+ let create = create_request(path, 0x80, 7, CreateDisposition::FileOpen, 0)?;
+ let [index, volume] = identity_requests(FileId::SENTINEL);
+ let close = CloseRequest {
+ file_id: FileId::SENTINEL,
+ flags: 0,
+ };
+ let [created, index, volume, closed]: [_; 4] = self
+ .client
+ .compound(&[
+ (Command::Create, &create),
+ (Command::QueryInfo, &index),
+ (Command::QueryInfo, &volume),
+ (Command::Close, &close),
+ ])?
+ .try_into()
+ .map_err(|_| io::ErrorKind::InvalidData)?;
+ created?;
+ if closed.is_err() {
+ self.client.retire();
+ }
+ let current = self.client.identity(index, volume)?;
+ closed?;
+ if own != current {
return Err(io::ErrorKind::ResourceBusy.into());
}
Ok(self)
}
+ #[cfg(test)]
fn lock(&self, offset: u64, flags: u32) -> io::Result<()> {
let _: LockResponse = self.client.request(
Command::Lock,
@@ -477,19 +582,37 @@ impl File<'_> {
Ok(())
}
- fn identity(&self) -> io::Result<(u64, u32)> {
- let index: QueryInfoResponse = self.client.request(
- Command::QueryInfo,
- QueryInfoRequest {
- info_type: InfoType::File,
- file_info_class: 6,
- output_buffer_length: 8,
- additional_information: 0,
- flags: 0,
- file_id: self.id.unwrap(),
- input_buffer: Vec::new(),
- },
- )?;
+ fn close(mut self) -> io::Result<()> {
+ self.release()
+ }
+
+ fn release(&mut self) -> io::Result<()> {
+ if let Some(file_id) = self.id.take() {
+ let result: io::Result = self
+ .client
+ .request(Command::Close, CloseRequest { file_id, flags: 0 });
+ if result.is_err() {
+ self.client.retire();
+ }
+ result?;
+ }
+ Ok(())
+ }
+}
+impl Drop for File<'_> {
+ fn drop(&mut self) {
+ let _ = self.release();
+ }
+}
+
+impl Client {
+ /// A file's volume serial number and index, from the responses to `identity_requests`.
+ fn identity(
+ &self,
+ index: io::Result>,
+ volume: io::Result>,
+ ) -> io::Result<(u64, u32)> {
+ let index: QueryInfoResponse = self.unpack(&index?)?;
let index = u64::from_le_bytes(
index
.output_buffer
@@ -499,47 +622,69 @@ impl File<'_> {
if index == 0 {
return Err(io::ErrorKind::Unsupported.into());
}
- let volume: QueryInfoResponse = self.client.request(
- Command::QueryInfo,
- QueryInfoRequest {
- info_type: InfoType::Filesystem,
- file_info_class: 1,
- output_buffer_length: 1024,
- additional_information: 0,
- flags: 0,
- file_id: self.id.unwrap(),
- input_buffer: Vec::new(),
- },
- )?;
+ let volume: QueryInfoResponse = self.unpack(&volume?)?;
let serial = volume
.output_buffer
.get(8..12)
.ok_or(io::ErrorKind::InvalidData)?;
Ok((index, u32::from_le_bytes(serial.try_into().unwrap())))
}
+}
- fn close(mut self) -> io::Result<()> {
- self.release()
- }
+/// FileInternalInformation and FileFsVolumeInformation queries.
+fn identity_requests(file_id: FileId) -> [QueryInfoRequest; 2] {
+ let query = |info_type, file_info_class, output_buffer_length| QueryInfoRequest {
+ info_type,
+ file_info_class,
+ output_buffer_length,
+ additional_information: 0,
+ flags: 0,
+ file_id,
+ input_buffer: Vec::new(),
+ };
+ [
+ query(InfoType::File, 6, 8),
+ query(InfoType::Filesystem, 1, 1024),
+ ]
+}
- fn release(&mut self) -> io::Result<()> {
- if let Some(file_id) = self.id.take() {
- let result: io::Result = self
- .client
- .request(Command::Close, CloseRequest { file_id, flags: 0 });
- if result.is_err() {
- self.client.retire();
- }
- result?;
- }
- Ok(())
+fn create_request(
+ path: &str,
+ access: u32,
+ sharing: u32,
+ disposition: CreateDisposition,
+ options: u32,
+) -> io::Result {
+ if path.is_empty() || path.contains('\0') || path.encode_utf16().count() > 32767 {
+ return Err(io::ErrorKind::InvalidInput.into());
}
+ Ok(CreateRequest {
+ requested_oplock_level: OplockLevel::None,
+ impersonation_level: ImpersonationLevel::Impersonation,
+ desired_access: FileAccessMask::new(access),
+ file_attributes: 0,
+ share_access: ShareAccess(sharing),
+ create_disposition: disposition,
+ create_options: options,
+ name: smb2::encode_path(&path.replace('\\', "/")),
+ create_contexts: Vec::new(),
+ })
}
-impl Drop for File<'_> {
- fn drop(&mut self) {
- let _ = self.release();
+
+fn read_request(file_id: FileId, offset: u64, length: usize) -> ReadRequest {
+ ReadRequest {
+ file_id,
+ offset,
+ length: length as u32,
+ minimum_count: 1,
+ flags: 0,
+ padding: 0,
+ channel: 0,
+ remaining_bytes: 0,
+ read_channel_info: Vec::new(),
}
}
+
fn read_size(params: &NegotiatedParams, credits: u16, requested: usize) -> usize {
let budget = if params.dialect != Dialect::Smb2_0_2
&& params.capabilities.contains(Capabilities::LARGE_MTU)
@@ -559,6 +704,15 @@ impl CommitIo for File<'_> {
if output.is_empty() {
return Ok(0);
}
+ if let Some(at) = self
+ .prefetched
+ .iter()
+ .position(|(start, length, _)| *start == offset && *length == output.len())
+ {
+ let (_, _, data) = self.prefetched.swap_remove(at);
+ output[..data.len()].copy_from_slice(&data);
+ return Ok(data.len());
+ }
let mut size = 0;
let response: io::Result =
self.client.request_with(Command::Read, |connection| {
@@ -595,40 +749,71 @@ impl CommitIo for File<'_> {
output[..response.data.len()].copy_from_slice(&response.data);
Ok(response.data.len())
}
+ /// Queues at most one request's worth of `bytes`; `flush` sends it.
fn write_at(&mut self, offset: u64, bytes: &[u8]) -> io::Result {
- if bytes.is_empty() {
- return Ok(0);
- }
let size = bytes.len().min(65536);
- let response: WriteResponse = self.client.request(
- Command::Write,
- WriteRequest {
- file_id: self.id.unwrap(),
+ if size > 0 {
+ self.writes.push((offset, bytes[..size].to_vec()));
+ }
+ Ok(size)
+ }
+
+ /// Sends the queued writes and then the flush in related compound requests of at most
+ /// sixteen, awaiting each: the server performs a compound in order, and answers the flush
+ /// once every write before it is durable.
+ fn flush(&mut self) -> io::Result<()> {
+ let file_id = self.id.unwrap();
+ let writes: Vec<_> = self
+ .writes
+ .drain(..)
+ .map(|(offset, data)| WriteRequest {
+ file_id,
offset,
- data: bytes[..size].to_vec(),
+ data,
data_offset: 112,
- flags: 1,
+ flags: 0,
channel: 0,
remaining_bytes: 0,
write_channel_info_offset: 0,
write_channel_info_length: 0,
- },
- )?;
- if response.count as usize > size {
- return Err(io::ErrorKind::InvalidData.into());
+ })
+ .collect();
+ let flush = FlushRequest { file_id };
+ let mut requests: Vec<(Command, &dyn Pack)> = writes
+ .iter()
+ .map(|write| (Command::Write, write as &dyn Pack))
+ .collect();
+ requests.push((Command::Flush, &flush));
+ let mut sizes = writes.iter().map(|write| write.data.len());
+ for compound in requests.chunks(16) {
+ for (response, (command, _)) in
+ self.client.compound(compound)?.into_iter().zip(compound)
+ {
+ let body = response?;
+ if *command == Command::Flush {
+ let _: FlushResponse = self.client.unpack(&body)?;
+ continue;
+ }
+ let written: WriteResponse = self.client.unpack(&body)?;
+ let size = sizes.next().ok_or(io::ErrorKind::InvalidData)?;
+ if written.count as usize != size {
+ return Err(if (written.count as usize) < size {
+ io::ErrorKind::WriteZero
+ } else {
+ io::ErrorKind::InvalidData
+ }
+ .into());
+ }
+ }
}
- Ok(response.count as usize)
- }
- fn flush(&mut self) -> io::Result<()> {
- let _: FlushResponse = self.client.request(
- Command::Flush,
- FlushRequest {
- file_id: self.id.unwrap(),
- },
- )?;
Ok(())
}
}
+/// The reads `Stamp::check` makes: the header and a probe of the last byte.
+fn checked(stamp: &onestore::Stamp) -> [(u64, usize); 2] {
+ [(0, 1024), (stamp.length.saturating_sub(1), 2)]
+}
+
#[cfg(test)]
mod tests;
diff --git a/crates/notebook/src/smb/remote.rs b/crates/notebook/src/smb/remote.rs
index 16fd2ba06ab25ceb5a2e0c08fb4329eced4fceb4..b1178eb2115de1f5478754686127724f74713299 100644
--- a/crates/notebook/src/smb/remote.rs
+++ b/crates/notebook/src/smb/remote.rs
@@ -26,15 +26,15 @@ impl Remote for SmbRemote {
self.client.read(&self.path, self.limit)
}
- fn stamp(&mut self) -> io::Result> {
- self.client.stamp(&self.path).map(Some)
+ fn stamp(&mut self) -> io::Result {
+ self.client.stamp(&self.path)
}
fn publish(&mut self, transaction: &Transaction) -> Result<(), CommitError> {
self.client.commit_transaction(&self.path, transaction)
}
- fn confirm(&mut self, snapshot: &[u8]) -> Result<(), CommitError> {
- self.client.confirm_snapshot(&self.path, snapshot)
+ fn confirm(&mut self, base: &Stamp) -> Result<(), CommitError> {
+ self.client.confirm(&self.path, base)
}
}
diff --git a/crates/notebook/src/smb/tests.rs b/crates/notebook/src/smb/tests.rs
index 54078552e8a67c7b15b3a34a1d308dda2d0a2e57..af3c34d20f8ccbfbe66741337843cd11284932df 100644
--- a/crates/notebook/src/smb/tests.rs
+++ b/crates/notebook/src/smb/tests.rs
@@ -1,7 +1,8 @@
use super::*;
use onestore::{
- RevisionIndex, Store,
+ ExGuid, RevisionIndex, Store, Transaction,
document::{Document, Kind},
+ op::{Edit, Op, PageOp},
};
use std::{
fs,
@@ -117,11 +118,7 @@ fn create(client: &Client, path: &str, bytes: &[u8]) {
},
)
.unwrap();
- let mut file = File {
- client,
- id: Some(response.file_id),
- length: response.end_of_file,
- };
+ let mut file = File::new(client, &response);
let mut offset = 0;
while offset < bytes.len() {
offset += file.write_at(offset as u64, &bytes[offset..]).unwrap();
@@ -129,6 +126,43 @@ fn create(client: &Client, path: &str, bytes: &[u8]) {
file.flush().unwrap();
file.close().unwrap();
}
+/// The transaction replacing `range` of the first text in `image` with `with`, as typed now.
+fn replaced(image: &[u8], range: std::ops::Range, with: &str) -> Transaction {
+ let (space, text, _) = text(image);
+ let arena = onestore::Arena::default();
+ let mut section = onestore::Section::open(&arena, image.to_vec()).unwrap();
+ let at = SystemTime::now()
+ .duration_since(UNIX_EPOCH)
+ .unwrap()
+ .as_nanos() as u64
+ / 100
+ + 116_444_736_000_000_000;
+ section
+ .apply(
+ "Fixture",
+ &Edit {
+ at,
+ ops: vec![Op::Page {
+ space,
+ op: PageOp::Text {
+ text,
+ range,
+ with: with.to_owned(),
+ },
+ }],
+ },
+ )
+ .unwrap();
+ section.seal().unwrap().unwrap()
+}
+
+/// `image` after `transaction`.
+fn applied(image: &[u8], transaction: &Transaction) -> Vec {
+ let mut image = image.to_vec();
+ transaction.apply(&mut image).unwrap();
+ image
+}
+
fn text(bytes: &[u8]) -> (ExGuid, ExGuid, String) {
let store = Store::parse(bytes).unwrap();
assert!(store.checksum_mismatches.is_empty());
@@ -171,21 +205,15 @@ fn live_coordination() {
client
.open(&path, false)
.unwrap()
- .coordinate(&path, false)
+ .coordinate(&path, false, &[])
.unwrap()
})
.collect();
- let (sid, oid, before) = text(&source);
+ let (_, _, before) = text(&source);
let replacement = "After café 🦀";
+ let everything = 0..before.encode_utf16().count() as u32;
writer
- .commit_text(
- &path,
- &source,
- sid,
- oid,
- 0..before.encode_utf16().count() as u32,
- replacement,
- )
+ .commit_transaction(&path, &replaced(&source, everything.clone(), replacement))
.unwrap();
let after = writer.read(&path, 1 << 20).unwrap();
assert_eq!(text(&after).2, replacement);
@@ -196,7 +224,7 @@ fn live_coordination() {
assert_eq!(snapshot, after);
}
let error = writer
- .commit_text(&path, &source, sid, oid, 0..1, "X")
+ .commit_transaction(&path, &replaced(&source, 0..1, "X"))
.unwrap_err();
assert_eq!(error.state, CommitState::NotCommitted);
assert_eq!(error.error.kind(), io::ErrorKind::ResourceBusy);
@@ -262,7 +290,7 @@ fn live_coordination() {
.unwrap();
drop(connection);
guard.close().unwrap();
- let error = stale.coordinate(&path, true).err().unwrap();
+ let error = stale.coordinate(&path, true, &[]).err().unwrap();
assert_eq!(error.kind(), io::ErrorKind::ResourceBusy);
assert_eq!(writer.read(&path, 1 << 20).unwrap(), source);
@@ -270,7 +298,7 @@ fn live_coordination() {
let file = retiring
.open(&path, true)
.unwrap()
- .coordinate(&path, true)
+ .coordinate(&path, true, &[])
.unwrap();
retiring.retire();
assert_eq!(
@@ -282,7 +310,7 @@ fn live_coordination() {
loop {
match writer
.open(&path, true)
- .and_then(|file| file.coordinate(&path, true))
+ .and_then(|file| file.coordinate(&path, true, &[]))
{
Ok(file) => {
file.close().unwrap();
@@ -300,7 +328,7 @@ fn live_coordination() {
let mut unfinished = writer
.open(&path, true)
.unwrap()
- .coordinate(&path, true)
+ .coordinate(&path, true, &[])
.unwrap();
assert_eq!(
unfinished
@@ -314,14 +342,7 @@ fn live_coordination() {
assert_eq!(snapshot.len(), source.len() + 11);
assert_eq!(text(&snapshot).2, before);
writer
- .commit_text(
- &path,
- &snapshot,
- sid,
- oid,
- 0..before.encode_utf16().count() as u32,
- "Recovered café 🦀",
- )
+ .commit_transaction(&path, &replaced(&snapshot, everything, "Recovered café 🦀"))
.unwrap();
let recovered = writer.read(&path, 1 << 20).unwrap();
assert_eq!(text(&recovered).2, "Recovered café 🦀");
@@ -376,19 +397,27 @@ fn live_stamp_and_transaction() {
onestore::Stamp::of(&source).unwrap()
);
guard.close().unwrap();
- let (sid, oid, _) = text(&source);
- let edit = onestore::PreparedEdit::text(&source, sid, oid, 0..0, "Changed ").unwrap();
- let transaction = edit.transaction();
+ let transaction = replaced(&source, 0..0, "Changed ");
+ let edited = applied(&source, &transaction);
poller.commit_transaction(&path, &transaction).unwrap();
assert_eq!(
poller.stamp(&path).unwrap(),
- onestore::Stamp::of(edit.as_bytes()).unwrap()
+ onestore::Stamp::of(&edited).unwrap()
);
- assert_eq!(poller.read(&path, 1 << 20).unwrap(), edit.as_bytes());
+ assert_eq!(poller.read(&path, 1 << 20).unwrap(), edited);
let stale = poller.commit_transaction(&path, &transaction).unwrap_err();
assert_eq!(stale.state, CommitState::NotCommitted);
assert_eq!(stale.error.kind(), io::ErrorKind::ResourceBusy);
- assert_eq!(poller.read(&path, 1 << 20).unwrap(), edit.as_bytes());
+ assert_eq!(poller.read(&path, 1 << 20).unwrap(), edited);
+ let base = onestore::Stamp::of(&edited).unwrap();
+ poller.confirm(&path, &base).unwrap();
+ let confirmed = poller.read(&path, 1 << 20).unwrap();
+ assert_eq!(confirmed[..212], edited[..212]);
+ assert_ne!(confirmed[212..252], edited[212..252]);
+ assert_eq!(confirmed[252..], edited[252..]);
+ let stale = poller.confirm(&path, &base).unwrap_err();
+ assert_eq!(stale.state, CommitState::NotCommitted);
+ assert_eq!(stale.error.kind(), io::ErrorKind::ResourceBusy);
poller.delete(&path).unwrap();
}
@@ -488,7 +517,7 @@ fn live_reader_hold() {
let mut file = client
.open(&path, false)
.unwrap()
- .coordinate(&path, false)
+ .coordinate(&path, false, &[])
.unwrap();
fs::write(output.join("ready"), b"held").unwrap();
let deadline = Instant::now() + Duration::from_secs(300);
@@ -580,13 +609,13 @@ fn live_structure() {
let mut notebook =
Notebook::open_smb(std::sync::Arc::clone(&client), &root, cache.path()).unwrap();
assert_eq!(
- notebook.create_section("", "Second", "Author").unwrap(),
+ notebook.create_section("", "Second", &onestore::PageCreation::new(None, Some(""), "Author").unwrap()).unwrap(),
"Second.one"
);
assert_eq!(notebook.create_group("", "Archive").unwrap(), "Archive");
assert_eq!(
notebook
- .create_section("Archive", "Inner", "Author")
+ .create_section("Archive", "Inner", &onestore::PageCreation::new(None, Some(""), "Author").unwrap())
.unwrap(),
"Archive/Inner.one"
);
diff --git a/crates/notebook/src/smb/tests/faults.rs b/crates/notebook/src/smb/tests/faults.rs
index 99641ee062cb06e9a4dad56f284ca954293b65fc..a9b74ec3144932898298846fec2c3026203a47a8 100644
--- a/crates/notebook/src/smb/tests/faults.rs
+++ b/crates/notebook/src/smb/tests/faults.rs
@@ -297,7 +297,7 @@ fn live_message_loss() {
&source,
)
.unwrap();
- let (sid, oid, before) = text(&source);
+ let (_, _, before) = text(&source);
let after = if fixture == "chunked" {
"After café 🦀 ".repeat(6000)
} else {
@@ -318,15 +318,11 @@ fn live_message_loss() {
);
std::thread::sleep(Duration::from_millis(5));
}
- let expected = onestore::replace_text(
+ let everything = 0..before.encode_utf16().count() as u32;
+ let new = snapshot(&applied(
&source,
- sid,
- oid,
- 0..before.encode_utf16().count() as u32,
- &after,
- )
- .unwrap();
- let new = snapshot(&expected);
+ &replaced(&source, everything.clone(), &after),
+ ));
let baseline_path = format!("fault-{prefix}-{fixture}-baseline.one");
create(&observer, &baseline_path, &source);
configure(&output, json!({"phase":format!("{fixture}-setup")}));
@@ -340,13 +336,9 @@ fn live_message_loss() {
let start = configure(&output, json!({"phase":format!("{fixture}-baseline")}));
let began = stamp();
baseline
- .commit_text(
+ .commit_transaction(
&baseline_path,
- &source,
- sid,
- oid,
- 0..before.encode_utf16().count() as u32,
- &after,
+ &replaced(&source, everything.clone(), &after),
)
.unwrap();
let events = records(&output);
@@ -397,15 +389,9 @@ fn live_message_loss() {
json!({"phase":name, "direction":direction, "cut":command, "status":status, "occurrence":occurrence}),
);
let began = stamp();
+ let transaction = replaced(&source, everything.clone(), &after);
let error = interrupted
- .commit_text(
- &path,
- &source,
- sid,
- oid,
- 0..before.encode_utf16().count() as u32,
- &after,
- )
+ .commit_transaction(&path, &transaction)
.unwrap_err();
assert_eq!(
interrupted.read(&path, 1 << 20).unwrap_err().kind(),
@@ -429,7 +415,7 @@ fn live_message_loss() {
loop {
match fresh
.open(&path, true)
- .and_then(|file| file.coordinate(&path, true))
+ .and_then(|file| file.coordinate(&path, true, &[]))
{
Ok(file) => {
file.close().unwrap();
@@ -458,14 +444,7 @@ fn live_message_loss() {
}
if !visible {
fresh
- .commit_text(
- &path,
- &saved,
- sid,
- oid,
- 0..before.encode_utf16().count() as u32,
- &after,
- )
+ .commit_transaction(&path, &replaced(&saved, everything.clone(), &after))
.unwrap();
}
let saved = fresh.read(&path, 1 << 20).unwrap();
@@ -475,7 +454,7 @@ fn live_message_loss() {
);
let end = after.encode_utf16().count() as u32;
fresh
- .commit_text(&path, &saved, sid, oid, end..end, suffix)
+ .commit_transaction(&path, &replaced(&saved, end..end, suffix))
.unwrap();
let recovered = fresh.read(&path, 1 << 20).unwrap();
assert_eq!(text(&recovered).2, format!("{after}{suffix}"));
diff --git a/crates/notebook/src/sync.rs b/crates/notebook/src/sync.rs
index f972d937376b28dcce55dedbbcac584e1c792d5c..e23cca5ce9edd84e1b1f37fabd4cb8ab1a192088 100644
--- a/crates/notebook/src/sync.rs
+++ b/crates/notebook/src/sync.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::working::{Rebased, Request, Resolve, Sealed};
+use crate::working::{Request, Sealed};
use onestore::{CommitError, CommitState, RevisionIndex, Stamp, Store, Transaction};
use rusqlite::OptionalExtension;
use std::{
@@ -12,44 +12,12 @@ use std::{
/// cached readers.
pub trait Remote {
fn read(&mut self) -> io::Result>;
- /// The file's stamp without reading its body, when the remote can tell. While it is the
- /// last observed image's, synchronization neither reads nor revalidates the file.
- fn stamp(&mut self) -> io::Result> {
- Ok(None)
- }
+ /// The file's stamp without reading its body or coordinating with writers. While it is
+ /// the last observed image's, synchronization neither reads nor revalidates the file.
+ fn stamp(&mut self) -> io::Result;
fn publish(&mut self, transaction: &Transaction) -> std::result::Result<(), CommitError>;
- fn confirm(&mut self, snapshot: &[u8]) -> std::result::Result<(), CommitError>;
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-#[repr(i64)]
-pub enum ConflictKind {
- /// The edited page or a selected page no longer exists remotely.
- TargetUnavailable = 0,
- /// The remote section no longer accepts the edit.
- UnsupportedEdit = 1,
- /// Page order or indentation changed remotely in a way the batch cannot absorb.
- StructureChanged = 2,
- /// The remote page changed where the local edits changed it too; review is required.
- ContentChanged = 3,
-}
-
-impl ConflictKind {
- fn from_stored(kind: i64) -> Result {
- Ok(match kind {
- 0 => Self::TargetUnavailable,
- 1 => Self::UnsupportedEdit,
- 2 => Self::StructureChanged,
- 3 => Self::ContentChanged,
- _ => {
- return Err(io::Error::new(
- io::ErrorKind::InvalidData,
- "Unknown cached conflict kind",
- )
- .into());
- }
- })
- }
+ /// Confirms that the file still has `base`'s stamp and is durable (`onestore::confirm`).
+ fn confirm(&mut self, base: &Stamp) -> std::result::Result<(), CommitError>;
}
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -59,7 +27,6 @@ pub enum EditStatus {
AwaitingConfirmation {
revision: ExGuid,
},
- Conflict(ConflictKind),
/// Historical confirmation; later remote edits or restores may remove the effect.
Published {
revision: ExGuid,
@@ -84,15 +51,13 @@ struct State {
base: Stamp,
/// The observed remote image's stamp while it is not the base.
remote: Option,
- /// The first batch waiting on a remote answer: sealed, attempted, or in conflict.
+ /// The first batch waiting on a remote answer to an attempt.
blocked: Option,
queued: bool,
}
struct Blocked {
batch: i64,
- attempted: bool,
- conflict: Option,
revisions: Option>,
}
@@ -101,24 +66,14 @@ fn state(connection: &Connection) -> Result {
.ok_or_else(|| io::Error::new(io::ErrorKind::InvalidData, "The cache has no base image"))?;
let blocked = connection
.query_row(
- "SELECT id, attempted, conflict, revisions FROM batches
- WHERE attempted=1 OR conflict IS NOT NULL ORDER BY id LIMIT 1",
+ "SELECT id, revisions FROM batches WHERE attempted=1 ORDER BY id LIMIT 1",
[],
- |row| {
- Ok((
- row.get::<_, i64>(0)?,
- row.get::<_, bool>(1)?,
- row.get::<_, Option>(2)?,
- row.get::<_, Option>(3)?,
- ))
- },
+ |row| Ok((row.get::<_, i64>(0)?, row.get::<_, Option>(1)?)),
)
.optional()?
- .map(|(batch, attempted, conflict, revisions)| {
+ .map(|(batch, revisions)| {
Ok::<_, Error>(Blocked {
batch,
- attempted,
- conflict: conflict.map(ConflictKind::from_stored).transpose()?,
revisions: revisions
.map(|revisions| decode_revisions(&revisions))
.transpose()?,
@@ -186,7 +141,7 @@ impl Replica {
/// The last observed remote image. Observation alone does not acknowledge any pending
/// edit's remote durability.
- pub fn remote_snapshot(&self) -> Result> {
+ pub(crate) fn remote_snapshot(&self) -> Result> {
let connection = self.lock()?;
let image = match base::read(&connection, base::Image::Remote)? {
Some(image) => Some(image),
@@ -197,26 +152,6 @@ impl Replica {
})?)
}
- /// The unpublished batch the remote no longer accepts, if any.
- pub fn conflict(&self) -> Result> {
- let connection = self.lock()?;
- let row: Option<(i64, i64, String)> = connection
- .query_row(
- "SELECT id, conflict, space FROM batches WHERE conflict IS NOT NULL ORDER BY id LIMIT 1",
- [],
- |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?)),
- )
- .optional()?;
- row.map(|(batch, kind, space)| {
- Ok(Conflict {
- id: newest(&connection, batch)?,
- space: space.parse()?,
- kind: ConflictKind::from_stored(kind)?,
- })
- })
- .transpose()
- }
-
/// Publishes the oldest unpublished batch, rebasing the queue first when the remote
/// changed. Reads the remote image only when its stamp moved; network I/O holds
/// synchronization ownership without holding the cache mutex. Uncertain attempts are
@@ -225,8 +160,8 @@ impl Replica {
let _owner = self.sync_owner()?;
let state = state(&*self.lock()?)?;
let observed = remote.stamp().map_err(Error::RemoteIo)?;
- if let (Some(observed), Some(blocked)) = (&observed, &state.blocked)
- && Some(observed) == state.remote.as_ref().or(Some(&state.base))
+ if let Some(blocked) = &state.blocked
+ && observed == *state.remote.as_ref().unwrap_or(&state.base)
{
// Nothing new to decide: the remote is as it was when the batch blocked.
let id = newest(&*self.lock()?, blocked.batch)?;
@@ -239,7 +174,7 @@ impl Replica {
});
}
let image = match observed {
- Some(observed) if observed == state.base => None,
+ observed if observed == state.base => None,
_ => {
let image = remote.read().map_err(Error::RemoteIo)?;
// A read image is compared whole: a stamp stands for it only when read alone.
@@ -249,13 +184,7 @@ impl Replica {
};
let mut changed = Vec::new();
if let Some(image) = image {
- if let Some(Blocked {
- batch,
- attempted: true,
- revisions,
- ..
- }) = &state.blocked
- {
+ if let Some(Blocked { batch, revisions }) = &state.blocked {
let id = newest(&*self.lock()?, *batch)?;
let revisions = revisions.clone().unwrap_or_default();
let store = Store::parse(&image)?;
@@ -308,7 +237,7 @@ impl Replica {
.collect(),
)
};
- if let Err(error) = remote.confirm(&image) {
+ if let Err(error) = remote.confirm(&Stamp::of(&image)?) {
if error.state == CommitState::Committed {
self.acknowledge(*batch, sealed.as_ref(), receipts.as_ref())?;
}
@@ -316,49 +245,26 @@ impl Replica {
}
self.acknowledge(*batch, sealed.as_ref(), receipts.as_ref())?;
let revision = self.receipt(id)?;
- changed = self.rebase(Some(image), None)?.unwrap_or_default();
+ changed = self.rebase(Some(image))?;
return Ok(Synced {
edit: Some((id, EditStatus::Published { revision })),
changed,
});
}
- match self.rebase(Some(image), None)? {
- Ok(spaces) => changed = spaces,
- Err(conflict) => {
- return Ok(Synced {
- edit: Some((conflict.id, EditStatus::Conflict(conflict.kind))),
- changed,
- });
- }
- }
+ changed = self.rebase(Some(image))?;
} else if let Some(blocked) = &state.blocked {
if state.remote.is_some() {
// The remote is back at the base: what blocked the queue is gone.
- let connection = self.lock()?;
- base::clear(&connection, base::Image::Remote)?;
- if blocked.conflict.is_some() {
- connection.execute("UPDATE batches SET conflict=NULL, space=NULL", [])?;
- }
- }
- if blocked.attempted {
- let id = newest(&*self.lock()?, blocked.batch)?;
- return Ok(Synced {
- edit: Some((
- id,
- status(&*self.lock()?, id)?.unwrap_or(EditStatus::Pending),
- )),
- changed,
- });
- }
- if let Some(kind) = blocked.conflict
- && state.remote.is_none()
- {
- let id = newest(&*self.lock()?, blocked.batch)?;
- return Ok(Synced {
- edit: Some((id, EditStatus::Conflict(kind))),
- changed,
- });
+ base::clear(&*self.lock()?, base::Image::Remote)?;
}
+ let id = newest(&*self.lock()?, blocked.batch)?;
+ return Ok(Synced {
+ edit: Some((
+ id,
+ status(&*self.lock()?, id)?.unwrap_or(EditStatus::Pending),
+ )),
+ changed,
+ });
} else if !state.queued {
return Ok(Synced::default());
}
@@ -383,7 +289,9 @@ impl Replica {
let id = newest(&*self.lock()?, batch)?;
let Some(transaction) = transaction else {
// Edits that changed nothing are published once the remote's image is durable.
- let base = base::read(&*self.lock()?, base::Image::Base)?.unwrap_or_default();
+ let base = base::stamp(&*self.lock()?, base::Image::Base)?.ok_or_else(|| {
+ io::Error::new(io::ErrorKind::InvalidData, "The cache holds no base image")
+ })?;
if let Err(error) = remote.confirm(&base) {
if error.state == CommitState::Committed {
self.acknowledge(batch, None, None)?;
@@ -439,22 +347,10 @@ impl Replica {
))
}
- /// Asks the section thread to replay the queue on `image`; `Err` is the conflict found.
- fn rebase(
- &self,
- image: Option>,
- resolve: Option,
- ) -> Result, Conflict>> {
- Ok(
- match self.ask(|reply| Request::Rebase {
- image,
- resolve,
- reply,
- })? {
- Rebased::Applied { changed } => Ok(changed),
- Rebased::Conflict { id, space, kind } => Err(Conflict { id, space, kind }),
- },
- )
+ /// Asks the section thread to replay the queue on `image`, returning the pages the
+ /// remote changed.
+ fn rebase(&self, image: Option>) -> Result> {
+ self.ask(|reply| Request::Rebase { image, reply })
}
fn receipt(&self, id: u64) -> Result {
@@ -501,49 +397,6 @@ impl Replica {
Ok(())
}
- /// Resolves the conflict holding edit `id`: the batch and everything queued after it
- /// drop their ops on the conflicted page; `Mine` rewrites the remote page to the local
- /// one first. A conflict on another page may follow.
- pub fn resolve(&self, id: u64, resolution: Resolution) -> Result<()> {
- self.resolve_with(id, resolution, None)
- }
-
- pub(crate) fn resolve_with(&self, id: u64, keep: Resolution, page: Option) -> Result<()> {
- let owner = self.sync_owner()?;
- let (first, space) = {
- let connection = self.lock()?;
- let row: Option<(i64, String)> = connection
- .query_row(
- "SELECT (SELECT min(id) FROM edits WHERE batch=batches.id), space FROM batches
- WHERE conflict IS NOT NULL AND id=(SELECT batch FROM edits WHERE id=?1)",
- [signed(id)?],
- |row| Ok((row.get(0)?, row.get(1)?)),
- )
- .optional()?;
- let Some((first, space)) = row else {
- return Err(io::Error::new(
- io::ErrorKind::InvalidInput,
- "The edit is not in conflict",
- )
- .into());
- };
- (unsigned(first)?, space.parse()?)
- };
- // A conflict on another page is recorded like any other.
- let _ = self.rebase(
- None,
- Some(Resolve {
- first,
- space,
- keep,
- page,
- }),
- )?;
- drop(owner);
- self.wake_sync();
- Ok(())
- }
-
/// Retires the uncertain attempt of the batch holding edit `id` after review. The
/// queue is first exported to `archive` (a new file), which is the record: no receipt
/// is written. `Mine` publishes the batch again against the current remote; `Theirs`
@@ -620,10 +473,7 @@ impl Replica {
None if !state.queued => state.base,
None => return Ok(false),
};
- let Some(stamp) = remote.stamp().map_err(Error::RemoteIo)? else {
- return Ok(false);
- };
- Ok(stamp == expected)
+ Ok(remote.stamp().map_err(Error::RemoteIo)? == expected)
}
}
@@ -651,26 +501,23 @@ pub(crate) fn status(connection: &Connection, id: u64) -> Result, Option, String)> = connection
+ let record: Option<(bool, Option, String)> = connection
.query_row(
- "SELECT batches.attempted, batches.conflict, batches.revisions, edits.edit
+ "SELECT batches.attempted, batches.revisions, edits.edit
FROM edits JOIN batches ON batches.id=edits.batch WHERE edits.id=?1",
[id],
- |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?, row.get(3)?)),
+ |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?)),
)
.optional()?;
Ok(match record {
None => None,
- Some((true, _, revisions, edit)) => {
+ Some((true, revisions, edit)) => {
let revisions = decode_revisions(revisions.as_deref().unwrap_or("{}"))?;
let edit: onestore::op::Edit = serde_json::from_str(&edit)
.map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
let revision = revision_of(&edit, &revisions)?;
Some(EditStatus::AwaitingConfirmation { revision })
}
- Some((false, Some(kind), ..)) => {
- Some(EditStatus::Conflict(ConflictKind::from_stored(kind)?))
- }
- Some((false, None, ..)) => Some(EditStatus::Pending),
+ Some((false, ..)) => Some(EditStatus::Pending),
})
}
diff --git a/crates/notebook/src/working.rs b/crates/notebook/src/working.rs
index ec937105e69c6ba4a4d9fba33a3483b46e8ed16d..53c2f3fa7b83c31f06bc26a1baff499848736d96 100644
--- a/crates/notebook/src/working.rs
+++ b/crates/notebook/src/working.rs
@@ -4,12 +4,11 @@
//! and, when the remote changed, to rebase the queue.
use crate::{
- ConflictKind, Resolution, Result, base, lock, merge, queue, session::Save, signed,
- worker::Signal,
+ Result, base, lock, merge, queue, worker::Signal,
};
use onestore::{
Arena, ExGuid, Section, Transaction,
- op::{Edit, Op, OpError},
+ op::{Edit, OpError},
page::Page,
};
use rusqlite::{Connection, OptionalExtension, TransactionBehavior, params};
@@ -28,15 +27,6 @@ pub(crate) enum Request {
edit: Edit,
reply: Reply,
},
- /// A whole-page save of the old session API: `None` answers a save a later one
- /// continuing it absorbed.
- Save {
- space: ExGuid,
- before: Page,
- after: Page,
- author: String,
- reply: Reply>,
- },
Page {
space: ExGuid,
reply: Reply,
@@ -44,6 +34,9 @@ pub(crate) enum Request {
Pages {
reply: Reply>,
},
+ Conflicts {
+ reply: Reply)>>,
+ },
/// Answers once the edits before it are written.
Flush {
reply: Reply<()>,
@@ -53,11 +46,11 @@ pub(crate) enum Request {
Seal {
reply: Reply>,
},
- /// Replays the queue on `image` (the stored remote image, or the base, when `None`).
+ /// Replays the queue on `image` (the stored remote image, or the base, when `None`);
+ /// answers with the pages the remote changed.
Rebase {
image: Option>,
- resolve: Option,
- reply: Reply,
+ reply: Reply>,
},
/// Rereads the queue after the sync thread replaced it.
Reopen {
@@ -78,34 +71,14 @@ pub(crate) struct Sealed {
pub transaction: Option,
}
-/// A conflict's resolution: the batch it holds and every later edit drop their ops on
-/// `space`; `Mine` first rewrites the rebased page to `page`, the local one unless given.
-pub(crate) struct Resolve {
- pub first: u64,
- pub space: ExGuid,
- pub keep: Resolution,
- pub page: Option,
-}
-
-pub(crate) enum Rebased {
- /// The queue now applies to the image, which is the base; these pages changed.
- Applied { changed: Vec },
- /// The batch holding edit `id` no longer applies; nothing changed but the record.
- Conflict {
- id: u64,
- space: ExGuid,
- kind: ConflictKind,
- },
-}
-
impl Request {
fn fail(self, message: &str) {
let error = || io::Error::other(message.to_owned()).into();
match self {
Self::Apply { reply, .. } => reply(Err(error())),
- Self::Save { reply, .. } => reply(Err(error())),
Self::Page { reply, .. } => reply(Err(error())),
Self::Pages { reply } => reply(Err(error())),
+ Self::Conflicts { reply } => reply(Err(error())),
Self::Flush { reply } => reply(Err(error())),
Self::Seal { reply } => reply(Err(error())),
Self::Rebase { reply, .. } => reply(Err(error())),
@@ -244,8 +217,7 @@ fn fail(error: crate::Error, backlog: VecDeque, requests: mpsc::Receive
enum Job {
Rebase {
image: Option>,
- resolve: Option,
- reply: Reply,
+ reply: Reply>,
},
Reopen {
reply: Reply<()>,
@@ -253,18 +225,14 @@ enum Job {
}
/// Runs `job`, rereads the section and takes the requests over from the thread that
-/// started it; a rebase that found a conflict changed nothing that thread serves.
+/// started it; a failed rebase changed nothing that thread serves.
fn build(shared: Arc, job: Job, signal: mpsc::Sender) {
let answer: Box = match job {
Job::Reopen { reply } => Box::new(move || reply(Ok(()))),
- Job::Rebase {
- image,
- resolve,
- reply,
- } => match rebase(&shared.connection, image, resolve) {
- Ok(applied @ Rebased::Applied { .. }) => Box::new(move || reply(Ok(applied))),
- other => {
- reply(other);
+ Job::Rebase { image, reply } => match rebase(&shared.connection, image) {
+ Ok(changed) => Box::new(move || reply(Ok(changed))),
+ Err(error) => {
+ reply(Err(error));
let _ = signal.send(Request::Resume);
return;
}
@@ -298,21 +266,7 @@ fn build(shared: Arc, job: Job, signal: mpsc::Sender) {
struct Accepted {
author: String,
edit: Edit,
- done: Done,
-}
-
-enum Done {
- Apply(Reply),
- Save(Reply>),
-}
-
-impl Done {
- fn reply(self, written: Result) {
- match self {
- Self::Apply(reply) => reply(written),
- Self::Save(reply) => reply(written.map(|id| Some(Save::Queued(id)))),
- }
- }
+ reply: Reply,
}
struct Working<'a> {
@@ -321,8 +275,6 @@ struct Working<'a> {
open: Option,
/// Spaces the open batch's edits change.
touched: BTreeSet,
- /// The last whole-page save: its space, the page it was given, and the page as stored.
- saved: Option<(ExGuid, Page, Page)>,
}
impl<'a> Working<'a> {
@@ -332,7 +284,6 @@ impl<'a> Working<'a> {
section,
open,
touched,
- saved: None,
})
}
@@ -367,6 +318,9 @@ impl<'a> Working<'a> {
reply(self.section.page(space).map_err(Into::into))
}
Request::Pages { reply } => reply(self.section.pages().map_err(Into::into)),
+ Request::Conflicts { reply } => {
+ reply(self.section.conflicts().map_err(Into::into))
+ }
Request::Handover(to) => {
let mut waiting = held.take().unwrap_or_default();
waiting.extend(burst.drain(..).chain(later.drain(..)));
@@ -386,86 +340,9 @@ impl<'a> Working<'a> {
edit,
reply,
} => self
- .accept(
- author,
- edit,
- Done::Apply(reply),
- &mut accepted,
- connection,
- worker,
- )
+ .accept(author, edit, reply, &mut accepted, connection, worker)
.err()
.unwrap_or(false),
- Request::Save {
- space,
- before,
- mut after,
- author,
- reply,
- } => {
- // Saves that continue one another are written once.
- let mut replies = vec![reply];
- while let Some(Request::Save {
- space: next,
- before: continued,
- author: by,
- ..
- }) = burst.front()
- && (*next, continued, by) == (space, &after, &author)
- {
- let Some(Request::Save {
- after: later,
- reply,
- ..
- }) = burst.pop_front()
- else {
- unreachable!()
- };
- after = later;
- replies.push(reply);
- }
- let last = replies.pop().unwrap();
- for folded in replies {
- folded(Ok(None));
- }
- match self.save(space, &before, &after) {
- Ok(Some(edit)) => match self.accept(
- author,
- edit,
- Done::Save(last),
- &mut accepted,
- connection,
- worker,
- ) {
- Ok(()) => {
- self.saved = self
- .section
- .page(space)
- .ok()
- .map(|stored| (space, after, stored));
- false
- }
- Err(broken) => broken,
- },
- Ok(None) => {
- self.saved = self
- .section
- .page(space)
- .ok()
- .map(|stored| (space, after, stored));
- last(Ok(Some(Save::Unchanged)));
- false
- }
- Err(Stale::Stale) => {
- last(Ok(Some(Save::Stale)));
- false
- }
- Err(Stale::Error(error)) => {
- last(Err(error));
- false
- }
- }
- }
Request::Page { space, reply } => {
reply(self.section.page(space).map_err(Into::into));
false
@@ -474,6 +351,10 @@ impl<'a> Working<'a> {
reply(self.section.pages().map_err(Into::into));
false
}
+ Request::Conflicts { reply } => {
+ reply(self.section.conflicts().map_err(Into::into));
+ false
+ }
request @ (Request::Flush { .. } | Request::Seal { .. })
if !burst.is_empty() =>
{
@@ -502,50 +383,15 @@ impl<'a> Working<'a> {
failed
}
}
- Request::Rebase {
- image,
- mut resolve,
- reply,
- } => {
- let written = self.flush(connection, worker, &mut accepted);
- // The page a `Mine` resolution keeps is read here, before the
- // rebuild; the root space lists pages and holds none.
- let root = self.section.root();
- let kept = match &mut resolve {
- Some(Resolve {
- keep: Resolution::Mine,
- page: page @ None,
- space,
- ..
- }) if *space != root => {
- self.section.page(*space).map(|local| *page = Some(local))
- }
- _ => Ok(()),
- };
- match (written, kept) {
- (true, Ok(())) => {
- held = self
- .rebuild(
- shared,
- Job::Rebase {
- image,
- resolve,
- reply,
- },
- )
- .then(VecDeque::new);
- false
- }
- (_, Err(error)) => {
- reply(Err(error.into()));
- !written
- }
- (false, _) => {
- reply(Err(
- io::Error::other("The queue could not be written").into()
- ));
- true
- }
+ Request::Rebase { image, reply } => {
+ if self.flush(connection, worker, &mut accepted) {
+ held = self
+ .rebuild(shared, Job::Rebase { image, reply })
+ .then(VecDeque::new);
+ false
+ } else {
+ reply(Err(io::Error::other("The queue could not be written").into()));
+ true
}
}
Request::Reopen { reply } => {
@@ -598,7 +444,7 @@ impl<'a> Working<'a> {
&mut self,
author: String,
edit: Edit,
- done: Done,
+ reply: Reply,
accepted: &mut Vec,
connection: &Mutex,
worker: &Worker,
@@ -607,7 +453,11 @@ impl<'a> Working<'a> {
Ok(()) => {
self.touched
.extend(queue::spaces(&edit, self.section.root()));
- accepted.push(Accepted { author, edit, done });
+ accepted.push(Accepted {
+ author,
+ edit,
+ reply,
+ });
Ok(())
}
Err(error) => {
@@ -615,40 +465,12 @@ impl<'a> Working<'a> {
if broken {
self.flush(connection, worker, accepted);
}
- done.reply(Err(error.into()));
+ reply(Err(error.into()));
Err(broken)
}
}
}
- /// The edit that takes the stored page from `before` to `after`. A save continuing
- /// the previous one finds the page as that one stored it, which may read back
- /// normalized.
- fn save(
- &mut self,
- space: ExGuid,
- before: &Page,
- after: &Page,
- ) -> std::result::Result, Stale> {
- let current = self
- .section
- .page(space)
- .map_err(|error| Stale::Error(error.into()))?;
- let expected = match &self.saved {
- Some((saved, given, stored)) if *saved == space && given == before => stored,
- _ => before,
- };
- if current != *expected {
- return Err(Stale::Stale);
- }
- let ops = onestore::op::lower_page(¤t, after)
- .map_err(|error| Stale::Error(OpError::Unsupported(error.message).into()))?;
- Ok((!ops.is_empty()).then(|| Edit {
- at: crate::now(),
- ops: ops.into_iter().map(|op| Op::Page { space, op }).collect(),
- }))
- }
-
/// Writes the accepted edits in one transaction, then answers their senders; false
/// when the write failed and the section holds edits the queue lacks.
fn flush(
@@ -689,15 +511,14 @@ impl<'a> Working<'a> {
match written {
Ok(ids) => {
for (edit, id) in accepted.drain(..).zip(ids) {
- edit.done.reply(Ok(id));
+ (edit.reply)(Ok(id));
}
crate::wake(worker);
}
Err(error) => {
let message = error.to_string();
for edit in accepted.drain(..) {
- edit.done
- .reply(Err(io::Error::other(message.clone()).into()));
+ (edit.reply)(Err(io::Error::other(message.clone()).into()));
}
}
}
@@ -712,7 +533,7 @@ impl<'a> Working<'a> {
{
let connection = lock(connection)?;
let waiting: bool = connection.query_row(
- "SELECT EXISTS(SELECT 1 FROM batches WHERE sealed IS NOT NULL OR conflict IS NOT NULL)",
+ "SELECT EXISTS(SELECT 1 FROM batches WHERE sealed IS NOT NULL)",
[],
|row| row.get(0),
)?;
@@ -746,12 +567,10 @@ impl<'a> Working<'a> {
}
}
-/// Replays every queued edit on `image`, keeping it as the base when all apply.
-fn rebase(
- connection: &Mutex,
- image: Option>,
- resolve: Option,
-) -> Result {
+/// Replays every queued edit on `image`, which becomes the base; each page whose local
+/// version the remote could not take gains a conflict page holding it, queued as a new edit.
+/// Returns the pages the remote changed.
+fn rebase(connection: &Mutex, image: Option>) -> Result> {
let (base_image, image, edits) = {
let connection = lock(connection)?;
if connection.query_row(
@@ -777,117 +596,91 @@ fn rebase(
(base_image, image, queue::load(&connection, None)?)
};
let old_arena = Arena::default();
- let mut old = Section::open(&old_arena, base_image.clone())?;
+ let mut old = Section::open(&old_arena, base_image)?;
let before: BTreeMap = old.revisions().collect();
- let mut after: BTreeMap;
+ let remote_arena = Arena::default();
+ let remote = Section::open(&remote_arena, image.clone())?;
+ if old.root() != remote.root() {
+ return Err(io::Error::new(
+ io::ErrorKind::InvalidInput,
+ "Remote snapshot belongs to another document",
+ )
+ .into());
+ }
+ let after: BTreeMap = remote.revisions().collect();
+ // The pages as the queue leaves them, read once a page conflicts: O(section).
+ let local_arena = Arena::default();
+ let mut local = None;
// Pages the remote already holds as the local edits leave them: their ops are done.
let mut converged = BTreeSet::new();
- let outcome = loop {
+ let (rewritten, added) = loop {
let arena = Arena::default();
let mut new = Section::open(&arena, image.clone())?;
- if old.root() != new.root() {
- return Err(io::Error::new(
- io::ErrorKind::InvalidInput,
- "Remote snapshot belongs to another document",
- )
- .into());
+ let merged = merge::rebase(&mut old, &mut new, &edits, &converged)?;
+ if !merged.conflicts.is_empty() && local.is_none() {
+ local = Some(replay(&local_arena, &*lock(connection)?)?.0);
}
- after = new.revisions().collect();
- let outcome = merge::rebase(
- &mut old,
- &mut new,
- &edits,
- &converged,
- resolve.as_ref().map(|resolve| merge::Resolving {
- first: resolve.first,
- space: resolve.space,
- mine: resolve.keep == Resolution::Mine,
- target: resolve.page.as_ref(),
- }),
- )?;
- if let merge::Outcome::Conflict { space, .. } = &outcome
- && !converged.contains(space)
- && let Some(local) = local_page(connection, *space)?
- && Section::open(&Arena::default(), image.clone())?
- .page(*space)
- .is_ok_and(|remote| remote == local)
- {
- converged.insert(*space);
+ let pages: BTreeMap = merged
+ .conflicts
+ .keys()
+ .filter_map(|space| Some((*space, local.as_ref()?.page(*space).ok()?)))
+ .collect();
+ let settled: Vec = pages
+ .iter()
+ .filter(|(space, page)| remote.page(**space).is_ok_and(|remote| remote == **page))
+ .map(|(space, _)| *space)
+ .collect();
+ if !settled.is_empty() {
+ converged.extend(settled);
continue;
}
- break outcome;
+ let mut added = Vec::new();
+ for (space, (author, objects)) in &merged.conflicts {
+ // A page the queue went on to delete keeps no version of its own.
+ let (Some(page), Some(local)) = (pages.get(space), local.as_mut()) else {
+ continue;
+ };
+ let edit = merge::conflict_page(
+ &mut new,
+ &mut old,
+ local,
+ *space,
+ page,
+ author,
+ objects,
+ crate::now(),
+ )?;
+ added.push((author.clone(), edit));
+ }
+ break (merged.rewritten, added);
};
let mut connection = lock(connection)?;
let transaction = connection.transaction_with_behavior(TransactionBehavior::Immediate)?;
- let rebased = match outcome {
- merge::Outcome::Conflict { id, space, kind } => {
- transaction.execute("UPDATE batches SET conflict=NULL, space=NULL", [])?;
- transaction.execute(
- "UPDATE batches SET conflict=?1, space=?2 WHERE id=(SELECT batch FROM edits WHERE id=?3)",
- params![kind as i64, space.to_string(), signed(id)?],
- )?;
- if image == base_image {
- base::clear(&transaction, base::Image::Remote)?;
- } else {
- base::write(&transaction, base::Image::Remote, &image)?;
- }
- // A conflict is reported under its batch's newest edit.
- let id = crate::unsigned(transaction.query_row(
- "SELECT max(id) FROM edits WHERE batch=(SELECT batch FROM edits WHERE id=?1)",
- [signed(id)?],
- |row| row.get(0),
- )?)?;
- Rebased::Conflict { id, space, kind }
- }
- merge::Outcome::Applied(rewritten) => {
- base::write(&transaction, base::Image::Base, &image)?;
- base::clear(&transaction, base::Image::Remote)?;
- transaction.execute("INSERT INTO batches DEFAULT VALUES", [])?;
- let batch = transaction.last_insert_rowid();
- transaction.execute("UPDATE edits SET batch=?1", [batch])?;
- transaction.execute("DELETE FROM batches WHERE id<>?1", [batch])?;
- for (id, edit) in rewritten {
- queue::rewrite(&transaction, id, &edit)?;
- }
- if transaction
- .query_row("SELECT count(*) FROM edits", [], |row| row.get::<_, i64>(0))?
- == 0
- {
- transaction.execute("DELETE FROM batches", [])?;
- }
- queue::collect(&transaction)?;
- let mut changed: BTreeSet = before
- .iter()
- .filter(|(space, rid)| after.get(space) != Some(rid))
- .map(|(space, _)| *space)
- .chain(
- after
- .keys()
- .filter(|space| !before.contains_key(space))
- .copied(),
- )
- .collect();
- changed.extend(resolve.as_ref().map(|resolve| resolve.space));
- changed.extend(converged);
- Rebased::Applied {
- changed: changed.into_iter().collect(),
- }
- }
- };
+ base::write(&transaction, base::Image::Base, &image)?;
+ base::clear(&transaction, base::Image::Remote)?;
+ transaction.execute("INSERT INTO batches DEFAULT VALUES", [])?;
+ let batch = transaction.last_insert_rowid();
+ transaction.execute("UPDATE edits SET batch=?1", [batch])?;
+ transaction.execute("DELETE FROM batches WHERE id<>?1", [batch])?;
+ for (id, edit) in rewritten {
+ queue::rewrite(&transaction, id, &edit)?;
+ }
+ for (author, edit) in &added {
+ queue::insert(&transaction, None, batch, author, edit)?;
+ }
+ if transaction.query_row("SELECT count(*) FROM edits", [], |row| row.get::<_, i64>(0))? == 0 {
+ transaction.execute("DELETE FROM batches", [])?;
+ }
+ queue::collect(&transaction)?;
transaction.commit()?;
- Ok(rebased)
-}
-
-/// A page as the queued edits leave it, read from the cache: O(section).
-fn local_page(connection: &Mutex, space: ExGuid) -> Result> {
- let arena = Arena::default();
- let (section, ..) = replay(&arena, &*lock(connection)?)?;
- Ok(section.page(space).ok())
-}
-
-enum Stale {
- Stale,
- Error(crate::Error),
+ let mut changed: BTreeSet