Repository navigation
π± Forward-merge v5 into v6 (100 commits) - #17265
Conversation
β¦es it before each kick (#17099) Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
β¦ng (#17086) * β¨ agents: drain CLI memory into draft knowledge entries before clearing Adds agents.cli_memory.drain_to_knowledge (default false, per-agent override). Before every non-resume kick, and before clear_on_kick wipes the store, the manager lists the agent's own CLI memory stores (Claude ~/.claude/projects/*/memory, Codex $CODEX_HOME/memories*, Gemini ~/.gemini/GEMINI.md) and the hive converts each bullet or paragraph into a state: draft entry in the bead-synth vault the Primer already reads, with source: cli-memory, agent:, cli:, repo: (from the Claude project slug when it matches one of the agent's repos) and a SHA-256 memhash that makes repeated drains idempotent across states and file names. Drafts are never promoted automatically; the approved-only Primer default keeps them out of kicks until a human approves them. The parser and vault writer live in pkg/knowledge/climemory (root module); the Crux manager only collects sources and calls the drainer installed via crux.CLIMemoryDrainHost, so the Crux module imports no knowledge package. One log line per drain: cli-memory: drained N facts from <agent> into <store> (dupes K). Proposed by @gregoryhunt at the 2026-11-05 community meeting. Fixes #17033 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π± climemory: edge-case tests for drain caps, unreadable stores, frontmatter hash scan and parser structure Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π climemory: nil Drainer returned no-target error without dereferencing; boot drain installer tests Drain built Result{Store: d.Dir} before the nil-receiver guard, so the nil-drainer edge test panicked in CI (test rest 3/4). Return the error result first. Add cmd/hive tests for cliMemoryDrainEnabled and installCLIMemoryDrainer: vault connected without bead stores, drainer installed on a hosted runtime and writes a draft entry with repo/agent tags, dedupes on second drain, and the stand-down paths (disabled, sidecar-like runtime, no knowledge API, unmkdirable vault path). Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦w tile font override (#17116) * π dashboard: phone layout for merged banners and toasts; drop Overview tile font override Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π dashboard: lift the phone banner helpers into the merge-banner countdown node test Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦ writes to (#17097) * π agent(bob): preflight probes the per-agent ~/.bob that bob actually writes to Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * agent(bob): keep manager.go at its file-size ratchet baseline Move bobStateHome into bob_settings.go beside the other bob helpers so crux-file-size-ratchet stays green. Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * π agent(bob): judge agent-owned ~/.bob by owner bits in the state-dir probe The per-agent ~/.bob is created by bob itself as the agent UID (mkdirSync 0755/0700) and no permissions-watcher root widens it, so testing it for group w+x flagged it as unwritable on every launch after first run. When the stat Uid matches the agent uid, consult the owner bits instead; otherwise keep the group test for dev-owned dirs. Applies to both the existing-dir and nearest-existing-parent branches. Hive-Fix-Attempt: 1/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * π agent(bob): skip $HOME/.bob probes until the per-agent home exists bobPreflightUnlocked runs before launchInTmux, and the per-agent home is only created by setupInteractiveHome inside the launch, so on a new per-UID bob agent's first launch the home does not exist. The ancestor walk then landed on /data/home/agents (deliberately 0755 dev-owned) and logged two bogus 'chmod 2775 /data/home/agents' errors. Skip the two $HOME/.bob probes when the home is absent; the workspace dir is still probed. Also make the logged remedy ownership-aware: an agent-owned ~/.bob that fails the owner-bit check now gets 'chmod u+rwx <dir>' instead of advice to widen group access, which would undo per-agent isolation. Hive-Fix-Attempt: 2/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
β¦ a reviewer when the swarm is off (#17115) Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
β¦es (#17120) v6 is a release_lines entry since the v6 release-line cut, so native-queue-policy.yml's pin reads [-v4] (v5 and v6 covered) rather than [v6, -v4]; the test asserted the old literal and would fail the next time pr-auto-update-test.yml ran on v5. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦ay under the file-size ratchet (#17122) * π fix(crux): move buffer/output getters out of agent/manager.go to stay under the file-size ratchet Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> * changelog: fragment for #17122 Generated by changelog-fragment-guard from the PR title (#5675). Edit the wording freely, or replace this file with the no-changelog label if the change is not user-visible. Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Signed-off-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
β¦-lane branch (#17125) * π docs(dashboard): review fallback doc comment describes the reviewer-lane branch The doc comment on stageTrackerReviewFallbackState still described the pre-#17115 behaviour where the reviewer always waited for CI. The body now branches on in.ReviewerLane and tells swarm-off repos a person must review. Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * changelog: fragment for #17125 Generated by changelog-fragment-guard from the PR title (#5675). Edit the wording freely, or replace this file with the no-changelog label if the change is not user-visible. Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Signed-off-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
β¦7128) A `${{ github.repository }}` mention in a bash comment inside the push_line step made GitHub evaluate the whole script as an expression; after the #17083 growth it passed the 21000-character limit, so every event since bde4411 has reported 'Invalid workflow file β¦ Exceeded max expression length 21000' for tagged-release.yml and no release has been considered on v5 or v6. Reword the comment; the script's value comes from $GITHUB_REPOSITORY already. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦m error instead of retrying (#17127) A bare cross-repo issue number resolves against the PR's own repository, GitHub returns 404, and the watcher retried with backoff indefinitely. A missing issue can never appear on retry; surface it as a policy rejection with a hint to write owner/repo#N. Closes #17124 Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Automated release commit. Compiles changelog.d/ fragments and moves the CHANGELOG.md Unreleased section into a dated v5.190.0 entry. See src/docs/releases.md. Signed-off-by: hive-release-bot <actions@github.com>
release: v5.190.0
β¦#17106) Design-only straw man for the Nous team conversation #17020 asks for. Records what the external Nous framework leaves on disk for a winning candidate (best_found.json, meta_findings.json deployment_recommendation, findings, bundle code_changes), what Hive reads of it (ledger.json and principles.json at boot, in a vocabulary the framework's own ledger rows do not share), and what spek-new accepts (one sources[].uri). Proposes an artifact shape, publishing it as a GitHub issue so spek-new can start from the link with no Hive or Spek change, and lists the open questions. Refs #17020 Hive-Run: #17020 Hive-Plan: #17020 proposal Hive-Spec: nous-spek-source#straw-man Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Automated release commit. Compiles changelog.d/ fragments and moves the CHANGELOG.md Unreleased section into a dated v5.189.1 entry. See src/docs/releases.md. Signed-off-by: hive-release-bot <actions@github.com>
release: v5.189.1
β¦erived keys (#17119) move-hub-registered-cutover.md cited src/docs/env-vars.md:306-321 for the HMAC(HIVE_HUB_SECRET, domain-string, HIVE_ID) per-hive derived keys, but that range covers the OPENAI_*/HIVE_*_BACKOFF rows instead of the derived-key table. Point it at src/docs/env-vars.md:472-475 (HIVE_HEARTBEAT_KEY through HIVE_TERMINAL_KEY). Hive-Run: #17038 Hive-Plan: move-hub-registered-cutover env-vars derived-key citation Hive-Spec: issue-17038#derived-key-citation Signed-off-by: thatguywob <thatguywob@users.noreply.github.com> Co-authored-by: thatguywob <thatguywob@users.noreply.github.com>
β¦17137) * π release: cap GitHub Release notes under the 125000-char body limit v6.0.0's first-on-the-line CHANGELOG section (~877 KB) made `gh release create` fail with HTTP 422 'body is too long' after the tag and image retags had already landed, leaving a tag with no Release and no SBOM/NOTICE assets. Add src/scripts/release-notes-cap.sh (RELEASE_NOTES_MAX_CHARS, default 120000 bytes) and run it between extract-release-notes.sh and the SBOM/NOTICE trailer in tagged-release.yml, so the changelog section is cut at a bullet boundary with an 'β¦ (N more entries) β full notes in CHANGELOG.md' link and the trailer always survives. Self-test wired into the same CI jobs as test-extract-release-notes.sh; TRUSTED_SCRIPTS_TREE re-pinned. Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π release: move fragment to changelog.d/ and unlink the doc example Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦losing claims (#17136) Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Automated release commit. Compiles changelog.d/ fragments and moves the CHANGELOG.md Unreleased section into a dated v5.189.2 entry. See src/docs/releases.md. Signed-off-by: hive-release-bot <actions@github.com>
release: v5.189.2
β¦e errors (#17109) * fix(fleetreport): dampener suppressions are not unclassified runtime errors Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * π docs(fleet-report): list the dampener-suppression exclusion in the slogfeed skip list Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
β¦to stay under the file-size ratchet (#17139) * π fix(crux): move pane-analysis helpers out of agent/manager_kick.go to stay under the file-size ratchet Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * chore: re-trigger required checks after concurrent run cancellation Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
β¦17144) POST /v1/runs {"checkout": "chk_β¦"} β the RFC's preferred form β was answering 501 unsupported because S1 (#17005) and S2 (#17014) landed in parallel and neither side was wired to the other. Now: - runs.Service.Checkouts resolves the id to the checkout's pinned worktree; the run must be made by the checkout's owner or the operator (checkout.CanUse, the same rule as delete); unknown id is 400, a server without a checkout service is 501. - runs.Service.InUse is the checkout.Config.InUse hook: a checkout with a live run refuses DELETE with 409 until the run settles. crux serve wires both directions. - /v1/runs admits lane project principals like /v1/checkouts; the run is owned by its creator (S0 principal, no longer a hard-coded "operator") and only the owner or the operator may read or cancel it. - crux runs start --checkout ID; run records carry "checkout". Part of hivecommons/crux#114 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦tisfy 'verify PR contents' (#17048) * π fix(ci): pr-verifier re-runs on label events so bot-pushed heads satisfy 'verify PR contents' Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> * π fix(ci): header comments attribute the autofix push to the PAT, not github.token Review on #17048 noted the pr-verifier and changelog-fragment-guard comments said the autofix push used the workflow token; the guard's checkout uses TOPUP_PUSH_TOKEN when set and the observed pull_request runs on #16567 were PAT-triggered. Wording only; no trigger or permission change. Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * π fix(ci): dispatch pr-verifier after a github.token autofix push so the required context lands on the new head Review on #17048 showed the labeled/unlabeled types alone have no producer: on #16567 the autofix push b9cd4ba landed 47s after the last prow label and no label event followed for three days. It also showed the earlier header comment was wrong about which token pushed β every run on that head reports actor=github-actions[bot], i.e. github.token (Dependabot-triggered runs see no Actions secrets), and that push did fire the pull_request workflows. A PAT/App push already fires pull_request_target, so the gap is specific to github.token pushes, and a github.token label flip fires nothing either. The only events github.token may trigger are workflow_dispatch and repository_dispatch, so: - pr-verifier.yml: add workflow_dispatch(pr_number); a dispatched run rebuilds the pull_request payload from the API, refuses fork PRs, and reports nothing when the PR head is no longer the ref tip. - changelog-fragment-guard.yml: after pushed=true, when TOPUP_PUSH_TOKEN is unset, dispatch pr-verifier.yml on the PR branch (same-repo only) so the check lands on the pushed head; actions: write for the dispatch. - Header comments now state the verified facts instead of the PAT claim. - test-native-queue-workflows.py covers the dispatch contract end to end. Hive-Fix-Attempt: 2/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: ci-maintainer <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Signed-off-by: ci-maintainer <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
β¦ and an 8 KB primer default (#17146) * β¨ knowledge: seed hosted spokes with the primary repo's knowledge dir and an 8 KB primer default A hive with no knowledge.git_sources now gets one entry at boot pointing at its primary repo's knowledge directory (bead_synthesizer.publish.path, else docs/knowledge/ then src/docs/knowledge/, probed via the GitHub contents API on the default branch), named <repo>-knowledge at the project layer. In-memory, idempotent, operator lists untouched. knowledge.primer.max_bytes default rises from 4096 to 8192. Fixes #17145 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π± knowledge: parity test reads primer_max_bytes default from config Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Automated release commit. Compiles changelog.d/ fragments and moves the CHANGELOG.md Unreleased section into a dated v5.189.3 entry. See src/docs/releases.md. Signed-off-by: hive-release-bot <actions@github.com>
release: v5.189.3
β¦legacy drain (#17141) * β¨ knowledge: review flow and never-prime for CLI auto-memory drafts, legacy drain Drained CLI-memory facts are agent-written text, so while one is still a draft it never reaches an agent, whatever include_states admits: - FilterByLifecycleFor (kick primer, knowledge advisor) drops it even for a draft-admitting scope or primer config, or an author match. The operator filter FilterByLifecycle still lists it for review. - TOCScope.HideAutoMemoryDrafts, set by AgentScope and on every ?agent= TOC/entry/effective read, drops it as reason "lifecycle". - AutoPromoteCandidates skips pages tagged cli-memory. Review: PUT /api/knowledge/entry/{id}/state now accepts drained entries (source: cli-memory) in the reserved bead-synth-wiki vault. Before this change they could never be approved. The dashboard knowledge view gets an "Auto-memory drafts" filter that shows agent: tags, with owner-only Approve (approved) and Discard (deprecated, so the memhash blocks a re-draft). hivectl knowledge drain-memory --legacy [--truncate] calls the new owner-only, audited POST /api/knowledge/cli-memory/drain-legacy, which drains /data/home/.claude/projects/*/memory into drafts tagged agent:shared. Files are emptied only with --truncate, and only when every fact in them is stored. Docs: Auto-memory drafts section in knowledge-lifecycle.md, operator reference, hivectl, API reference/OpenAPI, the design doc's "Phase 3 as shipped" section and the design index status. Route citations re-anchored with check-docs-citations.py --fix. Hive-Run: #17058 Hive-Plan: cli-memory-drain.md#phase-3--review-flow-draft-exclusion-legacy-migration-operator-docs Hive-Spec: cli-memory-drain#phase-3 Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> * π knowledge: fix legacy-drain test fixture path and settings-parity false positive Review fixes for #17141: - TestKnowledgeDrainLegacyMemory: put the fixture under a .claude/projects/ directory so repoFromClaudeSlug (which keys off the "projects" path segment, as in production) derives repo:hivecommons/hive. - drain-legacy 409 message: stop spelling out the dotted hive.yaml key agents.cli_memory.drain_to_knowledge, which made TestSettingsDialogReferencesEveryHiveYAMLLeaf believe the Settings UI referenced a still-allowlisted leaf. The docs-only conflict with #17123 is not actionable yet: #17123 is still open and this branch is mergeable against v5; whichever lands second rebases and runs check-docs-citations.py --fix. Hive-Fix-Attempt: 1/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
β¦ones (#17176) On a phone (.modal-sheet tier) the Activity monitor's 13-control toolbar and label chips are hidden; the sticky bar carries All / PRs / Issues, β Needs attention, π€ Waiting on you (with count) and β― Filters, which moves the full toolbar and label chips into a .hive-dialog.modal-sheet and returns them on close. The card body uses overflow: clip on phones so the sticky bar sticks to the viewport instead of being pushed over the first row. Desktop layout is unchanged. Adds the tracker-phone-chrome probe to the mobile-shots activity-density gate (390x844: chrome <= 160px, one row fully visible, sheet round-trip). Fixes #17159 Part of #17158 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Automated release commit. Compiles changelog.d/ fragments and moves the CHANGELOG.md Unreleased section into a dated v5.190.0 entry. See src/docs/releases.md. Signed-off-by: hive-release-bot <actions@github.com>
Automated release commit. Compiles changelog.d/ fragments and moves the CHANGELOG.md Unreleased section into a dated v5.201.1 entry. See src/docs/releases.md. Signed-off-by: hive-release-bot <actions@github.com>
release: v5.201.1
* β¨ crux: turn signals service (S5) Per-run, append-only turn signals (hivecommons/crux#114 S5) in <workdir>/runs/<id>/signals.jsonl with the closed kind set started, thinking, tool, blocked, needs-input, input, done; each with seq, kind, source (runner, gate, caller), at, a scrubbed bounded message and bounded scrubbed JSON data. The S2 runner appends started before the launcher and done on every terminal path, including cancellation, provisioning failure and runs Reconcile marks unfinished at start; done is always last. GET /v1/runs/{id}/signals is paged like the S4 command log; the run's owner posts thinking/tool/blocked/needs-input/input with POST; every durable signal is published as run.signal on /v1/events. POST /v1/gates accepts an optional run the caller owns: opening appends needs-input, answering input, expiry blocked. The last KickOutcome of every agent is saved under <workdir>/signals/agents/ before agent.kick_outcome is published, and GET /v1/agents/{name}/kick-outcome answers it with settled_for_last_kick by crux.KickOutcome.Settled. CLI: crux --server β¦ signal emit|list and crux gate open --run. Closes #17255 Part of hivecommons/crux#114 Hive-Run: #17255 Hive-Plan: hivecommons/crux#114 phase 5 (S5 turn signals) Hive-Spec: crux-work-services#S5 Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> * π crux/serve: decode the unknown-agent kick outcome into a fresh value last_kick is omitempty, so reusing the struct let alpha's newer kick leak into the answer for an agent the runtime no longer holds and the test failed on CI. Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Manual top-up of v6 with origin/v5 (1b63610), carrying v5.187.0βv5.201.1 onto the v6 line. Plain merge commit so v5's commits keep their SHAs and sign-offs. Conflict resolutions: - src/pkg/github/automerge/automerge_contributor_lane.go: kept v6's per-author merged-repo cache (#15088/#15371) and added v5's 422 isolation (#17151) on top; test updated to the merged shape. - src/crux/agent/manager_kick.go: v5 moved the pane helpers into manager_kick_pane.go; that file now carries v6's Copilot-CLI/OMP-aware versions. manager_status.go keeps v6's split (manager_output.go). - src/pkg/knowledge/api.go, src/cmd/hive/main.go, src/pkg/dashboard/api.go, prclaims.go, hivectl knowledge tests: both sides. - CHANGELOG.md: both lines' release sections kept; v6's Unreleased kept. - src/pkg/dashboard/static/index.html: regenerated with go generate. - TRUSTED_SCRIPTS_TREE re-pinned to the merged src/scripts tree. - docs: v6 wording/citations kept, v5's new endpoints and BP pill text added; style ratchet baselines kept at v6's values. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Hive status β updated in place; edits do not notify. Full history is in the Activity Monitor. @clubanderson this PR is held at Failing checks:
Next: the hive does not push to your branch. Push a new head (or reply here); CI and the review swarm re-run automatically and the PR returns to the normal path. |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
|
hive/ci-report @ 87e475e β base Semantic merge conflicts (v5 content vs. v6 tables) β Go tests
Guards
Not touching #17025 ( π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
β¦erge - automerge: the v5 unsearchable-repository tests now expect v6's search shape β the PR's own repository is part of the per-author cached search (#15088), and a sweep inside the cache TTL issues no query. - dashboard: stage/018-open-for-discussion (#17220) is an issue stage, not PR coverage; add it to the v6 CoversIssue table test. Reword the v5 tracker.css phone comment so the β glyph is written once in index.html. - crux: split the Linear credential helpers out of agent/manager_tokens.go and the caveman installer out of agent/manager_launch.go to stay under crux's file-size ratchet after the union of both lines. - docs: api-reference citations resynced (--fix); nous-spek-source links the experiment loop in experiment-lab.md (v6 moved it from strategy-lab). Signed-off-by: Andrew Anderson <andy@clubanderson.com>
5ad4573
βΉοΈ Sentinel notice β informational; author is trusted (owner), merge is not blockedHive flagged this PR (author @clubanderson, head
Hive did not add the |
There was a problem hiding this comment.
Intent alignment β reviewed current head 5ad4573 (the assigned head 87e475e plus the top-up commit).
The merge itself matches the PR body: I re-ran git merge 1b63610 onto fd10c75 and diffed the result against 87e475e β the only files that differ are the 25 conflicted files plus manager_kick_pane.go / manager_status.go, exactly the two hand-edits the body names. TRUSTED_SCRIPTS_TREE (.github/scripts/integration-governance.cjs:12) equals git rev-parse HEAD:src/scripts at head. No stray conflict markers; go build ./... passes in both modules.
1. Top-up commit breaks two caveman guard tests (in-scope, deterministic β test (agent 3/5) and test (agent 4/5) are red 3/3, not flaky)
5ad4573 moves installCavemanForAgent / cavemanInstallArgv into src/crux/agent/manager_launch_caveman.go (refs now at lines 86β87, skills add argv at 104β108), but src/crux/agent/caveman_pin_test.go still reads the old file, so both tests hit their "no caveman refs found β¦ update this test to scan the new location" fatal:
src, err := os.ReadFile("manager_launch_caveman.go")
at caveman_pin_test.go:24, and the same change at caveman_pin_test.go:55:
src, err := os.ReadFile("manager_launch_caveman.go")
(Optional: the t.Fatalf("reading manager.go: β¦") messages at :26/:57 and the doc comments still say manager.go; harmless.)
Everything else (DCO red on others' v5 commits, native-queue-policy failing on DCO: action_required) is the anticipated forward-merge state the body already calls out.
β hive: agent=ci-maintainer backend=copilot model=claude-fable-5.1 copilot=1.0.88
Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
hive/scanner β correction on the The repo's own π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
There was a problem hiding this comment.
Decision needed: @clubanderson should decide whether to admin-merge this with --merge as #17118 was, given DCO and native-queue-policy are red only on v5's 22 release-gate merge commits, and then close the superseded #17025.
Structural checks on head 636b3a8, from a fetched checkout rather than the diff view:
- Merge shape is as described.
87e475e1is a true two-parent merge (fd10c75e= v6,1b636107= v5 tip), followed by two top-up commits:5ad45739(file-size-ratchet splitsmanager_launch.goβmanager_launch_caveman.go,manager_tokens.goβmanager_tokens_linear.go, api-reference doc regen, two automerge test reconciliations) and636b3a85(pointssrc/crux/agent/caveman_pin_test.goat the new file). Both are mechanical and signed off. - Why DCO / native-queue-policy are red. The 22 commits DCO flags are v5's
Merge pull request #β¦ from hivecommons/release-gate/v5.x.ycommits (e.g.aa0b2f8c,5cdd29f9,a46b05b3,ca3a64d1,83988676), which are GitHub-authored merge commits already onv5.native-queue-policyfails on exactly that (DCO: action_requiredat.github/scripts/native-queue-policy.cjs:122). #17118 merged in this identical state (DCOACTION_REQUIRED, native-queue-policyFAILURE), so this is the established forward-merge path, not a defect in this branch. A squash would silence DCO but lose the v5 SHAs and sign-offs the body asks to preserve. - Supersedes #17025. That automated
sync/v5-to-v6PR carries 1 commit and isdirty; this one carries all 100. Once this lands #17025 is a no-op and could be closed. I have not closed anything.
What I did not verify: the 25 hand-resolved conflicts beyond the two I read, and the still-running v2 Tests / build matrix at the time of this comment. I'm not in a position to sign off a 318-file merge on content; the decision above is the one a maintainer needs to make.
β hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Top-up after hivecommons#17265: brings v5.202.0 and the maintainer-notes feature (hivecommons#17245), the crux checkout cap / private-repo auth / kubejob network hardening (hivecommons#17269) and the climemory symlink fix (hivecommons#17259) onto v6. Conflicts: imports/allowlist in main.go, server.go and dashboard_import_allowlist.txt (both sides); import_count_test ceiling 66 -> 67 for pkg/maintainernotes; tracker-filter.js keeps v6's finisher sort and v5's maintainer-notes UI; CHANGELOG keeps both lines' sections (v5.202.0 under v6.0.1); api-reference pages take v6 and add the /api/notes rows, citations resynced; index.html regenerated. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Manual forward-merge of
v5(1b636107e) intov6, following the #17118 precedent: a plain merge commit β merge with--merge, not squash β so v6 keeps v5's history, SHAs and sign-offs. Supersedes the automatedsync/v5-to-v6PR #17025, which is conflicting and stale.What this carries (100 v5 commits, 77 non-release)
github.tokenautofix push (ci: 'verify PR contents' is required on v5 but pr-verifier.yml skips dependabot, so dependabot PRs can never mergeΒ #17036).release-notes-cap.sh(already on v6 via π release: cap GitHub Release notes under the 125000-char body limit (v6)Β #17140; now identical history).drain-legacyendpoint,hivectl knowledge drain-memory),stateonPOST /api/knowledge/create, agent reads never see drained drafts ([scanner] β¨ knowledge: review flow + never-prime for auto-memory drafts, legacy migration, operator docs (phase 3 of #17033)Β #17058).closed by #N/ parenthetical citations ([scanner] supersession sweep closes no-closing-claim PRs on bare prose #N mentions (hotshot#364)Β #17134); fleetreport dampener noise ([selfreport] unclassified_error_repeated: stage transition suppressed by dampenerΒ #17103).changelog.d/), file-size-ratchet splits (π fix(crux): move buffer/output getters out of agent/manager.go to stay under the file-size ratchetΒ #17122, π fix(crux): move pane-analysis helpers out of agent/manager_kick.go to stay under the file-size ratchetΒ #17139), ratchet reads crux main (crux#124).BP = issues/PRs(β¨ feat(dashboard): name the Overview sidebar pill board pressure (BP = issues/PRs)Β #17242).Conflict resolutions (25 files)
src/pkg/github/automerge/automerge_contributor_lane.go(+test)src/crux/agent/manager_kick.goβmanager_kick_pane.goβ Working/esc interrupt,paneShowsOMPMidTurn,lineIsCLIChrome).src/crux/agent/manager_status.goGetOutput/GetBuffer*here frommanager.go; v6 already had them inmanager_output.goβ kept v6's layout (build was failing with duplicate methods otherwise).src/cmd/hive/main.goadvisor.HookSubcommand/nousdeps, v5memoryDrainSubcommand.src/pkg/knowledge/api.goSourceRef, v5State/draft-fact path.src/pkg/dashboard/api.godrain-legacyroute + v6's explicitGET /mcp/knowledge405 handler (#16906).src/pkg/dashboard/static-src/js/tracker-filter.jsfinishersort + v5 phoneopts.phonetier-first grouping.src/pkg/dashboard/static/index.htmlgo generate ./pkg/dashboard/webstatic/(-checkpasses).src/pkg/dashboard/webstatic/style_ratchet_test.gosrc/pkg/github/prclaims.gosrc/pkg/hivectl/commands/knowledge_more_test.goCHANGELOG.mdUnreleasedkept (not in any v5 release).changelog.d/added-crux-turn-signals.mdkept (not yet compiled anywhere).src/docs/api-reference/*.md,dashboard.md,operator-reference/README.mddrain-legacyrow, richercreaterow and board pressure text added.check-docs-citations.pyverifies clean..github/scripts/integration-governance.cjsTRUSTED_SCRIPTS_TREEre-pinned to the mergedsrc/scriptstree925f525d22d99042bf0c41778d8de837a79ac3e9..github/workflows/*,.github/release-lines.ymlauto-merged cleanly;check-release-lines.shpasses.go build ./...+go vetpass for both modules.DCO note: probot DCO / prow
dcowill be red on others' v5 commits as on every forward-merge; the merge commit itself is signed off.