diff --git a/agent/redact.py b/agent/redact.py
index e007de5d9..f11bc9843 100644
--- a/agent/redact.py
+++ b/agent/redact.py
@@ -8,6 +8,7 @@ the first 6 and last 4 characters for debuggability.
 """
 
 import logging
+import os
 import re
 from typing import Optional
 
@@ -73,9 +74,12 @@ def redact_sensitive_text(text: str) -> str:
     """Apply all redaction patterns to a block of text.
 
     Safe to call on any string -- non-matching text passes through unchanged.
+    Disabled when security.redact_secrets is false in config.yaml.
     """
     if not text:
         return text
+    if os.getenv("HERMES_REDACT_SECRETS", "").lower() in ("0", "false", "no", "off"):
+        return text
 
     # Known prefixes (sk-, ghp_, etc.)
     text = _PREFIX_RE.sub(lambda m: _mask_token(m.group(1)), text)
diff --git a/cli.py b/cli.py
index 4820069ef..a63e6053c 100755
--- a/cli.py
+++ b/cli.py
@@ -364,6 +364,13 @@ def load_cli_config() -> Dict[str, Any]:
         if model:
             os.environ[model_env] = model
     
+    # Security settings
+    security_config = defaults.get("security", {})
+    if isinstance(security_config, dict):
+        redact = security_config.get("redact_secrets")
+        if redact is not None:
+            os.environ["HERMES_REDACT_SECRETS"] = str(redact).lower()
+
     return defaults
 
 # Load configuration at module startup
diff --git a/gateway/run.py b/gateway/run.py
index faeddbf35..7873cf14d 100644
--- a/gateway/run.py
+++ b/gateway/run.py
@@ -118,6 +118,12 @@ if _config_path.exists():
         _tz_cfg = _cfg.get("timezone", "")
         if _tz_cfg and isinstance(_tz_cfg, str) and "HERMES_TIMEZONE" not in os.environ:
             os.environ["HERMES_TIMEZONE"] = _tz_cfg.strip()
+        # Security settings
+        _security_cfg = _cfg.get("security", {})
+        if isinstance(_security_cfg, dict):
+            _redact = _security_cfg.get("redact_secrets")
+            if _redact is not None:
+                os.environ["HERMES_REDACT_SECRETS"] = str(_redact).lower()
     except Exception:
         pass  # Non-fatal; gateway can still run with .env values
 
diff --git a/hermes_cli/config.py b/hermes_cli/config.py
index 8dda1a6ec..1adcae8a6 100644
--- a/hermes_cli/config.py
+++ b/hermes_cli/config.py
@@ -104,6 +104,10 @@ DEFAULT_CONFIG = {
         },
     },
     
+    "security": {
+        "redact_secrets": True,  # Mask API keys, tokens, passwords in tool output
+    },
+
     "display": {
         "compact": False,
         "personality": "kawaii",