Skip to content

🌱 Forward-merge v5 into v6 (5 commits) - #17273

Merged
clubanderson merged 6 commits into
v6from
topup/v5-to-v6-20261108b
Nov 8, 2026
Merged

clubanderson merged 6 commits into
v6from
topup/v5-to-v6-20261108b

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Second top-up after #17265: v5 moved on by five commits while that PR was in CI.

Brought over from v5

Conflict resolutions

File Resolution
src/cmd/hive/main.go, src/pkg/dashboard/server.go, dashboard_import_allowlist.txt both sides (v6 matrix/msteams/knowledge + v5 maintainernotes)
src/pkg/dashboard/import_count_test.go v5's rationale comment, ceiling = v6's 66 + maintainernotes = 67
tracker-filter.js v6 finisher sort + v5 maintainer-notes UI
CHANGELOG.md both; v5.202.0 section placed after v6.0.1
src/docs/api-reference/*.md v6 pages + v5's three /api/notes rows; check-api-reference-citations.sh --fix
src/pkg/dashboard/static/index.html regenerated via go generate ./pkg/dashboard/webstatic/

Plain merge commit, v5 SHAs/sign-offs preserved. DCO/native-queue-policy reds are expected on forward-merges (others' commits; to be admin-merged with a merge commit like #17118/#17265.
EOF
)

Karibhou and others added 6 commits November 8, 2026 17:49
…ening a memory store (#17259)

* πŸ› fix(knowledge/climemory): never follow a symlinked ancestor when opening a memory store

cliMemoryDrainSources resolves each store with EvalSymlinks and keeps it
only under the agent's own home, but openMemoryStore then Lstat'ed the
store path and opened it with os.OpenRoot, both of which follow a symlink
in any ancestor component. The agent owns every directory from its home
down, so swapping `.claude`, `projects` or a project slug for a symlink
after the listing still had the hive drain, and with truncate empty,
another agent's store under this agent's name.

The store is now reached by opening its directories one component at a
time from the filesystem root: each entry is Lstat'ed through its parent
root, refused when it is a symlink or not a directory, and the opened
directory must be the inode Lstat saw. Source.Path is already
symlink-free when the crux side lists it, so any symlink found on the way
was swapped in afterwards.

Fixes #17256

Hive-Run: #17256
Hive-Plan: reviewer-backlog-security-17256
Hive-Spec: climemory-drain#store-open-no-follow
Signed-off-by: Karibhou <Karibhou@users.noreply.github.com>

* 🌱 test(knowledge/climemory): resolve the temp dir for the whole package

openMemoryStore refuses every symlinked ancestor, so on macOS, where
$TMPDIR sits under /var -> /private/var, stores created under a raw
t.TempDir() could not be opened. Resolve TMPDIR once in TestMain so all
tests in the package use a symlink-free path.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HRH6kmtNmwccuH34XZzoUp
Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>

---------

Signed-off-by: Karibhou <Karibhou@users.noreply.github.com>
Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>
Co-authored-by: Karibhou <Karibhou@users.noreply.github.com>
Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…17269)

S1 checkout: the server now carries a ceiling on a request's max_bytes
(checkout.Config.MaxBytes, --checkout-max-bytes / CRUX_CHECKOUT_MAX_BYTES,
default 5 GiB). A request above it is refused before any clone with
ErrAboveCeiling (a 400 bad_request); a request naming no cap gets the
ceiling. Private HTTPS repositories clone with CRUX_CHECKOUT_TOKEN, which
reaches git only through an inline credential helper reading the child's
environment: never an argument, never in a record, and git output is
scrubbed before it lands in an error. Git runs with GIT_TERMINAL_PROMPT=0.

S2 kubejob: the job backend takes job_network: none|host|default and
defaults to none, creating a per-Job deny-all NetworkPolicy (ingress and
egress) before the Job and removing it when the Job goes. A policy that
cannot be created refuses the run. host sets hostNetwork; default adds
nothing. The launcher shared with hive's agent sandbox keeps default when
Network is empty.

Fixes #17267
Part of hivecommons/crux#114

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
…injected into kicks (#17245)

* ✨ dashboard: per-item maintainer notes shared across maintainers and injected into kicks

Private, per-item notes maintainers leave each other on the Activity
Monitor rows: append-only JSONL store on the spoke
(/data/maintainer-notes.jsonl, never GitHub), GET/POST /api/notes and
DELETE /api/notes/{id} (author = dashboard session; write on the repo
to add, author-or-owner to delete), a maintainer-notes SSE frame so
other browsers follow live, a πŸ—’ button + count badge and inline
expander/composer on every row and PR sub-row, the count in the row
tooltip, and a # Maintainer notes section (1 KB cap) in the agent kick.

Fixes #17244

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* 🌱 maintainer notes: CI fixes β€” citation resync, import ratchets, lifted-reconcile guard

- api-reference citations resynced (check-api-reference-citations.sh --fix)
- pkg/maintainernotes allowlisted for pkg/dashboard; import count 59
- reconcile's composer-focus keep is guarded for the lifted test fixtures
- kick test expects the fixture's repo#number display ref

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* 🌱 maintainer notes: restore sed-touched tokens, openapi routes, phone-card density

- the token rename had hit 104 unrelated lines (--line-subtle/--text-faint);
  restored from v5, the notes CSS keeps its own tokens
- /api/notes GET/POST and DELETE /api/notes/{id} documented in
  dashboard/openapi.json (route-parity guard)
- phone card tier: the πŸ—’ shows only once an item has notes so unnoted
  cards keep their two-line head (#17161 density probe); the β‹― menu
  gains "Maintainer notes…" as the way in

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* 🌱 maintainer notes: port the SPA edits into static-src/ (index.html is generated)

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* 🌱 maintainer notes: store tests for replay edge cases, write failures, kick cap corners (coverage gate)

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* 🌱 maintainer notes: appease staticcheck SA4000 in Default() test

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>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.202.0 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
Top-up after #17265: brings v5.202.0 and the maintainer-notes feature
(#17245), the crux checkout cap / private-repo auth / kubejob network
hardening (#17269) and the climemory symlink fix (#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>
@clubanderson clubanderson added the no-changelog No changelog fragment required label Nov 8, 2026
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Nov 8, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign kellyaa for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubestellar-prow kubestellar-prow Bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 8, 2026
@github-actions

github-actions Bot commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v6

Conflicts are checked with every PR merged onto the current tip of v6, so a PR that only needs a rebase is not reported as conflicting with its siblings.

No conflicting open PRs or same-file overlaps were found.

@hivecommons-hive

hivecommons-hive Bot commented Nov 8, 2026 •

Copy link
Copy Markdown
Contributor

Hive status β€” updated in place; edits do not notify. Full history is in the Activity Monitor.

hive/awaiting-ci: native-queue-policy is red only because DCO is action_required (Error: DCO: action_required at native-queue-policy.cjs:122). DCO flags two commits brought over from v5 β€” 23511cb and 1f1a44c β€” where the GitHub squash author is "Andy Anderson andy@clubanderson.com" but every Signed-off-by reads "Andrew Anderson andy@clubanderson.com" (same email, different display name). The remaining checks are still in progress.

Proposed fix (maintainer action, hive cannot push to this branch): either set the DCO check to pass for this forward-merge (the commits are already on v5 under the same author/sign-off pair), or align the GitHub profile name with the sign-off name so future web squashes match. Not a code defect; no retry from the hive.


🐝 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

@clubanderson this PR is held at stage/071-needs-author and the hive will not merge it yet.

Failing checks:

  • check-failure

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.

@hivecommons-hive

Copy link
Copy Markdown
Contributor
41cfe0c

ℹ️ Sentinel notice β€” informational; author is trusted (owner), merge is not blocked

Hive flagged this PR (author @clubanderson, head 41cfe0c4180b) because it matches behaviors that can override security controls, escalate privileges or damage the codebase. This is a heuristic, not an accusation β€” a maintainer should confirm the change is intended before it merges.

  • remote_code_execution β€” adds a remote-fetch-and-execute, decoded payload, reverse shell or embedded credential (Adds curl|sh, eval of encoded payloads, reverse shells or embedded private keys)
    • src/crux/checkout/checkout_test.go

Hive did not add the sentinel-alert label because this author is trusted. The finding remains recorded for audit and the dashboard Security tab; set sentinel.trusted_authors_block: true to require the blocking label for trusted authors too.

@clubanderson
clubanderson merged commit 198f5c1 into v6 Nov 8, 2026
86 of 96 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the topup/v5-to-v6-20261108b branch November 8, 2026 18:58
@github-actions

github-actions Bot commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified the merge mechanically rather than by reading 60 files: this looks correct to me.

Method. 41cfe0c has parents 5cda089 (v6 tip) and 2a486c7 (v5 tip at the time). I ran git merge-tree --write-tree 5cda089 2a486c7 to get the automatic 3-way result and diffed the PR's tree against it. Every file where the two differ is either a hand resolution listed in the body's table or a regeneration output:

  • src/cmd/hive/main.go:62-67, src/pkg/dashboard/server.go:34-38, src/internal/testutil/dashboard_import_allowlist.txt:69-74 β€” markers removed, both sides kept (v6 matrix/msteams/knowledge + v5 maintainernotes), import order preserved.
  • src/pkg/dashboard/import_count_test.go:63-76 β€” v5's longer rationale comment kept, maxDashboardInternalImports = 67 = v6's 66 + maintainernotes, as the body states.
  • src/pkg/dashboard/static-src/js/tracker-filter.js:291-480 β€” v6's finisherRank closed with its own } and v5's maintainer-notes block appended after it; brace structure checks out against both parents.
  • CHANGELOG.md:11-85 β€” markers removed, v6.1.2 section followed by v5.202.0, as described.
  • src/docs/api-reference.md + src/docs/api-reference/*.md, static/index.html β€” the only files touched that v5's five commits did not touch, consistent with check-api-reference-citations.sh --fix and go generate as the body says.

No file outside that set differs from the automatic merge, and the five v5 commits in 1b63610..2a486c7 match the body's list exactly. v5 has since gained d405c95 (v5.203.0 release) β€” not a problem with this PR, just the next top-up.

Not a maintainer; the DCO / native-queue-policy reds are the expected forward-merge pattern per the body and the admin-merge call is yours.

β€” hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

hivecommons-hive Bot pushed a commit to Danathar/hive that referenced this pull request Nov 8, 2026
Brings the v5.203.0 release commit onto v6 after hivecommons#17273. CHANGELOG keeps
both lines' sections (v5.203.0 under v6.0.1); the two fragments it
compiled are dropped on v6 since v6 now carries them via the v5.203.0
CHANGELOG section.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dco-signoff: yes Indicates the PR's author has signed the DCO. no-changelog No changelog fragment required size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants