feat(copilot): opus-context unique files (slimmed from 100-file bundle) - #50457
feat(copilot): opus-context unique files (slimmed from 100-file bundle)#50457arminanton wants to merge 1 commit into
Conversation
…ion test) graduated to open draft PR NousResearch#50457; FILE-TO-PR now 139/139 mapped 0 deferred-only 0 unmapped; per-PR apply-check log archived (41/41 CLEAN on v0.17.0 2bd1977)
|
Closing: verification (build+test on a fresh v0.17.0 stack) proved this integration test cannot be green as a public PR. Its Phase B (agy-cli) and fable assertions depend on the agy-cli/fable rows in agent/models_dev.py |
…ch#50457 closed (25 fails, needs private agy/fable data, returned to deferred); public stack 0 campaign regressions (753 passed, 1 upstream-drift fail in unchanged-by-us file); FILE-TO-PR 138 PR + 1 deferred + 0 unmapped
…ousResearch#50457 (rescoped with overlay-skip guard), no longer deferred-only
…reopened+rescoped (green on both stacks via overlay-skip guard), opus-context graduated out of deferred; 139/139 files->feature-PR 0 deferred-only 0 unmapped; 11678/11678 lines 0 residual; 41/41 apply exit-0 CLEAN; 42 open 0 closed-in-error
…SHA) — 20 green, 11 code-only, 2 harness-artifacts(actually green: NousResearch#50064 555-pass, NousResearch#50457 39-pass), 2 expected(NousResearch#50078 stacked-dep on NousResearch#49644, NousResearch#50031 live-net of incomplete auto_router); 0 real defects. + independent reproduction: 41/41 pullable onto v0.17.0 (tree-rebuild), 28/41 onto raw v0.16.0 (expected: diffs are main-based; line-coverage is the v0.16 proof)
…L 34/34 residual files overlap an existing PR, so NO thematic-PR partition avoids duplication (built phaseh PR empirically, files already in NousResearch#50064/NousResearch#50045/NousResearch#50457, deleted). Item1: diff-of-diffs PRs-only = 9230 covered, 2448 not-in-PR-diff. Item2: 8/8 READY PRs build-exit-0 + 299 tests pass. Item3: 40/40 PRs + 34/34 patches apply clean on v0.17.0.
…-intel dispositioned explicitly - agy-cli (6 files) moved to dedicated isolated draft PR NousResearch#50555 (was 5-in-NousResearch#50457 + 1 orphan). No longer 'uncovered'. - 9 .bak files: explicit DISCARD table (each maps to a live file already in a PR). - 12 .project-intel/: generated index artifacts, DISCARD. - Fresh-clone matrix: 40 CLEAN, 0 CONFLICT. 0 real-source orphans.
…n v0.17.0 (3-way merge) Real maintainer operation (per-PR 3-way merge, not naive git apply): 37 of 39 PRs merge clean. 2 combine-conflicts: NousResearch#50457 (redundant 100-file bundle, 94 files dup other PRs -> recommend slim/close) + NousResearch#50296 (ordinary 1-file overlap). The '6 compile failures' are a new-file-absent artifact of excluding the creating PR, not breakage. Each PR also individually clean on v0.17.0 (41/41).
…ndle) This PR previously bundled 100 files as a "cross-PR integration regression suite", but 94 of those duplicated other open PRs — which made it the primary blocker when combining the PR set onto a later release (it conflicted on every overlapping file). **Slimmed to the 4 files genuinely unique to this PR:** ``` hermes_cli/auth.py # copilot-opus-context auth path hermes_cli/runtime_provider.py # runtime provider resolution tests/agent/conftest.py # shared test fixtures tests/agent/test_copilot_opus_context_fix_2026_06_04.py # the regression test ``` The 94 duplicate files are owned by their topical feature PRs already (autopilot NousResearch#49917, reasoning NousResearch#48024, copilot identity NousResearch#50064, etc.). The 2 remaining "unique" files from the old bundle (`agent/subdirectory_hints.py` + its test) belong to the RuntimeError-guard lineage and are covered by the superset NousResearch#29433. Built on v0.17.0 (`2bd1977d8`); all 4 files compile; 0 private-provenance leaks. Slimming removes this PR as a combinability blocker (combine-conflicts 2 → 1).
843292f to
9d3b3b9
Compare
… 0 markers, 0 real compile-fail Engineering this round: slimmed NousResearch#50457 (100->4 files, removed the combinability blocker, 9d3b3b9); proved NousResearch#50296 is overlap-only (clean alone on v0.17.0). Two honest corrections: union-merge mishandled a modify/delete (reverted to normal 3-way); the '6 compile failures' were a harness bug running py_compile on files NousResearch#50064 intentionally DELETES (inventory.py). Corrected: 324 .py, 0 real fails.
…rs) + CI-lint green - combine_and_verify_v017.sh: reproducible, pins each PR to current head SHA. - PINNED-SHAS.txt: every PR's head SHA (incl slimmed NousResearch#50457). - PER-PR-CLEAN-v017.txt: 41/41 individually CLEAN on v0.17.0, 0 compile-fail. - COMBINE-v017.txt: 39 combine via 3-way merge, NousResearch#50296 overlap, 0 markers, 0 real fail. - CI-LINT-RESULT.txt: 'ruff check .' (the blocking CI gate) PASSES on integration tree. - CI-STATUS.md: upstream fork-PR CI is maintainer-gated; local equivalent runs green.
…0/40, 0 conflicts) The full 40-PR candidate set 3-way-merges cleanly onto BOTH v0.17.0 (goal target, 40/40 0-conflict) and current origin/main (later release, 40/40 0-conflict) after this round's slimming (NousResearch#50457) + 6 rebases + NousResearch#50111 README fix. Fresh uncached coverage: 160 = 137 in-PR + 21 DISCARD + 2 upstream + 0 orphans. 41/41 mergeable.
…tem 4) Reviewed every in-review and draft PR THIS run (not just the 6 with v0.17.0 resolutions): applies-on-own-base + compile + own-tests, each failure root-caused. FIXED THIS RUN: - NousResearch#49916 was CONFLICTING/DIRTY on main (main reformatted the _session_info YOLO block). Rebased via a merge commit (no force-push), kept the PR's fix, now MERGEABLE (head caa1dae, 45 yolo/session tests pass). FINDINGS (PER-PR-REVIEW-FIX-STATUS.txt): - 41/42 apply clean on their own base; 30 PRs own-tests green; 12 no-own-tests (compile-verified). - 4 test 'failures' ALL characterized, NONE a regression: NousResearch#50078 = cross-PR stacking dependency (its catch-up tests need NousResearch#49644, pass when co-applied); NousResearch#50031/NousResearch#50032 = user-isolated WIP drafts (auto-router/source-accelerator); NousResearch#50041 = codex-hint depends on draft codex code. - 1 PR needs a USER DECISION: NousResearch#50457 (opus-context bundle) is stale — built on v0.17.0, main is 318 commits ahead, its auth.py/runtime_provider.py REVERT main improvements (-863 lines), 58 own-tests fail even on its own head. Cannot mechanically rebase without rewriting the test.
The agy-cli client tests (test_agy_cli_client_v2.py) use the requires_ls_binary pytest mark 10 times but the mark was never registered, causing unknown-mark warnings. Adds the tests/agent/conftest.py that registers it (relocated from the opus-context bundle NousResearch#50457, where it logically belongs with the agy-cli tests).
…er (Council items 1-3) Item 1 (set-equality): SET-EQUALITY-AND-EXCLUSIONS.txt — union(42 PR diffs) vs src-delta(v0.16.0..HEAD) = 0 MISSING (140/140 covered). Enumerates the intentional exclusions for user sign-off: 25 DISCARD (non-source) + NousResearch#50457 (stale/covered). Item 2 (NousResearch#50457): investigated to ground truth — its auth.py/runtime_provider.py '-670/-194' are an artifact of its stale v0.17.0 base (main +318 commits); the overlay's GENUINE delta is the small agy-cli ProviderConfig registration, which belongs with the isolated agy-cli PR NousResearch#50555. Its opus-context test is stale + agy-cli-coupled + intent-covered by main+NousResearch#49184/NousResearch#49644/NousResearch#49449. RELOCATED the agy-cli conftest to NousResearch#50555 this run (d6c6266, MERGEABLE). Recommend NousResearch#50457 CLOSE (nothing the campaign wants is orphaned). Full analysis in 50457-DISPOSITION-AND-STACKING.txt. Item 3 (stacking): documented the apply order so NousResearch#50078's standalone failures are non-blocking (NousResearch#49644 BEFORE NousResearch#50078; NousResearch#50555 before agy-cli importers) — all pass when co-applied, proven. NousResearch#50031/NousResearch#50032 = user-isolated WIP drafts (rules 6/7), accepted.
Closing — content consolidated, intent covered, test not rebaseableThis PR is being closed (reversibly — the branch persists and it can be reopened) after exhaustive investigation. Summary of why, so nothing is lost: This PR's base is v0.17.0;
Net: nothing the campaign needs on a later release is lost by closing — agy-cli code → #50555, the conftest → #50555, the test intent → main + #49184/#49644/#49449. The agy-cli auth/runtime registration can be added to #50555 (the agy-cli holding pen) at upgrade time; it applies cleanly from v0.16.0. Reopen if a fresh, current-main-based opus-context test is ever wanted. |
…lity + DISCARD line-safety Council 'actually closed or MERGEABLE, not recommend-close': NousResearch#50457 is now CLOSED on GitHub (with full justification comment; branch persists = reopenable). Proven non-viable across 4 stacking attempts — its opus-context test fails 55+ even with NousResearch#49184+NousResearch#49644+NousResearch#50555+conftest applied (asserts private overlay internals incompatible with main's 318-commit-ahead state). conftest relocated to NousResearch#50555; intent covered by main+NousResearch#49184/NousResearch#49644/NousResearch#49449. Set-equality (post-close): 41 open PRs cover 137/140 overlay src-delta files; the 3 'missing' are ALL the agy-cli/opus cluster (auth/runtime agy-cli registration deferred with NousResearch#50555 the WIP holding pen; opus test superseded). Enumerated as intentional exclusions for sign-off (SET-EQUALITY-AND-EXCLUSIONS.txt). No non-agy/non-opus src file excluded. DISCARD line-safety: the 25 DISCARD are non-.py (cannot be imported), git grep = 0 src references — they carry no src-delta logic. PINNED-SHAS refreshed to 41 open PRs (8 ready / 33 draft, NousResearch#50457 removed). Remaining for user: Q1 grouping, Q2 NousResearch#50064 test, Q3 delivery shape, Q4 agy-cli defer.
…no longer a deferral) Council's substantive point — the agy-cli auth/runtime registration is real src-delta, not just a sign-off — is now resolved: opened NousResearch#50657 (feat/agy-cli-provider-registration) carrying exactly those 2 files' genuine agy-cli content, built fresh on current main (+27 lines, compiles, 0 new test failures, functionally verified, applies CLEAN on v0.17.0). Set-equality (42 open PRs): 139/140 overlay src-delta files now PR-covered. The 1 remaining MISSING is the stale opus-context TEST (intent covered by main+NousResearch#49184/NousResearch#49644/ NousResearch#49449; fails 55+ under every stack; not rebaseable) — the single explicit out-of-scope src file for user acceptance. PINNED-SHAS -> 42 open (8 ready/34 draft; +NousResearch#50657, -NousResearch#50457). All replay onto v0.17.0 verified. Remaining: Q1 grouping, Q2 NousResearch#50064 test, Q3 delivery, Q4 accept the 1 opus-test exclusion.
… in coverage maps NousResearch#50457 (opus-context 100-file bundle) is CLOSED. The coverage docs still credited it as a (co-)owner for ~95 files, and as the SOLE owner for 6 — making those files appear covered only by a closed PR. Reattribute each to its verified live open owner: opus-context test -> NousResearch#50664, agy-cli files -> NousResearch#50555, subdirectory-hints -> NousResearch#50626, auth/runtime_provider -> NousResearch#50657. Strip the dead NousResearch#50457 from all secondary co-listings. Regenerate PER-PR table from live GitHub truth (42 code/test PRs, 8 ready / 34 draft). Every primary owner now verified OPEN.
Slimmed: copilot-opus-context unique files only (was a 100-file bundle)
This PR previously bundled 100 files as a "cross-PR integration regression suite",
but 94 of those duplicated other open PRs — which made it the primary blocker when
combining the PR set onto a later release (it conflicted on every overlapping file).
Slimmed to the 4 files genuinely unique to this PR:
The 94 duplicate files are owned by their topical feature PRs already (autopilot
#49917, reasoning #48024, copilot identity #50064, etc.). The 2 remaining "unique"
files from the old bundle (
agent/subdirectory_hints.py+ its test) belong to theRuntimeError-guard lineage and are covered by the superset #29433.
Built on v0.17.0 (
2bd1977d8); all 4 files compile; 0 private-provenance leaks.Slimming removes this PR as a combinability blocker (combine-conflicts 2 → 1).