Skip to content

🌱 chore: top up v6 from v5 (2026-11-15, third) - #18312

Merged
clubanderson merged 10 commits into
v6from
topup/v5-to-v6-20261115c
Nov 15, 2026
Merged

clubanderson merged 10 commits into
v6from
topup/v5-to-v6-20261115c

Conversation

@clubanderson

Copy link
Copy Markdown
Member

This PR merges origin/v5 (2afddbd, release v5.269.0 plus #18298) into v6 (f00d126) as a single signed merge commit. After it lands, origin/v5 is an ancestor of v6 again. All 25 first-parent v5 commits from 2026-11-15 are ancestors of the merge (checked with git merge-base --is-ancestor).

I carried it by hand because the automated runs after #18309 (for example run 43741778114) stopped as intended. The fixed resolver refused the src/pkg/config/config.go conflict and printed the hand-port hint, so it did not keep v6's side and drop #18300's Meetings field. The automated runs opened no top-up PR, so there is nothing to supersede.

v5 PRs included

Conflicts

File Resolution
src/pkg/config/config.go Kept v6's Retro field and added v5's Meetings MeetingsConfig field (#18300) after it, in the same Config struct. v6 still keeps the Config struct in config.go. The rest of #18300's block (structs, defaults, env overrides, keystore-sealed secrets, Validate) is in the new meetings_config.go, which merged cleanly.
src/pkg/config/validate.go Kept v6's validateAdvisorLane and Hub.ValidateNPS checks and added v5's Meetings.Validate() call after them.
src/pkg/config/testdata/agent_runtime_golden.json Kept v6's "retro": {} and added v5's "meetings" object after it, in Config field order. This is the output HIVE_UPDATE_GOLDEN=1 produces. I did not run the generator, because local tests are off by repo rule, and TestAgentRuntimeConfigGolden in CI checks the result.
src/cmd/hive/main.go Kept v6's Spektacular clone-auth wiring (wireSpektacularRunnerWithCloneAuth plus the live reconfigure hook) instead of v5's plain wireSpektacularRunner, and added v5's wireMeetings boot block after it.
CHANGELOG.md Kept both lines' release sections, v6 first (the resolver's union), with a blank line restored before ## 2026-11-15 (v5.269.0).

kick_observer.go and #18305

#18305 does not touch kick_observer.go. It adds output_signals.go, which calls emitKickEvent and InFlightKickID, plus the KickEventOutputSignal and OutputSignal* constants in crux/kick_event.go. Both helpers exist in v6 unchanged since #18306. The merged kick_observer.go is byte-identical to v6's: the chaining SetKickObserver and kickObserverArchiveDetail/KickObserverDetailSource/Reason stay, and so does v5's fan-out from #18303. Output-signal events go only to the fan-out observers. The single-slot chain does not see them, the same as in v5. A follow-up PR converges this file with v5.

Other checks

🤖 Generated with Claude Code

clubanderson and others added 10 commits November 15, 2026 17:06
* 🐛 Sessions: make the queued-Send deadline test deterministic

The test set a 1s real-time fail-open deadline and waited 5s for delivery,
which loses under mutation-job CPU load. The queue worker now measures the
deadline through an injectable clock (test seam, no behaviour change) and the
test advances a fake clock, asserting no delivery before the deadline and
exactly one after.

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

* 🐛 Sessions: wait on pane polls instead of sleeping in the deadline test

TestSleepRatchet forbids new time.Sleep calls; count fake-runtime Capture
calls instead.

Signed-off-by: Andy Anderson <andy@clubanderson.com>
* ✨ meetings: config block and quorum child supervisor

Adds the meetings: config (off by default, env overrides for every key,
validation, keystore-sealed Vexa and Discord secrets), the quorumproc
supervisor for the Quorum child (per-boot bearer token in a 0600 file,
/healthz checks, restart backoff, stop on shutdown), boot wiring, and a
Dockerfile layer for the pinned quorum bundle (skipped while the version
is empty).

Fixes #18289

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

* 🐛 meetings: golden config fixture and no fixed sleeps in tests

Signed-off-by: Andy Anderson <andy@clubanderson.com>
* ✨ feat(crux): deliver agent output signals to kick observers

logOutputSignals keeps its log line and now also emits an
output-signal KickEvent for lines whose first token is [STATUS],
[FINDING], [COMPLETE] or [ERROR]: agent, in-flight queued kick ID,
signal kind, bounded text. Deduplicated per agent and kick so a pane
redraw does not deliver a finding twice. A marker mid-sentence (an
echoed prompt) is not a signal.

Fixes #18287

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

* 🐛 fix(crux): exact rune bound on output signal text; keep manager.go under its size ratchet

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

---------

Signed-off-by: Andy Anderson <andy@clubanderson.com>
pkg/research defines research-1..N (PoolSize, default 2, max 8) as
ADVISORY agents with include_repos false, so the proxy and token tier
refuse GitHub writes regardless of the prompt. Pool.Ensure registers
them (call only when meetings are enabled), Pool.Dispatch queues a
query on the least busy agent via EnqueueKick and returns the kick ID,
and Pool.Observe maps kick events and output signals for its kicks to
queued, running, finding, done and failed.

Fixes #18288

Signed-off-by: Andy Anderson <andy@clubanderson.com>
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 v5.269.0 entry.
See src/docs/releases.md.

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

The resolver kept v6's side of any src/pkg/config/config.go conflict. v6
split that monolith into topical files, so a conflict there means v5
changed config.go since the last top-up and keeping v6's side drops the
change without a trace (#18222's keystore sealing survived only through a
hand port; #18300's meetings block was next).

config.go is no longer a known pattern: the resolver now refuses and
prints the diff command for a hand port. The manifest path check for the
index.html regeneration now matches webstatic.ParseIndexManifest's
clean-relative-path rule. The throwaway-repo test gains a case where v5
adds a real config field and asserts the resolver refuses and leaves the
file unmerged.

Signed-off-by: Andy Anderson <andy@clubanderson.com>
- inbox.TranscribeSweep: auto mode queues pending items from
  inbox.transcription.sources within the daily cap and monthly budget,
  dedupes, retries failures with 1h/2h backoff up to 3 runs and budget
  skips on the next UTC day.
- Boot runs the sweep after each connector sync, audited as
  inbox_transcribe by inbox-auto-transcribe, and logs the egress host.
- Settings expose egress_hosts; the settings panel shows month minutes
  used, today's runs, the egress host and an auto-mode hint.
- Network requirements and provisioning docs list api.deepgram.com:443
  only when transcription is enabled.

Signed-off-by: Andy Anderson <andy@clubanderson.com>
Forward-merges origin/v5 through 2afddbd (#18298) into v6, carrying

Conflicts resolved by hand:
- src/pkg/config/config.go: keep v6's Retro field and add v5's
  Meetings field (#18300) to the Config struct.
- src/pkg/config/validate.go: keep v6's advisor-lane and hub NPS checks
  and add v5's Meetings.Validate call.
- src/pkg/config/testdata/agent_runtime_golden.json: keep v6's retro
  entry and add v5's meetings entry, in struct field order.
- src/cmd/hive/main.go: keep v6's Spektacular clone-auth wiring and add
  v5's wireMeetings boot block.
- CHANGELOG.md: keep both lines' release sections (union).

Signed-off-by: Andy Anderson <andy@clubanderson.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Nov 15, 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 danathar 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 15, 2026

@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.

Style review (advisory, non-blocking) — head 0dfcdfc

  1. .github/scripts/test-v6-topup-autoresolve.sh case_config_real_field (new, ends with return 1): the case inverts the file's convention. Every other case returns 0 on success and is registered as ok/fail by what the scenario should do. Here assertion failures return 0 and the passing path return 1, so expect config-go-real-field-refused fail passes only because the pass and fail values are swapped. It works, but a later assertion added in the usual style (|| { echo ...; return 1; }) would silently pass. Suggested shape: have the case succeed (return 0) when the resolver refuses as intended, register it as ok, and use return 1 for the failure messages.
-  [ "$rc" -ne 0 ] || return 0
-  git status --porcelain | grep -q '^UU src/pkg/config/config.go$' || { echo "config.go was resolved"; return 0; }
-  printf '%s\n' "$out" | grep -q 'port v5.s change by hand' || { echo "no hand-port hint"; return 0; }
-  return 1
+  [ "$rc" -ne 0 ] || { echo "resolver accepted the config.go conflict"; return 1; }
+  git status --porcelain | grep -q '^UU src/pkg/config/config.go$' || { echo "config.go was resolved"; return 1; }
+  printf '%s\n' "$out" | grep -q 'port v5.s change by hand' || { echo "no hand-port hint"; return 1; }
+  return 0
 }
-expect config-go-real-field-refused fail case_config_real_field
+expect config-go-real-field-refused ok case_config_real_field

Everything else I read (resolver comments, workflow comment, manifest path rule) is consistent with the PR body. I did not review the Go merge content for correctness; that is outside this perspective.

— hive: agent=adjudicator-4 backend=claude model=claude-sonnet-5-5 claude=2.1.325

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Review follow-ups (below review.backlog.min_severity: P2)

Non-blocking findings below the backlog filing line are listed here instead of as issues, one comment per PR, updated in place. Tick them off as they are fixed; set review.backlog.min_severity: P3 to file every finding.

  • P3 info correctness — Output-signal dedupe drops repeated identical marker lines within one kick (src/crux/agent/output_signals.go:93): firstSighting keys on the whole line per (agent, kickID), so a repeated identical '[STATUS] working' line in the same kick is suppressed. It also only resets at 256 entries. This is v5 ✨ Crux: deliver agent output signals to kick observers #18305 behavio…

@hivecommons-hive

Copy link
Copy Markdown
Contributor

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

Review findings from reviewer (folded here because this head already carries its hive review):

Routing to a human because the merge carries CI/workflow changes; I found no defect in what I read.

What I checked at head 0dfcdfc:

  • .github/scripts/v6-topup-autoresolve.sh removes UU src/pkg/config/config.go from the auto-resolved known set, so the resolver now refuses and prints a hand-port hint. The new case_config_real_field test covers this. This matches the PR body and is the safer direction.
  • The manifest-path check now follows the webstatic.ParseIndexManifest rule. I did not verify the new case body past the truncation point of the diff I read, so please check that part.
  • The Go changes are ✨ meetings: config block and quorum child supervisor #18300 (Meetings config field and meetings_config.go) and ✨ Crux: deliver agent output signals to kick observers #18305 (output signals). The body says these came from v5 with a hand-resolved config.go, validate.go, main.go and golden file. The mutation check was still running and tide pending when I looked; the other required checks were green.

Because .github/workflows and CI scripts are trust surfaces, a maintainer should make the call, not me.

@hivecommons-hive

Copy link
Copy Markdown
Contributor
0dfcdfc

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

Hive flagged this PR (author @clubanderson, head 0dfcdfcc2d27) 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 2 sensitive path(s) (Touches a sensitive path (OWNERS, workflows, policies, hive config, security docs, …))
    • .github/workflows/v6-topup.yml
    • src/Dockerfile

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.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Needs a decision, not a merge:

  • the reviewer swarm returned requires_human @0dfcdfc
  • the review found: sensitive-paths question from the correctness review
  • reviewer question: @clubanderson should confirm this v5→v6 merge, which carries .github/workflows/v6-topup.yml and .github/scripts/v6-topup-autoresolve.sh changes, is accepted as a trust-surface change.
  • the PR edits CI workflow / action files: awaiting owner approval — a hive owner / trusted merger's GitHub Approve review on the current head (or a dashboard /hive decision approve) releases the fence and the hive merges it; approval on an earlier head does not count unless the hive's own merge of the base branch is all that moved the head, so re-approve after a push

Head: verdict requires_human @0dfcdfc, 80/81 checks green, 1 pending, DCO yes, soak 0s of 10m0s.

How to release it:

  • A hive owner / trusted merger submits a GitHub Approve review on the current head (or approves from the Hive dashboard, which posts /hive decision approve on their behalf); that explicit approval releases the workflow-path fence and the lane merges on its next pass once CI, soak and the other gates are clear. Approval on an earlier head carries over only the hive's own merge of the base branch (which leaves the diff unchanged): re-approve after any other push.
  • After reading the verdict, a trusted merger can submit a GitHub Approve review for the current head and the lane clears the hold on its next pass; /hive approve replies on a PR are acknowledged but not consumed. An ordinary contributor cannot release their own PR.

Clear the cause and the hive re-evaluates on its next pass; the stage moves to stage/090-ready-for-human-merge, stage/095-pre-merge-soak or the merge queue on its own. Approval does not bypass CI, hold labels or other merge gates.

@github-actions

Copy link
Copy Markdown
Contributor

Mutation testing

Head 0dfcdfcc2.

⏱️ The 900s mutation budget ran out, so 4 package(s) were not fully mutated and the results below do not cover them:

  • pkg/dashboard: cut short (partial, no report)
  • pkg/inbox: skipped (not started)
  • pkg/meetings/quorumproc: skipped (not started)
  • pkg/research: skipped (not started)

❌ gremlins did not produce a report for 1 package(s), so no verdict can be derived from this run (see the job log):

  • crux: gremlins exited 1

6 mutant(s) in changed files are not reached by any test (NOT COVERED). A maintainer may apply the mutation/acknowledged label to accept this.

File Line Mutation
src/cmd/hive/boot_inbox.go 134 CONDITIONALS_NEGATION
src/cmd/hive/boot_inbox.go 138 CONDITIONALS_BOUNDARY
src/cmd/hive/boot_inbox.go 138 CONDITIONALS_NEGATION
src/cmd/hive/boot_inbox.go 138 CONDITIONALS_NEGATION
src/pkg/config/meetings_config.go 79 ARITHMETIC_BASE
src/pkg/config/meetings_config.go 82 ARITHMETIC_BASE

Verdict: error (#17349).

@clubanderson
clubanderson merged commit 60327d9 into v6 Nov 15, 2026
97 of 102 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the topup/v5-to-v6-20261115c branch November 15, 2026 17:57
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. 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.

2 participants