Skip to content

[scanner] v5→v6 forward-merge (v6-topup) failing: 109 conflicts incl. the pkg/agent→crux/agent rename #14340

Closed

Description

@hivecommons-hive

What is failing

.github/workflows/v6-topup.yml (the v5 → v6 forward-merge) has failed on every run since at least 2026-10-26T01:06Z — five consecutive failures, the latest https://github.com/hivecommons/hive/actions/runs/40262307988 (job 121377094747). The merge of origin/v5 into origin/v6 stops with 109 conflicting files: 82 content, 17 file-location, 9 add/add, 1 modify/delete. Nothing is pushed (by design — the workflow says "CONFLICTS ARE A HUMAN SIGNAL, NOT A RETRY", #7199 precedent). No sync/v5-to-v6 branch exists.

v6 is now 187 commits behind v5 (and 1,100 ahead), so every v5 fix since the last successful top-up is missing from edge builds.

Where the conflicts are

area files
src/pkg/github 15
src/cmd/hive (boot/launch deps, main.go, hookwire, self-upgrade drain) 12
src/pkg/dashboard 11
src/pkg/agent → src/crux/agent (directory renamed on v5; v6 added files in the old location) 11 + 5
src/pkg/fleetreport, src/pkg/crux, src/pkg/config 4 each
src/pkg/scheduler, src/internal/testutil 3 each
workflows (coverage-hourly.yml, v2-tests.yml), bin/contributor-*, docs/backend-setup.md, changelog.d add/adds, src/scripts/generate-notice.sh rest

The 17 file-location conflicts are v6-only files added under src/pkg/agent/ (advisor_hook, advisor_omp, headless_credentials, authprobe_omp_test, …) that need to move to src/crux/agent/ to follow the v5 rename.

Visible fallout

