Skip to content

fix(hermes): decide broker reuse from ownership #9305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arp1traj wants to merge 6 commits into from
Closed

fix(hermes): decide broker reuse from ownership #9305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
40398f0
fix(hermes): decide broker reuse from ownership
arp1traj Aug 17, 2026
3f1838d
Merge branch 'main' into fix/hermes-broker-ownership-reuse
cv Aug 17, 2026
9163641
style(hermes): apply Oxfmt to the broker ownership test
arp1traj Aug 17, 2026
8574db3
test(hermes): assert the unowned-listener refusal reports its port
arp1traj Aug 17, 2026
d3b3e3b
refactor(hermes): keep broker ownership in one guard
arp1traj Aug 18, 2026
0d49701
fix(hermes): prove broker ownership from a live pid on every call
arp1traj Aug 18, 2026
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
50 changes: 23 additions & 27 deletions src/lib/hermes-tool-gateway-broker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ const HERMES_TOOL_GATEWAY_CONTROL_CONTRACT_PATH = path.join(
);
const HERMES_TOOL_GATEWAY_RUNTIME_MISMATCH_RECOVERY =
"Reauthorize every managed-tool Hermes sandbox, then retry.";
const HERMES_TOOL_GATEWAY_UNOWNED_LISTENER_RECOVERY =
"Stop the process holding that port, then retry.";
const HERMES_TOOL_GATEWAY_CONTROL_CLIENT_SOURCE = [
'const http = require("node:http");',
"const [socketPath, route, timeoutValue] = process.argv.slice(1);",
Expand Down Expand Up @@ -118,8 +120,6 @@ const HERMES_TOOL_GATEWAY_CONTROL_CLIENT_SOURCE = [
"});",
].join("\n");

let brokerStartedThisRun = false;

function sleep(ms) {
const lock = new Int32Array(new SharedArrayBuffer(4));
Atomics.wait(lock, 0, 0, ms);
Expand Down Expand Up @@ -555,7 +555,7 @@ function preflightHermesToolGatewayCloneBinding(sandboxName) {
}

const pid = readPid();
const currentBrokerOwned = isHermesToolGatewayBrokerProcess(pid) || brokerStartedThisRun;
const currentBrokerOwned = isHermesToolGatewayBrokerProcess(pid);
const currentBrokerHealthy = isHermesToolGatewayBrokerHealthy();
if (currentBrokerHealthy && !currentBrokerOwned) {
throw new Error("Hermes managed-tool broker health endpoint is not owned by NemoClaw");
Expand Down Expand Up @@ -738,8 +738,23 @@ function ensureHermesToolGatewayBroker(options = {}) {
const desiredHash = brokerRuntimeHash();
const hashMatches = readBrokerHash() === desiredHash;
const pid = readPid();
const currentBrokerOwned = isHermesToolGatewayBrokerProcess(pid) || brokerStartedThisRun;
const currentBrokerHealthy = currentBrokerOwned && isHermesToolGatewayBrokerHealthy();
const currentBrokerOwned = isHermesToolGatewayBrokerProcess(pid);
const brokerHealthy = isHermesToolGatewayBrokerHealthy();
const currentBrokerHealthy = currentBrokerOwned && brokerHealthy;
// `/health` is unauthenticated on a fixed port, so reachability proves
// liveness and never identity. Ownership comes only from a recorded pid that
// still resolves to a running broker, re-proved on every call: a broker can
// exit and leave the port free for another process to bind. Refuse before any
// path can adopt, restart around, or stage credentials against a listener
// NemoClaw cannot prove it owns.
if (brokerHealthy && !currentBrokerOwned) {
console.error(
"Hermes managed-tool broker health endpoint is not owned by NemoClaw; " +
`refusing to reuse the listener on port ${HERMES_TOOL_GATEWAY_PORT}. ` +
HERMES_TOOL_GATEWAY_UNOWNED_LISTENER_RECOVERY,
);
return false;
}
if (options.startWithoutCredential) {
if (currentBrokerHealthy) {
return hashMatches && fs.existsSync(HERMES_TOOL_GATEWAY_CONTROL_SOCKET_PATH);
Expand All @@ -752,7 +767,6 @@ function ensureHermesToolGatewayBroker(options = {}) {
isHermesToolGatewayBrokerHealthy() &&
fs.existsSync(HERMES_TOOL_GATEWAY_CONTROL_SOCKET_PATH)
) {
brokerStartedThisRun = true;
return true;
}
sleep(250);
Expand All @@ -779,7 +793,6 @@ function ensureHermesToolGatewayBroker(options = {}) {
refreshToken,
options.sandboxName ?? null,
);
if (registered) brokerStartedThisRun = true;
return registered;
}
if (refreshPlan === "start-or-restart") {
Expand All @@ -791,33 +804,16 @@ function ensureHermesToolGatewayBroker(options = {}) {
isHermesToolGatewayBrokerHealthy() &&
registerHermesToolGatewayRuntimeCredential(refreshToken, options.sandboxName ?? null)
) {
brokerStartedThisRun = true;
return true;
}
sleep(250);
}
return false;
}

if (
!options.forceRestart &&
hashMatches &&
brokerStartedThisRun &&
isHermesToolGatewayBrokerHealthy()
) {
return true;
}
if (
!options.forceRestart &&
hashMatches &&
isHermesToolGatewayBrokerProcess(pid) &&
isHermesToolGatewayBrokerHealthy()
) {
brokerStartedThisRun = true;
return true;
}
if (!options.forceRestart && hashMatches && isHermesToolGatewayBrokerHealthy()) {
brokerStartedThisRun = true;
// `currentBrokerHealthy` already requires ownership, covering both proofs the
// three former branches tested separately, so reuse is one condition.
if (!options.forceRestart && hashMatches && currentBrokerHealthy) {
return true;
}
// Raw Nous OAuth stays out of durable ~/.nemoclaw state. If the broker is
Expand Down
Loading
Loading