docs: DONE-NOTE for rb1 -- merge-queue repair (rebased and landed #21 and #24) - #25
Draft
Brian Krabach (bkrabach) wants to merge 1 commit into
Draft
docs: DONE-NOTE for rb1 -- merge-queue repair (rebased and landed #21 and #24)#25Brian Krabach (bkrabach) wants to merge 1 commit into
Brian Krabach (bkrabach) wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this is
Merge-queue repair, lane
model_performance-rb1. Docs only — this branch'sown diff is a single append to
DONE-NOTE.md. The actual work of the lane wasrebasing and landing two other PRs, which are already on
main:49e2799replay_last_user_on_compaction— opt-in last-user replay at the tail3972070routing-matrix #49 was deliberately not touched — a live lane owns that repo.
Suite
f47c89449e2799main)397207056270a1The 1 skip is
tests/test_replay_last_user.py:682— an environment-conditionalskip (
amplifier-foundationrequiresamplifier-core>=1.0.10; this repo pinscore
<1.0.10), with the same contract covered unconditionally by a companiontest. It is not a failure. See the deviation note below.
Conflicts resolved (detail in
DONE-NOTE.md§1–§2)clear()(ours:_reset_hybrid_meter_state()from feat: token_meter "hybrid" -- provider-anchored counts with provenance (+ the never-run estimate-vs-hybrid-vs-actual measurement) #22; theirs: the per-toolname map + spill memo resets — diff3 base empty, both kept) and the
DONE-NOTE.mdadd/add against fix: protected_tool_results=0 must protect ZERO tool results, not all of them #23's note.DONE-NOTE.mdis now explicitly a shared, append-only file with aconvention header and an index table. Both lanes' notes are kept verbatim under
their original headings. Future add/add conflicts resolve by appending.
__init__.py, 1 inREADME.md), every oneadditive-vs-additive. Resolution was mechanical and checked: the diff3 base
section was asserted empty for each hunk before emitting ours-then-theirs.
git diff origin/main..pr24= 1,062 insertions, 0 deletions — proof therebase re-applied feat: replay_last_user_on_compaction -- opt-in last-user replay at the tail #24 without displacing anything already on
main.Defaults verified to coexist on merged
mainreplay_last_user_on_compaction=False·token_meter=TOKEN_METER_ESTIMATE·tool_result_budget_tokens=None·compaction_strategy=COMPACTION_STRATEGY_PROGRESSIVE.Deviation, recorded not smoothed
The brief said #24 was "124/125 — find and fix the one failure". Measured on its
pre-rebase branch: 124 passed, 1 skipped — pass/skip, never pass/fail. There
was no failing test at any point. Making the skip run would require adding a
dependency this repo pins against, which is a dependency change, not a test fix.
model_performance-57pThe merge-queue blocker is cleared — the treatment is on
main, default-off.57p's own blocker (S7 existing and demonstrably discriminating) is unchanged
by this lane. Two things the eval lane must redo because
mainmoved: therecorded T0 sha256 is stale (re-baseline against
3972070), and #21's five newdefault-no-op knobs must also be held at defaults for one-variable discipline.
Spend
$0.00. No API calls, no eval runs, no DTU, no infrastructure created or
registered. All local
git/pytest/gh.