Hosted spokes on edge (v6 @ a08007f) self-report WARNs that v5 already classifies as benign or known classes — [selfreport] unclassified_error_repeated: ioscan fail-closed blocked kick (#14336; fixed on v5 by #14275) and … copilot CLI substituted the configured model (#14337; fixed on v5 by #14048). Those issues are closed as already-fixed-on-v5 pointing here; more of the same will appear until v6 catches up.

Decision needed

Risk: governance — the repository's own workflow reserves a conflicting forward-merge for a human decision (#7199).

  • A — a maintainer resolves by hand per the workflow's recipe (git checkout -B sync/v5-to-v6 origin/v6 && git merge --no-ff --signoff origin/v5, resolve, PR against v6, merge-commit not squash).
  • B — authorize a hive agent to carry the hand-resolution in a hold-gated sync/v5-to-v6 PR (merge commit, --signoff), with the src/pkg/agent → src/crux/agent moves applied and CI as the verdict; a maintainer reviews before the hold is lifted. Note the v2-ci per-package coverage floors have bitten v5→v6 unions before (🌱 Forward-merge v5 into v6 (27 commits, hand-resolved) #8854, 🌱 Forward-merge v5 into v6 (19 commits, hand-resolved) #8886).
  • C — do it in stages: first a sync PR up to the v5 commit just before the pkg/agent → crux/agent rename, then a second for the rename and what follows, to keep each review tractable (hive can carry either or both under the same hold).

Recommendation: C carried by the hive under hold (B's safeguards), since 109 conflicts in one review is where hand resolutions go wrong.

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

Affected hives (2):

Activity

  1. added
    kind/bugCategorizes issue or PR as related to a bug.
    agent/scannerCreated or modified by the scanner agent
    ciApproved by a Hive merger/owner for auto-merge on green CI
    stage/045-needs-decisionIssue parked on a person: needs-human or a maintainer decision is owed before the hive picks it up
    on Oct 26, 2026
  2. added
    help wantedDenotes an issue that needs help from a contributor. Must meet "help wanted" guidelines.
    on Oct 26, 2026
  3. hivecommons-hive commented on Oct 26, 2026

    @hivecommons-hive
    ContributorAuthor

    What to reply

    • /hive approve: go with the recommendation
    • /hive decision <your instructions>: go ahead, following your instructions
    • /hive help: show these again

    If what this issue waited on has been done (a merged fix, or an action taken outside this repository), a maintainer can reply /fixed to close it as completed; Hive clears its park labels.

    Only a maintainer with write access can un-park; everything else is ignored. Full command reference: https://github.com/hivecommons/hive/blob/v5/src/docs/maintainer-commands.md.

  4. hivecommons-hive commented on Oct 26, 2026

    @hivecommons-hive
    ContributorAuthor

    Also seen on hosted-available-oke-11-placeholder-r05x (v5.186.4-570-g6650e7931, —) at 2026-10-26T04:03:43Z — class ioscan_classifier_unavailable, 1 in 28s

    ioscan fail-closed blocked kick

    Diagnostics (scrubbed)
    WARN agent=telemetry
    
  5. hivecommons-hive commented on Oct 26, 2026

    @hivecommons-hive
    ContributorAuthor

    Cleared on hosted-available-oke-11-placeholder-r05x (v5.186.4-570-g6650e7931) at 2026-10-26T04:24:08Z — the condition is no longer observed there. Leaving the issue open for a human to confirm the fix.

  6. hivecommons-hive commented on Oct 26, 2026

    @hivecommons-hive
    ContributorAuthor

    Cleared on hosted-available-oke-11-placeholder-r05x (v5.186.4-570-g6650e7931) at 2026-10-26T05:25:13Z — the condition is no longer observed there. Leaving the issue open for a human to confirm the fix.

  7. hivecommons-hive commented on Oct 26, 2026

    @hivecommons-hive
    ContributorAuthor

    Also seen on hosted-available-oke-11-placeholder-r05x (v5.186.4-570-g6650e7931, —) at 2026-10-26T14:37:30Z — class unclassified_error_repeated, 5 in 10m0s

    pr-request watcher: request failed, will retry with backoff

    Diagnostics (scrubbed)
    WARN repo=hivecommons/hotshot head=ops/runbook-informational-events error=creating PR hivecommons/hotshot ops/runbook-informational-events->main: external effect needs reconciliation before retry: op:58c4a745f13e0cb26373b34af1975a487270933fdc9b50afc1af204db26db19a is Unknown: operation must be reconciled against authoritative external state before retry
    
  8. hivecommons-hive commented on Oct 26, 2026

    @hivecommons-hive
    ContributorAuthor

    Cleared on hosted-available-oke-11-placeholder-r05x (v5.186.4-570-g6650e7931) at 2026-10-26T14:43:55Z — the condition is no longer observed there. Leaving the issue open for a human to confirm the fix.

  9. hivecommons-hive commented on Oct 26, 2026

    @hivecommons-hive
    ContributorAuthor

    Also seen on hosted-available-oke-11-placeholder-r05x (v5.186.4-588-ga37b7f270, —) at 2026-10-26T17:19:26Z — class ioscan_classifier_unavailable, 2 in 2m49s

    ioscan fail-closed blocked kick

    Diagnostics (scrubbed)
    WARN agent=ci-maintainer
    
  10. hivecommons-hive commented on Oct 26, 2026

    @hivecommons-hive
    ContributorAuthor

    Also seen on hosted-available-oke-11-placeholder-r05x (v5.186.4-588-ga37b7f270, —) at 2026-10-26T17:19:32Z — class ioscan_classifier_unavailable, 1 in 2m50s

    ioscan classifier failed closed; text withheld

    Diagnostics (scrubbed)
    WARN error=ioscan classifier: no model endpoint resolved fix=configure governor.trajectory/litellm for the ioscan model endpoint, or set ioscan.classifier.enabled: false or ioscan.classifier.fail_mode: open
    
  11. clubanderson commented on Oct 26, 2026

    @clubanderson
    Member

    /hive decision Option C, carried by the hive under hold — v6 is live (commits landed today: #14358, #14354), not abandoned, so the forward-merge proceeds. Verified in a scratch clone: v6 is 196 behind / 1102 ahead of v5; git merge --no-ff origin/v5 yields 112 conflicted files, the largest buckets being src/crux/agent (16 — git already follows the pkg/agent→crux/agent rename, so the v6-only files land there as location conflicts), src/cmd/hive (12), src/docs (11), src/pkg/dashboard (10), src/pkg/github/automerge (9); -X find-renames=30% only drops it to 111, so rename tuning is not the lever. Plan: hive-authored sync/v5-to-v6 PR(s) against v6 in slices — (1) first slice up to the v5 commit just before the pkg/agent→crux/agent rename (or git rebase --onto the v6-only src/pkg/agent/* additions over the rename so they are born in src/crux/agent/), then the rename and what follows; (2) within each slice land the mechanical conflicts (file moves, add/add changelog.d fragments, workflow/doc text) first and logic conflicts (cmd/hive boot/self-upgrade drain, pkg/github, dashboard, scheduler) second, as separate commits so review is tractable. Every commit --signoff; merge commit not squash; run the full v2-ci per-package coverage gate (floors in .github/workflows/v2-ci.yml) on every touched package before opening — #8854/#8886 are the precedent for union-induced floor misses. Hold stays on the PR until a maintainer reviews.

  12. 10 remaining items

  13. hivecommons-hive commented on Oct 26, 2026

    @hivecommons-hive
    ContributorAuthor

    Starting Option C: slice 1 opened as #14399 (hold). Slice 2 (the crux rename and after) follows once slice 1 merges.


    🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: unknown

    — hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

  14. hivecommons-hive commented on Oct 26, 2026

    @hivecommons-hive
    ContributorAuthor

    PR #14399 covers this issue: #14399

    GitHub only shows its linked-PR icon for closing-keyword PRs that target the repository default branch; this PR targets v6, so Hive cannot make GitHub display that icon for this issue.

  15. hivecommons-hive commented on Oct 26, 2026

    @hivecommons-hive
    ContributorAuthor

    🔓 Claim by agent scanner released (holding agent relaunched).

  16. hivecommons-hive commented on Oct 27, 2026

    @hivecommons-hive
    ContributorAuthor

    Also seen on hosted-available-oke-08-placeholder-xf07 (v5.186.4-1494-gfcf0e7887, —) at 2026-10-27T06:17:27Z — class unclassified_error_repeated, 9 in 10m0s

    review-request watcher: DENIED (policy)

    Diagnostics (scrubbed)
    WARN start=5c8bedb8 agent=supervisor repo=hivecommons/spektacular number=105 reason=agent "supervisor" may not review PRs at this ACMM level (mode ADVISORY) and does not have the `converse` capability
    
  17. hivecommons-hive commented on Oct 27, 2026

    @hivecommons-hive
    ContributorAuthor

    Cleared on hosted-available-oke-08-placeholder-xf07 (v5.186.4-1494-gfcf0e7887) at 2026-10-27T06:27:49Z — the condition is no longer observed there. Leaving the issue open for a human to confirm the fix.

  18. added a commit that references this issue on Oct 27, 2026
    9469572
  19. added a commit that references this issue on Oct 27, 2026
  20. github-actions commented on Oct 27, 2026

    @github-actions
    Contributor

    Closed by #14399 (merged to v6).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    agent/scannerCreated or modified by the scanner agentciApproved by a Hive merger/owner for auto-merge on green CIhelp wantedDenotes an issue that needs help from a contributor. Must meet "help wanted" guidelines.hive/selfreportCreated by Hive for agent-filed issue provenancekind/bugCategorizes issue or PR as related to a bug.triage/acceptedIndicates an issue or PR is ready to be actively worked on.

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions