Repository navigation
π± Forward-merge v5 into v6 (5 commits) - #17273
Conversation
β¦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>
release: v5.202.0
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>
|
[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 No conflicting open PRs or same-file overlaps were found. |
|
Hive status β updated in place; edits do not notify. Full history is in the Activity Monitor. hive/awaiting-ci: 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: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 @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. |
41cfe0c
βΉοΈ Sentinel notice β informational; author is trusted (owner), merge is not blockedHive flagged this PR (author @clubanderson, head
Hive did not add the |
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
There was a problem hiding this comment.
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 (v6matrix/msteams/knowledge+ v5maintainernotes), 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'sfinisherRankclosed 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 withcheck-api-reference-citations.sh --fixandgo generateas 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
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>
Second top-up after #17265: v5 moved on by five commits while that PR was in CI.
Brought over from v5
changelog.d/added-crux-turn-signals.mddropped (compiled into v5.202.0, carried via CHANGELOG);added-maintainer-notes.mdandadded-crux-s1-s2-followups.mdkept for the next v6 release.Conflict resolutions
src/cmd/hive/main.go,src/pkg/dashboard/server.go,dashboard_import_allowlist.txtsrc/pkg/dashboard/import_count_test.gotracker-filter.jsCHANGELOG.mdsrc/docs/api-reference/*.md/api/notesrows;check-api-reference-citations.sh --fixsrc/pkg/dashboard/static/index.htmlgo 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
)