Merge pull request #62 from zhujian0805/main

Author: zhujian0805

code_assistant_manager/tools/opencode.py

@@ -85,6 +85,29 @@ def _process_endpoint(self, endpoint_name: str) -> Optional[List[str]]:
 
     def _write_opencode_config(self, selected_models_by_endpoint: Dict[str, List[str]]) -> Path:
         """Write OpenCode.ai configuration to ~/.config/opencode/opencode.json."""
+        config_file = Path.home() / ".config" / "opencode" / "opencode.json"
+
+        # Load existing config to preserve all existing settings
+        existing = {}
+        if config_file.exists():
+            try:
+                existing = json.loads(config_file.read_text(encoding="utf-8"))
+                if not isinstance(existing, dict):
+                    existing = {}
+            except Exception:
+                pass
+
+        opencode_config = {
+            "$schema": "https://opencode.ai/config.json",
+            "provider": existing.get("provider", {}),
+            "mcp": existing.get("mcp", {}),
+        }
+
+        # Preserve other top-level keys from existing config (e.g. theme, keybinds)
+        for key, val in existing.items():
+            if key not in opencode_config:
+                opencode_config[key] = val
+
         # Set default model to the first selected model with provider prefix
         default_model = None
         for endpoint_name, selected_models in selected_models_by_endpoint.items():
@@ -95,42 +118,43 @@ def _write_opencode_config(self, selected_models_by_endpoint: Dict[str, List[str
                 default_model = f"{provider_id}/{model_key}"
                 break
 
-        opencode_config = {
-            "$schema": "https://opencode.ai/config.json",
-            "provider": {},
-            "mcp": {},
-        }
-
         if default_model:
             opencode_config["model"] = default_model
 
-        # Create providers from selected models
+        # Merge providers from selected models into existing providers
         for endpoint_name, selected_models in selected_models_by_endpoint.items():
             success, endpoint_config = self.endpoint_manager.get_endpoint_config(endpoint_name)
             if not success:
                 continue
 
             provider_id = endpoint_name.replace(":", "-").replace("_", "-").lower()
-            provider = {
+
+            # Start from existing provider entry if present, otherwise create new
+            provider = opencode_config["provider"].get(provider_id, {
                 "npm": "@ai-sdk/openai-compatible",
                 "name": endpoint_config.get("description", endpoint_name),
                 "options": {
                     "baseURL": endpoint_config["endpoint"]
                 },
                 "models": {}
-            }
+            })
+
+            # Update mutable fields so they stay current
+            provider["npm"] = "@ai-sdk/openai-compatible"
+            provider["name"] = endpoint_config.get("description", endpoint_name)
+            provider.setdefault("options", {})["baseURL"] = endpoint_config["endpoint"]
+            provider.setdefault("models", {})
 
             # Handle API key configuration
             if "api_key_env" in endpoint_config:
                 provider["options"]["apiKey"] = f"{{env:{endpoint_config['api_key_env']}}}"
             elif "api_key" in endpoint_config:
                 provider["options"]["apiKey"] = endpoint_config["api_key"]
 
-            # Add selected models
+            # Append selected models (existing models are preserved)
             for model_name in selected_models:
                 # Fix model name for copilot-api
                 if endpoint_name == "copilot-api" and model_name in ["g", "r", "o", "k", "-", "c", "d", "e", "f", "a", "s", "t", "1"]:
-                    # If single letters, replace with proper model
                     model_name = "lmstudio/google/gemma-3n-e4b"
                 model_key = model_name.replace("/", "-").replace(":", "-").replace(".", "-").lower()
                 provider["models"][model_key] = {
@@ -143,16 +167,6 @@ def _write_opencode_config(self, selected_models_by_endpoint: Dict[str, List[str
 
             opencode_config["provider"][provider_id] = provider
 
-        # Preserve existing MCP servers (if any)
-        config_file = Path.home() / ".config" / "opencode" / "opencode.json"
-        if config_file.exists():
-            try:
-                existing = json.loads(config_file.read_text(encoding="utf-8"))
-                if isinstance(existing, dict) and isinstance(existing.get("mcp"), dict):
-                    opencode_config["mcp"] = existing["mcp"]
-            except Exception:
-                pass
-
         # Write the config
         config_file.parent.mkdir(parents=True, exist_ok=True)
         with open(config_file, "w", encoding="utf-8") as f:

tests/test_tools_opencode.py

@@ -191,4 +191,61 @@ def test_run_with_model_selection(self, mock_subprocess, mock_select_model, mock
                 })
 
                 result = tool.run([])
-                assert result == 0
+                assert result == 0
+
+    def test_write_opencode_config_appends_existing(self, opencode_config):
+        """Test that _write_opencode_config merges into existing config instead of overwriting."""
+        config = ConfigManager(opencode_config)
+        tool = OpenCodeTool(config)
+
+        existing_config = {
+            "$schema": "https://opencode.ai/config.json",
+            "model": "old-provider/old-model",
+            "provider": {
+                "old-provider": {
+                    "npm": "@ai-sdk/openai-compatible",
+                    "name": "Old Provider",
+                    "options": {"baseURL": "https://old.example.com/v1"},
+                    "models": {
+                        "old-model": {
+                            "name": "old-model",
+                            "limit": {"context": 128000, "output": 4096}
+                        }
+                    }
+                }
+            },
+            "mcp": {"my-server": {"command": "npx my-mcp-server"}},
+            "theme": "dark",
+        }
+
+        with patch("pathlib.Path.home") as mock_home:
+            tmp_config_dir = Path(tempfile.mkdtemp())
+            opencode_dir = tmp_config_dir / ".config" / "opencode"
+            opencode_dir.mkdir(parents=True)
+            config_file = opencode_dir / "opencode.json"
+            config_file.write_text(json.dumps(existing_config), encoding="utf-8")
+            mock_home.return_value = tmp_config_dir
+
+            selected_models = {"test-provider": ["gpt-4"]}
+
+            with patch.object(tool.endpoint_manager, "get_endpoint_config") as mock_get_config:
+                mock_get_config.return_value = (True, {
+                    "endpoint": "https://api.test.com/v1",
+                    "description": "Test Provider",
+                    "api_key": "test-key"
+                })
+
+                result_file = tool._write_opencode_config(selected_models)
+                written = json.loads(result_file.read_text(encoding="utf-8"))
+
+            # Existing provider must still be present
+            assert "old-provider" in written["provider"]
+            assert "old-model" in written["provider"]["old-provider"]["models"]
+
+            # New provider must be added
+            assert "test-provider" in written["provider"]
+            assert "gpt-4" in written["provider"]["test-provider"]["models"]
+
+            # MCP and other top-level keys must be preserved
+            assert written["mcp"] == {"my-server": {"command": "npx my-mcp-server"}}
+            assert written.get("theme") == "dark"