Skip to content

Agent Zero AI framework

Speed up settings saves by reusing the Git version

Alessandroa776cad000fc
diff --git a/helpers/settings.py b/helpers/settings.py
index eb900b180..5539e39ae 100644
--- a/helpers/settings.py
+++ b/helpers/settings.py
@@ -181,6 +181,9 @@ UI_CONTROL_VISIBILITY_DEFAULTS = {
SETTINGS_FILE = files.get_abs_path("usr/settings.json")
_settings: Settings | None = None
+_apply_settings_cache: ContextVar[dict[str, str] | None] = ContextVar(
+ "apply_settings_cache", default=None
+)
_runtime_settings_snapshot: Settings | None = None
_prompt_settings_snapshot: ContextVar[Settings | None] = ContextVar(
"prompt_settings_snapshot", default=None
@@ -424,7 +427,14 @@ def set_settings(settings: Settings, apply: bool = True, browser_timezone: str |
_settings = normalize_settings(settings)
_write_settings_file(_settings)
if apply:
- _apply_settings(previous, browser_timezone)
+ cached = {"version": _settings["version"]}
+ token = _apply_settings_cache.set(cached)
+ try:
+ _apply_settings(previous, browser_timezone)
+ finally:
+ # Expire the cache in inherited task contexts too.
+ cached.clear()
+ _apply_settings_cache.reset(token)
return reload_settings()
@@ -843,4 +853,4 @@ def create_auth_token() -> str:
def _get_version():
- return git.get_version()
+ return (_apply_settings_cache.get() or {}).get("version") or git.get_version()
diff --git a/helpers/settings.py.dox.md b/helpers/settings.py.dox.md
index b5a16a65d..0429f5748 100644
--- a/helpers/settings.py.dox.md
+++ b/helpers/settings.py.dox.md
@@ -69,6 +69,11 @@
- Important called helpers/classes observed in the source: `TypeVar`, `files.get_abs_path`, `dotenv.get_dotenv_value`, `opts.insert`, `str.strip`, `_is_valid_timezone`, `str.strip.lower`, `_normalize_timezone_setting`, `SettingsOutput`, `get_default_settings`, `_ensure_option_present`, `_resolve_runtime_timezone`, `get_default_secrets_manager`, `get_settings`, `get_settings_for_prompt`, `normalize_settings`, `_load_sensitive_settings`, `deepcopy`, `settings.copy`, `_write_settings_file`, `reload_settings`, `set_settings`, `initialize_agent`.
- Applying settings refreshes active context configs while preserving each subordinate agent's own profile.
+- Agent refreshes reuse the version already resolved by `set_settings()` in a
+ task-local scope, restored even on failure. Settings normalization, credential
+ reads, and initialization hooks still run for each agent; the final reload and
+ subsequent saves resolve the version afresh. The cache is cleared on exit so
+ deferred tasks cannot retain an expired version through an inherited context.
- Applying settings starts a deferred `MCPConfig.update(...)` with the current `mcp_servers` string when global MCP server settings change.
- `get_settings()` retains normalize-on-read behavior. Prompt-building callers
explicitly use `get_settings_for_prompt()` to reuse one task-local snapshot
@@ -94,6 +99,8 @@
- Run targeted tests for changed helper behavior; run security regressions for auth, filesystem, WebSocket, tunnel, upload, or secret-handling helpers.
- Related tests observed by source search:
+ - `tests/test_settings_cache.py`
+ - `tests/test_settings_mcp.py`
- `tests/test_browser_agent_regressions.py`
- `tests/test_document_query_plugin.py`
- `tests/test_download_toast_regressions.py`
diff --git a/tests/test_settings_cache.py b/tests/test_settings_cache.py
index 87705c45e..20f24c0d3 100644
--- a/tests/test_settings_cache.py
+++ b/tests/test_settings_cache.py
@@ -1,8 +1,64 @@
import copy
+from contextvars import Context, copy_context
+
+import pytest
from helpers import extension, settings
[email protected]("fail_apply", [False, True])
+def test_settings_apply_reuses_only_version_and_restores_scope(monkeypatch, fail_apply):
+ configured = settings.get_default_settings()
+ version = "v1"
+ version_reads = []
+ sensitive_reads = []
+ inherited = []
+
+ def get_version():
+ version_reads.append(version)
+ return version
+
+ def load_sensitive(current):
+ sensitive_reads.append(current)
+ current["auth_password"] = str(len(sensitive_reads))
+
+ def apply(previous, browser_timezone):
+ nonlocal version
+ assert previous is configured
+ assert browser_timezone == "Europe/Rome"
+ for index in range(3):
+ current = settings.get_settings()
+ assert current["version"] == "v1"
+ assert current["auth_password"] == str(index + 1)
+ assert version_reads == ["v1"]
+ version = "v2"
+ assert Context().run(settings._get_version) == "v2"
+ assert settings._get_version() == "v1"
+ inherited.append(copy_context())
+ if fail_apply:
+ raise RuntimeError("apply failed")
+
+ monkeypatch.setattr(settings.git, "get_version", get_version)
+ monkeypatch.setattr(settings, "_settings", configured)
+ monkeypatch.setattr(settings, "_read_settings_file", lambda: configured)
+ monkeypatch.setattr(settings, "_write_settings_file", lambda current: None)
+ monkeypatch.setattr(settings, "_load_sensitive_settings", load_sensitive)
+ monkeypatch.setattr(settings, "_apply_settings", apply)
+
+ if fail_apply:
+ with pytest.raises(RuntimeError, match="apply failed"):
+ settings.set_settings(configured, browser_timezone="Europe/Rome")
+ else:
+ saved = settings.set_settings(configured, browser_timezone="Europe/Rome")
+ assert saved["version"] == "v2"
+ assert saved["auth_password"] == "4"
+
+ assert settings._get_version() == "v2"
+ assert inherited[0].run(settings._get_version) == "v2"
+ version = "v3"
+ assert settings.set_settings(configured, apply=False)["version"] == "v3"
+
+
def test_settings_snapshot_is_limited_to_one_prompt(monkeypatch):
configured = settings.get_default_settings()
configured["api_keys"] = {"provider": "secret"}