diff --git a/src/utils/managedEnvConstants.ts b/src/utils/managedEnvConstants.ts
index 2dcb71969..3ca14ece0 100644
--- a/src/utils/managedEnvConstants.ts
+++ b/src/utils/managedEnvConstants.ts
@@ -163,6 +163,9 @@ export const SAFE_ENV_VARS = new Set([
   'ANTHROPIC_DEFAULT_SONNET_MODEL_NAME',
   'ANTHROPIC_DEFAULT_SONNET_MODEL_SUPPORTED_CAPABILITIES',
   // OpenAI provider specific
+  'OPENAI_API_KEY',
+  'OPENAI_AUTH_MODE',
+  'OPENAI_BASE_URL',
   'OPENAI_DEFAULT_HAIKU_MODEL',
   'OPENAI_DEFAULT_HAIKU_MODEL_DESCRIPTION',
   'OPENAI_DEFAULT_HAIKU_MODEL_NAME',
@@ -175,6 +178,21 @@ export const SAFE_ENV_VARS = new Set([
   'OPENAI_DEFAULT_SONNET_MODEL_DESCRIPTION',
   'OPENAI_DEFAULT_SONNET_MODEL_NAME',
   'OPENAI_DEFAULT_SONNET_MODEL_SUPPORTED_CAPABILITIES',
+  'OPENAI_ENABLE_THINKING',
+  'OPENAI_MAX_TOKENS',
+  'OPENAI_MODEL',
+  'OPENAI_ORG_ID',
+  'OPENAI_PROJECT_ID',
+  'OPENAI_SMALL_FAST_MODEL',
+  // Grok provider specific
+  'GROK_API_KEY',
+  'GROK_BASE_URL',
+  'GROK_DEFAULT_HAIKU_MODEL',
+  'GROK_DEFAULT_OPUS_MODEL',
+  'GROK_DEFAULT_SONNET_MODEL',
+  'GROK_MODEL',
+  'GROK_MODEL_MAP',
+  'XAI_API_KEY',
   'ANTHROPIC_FOUNDRY_API_KEY',
   'ANTHROPIC_MODEL',
   'ANTHROPIC_SMALL_FAST_MODEL_AWS_REGION',
@@ -201,7 +219,11 @@ export const SAFE_ENV_VARS = new Set([
   'CLAUDE_CODE_USE_BEDROCK',
   'CLAUDE_CODE_USE_FOUNDRY',
   'CLAUDE_CODE_USE_GEMINI',
+  'CLAUDE_CODE_USE_GROK',
+  'CLAUDE_CODE_USE_OPENAI',
   'CLAUDE_CODE_USE_VERTEX',
+  'GEMINI_API_KEY',
+  'GEMINI_BASE_URL',
   'GEMINI_MODEL',
   'GEMINI_SMALL_FAST_MODEL',
   'GEMINI_DEFAULT_HAIKU_MODEL',