Fix OpenCode BYOK switching

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

Copilot-Session: b341b7c4-ba73-4699-8f8a-719b4404b75b

Author: vanzue

src/cascadia/TerminalSettingsEditor/AIAgentsViewModel.cpp

@@ -649,18 +649,27 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         const bool supportsByok = Reg::SupportsByok(std::wstring_view{ _GlobalSettings.AcpAgent() });
         if (::Microsoft::Terminal::CustomModels::IsCustomSelection(value.Id()))
         {
+            if (_GlobalSettings.CustomModelSelection() == value.Id() && _GlobalSettings.AcpModel().empty())
+            {
+                return;
+            }
             _GlobalSettings.CustomModelSelection(value.Id());
             _GlobalSettings.AcpModel(L"");
         }
         else
         {
+            if (_GlobalSettings.AcpModel() == value.Id() &&
+                (!supportsByok || _GlobalSettings.CustomModelSelection().empty()))
+            {
+                return;
+            }
             _GlobalSettings.AcpModel(value.Id());
             if (supportsByok)
             {
                 _GlobalSettings.CustomModelSelection(L"");
             }
         }
-        _NotifyChanges(L"AcpModel", L"CurrentAcpModelEntry");
+        _NotifyChanges(L"AcpModel");
     }
 
     bool AIAgentsViewModel::ShowAcpModel()

tools/wta/src/custom_model_provider.rs

@@ -114,11 +114,8 @@ fn configure_opencode(cmd: &mut Command, config: &Config) -> Result<()> {
     let api_key = config.resolve_api_key()?;
     cmd.env(
         OPENCODE_CONFIG_CONTENT,
-        render_opencode_config(config, api_key.is_some())?,
+        render_opencode_config(config, api_key.as_deref())?,
     );
-    if let Some(api_key) = api_key {
-        cmd.env(PROVIDER_API_KEY, api_key);
-    }
     Ok(())
 }
 
@@ -158,15 +155,15 @@ fn render_codex_config(config: &Config, has_api_key: bool) -> Result<String> {
     .context("failed to serialize Codex custom model configuration")
 }
 
-fn render_opencode_config(config: &Config, has_api_key: bool) -> Result<String> {
+fn render_opencode_config(config: &Config, api_key: Option<&str>) -> Result<String> {
     let mut options = serde_json::Map::from_iter([(
         "baseURL".to_string(),
         serde_json::Value::String(config.base_url.clone()),
     )]);
-    if has_api_key {
+    if let Some(api_key) = api_key {
         options.insert(
             "apiKey".to_string(),
-            serde_json::Value::String(format!("{{env:{PROVIDER_API_KEY}}}")),
+            serde_json::Value::String(api_key.to_string()),
         );
     }
 
@@ -244,15 +241,15 @@ mod tests {
     use super::*;
 
     #[test]
-    fn opencode_config_uses_shared_provider_without_persisting_secret() {
+    fn opencode_config_uses_resolved_provider_secret() {
         let rendered = render_opencode_config(
             &Config {
                 base_url: "https://openrouter.ai/api/v1".to_string(),
                 model: "qwen/qwen3.5-9b".to_string(),
                 credential_id: Some("opaque-id".to_string()),
                 credential_resource: "test",
             },
-            true,
+            Some("test-api-key"),
         )
         .expect("OpenCode config should serialize");
         let parsed: serde_json::Value =
@@ -265,7 +262,7 @@ mod tests {
         );
         assert_eq!(
             parsed["provider"]["intelligent-terminal"]["options"]["apiKey"],
-            "{env:INTELLIGENT_TERMINAL_MODEL_API_KEY}"
+            "test-api-key"
         );
         assert!(!rendered.contains("opaque-id"));
     }