From ec9ee866dbb471c1aea8b1b608d826e69b8650c9 Mon Sep 17 00:00:00 2001 From: iris Date: Mon, 7 Sep 2026 15:05:57 +0200 Subject: [PATCH] docs: fix merge-conflict fallout + a fresh Contractions/Auto typo from the merge Resolving the 5 branches (contractions/foreign/auto/quotes/hyphens) onto current main surfaced a few things beyond plain conflict markers: - docs/scheduler/coordinator.md had 'auto-noops' turned into the malformed 'autanoops' by the auto-hyphens batch -- fixed to 'autonoops'. - main had moved (new prose, some option renames) since the batches were generated against an older commit, so a handful of merge conflicts needed both sides combined (keep main's updated content, reapply the lint fix on top) rather than a plain pick-one resolution. - A few genuinely new Microsoft.Contractions hits had appeared in the moved-forward main and in content pulled in wholesale during conflict resolution -- fixed the 2 real ones (docs/integrations/forge.md, docs/turn-loop/claude-invocation.md). - The other 'new' Contractions hits vale reports now (docs/integrations/forge.md:281, docs/tools/forge.md:260, docs/tools/hivectl.md:239, docs/tools/swarmctl-cli.md:28, docs/web-ui/dashboard.md:457) are a side effect of the Foreign batch's own 'i.e.' -> 'that is' substitution: vale's Contractions rule can't tell 'that is' used as a copula (contractable) from 'that is' used as a parenthetical clarifier (not contractable, would break the sentence -- 'that's it raced the merge' isn't English). Left those alone; noted in the PR description. Final vale count on this branch: the only Microsoft.Contractions/ Foreign/Auto/Quotes/Hyphens hits left are the known legitimate skips (ALL-CAPS/bold emphasis, vale's own false positives, and this Foreign/Contractions interaction) -- verified with a fresh vale run. --- docs/integrations/forge.md | 2 +- docs/swarm/services.md | 2 +- docs/turn-loop/claude-invocation.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/integrations/forge.md b/docs/integrations/forge.md index 4b7dd979..64705542 100644 --- a/docs/integrations/forge.md +++ b/docs/integrations/forge.md @@ -5,7 +5,7 @@ swarm's persistent code-collaboration surface (issues, PRs, reviews, attachments). Configured via `services.hyperhive.swarm.forge.*` (what the forge IS to every hive — its package, names, ports, URLs) plus `services.hyperhive.deploy.forgejo.*` (what the host running it decides — -how it is served, what it mirrors, where its host-local secrets sit). +how it's served, what it mirrors, where its host-local secrets sit). Container shape, ROOT_URL / sub-domain routing, and operator-vs-in-cluster URL handling live in [`docs/networking/gateway.md`](../networking/gateway.md); this file owns the diff --git a/docs/swarm/services.md b/docs/swarm/services.md index 21a28cd5..7ae532d6 100644 --- a/docs/swarm/services.md +++ b/docs/swarm/services.md @@ -113,7 +113,7 @@ services.hyperhive.deploy.grafana.enable = false; See `retentionPeriod` below before leaving it at its default. | Option | When you'd touch it | -| ----------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `deploy.victoriametrics.retentionPeriod` | Default `5y`. Lower it once you have measured how fast this swarm actually fills a disk — the default is deliberately generous because too-short silently discards history you can't get back. | | `swarm.grafana.oidc.role` | Default `Admin` for everyone who logs in. Lower to `Viewer`/`Editor` if the swarm grows operators who shouldn't be able to reconfigure Grafana. | | `deploy.grafana.datasourceUrl` | Only if you front VictoriaMetrics with something else. It defaults to the store on this host, which is the only thing it can reach. | diff --git a/docs/turn-loop/claude-invocation.md b/docs/turn-loop/claude-invocation.md index b1a583ca..7bcdafbf 100644 --- a/docs/turn-loop/claude-invocation.md +++ b/docs/turn-loop/claude-invocation.md @@ -136,7 +136,7 @@ calls alone blow past the window hits the reactive path with no preceding checkpoint, losing whatever wasn't already persisted (#2707, root-caused in #3727). -**Safety net for that gap: claude-code's own native auto-compact is on**, +**Safety net for that gap: claude-code's own native autocompact is on**, via the managed settings (`"autoCompactEnabled": true`, `"autoCompactWindow": 1000000` — the CLI's documented max, so it fires only right before the real hard limit, not as an earlier watermark). This is @@ -144,7 +144,7 @@ deliberately _not_ the primary mechanism — it runs with no checkpoint and none of the `CHECKPOINT_PROMPT` notes-flush machinery above, so a session saved by it still loses whatever wasn't already durable — but it can act _mid-turn_, underneath `InfiniteSession::run`, which the two triggers above -structurally cannot. Do not confuse this with the `hyperhive.autoCompact` +structurally can't. Don't confuse this with the `hyperhive.autoCompact` nix option below: that one is a per-agent on/off for hyperhive's _own_ proactive watermark and has no effect on claude's native mechanism, which is fleet-wide and set once in `hive-agent/prompts/claude-settings.json`.