Skip to content

fix: reconcile live-config post-merge regressions #121

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
exiao wants to merge 2 commits into from
Closed

fix: reconcile live-config post-merge regressions #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81aa645
fix(gateway): reconcile live-config merge regressions
exiao Jul 16, 2026
e47e7fa
fix(approval): drop dead eager redaction in check_execute_code_guard
exiao Jul 15, 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
2 changes: 1 addition & 1 deletion gateway/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14344,7 +14344,7 @@ def _save_config_key(key_path: str, value):
return t("gateway.reasoning.reset_done")
if effort == "none":
parsed = {"enabled": False}
elif effort in {"minimal", "low", "medium", "high", "xhigh"}:
elif effort in {"minimal", "low", "medium", "high", "xhigh", "max", "ultra"}:
parsed = {"enabled": True, "effort": effort}
else:
return t(
Expand Down
6 changes: 6 additions & 0 deletions tests/gateway/test_multiplex_credential_isolation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,9 @@ class _Pool:
def has_credentials(self):
return pool_has_creds

def has_available(self):
return pool_has_creds

monkeypatch.setattr(
"agent.credential_pool.load_pool", lambda slug: _Pool()
)
Expand Down Expand Up @@ -852,6 +855,9 @@ class _Pool:
def has_credentials(self):
return pool_has_creds

def has_available(self):
return pool_has_creds

monkeypatch.setattr("agent.credential_pool.load_pool", lambda slug: _Pool())
providers = list_authenticated_providers(max_models=5)
return [p for p in providers if p.get("slug") == "copilot"]
Expand Down
12 changes: 6 additions & 6 deletions tests/hermes_cli/test_models_secret_scope.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def _urlopen(request, timeout):
captured["headers"] = dict(request.headers)
return _Response()

monkeypatch.setattr("urllib.request.urlopen", _urlopen)
monkeypatch.setattr(models, "_urlopen_model_catalog_request", _urlopen)
monkeypatch.setattr(
"agent.anthropic_adapter.resolve_anthropic_token",
lambda: "sk-ant-oat01-default-profile",
Expand Down Expand Up @@ -61,7 +61,7 @@ def _urlopen(*_args, **_kwargs):
named_home.mkdir(parents=True)
monkeypatch.setenv("HERMES_HOME", str(named_home))

monkeypatch.setattr("urllib.request.urlopen", _urlopen)
monkeypatch.setattr(models, "_urlopen_model_catalog_request", _urlopen)
monkeypatch.setattr("hermes_cli.auth._load_auth_store", lambda: {})
monkeypatch.setattr(
"agent.anthropic_adapter.resolve_anthropic_token",
Expand Down Expand Up @@ -109,7 +109,7 @@ def _urlopen(request, timeout):
default_home.mkdir(parents=True)
monkeypatch.setenv("HERMES_HOME", str(default_home))

monkeypatch.setattr("urllib.request.urlopen", _urlopen)
monkeypatch.setattr(models, "_urlopen_model_catalog_request", _urlopen)
monkeypatch.setattr("hermes_cli.auth._load_auth_store", lambda: {})
monkeypatch.setattr(
"agent.anthropic_adapter.resolve_anthropic_token",
Expand Down Expand Up @@ -162,7 +162,7 @@ def _no_resolve():
default_home.mkdir(parents=True)
monkeypatch.setenv("HERMES_HOME", str(default_home))

monkeypatch.setattr("urllib.request.urlopen", _urlopen)
monkeypatch.setattr(models, "_urlopen_model_catalog_request", _urlopen)
monkeypatch.setattr("hermes_cli.auth._load_auth_store", lambda: {})
monkeypatch.setattr("agent.anthropic_adapter.resolve_anthropic_token", _no_resolve)
ss.set_multiplex_active(True)
Expand Down Expand Up @@ -195,7 +195,7 @@ def _urlopen(request, timeout):
captured["headers"] = dict(request.headers)
return _Response()

monkeypatch.setattr("urllib.request.urlopen", _urlopen)
monkeypatch.setattr(models, "_urlopen_model_catalog_request", _urlopen)
monkeypatch.setattr(
"hermes_cli.auth._load_auth_store",
lambda: {
Expand Down Expand Up @@ -232,7 +232,7 @@ def _urlopen(request, timeout):
captured["headers"] = dict(request.headers)
return _Response()

monkeypatch.setattr("urllib.request.urlopen", _urlopen)
monkeypatch.setattr(models, "_urlopen_model_catalog_request", _urlopen)
monkeypatch.setattr(
"hermes_cli.auth._load_auth_store",
lambda: {
Expand Down
Loading
Loading