Skip to content

fix: forward Relay logging variables to the Claude child #385

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

Open
mnajafian-nv wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: forward Relay logging variables to the Claude child #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions adapters/python/claude/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,10 @@ Schema defaults are documentation only; planning preserves the supplied settings
without adding `setting_sources`.

The adapter filters the inherited environment before launching Claude Code.
It retains portable OS/config variables, the selected model's `api_key_env`,
and explicitly configured `environment.env` values. Raw Claude stderr is consumed
It retains portable OS/config variables, NeMo Relay logging variables
(`NEMO_RELAY_LOG`, `NEMO_RELAY_LOG_CONFIG_PATH`, `NEMO_RELAY_LOG_STDERR`, and
`NEMO_RELAY_LOG_STDERR_FORMAT`), the selected model's `api_key_env`, and
explicitly configured `environment.env` values. Raw Claude stderr is consumed
by the SDK and is not persisted as a NeMo Fabric artifact.

## Relay Observability
Expand Down
6 changes: 6 additions & 0 deletions adapters/python/claude/src/nemo_fabric_adapters/claude/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@
"LC_ALL",
"LC_CTYPE",
"LOCALAPPDATA",
# Relay hook commands reject these when set to an empty string, and the
# SDK can only override inherited variables, so keep the parent's values.
"NEMO_RELAY_LOG",
"NEMO_RELAY_LOG_CONFIG_PATH",
"NEMO_RELAY_LOG_STDERR",
"NEMO_RELAY_LOG_STDERR_FORMAT",
"NO_PROXY",
"PATH",
"PATHEXT",
Expand Down
30 changes: 30 additions & 0 deletions tests/adapters/test_claude_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,36 @@ def test_build_options_adds_relay_plugin_and_gateway_environment(
).exists()


@pytest.mark.parametrize(
"logging_environment",
[
{
"NEMO_RELAY_LOG": "debug",
"NEMO_RELAY_LOG_STDERR": "true",
"NEMO_RELAY_LOG_STDERR_FORMAT": "jsonl",
},
{"NEMO_RELAY_LOG_CONFIG_PATH": "/etc/relay/logging.toml"},
],
)
def test_build_options_relay_logging_environment_set_forwards_parent_values(
relay_payload, tmp_path, logging_environment
):
# Relay rejects an empty logging variable, so a blanked value makes every
# Claude hook fail before it reaches the gateway.
os.environ.update(logging_environment)
os.environ["NEMO_RELAY_CLIENT_TOKEN"] = "parent-route-token"
os.environ["FABRIC_UNRELATED_SECRET"] = "do-not-forward"

options = build_options(relay_payload, relay=relay_settings(tmp_path, {}))

forwarded_logging_environment = {
name: options.env[name] for name in logging_environment
}
assert forwarded_logging_environment == logging_environment
assert options.env["NEMO_RELAY_CLIENT_TOKEN"] == ""
assert options.env["FABRIC_UNRELATED_SECRET"] == ""


def test_build_options_does_not_enable_skills_for_relay_plugin_alone(
relay_payload, tmp_path
):
Expand Down
Loading