Skip to content

feat(copilot): opus-context unique files (slimmed from 100-file bundle) - #50457

Closed
arminanton wants to merge 1 commit into
NousResearch:mainfrom
arminanton:tests/copilot-opus-context-integration
Closed

feat(copilot): opus-context unique files (slimmed from 100-file bundle)#50457
arminanton wants to merge 1 commit into
NousResearch:mainfrom
arminanton:tests/copilot-opus-context-integration

Conversation

@arminanton

@arminanton arminanton commented Jun 21, 2026

Copy link
Copy Markdown
Contributor

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:

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
#49917, reasoning #48024, copilot identity #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 #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).

arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 21, 2026
…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)
@alt-glitch alt-glitch added type/test Test coverage or test infrastructure P3 Low — cosmetic, nice to have comp/agent Core agent runtime: loop, agent_init, prompt builder, context-compression, responses endpoint provider/copilot GitHub Copilot (ACP + Chat) labels Jun 21, 2026
@arminanton

Copy link
Copy Markdown
Contributor Author

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 _PROBE_VERIFIED_OVERRIDES, which are account-specific/private and deliberately NOT in any public PR (per project policy). On the public PR stack 25 of its tests fail (get_model_info('agy-cli',...) returns None); on the full tree (with the private data) all 64 pass. It therefore correctly belongs in the deferred private set (#50111), not a standalone public PR. Returning it there. This was caught by actually running the suite on the stacked tree rather than trusting git apply --check.

@arminanton arminanton closed this Jun 21, 2026
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 21, 2026
…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
@arminanton arminanton reopened this Jun 21, 2026
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 21, 2026
…ousResearch#50457 (rescoped with overlay-skip guard), no longer deferred-only
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 21, 2026
…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
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 21, 2026
…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)
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 22, 2026
…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.
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 22, 2026
…-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.
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 22, 2026
…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).
@arminanton arminanton changed the title test(copilot): cross-PR opus-context integration regression suite feat(copilot): opus-context unique files (slimmed from 100-file bundle) Jun 22, 2026
@arminanton
arminanton force-pushed the tests/copilot-opus-context-integration branch from 843292f to 9d3b3b9 Compare June 22, 2026 03:47
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 22, 2026
… 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.
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 22, 2026
…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.
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 22, 2026
…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.
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 22, 2026
…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.
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 22, 2026
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).
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 22, 2026
…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.
@arminanton

Copy link
Copy Markdown
Contributor Author

Closing — content consolidated, intent covered, test not rebaseable

This 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; main is now 318 commits ahead. That staleness makes its diff misleading and its content non-viable as-is:

  1. hermes_cli/auth.py (−670) and hermes_cli/runtime_provider.py (−194) are not genuine deletions — they are an artifact of diffing this PR's stale tree against current main. Landing them would revert main's auth improvements (env_int / _get_secret / profile-scoped helpers). The overlay's genuine change to these files vs v0.16.0 is small: the agy-cli ProviderConfig registration, which belongs with the isolated agy-cli PR (feat(provider): isolated agy-cli provider (WIP, draft — not for merge) #50555), not here.

  2. tests/agent/conftest.py (the requires_ls_binary mark for agy-cli tests) has been relocated to feat(provider): isolated agy-cli provider (WIP, draft — not for merge) #50555 (commit on feat/agy-cli-provider-isolated), where the agy-cli tests that need it actually live. So that piece is preserved.

  3. tests/agent/test_copilot_opus_context_fix_2026_06_04.py asserts the private overlay's exact copilot routing / effort-clamp / mythos-alias internals. It fails 55+ tests on every combination of current main + the relevant open PRs (fix(copilot): route Claude on Copilot to /v1/messages instead of /chat/completions #49184 + feat(reasoning): accept "max" reasoning effort end-to-end with nearest-down clamp #49644 + feat(provider): isolated agy-cli provider (WIP, draft — not for merge) #50555 were all applied and it still failed), because it tests overlay-specific values that the public PRs deliver differently. Its intent — verify copilot-claude → /v1/messages routing + effort clamps — is already delivered by:

    Making it pass would require rewriting its assertions against current main (inventing new test code), which is out of scope for a faithful re-application PR.

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.

@arminanton arminanton closed this Jun 22, 2026
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 22, 2026
…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.
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 22, 2026
…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.
arminanton added a commit to arminanton/hermes-agent that referenced this pull request Jun 22, 2026
… 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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp/agent Core agent runtime: loop, agent_init, prompt builder, context-compression, responses endpoint P3 Low — cosmetic, nice to have provider/copilot GitHub Copilot (ACP + Chat) type/test Test coverage or test infrastructure

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants