From 5e0c87e68e4d4c96def82cf7278bc627023f3d00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2026 13:52:44 +0000 Subject: [PATCH 1/5] Update sphinx-autodoc-typehints requirement from >=3.0.0 to >=3.0.1 Updates the requirements on [sphinx-autodoc-typehints](https://github.com/tox-dev/sphinx-autodoc-typehints) to permit the latest version. - [Release notes](https://github.com/tox-dev/sphinx-autodoc-typehints/releases) - [Commits](https://github.com/tox-dev/sphinx-autodoc-typehints/compare/3.0.0...3.0.1) --- updated-dependencies: - dependency-name: sphinx-autodoc-typehints dependency-version: 3.0.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 7434748..01f3872 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ sphinx>=8.1.3 sphinx-rtd-theme>=3.1.0 -sphinx-autodoc-typehints>=3.0.0 \ No newline at end of file +sphinx-autodoc-typehints>=3.0.1 \ No newline at end of file From 52b1bbfb1abd308b6dabadab192f87755d5ad830 Mon Sep 17 00:00:00 2001 From: Christopher Toth Date: Tue, 20 Oct 2026 19:37:58 -0600 Subject: [PATCH 2/5] Build typehint documentation and run existing offline tests in CI --- .github/workflows/ci.yml | 2 +- README.md | 2 +- .../repair-task6-gui-builder-typehints-ci.md | 32 +++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 agent-notes/repair-task6-gui-builder-typehints-ci.md diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10ee2ae..eef9b40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: - name: Install actual autodoc dependencies run: | uv venv --python 3.11 - uv pip install --only-binary wxPython . -r docs/requirements.txt "sphinx==8.1.3" "sphinx-rtd-theme==3.1.0" "sphinx-autodoc-typehints==3.0.0" + uv pip install --only-binary wxPython . -r docs/requirements.txt "sphinx==8.1.3" "sphinx-rtd-theme==3.1.0" "sphinx-autodoc-typehints==3.0.1" - name: Build real HTML documentation with warnings fatal working-directory: docs run: ../.venv/Scripts/python.exe -m sphinx -W --keep-going -b html . _build/html diff --git a/README.md b/README.md index 6750f6e..58bc3b4 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,7 @@ the branch's documentation dependency floors and actual wxPython imports: ```bash uv venv --python 3.11 -uv pip install --only-binary wxPython . -r docs/requirements.txt sphinx==8.1.3 sphinx-rtd-theme==3.1.0 sphinx-autodoc-typehints==3.0.0 +uv pip install --only-binary wxPython . -r docs/requirements.txt sphinx==8.1.3 sphinx-rtd-theme==3.1.0 sphinx-autodoc-typehints==3.0.1 cd docs ../.venv/Scripts/python.exe -m sphinx -W --keep-going -b html . _build/html ``` diff --git a/agent-notes/repair-task6-gui-builder-typehints-ci.md b/agent-notes/repair-task6-gui-builder-typehints-ci.md new file mode 100644 index 0000000..7fce5cf --- /dev/null +++ b/agent-notes/repair-task6-gui-builder-typehints-ci.md @@ -0,0 +1,32 @@ +# GUI Builder PR #10: sphinx-autodoc-typehints floor 3.0.1 + +## Goal + +Preserve this dependency PR and supported Python while wiring the actual tracked tests, package build and real Sphinx autodoc build. No product/accessibility behavior, release workflow, dependency refresh, settings or external model calls. + +## State + +- Current landed baseline: prerequisite #11 merged at 2026-10-21 02:35:30 UTC. Fresh authenticated master is 7a3c755e83b3f79f100560c73c3949cb1ec2f02c, independently read back from origin; its reviewed source was caa318f88aecdead2ba335413909d11a4bf69332 with all three hosted jobs green. +- Rebased this original feature branch from exact published/local 6a921dee3cf5d9f929dfc1ddf678c9011038646d onto actual master using git rebase --no-update-refs, not the earlier local merge stack. Both original feature commits were preserved. Only the established CI/README add-add conflicts occurred; Git reused the previously inspected resolution, retaining typehints3.0.1 pins and exact published file bytes. +- Exact published remote remains 6a921dee3cf5d9f929dfc1ddf678c9011038646d; no push. The earlier local stack bf2e88c63b4273e0091ebaaa932db1610eeb7ebf and its branch/worktree remain untouched. New backup/task6-gui-builder-10-{published,local,stacked}-before-master-rebase refs preserve those exact tips, alongside all original archives. Canonical dirty work and local master32eb2671 remain untouched. +- This current successor includes the landed config fix, complete seven tests and supported runtime/strict docs coverage; no source/test behavior changes. New final-head hosted/Claude gates remain pending. The following first-preparation state is historical. + +- Fresh same-org origin is git@github.com:accessibleapps/gui_builder.git. Published PR #10 remains at 57e5c494195539488d954434971a3a6129335d89; preserved as backup/task6-gui-builder-10-published-before-repair. There was no local branch matching this Dependabot PR. Canonical master and all dirty/untracked experiments remain untouched. +- Local successor is based on current master 32eb2671a40eb3dc324e5628ef1544318adb6853, with only the original dependency commit replayed before this amendment. This carries current safe seven-test callback suite instead of inventing tests for an obsolete source tree. It is local and unpublished. +- Actions is enabled; existing default/release successes do not test this head. Hosted results and actual final-head Claude review are pending. No full local CI was run. + +## Decisions and why + +- Manifest/README Python floor is 3.8.6; RTD docs explicitly use 3.11. wxPython 4.2.4 primary PyPI metadata requires >=3.9 and supplies Windows wheels through CPython 3.14. The 3.8 wheel exists at 4.2.2. Python 3.14 is the latest demonstrated wheel leg, not a support-policy ceiling. +- Windows 3.8/3.14 installs the actual package graph with binary-only wxPython, imports wx and fields/forms without creating wx.App, runs the full unchanged tracked pytest suite (seven tests), and builds/verifies wheel/sdist. Compatible pytest pins are 8.3.5/9.1.1. Existing test stubs are not claimed as actual GUI/accessibility exercise. +- The docs job uses the actual RTD-selected Python 3.11 and real wxPython imports, not blanket autodoc mocks. Exact Sphinx 8.1.3/theme 3.1.0/typehints 3.0.1 meet the branch requirements (both typehints 3.0.0 and 3.0.1 require Sphinx >=8.1.3). Build runs from docs as its Makefile does; warnings are fatal and no links/services/examples are executed. +- Existing docs conf names absent _templates/_static directories. The strict hosted build may expose baseline documentation warnings; do not suppress or claim green. Classify actual failures against fresh default before a prerequisite fix. +- CI has ordinary PR/master events, verified pinned checkout/setup-uv, contents:read, no persisted credentials/cache, timeout/concurrency. No release workflow edits. + +## Verification + +Source/manifest/test/docs authority read. actionlint1.7.12 (optional shellcheck/pyflakes disabled) and zizmor1.31.1 --offline --pedantic both passed, exit0, no findings. Full hosted suite/build results are pending. No local full CI, GUI windows, model calls, release or service calls. + +## Next step + +Return the complete actual-master-to-rebased-head diff and exact head to coordinator before publication. Keep remote feature unchanged; no push/merge/model or full local CI. Only concrete reviewed publication authority and subsequent final-head hosted/Claude gates may advance the PR. From 05689864219ad1106382a8253474c65ed288ab40 Mon Sep 17 00:00:00 2001 From: Christopher Toth Date: Tue, 20 Oct 2026 21:38:53 -0600 Subject: [PATCH 3/5] Give typehints dependency task its own living note path --- agent-notes/repair-task6-gui-builder-ci.md | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 agent-notes/repair-task6-gui-builder-ci.md diff --git a/agent-notes/repair-task6-gui-builder-ci.md b/agent-notes/repair-task6-gui-builder-ci.md deleted file mode 100644 index 0581bed..0000000 --- a/agent-notes/repair-task6-gui-builder-ci.md +++ /dev/null @@ -1,34 +0,0 @@ -# GUI Builder PR #5: wxPython floor 4.2.4 - -## Goal - -Preserve this dependency PR and supported Python while wiring the actual tracked tests, package build and real Sphinx autodoc build. No product/accessibility behavior, release workflow, dependency refresh, settings or external model calls. - -## State - -- Current landed baseline: prerequisite #11 merged at 2026-10-21 02:35:30 UTC. Fresh authenticated master is 7a3c755e83b3f79f100560c73c3949cb1ec2f02c, independently read back from origin; its reviewed source was caa318f88aecdead2ba335413909d11a4bf69332 with all three hosted jobs green. -- Rebased this original feature branch from exact published/local 15868f6f92ba7df887a9154a16efffd74a8c664d onto actual master using git rebase --no-update-refs, not the earlier local merge stack. Both original feature commits were preserved. The rebase was clean; identical baseline CI/README were retained automatically. -- Exact published remote remains 15868f6f92ba7df887a9154a16efffd74a8c664d; no push. The earlier local stack f78814fcb76a39aafe870c3ee6dfe1f5580287ab and its branch/worktree remain untouched. New backup/task6-gui-builder-5-{published,local,stacked}-before-master-rebase refs preserve those exact tips, alongside all original archives. Canonical dirty work and local master32eb2671 remain untouched. -- This current successor includes the landed config fix, complete seven tests and supported runtime/strict docs coverage; no source/test behavior changes. New final-head hosted/Claude gates remain pending. The following first-preparation state is historical. - -- Fresh same-org origin is git@github.com:accessibleapps/gui_builder.git. Published PR #5 remains at 4626f870ac374a2dcdcaa81280f5d0737506fd64; preserved as backup/task6-gui-builder-5-published-before-repair. There was no local branch matching this Dependabot PR. Canonical master and all dirty/untracked experiments remain untouched. -- Local successor is based on current master 32eb2671a40eb3dc324e5628ef1544318adb6853, with only the original dependency commit replayed before this amendment. This carries current safe seven-test callback suite instead of inventing tests for an obsolete source tree. It is local and unpublished. -- Actions is enabled; existing default/release successes do not test this head. Hosted results and actual final-head Claude review are pending. No full local CI was run. - -## Decisions and why - -- Manifest/README Python floor is 3.8.6; RTD docs explicitly use 3.11. wxPython 4.2.4 primary PyPI metadata requires >=3.9 and supplies Windows wheels through CPython 3.14. The 3.8 wheel exists at 4.2.2. Python 3.14 is the latest demonstrated wheel leg, not a support-policy ceiling. -- Windows 3.8/3.14 installs the actual package graph with binary-only wxPython, imports wx and fields/forms without creating wx.App, runs the full unchanged tracked pytest suite (seven tests), and builds/verifies wheel/sdist. Compatible pytest pins are 8.3.5/9.1.1. Existing test stubs are not claimed as actual GUI/accessibility exercise. -- The docs job uses the actual RTD-selected Python 3.11 and real wxPython imports, not blanket autodoc mocks. Exact Sphinx 8.1.3/theme 3.1.0/typehints 3.0.0 meet the branch requirements (both typehints 3.0.0 and 3.0.1 require Sphinx >=8.1.3). Build runs from docs as its Makefile does; warnings are fatal and no links/services/examples are executed. -- Existing docs conf names absent _templates/_static directories. The strict hosted build may expose baseline documentation warnings; do not suppress or claim green. Classify actual failures against fresh default before a prerequisite fix. -- CI has ordinary PR/master events, verified pinned checkout/setup-uv, contents:read, no persisted credentials/cache, timeout/concurrency. No release workflow edits. - -## Verification - -The PR's unconditional wxPython >=4.2.4 cannot install at the declared Python 3.8 floor because that release requires >=3.9. This feature-only compatibility defect is fixed with two Python markers: retain original >=4.1.0 below 3.9, and apply >=4.2.4 from 3.9 onward. No source or support declaration changes. - -Source/manifest/test/docs authority read. actionlint1.7.12 (optional shellcheck/pyflakes disabled) and zizmor1.31.1 --offline --pedantic both passed, exit0, no findings. Full hosted suite/build results are pending. No local full CI, GUI windows, model calls, release or service calls. - -## Next step - -Return the complete actual-master-to-rebased-head diff and exact head to coordinator before publication. Keep remote feature unchanged; no push/merge/model or full local CI. Only concrete reviewed publication authority and subsequent final-head hosted/Claude gates may advance the PR. From 3a73e2fd2227fa4ada67e4ba5833b568a92ca455 Mon Sep 17 00:00:00 2001 From: Christopher Toth Date: Tue, 20 Oct 2026 22:06:03 -0600 Subject: [PATCH 4/5] Preserve both GUI task notes after wxPython prerequisite rebase --- agent-notes/repair-task6-gui-builder-ci.md | 34 +++++++++++++++++++ .../repair-task6-gui-builder-typehints-ci.md | 9 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 agent-notes/repair-task6-gui-builder-ci.md diff --git a/agent-notes/repair-task6-gui-builder-ci.md b/agent-notes/repair-task6-gui-builder-ci.md new file mode 100644 index 0000000..0581bed --- /dev/null +++ b/agent-notes/repair-task6-gui-builder-ci.md @@ -0,0 +1,34 @@ +# GUI Builder PR #5: wxPython floor 4.2.4 + +## Goal + +Preserve this dependency PR and supported Python while wiring the actual tracked tests, package build and real Sphinx autodoc build. No product/accessibility behavior, release workflow, dependency refresh, settings or external model calls. + +## State + +- Current landed baseline: prerequisite #11 merged at 2026-10-21 02:35:30 UTC. Fresh authenticated master is 7a3c755e83b3f79f100560c73c3949cb1ec2f02c, independently read back from origin; its reviewed source was caa318f88aecdead2ba335413909d11a4bf69332 with all three hosted jobs green. +- Rebased this original feature branch from exact published/local 15868f6f92ba7df887a9154a16efffd74a8c664d onto actual master using git rebase --no-update-refs, not the earlier local merge stack. Both original feature commits were preserved. The rebase was clean; identical baseline CI/README were retained automatically. +- Exact published remote remains 15868f6f92ba7df887a9154a16efffd74a8c664d; no push. The earlier local stack f78814fcb76a39aafe870c3ee6dfe1f5580287ab and its branch/worktree remain untouched. New backup/task6-gui-builder-5-{published,local,stacked}-before-master-rebase refs preserve those exact tips, alongside all original archives. Canonical dirty work and local master32eb2671 remain untouched. +- This current successor includes the landed config fix, complete seven tests and supported runtime/strict docs coverage; no source/test behavior changes. New final-head hosted/Claude gates remain pending. The following first-preparation state is historical. + +- Fresh same-org origin is git@github.com:accessibleapps/gui_builder.git. Published PR #5 remains at 4626f870ac374a2dcdcaa81280f5d0737506fd64; preserved as backup/task6-gui-builder-5-published-before-repair. There was no local branch matching this Dependabot PR. Canonical master and all dirty/untracked experiments remain untouched. +- Local successor is based on current master 32eb2671a40eb3dc324e5628ef1544318adb6853, with only the original dependency commit replayed before this amendment. This carries current safe seven-test callback suite instead of inventing tests for an obsolete source tree. It is local and unpublished. +- Actions is enabled; existing default/release successes do not test this head. Hosted results and actual final-head Claude review are pending. No full local CI was run. + +## Decisions and why + +- Manifest/README Python floor is 3.8.6; RTD docs explicitly use 3.11. wxPython 4.2.4 primary PyPI metadata requires >=3.9 and supplies Windows wheels through CPython 3.14. The 3.8 wheel exists at 4.2.2. Python 3.14 is the latest demonstrated wheel leg, not a support-policy ceiling. +- Windows 3.8/3.14 installs the actual package graph with binary-only wxPython, imports wx and fields/forms without creating wx.App, runs the full unchanged tracked pytest suite (seven tests), and builds/verifies wheel/sdist. Compatible pytest pins are 8.3.5/9.1.1. Existing test stubs are not claimed as actual GUI/accessibility exercise. +- The docs job uses the actual RTD-selected Python 3.11 and real wxPython imports, not blanket autodoc mocks. Exact Sphinx 8.1.3/theme 3.1.0/typehints 3.0.0 meet the branch requirements (both typehints 3.0.0 and 3.0.1 require Sphinx >=8.1.3). Build runs from docs as its Makefile does; warnings are fatal and no links/services/examples are executed. +- Existing docs conf names absent _templates/_static directories. The strict hosted build may expose baseline documentation warnings; do not suppress or claim green. Classify actual failures against fresh default before a prerequisite fix. +- CI has ordinary PR/master events, verified pinned checkout/setup-uv, contents:read, no persisted credentials/cache, timeout/concurrency. No release workflow edits. + +## Verification + +The PR's unconditional wxPython >=4.2.4 cannot install at the declared Python 3.8 floor because that release requires >=3.9. This feature-only compatibility defect is fixed with two Python markers: retain original >=4.1.0 below 3.9, and apply >=4.2.4 from 3.9 onward. No source or support declaration changes. + +Source/manifest/test/docs authority read. actionlint1.7.12 (optional shellcheck/pyflakes disabled) and zizmor1.31.1 --offline --pedantic both passed, exit0, no findings. Full hosted suite/build results are pending. No local full CI, GUI windows, model calls, release or service calls. + +## Next step + +Return the complete actual-master-to-rebased-head diff and exact head to coordinator before publication. Keep remote feature unchanged; no push/merge/model or full local CI. Only concrete reviewed publication authority and subsequent final-head hosted/Claude gates may advance the PR. diff --git a/agent-notes/repair-task6-gui-builder-typehints-ci.md b/agent-notes/repair-task6-gui-builder-typehints-ci.md index 7fce5cf..e3d0886 100644 --- a/agent-notes/repair-task6-gui-builder-typehints-ci.md +++ b/agent-notes/repair-task6-gui-builder-typehints-ci.md @@ -6,6 +6,13 @@ Preserve this dependency PR and supported Python while wiring the actual tracked ## State +- Current local successor genuinely rebased from published 0b8d08e5f18f18ec119ffa2715af1057d670d188 onto merged GUI #5 default 5a7ae5f7443e30ab05ad9c01f42d8984962954fb with --no-update-refs. Retain the exact wxPython Python 3.8 compatibility markers and original sphinx-autodoc-typehints >=3.0.1 proposal with its existing matching CI/README pins; no dependency/support/product/test policy change. +- Separate archive/task6-gui-builder-10-published-before-wx-rebase and -local-before-wx-rebase retain 0b8d08e5; archive/task6-gui-builder-canonical-before-wx-rebase preserves 32eb2671. Existing stacks, review worktrees, canonical experiments and other refs remain untouched. Remote PR #10 remains at 0b8d08e5; no publication. +- Replay produced add/add and historical-edit conflicts only in the generic living note. Preserve GUI #5's generic note at its original path and this branch's distinct typehints note. The later original rename removed the generic path during replay; restore exact default blob 0581bed9c0eb1ea61d0549f05ec18f184111aee1 before the final note commit. No note content was discarded; the old branch-note content below is retained as history. +- Return the complete fresh-default delta for root review before publication. No local CI, GUI execution, models, settings or description changes. + +## Historical preparation state + - Current landed baseline: prerequisite #11 merged at 2026-10-21 02:35:30 UTC. Fresh authenticated master is 7a3c755e83b3f79f100560c73c3949cb1ec2f02c, independently read back from origin; its reviewed source was caa318f88aecdead2ba335413909d11a4bf69332 with all three hosted jobs green. - Rebased this original feature branch from exact published/local 6a921dee3cf5d9f929dfc1ddf678c9011038646d onto actual master using git rebase --no-update-refs, not the earlier local merge stack. Both original feature commits were preserved. Only the established CI/README add-add conflicts occurred; Git reused the previously inspected resolution, retaining typehints3.0.1 pins and exact published file bytes. - Exact published remote remains 6a921dee3cf5d9f929dfc1ddf678c9011038646d; no push. The earlier local stack bf2e88c63b4273e0091ebaaa932db1610eeb7ebf and its branch/worktree remain untouched. New backup/task6-gui-builder-10-{published,local,stacked}-before-master-rebase refs preserve those exact tips, alongside all original archives. Canonical dirty work and local master32eb2671 remain untouched. @@ -25,7 +32,7 @@ Preserve this dependency PR and supported Python while wiring the actual tracked ## Verification -Source/manifest/test/docs authority read. actionlint1.7.12 (optional shellcheck/pyflakes disabled) and zizmor1.31.1 --offline --pedantic both passed, exit0, no findings. Full hosted suite/build results are pending. No local full CI, GUI windows, model calls, release or service calls. +Historical pre-rebase validation: source/manifest/test/docs authority read; actionlint1.7.12 (optional shellcheck/pyflakes disabled) and zizmor1.31.1 --offline --pedantic both passed, exit0, no findings. Fresh rebased-head hosted suite/build results remain pending. No local full CI, GUI windows, model calls, release or service calls. ## Next step From c77d61676b0dee12cddf92cca27dcd9ac7528250 Mon Sep 17 00:00:00 2001 From: Christopher Toth Date: Tue, 20 Oct 2026 22:24:58 -0600 Subject: [PATCH 5/5] Record final typehints rebase onto merged Sphinx prerequisite --- agent-notes/repair-task6-gui-builder-typehints-ci.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agent-notes/repair-task6-gui-builder-typehints-ci.md b/agent-notes/repair-task6-gui-builder-typehints-ci.md index e3d0886..da8642d 100644 --- a/agent-notes/repair-task6-gui-builder-typehints-ci.md +++ b/agent-notes/repair-task6-gui-builder-typehints-ci.md @@ -6,9 +6,9 @@ Preserve this dependency PR and supported Python while wiring the actual tracked ## State -- Current local successor genuinely rebased from published 0b8d08e5f18f18ec119ffa2715af1057d670d188 onto merged GUI #5 default 5a7ae5f7443e30ab05ad9c01f42d8984962954fb with --no-update-refs. Retain the exact wxPython Python 3.8 compatibility markers and original sphinx-autodoc-typehints >=3.0.1 proposal with its existing matching CI/README pins; no dependency/support/product/test policy change. -- Separate archive/task6-gui-builder-10-published-before-wx-rebase and -local-before-wx-rebase retain 0b8d08e5; archive/task6-gui-builder-canonical-before-wx-rebase preserves 32eb2671. Existing stacks, review worktrees, canonical experiments and other refs remain untouched. Remote PR #10 remains at 0b8d08e5; no publication. -- Replay produced add/add and historical-edit conflicts only in the generic living note. Preserve GUI #5's generic note at its original path and this branch's distinct typehints note. The later original rename removed the generic path during replay; restore exact default blob 0581bed9c0eb1ea61d0549f05ec18f184111aee1 before the final note commit. No note content was discarded; the old branch-note content below is retained as history. +- Final local successor genuinely rebased from held local a23e4b2d421126ef8cbd875cddf04b7e2526d660 onto cumulative default 9bf539fa61d21b2bee53564f620070c4a46b9718 with --no-update-refs. GUI #9 merged there at 2026-10-21 04:23:27 UTC. Keep landed Sphinx >=8.1.3 and exact wxPython Python 3.8 markers alongside the original sphinx-autodoc-typehints >=3.0.1 proposal and existing matching CI/README pins; no dependency/support/product/test policy change. +- Separate archive/task6-gui-builder-10-local-before-sphinx-rebase preserves a23e4b2d and -published-before-sphinx-rebase preserves 0b8d08e5f18f18ec119ffa2715af1057d670d188; archive/task6-gui-builder-canonical-before-sphinx-rebase preserves 32eb2671. Earlier wx-rebase archives, stacks, review worktrees, canonical experiments and other refs remain untouched. Remote PR #10 remains at 0b8d08e5; no publication. +- This cumulative-default rebase completed cleanly. Existing docs-baseline, generic GUI #5 and Sphinx GUI #9 notes remain byte-identical to default; only this unique typehints note is refreshed. The earlier wx rebase's generic-note add/add and historical-edit conflicts were resolved by retaining both distinct notes, with exact generic blob 0581bed9c0eb1ea61d0549f05ec18f184111aee1 restored after the original rename. That preserved resolution remains intact. - Return the complete fresh-default delta for root review before publication. No local CI, GUI execution, models, settings or description changes. ## Historical preparation state