nix: move the agent option namespace under services.hyperhive.agent
Every per-agent harness option lived at the top-level `hyperhive.*` while the host tier has always been `services.hyperhive.*`. Move all 52 agent-tier option leaves (33 top-level names across 16 modules) to `services.hyperhive.agent.*`, repoint every read, and keep existing agent configs evaluating through one `mkRenamedOptionModule` per old leaf path in the new nix/agent-modules/renamed-options.nix. The shims are per leaf rather than per namespace: `user`, `mcp`, `otel`, `queue`, `docs`, `forge`, `frontend`, `github`, `gui`, `logs`, `matrix` and `cargo` are plain attrsets of declarations, not submodule-typed options, so a parent-path rename would not reach their children. Three read-only options (`frontend.mergedDist`, `queue.clientIdFile`, `queue.clientSecretFile`) deliberately get no shim — a rename contributes a definition, which a read-only option refuses; the exclusions are commented in place. Refs #4473
This commit is contained in:
parent
60393d0e32
commit
3662eda440
21 changed files with 531 additions and 290 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# In-container hyperhive reference docs: the `hyperhive.docs.*`
|
||||
# In-container hyperhive reference docs: the `services.hyperhive.agent.docs.*`
|
||||
# options and the `$HIVE_DOCS_DIR` wiring the harness reads.
|
||||
{
|
||||
pkgs,
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
options.hyperhive.docs.enable = lib.mkEnableOption ''
|
||||
options.services.hyperhive.agent.docs.enable = lib.mkEnableOption ''
|
||||
make the hyperhive reference docs (the repo `docs/` tree, shipped
|
||||
read-only as the standalone `hyperhive-docs` derivation) available
|
||||
in-container. When enabled the harness exposes the docs dir to claude
|
||||
|
|
@ -19,13 +19,13 @@
|
|||
`agent.nix`.
|
||||
'';
|
||||
|
||||
options.hyperhive.docs.source = lib.mkOption {
|
||||
options.services.hyperhive.agent.docs.source = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = config.hyperhive.packages.reference-docs;
|
||||
default = config.services.hyperhive.agent.packages.reference-docs;
|
||||
defaultText = lib.literalMD "`hyperhive.packages.reference-docs` (built from the repo `docs/` tree)";
|
||||
description = ''
|
||||
Store path of the reference-docs tree exposed at `$HIVE_DOCS_DIR`
|
||||
when `hyperhive.docs.enable` is set. Defaults to the flake's
|
||||
when `services.hyperhive.agent.docs.enable` is set. Defaults to the flake's
|
||||
`reference-docs` package (the `nix/packages/reference-docs.nix`
|
||||
build) so a standalone container build from a full checkout
|
||||
works unchanged. The generated meta flake overrides this with the
|
||||
|
|
@ -36,15 +36,15 @@
|
|||
};
|
||||
|
||||
config = {
|
||||
environment.variables = lib.mkIf config.hyperhive.docs.enable {
|
||||
environment.variables = lib.mkIf config.services.hyperhive.agent.docs.enable {
|
||||
# The harness reads HIVE_DOCS_DIR and passes it to claude as
|
||||
# `--add-dir` so the docs are readable, and appends a single
|
||||
# pointer sentence to the system prompt
|
||||
# (hive-agent::prompt::render) telling the agent the docs exist.
|
||||
# Source is `hyperhive.docs.source` (the narrow `hyperhive-docs`
|
||||
# Source is `services.hyperhive.agent.docs.source` (the narrow `hyperhive-docs`
|
||||
# meta-flake input, or `pkgs.hyperhive-docs` for standalone
|
||||
# builds). See hive-agent::turn.
|
||||
HIVE_DOCS_DIR = "${config.hyperhive.docs.source}";
|
||||
HIVE_DOCS_DIR = "${config.services.hyperhive.agent.docs.source}";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue