feat: add environment variable fallback with ENT_ prefix support

- Add getEnvWithFallback() to check unprefixed vars first, then ENT_ prefixed
- Applies to all env vars: CONTEXT7_API_KEY, BRAVE_API_KEY, OPENAI_API_KEY, ANTHROPIC_API_KEY
- Update docs to reflect unprefixed as preferred style with ENT_ as fallback
- Bump version to 1.1.0
- Update golangci-lint version to 2.11.3

Author: EstebanForge

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to MCP CLI-Ent will be documented in this file.
 
+<!-- RELEASE:START 1.1.0 -->
+## [1.1.0] - 2026-03-19
+
+### Added
+
+- **Environment Variable Fallback**: For each `${VAR_NAME}` in config, the CLI now checks the unprefixed variable first (e.g., `CONTEXT7_API_KEY`), then falls back to the `ENT_` prefixed version (e.g., `ENT_CONTEXT7_API_KEY`) if the first is empty. This provides backward compatibility while supporting the preferred unprefixed naming convention.
+
+<!-- RELEASE:END 1.1.0 -->
+---
+
 <!-- RELEASE:START 1.0.0 -->
 ## [1.0.0] - 2026-01-20
 

Makefile

@@ -21,7 +21,7 @@ SIGN_IDENTITY?=-
 
 # Lint
 GOLANGCI_LINT_BIN ?= golangci-lint
-GOLANGCI_LINT_VERSION ?= 2.10.1
+GOLANGCI_LINT_VERSION ?= 2.11.3
 LINT_TIMEOUT ?= 5m
 
 help: ## Show this help message

README.md

@@ -162,18 +162,23 @@ Use `${VAR_NAME}` or `$VAR_NAME` in values:
 
 ```json
 {
-  "args": ["--api-key", "${ENT_CONTEXT7_API_KEY}"],
+  "args": ["--api-key", "${CONTEXT7_API_KEY}"],
   "env": { "API_KEY": "$MY_API_KEY" },
   "headers": { "Authorization": "Bearer ${TOKEN}" }
 }
 ```
 
+**Fallback Behavior**: For each variable, the CLI checks the unprefixed name first (e.g., `CONTEXT7_API_KEY`), then falls back to the `ENT_` prefixed version (e.g., `ENT_CONTEXT7_API_KEY`) if the first is empty. This prevents conflicts with existing environment variables.
+
 ```bash
-# Linux/macOS
+# Linux/macOS - either format works
+export CONTEXT7_API_KEY="your_key"
+# or
 export ENT_CONTEXT7_API_KEY="your_key"
-export ENT_BRAVE_API_KEY="your_key"
 
 # Windows PowerShell
+$env:CONTEXT7_API_KEY = "your_key"
+# or
 $env:ENT_CONTEXT7_API_KEY = "your_key"
 ```
 

VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

internal/config/types.go

@@ -44,14 +44,31 @@ type ServerStatus struct {
 	Error   string `json:"error,omitempty"`
 }
 
+// getEnvWithFallback retrieves an environment variable with an ENT_ prefix fallback.
+// First checks the unprefixed variable (e.g., CONTEXT7_API_KEY), then falls back
+// to the ENT_ prefixed version (e.g., ENT_CONTEXT7_API_KEY) if the first is empty.
+func getEnvWithFallback(varName string) string {
+	// Try the unprefixed version first
+	if value := os.Getenv(varName); value != "" {
+		return value
+	}
+	// Fall back to ENT_ prefixed version
+	entVarName := "ENT_" + varName
+	if value := os.Getenv(entVarName); value != "" {
+		return value
+	}
+	return ""
+}
+
 // ResolveEnvironmentVariables substitutes environment variables in string values
-// Supports ${VAR_NAME} and $VAR_NAME formats
+// Supports ${VAR_NAME} and $VAR_NAME formats.
+// For each variable, it checks the unprefixed name first, then falls back to ENT_ prefixed.
 func ResolveEnvironmentVariables(input string) string {
 	// Match ${VAR_NAME} pattern
 	re := regexp.MustCompile(`\$\{([^}]+)\}`)
 	result := re.ReplaceAllStringFunc(input, func(match string) string {
 		varName := strings.Trim(match, "${}")
-		if value := os.Getenv(varName); value != "" {
+		if value := getEnvWithFallback(varName); value != "" {
 			return value
 		}
 		return match // Keep original if environment variable not found
@@ -61,7 +78,7 @@ func ResolveEnvironmentVariables(input string) string {
 	re2 := regexp.MustCompile(`\$([A-Za-z_][A-Za-z0-9_]*)`)
 	result = re2.ReplaceAllStringFunc(result, func(match string) string {
 		varName := strings.Trim(match, "$")
-		if value := os.Getenv(varName); value != "" {
+		if value := getEnvWithFallback(varName); value != "" {
 			return value
 		}
 		return match // Keep original if environment variable not found