@@ -116,3 +116,50 @@ The branch remains stacked on #34 and #36 until they land. PR #37 must target
116116develop when its updates are published. No push, PR-base edit, reviewer reply or
117117merge is included in this implementation step. Hosted CI must be checked on the
118118eventual pushed head.
119+
120+ ## Rebase after PR #34 merged (2026-10-28)
121+
122+ PR #34 merged normally as ` 805db05 ` . Both dependent branches now contain
123+ develop ` 63ecd9240d98bbe06c879089dd887494c7e99293 ` , including upstream SecretValue
124+ changes. PR #36 was rebased first; PR #37 's issue-specific commits were replayed
125+ onto that rebased foundation. The original local PR #37 head is preserved as
126+ ` backup/pr37-before-develop-rebase-20261028 ` . The original published head was
127+ still ` e458282 ` ; publishing uses an explicit force-with-lease against that head.
128+
129+ PR #37 now targets develop. It still includes PR #36 until that PR merges, but
130+ the already-merged PR #34 commits are no longer outstanding dependency changes.
131+ Tree comparison against the previously validated implementation plus new develop
132+ shows no functional changes lost during the rebase.
133+
134+ Complete collection succeeds with ** 954 tests** , including the 99 wire cases.
135+ Exact-source runs at rebased head ` a577fe7 ` use MCP ** 2.2.0** :
136+
137+ | Platform | Python | Complete suite | Coverage |
138+ | ---| ---| ---| ---|
139+ | Ubuntu / WSL | 3.10.21 | 954 passed | 86.32% |
140+ | Ubuntu / WSL | 3.11.16 | 954 passed | 86.30% |
141+ | Ubuntu / WSL | 3.12.14 | 954 passed | 86.30% |
142+ | Windows | 3.12.14 | 953 passed, 1 socket failure on first run | 86.30% |
143+
144+ The Windows failure is ` test_discovery_dcr_404_when_disabled_or_missing_client_id `
145+ with WinError 10053, matching the intermittent baseline-reproduced failure
146+ documented above. A complete repeat is recorded separately below. No exclusions,
147+ skips or xfails were added. Logs are retained in
148+ ` .pytest_cache/rebase-linux-3.10.log ` , ` rebase-linux-3.11.log ` ,
149+ ` rebase-linux-3.12.log ` , ` rebase-windows-full.tmp.log ` and
150+ ` rebase-windows-repeat.tmp.log ` . Hosted CI must be checked on the new published
151+ head; the old 914-test results above are historical.
152+
153+ The complete Windows repeat reported ** 952 passed, 2 failed** (86.30% coverage),
154+ both unchanged live OAuth discovery socket tests:
155+ ` test_discovery_server_idempotent_start_and_dcr_http ` and
156+ ` test_discovery_dcr_404_when_disabled_or_missing_client_id ` , with WinError 10053.
157+ These Windows full suites are not claimed green. No OAuth source or test changes
158+ were introduced by this rebase, and none of these tests were excluded.
159+
160+ A fresh archive of current develop ` 63ecd92 ` , tested with the same Windows
161+ Python/MCP environment, reproduced ** both** failures: ** 72 passed, 2 failed** .
162+ The command was `python -m pytest tests/test_oauth.py tests/test_secret_value.py
163+ -o addopts= -q --timeout=60 --tb=short`. The log is
164+ ` .pytest_cache/rebase-develop-windows.log ` . Import-path inspection confirmed the
165+ archive's package was loaded rather than the editable feature checkout.
0 commit comments