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
2 changes: 1 addition & 1 deletion agents/hermes/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ PY
# silent supply-chain tampering of the build context (an attacker rewriting a
# file has to also rewrite the Dockerfile-committed hash, which reviewers gate).
# Regenerate with `sha256sum agents/hermes/{hermes-wrapper.py,validate-env-secret-boundary.py,finalize-tirith-marker.py}`.
ARG NEMOCLAW_HERMES_WRAPPER_SHA256=ec8b0e4d6254175929d5a02240acd6af25e94774a30b36ba5c6f5a69c32fb9d7
ARG NEMOCLAW_HERMES_WRAPPER_SHA256=481eb04869b40cd163486a3632e0dc02f5655e17c37d0eab097808d1ca590da6
ARG NEMOCLAW_HERMES_VALIDATOR_SHA256=87c1b02e0fb2becd26f79ae5dec6e0d21f78c6b08862b880e926708faf46ecb3
ARG NEMOCLAW_HERMES_TIRITH_FINALIZER_SHA256=a1e6b1c53ab297569abb87c29d15c294d729e46005bfd022136b4c447a791819
# hadolint ignore=DL4006
Expand Down
108 changes: 108 additions & 0 deletions agents/hermes/hermes-wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,113 @@ def _translate_resumed_oneshot(argv: list[str]) -> list[str] | None:
return translated


# Source-of-truth note for the `_merge_provider_into_model` rewrite
# (NVIDIA/NemoClaw#7361):
# - Invalid state: separate --provider and -m/--model flags bypass the
# OpenShell proxy rewrite path; the raw .env placeholder is sent as the
# bearer token, causing a 401.
# - Fix: merge into the combined provider/model form at the wrapper boundary
# so the invocation routes through the proxy credential resolution path.
# - Removal condition: delete this translation when Hermes natively resolves
# openshell: placeholders for separate --provider flag invocations.
# - Tracking: NVIDIA/NemoClaw#7361


def _merge_provider_into_model(argv: list[str]) -> list[str]:
"""Merge separate --provider and -m/--model flags into the combined form.

When both --provider <name> and -m/--model <model> are present as separate
flags and the model value does not already contain '/', rewrite to the
combined 'provider/model' form so the invocation routes through the
OpenShell proxy rewrite path that resolves credential placeholders.

Returns argv unchanged on ambiguity (missing flag, model already combined,
empty values, duplicates). Pure function, no side effects.
"""
provider: str | None = None
provider_idx: int = -1
provider_val_idx: int = -1
model: str | None = None
model_idx: int = -1
model_val_idx: int = -1

i = 0
while i < len(argv):
arg = argv[i]
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

if arg == "--":
break

split = _split_flag_value(arg)
if split is not None:
name, value = split
if name == "--provider":
if provider is not None:
return argv
provider = value
provider_idx = i
provider_val_idx = -1
elif name in ("--model", "-m"):
if model is not None:
return argv
model = value
model_idx = i
model_val_idx = -1
i += 1
continue

if arg == "--provider":
if provider is not None:
return argv
if i + 1 >= len(argv) or argv[i + 1].startswith("-"):
return argv
provider = argv[i + 1]
provider_idx = i
provider_val_idx = i + 1
i += 2
continue

if arg in ("-m", "--model"):
if model is not None:
return argv
if i + 1 >= len(argv) or argv[i + 1].startswith("-"):
return argv
model = argv[i + 1]
model_idx = i
model_val_idx = i + 1
i += 2
continue

i += 1

if provider is None or model is None:
return argv
if not provider or not model:
return argv
if "/" in model:
return argv

merged_model = f"{provider}/{model}"

# Build new argv: remove provider flag+value, replace model value with merged
skip = {provider_idx}
if provider_val_idx >= 0:
skip.add(provider_val_idx)

result: list[str] = []
for idx, val in enumerate(argv):
if idx in skip:
continue
if idx == model_idx and model_val_idx < 0:
# Equals form: replace the whole --model=value token
result.append(f"--model={merged_model}")
elif idx == model_val_idx:
result.append(merged_model)
else:
result.append(val)
return result


