vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

664: address argus nits (must_use + DEFAULT_DAEMON_SOCKET path)

Browse source
This commit is contained in:
damocles 2026-05-30 21:43:55 +02:00 • committed by Mara
commit 4d64f253c8
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hive-c0re/src/lifecycle.rs
View file

@ -33,6 +33,7 @@ pub const CONTAINER_RUNTIME_MOUNT: &str = "/run/hive";
/// service environment sets `HOME` to the same path, so the OAuth /// service environment sets `HOME` to the same path, so the OAuth
/// session survives container restarts the same way the constant /// session survives container restarts the same way the constant
/// did. /// did.
#[must_use]
pub fn container_claude_mount(name: &str) -> String { pub fn container_claude_mount(name: &str) -> String {
format!("/home/{name}/.claude") format!("/home/{name}/.claude")
} }

11
hive-matrix-mcp/src/paths.rs
View file

@ -15,10 +15,11 @@ pub const DEFAULT_HOMESERVER: &str = "http://localhost:8008";
/// Default unix socket path the daemon listens on inside the agent /// Default unix socket path the daemon listens on inside the agent
/// container. The stdio MCP bridge `connect()`s here on every tool call. /// container. The stdio MCP bridge `connect()`s here on every tool call.
/// `/run/hive-matrix.sock` is a tmpfs path that disappears on container /// Lives under systemd's `RuntimeDirectory=hive-matrix` (a tmpfs path
/// restart — fine, because the daemon recreates the socket on its own /// that disappears on container restart — fine, because the daemon
/// boot. /// recreates the socket on its own boot) so the agent unix user
pub const DEFAULT_DAEMON_SOCKET: &str = "/run/hive-matrix.sock"; /// (post-#658) can bind a socket inside it without root in `/run`.
pub const DEFAULT_DAEMON_SOCKET: &str = "/run/hive-matrix/socket";
/// Resolve the matrix access-token file path. Override via /// Resolve the matrix access-token file path. Override via
/// `HIVE_MATRIX_TOKEN_FILE`; default is `<HYPERHIVE_STATE_DIR>/matrix-token`, /// `HIVE_MATRIX_TOKEN_FILE`; default is `<HYPERHIVE_STATE_DIR>/matrix-token`,
@ -41,7 +42,7 @@ pub fn homeserver_url() -> String {
} }
/// Resolve the daemon's unix socket path. Override via /// Resolve the daemon's unix socket path. Override via
/// `HIVE_MATRIX_SOCKET`; default is `/run/hive-matrix.sock`. /// `HIVE_MATRIX_SOCKET`; default is `/run/hive-matrix/socket`.
#[must_use] #[must_use]
pub fn daemon_socket() -> PathBuf { pub fn daemon_socket() -> PathBuf {
std::env::var_os("HIVE_MATRIX_SOCKET").map_or_else(|| PathBuf::from(DEFAULT_DAEMON_SOCKET), PathBuf::from) std::env::var_os("HIVE_MATRIX_SOCKET").map_or_else(|| PathBuf::from(DEFAULT_DAEMON_SOCKET), PathBuf::from)