✨ feat(sdk): add environment detection and dynamic icons for PyCharm 2026.1

PyCharm 2026.1 removed the generic Virtualenv icon and now requires proper SDK flavor data to display environment-specific icons (UV, Poetry, Hatch, Conda, Pipenv). Without this, all environments showed broken icon references and package managers couldn't properly detect their tooling.

The plugin now detects environment types by checking filesystem markers: pyvenv.cfg for UV, conda-meta directories for Conda, .gitignore markers for Hatch, and standard cache locations (with environment variable overrides) for Poetry and Pipenv. Each detected type gets the appropriate SDK flavor data so PyCharm's package managers work correctly and display the right icons.

SDK creation now properly handles PyCharm's threading model by separating name generation (which runs Python) from write-locked modifications. Only in-project virtual environments get associated with the project to avoid polluting other projects' interpreter lists.

Signed-off-by: Bernát Gábor <bgabor8@bloomberg.net>

Author: gaborbernat

CHANGELOG.md

@@ -2,6 +2,29 @@
 
 ## [Unreleased]
 
+### Added
+
+- Environment type detection for UV, Conda, Poetry, Hatch, and Pipenv virtual environments
+- Dynamic icons in tree view and context menu based on detected environment type
+- Proper SDK flavor data for each environment type (UV, Poetry, Hatch, etc.)
+- Project association for in-project virtual environments
+- Support for configurable environment paths via environment variables (HATCH_DATA_DIR, WORKON_HOME, etc.)
+- Comprehensive logging for environment detection debugging
+
+### Changed
+
+- Updated to PyCharm 2026.1 platform API
+- Minimum supported version is now PyCharm 2026.1 (build 261)
+- Removed module-level interpreter action (kept project-level only)
+- SDK creation now uses proper SdkModificator API with write actions
+- Environment detection checks pyvenv.cfg for UV marker, .gitignore for Hatch marker, and standard cache locations
+
+### Fixed
+
+- Icon loading errors on PyCharm 2026.1 by removing hardcoded icon references
+- SDK duplicate registration errors by checking global SDK table before creating new SDKs
+- Threading assertions by properly wrapping SDK modifications in write actions
+
 ## [2.2.7] - 2026-03-31
 
 ${GITHUB_EVENT_RELEASE_BODY}
@@ -16,8 +39,10 @@ ${GITHUB_EVENT_RELEASE_BODY}
 - Standardize .github files to .yaml suffix by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/142
 - Clarify the venv selection painfulness by @andrask in https://github.com/tox-dev/PyVenvManage/pull/143
 - 🔒 ci(workflows): add zizmor security auditing by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/154
-- 🐛 fix(icons): resolve NoSuchFieldError on IntelliJ 2026.1 by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/157
-- 🔒 fix(ci): split release workflow for proper credential scoping by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/158
+- 🐛 fix(icons): resolve NoSuchFieldError on IntelliJ 2026.1 by @gaborbernat in
+  https://github.com/tox-dev/PyVenvManage/pull/157
+- 🔒 fix(ci): split release workflow for proper credential scoping by @gaborbernat in
+  https://github.com/tox-dev/PyVenvManage/pull/158
 
 ## [2.2.5] - 2026-01-30
 
@@ -26,13 +51,15 @@ ${GITHUB_EVENT_RELEASE_BODY}
 ## [2.2.4] - 2026-01-30
 
 - Bump version to `2.2.4-dev` by @github-actions[bot] in https://github.com/tox-dev/PyVenvManage/pull/123
-- Use RELEASE_TOKEN for post-release PR and auto-merge by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/124
+- Use RELEASE_TOKEN for post-release PR and auto-merge by @gaborbernat in
+  https://github.com/tox-dev/PyVenvManage/pull/124
 
 ## [2.2.3] - 2026-01-30
 
 - Bump version to `2.2.3-dev` by @github-actions[bot] in https://github.com/tox-dev/PyVenvManage/pull/120
 - Add auto-merge workflow for trusted contributors by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/121
-- Make Python dependency optional to fix marketplace verification by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/122
+- Make Python dependency optional to fix marketplace verification by @gaborbernat in
+  https://github.com/tox-dev/PyVenvManage/pull/122
 
 ## [2.2.2] - 2026-01-29
 
