revert: unproven default-off features per merge policy (wins only) - #30
Merged
Conversation
…was never sent (#jnt) (#28)" This reverts commit 5cdbc62253ca80cb93f11a2fa6f7a5d3940394c78. Not in the owner's literal revert list (#20-27), but merged AFTER #27 and exists solely to fix a bug in the summary_call_mode="fork" code path that #27 introduced. Once #27 (the fork feature itself) is reverted next, this fix has no surviving target -- keeping it would leave dead code / an orphaned test file referencing a feature no longer on main. Reverting it first, before #27, keeps the revert of #27 itself clean.
…on call (#27)" This reverts commit a877b36. Merge policy: main carries wins only. summary_call_mode's fork mode was shipped with benefit explicitly labeled unmeasured (see the original merge note: "benefit correctly labeled unmeasured"). Unproven default-off feature -- belongs on a branch for evaluation, not on main.
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.
Policy
Owner-approved merge policy: main carries wins only -- bug fixes with fail-before tests, or
features whose eval PROVED a win. Unproven default-off features live on branches/draft PRs, not
main. This PR reverts six merged features that shipped without a proven win (several explicitly
measured as not a win), while keeping the one proven fix and the one enabling infra change.
Reverted (newest to oldest; each is a standalone
git revert -m 1)fix: _capture_fork_prefix no longer forks onto an array that was never sent-- notin the original revert list, but merged after feat: summary_call_mode -- cache-safe fork of the summarization call (#7k2) #27 and exists solely to fix a bug in the
summary_call_mode="fork"code path feat: summary_call_mode -- cache-safe fork of the summarization call (#7k2) #27 introduced. Once feat: summary_call_mode -- cache-safe fork of the summarization call (#7k2) #27 is reverted there is no survivingtarget for this fix (it would be dead code / an orphaned test file referencing a feature no
longer on main), so it is reverted first, ahead of feat: summary_call_mode -- cache-safe fork of the summarization call (#7k2) #27, to keep feat: summary_call_mode -- cache-safe fork of the summarization call (#7k2) #27's own revert clean.
feat: summary_call_mode -- cache-safe fork of the summarization call-- merged withbenefit explicitly labeled unmeasured ("benefit correctly labeled unmeasured" in the
original merge note).
feat: clear_at_least -- a worth-the-rebuild predicate in front of compaction--falsified: no threshold passes; it cuts boundaries by killing turns rather than helping.
feat: replay_last_user_on_compaction-- opt-in, unproven.feat: token_meter "hybrid"-- its own estimate-vs-hybrid-vs-actual measurement wasnever run.
feat: tool-result budget (token-denominated, head+tail, per-tool) + spill-to-disk--unproven, all-defaults-no-op.
feat: compaction_strategy "summary"-- measured +83% run cost, summarizer shareonly 26-35% of that cost (i.e. the regression isn't even mostly the summarizer call itself);
gate was not met.
Kept
fix: protected_tool_results=0 must protect ZERO tool results, not all of them-- realbug fix (inverted-knob-meaning bug at exactly one value), with its own test
(
tests/test_protected_tool_results.py). Verified byte-identical:diff <(git show e9a1697:README.md) README.mdand the equivalent for theprotected_tool_resultsfunction in
__init__.pyare both empty after the reverts.feat: real-usage token meter (token_meter: "actual")-- needed for the provencompact-late result; kept in its original, unmodified form (
README.md/DONE-NOTE.mddiffedbyte-identical against this PR's HEAD).
Feature branches preserved for later evaluation
The reverted work is not deleted -- it remains evaluable on its original lane branches:
lane/pmt-fork-span-predicate(open PR feat: span-size predicate in front of the summarizer fork (summary_fork_min_span_ratio / summary_call_mode: auto) #29, builds on feat: summary_call_mode -- cache-safe fork of the summarization call (#7k2) #27/fix: _capture_fork_prefix no longer forks onto an array that was never sent (#jnt) #28 -- left untouched; note it willneed to be rebased onto this revert or evaluated standalone once feat: summary_call_mode -- cache-safe fork of the summarization call (#7k2) #27/fix: _capture_fork_prefix no longer forks onto an array that was never sent (#jnt) #28 are off main)
lane/7k2-summary-call-fork(feat: summary_call_mode -- cache-safe fork of the summarization call (#7k2) #27)lane/jnt-fork-prefix-capture(fix: _capture_fork_prefix no longer forks onto an array that was never sent (#jnt) #28)lane/2o9-clear-at-least(feat: clear_at_least -- a worth-the-rebuild predicate in front of compaction (#2o9) #26)lane/l8-replay-last-user(feat: replay_last_user_on_compaction -- opt-in last-user replay at the tail #24)lane/q69-token-meter-hybrid(feat: token_meter "hybrid" -- provider-anchored counts with provenance (+ the never-run estimate-vs-hybrid-vs-actual measurement) #22)lane/x1r-tool-result-budget(feat: tool-result budget (token-denominated, head+tail, per-tool) + spill-to-disk -- all defaults no-op #21)feat/summary-compaction-strategy(feat: compaction_strategy "summary" — LLM rolling-summary compaction (opt-in) #20)Test result
Full suite green on the revert branch: 87 passed (
uv run pytest -q),ruff check .clean.(Baseline before any revert on this branch: 286 passed, 1 skipped -- matches #28's own merge note.)