merge: resolve conflicts with origin/main

2026-03-17 04:30:37 -07:00
parent 695eb04243 d2b10545db
commit 0897e4350e
100 changed files with 11637 additions and 1337 deletions
--- a/tools/environments/local.py
+++ b/tools/environments/local.py
@@ -82,6 +82,9 @@ def _build_provider_env_blocklist() -> frozenset:
        "FIREWORKS_API_KEY",       # Fireworks AI
        "XAI_API_KEY",             # xAI (Grok)
        "HELICONE_API_KEY",        # LLM Observability proxy
+        "PARALLEL_API_KEY",
+        "FIRECRAWL_API_KEY",
+        "FIRECRAWL_API_URL",
        # Gateway/runtime config not represented in OPTIONAL_ENV_VARS.
        "TELEGRAM_HOME_CHANNEL",
        "TELEGRAM_HOME_CHANNEL_NAME",