def main(argv: list[str]) -> int:
real_hermes = _resolve_real_hermes()
guard_path = _resolve_guard()
Expand All @@ -454,6 +561,7 @@ def main(argv: list[str]) -> int:
exec_argv = translated
else:
exec_argv = argv
exec_argv = _merge_provider_into_model(exec_argv)
try:
os.execv(real_hermes, [real_hermes, *exec_argv])
except OSError as exc:
Expand Down
24 changes: 18 additions & 6 deletions test/e2e/live/hermes-inference-switch.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -380,12 +380,24 @@ test("Hermes inference set updates route/config and preserves live runtime", {
progress.phase("run Hermes CLI against switched provider");
const hermesCli = await runHermesCliPongWithRetry({
run: (attempt) =>
sandbox.exec(SANDBOX_NAME, ["hermes", "-z", "Reply with exactly one word: PONG"], {
artifactName: `hermes-cli-z-after-switch-${attempt}`,
env: env(),
redactionValues,
timeoutMs: 150_000,
}),
sandbox.exec(
SANDBOX_NAME,
[
"hermes",
"-z",
"Reply with exactly one word: PONG",
"--provider",
SWITCH_PROVIDER,
"--model",
SWITCH_MODEL,
],
{
artifactName: `hermes-cli-split-provider-model-after-switch-${attempt}`,
env: env(),
redactionValues,
timeoutMs: 150_000,
},
),
});
expect(hermesCli.exitCode, resultText(hermesCli)).toBe(0);
expect(hermesCli.stdout).toMatch(/\bPONG\b/iu);
Expand Down
137 changes: 137 additions & 0 deletions test/hermes-wrapper-provider-merge.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
// SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-License-Identifier: Apache-2.0
//
// Coverage for the hermes CLI wrapper's provider/model flag merging
// (agents/hermes/hermes-wrapper.py, #7361): separate --provider and -m/--model
// flags must be merged into the combined provider/model form so the invocation
// routes through the OpenShell proxy rewrite path that resolves credential
// placeholders.
//
// Linux + python3 gated: the wrapper is a Python script invoked via its
// `#!/usr/bin/python3 -I` shebang. CI runs on Linux with python3 available, so
// the suite runs every PR; the gate exists so a maintainer cloning on macOS or
// Windows does not see a spurious red on `npm test`. See `.github/workflows/`
// for the canonical CI runner image.

import { describe, expect, it } from "vitest";

import { canRun, runWrapper } from "./helpers/hermes-wrapper-harness.ts";

describe.skipIf(!canRun)("agents/hermes/hermes-wrapper.py provider/model merge", () => {
it("merges separate --provider and -m flags into the combined form (#7361)", () => {
const run = runWrapper(["--provider", "opencode-zen", "-m", "nemotron-3-ultra-free"], {});

expect(run.status).toBe(0);
expect(run.realArgv).toEqual(["-m", "opencode-zen/nemotron-3-ultra-free"]);
});

it("passes through model that already contains a slash (#7361)", () => {
const run = runWrapper(
["--provider", "opencode-zen", "-m", "opencode-zen/already-prefixed"],
{},
);

expect(run.status).toBe(0);
expect(run.realArgv).toEqual([
"--provider",
"opencode-zen",
"-m",
"opencode-zen/already-prefixed",
]);
});

it("passes through --provider alone without -m (#7361)", () => {
const run = runWrapper(["--provider", "opencode-zen"], {});

expect(run.status).toBe(0);
expect(run.realArgv).toEqual(["--provider", "opencode-zen"]);
});

it("passes through -m alone without --provider (#7361)", () => {
const run = runWrapper(["-m", "nemotron-3-ultra-free"], {});

expect(run.status).toBe(0);
expect(run.realArgv).toEqual(["-m", "nemotron-3-ultra-free"]);
});

it("merges equals-form --provider and --model flags (#7361)", () => {
const run = runWrapper(["--provider=opencode-zen", "--model=some-model"], {});

expect(run.status).toBe(0);
expect(run.realArgv).toEqual(["--model=opencode-zen/some-model"]);
});

it("merges when model appears before provider (#7361)", () => {
const run = runWrapper(["-m", "nemotron-3-ultra-free", "--provider", "opencode-zen"], {});

expect(run.status).toBe(0);
expect(run.realArgv).toEqual(["-m", "opencode-zen/nemotron-3-ultra-free"]);
});

it("passes through empty provider value (#7361)", () => {
const run = runWrapper(["--provider", "", "-m", "nemotron-3-ultra-free"], {});

expect(run.status).toBe(0);
expect(run.realArgv).toEqual(["--provider", "", "-m", "nemotron-3-ultra-free"]);
});

it("passes through combined form without --provider (#7361)", () => {
const run = runWrapper(["-m", "opencode-zen/nemotron-3-ultra-free"], {});

expect(run.status).toBe(0);
expect(run.realArgv).toEqual(["-m", "opencode-zen/nemotron-3-ultra-free"]);
});

it("passes through duplicate provider flags as ambiguous (#7361)", () => {
const argv = [
"--provider=opencode-zen",
"--provider",
"opencode-zen",
"-m",
"nemotron-3-ultra-free",
];

const run = runWrapper(argv, {});

expect(run.status).toBe(0);
expect(run.realArgv).toEqual(argv);
});

it("passes through mixed duplicate model flags as ambiguous (#7361)", () => {
const argv = [
"--provider",
"opencode-zen",
"-m",
"nemotron-3-ultra-free",
"--model=nemotron-3-ultra-free",
];

const run = runWrapper(argv, {});

expect(run.status).toBe(0);
expect(run.realArgv).toEqual(argv);
});

it("merges flags before -- and preserves arguments after (#7361)", () => {
const run = runWrapper(
["--provider", "opencode-zen", "-m", "nemotron-3-ultra-free", "--", "extra"],
{},
);

expect(run.status).toBe(0);
expect(run.realArgv).toEqual(["-m", "opencode-zen/nemotron-3-ultra-free", "--", "extra"]);
});

it("does not merge flags that appear only after -- (#7361)", () => {
const run = runWrapper(["--", "--provider", "opencode-zen", "-m", "nemotron-3-ultra-free"], {});

expect(run.status).toBe(0);
expect(run.realArgv).toEqual([
"--",
"--provider",
"opencode-zen",
"-m",
"nemotron-3-ultra-free",
]);
});
});
Loading