Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions .github/scripts/test-v6-topup-autoresolve.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ case_all_known() {
echo v5bot > discord/bot.go
printf '# Changelog\n\n## Unreleased\n\n## 1.1.0 (v5)\n\n- v5 entry\n\n## 1.0.0\n\n- base\n' > CHANGELOG.md
echo v5 > src/scripts/b.sh
echo 'package config // v5 monolith edit' > src/pkg/config/config.go
echo A5 > src/pkg/dashboard/static-src/a.html
printf 'A5\nB\n' > src/pkg/dashboard/static/index.html
git add -A && git commit -qm v5 && finish_pin v5
Expand All @@ -79,7 +78,7 @@ case_all_known() {
bash "$RESOLVER"
git commit -q --no-edit
[ ! -e discord/bot.go ] || { echo "discord not deleted"; return 1; }
grep -q 'v6 slim' src/pkg/config/config.go || { echo "config.go not v6"; return 1; }
grep -q 'v6 slim' src/pkg/config/config.go || { echo "config.go lost v6's one-sided edit"; return 1; }
grep -q '6.1.0 (v6)' CHANGELOG.md && grep -q '1.1.0 (v5)' CHANGELOG.md || { echo "changelog lost a side"; return 1; }
! grep -qE '^(<<<<<<<|=======|>>>>>>>)' CHANGELOG.md .github/scripts/integration-governance.cjs || { echo "markers left"; return 1; }
[ "$(cat src/pkg/dashboard/static/index.html)" = "$(printf 'A5\nB6')" ] || { echo "index not regenerated"; return 1; }
Expand All @@ -106,7 +105,33 @@ case_pin_file_real_edit() {
bash "$RESOLVER"
}

# v5 adds a real field to the monolith config.go while v6 has split it. The
# resolver must refuse (keeping v6's side would drop the field silently) and
# must leave config.go unmerged for the human, even when every other conflict
# is a known pattern.
case_config_real_field() {
new_repo "$WORK/config" && cd "$WORK/config"
printf 'package config // base\n\ntype Config struct {\n\tMeetings MeetingsConfig `yaml:"meetings"`\n}\n' > src/pkg/config/config.go
printf '# Changelog\n\n## Unreleased\n\n## 1.1.0 (v5)\n\n- v5 entry\n\n## 1.0.0\n\n- base\n' > CHANGELOG.md
git commit -qam "v5 adds a config field"
git checkout -q v6
echo 'package config // v6 slim (structs moved to types.go)' > src/pkg/config/config.go
printf '# Changelog\n\n## Unreleased\n\n## 6.1.0 (v6)\n\n- v6 entry\n\n## 1.0.0\n\n- base\n' > CHANGELOG.md
git commit -qam "v6 splits config.go"
git merge --no-ff -q v5 -m merge >/dev/null 2>&1 && { echo "expected conflicts"; return 1; }
# Exit 0 here means the resolver accepted the conflict, which is the bug;
# `expect ... fail` turns that into a test failure.
local out rc=0
out="$(bash "$RESOLVER" 2>&1)" || rc=$?
printf '%s\n' "$out"
[ "$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
}

expect all-known-patterns-resolve ok case_all_known
expect config-go-real-field-refused fail case_config_real_field
expect unknown-conflict-refused fail case_unknown_conflict
expect pin-file-real-edit-refused fail case_pin_file_real_edit

Expand Down
29 changes: 21 additions & 8 deletions .github/scripts/v6-topup-autoresolve.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
# Known patterns:
# - DU discord/** and DU/UD .github/workflows/discord-syntax.yml: v6 removed
# discord/ (#9277) while v5 still develops it. Keep v6's deletion.
# - UU src/pkg/config/config.go: v6 split the monolith into topical files
# (#9386, #9956). Keep v6's side.
# - UU CHANGELOG.md: both lines prepend their own release sections under
# "## Unreleased" on every release, so the top of the file conflicts on
# almost every top-up. Keep both sides' lines (v6's block first, then
Expand All @@ -25,6 +23,17 @@
# it as the byte-exact concatenation of static-src/manifest.txt (what
# webstatic.ConcatIndex and TestIndexHTMLIsGenerated do), provided no
# static-src file is itself conflicted.
#
# Deliberately NOT a known pattern:
# - UU src/pkg/config/config.go. v6 split the monolith into topical files
# (#9386, #9956), and an earlier version of this script kept v6's side of
# any config.go conflict. A conflict there means v5 changed config.go since
# the last top-up, and keeping v6's side drops that change without a trace:
# #18222's keystore sealing survived only because it was hand-ported into
# v6's load.go/save.go. A config.go conflict always goes to a human, who
# ports v5's change into the matching split file. Whether v6 already has an
# equivalent change cannot be decided mechanically (the code moved), so
# there is no "safe subset" to auto-resolve.
set -euo pipefail

PIN_FILE=.github/scripts/integration-governance.cjs
Expand All @@ -35,10 +44,14 @@ PIN_RE="^const TRUSTED_SCRIPTS_TREE = '[0-9a-f]{40}';\$"
unmerged="$(git status --porcelain | grep -E '^(DD|AU|UD|UA|DU|AA|UU) ' || true)"
[ -n "$unmerged" ] || { echo "v6-topup-autoresolve: no conflicts to resolve"; exit 1; }

known='^DU discord/|^(DU|UD) \.github/workflows/discord-syntax\.yml$|^UU src/pkg/config/config\.go$|^UU CHANGELOG\.md$|^UU \.github/scripts/integration-governance\.cjs$|^UU src/pkg/dashboard/static/index\.html$'
known='^DU discord/|^(DU|UD) \.github/workflows/discord-syntax\.yml$|^UU CHANGELOG\.md$|^UU \.github/scripts/integration-governance\.cjs$|^UU src/pkg/dashboard/static/index\.html$'
if unknown="$(printf '%s\n' "$unmerged" | grep -vE "$known")"; then
echo "v6-topup-autoresolve: conflicts outside the known patterns:"
printf '%s\n' "$unknown"
if printf '%s\n' "$unknown" | grep -q ' src/pkg/config/config\.go$'; then
echo "v6-topup-autoresolve: v5 changed src/pkg/config/config.go, which v6 split into topical files;"
echo " port v5's change by hand: git diff \$(git merge-base HEAD MERGE_HEAD) MERGE_HEAD -- src/pkg/config/config.go"
fi
exit 1
fi

Expand Down Expand Up @@ -70,10 +83,6 @@ while IFS= read -r entry; do
"DU "*|"UD "*)
git rm -q -- "$file"
;;
"UU src/pkg/config/config.go")
git checkout --ours -- "$file"
git add -- "$file"
;;
"UU CHANGELOG.md")
tmp="$(mktemp -d)"
git show ":1:$file" > "$tmp/base"
Expand Down Expand Up @@ -107,7 +116,11 @@ if [ "$regen_index" = 1 ]; then
while IFS= read -r line || [ -n "$line" ]; do
line="$(printf '%s' "$line" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
case "$line" in ''|'#'*) continue ;; esac
case "$line" in /*|..*) echo "v6-topup-autoresolve: unsafe manifest path $line"; exit 1 ;; esac
# The same clean-relative-path rule as webstatic.ParseIndexManifest.
case "$line" in
/*|..*|./*|*/|*//*|*/./*|*/../*|*/.|*/..)
echo "v6-topup-autoresolve: unsafe manifest path $line"; exit 1 ;;
esac
cat "$STATIC_SRC/$line" >> "$INDEX_FILE"
done < "$STATIC_SRC/manifest.txt"
git add -- "$INDEX_FILE"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/v6-topup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,15 @@ jobs:
# them with their history):
# - discord/ + discord-syntax.yml modify/delete: keep v6's
# deletion (#9277, #11551).
# - src/pkg/config/config.go: keep v6's split (#9386, #9956).
# - CHANGELOG.md: both lines prepend release sections, keep both.
# - integration-governance.cjs TRUSTED_SCRIPTS_TREE literal only:
# re-pin to the merged src/scripts tree.
# - static/index.html: regenerate from static-src/manifest.txt.
# When the ONLY conflicts match those patterns, resolve them and
# finish the merge. Anything else (other content conflicts, other
# deletions, other hunks in the pin file) still fails loudly below.
# src/pkg/config/config.go is deliberately NOT auto-resolved: v6
# split it, so keeping v6's side would silently drop v5's change.
# The resolver runs from the copy taken off the triggering ref
# before the checkout, not from v6's tree.
elif bash "$RUNNER_TEMP/v6-topup-autoresolve.sh"; then
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@ Hive did not historically maintain a complete changelog. This file starts a prag