@@ -48,13 +75,16 @@ ${GITHUB_EVENT_RELEASE_BODY}
 ## [2.2.0] - 2026-01-04
 
 - Changelog update - `v2.1.2` by @github-actions[bot] in https://github.com/tox-dev/PyVenvManage/pull/78
-- Optimize GitHub Actions: parallelize verification and fix disk space by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/99
-- Refactor to modern Kotlin idioms and fix deprecated API by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/100
+- Optimize GitHub Actions: parallelize verification and fix disk space by @gaborbernat in
+  https://github.com/tox-dev/PyVenvManage/pull/99
+- Refactor to modern Kotlin idioms and fix deprecated API by @gaborbernat in
+  https://github.com/tox-dev/PyVenvManage/pull/100
 - Add cache invalidation with file watcher by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/101
 - Improve error UX with notifications by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/102
 - Add plugin settings page by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/103
 - Improve plugin description and documentation by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/105
-- Enhance project view decorations and add 100% test coverage by @gaborbernat in https://github.com/tox-dev/PyVenvManage/pull/104
+- Enhance project view decorations and add 100% test coverage by @gaborbernat in
+  https://github.com/tox-dev/PyVenvManage/pull/104
 
 ## [2.1.2] - 2025-10-23
 
@@ -127,22 +157,22 @@ ${GITHUB_EVENT_RELEASE_BODY}
 
 - Removed the usage of the deprecated PythonSdkType.getPythonExecutable API
 
-[Unreleased]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.7...HEAD
-[2.2.7]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.6...v2.2.7
-[2.2.6]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.5...v2.2.6
-[2.2.5]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.4...v2.2.5
-[2.2.4]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.3...v2.2.4
-[2.2.3]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.2...v2.2.3
-[2.2.2]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.1...v2.2.2
-[2.2.1]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.0...v2.2.1
-[2.2.0]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.1.2...v2.2.0
-[2.1.2]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.1.0...v2.1.2
-[2.1.0]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.0.1...v2.1.0
-[2.0.1]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.0.0...v2.0.1
-[2.0.0]: https://github.com/pyvenvmanage/PyVenvManage/compare/v1.4.0...v2.0.0
-[1.4.0]: https://github.com/pyvenvmanage/PyVenvManage/compare/v1.3.4...v1.4.0
-[1.3.4]: https://github.com/pyvenvmanage/PyVenvManage/compare/v1.3.3...v1.3.4
-[1.3.3]: https://github.com/pyvenvmanage/PyVenvManage/compare/v1.3.2...v1.3.3
-[1.3.2]: https://github.com/pyvenvmanage/PyVenvManage/compare/v1.3.1...v1.3.2
-[1.3.1]: https://github.com/pyvenvmanage/PyVenvManage/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/pyvenvmanage/PyVenvManage/commits/v1.3.0
+[1.3.1]: https://github.com/pyvenvmanage/PyVenvManage/compare/v1.3.0...v1.3.1
+[1.3.2]: https://github.com/pyvenvmanage/PyVenvManage/compare/v1.3.1...v1.3.2
+[1.3.3]: https://github.com/pyvenvmanage/PyVenvManage/compare/v1.3.2...v1.3.3
+[1.3.4]: https://github.com/pyvenvmanage/PyVenvManage/compare/v1.3.3...v1.3.4
+[1.4.0]: https://github.com/pyvenvmanage/PyVenvManage/compare/v1.3.4...v1.4.0
+[2.0.0]: https://github.com/pyvenvmanage/PyVenvManage/compare/v1.4.0...v2.0.0
+[2.0.1]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.0.0...v2.0.1
+[2.1.0]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.0.1...v2.1.0
+[2.1.2]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.1.0...v2.1.2
+[2.2.0]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.1.2...v2.2.0
+[2.2.1]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.0...v2.2.1
+[2.2.2]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.1...v2.2.2
+[2.2.3]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.2...v2.2.3
+[2.2.4]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.3...v2.2.4
+[2.2.5]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.4...v2.2.5
+[2.2.6]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.5...v2.2.6
+[2.2.7]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.6...v2.2.7
+[unreleased]: https://github.com/pyvenvmanage/PyVenvManage/compare/v2.2.7...HEAD

