Address PR review: check process env for existing FOUNDRY_* vars and fix comment

- appendFoundryEnvVars now also checks the existing env slice (from
  os.Environ()) before appending FOUNDRY_* translations, preventing
  user shell-set values from being silently overridden.
- Extract envSliceHasKey helper for the prefix check.
- Add test covering the process env scenario.
- Fix misleading test comment about AZURE_OPENAI_ENDPOINT auto-injection.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: JeffreyCA

cli/azd/extensions/azure.ai.agents/internal/cmd/init_from_code_test.go

@@ -441,8 +441,8 @@ func TestWriteDefinitionToSrcDir(t *testing.T) {
 		if !containsAll(contentStr, "name: test-agent", "kind: hosted", "responses", "AZURE_AI_MODEL_DEPLOYMENT_NAME") {
 			t.Errorf("written content missing expected fields:\n%s", contentStr)
 		}
-		// AZURE_OPENAI_ENDPOINT and AZURE_AI_PROJECT_ENDPOINT should NOT be in agent.yaml
-		// (they are auto-injected as FOUNDRY_PROJECT_ENDPOINT by the hosted agent platform)
+		// AZURE_OPENAI_ENDPOINT and AZURE_AI_PROJECT_ENDPOINT should NOT be written to agent.yaml.
+		// Hosted agents receive platform-provided FOUNDRY_* variables such as FOUNDRY_PROJECT_ENDPOINT instead.
 		if strings.Contains(contentStr, "AZURE_OPENAI_ENDPOINT") || strings.Contains(contentStr, "AZURE_AI_PROJECT_ENDPOINT") {
 			t.Errorf("agent.yaml should not contain AZURE_OPENAI_ENDPOINT or AZURE_AI_PROJECT_ENDPOINT:\n%s", contentStr)
 		}

cli/azd/extensions/azure.ai.agents/internal/cmd/run.go

@@ -11,6 +11,7 @@ import (
 	"os/signal"
 	"path/filepath"
 	"runtime"
+	"slices"
 	"strings"
 	"syscall"
 
@@ -389,7 +390,7 @@ func appendFoundryEnvVars(env []string, azdEnv map[string]string, serviceName st
 
 	for _, m := range staticMappings {
 		if v := azdEnv[m.azdKey]; v != "" {
-			if _, exists := azdEnv[m.foundryKey]; !exists {
+			if _, exists := azdEnv[m.foundryKey]; !exists && !envSliceHasKey(env, m.foundryKey) {
 				env = append(env, fmt.Sprintf("%s=%s", m.foundryKey, v))
 			}
 		}
@@ -409,7 +410,7 @@ func appendFoundryEnvVars(env []string, azdEnv map[string]string, serviceName st
 		for _, m := range agentMappings {
 			azdKey := fmt.Sprintf(m.azdKeyFmt, serviceKey)
 			if v := azdEnv[azdKey]; v != "" {
-				if _, exists := azdEnv[m.foundryKey]; !exists {
+				if _, exists := azdEnv[m.foundryKey]; !exists && !envSliceHasKey(env, m.foundryKey) {
 					env = append(env, fmt.Sprintf("%s=%s", m.foundryKey, v))
 				}
 			}
@@ -419,6 +420,14 @@ func appendFoundryEnvVars(env []string, azdEnv map[string]string, serviceName st
 	return env
 }
 
+// envSliceHasKey reports whether the env slice already contains an entry for the given key.
+func envSliceHasKey(env []string, key string) bool {
+	prefix := key + "="
+	return slices.ContainsFunc(env, func(entry string) bool {
+		return strings.HasPrefix(entry, prefix)
+	})
+}
+
 // loadAzdEnvironment reads all key-value pairs from the current azd environment.
 func loadAzdEnvironment(ctx context.Context, azdClient *azdext.AzdClient) (map[string]string, error) {
 	envResponse, err := azdClient.Environment().GetCurrent(ctx, &azdext.EmptyRequest{})

cli/azd/extensions/azure.ai.agents/internal/cmd/run_test.go

@@ -290,4 +290,49 @@ func TestAppendFoundryEnvVars(t *testing.T) {
 			t.Errorf("expected no translated env vars, got %v", env)
 		}
 	})
+
+	t.Run("skips foundry key when already set in process env slice", func(t *testing.T) {
+		t.Parallel()
+		// Simulate os.Environ() already containing FOUNDRY_* vars set by the user's shell
+		existingEnv := []string{
+			"HOME=/home/user",
+			"FOUNDRY_PROJECT_ENDPOINT=https://user-shell.services.ai.azure.com",
+			"FOUNDRY_AGENT_NAME=shell-agent",
+		}
+		azdEnv := map[string]string{
+			"AZURE_AI_PROJECT_ENDPOINT": "https://from-azd.services.ai.azure.com",
+			"AZURE_AI_PROJECT_ID":       "/subscriptions/sub/rg/rg/acct/proj",
+			"AGENT_MY_SVC_NAME":         "my-agent",
+			"AGENT_MY_SVC_VERSION":      "v2",
+		}
+		env := appendFoundryEnvVars(existingEnv, azdEnv, "my-svc")
+
+		// FOUNDRY_PROJECT_ENDPOINT and FOUNDRY_AGENT_NAME should NOT be appended
+		// because they already exist in the process env slice.
+		foundryEndpointCount := 0
+		foundryAgentNameCount := 0
+		for _, entry := range env {
+			if strings.HasPrefix(entry, "FOUNDRY_PROJECT_ENDPOINT=") {
+				foundryEndpointCount++
+			}
+			if strings.HasPrefix(entry, "FOUNDRY_AGENT_NAME=") {
+				foundryAgentNameCount++
+			}
+		}
+		if foundryEndpointCount != 1 {
+			t.Errorf("expected exactly 1 FOUNDRY_PROJECT_ENDPOINT entry (from shell), got %d in %v", foundryEndpointCount, env)
+		}
+		if foundryAgentNameCount != 1 {
+			t.Errorf("expected exactly 1 FOUNDRY_AGENT_NAME entry (from shell), got %d in %v", foundryAgentNameCount, env)
+		}
+
+		// FOUNDRY_PROJECT_ARM_ID and FOUNDRY_AGENT_VERSION should still be translated
+		// since they are NOT already present in the env slice.
+		if !slices.Contains(env, "FOUNDRY_PROJECT_ARM_ID=/subscriptions/sub/rg/rg/acct/proj") {
+			t.Errorf("expected FOUNDRY_PROJECT_ARM_ID to be translated, got %v", env)
+		}
+		if !slices.Contains(env, "FOUNDRY_AGENT_VERSION=v2") {
+			t.Errorf("expected FOUNDRY_AGENT_VERSION to be translated, got %v", env)
+		}
+	})
 }