- The signed-commit reconciler's intentional refusal to rewrite a foreign or merge commit no longer files repeated unclassified-error fleet reports; its warning and PR remediation remain visible ([#17924](https://github.com/hivecommons/hive/issues/17924)).
- Dashboard logs one summary warning per five minutes for dropped SSE events instead of one warning per event, so a stalled browser tab no longer triggers repeated-error fleet reports (#17995).

## 2026-11-15 (v5.269.0)

### Added

- Crux gains ID-addressed, queued kicks: `Manager.EnqueueKick(agent, kickID, message)` appends a kick to a bounded per-agent FIFO (`HIVE_KICK_QUEUE_SIZE`, default 8) and returns its kick ID (caller-supplied or generated), delivering each kick once the agent is idle. `Manager.KickStatus(kickID)` reports `queued`, `pending`, `delivered`, `completed` (with the turn's outcome) or `failed`; waits and turns are bounded by `HIVE_KICK_QUEUE_WAIT_TIMEOUT` (30m) and `HIVE_KICK_QUEUE_TURN_TIMEOUT` (60m). The optional `crux.KickQueuer` interface exposes it; `SendKick` and `SendKickAsync` are unchanged. Groundwork for meeting research kicks ([#18285](https://github.com/hivecommons/hive/issues/18285), parent [#18284](https://github.com/hivecommons/hive/issues/18284)).
- Crux kick observers fan out: `Manager.AddKickObserver(func(crux.KickEvent)) (remove func())` registers any number of observers, each receiving every kick event in order on its own goroutine (a slow observer has events dropped rather than stalling the runtime). Events carry the kick ID of the queued kick they belong to, and the kick queue adds `kick-queued`, `kick-completed` and `kick-failed`. `SetKickObserver` keeps its single slot and its two events, so the Linear agent behaves exactly as before ([#18286](https://github.com/hivecommons/hive/issues/18286), parent [#18284](https://github.com/hivecommons/hive/issues/18284)).
- Inbox: Google Meet meetings as a knowledge integration — a `google-meet` connector (user-level OAuth with the hosted paste flow, or a service account with domain-wide delegation) that syncs conference records with a recording, transcript or Gemini notes into one fact each, with the event title, participants, Gemini notes as the summary and the transcript entries as `[mm:ss] Speaker: text` lines; a default `inbox.sources` entry with a Connect / Check / Sync now card (Meet recordings are Drive files behind a bearer token, so Inbox playback links the Drive page).

## 2026-11-15 (v5.268.0)

### Added
Expand Down
1 change: 0 additions & 1 deletion changelog.d/added-18285-kick-queue.md

This file was deleted.

1 change: 0 additions & 1 deletion changelog.d/added-18286-kick-observers.md

This file was deleted.

1 change: 1 addition & 0 deletions changelog.d/added-18287-output-signals.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Agent output markers now reach kick observers: a line that starts with `[STATUS]`, `[FINDING]`, `[COMPLETE]` or `[ERROR]` (after any CLI glyph) is delivered as a `output-signal` kick event carrying the agent, the in-flight queued kick's ID, the signal kind and the text after the marker (bounded to 500 runes), deduplicated per kick so a pane redraw does not repeat a finding. The existing log line is unchanged ([#18287](https://github.com/hivecommons/hive/issues/18287), parent [#18284](https://github.com/hivecommons/hive/issues/18284)).
1 change: 1 addition & 0 deletions changelog.d/added-18288-research-pool.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- New `pkg/research` research agent pool for the meetings feature: `research-1..N` agents (`meetings.research_pool_size`, default 2, at most 8) defined as `ADVISORY` with no repo checkouts, so the proxy refuses every GitHub write whatever the prompt says. `Pool.Dispatch(ctx, query, meta)` queues the query on the least busy agent (starting it if stopped) and returns the kick ID; `Pool.Observe` reports `queued`, `running`, `finding`, `done` and `failed` per kick from the agent's `[FINDING]` / `[COMPLETE]` / `[ERROR]` output ([#18288](https://github.com/hivecommons/hive/issues/18288), parent [#18284](https://github.com/hivecommons/hive/issues/18284)).
1 change: 0 additions & 1 deletion changelog.d/added-inbox-google-meet.md

This file was deleted.

1 change: 1 addition & 0 deletions changelog.d/added-inbox-transcription-auto-sweep.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- **Inbox: automatic transcription sweep for opted-in sources.** With `inbox.transcription.mode: auto`, the hive now transcribes new pending recordings by itself after each connector sync, but only from the sources listed in `inbox.transcription.sources`. The sweep queues only what the day's item cap and the month's minutes budget leave room for (items that do not fit stay pending, no skip records), never queues an item twice, retries failed items after 1h then 2h up to 3 runs, and retries budget skips the next UTC day. Runs are audited as `inbox_transcribe` by `inbox-auto-transcribe`. The ⚙ settings panel shows this month's minutes used, today's runs and the required egress (`api.deepgram.com:443`, only while transcription is enabled), and the network requirements docs list it.
1 change: 1 addition & 0 deletions changelog.d/added-meetings-config-quorum-supervisor.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Meetings groundwork: a `meetings:` config block (off by default, every key overridable by a `HIVE_MEETINGS_*` env var, Vexa tenant key and Discord bot token kept in keystore-sealed secret files) and a supervisor that runs the Quorum meeting server as a loopback child process with a per-boot bearer token, health checks and restart backoff (#18289).
1 change: 1 addition & 0 deletions changelog.d/changed-sessions-queue-deadline-clock-seam.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Sessions: the queued-Send fail-open deadline is now measured through an injectable clock (no behaviour change; it makes the deadline test deterministic instead of racing a one-second wall-clock wait under CI load).
1 change: 1 addition & 0 deletions changelog.d/fixed-18276-kick-busy-log-level.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- A kick refused because another kick is already being typed into the same pane is now logged at info instead of warn, so this expected back-pressure no longer floods the fleet self-report as an unclassified repeated error ([#18276](https://github.com/hivecommons/hive/issues/18276)).
21 changes: 21 additions & 0 deletions src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,27 @@ RUN ARCH="${TARGETARCH:-$(dpkg --print-architecture)}" && \
echo "WARN: spektacular download failed - skipping (Inbox falls back to inbox.spek.agent)"; \
fi

# --- Layer 8.2: Quorum meeting MCP server (meetings, hivecommons/hive#18289) ---
# The pinned hivecommons/quorum release asset `quorum.mjs` (a single-file
# Node bundle), SHA-256-verified, installed to /usr/local/lib/quorum so the
# default meetings.quorum.binary resolves with no config. Quorum only runs
# when meetings.enabled is set. QUORUM_VERSION is empty until the first
# quorum release is cut; while it is empty the download is skipped and a
# hive with meetings enabled logs that the bundle is missing. A checksum
# mismatch hard-fails the build. Bump the version and digest together.
ARG QUORUM_VERSION=""
ARG QUORUM_SHA256=""
RUN if [ -n "${QUORUM_VERSION}" ]; then \
test -n "${QUORUM_SHA256}" || { echo "QUORUM_SHA256 is required with QUORUM_VERSION" >&2; exit 1; } && \
mkdir -p /usr/local/lib/quorum && \
curl -fsSL --retry 5 --retry-delay 5 --retry-connrefused "https://github.com/hivecommons/quorum/releases/download/${QUORUM_VERSION}/quorum.mjs" -o /tmp/quorum.mjs && \
echo "${QUORUM_SHA256} /tmp/quorum.mjs" | sha256sum -c - && \
install -m 0644 /tmp/quorum.mjs /usr/local/lib/quorum/quorum.mjs && \
rm -f /tmp/quorum.mjs; \
else \
echo "QUORUM_VERSION unset - skipping the quorum bundle (meetings unavailable in this image)"; \
fi

# --- Layer 8.25: Google Antigravity CLI (backend: agy) ---
# The vendor distributes a self-contained Linux executable, not an npm package.
# Pin the version, build ID, and SHA-512 from its public updater manifest; do
Expand Down
4 changes: 4 additions & 0 deletions src/cmd/hive/boot.go
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,10 @@ type boot struct {
// cruxSupervision is the sidecar runtime's child supervisor and probe
// loop (hivecommons/hive#14138 stage 4); nil in-process.
cruxSupervision *cruxRuntimeSupervision

// meetingsQuorum is the Quorum child supervisor
// (hivecommons/hive#18289); nil when meetings are off.
meetingsQuorum quorumSupervisor
}

// deferStack stands in for the `defer` statements that used to sit in
Expand Down
24 changes: 23 additions & 1 deletion src/cmd/hive/boot_inbox.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"path/filepath"
"strings"
"time"

"github.com/hivecommons/hive/pkg/config"
Expand Down Expand Up @@ -52,6 +53,11 @@ func (b *boot) bootInbox(baseDir string) {
svc.EnableTranscription(inbox.NewTranscriptStore(filepath.Join(baseDir, "connector-state", "transcripts")))
b.inboxSvc = svc
b.logger.Info("inbox started", "sources", len(srcs), "rules", len(b.cfg.Inbox.Rules))
if tx := b.cfg.Inbox.Transcription; tx.Enabled {
// Transcription uploads audio from the hive process itself, so a
// locked-down spoke must allow this egress (network-requirements.md).
b.logger.Info("inbox transcription enabled", "mode", tx.EffectiveMode(), "provider", tx.EffectiveProvider(), "egress", strings.Join(inbox.TranscriptionEgressHosts(tx), ","))
}
}

// inboxSources returns one source per configured voice type (inbox.sources)
Expand Down Expand Up @@ -120,7 +126,22 @@ func (b *boot) inboxSource(baseDir, typ string, entries []config.KnowledgeConnec
return facts
}

// inboxAfterSync runs the auto-routing rules once a voice connector synced.
// inboxTranscribeSweep queues machine transcriptions for opted-in sources
// (inbox.transcription.mode: auto). Runs are audited as inbox_transcribe
// with the AutoTranscribeActor actor.
func (b *boot) inboxTranscribeSweep(ctx context.Context, svc *inbox.Service) {
opts := inbox.TranscribeOptions{Actor: inbox.AutoTranscribeActor, Audit: func(a inbox.TranscribeAudit) {
if b.dashSrv != nil {
b.dashSrv.AuditLog(a.Actor, "inbox_transcribe", a.Detail(), "")
}
}}
if n, err := svc.TranscribeSweep(ctx, opts); err != nil || n > 0 {
b.logger.Info("inbox transcription sweep", "queued", n, "error", err)
}
}

// inboxAfterSync runs the auto-routing rules once a voice connector synced,
// then the transcription sweep.
func (b *boot) inboxAfterSync(st connector.Status) {
svc := b.inboxSvc
if svc == nil {
Expand All @@ -136,6 +157,7 @@ func (b *boot) inboxAfterSync(st connector.Status) {
if n, err := svc.Sweep(ctx); err != nil {
b.logger.Warn("inbox sweep", "error", err, "routed", n)
}
b.inboxTranscribeSweep(ctx, svc)
}()
return
}
Expand Down
6 changes: 6 additions & 0 deletions src/cmd/hive/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3803,6 +3803,12 @@ func (b *boot) bootDashboardAPIWith(deps bootDashboardAPIDeps) {
b.dashSrv.SetSpektacularReconfigureFn(func() bool {
return rewireSpektacular(b.cfg, b.dashSrv, b.logger, spekCloneAuth)
})
// Meetings (hivecommons/hive#18289): the Quorum child, only when
// meetings.enabled is set. Stopped on shutdown.
if sup := wireMeetings(b.ctx, b.cfg, b.logger); sup != nil {
b.meetingsQuorum = sup
b.cleanup.push(sup.Stop)
}
// #8380: chain GitHub comments/labels behind the relay yank on takeover.
ghClientFn := func() *github.Client { return b.ghClient }
b.dashSrv.InstallClaimHooks(gfiClaimHooks(b.ctx, b.cfg, b.gfiState(), ghClientFn, b.dashSrv, b.logger,
Expand Down
Loading
Loading