README.md

@@ -12,34 +12,42 @@
 **PyVenvManage** simplifies Python virtual environment management in JetBrains IDEs.
 
 Managing multiple Python interpreters across different virtual environments (for testing against various Python versions
-with tools like `tox` or `nox`) traditionally requires navigating through multiple dialogs in PyCharm or other JetBrains IDEs.
-PyVenvManage streamlines this by enabling quick interpreter selection directly from the project view with just a right-click.
+with tools like `tox` or `nox`) traditionally requires navigating through multiple dialogs in PyCharm or other JetBrains
+IDEs. PyVenvManage streamlines this by enabling quick interpreter selection directly from the project view with just a
+right-click.
 
 ## Features
 
 - **Quick interpreter switching**: Right-click any virtual environment folder to set it as your project or module
   interpreter instantly
-- **Visual identification**: Virtual environment folders display with a distinctive icon and customizable decoration
-  (e.g., `.venv [3.11.5 - CPython]`) in the project view
+- **Smart environment detection**: Automatically detects environment types (UV, Conda, Poetry, Hatch, Pipenv,
+  virtualenv) and sets appropriate metadata and icons
+- **Dynamic icons**: Tree view and context menus display environment-specific icons (UV, Conda, Poetry, Hatch, Pipenv)
+  based on detection
+- **Visual identification**: Virtual environment folders display with customizable decoration (e.g.,
+  `.venv [3.11.5 - CPython]`) in the project view
 - **Customizable decorations**: Configure which fields to show (Python version, implementation, system site-packages,
   creator tool), their order, and the format via Settings
 - **Multi-IDE support**: Works with PyCharm (Community and Professional), IntelliJ IDEA, GoLand, CLion, and RustRover
-- **Smart detection**: Automatically detects Python virtual environments by recognizing `pyvenv.cfg` files
+- **Smart association**: In-project virtual environments are associated with the current project; external environments
+  (Poetry cache, Hatch cache, Pipenv virtualenvs) remain global
 - **Cached version display**: Python version information is cached for performance and automatically refreshed when
   `pyvenv.cfg` files change
 
 <!-- Plugin description end -->
 
 ## Supported IDEs
 
-Version 2025.1 or later of:
+Version 2026.1 or later of:
 
 - PyCharm (Community and Professional)
 - IntelliJ IDEA (Community and Ultimate)
 - GoLand
 - CLion
 - RustRover
 
+**Note**: Version 2.2.x supports PyCharm 2025.1 and earlier.
+
 ## Install
 
 In your JetBrains IDE, open **Settings** -> **Plugins**, search for "PyVenv Manage", and click **Install**.
@@ -51,9 +59,9 @@ The official plugin page is at https://plugins.jetbrains.com/plugin/20536-pyvenv
 ![usage video](anim.gif?raw=true)
 
 1. Create or navigate to a Python virtual environment folder in your project
-2. Right-click the virtual environment folder (e.g., `venv`, `.venv`, or any folder with a `pyvenv.cfg`)
-3. Select **Set as Project Interpreter** or **Set as Module Interpreter**
-4. The interpreter is configured instantly with a confirmation notification
+1. Right-click the virtual environment folder (e.g., `venv`, `.venv`, or any folder with a `pyvenv.cfg`)
+1. Select **Set as Project Interpreter** or **Set as Module Interpreter**
+1. The interpreter is configured instantly with a confirmation notification
 
 ## Settings
 

build.gradle.kts

