Skip to content

πŸ”€ sync: merge upstream hivecommons/hive v6 (f9389dbba) into tuna/v6 - #195

Merged
hanthor merged 2568 commits into
tuna/v6from
sync/upstream-v6-f9389dbba
Nov 18, 2026
Merged

hanthor merged 2568 commits into
tuna/v6from
sync/upstream-v6-f9389dbba

Conversation

@hanthor

@hanthor hanthor commented Nov 18, 2026

Copy link
Copy Markdown
Member

Merges current upstream hivecommons/hive v6 HEAD (f9389dbba) into tuna/v6 with a merge commit. Supersedes #179, whose base had moved and which conflicted with tuna/v6.

Conflict resolution

Upstream wins, except where tuna/v6 carries a fork-only patch that upstream does not have (see FORK.md, "Pilot-line patches"):

Checks run locally

Per this repo's rule, go test, go vet and lint were not run. Only go build ./..., gofmt -l on the hand-resolved files, node --check on the proxy files and bash -n on the deploy scripts were run. CI decides the rest.

Merge with a merge commit (merge-method/merge), never a squash.

πŸ€– Generated with Claude Code

actions-user and others added 30 commits November 17, 2026 05:40
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.294.0 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
Automated pin bump (hivecommons#8419). Digests recomputed from the downloaded
release artifacts by src/scripts/cli-pin-bump.sh:

  VERSION=18.22.0
  SHA256_AMD64=f706b27ba845834d8f8360705a2e9ba1534f3593fa24411d41358272de33642b
  SHA256_ARM64=7238dd213d5c61bc9bf51735d552bc71901fdd44329f862b0a971146b1cdac3e

Signed-off-by: hive-release[bot] <hive-release@hive.kubestellar.io>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Automated pin bump (hivecommons#8419). Digests recomputed from the downloaded
release artifacts by src/scripts/cli-pin-bump.sh:

  VERSION=2.1.326

Signed-off-by: hive-release[bot] <hive-release@hive.kubestellar.io>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>
…th (hivecommons#18604)

The guard was cancelled at its 10-minute timeout whenever the
whisper-linux-amd64 gha cache missed. The repo's Actions cache runs at
12-23 GB against a 10 GB cap, so LRU eviction regularly drops the
whisper-builder blobs; the hosted 4-vCPU runner then compiles FFmpeg and
whisper.cpp from source (~8.5 min serial chain) and the job needs ~13 min.
Warm runs measure 6.5-8 min and are unaffected.

Raise the timeout to 20 min (cold path plus ~50% headroom) and skip the
buildx post-step teardown on the ephemeral runner (16-36s per run).
Regenerated the integration workflows from v2-ci.yml.

Signed-off-by: Andy Anderson <andy@clubanderson.com>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v6.41.0 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
Avoid collisions with delayed tmux operations from shuffled tests and drain the readiness helper before session teardown.

Hive-Run: hivecommons#18626
Hive-Plan: restart-kick-flake
Hive-Spec: restart-kick#readiness
Signed-off-by: Karibhou <Karibhou@users.noreply.github.com>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.295.0 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
…ns#18651)

* ✨ advisory engine: default-off shadow sessions over Model Gateways

Phase 1 of RFC hivecommons#18464 as scoped by the maintainer decision
(issuecomment-6938430548): wire llmrouter, the hivetool read executor
and the toolapprove hive-tool classes as a default-off, report-only
advisory engine, run in shadow.

- config: new advisory_engine block (enabled, mode=shadow only,
  gateways by Model Gateway name with model/daily_cap,
  allow_training_providers_for_private, max_turns, items_per_cycle).
  Absent or any other mode is off.
- Model Gateways gain trains_on_inputs (YAML-only, preserved by the
  dashboard gateway and OpenRouter upserts).
- llmrouter: port TrainsOnInputs, WithPrivateRepo and
  WithAllowTrainingProvidersForPrivate from the tuna-os fork;
  FromGateway carries the gateway flag.
- pkg/advisoryengine: after each eval cycle's SetLastActionable the
  engine takes up to items_per_cycle unseen issues and runs one session
  at a time in the background, at ADVISORY / ACMM L2, offering only
  toolapprove read-only tools. Results go to the log and the dashboard
  audit log (advisory_engine_shadow) and are never acted on.
- The engine's only GitHub surface is hivetool's GET-only RESTReader
  over a transport that refuses every non-GET/HEAD request. Unknown
  repository visibility counts as private.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>

* πŸ› advisory engine: keep the config JSON shape unchanged when the block is absent

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>

* 🌱 settings parity: allowlist the YAML-only advisory engine leaves

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>

* 🌱 advisory engine: cover the skip, finish-phase, error and bounds paths

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>

* πŸ”’ advisory engine: metadata-only records for private repositories

Owner decision on hivecommons#18651: for a private or unknown-visibility repository
the shadow result, the audit record and the log line carry no advice
text, only repo, number, outcome kind, verified citations, turns,
provider, model, served requests and duration. Public repositories keep
the 600-character summary in the audit record.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
* ✨ feat: range attribution core for post-merge runs

Pure, GitHub/Tekton-agnostic AttributeRuns in workflowmodel: attributes
post-merge runs per pipeline/environment to merged PRs by range prev..R,
first success wins, failure holds until a later success covers it, and
undeterminable revisions or ranges stay unknown with a recorded reason.

Part of hivecommons#18356. Closes hivecommons#18644.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* changelog: fragment for hivecommons#18653

Generated by changelog-fragment-guard from the PR title (hivecommons#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>
hivecommons#18654)

* 🌱 advisor: hermetic probe that proves a Codex/Copilot run has no tools

Adds src/test/advisor_toolless_probe, the step-1 check for hivecommons#18421: a
disposable container with the Codex and Copilot CLIs at the versions
src/Dockerfile pins runs each CLI in a locked-down invocation against
adversarial prompts (run id, read a canary, write a marker, fetch a URL,
call an MCP tool, @path) and passes only if no tool ran and no canary
leaked into output, logs, sessions or model requests.

Fake mode (default) needs no login and no network: a fake model inside
the container calls every tool it is offered plus well-known unoffered
names, so it proves what the CLI itself lets run. A run without the
lock-down flags is a negative control that must fail. Login mode runs
the same cases against the real providers on a test login, and refuses
to start on a hive host.

Hive-Run: hivecommons#18421
Hive-Plan: hivecommons#18421 Work step 1 (verify per CLI)
Hive-Spec: advisor-subscription-backends#step-1
Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>

* changelog: add fragment for the advisor tool-less probe

Hive-Run: hivecommons#18421
Hive-Plan: hivecommons#18421 Work step 1 (verify per CLI)
Hive-Spec: advisor-subscription-backends#step-1
Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>

* 🌱 advisor probe: union offered tools, count every Copilot tool start, control login mode

Address the review on hivecommons#18481:
- fake mode unions the offered tool list over every model POST, so a
  tool-less side request before the main turn cannot hide offered tools;
- Copilot counts every tool.execution_start as a tool that ran, not only
  a successful completion;
- login mode runs the unlocked read control too and requires it to FAIL,
  and reports a clean locked case as NO-TOOL-SEEN instead of PASS;
- a run where PROBE_CLIS matched no CLI exits non-zero.

Hive-Run: hivecommons#18421
Hive-Plan: hivecommons#18421 Work step 1 (verify per CLI)
Hive-Spec: advisor-subscription-backends#step-1
Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>

* fix: correct advisor probe changelog metadata

Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>

* fix: pin advisor probe base image digest

Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>

* fix: distinguish rejected unknown probe tools

Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>

* docs: align probe changelog wording with category

Signed-off-by: Karibhou <Karibhou@users.noreply.github.com>

* ci: re-evaluate native-queue-policy on a fresh head

A skipped Feedback Wanted 'gate' job (fired by the close of the original
PR hivecommons#18481) is attached to the previous head SHA and shadows the real
docker.yml 'gate' in native-queue-policy. No content change.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Signed-off-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 v6.42.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.296.0 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
* [scanner] fix: Tekton PipelineRun post-merge observer (hivecommons#18646)

Add an explicit tektonRuns config on Tekton pipelines (kube context or
in-cluster, namespace, label selector, optional revision annotation/param
names) and an observer that lists PipelineRuns, reads each run's revision
(pipelinesascode.tekton.dev/sha annotation, then the revision param) and
conclusion, and feeds them through workflowmodel.AttributeRuns. A run
whose revision is not a full commit SHA keeps an empty revision with the
reason recorded, so attribution leaves the column unknown.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* [scanner] test: cover tekton observer error paths for the coverage floor

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* docs: say the Tekton observer is not wired into the stage engine yet

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…ivecommons#18656)

* [scanner] fix: GitHub Actions post-merge run observer feeding pipeline.status

Observe default-branch push runs (Main CI, exact merge SHA when the
range cannot decide), release and deploy workflow runs of the workflows
an ingested model binds, attribute them to merged PRs through
workflowmodel.AttributeRuns and carry the result in
PRFacts.PostMerge so pipeline.status reports green/red/running instead
of always unknown. Never guess: pull-request and merge-queue runs never
count, a deploy run without its environment credits none of the bound
environments, and an undeterminable revision or range stays unknown
with the reason recorded.

Closes hivecommons#18645

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* docs: say the Actions observer is not wired into the sweep yet

Signed-off-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 v6.42.1 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
…ivecommons#18662)

The workflow simulate's merged-PR fill now calls the GitHub Actions
post-merge observer (ObservePostMergeRuns) with the PR's merge commit and
default branch, so pipeline.status reflects observed runs instead of
always being unknown. Refs hivecommons#18356.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.297.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.298.0 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
…rence limit (hivecommons#18668)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…ns#18669)

A PR the stage pass held at 085 on the same head was re-parked with a
bare route when the lane's own human route came back without a decision:
on projectbluefin/fsdk-containers#553 the contributor lane's verdict cache
read no verdict while the stage pass held requires_human with the finding
"the reviewer marked this change high-risk", and DecisionComment rendered
"Needs a decision, not a merge:" over an empty list.

- preserveNeedsDecisionOnSameHead's re-park now builds its route from the
  stage pass's verdict (sameHeadDecisionRoute): the requires_human
  verdict, the finding, and the question or summaries, in the wording
  RouteHuman uses (stagelabels.RequiresHumanReasons).
- The shared-CI permission park carries its decision cause as the reason.
- DecisionComment never renders an empty list: a route with no reasons
  names DecisionReasonUnnamed ("the reviewer asked for a human
  decision"), and postHumanEntry logs a warning naming the PR and head.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1
Signed-off-by: Danathar <6772335+Danathar@users.noreply.github.com>
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v5.298.1 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
…ports (hivecommons#18674)

The repo's Actions cache is over the 10 GB cap, so LRU eviction kept
dropping the whisper-builder blobs and builds recompiled whisper.cpp and
FFmpeg (slow for arm64 under QEMU).

- whisper-builder warm step: cache-from/cache-to a dedicated GHCR registry
  cache (hive-buildcache:whisper-<arch>), exported only by push builds.
  Same-repo PR builds log in and read it only; fork PRs never run the job.
- hub and mx builds: drop the gha cache. Both stages of each Dockerfile are
  in no-cache-filters, so the mode=max export could never be hit.
- contributor build: export the gha cache only on push builds, so PR refs
  stop adding entries that only that PR can see.
- overlayfs-exec-guard (v2-ci and its generated copies): read whisper layers
  from the registry cache instead of the gha scope that is no longer written.

Signed-off-by: Andy Anderson <andy@clubanderson.com>
… own save (hivecommons#18673)

The Copilot CLI's atomic save replaces the per-agent config.json symlink
seconds after launch, so a later dashboard login never reached running
agents. The pane poller now relinks within one poll interval, merging
CLI-written non-credential fields into the shared file first (shared login
wins), serialized against the hive's token writers. The hivecommons#18445 guard for a
private copy holding the only login is kept.

Fixes hivecommons#18671

Signed-off-by: Andy Anderson <andy@clubanderson.com>
actions-user and others added 17 commits November 18, 2026 15:33
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v6.47.0 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
…deny-list (hivecommons#19009)

* fix(contribute): run opencode headless in every mode

The relay has no pane classifier for opencode (bin/lib/pane-classifier.js),
so `just contribute-hive opencode local`, which launched it in an
interactive tmux pane, never read as ready: the relay logged "CLI is not
ready yet β€” withholding ready" in front of an idle opencode prompt and no
task was ever sent. The recipe already said opencode only runs headless but
never selected it.

- contributor-relay.js: HEADLESS_ONLY_BACKENDS (cline, opencode) select
  headless whatever CONTRIBUTOR_MODE says.
- contributor-agent.sh: the container entrypoint does the same for opencode.
- Justfile local mode: opencode exports CONTRIBUTOR_MODE=headless and its
  OPENCODE_PERMISSION deny-list into the relay's environment, so each
  `opencode run` keeps the host-state denials; a headless backend gets no
  tmux pane.

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

* test(contribute): opencode container knowledge links stay in $HOME (headless)

opencode now runs headless whatever CONTRIBUTOR_MODE says, so the entrypoint
links its AGENTS.md in $HOME like any headless backend. Move it out of the
interactive container-placement loop and assert the headless placement.

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

* fix(contribute): the host side selects headless for opencode in container mode too

Review on hivecommons#19009: only cline exported CONTRIBUTOR_MODE=headless on the host
side, so container-mode opencode was offered a tmux attach to a container
with no session and took the interactive krun branch. Export it for opencode
next to cline; pin it in the test.

Signed-off-by: Danathar <6772335+Danathar@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1
…Close (hivecommons#19016)

Signed-off-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 v6.47.1 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
…easesTheQueue (hivecommons#19017)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…ecommons#19023)

requestProwPresubmitsForFork skipped only the merge-request relay. On a
repo whose auto-merge is off, the observe-only pass reached it too: its
mutation boundary refuses the comment by design, and each pass runs on a
fresh engine whose per-head mark is empty, so the refused attempt logged
"automerge failed to post ok-to-test workflow approval command" at WARN on
every re-evaluation (projectbluefin/server#690: 11 times on one head in
30 minutes). Return before the post in an observe-only pass or the
read-only eligibility probe, as the workflow-fence audit comment does
(hivecommons#17668).

Signed-off-by: Danathar <6772335+Danathar@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1
…blocker (hivecommons#19024)

The rerun 403 (`unauthorized:rerun-shared-ci`, hivecommons#16277) replaced the stage,
reason and route of every PR whose exact head it was refused for, whatever
held the PR: on projectbluefin it showed "re-run CI" over a reviewer's
changes request (utah#1313), a withheld security approval
(utah-packages#1013) and high-risk decision requests. It was meant to keep an
infrastructure failure out of source fixing, not to outrank review gates.

RecoveryUnauthorizedOwnsStage lets it take the stage only when CI is what
holds the PR (a red/pending check, a shared-CI or base-branch-red deferral,
a red optional check) and no review gate stands; it is used by both the
stage-label pass and DerivePR. The hive:unauthorized label and comment are
still written either way.

Signed-off-by: Danathar <6772335+Danathar@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1
…abled (hivecommons#19021)

shared_ci_rerun.enabled was yaml-only (settings_parity_allowlist.txt, TODO
hivecommons#11854). A hive whose App has no Actions write, an optional permission
(src/docs/github-app-setup.md), gets a 403 on every rerun-failed-jobs and a
note on each PR, and could only turn the sweep off by editing its config.

- Features PUT/GET: sharedCiRerunEnabled.
- Settings -> Features -> Quality loops & release health -> Shared-CI
  recovery: a toggle with a YAML hint and help, plus a search entry.
- Admin MCP governor.feature_settings accepts it and discloses turning it on.
- The key leaves the parity allowlist; docs updated.

Refs hivecommons#11854

Signed-off-by: Danathar <6772335+Danathar@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1
Automated release commit. Compiles changelog.d/ fragments and moves
the CHANGELOG.md Unreleased section into a dated v6.48.0 entry.
See src/docs/releases.md.

Signed-off-by: hive-release-bot <actions@github.com>
…9066)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…nistic (hivecommons#19068)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…e-path hold (opt-in per repo) (hivecommons#19015)

* ✨ auto-merge: an owner's approval of the head releases the human-merge-path hold (opt-in per repo)

New key auto_merge.human_merge_owner_approval, a list of owner/repo,
empty by default. On a listed repository a trusted merger's explicit
approval of a PR's current head releases the hold the human-merge-path
gate put on it, and the merge lanes merge the PR once CI, review, soak
and every other gate pass. Unlisted repositories keep today's rule and
`/hive approve` reply word for word.

- Approval: the workflow-path fence's (workflowFenceApproval: Approve
  review, dashboard approve, typed /hive decision approve) plus a
  trusted merger's /hive approve posted after the head was first seen.
- Release: the stage-label pass, next to the stale-head lift, through
  ReleaseApprovedHumanMergePathHold. It shares the pin-only release's
  provenance checks, widened only so it may lift the hold on the head it
  was put on and a hold the App re-added on a later head; any person's
  hold application, another hold source, or a write-back refusal keeps
  the hold. The gate lets an approved head through instead of re-holding.
- Audit: one comment per head names the approver and head, plus a log
  line.
- 085 route asks for the approval instead of a manual merge; the
  /hive approve reply says "released for <sha>".
- Dashboard multi-select with help mark, PUT/PATCH validation (400 for a
  repo outside project.repos), admin MCP auto_merge.update row.
- Docs: hive-merge.md section, maintainer-commands.md, settings.md,
  admin-mcp.md, api-reference.md; changelog fragment.

Refs Danathar/goodreads-mcp#463.

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

* test(automerge): expect the 7-char ShortSHA in the human-merge approval comment

humanMergeApprovalComment renders the head via stagelabels.ShortSHA,
which trims to 7 characters; the test asserted an 8-character prefix,
so it failed on every run. Assert the exact backticked 7-char form.

Hive-Run: hivecommons#19015
Hive-Plan: fix-pr check-failure
Hive-Spec: auto_merge.human_merge_owner_approval#audit-comment

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Danathar <Danathar@users.noreply.github.com>

* fix(automerge): the PR author's own approval never releases the human-merge-path hold

Review asked whether a trusted merger who authors a PR touching a
human_merge_paths file could approve it themselves. They could (typed
/hive decision approve or /hive approve); reject any approval whose login is
the PR author. Also add the missing auto_merge.human_merge_owner_approval row
to the operator reference.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Signed-off-by: Danathar <Danathar@users.noreply.github.com>
Conflicts resolved in upstream's favour, except where tuna/v6 carries a
fork-only patch upstream does not have:

- Keeps fork security fix b4c7ceb.
- Revert sheriff (pilot): wiring moved from the removed runSweeps into the
  red_main sweep worker.
- Open-PR guard rate-limit backoff (#175) kept alongside upstream's label
  backoff; its operator-reference paragraph moved to the split subpage.
- Hub registration v1 PATCH prototype (#189) kept over upstream's v1 file,
  which is the same code without PATCH.
- Upstream versions adopted for the agent-proposal gate, the omp ioscan
  backend, the device-flow proxy routes, the agent NO_PROXY helper and the
  self-service backports, which upstream has merged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
…iteback gate

Upstream's writeback containment ratchet (pkg/writeback TestDirectWriteRatchet)
refuses ungated direct writes. The fork's revert sheriff now consults the
shared ci_rerun writeback policy before rerunning a failing job and again
before opening a held revert, so operator pauses and per-repo write
restrictions apply to it too.

Ported from #172 (71ce0ef) without its Matrix kiosk test edits, which the
upstream refresh supersedes.

Signed-off-by: James Reilly <jreilly1821@gmail.com>
Upstream's notification write-site inventory (TestNotificationWriteSitesInventory)
requires every notification-capable write to carry a class. The tuna-os
revert sheriff's note on the culprit PR asks its author to look, so it is
attention; listed in src/docs/notifications.md too.

Signed-off-by: James Reilly <jreilly1821@gmail.com>
@hanthor hanthor added the merge-method/merge Hive merges this PR with a merge commit (mixed authorship, each commit self-signed); never squash label Nov 18, 2026
… from the pilot workflow

The tmux server start command moves to manager_tmux_server.go. The pilot
binary workflow runs on tuna/v6 only, now that v6 is a release line.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
@tuna-reef-hive

Copy link
Copy Markdown
cb9b036

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

Hive flagged this PR (author @hanthor, head cb9b036b5975) 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.

  • sensitive_path β€” changes 134 sensitive path(s) (Touches a sensitive path (OWNERS, workflows, policies, hive config, security docs, …))
    • .github/dependabot.yml
    • .github/release-lines.yml
    • .github/scripts/testdata/claude-model-freshness/Dockerfile.txt
    • .github/workflows/changelog-fragment-guard.yml
    • .github/workflows/ci-runner-image.yml
    • .github/workflows/claude-model-freshness.yml
    • .github/workflows/cli-pin-bump.yml
    • .github/workflows/coverage-hourly.yml
    • .github/workflows/crux-file-size-ratchet.yml
    • .github/workflows/dashboard-mobile-shots.yml
    • .github/workflows/dco-post-merge.yml
    • .github/workflows/dco-push-delta.yml
    • .github/workflows/dco-squash-attribution.yml
    • .github/workflows/docker.yml
    • .github/workflows/docs-index-reminder.yml
    • .github/workflows/docs-link-check.yml
    • .github/workflows/feedback.yml
    • .github/workflows/fossa.yml
    • .github/workflows/gh-aw-compile.yml
    • .github/workflows/go-security-analysis.yml
    • .github/workflows/integration-candidate-prepare.yml
    • .github/workflows/integration-candidate.yml
    • .github/workflows/integration-technical-go-security-analysis.yml
    • .github/workflows/integration-technical-v2-ci.yml
    • .github/workflows/integration-technical-v2-tests.yml
    • .github/workflows/issue-closed-reopen-hint.yml
    • .github/workflows/kustomize-render.yml
    • .github/workflows/monthly-outcomes.yml
    • .github/workflows/mutation-advisory.yml
    • .github/workflows/native-queue-policy.yml
    • .github/workflows/podman-arm64-lane.yml
    • .github/workflows/podman-contract.yml
    • .github/workflows/podman-rootful-lane.yml
    • .github/workflows/podman-rootless-lane.yml
    • .github/workflows/pr-auto-update-test.yml
    • .github/workflows/pr-auto-update.yml
    • .github/workflows/pr-overlap.yml
    • .github/workflows/pr-verifier.yml
    • .github/workflows/prometheusrule-check.yml
    • .github/workflows/promote-stable.yml
    • .github/workflows/quadlet-gate.yml
    • .github/workflows/scorecard.yml
    • .github/workflows/static-model-freshness.yml
    • .github/workflows/stream-image.yml
    • .github/workflows/suid-contract.yml
    • .github/workflows/tagged-release.yml
    • .github/workflows/v2-ci.yml
    • .github/workflows/v2-tests.yml
    • .github/workflows/v6-topup-autoresolve-tests.yml
    • .github/workflows/v6-topup.yml
    • .github/workflows/weekly-competitor-report.lock.yml
    • .github/workflows/weekly-competitor-report.md
    • Justfile
    • Makefile
    • bin/gh-wrapper.sh
    • bin/gh-wrapper.test.sh
    • dashboard/package-lock.json
    • src/Dockerfile
    • src/Dockerfile.contributor
    • src/Dockerfile.mx
    • src/crux/go.mod
    • src/crux/logread/secrets.go
    • src/crux/proxy/rules.go
    • src/crux/proxy/rules_deny.go
    • src/crux/proxy/rules_test.go
    • src/deploy/README.md
    • src/deploy/ci-runners/Dockerfile
    • src/deploy/ci-runners/lke/README.md
    • src/deploy/ci-runners/lke/hive-runners-lke-values.yaml
    • src/deploy/entrypoint.sh
    • src/deploy/gh-aw/README.md
    • src/deploy/hive-oke/acme-dns/README.md
    • src/deploy/hive-oke/acme-dns/clusterissuer-rfc2136.yaml
    • src/deploy/hive-oke/acme-dns/configmap.yaml
    • src/deploy/hive-oke/acme-dns/deployment.yaml
    • src/deploy/hive-oke/acme-dns/kustomization.yaml
    • src/deploy/hive-oke/acme-dns/namespace.yaml
    • src/deploy/hive-oke/acme-dns/secret.example.yaml
    • src/deploy/hive-oke/acme-dns/service.yaml
    • src/deploy/inference/vllm-deployment.yaml
    • src/deploy/k8s/deployment.yaml
    • src/deploy/k8s/error-pages.yaml
    • src/deploy/k8s/sandbox-job-rbac.yaml
    • src/deploy/k8s/sandbox-substrate-preflight-rbac.yaml
    • src/deploy/k8s/secret.yaml
    • src/deploy/kustomize/components/monitoring/README.md
    • src/deploy/kustomize/components/monitoring/hive-metrics.json
    • src/deploy/kustomize/components/monitoring/kustomization.yaml
    • src/deploy/kustomize/components/monitoring/patch-deployment.yaml
    • src/deploy/kustomize/components/monitoring/prometheusrule.yaml
    • src/deploy/kustomize/components/monitoring/servicemonitor.yaml
    • src/deploy/kustomize/components/monitoring/tests/prometheusrule_test.yaml
    • src/deploy/nginx.conf
    • src/deploy/openshell.md
    • src/deploy/stream/.gitignore
    • src/deploy/stream/Dockerfile
    • src/deploy/stream/README.md
    • src/deploy/stream/authproxy/main.go
    • src/deploy/stream/authproxy/main_test.go
    • src/deploy/stream/docker-compose.yaml
    • src/deploy/stream/entrypoint.sh
    • src/deploy/stream/fleet/configmap.yaml
    • src/deploy/stream/fleet/deployment.yaml
    • src/deploy/stream/fleet/kustomization.yaml
    • src/deploy/stream/fleet/namespace.yaml
    • src/deploy/stream/fleet/networkpolicy.yaml
    • src/deploy/stream/fleet/secret.yaml
    • src/deploy/stream/healthcheck.sh
    • src/deploy/stream/k8s/configmap.yaml
    • src/deploy/stream/k8s/deployment.yaml
    • src/deploy/stream/k8s/kustomization.yaml
    • src/deploy/stream/k8s/namespace.yaml
    • src/deploy/stream/k8s/networkpolicy.yaml
    • src/deploy/stream/k8s/secret.yaml
    • src/deploy/stream/overlays/hive-hosted-matrix/kustomization.yaml
    • src/deploy/stream/overlays/hive-hosted/kustomization.yaml
    • src/deploy/stream/public-safe-gate.sh
    • src/deploy/stream/stream-watchdog.sh
    • src/deploy/stream/test-stream-watchdog.sh
    • src/deploy/substrate.md
    • src/deploy/test_arm64_lane_probes_pr_code.sh
    • src/deploy/test_ci_build_lane_aggregate.sh
    • src/deploy/test_cline_install_retry.py
    • src/deploy/test_contributor_container_resources.sh
    • src/deploy/test_entrypoint_perm_guard.sh
    • src/deploy/test_entrypoint_replica_names.sh
    • src/deploy/test_entrypoint_runtime_config.sh
    • src/deploy/test_hivectl_extraction_contract.sh
    • src/deploy/test_pr_verifier_advisory.sh
    • src/deploy/test_supply_chain_pins.sh
    • src/deploy/test_ttyd_attach_hangup.sh
    • src/deploy/test_ttyd_session_attach_token.sh
    • src/deploy/test_ttyd_session_readonly_attach.sh
    • src/deploy/ttyd-tmux.sh
  • permission_escalation β€” widens workflow permissions or uses pull_request_target (Widens GitHub Actions permissions or switches to pull_request_target)
    • .github/workflows/changelog-fragment-guard.yml
    • .github/workflows/claude-model-freshness.yml
    • .github/workflows/integration-candidate-prepare.yml
    • .github/workflows/mutation-advisory.yml
    • .github/workflows/native-queue-policy.yml
    • .github/workflows/stream-image.yml
    • .github/workflows/tagged-release.yml
  • ci_gate_weakening β€” CI configuration is deleted, softened or has gate checks removed (Disables or softens CI gates (continue-on-error, || true, removed checks))
    • .github/workflows/changelog-fragment-guard.yml
    • .github/workflows/cli-pin-bump.yml
    • .github/workflows/docker.yml
    • .github/workflows/go-security-analysis.yml
    • .github/workflows/integration-technical-go-security-analysis.yml
    • .github/workflows/integration-technical-v2-ci.yml
    • .github/workflows/integration-technical-v2-tests.yml
    • .github/workflows/mutation-advisory.yml
    • .github/workflows/pr-auto-update-test.yml
    • .github/workflows/pr-verifier.yml
    • .github/workflows/static-model-freshness.yml
    • .github/workflows/stream-image.yml
    • .github/workflows/tagged-release.yml
    • .github/workflows/v2-ci.yml
    • .github/workflows/v2-tests.yml
    • .github/workflows/weekly-competitor-report.md
  • test_removal β€” deletes 3 test file(s) (Deletes test files or guts test coverage)
    • src/crux/agent/blocking_prompt_test.go
    • src/crux/agent/dedup_bench_test.go
    • src/crux/agent/manager_pane_sanitizer_test.go
  • security_policy_edit β€” edits security policy, scanner config, rulesets or hooks (Edits SECURITY.md, dependabot/CodeQL config, rulesets or git hooks)
    • .github/dependabot.yml
    • security-insights.yml
  • 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/agent/backend_auth_test.go
    • src/crux/agent/bob_settings.go
    • src/crux/checkout/checkout_test.go
    • src/crux/cmdlog/cmdlog_test.go
    • src/crux/logscrub/find_secret_test.go
    • src/crux/logscrub/pane_test.go
    • src/crux/logscrub/scrub_test.go
    • src/crux/pushbroker/pushbroker_test.go
    • src/crux/runs/cmdlog_test.go
    • src/crux/runs/service_test.go
    • src/crux/signals/signals_test.go
    • src/deploy/entrypoint.sh
    • src/deploy/hive-oke/acme-dns/deployment.yaml
    • src/deploy/stream/Dockerfile
    • src/deploy/test_ci_build_lane_aggregate.sh

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.

@hanthor

hanthor commented Nov 18, 2026

Copy link
Copy Markdown
Member Author

CI result: everything passes except two checks, and upstream's own content causes both. I have not merged this PR.

  • Sign-off survives the squash: fails on upstream commits whose Signed-off-by names upstream people and bots (for example dda38c925, 40d3be36f, b8e050dea). This is the same blocker πŸ”€ sync: merge upstream hivecommons/hive v6 (dea69b350) into tuna/v6Β #179 had. The checker exempts only LANDED_REFS=origin/v4, so upstream v6 history counts as foreign sign-off. The fix is a policy decision, such as adding hivecommons/hive v6 to LANDED_REFS for merge-method/merge PRs into fork lines. Rewriting other people's sign-offs is not an option.
  • Build (PR gate, no push): upstream's hive-ci-runner image pins gh=2.104.0, and cli.github.com's apt repository does not have that version (E: Version '2.104.0' for 'gh' was not found). The fork did not change that file.

…rves

Upstream pins gh=2.104.0, but the apt repository keeps only the latest
release (2.105.0), so the runner image build failed with "Version
'2.104.0' for 'gh' was not found". The keyring checksum is unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
@github-actions

github-actions Bot commented Nov 18, 2026 •

Copy link
Copy Markdown

Open PR overlap check

βœ… Resolved: no conflicting open PRs or same-file overlaps remain against tuna/v6.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: James Reilly <jreilly1821@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge-method/merge Hive merges this PR with a merge commit (mixed authorship, each commit self-signed); never squash

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants