Repository navigation
π± top-up: forward-merge v5 into v6 (v6 release line cut, v5.187βv5.189) - #17118
Conversation
β¦17014) * β¨ crux: contained run service with saved run state (S2 + S7 minimum) Refs hivecommons/crux#114 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π changelog: crux contained run service Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π± crux/runstate: cover write obstacles, unreadable records and list ordering Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com> Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
β¦policy verdict (#16988) * fix(ci): re-validate policy checks before replaying a native-queue-policy verdict Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * fix(ci): fall through to the full wait when a replayed policy provider is pending replayLastVerdict re-validates POLICY_CHECKS before replaying a prior success, but assertEvidence throws PendingEvidence for a missing or still-running provider and the workflow's replay step only tolerates transient API errors. A cosmetic label flip during a provider re-run therefore failed native-queue-policy outright with no retry. Catch PendingEvidence and return null so the caller runs the normal polling wait; add queued/in-progress/missing provider tests. Hive-Fix-Attempt: 1/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: ci-maintainer <280983584+hivecommons-hive[bot]@users.noreply.github.com> * fix(ci): fall through on DCO UNKNOWN during replay; refresh replay docs Address review findings on #16988: - replayLastVerdict now returns null for ProviderUnavailable too, so the full wait re-raises it once and renders the runbook job summary instead of a bare setFailed from the label-flip step. - Re-flow the replayLastVerdict doc comment to ~80 columns. - native-merge-queue.md: replay re-validates the five policy checks on the head; red fails, pending/missing/UNKNOWN falls through. - Test: UNKNOWN DCO on replay falls through. 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: Copilot <223556219+Copilot@users.noreply.github.com>
β¦er guess exit code 0 (#17023) * fix(kubejob): drop SA token mount, harden securityContext, keep unknown exit code honest Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * fix(kubejob): drop runAsNonRoot β image USER is non-numeric Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * fix(kubejob): refresh ctx per collection step; let verify pass on unknown exit code A cancel that lands during pod log collection left podExitCode on a dead context, so a readable Complete pod reported -1 and TestRunSuccessDeletesJobEvenIfContextExpiresDuringLogCollection failed. Every collection/cleanup request now re-checks ctx and falls back to a fresh request-bounded context. The empty exitCodeUnknown branch (SA9003) is folded into a comment. SandboxVerifyResult.Passed now accepts kubejob.ExitCodeUnknown when the launcher returned no error and did not time out, so a Complete verify Job whose pod is gone no longer withholds the PR β matching the publish gate and the PR description. Changelog notes the -1 transcript/dashboard rendering. 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: 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>
Since #16785 the proxy's destination guard covers plain-HTTP forwards, uninspected CONNECT tunnels and transparent-TLS passthrough, and HIVE_PROXY_ALLOW_PRIVATE_FORWARD=true lifts it for all three legs. env-vars.md and security-model.md still described the guard and its override as plain-HTTP-only; bring both in line with the code. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
* π± build(deps): bump ws from 8.21.3 to 8.22.1 in /src/proxy Bumps [ws](https://github.com/websockets/ws) from 8.21.3 to 8.22.1. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](websockets/ws@8.21.3...8.22.1) --- updated-dependencies: - dependency-name: ws dependency-version: 8.22.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * changelog: fragment for #16567 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: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Answers the 2026-11-05 community-meeting question nobody could answer: which context reaches an agent and from where. Separates the three layers (Hive knowledge primer, CLI conversation, CLI persistent memory), traces the kick-primer path (Primer.PrimeScoped -> primeKnowledge -> # Relevant Knowledge) with its scoping rules and size caps, explains why repo AGENTS.md is injected by the scheduler rather than read natively, lists which per-agent home directories are fleet-shared, and tabulates what survives a kick, /clear, pod restart or a new agent. In-flight memory isolation work (#17031, #17032, #17033, PR #17039) is linked as known gaps rather than described as current behaviour. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦o placeholders (#17046) handleApproveProvision only ever looked in the pool mapped from the request's auth_method, so a public request 409'd when hive-oke had no available placeholder even though lke648397 had 30. Auto-pick now tries the preferred pool first and, for the soft public/default preference, falls back to any other cluster registered in clusters.json that has an available placeholder (most available first, tie-break by cluster id), logging one INFO line. Private requests stay pinned to the GPU pool, the GPU pool is never used for public requests, and an admin's explicit placeholder choice remains strict. Fixes #17044 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦b's cap; GitHub failures no longer read as "hive unavailable" (#17041) * π fix(dashboard): Hold works on a hive whose hold label exceeds GitHub's cap and GitHub failures are not reported as "hive unavailable" Clicking Hold on an Activity Monitor row of a hosted hive answered "hive unavailable" while the hive was up. The hive's hold label hive-pause/hosted-available-oke-11-placeholder-r05x is 51 chars, over GitHub's 50-char label-name cap, so CreateLabel answered 422; EnsureIssueLabel swallowed every 422 as "already exists", AddLabelsToIssue then failed 422, the handler mapped it to 502, and the hosted Ingress (custom-http-errors 502,503) replaced the body with its generic outage page. - CanonicalHiveHoldLabel always fits the cap: over it, the id is truncated and suffixed with an FNV hash of the full id; the dashboard band classifier now derives the label through the same function. - EnsureIssueLabel/ensureLabel only treat an already_exists 422 as success and return any other 422 with GitHub's reason. - handleRepoItemHold answers GitHub failures (and a missing client) with 424 and the step + reason, logged on the spoke, never 502/503. - A row action that still receives the gateway's placeholder body on a 502-504 names the gateway and the status instead of repeating "hive unavailable" as the hive's word. Fixes #17037 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * docs: refresh scale-envelope citation after client.go line shift Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦ scoped knowledge entries (#17051) AGENTS.md goes from 3736 to 1980 bytes. Every removed fact lives in exactly one src/docs/knowledge/<topic>.md entry with frontmatter and a scope: block (paths, labels, lanes), traceable via source: AGENTS.md. The rules themselves (CI is the verdict, never run the suite in an agent pane, fragment required, citation --fix first) stay. Proposed by @gregoryhunt at the 2026-11-05 community meeting. Fixes #17047 Part of #17043 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦nd entries skipped for the cap (#17064) primeKnowledge now returns its numbers (bytes, entries, skipped-for-cap, cap) alongside the rendered section, and every primed kick logs one line "knowledge: injected N bytes from M entries (skipped K for cap)" with the AGENTS.md and skills block sizes that share the kick. The old "injecting facts into kick" line is folded into it; the debounced over-cap detail line stays. Silent when the primer did not run, so a hive without a knowledge store does not log a zero per kick. Proposed by @gregoryhunt at the 2026-11-05 community meeting. Fixes #17049 Part of #17043 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦.gemini/.bob state to the shared home (#17039) * π agents: give each agent its own CLI memory β stop bridging .claude/.gemini/.bob state to the shared home interactiveHomeBridgeDirs symlinked ~/.claude, ~/.gemini and ~/.bob whole into /data/home, so every Claude Code agent on a hive read and rewrote the same projects/<cwd>/memory/MEMORY.md (and shared transcripts/todos), Gemini agents shared GEMINI.md and bob agents shared chat recordings. Make those three REAL per-agent directories following the .copilot pattern (#9444): only the login/settings entries are bridged (.credentials.json + settings.json for claude; antigravity-cli/, settings.json, oauth_creds.json, google_accounts.json, installation_id for gemini; settings.json + settings/ for bob). Legacy whole-dir bridges are retired on launch; nothing under /data/home is deleted β an existing shared memory store is logged once for operator review. Dashboard token scanners (claude_sessions_dir, bob_sessions_dir) now also walk /data/home/agents/*/.claude/projects and /.bob, attributing each per-agent tree to its owner, mirroring CopilotSessionTrees. Fixes #17031 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π agents: correct the shared-memory wording β MEMORY.md is per-agent by cwd, the tree is what was shared Claude keys auto-memory by cwd (/data/agents/<name>), so MEMORY.md was never one physical file; the user-level CLAUDE.md, history.jsonl and todos/ were. The bridged tree being readable and writable by every agent is the bug. Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π± agents: keep manager.go inside its file-size ratchet baseline Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π agents: bring agent-knowledge-and-memory.md in line with per-agent CLI homes Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com> Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
β¦tead of reposting per head (#17071) * π± automerge: upsert signoff-attribution and unauthorized comments instead of reposting per head hive:signoff-attribution becomes one comment per PR under a stable marker, rewritten in place on a new head with an 'updated β¦' history capped at five lines. hive:unauthorized becomes one comment per PR and blocked step; a new head hitting the same block edits it with an attempt count and the heads it covers. Legacy per-head comments are adopted and upgraded in place. workflowFenceReleased reads head coverage from the upserted note. Fixes #17066 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π± automerge: fix capped-history test heads; move nudge raw-write baseline line to the signoff file The sign-off attribution CreateComment moved files unchanged (2β1 in the nudge file, 1 in automerge_signoff_attribution.go); the test heads used %040d, whose 12-char short SHA was identical for every head. Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦s work enters a new scope (#17068) * β¨ knowledge advisor: surface scoped knowledge mid-task when an agent's work enters a new scope Phase 1 of the mid-task knowledge advisor (#17052). The kick primer runs once; this watches the agent's pane on every poll tick, and the first time a scope (directory prefix or gh command family) shows up that was not on screen at kick time, asks the same knowledge Primer under the same agent scope and types one 'π Knowledge:' line per hit through the existing live-session primitive used by the CI-poll nudge. - crux: KnowledgeAdviser host seam (in-process-only, like SetSpanStarter), crux/agent/knowledge_advisor.go: baseline at first post-kick poll, per-kick cap, cooldown, dedupe against kick-primed slugs, never during a tool call or after the turn ends, prompt-history trigger knowledge-advisor for measurement. - hive: cmd/hive/knowledge_adviser.go adapts Primer.PrimeScoped; the primer now records which slugs survived the byte cap (RenderedSlugs, Scheduler.KickPrimedSlugs) so those are never re-sent. - config: knowledge.advisor (default off), advisor_max_per_kick (3), advisor_exclude_agents. - docs: knowledge-curator.md section, operator-reference row, crux.md HostSetters row. Phase 2 (LLM-ranked, OMP-style) is #17054. Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π± knowledge advisor: reuse oneLine, keep runtime.go and recorder.go at ratchet baselines Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π± knowledge advisor: rune-cap the typed summary, golden + settings-parity fixtures, keep manager.go at baseline Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦#17083) Tagged Release deferred whenever v5's tip had moved past the commit docker.yml built, expecting the successor run to release. With merges landing faster than a multi-arch build no run ever saw an unmoved tip, every successor deferred again, and the hourly backstop applied the same tip-only test β v5 went from v5.186.4 (2026-10-18) to ~1,700 untagged commits. - precheck: release the built SHA when it is an ancestor of v5's tip and newer than the last v5.* tag; defer only when it is off-branch or a release already landed after it (version collision). - push_v5: the version tag names the release commit (built SHA + changelog), never the merge commit; 409 base-moved is retried, head-moved and a CONFLICTING PR hard-fail; the post-merge docker dispatch passes release_version only when the merge adds nothing but the changelog. - backstop: pick the newest successfully built ancestor of the tip instead of requiring the tip itself. - docker.yml: push builds get a per-run concurrency group β GitHub's queue holds one pending run per group and cancels the rest, which is what was killing most v5 builds. - test-release-push-retry.sh covers the new state machine; releases.md and the RACES/BACKSTOP headers describe the new rule; TRUSTED_SCRIPTS_TREE re-pinned. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦Primer (#17060) * β¨ knowledge: scope block on entries and a kick-context filter in the Primer A knowledge entry can now say where it applies with a frontmatter scope: block (paths, labels, lanes). FileStore parses it into Fact.Scope; Primer.PrimeForKick takes the kick's lane, issue labels and known file paths and keeps a scoped fact only when one dimension matches (OR), both in the ranked set and in graph expansion. Unscoped facts are unchanged. The scheduler passes the base lane name and the primed issues' labels; paths stay empty on the kick path. The count excluded is reported as PrimedKnowledge.ScopedOut and in the "knowledge primed" log line. Proposed by @gregoryhunt at the 2026-11-05 community meeting. Fixes #17045 Part of #17043 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π± test: Agents lives in the embedded AgentRuntimeConfig Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦ame-family findings (#17072) * review backlog: min_severity floor, per-PR lifetime cap, collapse same-family findings Findings below review.backlog.min_severity (default P2) are no longer filed as backlog issues; they are appended to one upserted hive:review-followups comment on the PR. The issue cap is now review.backlog.max_per_pr (default 3) over the PR's lifetime, persisted in the review-backlog ledger, instead of per UTC day (max_per_pr_per_day is read as a retired alias). New findings from one pass that share a perspective and scope are filed as a single checklist item. Operators who want every finding filed as before set min_severity: P3. Fixes #17065 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * review backlog: tests follow collapsed items and uncapped still-present notes Signed-off-by: Andrew Anderson <andy@clubanderson.com> * review backlog: expose min_severity and max_per_pr in Settings TestSettingsDialogReferencesEveryHiveYAMLLeaf requires every hive.yaml leaf to have a Settings control. Add a min_severity select and a lifetime max_per_pr input next to the retired per-day cap, accept both on PUT /api/config/review, and cover them in the 11088 settings test. Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦/v5-to-v6 forward-merges (#17050) 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.187.0 entry. See src/docs/releases.md. Signed-off-by: hive-release-bot <actions@github.com>
β¦ocal checkout (#17093) Hosted spokes keep no clone of their primary repo, so both roots agentsRepoRoot knows (project.checkouts_dir, policies.local_dir) are empty and primeAgentsMd was a silent no-op: hive's own hive showed zero agentsmd: log lines. Add a third source: when no local root exists and a GitHub client is wired, fetch AGENTS.md from the repo's default branch, cache it for 15 minutes (the conditional-GET transport makes refreshes free), keep the last-known-good copy across API failures, and materialise it under /data/agentsmd-cache/<owner>/<repo>/ so Parse/Render/primeSkills and the injection cap run unchanged. Fixes #17090 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
release: v5.187.0
β¦per-agent memory before each kick (#17089) * β¨ agents: CLI auto-memory off by default; clear_memory_on_kick wipes per-agent memory before each kick Adds agents.cli_memory {auto_memory, clear_on_kick} with per-agent override, seeds the vendor off-switches (Claude env var, Codex [features] memories, Copilot settings.json memory) and removes the agent's own memory stores next to the /clear kick when clear_on_kick is set. Fixes #17032 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π± agents: keep manager_homes.go inside its ratchet baseline; document cli_memory in agent-knowledge-and-memory.md Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π± agents: cli_memory test imports crux/config (outbound ratchet); settingsparity tool fixture gains the two cli_memory leaves Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
β¦17078) Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
β¦ates lists draft (#17079) The kick primer admits approved facts only and the agent scope can only narrow, so knowledge.agent_scopes.<agent>.include_states: [draft] never reached a kick. Thread the agent's identities (name, base agent, owner logins) into TOCScope.DraftAuthors when the scope lists draft, admit drafts whose author: frontmatter matches, and render them with a (draft) marker. Approved-only stays the default for every other agent. Fixes #17076 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.188.0 entry. See src/docs/releases.md. Signed-off-by: hive-release-bot <actions@github.com>
β¦ces design status (#17035) Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
release: v5.188.0
Automated release commit. Compiles changelog.d/ fragments and moves the CHANGELOG.md Unreleased section into a dated v5.189.0 entry. See src/docs/releases.md. Signed-off-by: hive-release-bot <actions@github.com>
release: v5.189.0
β¦e link check on v5 (#17096) Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Add docs/rfc-17054-llm-ranked-knowledge-advisor.md arguing the open questions on #17054: rank-only (slug must be a matcher candidate, model reason never typed), hive-paid per-agent/fleet call caps, in-process behind phase 1's KnowledgeAdviser seam with Advise moved off the poll goroutine, pane tail + kick summary as signal, and shadow/holdout measurement through the retro lane's existing counters. Hive-Run: #17054 Hive-Plan: knowledge advisor phase 2 (RFC) Hive-Spec: knowledge-advisor#17054 Signed-off-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: Karibhou <Karibhou@users.noreply.github.com> Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
β¦; marker ratchet (#17073) * π± contributor-nudge once per PR+reason; fold origin notes into status; marker ratchet Contributor nudges carry a hive:contributor-nudge reason=<slug> marker and are edited in place for a new head or changed reason, with one re-nudge after auto_merge.nudge_repeat_after (default 72h). Agent free-text relay comments whose only marker is the hive:origin footer fold into the hive:status card in quiet mode or one hive:origin-notes comment per item otherwise. A grep-based ratchet in internal/testutil caps unmarked raw comment emitters under pkg/github at the current 45. Fixes #17067 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * contributor nudge: expose auto_merge.nudge_repeat_after in Settings TestSettingsDialogReferencesEveryHiveYAMLLeaf requires every hive.yaml leaf to have a Settings control. Add a Re-nudge-after field to the Labels tab next to the legacy renudge_interval it supersedes, read and write it via /api/config/governor/labels with the same positive-duration validation, and cover the round trip. Signed-off-by: Andrew Anderson <andy@clubanderson.com> * stagelabels: cover MarkNudgedReason, NudgeReasonSlug and NudgeStart The per-reason nudge ledger added for #17067 had no direct tests, dropping pkg/stagelabels under its 90% coverage floor. Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com> Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
β¦and refuse non-canonical paths (#17104) Allowed() compared the caller's URL string with strings.HasPrefix and parseRepo never normalized the path, so dot segments (which libcurl squashes and local git follows literally), percent-encoded segments and mid-segment prefixes all cloned repositories outside the allowlist. Signed-off-by: sec-check <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: sec-check <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* β¨ release: make v6 an official release line (v6.x.y tags) Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π docs: full release-line cut checklist, ROADMAP line table for v6 Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π docs: repoint releases.md anchor after section rename Signed-off-by: Andrew Anderson <andy@clubanderson.com> * π± ci: carry v6's test-release-push-retry.sh (push_line step id) into v5 The parameterised tagged-release.yml renames push_v5 to push_line; the contract test must follow. Re-pins TRUSTED_SCRIPTS_TREE. Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Manual v5 -> v6 top-up carrying #17074 (v6 under release_lines, parameterised tagged-release.yml with relay job, promote-stable guard, release docs) and #17083 (tag the built ancestor; per-run docker concurrency), plus every v5 commit since the last top-up. Conflict resolutions (v5 behaviour carried into v6 structure): - release-lines.yml: v5 manifest + v6-only pinned entries as [-v4, -v5]. - tagged-release.yml, releases.md, release-line-guard.md, test-release-push-retry.sh: v5 (already parameterised on RELEASE_LINE). - pkg/config: v5's cli_memory decode/encode, AdvisorMaxPerKick default, NudgeRepeatAfter ported into v6's split files. - crux/api: SetKnowledgeAdviser row in host_setters.go. - issue_request_watcher.go: origin-note branch in v6's comment chain. - review_backlog.go: v5 collapse rewrite + v6 findingNeedsNoAction and SameFilePath argument. - stagelabels/store.go: WithdrawNudge (v6) and MarkNudgedReason/ NudgeReasonSlug (v5) both kept. - held_runs_test.go: both sides' new tests. - docs: packs-and-acmm table (v5 + v6 blocker/handoff row, citations re-resolved), stage-labels (v5 per-PR nudge semantics + v6 prose), scale-envelope citation. - changelog.d/fixed-14225.md: v6-only fragment given its missing '- '. - TRUSTED_SCRIPTS_TREE re-pinned to 23eed03. - v5's reason-keyed nudge marker and one-comment-per-PR rewrite applied to v6's shared-CI nudge withdrawal: withdrawNudge matches the head field behind any reason slug, WithdrawNudge forgets the reason class, and the withdrawn comment is rewritten into the fresh first nudge. - marshalConfigYAMLWithAgentCap early-return keeps encoding agents.cli_memory (v6 split's guard did not know the new field). - review_backlog_same_file_path_test: min_severity P3 so the low nit is filed under v5's below-min-severity hold. - comment-marker ratchet baseline 46 on v6 (its own emitters outnumber the v5-only ones it lacks). Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
Docs map: this PR adds page(s) under
A page missing from the map is one readers do not find. Please add a If the page is indexed from a subdirectory README, or is deliberately |
|
[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 |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
|
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. Review findings from Read at The merge commit restores ~1,373 changelog fragments that v5 deleted. What I verified and found correct:
Also for whoever merges:
This touches release workflows and triggers a public release on merge, so I am not signing off on it β flagging for |
6888c77
βΉοΈ Sentinel notice β informational; author is trusted (owner), merge is not blockedHive flagged this PR (author @clubanderson, head
Hive did not add the |
v6 is a release_lines entry now, so native-queue-policy.yml's pin reads [-v4] (v5 and v6 covered) rather than [v6, -v4]; the test asserted the old literal. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
There was a problem hiding this comment.
Decision needed: @clubanderson should decide whether to admin-merge #17118 past the red probot DCO / native-queue-policy checks, or re-shape it (push the tip as a two-parent merge of origin/v5 onto v6 on sync/v5-to-v6 via v6-topup.yml) so the v5-reachable DCO substitution in native-queue-policy.cjs actually applies.
Routing to @clubanderson β this is a 214-file forward-merge that touches .github/workflows (tagged-release.yml, release-lines.yml), re-pins TRUSTED_SCRIPTS_TREE, and currently cannot clear native-queue-policy. I did not review the 214-file content; what follows is the one thing I could verify end-to-end.
The DCO path the body relies on does not apply to this PR as shaped.
The body says the plain merge commit is kept so "the native-queue-policy DCO path for v5-reachable commits applies". The substitution is forwardMergeDCOPath in .github/scripts/native-queue-policy.cjs:171-180, and it returns null (probot DCO stays required) unless all of:
pr.head.ref === 'sync/v5-to-v6'(FORWARD_MERGE.head, line 30) β this PR's head istopup/v5-to-v6-release-line;pr.userisgithub-actions[bot]id 41898282 (line 31) β this PR is authored by a human account;- the tip commit has exactly two parents, one reachable from
v6and one fromv5(lines 186-194) β the tipe2d3260("π± ci: native-queue contract test resolves the pin against release_lines") has a single parent6888c77, because the fix-up was committed on top of the merge.
Consequence: probot DCO is the evidence (DCO: action_required), and assertEvidence throws at native-queue-policy.cjs:156 β that is the Unhandled error: Error: DCO: action_required in job 128551301218. Of the 36 commits in the PR, the three without Signed-off-by are GitHub-generated merge commits already on v5 (ec3d6fe8e #17094, 9f04cc744 #17100, 30468b7e9 #17108). Whether those are what probot objects to is an open question I could not confirm from the check output; I only verified that the v5-reachable bypass is not reached.
The comment in the policy file says "Any doubt keeps probot DCO required" by design, so this is a decision for the owner, not a code fix I can recommend: either merge it as-is with admin rights (accepting the red required check), or re-shape the branch so the narrow path matches.
Not touched: the Go/config conflict resolutions and the release-line workflow changes. Someone should read tagged-release.yml and promote-stable.yml in the merged tree before this lands, since they decide where :stable and v6.0.0 get published.
I have not approved, closed, or labelled anything.
β 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 |
Manual forward-merge of
v5intov6(plain merge commit β merge with--merge, not squash, so v6 keeps v5's history and the native-queue-policy DCO path for v5-reachable commits applies). The automatedv6-topup.ymlruns were failing on conflicts.What this carries
.github/release-lines.yml:release_lines: [v4, v5, v6]), from v5 PR "β¨ release: make v6 an official release line (v6.x.y tags)" (merged asbde4411c9):tagged-release.ymlparameterised onRELEASE_LINE=github.ref_name, with therelayjob that dispatches the workflow on each non-default declared line after a successfuldocker.ymlrun there, and the--is-release-lineguard replacing the hard-coded v5 check.promote-stable.ymlkeepsstable/candidate/:lateston v5 only.derive-release-version.sh/compile-changelog.shtakeRELEASE_LINE; on v6 with nov6.*tag the first run derivesv6.0.0(bump=first), consuming the ~2.1k fragments carried on v6 (verified locally on this merge:release=true version=6.0.0 bump=first).releases.md,release-channels.md,release-line-guard.mdchecklist,v5-ga.md/release-rollback.mdanchors.dc4f20c13):tagged-release.ymlstate machine (precheck/backstop/push_line), per-rundocker.ymlconcurrency groups β this is what unblocked v5.187.0βv5.189.0.Image channel mapping after this lands
ghcr.io/hivecommons/{hive,hive-contributor,hive-hub}:stable,:candidate,:latestpromote-stable.yml(unchanged):v5.x.ytagged-release.ymlon v5:edge,:v6-latestdocker.ymlrowsv6 false edge(unchanged):v6.x.y(first:v6.0.0)tagged-release.ymldispatched on v6 by the v5relayjobstabledoes not follow v6.Conflict resolutions (v5 behaviour carried into v6 structure)
.github/release-lines.yml: v5 manifest + v6-only pinned entries re-added as[-v4, -v5](hive-action-tests,hive-chat-phone-sweep,prometheusrule-check,kustomize-render).tagged-release.yml,releases.md,release-line-guard.md,test-release-push-retry.sh: v5 versions (already parameterised).pkg/config(v6 split into files): ported v5'scli_memorydecode/encode,AdvisorMaxPerKickdefault,NudgeRepeatAfter; the v6 marshal early-return now also checksAgentsCLIMemory.crux/api/host_setters.go:SetKnowledgeAdviserrow.issue_request_watcher.go: origin-note branch in v6's comment chain.review_backlog.go: v5 collapse rewrite + v6findingNeedsNoActionandSameFilePath.stagelabels/store.go:WithdrawNudge(v6) andMarkNudgedReason/NudgeReasonSlug(v5) both kept;WithdrawNudgenow also forgets the reason class.automerge_contributor_nudge.go:withdrawNudgematches v5'sreason=<slug> head=<sha>marker.min_severity: P3; comment-marker ratchet baseline 46 on v6 (v6-only emitters).packs-and-acmm.md(v5 table + v6blocker/handoffrow, citations re-resolved),stage-labels.md,scale-envelope.mdcitation.changelog.d/fixed-14225.md: v6-only fragment was missing its leading-(would have failed the fragment guard).TRUSTED_SCRIPTS_TREEre-pinned to23eed03bebbb82deb0128f396b551939326729f2(=src/scriptstree of this merge).Validation
go build ./...,go vet,go testonpkg/...,internal/...,crux/{api,config,checkout,cli,kubejob,serve}(only pre-existing localreleasesentinelgit-env failures, identical on pristine v5/v6);check-release-lines.sh,test-release-lines-guard.sh,test-release-push-retry.shPASS;actionlintclean; docs link/citation checks clean;compile-changelog.sh+RELEASE_LINE=v6 derive-release-version.shβv6.0.0.After merge
docker.ymlpush run on v6 β v5'stagged-release.ymlrelaydispatchestagged-release.yml --ref v6β tagv6.0.0, GitHub Release withhive-v6.0.0-sbom.spdx.json,hive-contributor-v6.0.0-sbom.spdx.json,hive-hub-v6.0.0-sbom.spdx.json, NOTICE; imagesghcr.io/hivecommons/{hive,hive-contributor,hive-hub}:v6.0.0.