@@ -56,7 +56,7 @@ dependencies {
     testImplementation(libs.remoteRobot)
     testImplementation(libs.remoteRobotFixtures)
     intellijPlatform {
-        pycharmCommunity(platformVersion)
+        pycharm(platformVersion)
         bundledPlugin("PythonCore")
         pluginVerifier()
         zipSigner()

gradle.properties

@@ -4,9 +4,9 @@ nl.littlerobots.vcu.resolver=true
 org.gradle.caching=true
 org.gradle.configuration-cache=true
 org.gradle.welcome=never
-platformVersion=2025.1
+platformVersion=2026.1
 pluginGroup=com.github.pyvenvmanage
 pluginName=PyVenv Manage 2
 pluginRepositoryUrl=https://github.com/pyvenvmanage/PyVenvManage
-pluginSinceBuild=251
+pluginSinceBuild=261
 pluginVersion=2.2.8-dev

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-all.zip
-networkTimeout=10000
+networkTimeout=60000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/com/github/pyvenvmanage/VenvProjectViewNodeDecorator.kt

@@ -1,14 +1,15 @@
 package com.github.pyvenvmanage
 
-import javax.swing.Icon
-
+import com.github.pyvenvmanage.sdk.EnvironmentDetector
+import com.github.pyvenvmanage.sdk.SdkFactory
+import com.github.pyvenvmanage.settings.PyVenvManageSettings
 import com.intellij.ide.projectView.PresentationData
 import com.intellij.ide.projectView.ProjectViewNode
 import com.intellij.ide.projectView.ProjectViewNodeDecorator
 import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.ui.SimpleTextAttributes
-
-import com.github.pyvenvmanage.settings.PyVenvManageSettings
+import com.jetbrains.python.sdk.PythonSdkUtil
+import java.nio.file.Path
 
 class VenvProjectViewNodeDecorator : ProjectViewNodeDecorator {
     override fun decorate(
@@ -23,6 +24,17 @@ class VenvProjectViewNodeDecorator : ProjectViewNodeDecorator {
             val settings = PyVenvManageSettings.getInstance()
             val venvInfo = VenvVersionCache.getInstance().getInfo(pyVenvCfgPath.toString())
             thisLogger().debug("VenvInfo from cache: $venvInfo")
+
+            val venvRoot = Path.of(pyVenvCfgPath.toString()).parent
+            val pythonExecutable = venvRoot?.let { PythonSdkUtil.getPythonExecutable(it.toString()) }
+
+            if (pythonExecutable != null) {
+                val envType = EnvironmentDetector.detectEnvironmentType(pythonExecutable)
+                val icon = SdkFactory.getIconForEnvironmentType(envType)
+                thisLogger().debug("Setting icon for environment type: $envType")
+                data.setIcon(icon)
+            }
+
             venvInfo?.let { info ->
                 data.presentableText?.let { fileName ->
                     val decoration = settings.formatDecoration(info)
@@ -32,25 +44,6 @@ class VenvProjectViewNodeDecorator : ProjectViewNodeDecorator {
                     data.addText(decoration, SimpleTextAttributes.GRAY_ATTRIBUTES)
                 } ?: thisLogger().debug("No presentableText for decoration")
             } ?: thisLogger().debug("No venvInfo found for $pyVenvCfgPath")
-            virtualenvIcon?.let { data.setIcon(it) }
-        }
-    }
-
-    companion object {
-        val virtualenvIcon: Icon? by lazy {
-            loadIcon("com.intellij.python.venv.icons.PythonVenvIcons", "VirtualEnv")
-                ?: loadIcon("com.jetbrains.python.icons.PythonIcons\$Python", "Virtualenv")
         }
-
-        private fun loadIcon(
-            className: String,
-            fieldName: String,
-        ): Icon? =
-            try {
-                val clazz = Class.forName(className)
-                clazz.getField(fieldName).get(null) as? Icon
-            } catch (_: Exception) {
-                null
-            }
     }
 }

src/main/kotlin/com/github/pyvenvmanage/actions/ConfigurePythonActionAbstract.kt

@@ -1,34 +1,50 @@
 package com.github.pyvenvmanage.actions
 
+import com.github.pyvenvmanage.sdk.EnvironmentDetector
+import com.github.pyvenvmanage.sdk.PythonEnvironmentType
+import com.github.pyvenvmanage.sdk.SdkFactory
 import com.intellij.notification.NotificationGroupManager
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.projectRoots.ProjectJdkTable
 import com.intellij.openapi.projectRoots.Sdk
-import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil
 import com.intellij.openapi.vfs.VirtualFile
-
 import com.jetbrains.python.configuration.PyConfigurableInterpreterList
-import com.jetbrains.python.sdk.PythonSdkType
 import com.jetbrains.python.sdk.PythonSdkUtil
 import com.jetbrains.python.statistics.executionType
 import com.jetbrains.python.statistics.interpreterType
 
 abstract class ConfigurePythonActionAbstract : AnAction() {
+    companion object {
+        private val LOG = Logger.getInstance(ConfigurePythonActionAbstract::class.java)
+    }
+
     override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.BGT
 
     override fun update(e: AnActionEvent) {
-        e.presentation.isEnabledAndVisible =
-            e.getData(CommonDataKeys.VIRTUAL_FILE)?.let { selectedPath ->
-                if (selectedPath.isDirectory) {
-                    PythonSdkUtil.getPythonExecutable(selectedPath.path) != null
-                } else {
-                    PythonSdkUtil.isVirtualEnv(selectedPath.path)
-                }
-            } ?: false
+        val selectedPath = e.getData(CommonDataKeys.VIRTUAL_FILE)
+        LOG.info("Update called for path: $selectedPath")
+        val isValid =
+            selectedPath?.let { path ->
+                val dir = if (path.isDirectory) path else path.parent
+                LOG.info("Checking directory: ${dir.path}")
+                PythonSdkUtil.getPythonExecutable(dir.path)?.let { pythonExe ->
+                    LOG.info("Found python executable: $pythonExe")
+                    val envType = EnvironmentDetector.detectEnvironmentType(pythonExe)
+                    val icon = SdkFactory.getIconForEnvironmentType(envType)
+                    LOG.info("Setting icon for type $envType: $icon")
+                    e.presentation.icon = icon
+                    true
+                } ?: false.also { LOG.info("No python executable found") }
+            } ?: false.also { LOG.info("No selected path") }
+
+        e.presentation.isEnabledAndVisible = isValid
+        LOG.info("Action visible: $isValid")
     }
 
     override fun actionPerformed(e: AnActionEvent) {
@@ -44,24 +60,22 @@ abstract class ConfigurePythonActionAbstract : AnAction() {
             return
         }
 
+        val envType = EnvironmentDetector.detectEnvironmentType(pythonExecutable)
+
+        val existingSdk = ProjectJdkTable.getInstance().allJdks.firstOrNull { it.homePath == pythonExecutable }
+
         val sdk: Sdk =
-            PyConfigurableInterpreterList
-                .getInstance(project)
-                .model
-                .projectSdks
-                .values
-                .firstOrNull { it.homePath == pythonExecutable }
-                ?: run {
-                    val newSdk = SdkConfigurationUtil.createAndAddSDK(pythonExecutable, PythonSdkType.getInstance())
-                    if (newSdk == null) {
-                        notifyError(project, "Failed to create SDK from $pythonExecutable")
-                        return
-                    }
-                    newSdk
+            existingSdk ?: run {
+                val newSdk = SdkFactory.createSdk(pythonExecutable, envType, selectedPath.toNioPath())
+                if (newSdk == null) {
+                    notifyError(project, "Failed to create SDK from $pythonExecutable")
+                    return
                 }
+                newSdk
+            }
 
         when (val result = setSdk(project, selectedPath, sdk)) {
-            is SetSdkResult.Success -> notifySuccess(project, result.target, sdk)
+            is SetSdkResult.Success -> notifySuccess(project, result.target, sdk, envType)
             is SetSdkResult.Error -> notifyError(project, result.message)
         }
     }
@@ -70,17 +84,20 @@ abstract class ConfigurePythonActionAbstract : AnAction() {
         project: Project,
         target: String,
         sdk: Sdk,
+        envType: PythonEnvironmentType,
     ) {
         NotificationGroupManager
             .getInstance()
             .getNotificationGroup("Python SDK change")
             .createNotification(
                 "Python SDK Updated",
                 "Updated SDK for $target to:\n${sdk.name} " +
+                    "(${envType.name.lowercase()}) " +
                     "of type ${sdk.interpreterType.toString().lowercase()} " +
                     sdk.executionType.toString().lowercase(),
                 NotificationType.INFORMATION,
-            ).notify(project)
+            ).setIcon(SdkFactory.getIconForEnvironmentType(envType))
+            .notify(project)
     }
 
     private fun notifyError(