Skip to content

Agent Zero AI framework

Preserve secret values when saving settings

Alessandro03a364378f02
diff --git a/helpers/secrets.py b/helpers/secrets.py
index ba038aa21..c8ccb340e 100644
--- a/helpers/secrets.py
+++ b/helpers/secrets.py
@@ -450,6 +450,7 @@ class SecretsManager:
left_raw = ln.key
left = left_raw.upper()
val = ln.value if ln.value is not None else ""
+ val = val.replace("\\", "\\\\").replace('"', '\\"').replace("\r", "\\r")
comment = ln.inline_comment or ""
formatted_key = (
key_formatter(left)
diff --git a/helpers/secrets.py.dox.md b/helpers/secrets.py.dox.md
index e22f58b14..045c6d6cf 100644
--- a/helpers/secrets.py.dox.md
+++ b/helpers/secrets.py.dox.md
@@ -35,6 +35,7 @@
- Helper modules own reusable framework APIs and must preserve public callers unless all callers, tests, and docs are updated together.
- The agent-facing `get_secrets_manager` masks and unpacks `API_KEY_*` and login/password credentials from `usr/.env`, every value from the global `usr/secrets.env`, and every value from the active project's `secrets.env`; ordinary runtime settings are not treated as secrets. `get_default_secrets_manager` remains scoped to the single writable `usr/secrets.env` file.
+- Secret serialization escapes backslashes, double quotes, and carriage returns in double-quoted values so global and project saves preserve their parsed values across disk reads and masked edits. Literal line feeds remain multiline; empty values, comments, and deletion semantics are unchanged.
- Update this file whenever public functions, classes, persistence behavior, path/security assumptions, side effects, or cross-module contracts change.
- Observed side-effect areas: filesystem reads, filesystem writes, filesystem deletion, WebSocket state, settings/state persistence, secret handling.
- Imported dependency areas include: `dataclasses`, `dotenv.parser`, `helpers`, `helpers.errors`, `helpers.extension`, `io`, `os`, `re`, `threading`, `time`, `typing`.
diff --git a/tests/test_secrets.py b/tests/test_secrets.py
index c18f4a493..020d085ed 100644
--- a/tests/test_secrets.py
+++ b/tests/test_secrets.py
@@ -1,3 +1,7 @@
+import json
+
+import pytest
+
from helpers import secrets
@@ -35,3 +39,30 @@ def test_agent_secret_manager_masks_runtime_credentials_only(monkeypatch):
"avoid falsely accusing a utility"
)
assert stream_filter.finalize() == ""
+
+
+ 'value with "quotes" and # inside',
+ r"C:\new\folder\test",
+ r"literal \n and \t",
+ "first\nsecond",
+ "first\r\nsecond",
+ "first\rsecond",
+ "value\twith tab",
+ "caffè 😀",
+ "",
+])
+def test_secret_values_survive_save_and_masked_round_trip(tmp_path, monkeypatch, value):
+ monkeypatch.setattr(secrets.SecretsManager, "_instances", {})
+ manager = secrets.SecretsManager.get_instance(str(tmp_path / "secrets.env"))
+ submitted = f'# Heading\nVALUE={json.dumps(value, ensure_ascii=False)} # Inline\n\nEMPTY=""\n'
+ assert manager.parse_env_content(submitted) == {"VALUE": value, "EMPTY": ""}
+
+ manager.save_secrets_with_merge(submitted)
+ assert manager.load_secrets() == {"VALUE": value, "EMPTY": ""}
+
+ masked = manager.get_masked_secrets()
+ manager.save_secrets_with_merge(masked)
+ assert manager.load_secrets() == {"VALUE": value, "EMPTY": ""}
+ assert manager.get_masked_secrets() == masked
+ assert "# Heading" in masked and "# Inline" in masked