Skip to content

PR #3827 needs rebase - 4 of 8 hunks rejected due to conflicts #3887

Description

@knoal

Problem

PR #3827 (fix: load full history when compacting a limited session) has apply conflicts on 4 of 8 hunks. The PR needs to be rebased against current main.

Additionally:

  • Failing-first regression test does not actually exercise the bug it claims to fix
  • P1 (Full history loaded on compact) is overstated
  • The diff has a duplicated test name

Impact

  • PR cannot merge cleanly until rebased
  • The substantive change may or may not be present in the diff after rebase
  • The test methodology violates failing-first principles

What was audited

MCE audit Toaiagents3827 (2026-07-19) caught 3 HIGH attacks:

  1. The 'failing-first' regression test does not actually exercise the bug it claims to fix
  2. P1 (p=0.85, 'Full history loaded on compact') is overstated
  3. The diff has a duplicated test name

The apply step in the MCE pipeline rejected 4 of 8 hunks due to conflicts.

Recommended fix

  1. The author (winklemad) should rebase the branch against current main
  2. After rebase, verify all 8 hunks apply cleanly
  3. Fix the duplicated test name
  4. Write a test that actually exercises the failing scenario

Cross-references

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions