From 5d57420b44e55ca88c5c73ea2731c0cae00b42b3 Mon Sep 17 00:00:00 2001
From: John Trujillo <johnandrestrujillo@gmail.com>
Date: Tue, 4 Aug 2026 12:02:36 -0500
Subject: [PATCH 1/3] feat(ADFA-1816): list plugin settings screens in IDE
 Preferences

Adds the SettingsExtension extension point, collects entries in PluginManager, and appends one row per entry to Configuration, rechecked on resume.
---
 .../activities/PluginScreenActivity.kt        |  223 +-
 .../activities/PluginScreenNavigator.kt       |   36 +
 .../activities/PreferencesActivity.kt         |  232 +-
 .../androidide/preferences/pluginPrefExts.kt  |  117 +-
 .../androidide/preferences/rootPrefExts.kt    |    3 +-
 .../res/layout/layout_settings_gemini_api.xml |   65 -
 .../PluginSettingsEntryPreferenceTest.kt      |   92 +
 docs/plugin-api.md                            |    4 +-
 plugin-api/api/plugin-api.api                 |   30 +
 .../plugins/extensions/SettingsExtension.kt   |   46 +
 .../plugins/manager/core/PluginManager.kt     | 3344 +++++++++--------
 .../manager/core/PluginSettingsEntries.kt     |   33 +
 .../manager/core/PluginSettingsEntriesTest.kt |  124 +
 .../preferences/IPreferenceGroup.kt           |   49 +-
 resources/src/main/res/values/strings.xml     |    1 +
 15 files changed, 2485 insertions(+), 1914 deletions(-)
 create mode 100644 app/src/main/java/com/itsaky/androidide/activities/PluginScreenNavigator.kt
 delete mode 100644 app/src/main/res/layout/layout_settings_gemini_api.xml
 create mode 100644 app/src/test/java/com/itsaky/androidide/preferences/PluginSettingsEntryPreferenceTest.kt
 create mode 100644 plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/extensions/SettingsExtension.kt
 create mode 100644 plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginSettingsEntries.kt
 create mode 100644 plugin-manager/src/test/kotlin/com/itsaky/androidide/plugins/manager/core/PluginSettingsEntriesTest.kt

diff --git a/app/src/main/java/com/itsaky/androidide/activities/PluginScreenActivity.kt b/app/src/main/java/com/itsaky/androidide/activities/PluginScreenActivity.kt
index 3e4daec7f1..d724bb153a 100644
--- a/app/src/main/java/com/itsaky/androidide/activities/PluginScreenActivity.kt
+++ b/app/src/main/java/com/itsaky/androidide/activities/PluginScreenActivity.kt
@@ -1,5 +1,7 @@
 package com.itsaky.androidide.activities
 
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -11,103 +13,126 @@ import com.itsaky.androidide.plugins.manager.fragment.PluginFragmentFactory
 import com.itsaky.androidide.plugins.services.IdeUIService
 
 class PluginScreenActivity : IDEActivity() {
-
-    private var pluginId: String? = null
-    private var fragmentClassName: String? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        pluginId = intent.getStringExtra(IdeUIService.EXTRA_PLUGIN_ID)
-        fragmentClassName = intent.getStringExtra(IdeUIService.EXTRA_FRAGMENT_CLASS_NAME)
-
-        val pluginId = pluginId
-        val fragmentClassName = fragmentClassName
-
-        if (pluginId.isNullOrBlank() || fragmentClassName.isNullOrBlank()) {
-            super.onCreate(savedInstanceState)
-            finish()
-            return
-        }
-
-        val classLoader = IDEApplication.getPluginManager()
-            ?.getClassLoaderForPluginId(pluginId)
-
-        if (classLoader == null) {
-            super.onCreate(savedInstanceState)
-            finish()
-            return
-        }
-
-        registerPluginFragmentFactory(
-            pluginId = pluginId,
-            classLoader = classLoader,
-            fragmentClassName = fragmentClassName
-        )
-
-        super.onCreate(savedInstanceState)
-
-        if (savedInstanceState == null) {
-            loadPluginFragment(classLoader, fragmentClassName)
-        }
-    }
-
-    override fun bindLayout(): View {
-        return FrameLayout(this).apply {
-            id = R.id.plugin_screen_container
-            layoutParams = FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT,
-                FrameLayout.LayoutParams.MATCH_PARENT
-            )
-        }
-    }
-
-    private fun registerPluginFragmentFactory(
-        pluginId: String,
-        classLoader: ClassLoader,
-        fragmentClassName: String
-    ) {
-        supportFragmentManager.fragmentFactory =
-            PluginFragmentFactory(supportFragmentManager.fragmentFactory)
-
-        PluginFragmentFactory.registerPluginClassLoader(
-            pluginId,
-            classLoader,
-            listOf(fragmentClassName)
-        )
-    }
-
-    private fun loadPluginFragment(
-        classLoader: ClassLoader,
-        fragmentClassName: String
-    ) {
-        val fragment = runCatching {
-            supportFragmentManager.fragmentFactory.instantiate(
-                classLoader,
-                fragmentClassName
-            )
-        }.getOrElse { error ->
-            Log.e(TAG, "Failed to instantiate plugin fragment: $fragmentClassName", error)
-            finish()
-            return
-        }
-
-        supportFragmentManager.beginTransaction()
-            .replace(R.id.plugin_screen_container, fragment, TAG_PLUGIN_SCREEN)
-            .commit()
-    }
-
-    override fun onDestroy() {
-        val pluginId = pluginId
-        val fragmentClassName = fragmentClassName
-
-        if (!pluginId.isNullOrBlank() && !fragmentClassName.isNullOrBlank()) {
-            PluginFragmentFactory.unregisterPluginClassLoader(pluginId, listOf(fragmentClassName))
-        }
-
-        super.onDestroy()
-    }
-
-    companion object {
-        private const val TAG = "PluginScreenActivity"
-        private const val TAG_PLUGIN_SCREEN = "plugin_screen"
-    }
+	private var pluginId: String? = null
+	private var fragmentClassName: String? = null
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		pluginId = intent.getStringExtra(IdeUIService.EXTRA_PLUGIN_ID)
+		fragmentClassName = intent.getStringExtra(IdeUIService.EXTRA_FRAGMENT_CLASS_NAME)
+
+		val pluginId = pluginId
+		val fragmentClassName = fragmentClassName
+
+		if (pluginId.isNullOrBlank() || fragmentClassName.isNullOrBlank()) {
+			super.onCreate(savedInstanceState)
+			finish()
+			return
+		}
+
+		val classLoader =
+			IDEApplication
+				.getPluginManager()
+				?.getClassLoaderForPluginId(pluginId)
+
+		if (classLoader == null) {
+			super.onCreate(savedInstanceState)
+			finish()
+			return
+		}
+
+		registerPluginFragmentFactory(
+			pluginId = pluginId,
+			classLoader = classLoader,
+			fragmentClassName = fragmentClassName,
+		)
+
+		super.onCreate(savedInstanceState)
+
+		if (savedInstanceState == null) {
+			loadPluginFragment(classLoader, fragmentClassName)
+		}
+	}
+
+	override fun bindLayout(): View =
+		FrameLayout(this).apply {
+			id = R.id.plugin_screen_container
+			layoutParams =
+				FrameLayout.LayoutParams(
+					FrameLayout.LayoutParams.MATCH_PARENT,
+					FrameLayout.LayoutParams.MATCH_PARENT,
+				)
+		}
+
+	private fun registerPluginFragmentFactory(
+		pluginId: String,
+		classLoader: ClassLoader,
+		fragmentClassName: String,
+	) {
+		supportFragmentManager.fragmentFactory =
+			PluginFragmentFactory(supportFragmentManager.fragmentFactory)
+
+		PluginFragmentFactory.registerPluginClassLoader(
+			pluginId,
+			classLoader,
+			listOf(fragmentClassName),
+		)
+	}
+
+	private fun loadPluginFragment(
+		classLoader: ClassLoader,
+		fragmentClassName: String,
+	) {
+		val fragment =
+			runCatching {
+				supportFragmentManager.fragmentFactory.instantiate(
+					classLoader,
+					fragmentClassName,
+				)
+			}.getOrElse { error ->
+				Log.e(TAG, "Failed to instantiate plugin fragment: $fragmentClassName", error)
+				finish()
+				return
+			}
+
+		supportFragmentManager
+			.beginTransaction()
+			.replace(R.id.plugin_screen_container, fragment, TAG_PLUGIN_SCREEN)
+			.commit()
+	}
+
+	override fun onDestroy() {
+		val pluginId = pluginId
+		val fragmentClassName = fragmentClassName
+
+		if (!pluginId.isNullOrBlank() && !fragmentClassName.isNullOrBlank()) {
+			PluginFragmentFactory.unregisterPluginClassLoader(pluginId, listOf(fragmentClassName))
+		}
+
+		super.onDestroy()
+	}
+
+	companion object {
+		private const val TAG = "PluginScreenActivity"
+		private const val TAG_PLUGIN_SCREEN = "plugin_screen"
+
+		/**
+		 * The intent that mounts [fragmentClassName] of [pluginId] on this screen - the same one
+		 * `IdeUIServiceImpl.openPluginScreen` builds, so both entry points stay in step. Action-based
+		 * rather than explicit-component to match the manifest intent-filter; [setPackage] keeps it
+		 * inside the app.
+		 */
+		fun newIntent(
+			context: Context,
+			pluginId: String,
+			fragmentClassName: String,
+			title: String? = null,
+		): Intent =
+			Intent(IdeUIService.ACTION_OPEN_PLUGIN_SCREEN).apply {
+				setPackage(context.packageName)
+				putExtra(IdeUIService.EXTRA_PLUGIN_ID, pluginId)
+				putExtra(IdeUIService.EXTRA_FRAGMENT_CLASS_NAME, fragmentClassName)
+				putExtra(IdeUIService.EXTRA_TITLE, title)
+				flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP
+			}
+	}
 }
diff --git a/app/src/main/java/com/itsaky/androidide/activities/PluginScreenNavigator.kt b/app/src/main/java/com/itsaky/androidide/activities/PluginScreenNavigator.kt
new file mode 100644
index 0000000000..0e7dc57f85
--- /dev/null
+++ b/app/src/main/java/com/itsaky/androidide/activities/PluginScreenNavigator.kt
@@ -0,0 +1,36 @@
+package com.itsaky.androidide.activities
+
+import android.content.Context
+import org.slf4j.LoggerFactory
+
+/**
+ * Launches a plugin-owned screen in [PluginScreenActivity].
+ *
+ * Kept out of the callers so that "how a plugin screen is opened" lives in one place: today the
+ * contributed preference rows, later any other surface that wants to mount plugin UI. Callers decide
+ * what the user sees when it fails - the message belongs to the surface, not to the launch.
+ */
+object PluginScreenNavigator {
+	private val log = LoggerFactory.getLogger("PluginScreenNavigator")
+
+	/**
+	 * Opens [fragmentClassName] of the plugin [pluginId], full-screen.
+	 *
+	 * @return true when the screen was launched; false (already logged) when it could not be, so the
+	 * caller can tell the user.
+	 */
+	fun openPluginScreen(
+		context: Context,
+		pluginId: String,
+		fragmentClassName: String,
+		title: String? = null,
+	): Boolean =
+		runCatching {
+			context.startActivity(
+				PluginScreenActivity.newIntent(context, pluginId, fragmentClassName, title),
+			)
+			true
+		}.onFailure { error ->
+			log.error("Failed to open screen $fragmentClassName of plugin $pluginId", error)
+		}.getOrDefault(false)
+}
diff --git a/app/src/main/java/com/itsaky/androidide/activities/PreferencesActivity.kt b/app/src/main/java/com/itsaky/androidide/activities/PreferencesActivity.kt
index c5d1fd31ed..0a5993cefb 100755
--- a/app/src/main/java/com/itsaky/androidide/activities/PreferencesActivity.kt
+++ b/app/src/main/java/com/itsaky/androidide/activities/PreferencesActivity.kt
@@ -29,106 +29,142 @@ import com.itsaky.androidide.app.EdgeToEdgeIDEActivity
 import com.itsaky.androidide.databinding.ActivityPreferencesBinding
 import com.itsaky.androidide.fragments.IDEPreferencesFragment
 import com.itsaky.androidide.idetooltips.TooltipManager
+import com.itsaky.androidide.preferences.PluginSettingsEntryPreference
 import com.itsaky.androidide.preferences.addRootPreferences
+import com.itsaky.androidide.preferences.pluginSettingsPreferences
 import com.itsaky.androidide.preferences.IDEPreferences as prefs
 
 class PreferencesActivity : EdgeToEdgeIDEActivity() {
-
-  private var _binding: ActivityPreferencesBinding? = null
-  private val binding: ActivityPreferencesBinding
-    get() = checkNotNull(_binding) { "Activity has been destroyed" }
-    private var feedbackButtonManager: FeedbackButtonManager? = null
-
-  private val rootFragment by lazy {
-    IDEPreferencesFragment()
-  }
-
-  private val gestureDetector by lazy {
-    GestureDetector(this, object : GestureDetector.SimpleOnGestureListener() {
-      override fun onLongPress(e: MotionEvent) {
-        binding.root.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
-        val currentFragment = supportFragmentManager.findFragmentById(binding.fragmentContainer.id) as? IDEPreferencesFragment
-        val tooltipTag = currentFragment?.getCurrentScreenTooltip() ?: ""
-        TooltipManager.showIdeCategoryTooltip(this@PreferencesActivity, binding.root, tooltipTag)
-      }
-    })
-  }
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-
-    setSupportActionBar(binding.toolbar)
-    supportActionBar!!.setTitle(R.string.ide_preferences)
-    supportActionBar!!.setDisplayHomeAsUpEnabled(true)
-
-    binding.toolbar.setNavigationOnClickListener { onBackPressedDispatcher.onBackPressed() }
-
-      feedbackButtonManager = FeedbackButtonManager(
-          activity = this,
-          feedbackFab = binding.fabFeedback.root,
-      )
-      feedbackButtonManager?.setupDraggableFab()
-
-    if (savedInstanceState != null) {
-      return
-    }
-
-    (prefs.children as MutableList?)?.clear()
-
-    prefs.addRootPreferences()
-
-    val args = Bundle()
-    args.putParcelableArrayList(
-      IDEPreferencesFragment.EXTRA_CHILDREN,
-      ArrayList(prefs.children)
-    )
-
-    rootFragment.arguments = args
-    loadFragment(rootFragment)
-  }
-
-  override fun onApplySystemBarInsets(insets: Insets) {
-    val binding = _binding ?: return
-    val toolbar: View = binding.toolbar
-    toolbar.setPadding(
-      toolbar.paddingLeft + insets.left,
-      toolbar.paddingTop,
-      toolbar.paddingRight + insets.right,
-      toolbar.paddingBottom
-    )
-
-    val fragmentContainer: View = binding.fragmentContainerParent
-    fragmentContainer.setPadding(
-      fragmentContainer.paddingLeft + insets.left,
-      fragmentContainer.paddingTop,
-      fragmentContainer.paddingRight + insets.right,
-      fragmentContainer.paddingBottom
-    )
-  }
-
-  override fun bindLayout(): View {
-    _binding = ActivityPreferencesBinding.inflate(
-      layoutInflater
-    )
-    return binding.root
-  }
-
-  private fun loadFragment(fragment: Fragment) {
-    super.loadFragment(fragment, binding.fragmentContainer.id)
-  }
-
-  override fun onDestroy() {
-    super.onDestroy()
-    _binding = null
-  }
-
-  override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
-    gestureDetector.onTouchEvent(ev)
-    return super.dispatchTouchEvent(ev)
-  }
-
-    override fun onResume() {
-        super.onResume()
-        feedbackButtonManager?.loadFabPosition()
-    }
+	@Suppress("ktlint:standard:backing-property-naming")
+	private var _binding: ActivityPreferencesBinding? = null
+	private val binding: ActivityPreferencesBinding
+		get() = checkNotNull(_binding) { "Activity has been destroyed" }
+	private var feedbackButtonManager: FeedbackButtonManager? = null
+
+	/**
+	 * The plugin-contributed rows present in the tree currently on screen. Plugins load
+	 * asynchronously at startup, so a tree built in [onCreate] can miss rows that exist moments
+	 * later; re-reading them on resume also picks up an install, uninstall, enable or disable done
+	 * in the Plugin Manager, with no IDE restart.
+	 */
+	private var contributedPreferences: List<PluginSettingsEntryPreference>? = null
+
+	private val gestureDetector by lazy {
+		GestureDetector(
+			this,
+			object : GestureDetector.SimpleOnGestureListener() {
+				override fun onLongPress(e: MotionEvent) {
+					binding.root.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
+					val currentFragment = supportFragmentManager.findFragmentById(binding.fragmentContainer.id) as? IDEPreferencesFragment
+					val tooltipTag = currentFragment?.getCurrentScreenTooltip() ?: ""
+					TooltipManager.showIdeCategoryTooltip(this@PreferencesActivity, binding.root, tooltipTag)
+				}
+			},
+		)
+	}
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+
+		setSupportActionBar(binding.toolbar)
+		supportActionBar!!.setTitle(R.string.ide_preferences)
+		supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+
+		binding.toolbar.setNavigationOnClickListener { onBackPressedDispatcher.onBackPressed() }
+
+		feedbackButtonManager =
+			FeedbackButtonManager(
+				activity = this,
+				feedbackFab = binding.fabFeedback.root,
+			)
+		feedbackButtonManager?.setupDraggableFab()
+
+		if (savedInstanceState != null) {
+			// The restored fragment already carries its children; only record what it was built from.
+			contributedPreferences = pluginSettingsPreferences()
+			return
+		}
+
+		loadRootFragment()
+	}
+
+	private fun loadRootFragment() {
+		// Snapshot before building the tree: a plugin that loads in between then reads as a change on
+		// the next resume instead of being silently missed.
+		contributedPreferences = pluginSettingsPreferences()
+
+		prefs.clearPreferences()
+
+		prefs.addRootPreferences()
+
+		val args = Bundle()
+		args.putParcelableArrayList(
+			IDEPreferencesFragment.EXTRA_CHILDREN,
+			ArrayList(prefs.children),
+		)
+
+		// A fresh instance every time: arguments cannot be set on a fragment whose state was saved.
+		loadFragment(IDEPreferencesFragment().also { it.arguments = args })
+	}
+
+	private fun reloadRootFragmentIfContributedRowsChanged() {
+		// Only while the root screen is showing - rebuilding it under a sub-screen would pop the user
+		// out of the screen they are on.
+		if (supportFragmentManager.backStackEntryCount > 0) {
+			return
+		}
+
+		if (pluginSettingsPreferences() == contributedPreferences) {
+			return
+		}
+
+		loadRootFragment()
+	}
+
+	override fun onApplySystemBarInsets(insets: Insets) {
+		val binding = _binding ?: return
+		val toolbar: View = binding.toolbar
+		toolbar.setPadding(
+			toolbar.paddingLeft + insets.left,
+			toolbar.paddingTop,
+			toolbar.paddingRight + insets.right,
+			toolbar.paddingBottom,
+		)
+
+		val fragmentContainer: View = binding.fragmentContainerParent
+		fragmentContainer.setPadding(
+			fragmentContainer.paddingLeft + insets.left,
+			fragmentContainer.paddingTop,
+			fragmentContainer.paddingRight + insets.right,
+			fragmentContainer.paddingBottom,
+		)
+	}
+
+	override fun bindLayout(): View {
+		_binding =
+			ActivityPreferencesBinding.inflate(
+				layoutInflater,
+			)
+		return binding.root
+	}
+
+	private fun loadFragment(fragment: Fragment) {
+		super.loadFragment(fragment, binding.fragmentContainer.id)
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		_binding = null
+	}
+
+	override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
+		gestureDetector.onTouchEvent(ev)
+		return super.dispatchTouchEvent(ev)
+	}
+
+	override fun onResume() {
+		super.onResume()
+		feedbackButtonManager?.loadFabPosition()
+		reloadRootFragmentIfContributedRowsChanged()
+	}
 }
diff --git a/app/src/main/java/com/itsaky/androidide/preferences/pluginPrefExts.kt b/app/src/main/java/com/itsaky/androidide/preferences/pluginPrefExts.kt
index 57d77a8db5..ae8098d04a 100644
--- a/app/src/main/java/com/itsaky/androidide/preferences/pluginPrefExts.kt
+++ b/app/src/main/java/com/itsaky/androidide/preferences/pluginPrefExts.kt
@@ -5,28 +5,115 @@ import android.content.Context
 import android.content.Intent
 import androidx.preference.Preference
 import com.itsaky.androidide.activities.PluginManagerActivity
+import com.itsaky.androidide.activities.PluginScreenNavigator
+import com.itsaky.androidide.app.IDEApplication
+import com.itsaky.androidide.plugins.manager.core.PluginManager
 import com.itsaky.androidide.resources.R.drawable
 import com.itsaky.androidide.resources.R.string
+import com.itsaky.androidide.utils.flashError
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class PluginManagerEntry(
-  override val key: String = "idepref_plugin_manager",
-  override val title: Int = string.plugin_manager_title,
-  override val summary: Int? = string.plugin_manager_summary,
+	override val key: String = "idepref_plugin_manager",
+	override val title: Int = string.plugin_manager_title,
+	override val summary: Int? = string.plugin_manager_summary,
 ) : BasePreference() {
+	override fun onCreatePreference(context: Context): Preference {
+		return Preference(context)
+	}
 
-  override fun onCreatePreference(context: Context): Preference {
-    return Preference(context)
-  }
+	override fun onPreferenceClick(preference: Preference): Boolean {
+		val context = preference.context
 
-  override fun onPreferenceClick(preference: Preference): Boolean {
-    val context = preference.context
+		val intent = Intent(context, PluginManagerActivity::class.java)
+		// Add flags to prevent multiple instances
+		intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP
+		context.startActivity(intent)
+		return true
+	}
+}
 
-    val intent = Intent(context, PluginManagerActivity::class.java)
-    // Add flags to prevent multiple instances
-    intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP
-    context.startActivity(intent)
-    return true
-  }
-}
\ No newline at end of file
+/**
+ * A Configuration row contributed by a plugin through
+ * [com.itsaky.androidide.plugins.extensions.SettingsExtension]. Tapping it asks
+ * [PluginScreenNavigator] to mount the plugin's own fragment full-screen; the row itself only holds
+ * the data, builds the widget, and reports a failed launch.
+ *
+ * Deliberately not a [BasePreference]: [IPreference.title] is an `@StringRes` resolved against the
+ * IDE's resources, while a plugin's title is a runtime string, so this row builds its own
+ * [Preference].
+ *
+ * Carries only strings - no click lambda - so it can rebuild the launch after process death,
+ * unlike [SimpleClickablePreference], whose callback is dropped from the parcel.
+ *
+ * A data class on purpose: `PreferencesActivity` compares the contributed rows across resumes to
+ * decide whether the preference tree needs rebuilding.
+ */
+@Parcelize
+data class PluginSettingsEntryPreference(
+	val pluginId: String,
+	val entryId: String,
+	val titleText: String,
+	val summaryText: String?,
+	val fragmentClassName: String,
+) : IPreference() {
+	override val key: String
+		get() = "idepref_plugin_settings_$pluginId.$entryId"
+
+	// Unused: the row sets a literal title in onCreateView rather than resolving an IDE resource.
+	override val title: Int
+		get() = 0
+
+	override fun onCreateView(context: Context): Preference {
+		val preference = Preference(context)
+		preference.key = key
+		preference.title = titleText
+		preference.summary = summaryText
+		// No icon in v1: leave the slot unreserved so the row aligns with PluginManagerEntry.
+		preference.isIconSpaceReserved = false
+		preference.setOnPreferenceClickListener { onClick(it.context) }
+		return preference
+	}
+
+	private fun onClick(context: Context): Boolean {
+		val opened =
+			PluginScreenNavigator.openPluginScreen(
+				context = context,
+				pluginId = pluginId,
+				fragmentClassName = fragmentClassName,
+				title = titleText,
+			)
+
+		// Without this the row looks dead: the tap would do nothing the user can see.
+		if (!opened) {
+			flashError(string.msg_open_plugin_settings_failed)
+		}
+
+		// The click was ours either way, so don't let androidx-preference fall through to its own
+		// fragment/intent handling.
+		return true
+	}
+}
+
+/**
+ * The preference rows contributed by enabled plugins. Empty when no plugin contributes any, and
+ * also while the asynchronous plugin load is still in flight - `PreferencesActivity` re-checks on
+ * resume and rebuilds the tree if the set changed.
+ *
+ * [pluginManager] defaults to the running IDE's instance; tests pass their own.
+ */
+internal fun pluginSettingsPreferences(
+	pluginManager: PluginManager? = IDEApplication.getPluginManager(),
+): List<PluginSettingsEntryPreference> =
+	pluginManager
+		?.getPluginSettingsEntries()
+		?.map { (pluginId, entry) ->
+			PluginSettingsEntryPreference(
+				pluginId = pluginId,
+				entryId = entry.id,
+				titleText = entry.title,
+				summaryText = entry.summary,
+				fragmentClassName = entry.fragmentClassName,
+			)
+		}.orEmpty()
diff --git a/app/src/main/java/com/itsaky/androidide/preferences/rootPrefExts.kt b/app/src/main/java/com/itsaky/androidide/preferences/rootPrefExts.kt
index 5ce47c50e8..2d8ede5c16 100644
--- a/app/src/main/java/com/itsaky/androidide/preferences/rootPrefExts.kt
+++ b/app/src/main/java/com/itsaky/androidide/preferences/rootPrefExts.kt
@@ -39,7 +39,8 @@ class ConfigurationPreferences(
 		addPreference(BuildAndRunPreferences())
 		addPreference(TermuxPreferences())
 		addPreference(GitPreferencesScreen())
-        addPreference(PluginManagerEntry())
+		addPreference(PluginManagerEntry())
+		pluginSettingsPreferences().forEach { addPreference(it) }
 
 		addPreference(about)
 	}
diff --git a/app/src/main/res/layout/layout_settings_gemini_api.xml b/app/src/main/res/layout/layout_settings_gemini_api.xml
deleted file mode 100644
index 731fb3b3a0..0000000000
--- a/app/src/main/res/layout/layout_settings_gemini_api.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/gemini_api_key_status_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:text="@string/gemini_api_key_saved_on"
-        android:textAppearance="?attr/textAppearanceBodyMedium"
-        android:textColor="?attr/colorOnSurfaceVariant"
-        android:visibility="gone" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/gemini_api_key_layout"
-        style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/gemini_api_key"
-        app:passwordToggleEnabled="true">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/gemini_api_key_input"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textPassword"
-            android:maxLines="1" />
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp">
-
-        <Button
-            android:id="@+id/btn_clear_api_key"
-            style="?attr/materialButtonOutlinedStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:text="@string/clear"
-            android:visibility="gone" />
-
-        <Button
-            android:id="@+id/btn_edit_api_key"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:text="@string/edit"
-            android:visibility="gone" />
-
-        <Button
-            android:id="@+id/btn_save_api_key"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:text="@string/save_key" />
-
-    </RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/test/java/com/itsaky/androidide/preferences/PluginSettingsEntryPreferenceTest.kt b/app/src/test/java/com/itsaky/androidide/preferences/PluginSettingsEntryPreferenceTest.kt
new file mode 100644
index 0000000000..c1c5a4c1ea
--- /dev/null
+++ b/app/src/test/java/com/itsaky/androidide/preferences/PluginSettingsEntryPreferenceTest.kt
@@ -0,0 +1,92 @@
+/*
+ *  This file is part of AndroidIDE.
+ *
+ *  AndroidIDE is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  AndroidIDE is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.itsaky.androidide.preferences
+
+import android.os.Parcel
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/**
+ * The row is re-created from its parcel after process death and rebuilds its own launch intent from
+ * these fields, so losing any of them would leave a dead preference row behind.
+ */
+@RunWith(RobolectricTestRunner::class)
+class PluginSettingsEntryPreferenceTest {
+	@Test
+	fun parcelRoundTripKeepsEveryField() {
+		val original =
+			PluginSettingsEntryPreference(
+				pluginId = "com.example.ai",
+				entryId = "agent",
+				titleText = "Agent",
+				summaryText = "Configure the assistant",
+				fragmentClassName = "com.example.ai.SettingsFragment",
+			)
+
+		assertThat(roundTrip(original)).isEqualTo(original)
+	}
+
+	@Test
+	fun parcelRoundTripKeepsANullSummary() {
+		val original =
+			PluginSettingsEntryPreference(
+				pluginId = "com.example.ai",
+				entryId = "agent",
+				titleText = "Agent",
+				summaryText = null,
+				fragmentClassName = "com.example.ai.SettingsFragment",
+			)
+
+		val restored = roundTrip(original)
+
+		assertThat(restored).isEqualTo(original)
+		assertThat(restored.summaryText).isNull()
+	}
+
+	@Test
+	fun keyNamespacesThePluginAndTheEntry() {
+		val preference =
+			PluginSettingsEntryPreference(
+				pluginId = "com.example.ai",
+				entryId = "agent",
+				titleText = "Agent",
+				summaryText = null,
+				fragmentClassName = "com.example.ai.SettingsFragment",
+			)
+
+		assertThat(preference.key).isEqualTo("idepref_plugin_settings_com.example.ai.agent")
+	}
+
+	@Suppress("DEPRECATION")
+	private fun roundTrip(preference: PluginSettingsEntryPreference): PluginSettingsEntryPreference {
+		val parcel = Parcel.obtain()
+		return try {
+			parcel.writeParcelable(preference, 0)
+			parcel.setDataPosition(0)
+			checkNotNull(
+				parcel.readParcelable<PluginSettingsEntryPreference>(
+					PluginSettingsEntryPreference::class.java.classLoader,
+				),
+			)
+		} finally {
+			parcel.recycle()
+		}
+	}
+}
diff --git a/docs/plugin-api.md b/docs/plugin-api.md
index 1eb9fea222..fb03b91287 100644
--- a/docs/plugin-api.md
+++ b/docs/plugin-api.md
@@ -10,9 +10,9 @@ The surface a plugin binds to is broader than one module. All of the following a
 
 - **The `:plugin-api` module** — package `com.itsaky.androidide.plugins.*`:
   - Core: `IPlugin` (lifecycle), `PluginContext`, `PluginLogger`, `ServiceRegistry`, `ResourceManager`.
-  - Extension interfaces plugins **implement**: `UIExtension`, `EditorExtension`, `EditorTabExtension`, `DocumentationExtension`, `BuildActionExtension`, `SnippetExtension`, `ProjectExtension`, `FileOpenExtension`.
+  - Extension interfaces plugins **implement**: `UIExtension`, `EditorExtension`, `EditorTabExtension`, `DocumentationExtension`, `BuildActionExtension`, `SnippetExtension`, `ProjectExtension`, `FileOpenExtension`, `SettingsExtension`.
   - IDE service interfaces plugins **call** (via `ServiceRegistry.get(X::class.java)`): `IdeProjectService`, `IdeEditorService`, `IdeFileService`, `IdeEnvironmentService`, `IdeArchiveService`, `IdeBuildService`, `IdeUIService`, `IdeEditorTabService`, `IdeTooltipService`, `IdeThemeService`, `IdeFeatureFlagService`, `IdeCommandService`, `IdeTemplateService`, `IdeSnippetService`, `IdeSidebarService`.
-  - Data classes plugins **construct** (e.g. `MenuItem`, `TabItem`, `EditorTabItem`, `NavigationItem`, `ToolbarAction`, `FabAction`, `PluginBuildAction`, `SnippetContribution`, `PluginTooltipEntry`).
+  - Data classes plugins **construct** (e.g. `MenuItem`, `TabItem`, `EditorTabItem`, `NavigationItem`, `ToolbarAction`, `FabAction`, `PluginBuildAction`, `SnippetContribution`, `PluginTooltipEntry`, `PluginSettingsEntry`).
   - Enums / sealed types plugins **reference**: `PluginPermission`, `ShowAsAction`, `ArchiveFormat`, `BuildActionCategory`, `ToolbarActionIds`, `CommandSpec`, `CommandResult`, `ExtractResult`.
 - **Wire/format contracts outside the module:**
   - Manifest `<meta-data>` keys — `plugin.id`, `plugin.name`, `plugin.version`, `plugin.description`, `plugin.author`, `plugin.main_class`, `plugin.min_ide_version`, `plugin.max_ide_version`, `plugin.permissions`, `plugin.sidebar_items`, `plugin.icon_day`, `plugin.icon_night`. Matched **by string** — a rename silently breaks every plugin.
diff --git a/plugin-api/api/plugin-api.api b/plugin-api/api/plugin-api.api
index e646caffa1..399036d52e 100644
--- a/plugin-api/api/plugin-api.api
+++ b/plugin-api/api/plugin-api.api
@@ -821,6 +821,28 @@ public final class com/itsaky/androidide/plugins/extensions/PluginBuildAction {
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class com/itsaky/androidide/plugins/extensions/PluginSettingsEntry {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZ)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()Ljava/lang/String;
+	public final fun component4 ()Ljava/lang/String;
+	public final fun component5 ()I
+	public final fun component6 ()Z
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZ)Lcom/itsaky/androidide/plugins/extensions/PluginSettingsEntry;
+	public static synthetic fun copy$default (Lcom/itsaky/androidide/plugins/extensions/PluginSettingsEntry;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZILjava/lang/Object;)Lcom/itsaky/androidide/plugins/extensions/PluginSettingsEntry;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getFragmentClassName ()Ljava/lang/String;
+	public final fun getId ()Ljava/lang/String;
+	public final fun getOrder ()I
+	public final fun getSummary ()Ljava/lang/String;
+	public final fun getTitle ()Ljava/lang/String;
+	public fun hashCode ()I
+	public final fun isVisible ()Z
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class com/itsaky/androidide/plugins/extensions/PluginTooltipButton {
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;IZ)V
 	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;IZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -1001,6 +1023,14 @@ public final class com/itsaky/androidide/plugins/extensions/ProjectType : java/l
 	public static fun values ()[Lcom/itsaky/androidide/plugins/extensions/ProjectType;
 }
 
+public abstract interface class com/itsaky/androidide/plugins/extensions/SettingsExtension : com/itsaky/androidide/plugins/IPlugin {
+	public abstract fun getSettingsEntries ()Ljava/util/List;
+}
+
+public final class com/itsaky/androidide/plugins/extensions/SettingsExtension$DefaultImpls {
+	public static fun getSettingsEntries (Lcom/itsaky/androidide/plugins/extensions/SettingsExtension;)Ljava/util/List;
+}
+
 public final class com/itsaky/androidide/plugins/extensions/ShowAsAction : java/lang/Enum {
 	public static final field ALWAYS Lcom/itsaky/androidide/plugins/extensions/ShowAsAction;
 	public static final field COLLAPSE_ACTION_VIEW Lcom/itsaky/androidide/plugins/extensions/ShowAsAction;
diff --git a/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/extensions/SettingsExtension.kt b/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/extensions/SettingsExtension.kt
new file mode 100644
index 0000000000..c2fcdace7c
--- /dev/null
+++ b/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/extensions/SettingsExtension.kt
@@ -0,0 +1,46 @@
+package com.itsaky.androidide.plugins.extensions
+
+import com.itsaky.androidide.plugins.IPlugin
+
+/**
+ * Interface for plugins that contribute rows to the IDE Preferences screen.
+ *
+ * Each entry becomes one preference row in the IDE's Configuration group, alongside Terminal,
+ * Git and Plugin Manager. Tapping it mounts [PluginSettingsEntry.fragmentClassName] full-screen
+ * on an IDE-owned container.
+ *
+ * The IDE knows nothing about what a plugin's settings screen contains: the plugin owns both the
+ * UI and the persistence (see `PluginContext.getPluginSharedPreferences`). The IDE never renders
+ * widgets for, reads, or writes a plugin's setting values.
+ */
+interface SettingsExtension : IPlugin {
+	/**
+	 * Provide the settings entries to show in the IDE Preferences screen.
+	 * @return List of entries, one preference row each.
+	 */
+	fun getSettingsEntries(): List<PluginSettingsEntry> = emptyList()
+}
+
+/**
+ * One IDE Preferences row owned by a plugin.
+ *
+ * The hosted fragment is shown full-screen with no IDE toolbar and no IDE back affordance, so
+ * supply your own app bar and your own way back (`requireActivity().finish()`) - exactly as the
+ * layout-editor plugin screens do.
+ *
+ * @property id Stable id, unique within the plugin. Forms part of the row's preference key.
+ * @property title Row title. A runtime string, NOT an IDE string resource, so localize it yourself.
+ * @property summary Optional second line shown under the title.
+ * @property fragmentClassName Fully-qualified name of the Fragment to mount. Must be a public
+ * class in the plugin with a no-arg constructor, resolvable by the plugin's own classloader.
+ * @property order Sort order among all contributed rows; ties break on [title].
+ * @property isVisible When false the IDE skips the row entirely.
+ */
+data class PluginSettingsEntry(
+	val id: String,
+	val title: String,
+	val summary: String? = null,
+	val fragmentClassName: String,
+	val order: Int = 0,
+	val isVisible: Boolean = true,
+)
diff --git a/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginManager.kt b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginManager.kt
index edb9b21254..f0b0892ac2 100644
--- a/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginManager.kt
+++ b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginManager.kt
@@ -4,35 +4,26 @@ package com.itsaky.androidide.plugins.manager.core
 
 import android.app.Activity
 import android.content.Context
-import com.itsaky.androidide.plugins.*
+import com.itsaky.androidide.actions.SidebarSlotExceededException
+import com.itsaky.androidide.actions.SidebarSlotManager
+import com.itsaky.androidide.plugins.IPlugin
+import com.itsaky.androidide.plugins.PluginContext
+import com.itsaky.androidide.plugins.PluginInfo
+import com.itsaky.androidide.plugins.PluginLogger
+import com.itsaky.androidide.plugins.PluginMetadata
+import com.itsaky.androidide.plugins.PluginPermission
+import com.itsaky.androidide.plugins.ServiceRegistry
 import com.itsaky.androidide.plugins.base.PluginFragmentHelper
-import com.itsaky.androidide.plugins.manager.fragment.PluginFragmentFactory
-import com.itsaky.androidide.plugins.services.IdeProjectService
-import com.itsaky.androidide.plugins.services.IdeUIService
-import com.itsaky.androidide.plugins.services.IdeBuildService
-import com.itsaky.androidide.plugins.services.IdeProjectManipulationService
-import com.itsaky.androidide.plugins.manager.services.IdeUIServiceImpl
-import com.itsaky.androidide.plugins.manager.services.IdeBuildServiceImpl
-import com.itsaky.androidide.plugins.manager.services.IdeProjectManipulationServiceImpl
-import com.itsaky.androidide.plugins.manager.services.IdeProjectServiceImpl
-import com.itsaky.androidide.plugins.manager.services.IdeFileServiceImpl
-import com.itsaky.androidide.plugins.manager.services.CogoProjectProvider
-import com.itsaky.androidide.plugins.manager.services.IdeTooltipServiceImpl
-import com.itsaky.androidide.plugins.manager.services.IdeEditorTabServiceImpl
+import com.itsaky.androidide.plugins.extensions.BuildActionExtension
 import com.itsaky.androidide.plugins.extensions.DocumentationExtension
 import com.itsaky.androidide.plugins.extensions.EditorDecorationProvider
 import com.itsaky.androidide.plugins.extensions.FileOpenExtension
-import com.itsaky.androidide.plugins.extensions.SnippetExtension
-import com.itsaky.androidide.plugins.manager.services.IdeSnippetServiceImpl
-import com.itsaky.androidide.plugins.manager.snippets.PluginSnippetManager
-import com.itsaky.androidide.plugins.services.IdeSnippetService
 import com.itsaky.androidide.plugins.extensions.FileTabMenuItem
+import com.itsaky.androidide.plugins.extensions.PluginSettingsEntry
+import com.itsaky.androidide.plugins.extensions.SettingsExtension
+import com.itsaky.androidide.plugins.extensions.SnippetExtension
 import com.itsaky.androidide.plugins.extensions.UIExtension
-import com.itsaky.androidide.plugins.manager.loaders.PluginManifest
-import com.itsaky.androidide.plugins.manager.loaders.PluginLoader
-import com.itsaky.androidide.plugins.manager.loaders.toPluginMetadata
-import com.itsaky.androidide.plugins.manager.loaders.PluginResourceContext
-import com.itsaky.androidide.plugins.manager.security.PluginSecurityManager
+import com.itsaky.androidide.plugins.manager.build.PluginBuildActionManager
 import com.itsaky.androidide.plugins.manager.context.PluginContextImpl
 import com.itsaky.androidide.plugins.manager.context.PluginLifecycleDispatcher
 import com.itsaky.androidide.plugins.manager.context.PluginLoggerImpl
@@ -41,31 +32,48 @@ import com.itsaky.androidide.plugins.manager.context.ResourceManagerImpl
 import com.itsaky.androidide.plugins.manager.context.ServiceRegistryImpl
 import com.itsaky.androidide.plugins.manager.context.SharedServiceRegistry
 import com.itsaky.androidide.plugins.manager.documentation.PluginDocumentationManager
+import com.itsaky.androidide.plugins.manager.fragment.PluginFragmentFactory
+import com.itsaky.androidide.plugins.manager.loaders.PluginLoader
+import com.itsaky.androidide.plugins.manager.loaders.PluginManifest
+import com.itsaky.androidide.plugins.manager.loaders.PluginResourceContext
+import com.itsaky.androidide.plugins.manager.loaders.toPluginMetadata
 import com.itsaky.androidide.plugins.manager.project.PluginProjectManager
+import com.itsaky.androidide.plugins.manager.security.PluginSecurityManager
+import com.itsaky.androidide.plugins.manager.services.CogoProjectProvider
+import com.itsaky.androidide.plugins.manager.services.IdeArchiveServiceImpl
+import com.itsaky.androidide.plugins.manager.services.IdeBuildServiceImpl
+import com.itsaky.androidide.plugins.manager.services.IdeCommandServiceImpl
+import com.itsaky.androidide.plugins.manager.services.IdeEditorServiceImpl
+import com.itsaky.androidide.plugins.manager.services.IdeEditorTabServiceImpl
+import com.itsaky.androidide.plugins.manager.services.IdeEnvironmentServiceImpl
+import com.itsaky.androidide.plugins.manager.services.IdeFeatureFlagServiceImpl
+import com.itsaky.androidide.plugins.manager.services.IdeFileServiceImpl
+import com.itsaky.androidide.plugins.manager.services.IdeProjectManipulationServiceImpl
+import com.itsaky.androidide.plugins.manager.services.IdeProjectServiceImpl
+import com.itsaky.androidide.plugins.manager.services.IdeSidebarServiceImpl
+import com.itsaky.androidide.plugins.manager.services.IdeSnippetServiceImpl
 import com.itsaky.androidide.plugins.manager.services.IdeTemplateServiceImpl
-import com.itsaky.androidide.plugins.services.IdeTemplateService
-import com.itsaky.androidide.plugins.services.IdeTooltipService
+import com.itsaky.androidide.plugins.manager.services.IdeThemeServiceImpl
+import com.itsaky.androidide.plugins.manager.services.IdeTooltipServiceImpl
+import com.itsaky.androidide.plugins.manager.services.IdeUIServiceImpl
+import com.itsaky.androidide.plugins.manager.snippets.PluginSnippetManager
+import com.itsaky.androidide.plugins.manager.ui.PluginEditorTabManager
+import com.itsaky.androidide.plugins.services.IdeArchiveService
+import com.itsaky.androidide.plugins.services.IdeBuildService
+import com.itsaky.androidide.plugins.services.IdeCommandService
+import com.itsaky.androidide.plugins.services.IdeEditorService
 import com.itsaky.androidide.plugins.services.IdeEditorTabService
+import com.itsaky.androidide.plugins.services.IdeEnvironmentService
+import com.itsaky.androidide.plugins.services.IdeFeatureFlagService
 import com.itsaky.androidide.plugins.services.IdeFileService
+import com.itsaky.androidide.plugins.services.IdeProjectManipulationService
+import com.itsaky.androidide.plugins.services.IdeProjectService
 import com.itsaky.androidide.plugins.services.IdeSidebarService
-import com.itsaky.androidide.plugins.services.IdeEditorService
-import com.itsaky.androidide.plugins.services.IdeEnvironmentService
-import com.itsaky.androidide.plugins.services.IdeArchiveService
-import com.itsaky.androidide.plugins.manager.services.IdeEnvironmentServiceImpl
-import com.itsaky.androidide.plugins.manager.services.IdeArchiveServiceImpl
-import com.itsaky.androidide.plugins.manager.services.IdeSidebarServiceImpl
-import com.itsaky.androidide.plugins.manager.services.IdeEditorServiceImpl
-import com.itsaky.androidide.plugins.manager.ui.PluginEditorTabManager
-import com.itsaky.androidide.plugins.manager.services.IdeThemeServiceImpl
+import com.itsaky.androidide.plugins.services.IdeSnippetService
+import com.itsaky.androidide.plugins.services.IdeTemplateService
 import com.itsaky.androidide.plugins.services.IdeThemeService
-import com.itsaky.androidide.plugins.services.IdeFeatureFlagService
-import com.itsaky.androidide.plugins.manager.services.IdeFeatureFlagServiceImpl
-import com.itsaky.androidide.plugins.services.IdeCommandService
-import com.itsaky.androidide.plugins.manager.services.IdeCommandServiceImpl
-import com.itsaky.androidide.plugins.extensions.BuildActionExtension
-import com.itsaky.androidide.plugins.manager.build.PluginBuildActionManager
-import com.itsaky.androidide.actions.SidebarSlotManager
-import com.itsaky.androidide.actions.SidebarSlotExceededException
+import com.itsaky.androidide.plugins.services.IdeTooltipService
+import com.itsaky.androidide.plugins.services.IdeUIService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -79,1584 +87,1696 @@ import java.io.File
 import java.util.concurrent.ConcurrentHashMap
 
 class PluginManager private constructor(
-    private val context: Context,
-    private val eventBus: Any, // EventBus reference to avoid direct dependency
-    private val logger: PluginLogger
+	private val context: Context,
+	private val eventBus: Any, // EventBus reference to avoid direct dependency
+	private val logger: PluginLogger,
 ) {
-    
-    /**
-     * Interface for providing the current Activity context for UI operations
-     */
-    fun interface ActivityProvider {
-        fun getCurrentActivity(): Activity?
-    }
-    
-    /**
-     * Interface for validating file/path access for plugins
-     */
-    interface PluginPathValidator {
-        fun isPathAllowed(path: File): Boolean
-        fun getAllowedPaths(): List<String>
-    }
-    
-    private var activityProvider: ActivityProvider? = null
-    private var pathValidator: PluginPathValidator? = null
-    private var editorProvider: IdeEditorServiceImpl.EditorProvider? = null
-
-    /**
-     * Stable provider handed to every plugin's [IdeEditorServiceImpl]. Each call delegates to
-     * the currently-set [editorProvider] (or returns a no-op default when none is wired). This
-     * lets the editor activity register/unregister a real provider over its lifecycle without
-     * having to rebuild already-loaded plugin services.
-     */
-    /**
-     * Callbacks added by plugins before any real provider was set. We hold them here and
-     * replay onto a real provider when one is registered, so listener registration doesn't
-     * silently drop on the floor during the early-boot window.
-     */
-    private val pendingFileChangeCallbacks = java.util.concurrent.CopyOnWriteArraySet<(File?) -> Unit>()
-    private val pendingContentChangeCallbacks =
-        java.util.concurrent.CopyOnWriteArraySet<(String, Int, Int, String) -> Unit>()
-
-    private val delegatingEditorProvider = object : IdeEditorServiceImpl.EditorProvider {
-        private fun current(): IdeEditorServiceImpl.EditorProvider? = editorProvider
-
-        override fun getCurrentFile(): File? = current()?.getCurrentFile()
-        override fun getOpenFiles(): List<File> = current()?.getOpenFiles() ?: emptyList()
-        override fun isFileOpen(file: File): Boolean = current()?.isFileOpen(file) ?: false
-        override fun getCurrentSelection(): String? = current()?.getCurrentSelection()
-        override fun getCurrentFileContent(): String? = current()?.getCurrentFileContent()
-        override fun getFileContent(file: File): String? = current()?.getFileContent(file)
-        override fun getCurrentCursorPosition() = current()?.getCurrentCursorPosition()
-        override fun getCurrentSelectionRange() = current()?.getCurrentSelectionRange()
-        override fun getCurrentLineText(): String? = current()?.getCurrentLineText()
-        override fun getLineText(file: File, lineNumber: Int): String? = current()?.getLineText(file, lineNumber)
-        override fun getLineCount(file: File): Int = current()?.getLineCount(file) ?: 0
-        override fun getWordAtCursor(): String? = current()?.getWordAtCursor()
-        override fun getCurrentLanguageId(): String? = current()?.getCurrentLanguageId()
-        override fun getFileLanguageId(file: File): String? = current()?.getFileLanguageId(file)
-        override fun isFileModified(file: File): Boolean = current()?.isFileModified(file) ?: false
-        override fun getModifiedFiles(): List<File> = current()?.getModifiedFiles() ?: emptyList()
-        override fun openFile(file: File): Boolean = current()?.openFile(file) ?: false
-        override fun openFileAt(file: File, line: Int, column: Int): Boolean =
-            current()?.openFileAt(file, line, column) ?: false
-        override fun saveCurrentFile(): Boolean = current()?.saveCurrentFile() ?: false
-        override fun insertTextAtCursor(text: String): Boolean = current()?.insertTextAtCursor(text) ?: false
-        override fun replaceSelection(text: String): Boolean = current()?.replaceSelection(text) ?: false
-        override fun appendToLine(file: File, line: Int, text: String): Boolean =
-            current()?.appendToLine(file, line, text) ?: false
-        override fun prependToLine(file: File, line: Int, text: String): Boolean =
-            current()?.prependToLine(file, line, text) ?: false
-        override fun replaceLine(file: File, line: Int, newText: String): Boolean =
-            current()?.replaceLine(file, line, newText) ?: false
-        override fun insertLineBefore(file: File, line: Int, text: String): Boolean =
-            current()?.insertLineBefore(file, line, text) ?: false
-        override fun deleteLine(file: File, line: Int): Boolean = current()?.deleteLine(file, line) ?: false
-        override fun replaceRange(
-            file: File,
-            range: com.itsaky.androidide.plugins.services.SelectionRange,
-            newText: String,
-        ): Boolean = current()?.replaceRange(file, range, newText) ?: false
-        override fun addFileChangeCallback(callback: (File?) -> Unit) {
-            pendingFileChangeCallbacks.add(callback)
-            current()?.addFileChangeCallback(callback)
-        }
-        override fun removeFileChangeCallback(callback: (File?) -> Unit) {
-            pendingFileChangeCallbacks.remove(callback)
-            current()?.removeFileChangeCallback(callback)
-        }
-        override fun addContentChangeCallback(callback: (String, Int, Int, String) -> Unit) {
-            pendingContentChangeCallbacks.add(callback)
-            current()?.addContentChangeCallback(callback)
-        }
-        override fun removeContentChangeCallback(callback: (String, Int, Int, String) -> Unit) {
-            pendingContentChangeCallbacks.remove(callback)
-            current()?.removeContentChangeCallback(callback)
-        }
-        override fun showInlineSuggestion(pluginId: String, text: String) { current()?.showInlineSuggestion(pluginId, text) }
-        override fun dismissInlineSuggestion(pluginId: String) { current()?.dismissInlineSuggestion(pluginId) }
-    }
-
-    // Configurable permissions for different services
-    private var projectServicePermissions: Set<PluginPermission> = setOf(PluginPermission.FILESYSTEM_READ)
-    
-    companion object {
-        @Volatile
-        private var INSTANCE: PluginManager? = null
-        
-        fun getInstance(context: Context, eventBus: Any, logger: PluginLogger): PluginManager {
-            return INSTANCE ?: synchronized(this) {
-                INSTANCE ?: PluginManager(context, eventBus, logger).also { INSTANCE = it }
-            }
-        }
-        
-        /**
-         * Get the already initialized instance, or null if not yet initialized
-         */
-        fun getInstance(): PluginManager? {
-            return INSTANCE
-        }
-    }
-    
-    private val loadedPlugins = ConcurrentHashMap<String, LoadedPlugin>()
-    private val pluginStates = ConcurrentHashMap<String, Boolean>()
-    private val pluginRegistry = PluginRegistry(context)
-    private val securityManager = PluginSecurityManager()
-    private val serviceRegistry = SharedServiceRegistry()
-    private val lifecycleDispatcher = PluginLifecycleDispatcher()
-    
-    private val pluginsDir = File(context.filesDir, "plugins")
-    private val documentationManager = PluginDocumentationManager(context)
-    private var templateReloadListener: (() -> Unit)? = null
-    private var snippetRefreshListener: ((String) -> Unit)? = null
-    val crashTracker = PluginCrashTracker(context, logger)
-
-    private val statePersistScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-    private val statePersistMutex = Mutex()
-
-    fun setTemplateReloadListener(listener: (() -> Unit)?) {
-        this.templateReloadListener = listener
-        PluginProjectManager.getInstance().setTemplateReloadListener(listener)
-    }
-
-    fun setSnippetRefreshListener(listener: ((String) -> Unit)?) {
-        this.snippetRefreshListener = listener
-    }
-
-    // Helper methods for cleaner error handling
-    private fun <T> executeWithErrorHandling(
-        operationDescription: String,
-        pluginId: String? = null,
-        operation: () -> T
-    ): Result<T> {
-        return runCatching(operation).onFailure { exception ->
-            val contextInfo = if (pluginId != null) " for plugin $pluginId" else ""
-            logger.error("Failed to $operationDescription$contextInfo", exception)
-        }
-    }
-
-    private fun <T> registerServiceWithErrorHandling(
-        serviceRegistry: ServiceRegistryImpl,
-        serviceClass: Class<T>,
-        pluginId: String,
-        serviceName: String,
-        serviceFactory: () -> T
-    ) {
-        executeWithErrorHandling("create $serviceName service", pluginId) {
-            val serviceInstance = serviceFactory()
-            serviceRegistry.register(serviceClass, serviceInstance)
-            logger.debug("Registered $serviceName service for plugin: $pluginId")
-        }
-    }
-
-    // IDE service providers
-    private val projectProvider = CogoProjectProvider()
-    
-    init {
-        if (!pluginsDir.exists()) {
-            pluginsDir.mkdirs()
-        }
-    }
-    
-    suspend fun loadPlugins() = withContext(Dispatchers.IO) {
-        logger.info("Loading plugins from directory: ${pluginsDir.absolutePath}")
-
-        // Load plugin states first
-        loadPluginStates()
-
-        // After loading all plugins, verify documentation for already loaded plugins
-        verifyDocumentationForLoadedPlugins()
-
-        val pluginFiles = pluginsDir.listFiles { file ->
-            file.isFile && file.name.endsWith(".cgp", ignoreCase = true)
-        } ?: return@withContext
-
-        logger.info("Found ${pluginFiles.size} plugin files")
-
-        // Load plugins in parallel
-        val loadJobs = pluginFiles.map { pluginFile ->
-            async {
-                try {
-                    logger.debug("Loading plugin: ${pluginFile.name}")
-                    val result = loadPlugin(pluginFile)
-                    result.onFailure { error ->
-                        logger.error("Failed to load plugin from ${pluginFile.name}: ${error.message}", error)
-                    }
-                } catch (e: Exception) {
-                    logger.error("Failed to load plugin from ${pluginFile.name}", e)
-                }
-            }
-        }
-
-        // Wait for all plugins to load
-        loadJobs.awaitAll()
-
-        logger.info("Successfully loaded ${loadedPlugins.size} plugins")
-
-        // Verify documentation after all plugins are loaded
-        verifyDocumentationForLoadedPlugins()
-    }
-
-    /**
-     * Verify and recreate documentation for all loaded plugins that support it.
-     * This ensures documentation is present even after database updates.
-     */
-    private suspend fun verifyDocumentationForLoadedPlugins() = withContext(Dispatchers.IO) {
-        val pluginsWithDocs = loadedPlugins.values
-            .filter { it.plugin is DocumentationExtension }
-            .associate { it.manifest.id to it.plugin as DocumentationExtension }
-
-        if (pluginsWithDocs.isNotEmpty()) {
-            logger.info("Verifying documentation for ${pluginsWithDocs.size} plugins")
-            val recreatedCount = documentationManager.verifyAllPluginDocumentation(pluginsWithDocs)
-            if (recreatedCount > 0) {
-                logger.info("Recreated missing documentation for $recreatedCount plugins")
-            }
-        }
-    }
-
-    /**
-     * Public method to manually trigger documentation verification.
-     * Can be called when database changes are detected.
-     */
-    suspend fun verifyAllPluginDocumentation() = withContext(Dispatchers.IO) {
-        verifyDocumentationForLoadedPlugins()
-    }
-
-    private fun loadAndValidate(pluginFile: File): Result<Pair<PluginManifest, PluginLoader>> {
-        if (!pluginFile.exists()) return Result.failure(IllegalArgumentException("Plugin file does not exist: ${pluginFile.absolutePath}"))
-        if (!pluginFile.canRead()) return Result.failure(IllegalArgumentException("Cannot read plugin file: ${pluginFile.absolutePath}"))
-        val loader = PluginLoader(context, pluginFile)
-        val manifest = loader.getPluginMetadata()
-            ?: return Result.failure(IllegalArgumentException("Plugin manifest not found in: ${pluginFile.name}"))
-        return Result.success(manifest to loader)
-    }
-
-    fun getPluginMetadataOnly(pluginFile: File): Result<PluginManifest> =
-        loadAndValidate(pluginFile).map { it.first }
-
-    fun getPluginValidation(pluginFile: File): Result<PluginValidation> =
-        loadAndValidate(pluginFile).map { (manifest, loader) ->
-            PluginValidation(
-                manifest = manifest,
-                isDebug = loader.isDebuggable(),
-                iconDayEntryExists = manifest.iconDay?.let(loader::hasEntry) ?: false,
-                iconNightEntryExists = manifest.iconNight?.let(loader::hasEntry) ?: false
-            )
-        }
-
-    /**
-     * Load plugin and return both the plugin instance and its metadata
-     */
-    fun loadPluginWithMetadata(pluginFile: File): Result<Pair<IPlugin, PluginManifest>> {
-        logger.info("Attempting to load plugin with metadata: ${pluginFile.name}")
-
-        // Pre-flight checks
-        if (!pluginFile.exists()) {
-            val error = "Plugin file does not exist: ${pluginFile.absolutePath}"
-            logger.error(error)
-            return Result.failure(IllegalArgumentException(error))
-        }
-
-        if (!pluginFile.canRead()) {
-            val error = "Cannot read plugin file: ${pluginFile.absolutePath}"
-            logger.error(error)
-            return Result.failure(IllegalArgumentException(error))
-        }
-
-        if (!pluginFile.name.endsWith(".cgp", ignoreCase = true)) {
-            val error = "Only CGP plugins are supported. File: ${pluginFile.name}"
-            logger.error(error)
-            return Result.failure(IllegalArgumentException(error))
-        }
-
-        // Create plugin loader
-        val pluginLoader = PluginLoader(context, pluginFile)
-
-        // Get plugin manifest from 
-        val manifest = pluginLoader.getPluginMetadata()
-        if (manifest == null) {
-            return Result.failure(IllegalArgumentException("Plugin manifest not found in CGP: ${pluginFile.name}"))
-        }
-
-        // Load the plugin
-        val pluginResult = loadPlugin(pluginFile)
-        return if (pluginResult.isSuccess) {
-            val plugin = pluginResult.getOrNull()!!
-            Result.success(plugin to manifest)
-        } else {
-            Result.failure(pluginResult.exceptionOrNull() ?: RuntimeException("Failed to load plugin"))
-        }
-    }
-    
-    /**
-     * Load plugin with full resource support
-     */
-    fun loadPlugin(file: File): Result<IPlugin> {
-        var reservedSlotsPluginId: String? = null
-        return try {
-            logger.debug("Loading plugin from: ${file.absolutePath}")
-
-            // Validate prerequisites
-            if (!file.exists() || !file.canRead()) {
-                return Result.failure(IllegalArgumentException("Plugin  does not exist or is not readable: ${file.absolutePath}"))
-            }
-
-            // Create plugin loader
-            val pluginLoader = PluginLoader(context, file)
-
-            // Validate signature
-            if (!pluginLoader.validateSignature()) {
-                logger.warn("signature validation failed for: ${file.name}")
-                // Continue anyway for development
-            }
-
-            // Get plugin manifest from 
-            val manifest = pluginLoader.getPluginMetadata()
-            if (manifest == null) {
-                return Result.failure(IllegalArgumentException("Plugin manifest not found in: ${file.name}"))
-            }
-
-            logger.debug("Parsed manifest for plugin: ${manifest.name} (${manifest.id})")
-
-            if (!securityManager.validatePlugin(file, manifest)) {
-                return Result.failure(SecurityException("plugin failed security validation: ${manifest.id}"))
-            }
-
-            // Validate sidebar slots BEFORE loading plugin code
-            if (manifest.sidebarItems > 0) {
-                val available = SidebarSlotManager.getAvailableSlotsForPlugins()
-                if (manifest.sidebarItems > available) {
-                    return Result.failure(
-                        SidebarSlotExceededException(manifest.sidebarItems, available, manifest.id)
-                    )
-                }
-                SidebarSlotManager.reservePluginSlots(manifest.id, manifest.sidebarItems)
-                reservedSlotsPluginId = manifest.id
-            }
-
-            // Parse permissions
-            val permissions = executeWithErrorHandling("parse permissions", manifest.id) {
-                manifest.permissions.mapNotNull { permissionStr ->
-                    PluginPermission.values().find { it.key == permissionStr } ?: run {
-                        logger.warn("Invalid permission in plugin manifest: $permissionStr")
-                        null
-                    }
-                }.toSet()
-            }.getOrElse { emptySet() }
-
-            var nativeLibPath: String? = try {
-                pluginLoader.extractNativeLibs(manifest.id)?.absolutePath
-            } catch (e: Exception) {
-                logger.warn("Failed to extract native libs for plugin: ${manifest.id}", e)
-                null
-            }
-
-            val (iconDayPath, iconNightPath) = try {
-                pluginLoader.extractPluginIcons(manifest.id, manifest)
-            } catch (e: Exception) {
-                logger.warn("Failed to extract icons for plugin: ${manifest.id}", e)
-                null to null
-            }
-
-            if (nativeLibPath != null && !permissions.contains(PluginPermission.NATIVE_CODE)) {
-                File(nativeLibPath).deleteRecursively()
-                if (manifest.sidebarItems > 0) {
-                    SidebarSlotManager.releasePluginSlots(manifest.id)
-                }
-                return Result.failure(SecurityException(
-                    "Plugin '${manifest.name}' bundles native libraries but does not declare " +
-                    "'native.code' permission. Add 'native.code' to plugin.permissions in the manifest."
-                ))
-            }
-
-            val classLoader = pluginLoader.loadPluginClasses(this::class.java.classLoader!!, nativeLibPath)
-
-            logger.debug("Loading main class: ${manifest.mainClass}")
-            val pluginClass = executeWithErrorHandling("load main class ${manifest.mainClass}", manifest.id) {
-                classLoader.loadClass(manifest.mainClass)
-            }.getOrElse {
-                if (manifest.sidebarItems > 0) {
-                    SidebarSlotManager.releasePluginSlots(manifest.id)
-                }
-                return Result.failure(it)
-            }
-
-            logger.debug("Creating plugin instance for: ${manifest.id}")
-            val plugin = executeWithErrorHandling("create plugin instance", manifest.id) {
-                pluginClass.getDeclaredConstructor().newInstance() as IPlugin
-            }.getOrElse {
-                if (manifest.sidebarItems > 0) {
-                    SidebarSlotManager.releasePluginSlots(manifest.id)
-                }
-                return Result.failure(it)
-            }
-
-            // Create plugin context with  resources
-            val ctx = pluginLoader.createPluginContext(manifest.id)
-            if (ctx == null) {
-                if (manifest.sidebarItems > 0) {
-                    SidebarSlotManager.releasePluginSlots(manifest.id)
-                }
-                return Result.failure(RuntimeException("Failed to create plugin context for: ${manifest.id}"))
-            }
-
-            val pluginContext = createPluginContextWithResources(manifest.id, classLoader, permissions, ctx)
-
-            logger.debug("Initializing  plugin: ${manifest.id}")
-            val initResult = try {
-                plugin.initialize(pluginContext)
-            } catch (e: Exception) {
-                logger.error("Plugin initialization threw exception for: ${manifest.id}", e)
-                if (manifest.sidebarItems > 0) {
-                    SidebarSlotManager.releasePluginSlots(manifest.id)
-                }
-                return Result.failure(e)
-            }
-
-            if (!initResult) {
-                logger.warn(" plugin initialization returned false for: ${manifest.id}")
-                if (manifest.sidebarItems > 0) {
-                    SidebarSlotManager.releasePluginSlots(manifest.id)
-                }
-                return Result.failure(RuntimeException(" plugin initialization failed for: ${manifest.id}"))
-            }
-
-            val isLegacy = (ctx as? PluginResourceContext)?.let { !it.usesCustomPackageId() } ?: true
-            PluginFragmentHelper.registerPluginContext(manifest.id, ctx, isLegacy)
-            logger.debug("Registered resource context for plugin: ${manifest.id} (legacy=$isLegacy)")
-            PluginFragmentHelper.registerServiceRegistry(manifest.id, pluginContext.services)
-            logger.debug("Registered service registry for plugin: ${manifest.id}")
-
-            val isEnabled = getPluginState(manifest.id)
-            val loadedPlugin = LoadedPlugin(
-                plugin, manifest, classLoader, pluginContext, file.absolutePath, isEnabled,
-                iconDayPath = iconDayPath,
-                iconNightPath = iconNightPath
-            )
-            loadedPlugins[manifest.id] = loadedPlugin
-
-            if (!isEnabled) {
-                logger.info("Successfully loaded  plugin (disabled): ${manifest.name} (${manifest.id})")
-                return Result.success(plugin)
-            }
-
-            activateLoadedPlugin(loadedPlugin)
-            Result.success(plugin)
-        } catch (e: Exception) {
-            reservedSlotsPluginId?.let { pluginId ->
-                SidebarSlotManager.releasePluginSlots(pluginId)
-            }
-            logger.error("Failed to load plugin from ${file.name}: ${e.javaClass.simpleName}: ${e.message}", e)
-            val prefix = if (e is RuntimeException) "" else "[${e.javaClass.simpleName}] "
-            Result.failure(RuntimeException("Error loading plugin: $prefix${e.message}", e))
-        }
-    }
-
-    private fun activateLoadedPlugin(loadedPlugin: LoadedPlugin) {
-        val plugin = loadedPlugin.plugin
-        val manifest = loadedPlugin.manifest
-        runCatching {
-            if (plugin is SnippetExtension) {
-                PluginSnippetManager.getInstance().registerPlugin(manifest.id, plugin)
-            }
-
-            plugin.activate()
-            logger.info("Successfully loaded and activated  plugin: ${manifest.name} (${manifest.id})")
-
-            if (plugin is DocumentationExtension) {
-                installPluginDocumentationAsync(manifest.id, plugin, loadedPlugin.apkPath)
-            }
-
-            val buildActionManager = PluginBuildActionManager.getInstance()
-            if (plugin is BuildActionExtension) {
-                buildActionManager.registerPlugin(manifest.id, manifest.name, plugin)
-                logger.info("Registered build actions for plugin: ${manifest.id}")
-            }
-            buildActionManager.registerManifestActions(manifest.id, manifest.name, manifest)
-            lifecycleDispatcher.notifyActivated(manifest.id)
-        }.onFailure { e ->
-            logger.error("Failed to activate  plugin: ${manifest.id}", e)
-            loadedPlugin.isEnabled = false
-            savePluginState(manifest.id, false)
-        }
-    }
-
-    private fun installPluginDocumentationAsync(
-        pluginId: String,
-        plugin: DocumentationExtension,
-        apkPath: String
-    ) {
-        CoroutineScope(Dispatchers.IO).launch {
-            runDocStep("documentation", pluginId) {
-                documentationManager.verifyAndRecreateDocumentation(pluginId, plugin)
-            }
-            runDocStep("Tier 3 docs", pluginId) {
-                documentationManager.verifyAndRecreateTier3Documentation(pluginId, plugin, apkPath)
-            }
-        }
-    }
-
-    private suspend fun runDocStep(
-        label: String,
-        pluginId: String,
-        block: suspend () -> Boolean
-    ) {
-        runCatching { block() }
-            .onSuccess { result ->
-                if (result) {
-                    logger.info("$label verified/installed for plugin: $pluginId")
-                } else {
-                    logger.warn("Failed to verify/install $label for plugin: $pluginId")
-                }
-            }
-            .onFailure { e ->
-                logger.error("Error verifying/installing $label for plugin: $pluginId", e)
-            }
-    }
-
-    fun unloadPlugin(pluginId: String): Boolean {
-        val loadedPlugin = loadedPlugins.remove(pluginId) ?: return false
-
-        try {
-            // Remove documentation if plugin implements DocumentationExtension
-            if (loadedPlugin.plugin is DocumentationExtension) {
-                CoroutineScope(Dispatchers.IO).launch {
-                    try {
-                        val docResult = documentationManager.removePluginDocumentation(pluginId, loadedPlugin.plugin)
-                        if (docResult) {
-                            logger.info("Removed documentation for plugin: $pluginId")
-                        } else {
-                            logger.warn("Failed to remove documentation for plugin: $pluginId")
-                        }
-                    } catch (e: Exception) {
-                        logger.error("Error removing documentation for plugin: $pluginId", e)
-                    }
-
-                    try {
-                        val tier3Result = documentationManager.removePluginTier3Documentation(pluginId)
-                        if (tier3Result) {
-                            logger.info("Removed Tier 3 docs for plugin: $pluginId")
-                        } else {
-                            logger.warn("Failed to remove Tier 3 docs for plugin: $pluginId")
-                        }
-                    } catch (e: Exception) {
-                        logger.error("Error removing Tier 3 docs for plugin: $pluginId", e)
-                    }
-                }
-            }
-
-            PluginProjectManager.getInstance().cleanupPluginTemplates(pluginId)
-            PluginSnippetManager.getInstance().cleanupPlugin(pluginId)
-            snippetRefreshListener?.invoke(pluginId)
-
-            PluginBuildActionManager.getInstance().cleanupPlugin(pluginId)
-            val commandService = loadedPlugin.context.services.get(IdeCommandService::class.java)
-            if (commandService is IdeCommandServiceImpl) {
-                commandService.cancelAllCommands()
-            }
-
-            val templateService = loadedPlugin.context.services.get(IdeTemplateService::class.java)
-            if (templateService is IdeTemplateServiceImpl) {
-                templateService.cleanupAllTemplates()
-            }
-
-            runCatching { loadedPlugin.plugin.deactivate() }.onFailure { e ->
-                logger.error("Plugin deactivate threw during unload: $pluginId", e)
-            }
-            runCatching { loadedPlugin.plugin.dispose() }.onFailure { e ->
-                logger.error("Plugin dispose threw during unload: $pluginId", e)
-            }
-
-            val themeService = loadedPlugin.context.services.get(IdeThemeService::class.java)
-            if (themeService is IdeThemeServiceImpl) {
-                themeService.dispose()
-            }
-
-            val editorService = loadedPlugin.context.services.get(IdeEditorService::class.java)
-            if (editorService is IdeEditorServiceImpl) {
-                editorService.dispose()
-            }
-
-            // Unregister the plugin's resource context
-            PluginFragmentHelper.unregisterPluginContext(pluginId)
-
-            PluginFragmentFactory.unregisterAllClassLoadersForPlugin(pluginId)
-
-            // Drop lifecycle listeners this plugin registered; its classloader is going away.
-            lifecycleDispatcher.removeAllFrom(pluginId)
-
-            File(context.getDir("plugin_native_libs", Context.MODE_PRIVATE), pluginId).let { dir ->
-                if (dir.exists()) dir.deleteRecursively()
-            }
-
-            logger.info("Unloaded plugin: $pluginId")
-            return true
-        } catch (e: Exception) {
-            logger.error("Failed to unload plugin: $pluginId", e)
-            return false
-        }
-    }
-
-
-    fun haveMatchingSignatures(incomingFile: File, existingPluginId: String): Boolean {
-        val existingFile = File(pluginsDir, "$existingPluginId.cgp")
-        val incomingSig = PluginLoader(context, incomingFile).getSignatureHash()
-        val existingSig = PluginLoader(context, existingFile).getSignatureHash()
-        if (incomingSig == null || existingSig == null) {
-            logger.warn("Could not extract signatures for $existingPluginId; treating as mismatch")
-            return false
-        }
-        return incomingSig.contentEquals(existingSig)
-    }
-
-    fun uninstallPlugin(pluginId: String): Boolean {
-        logger.info("=== Starting uninstall for plugin: $pluginId ===")
-
-        // Release sidebar slots reserved by this plugin
-        SidebarSlotManager.releasePluginSlots(pluginId)
-
-        // Clean up sidebar actions BEFORE unloading the plugin
-        cleanupSidebarActions(pluginId)
-
-        // Then unload the plugin from memory
-        val unloaded = unloadPlugin(pluginId)
-        if (!unloaded) {
-            logger.warn("Could not unload plugin from memory: $pluginId (may already be unloaded)")
-        } else {
-            logger.info("Successfully unloaded plugin from memory: $pluginId")
-        }
-
-        // Find and delete the plugin file (CGP)
-        val pluginFiles = pluginsDir.listFiles { file ->
-            file.isFile && file.name.endsWith(".cgp", ignoreCase = true)
-        }
-
-        if (pluginFiles == null || pluginFiles.isEmpty()) {
-            logger.error("No plugin files found in plugins directory")
-            return false
-        }
-
-        logger.info("Found ${pluginFiles.size} plugin files to check")
-        var deleted = false
-        for (pluginFile in pluginFiles) {
-            try {
-                // Check if this  contains the plugin we want to delete
-                val Loader = PluginLoader(context, pluginFile)
-                val manifest = Loader.getPluginMetadata()
-
-                if (manifest != null) {
-                    if (manifest.id == pluginId) {
-                        if (pluginFile.delete()) {
-                            deleted = true
-                            break // Found and deleted the right file
-                        } else {
-                            logger.error("File exists: ${pluginFile.exists()}, Can write: ${pluginFile.canWrite()}")
-                        }
-                    }
-                } else {
-                    logger.warn("Could not read manifest from ${pluginFile.name}")
-                }
-            } catch (e: Exception) {
-                logger.error("Error checking plugin file ${pluginFile.name}: ${e.message}", e)
-            }
-        }
-
-        // Remove plugin state and cleanup contributions
-        if (deleted) {
-            removePluginState(pluginId)
-            crashTracker.removeCrashCount(pluginId)
-            cleanupPluginCacheFiles(pluginId)
-            lifecycleDispatcher.notifyUninstalled(pluginId)
-            logger.info("Plugin uninstall completed successfully: $pluginId")
-        } else {
-            logger.error("Failed to uninstall plugin: $pluginId - file not found or could not be deleted")
-        }
-        logger.info("Uninstall process ended for plugin: $pluginId (success: $deleted) ===")
-        return deleted
-    }
-    
-    fun getPlugin(pluginId: String): IPlugin? {
-        return loadedPlugins[pluginId]?.plugin
-    }
-    
-    fun getAllPlugins(): List<PluginInfo> {
-        return loadedPlugins.values.map { loadedPlugin ->
-            PluginInfo(
-                metadata = loadedPlugin.toPluginMetadata(),
-                isEnabled = loadedPlugin.isEnabled,
-                isLoaded = true
-            )
-        }
-    }
-    
-    /**
-     * Get all enabled plugin instances for UI integration
-     */
-    fun getAllPluginInstances(): List<IPlugin> {
-        return loadedPlugins.values
-            .filter { it.isEnabled }
-            .map { it.plugin }
-    }
-
-    fun getLoadedPlugin(pluginId: String): LoadedPlugin? {
-        return loadedPlugins[pluginId]?.takeIf { it.isEnabled }
-    }
-
-    /**
-     * Get all enabled plugins that implement UI extensions
-     */
-    fun getEnabledUIExtensions(): List<com.itsaky.androidide.plugins.extensions.UIExtension> {
-        return loadedPlugins.values
-            .filter { it.isEnabled }
-            .map { it.plugin }
-            .filterIsInstance<com.itsaky.androidide.plugins.extensions.UIExtension>()
-    }
-
-    fun getEnabledFileOpenExtensions(): List<FileOpenExtension> {
-        return loadedPlugins.values
-            .filter { it.isEnabled }
-            .map { it.plugin }
-            .filterIsInstance<FileOpenExtension>()
-    }
-
-    /**
-     * Get all enabled plugins that provide editor decorations (additive coloring of editor text).
-     */
-    fun getEnabledEditorDecorationProviders(): List<EditorDecorationProvider> {
-        return loadedPlugins.values
-            .filter { it.isEnabled }
-            .map { it.plugin }
-            .filterIsInstance<EditorDecorationProvider>()
-    }
-
-    fun notifyFileOpened(file: File) {
-        getEnabledFileOpenExtensions().forEach { extension ->
-            executeWithErrorHandling("notify file opened") {
-                extension.onFileOpened(file)
-            }
-        }
-    }
-
-    fun notifyFileClosed(file: File) {
-        getEnabledFileOpenExtensions().forEach { extension ->
-            executeWithErrorHandling("notify file closed") {
-                extension.onFileClosed(file)
-            }
-        }
-    }
-
-    fun getFileTabMenuItems(file: File): List<FileTabMenuItem> {
-        return getEnabledFileOpenExtensions().flatMap { extension ->
-            executeWithErrorHandling("get file tab menu items") {
-                extension.getFileTabMenuItems(file)
-            }.getOrDefault(emptyList())
-        }.sortedBy { it.order }
-    }
-
-    fun delegateFileOpen(file: File): Boolean {
-        val handler = getEnabledFileOpenExtensions().firstOrNull { extension ->
-            executeWithErrorHandling("check canHandleFileOpen") {
-                extension.canHandleFileOpen(file)
-            }.getOrDefault(false)
-        } ?: return false
-        return executeWithErrorHandling("handle file open") {
-            handler.handleFileOpen(file)
-        }.getOrDefault(false)
-    }
-
-    fun getPluginIdForInstance(plugin: IPlugin): String? {
-        return loadedPlugins.entries
-            .find { it.value.plugin === plugin }
-            ?.key
-    }
-
-    fun getClassLoaderForPlugin(plugin: IPlugin): ClassLoader? {
-        return loadedPlugins.values
-            .find { it.plugin === plugin }
-            ?.classLoader
-    }
-
-    fun getClassLoaderForPluginId(pluginId: String): ClassLoader? {
-        return loadedPlugins[pluginId]?.classLoader
-    }
-
-    fun enablePlugin(pluginId: String): Boolean {
-        val loadedPlugin = loadedPlugins[pluginId] ?: return false
-
-        if (loadedPlugin.isEnabled) {
-            logger.info("Plugin $pluginId is already enabled")
-            return true
-        }
-
-        loadedPlugin.isEnabled = true
-        activateLoadedPlugin(loadedPlugin)
-        return if (loadedPlugin.isEnabled) {
-            savePluginState(pluginId, true)
-            crashTracker.resetCrashCount(pluginId)
-            logger.info("Enabled plugin: $pluginId")
-            true
-        } else {
-            logger.error("Failed to enable plugin: $pluginId (activation failed)")
-            false
-        }
-    }
-
-    fun disablePlugin(pluginId: String): Boolean {
-        val loadedPlugin = loadedPlugins[pluginId] ?: return false
-
-        if (!loadedPlugin.isEnabled) {
-            logger.info("Plugin $pluginId is already disabled")
-            return true
-        }
-
-        return try {
-            cleanupPluginContributions(loadedPlugin)
-            loadedPlugin.plugin.deactivate()
-            loadedPlugin.isEnabled = false
-            savePluginState(pluginId, false)
-            lifecycleDispatcher.notifyDeactivated(pluginId)
-
-            logger.info("Disabled plugin: $pluginId")
-            true
-        } catch (e: Exception) {
-            logger.error("Failed to disable plugin: $pluginId", e)
-            false
-        }
-    }
-
-    fun forceDisablePlugin(pluginId: String) {
-        val loadedPlugin = loadedPlugins[pluginId] ?: return
-        cleanupSidebarActions(pluginId)
-        runCatching { PluginEditorTabManager.getInstance().removePluginTabs(pluginId) }.onFailure { e ->
-            logger.error("Failed to remove plugin tabs during force-disable: $pluginId", e)
-        }
-        cleanupPluginContributions(loadedPlugin)
-        runCatching { loadedPlugin.plugin.deactivate() }.onFailure { e ->
-            logger.error("Plugin deactivate threw during force-disable: $pluginId", e)
-        }
-        loadedPlugin.isEnabled = false
-        savePluginState(pluginId, false)
-        lifecycleDispatcher.notifyDeactivated(pluginId)
-        logger.warn("Force-disabled plugin due to crashes: $pluginId")
-    }
-
-    private fun cleanupPluginContributions(loadedPlugin: LoadedPlugin) {
-        val pluginId = loadedPlugin.manifest.id
-        runCatching { PluginProjectManager.getInstance().cleanupPluginTemplates(pluginId) }
-            .onFailure { logger.error("Failed to clean project templates for: $pluginId", it) }
-        runCatching {
-            PluginSnippetManager.getInstance().cleanupPlugin(pluginId)
-            snippetRefreshListener?.invoke(pluginId)
-        }.onFailure { logger.error("Failed to clean snippets for: $pluginId", it) }
-        runCatching { PluginBuildActionManager.getInstance().cleanupPlugin(pluginId) }
-            .onFailure { logger.error("Failed to clean build actions for: $pluginId", it) }
-        runCatching {
-            val commandService = loadedPlugin.context.services.get(IdeCommandService::class.java)
-            if (commandService is IdeCommandServiceImpl) commandService.cancelAllCommands()
-        }.onFailure { logger.error("Failed to cancel commands for: $pluginId", it) }
-        runCatching {
-            val templateService = loadedPlugin.context.services.get(IdeTemplateService::class.java)
-            if (templateService is IdeTemplateServiceImpl) templateService.cleanupAllTemplates()
-        }.onFailure { logger.error("Failed to cleanup templates for: $pluginId", it) }
-    }
-
-    sealed class CrashResult {
-        abstract val pluginId: String
-        abstract val pluginName: String
-
-        data class Recorded(
-            override val pluginId: String,
-            override val pluginName: String,
-            val crashCount: Int,
-        ) : CrashResult()
-
-        data class Disabled(
-            override val pluginId: String,
-            override val pluginName: String,
-        ) : CrashResult()
-    }
-
-    fun recordPluginCrash(pluginId: String): CrashResult {
-        val count = crashTracker.recordCrash(pluginId)
-        val name = loadedPlugins[pluginId]?.manifest?.name ?: pluginId
-        return if (crashTracker.shouldDisable(pluginId)) {
-            forceDisablePlugin(pluginId)
-            CrashResult.Disabled(pluginId, name)
-        } else {
-            CrashResult.Recorded(pluginId, name, count)
-        }
-    }
-
-    fun getLoadedPluginIds(): Set<String> = loadedPlugins.keys.toSet()
-
-    fun getServiceRegistry(): ServiceRegistry =
-        serviceRegistry.asRegistry(SharedServiceRegistry.HOST_PROVIDER_ID)
-    
-    /**
-     * Set the activity provider to enable UI operations in plugins
-     */
-    fun setActivityProvider(provider: ActivityProvider?) {
-        this.activityProvider = provider
-    }
-
-    fun getCurrentActivity(): Activity? = activityProvider?.getCurrentActivity()
-    
-    /**
-     * Set the path validator for validating plugin file access
-     */
-    fun setPathValidator(validator: PluginPathValidator?) {
-        this.pathValidator = validator
-    }
-
-    /**
-     * Set the editor provider to enable plugin access to editor state. Safe to call after
-     * plugins have already loaded — buffered file-change callbacks are replayed on the new
-     * provider and detached from the previous one.
-     */
-    fun setEditorProvider(provider: IdeEditorServiceImpl.EditorProvider?) {
-        val previous = this.editorProvider
-        if (previous === provider) return
-        if (previous != null) {
-            pendingFileChangeCallbacks.forEach { cb ->
-                runCatching { previous.removeFileChangeCallback(cb) }
-            }
-            pendingContentChangeCallbacks.forEach { cb ->
-                runCatching { previous.removeContentChangeCallback(cb) }
-            }
-        }
-        this.editorProvider = provider
-        if (provider != null) {
-            pendingFileChangeCallbacks.forEach { cb ->
-                runCatching { provider.addFileChangeCallback(cb) }
-            }
-            pendingContentChangeCallbacks.forEach { cb ->
-                runCatching { provider.addContentChangeCallback(cb) }
-            }
-        }
-    }
-
-    /**
-     * Save plugin enabled state to persistent storage
-     */
-    private fun savePluginState(pluginId: String, enabled: Boolean) {
-        pluginStates[pluginId] = enabled
-        statePersistScope.launch {
-            statePersistMutex.withLock {
-                executeWithErrorHandling("save plugin state", pluginId) {
-                    val prefsFile = File(context.filesDir, "plugin_states.properties")
-                    val properties = java.util.Properties()
-
-                    if (prefsFile.exists()) {
-                        prefsFile.inputStream().use { input ->
-                            properties.load(input)
-                        }
-                    }
-
-                    properties.setProperty(pluginId, enabled.toString())
-
-                    prefsFile.outputStream().use { output ->
-                        properties.store(output, "Plugin enabled/disabled states")
-                    }
-
-                    logger.debug("Saved plugin state: $pluginId = $enabled")
-                }
-            }
-        }
-    }
-    
-    /**
-     * Load plugin enabled states from persistent storage
-     */
-    private fun loadPluginStates() {
-        executeWithErrorHandling("load plugin states") {
-            val prefsFile = File(context.filesDir, "plugin_states.properties")
-            if (prefsFile.exists()) {
-                val properties = java.util.Properties()
-                prefsFile.inputStream().use { input ->
-                    properties.load(input)
-                }
-
-                properties.forEach { key, value ->
-                    val pluginId = key as String
-                    val enabled = (value as String).toBoolean()
-                    pluginStates[pluginId] = enabled
-                    logger.debug("Loaded plugin state: $pluginId = $enabled")
-                }
-            }
-        }
-    }
-    
-    /**
-     * Get the saved enabled state for a plugin (defaults to true for new plugins)
-     */
-    private fun getPluginState(pluginId: String): Boolean {
-        return pluginStates[pluginId] ?: true
-    }
-
-    private fun removePluginState(pluginId: String) {
-        pluginStates.remove(pluginId)
-        statePersistScope.launch {
-            statePersistMutex.withLock {
-                executeWithErrorHandling("remove plugin state", pluginId) {
-                    val prefsFile = File(context.filesDir, "plugin_states.properties")
-                    if (prefsFile.exists()) {
-                        val properties = java.util.Properties()
-                        properties.load(prefsFile.inputStream())
-                        properties.remove(pluginId)
-                        properties.store(prefsFile.outputStream(), "Plugin states")
-                        logger.debug("Removed plugin state: $pluginId")
-                    }
-                }
-            }
-        }
-    }
-    
-    /**
-     * Configure required permissions for project service access
-     */
-    fun setProjectServicePermissions(permissions: Set<PluginPermission>) {
-        this.projectServicePermissions = permissions
-    }
-    
-    
-    /**
-     * Create plugin context with  resources
-     */
-    private fun createPluginContextWithResources(
-        pluginId: String,
-        classLoader: ClassLoader,
-        permissions: Set<PluginPermission>,
-        resourceContext: Context
-    ): PluginContext {
-        // Create a plugin-specific service registry with permission-validated services
-        val pluginServiceRegistry = ServiceRegistryImpl()
-
-        logger.debug("Creating IDE services with resources for plugin: $pluginId")
-
-        // Create services with resource context
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeProjectService::class.java,
-            pluginId,
-            "project"
-        ) {
-            IdeProjectServiceImpl(
-                pluginId = pluginId,
-                permissions = permissions,
-                projectProvider = projectProvider,
-                requiredPermissions = projectServicePermissions,
-                pathValidator = pathValidator?.let { validator ->
-                    object : IdeProjectServiceImpl.PathValidator {
-                        override fun isPathAllowed(path: File): Boolean = validator.isPathAllowed(path)
-                        override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
-                    }
-                }
-            )
-        }
-
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeUIService::class.java,
-            pluginId,
-            "UI"
-        ) {
-            IdeUIServiceImpl(activityProvider)
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeBuildService::class.java,
-            pluginId,
-            "build"
-        ) {
-            IdeBuildServiceImpl.getInstance()
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeProjectManipulationService::class.java,
-            pluginId,
-            "project_manipulation"
-        ) {
-            IdeProjectManipulationServiceImpl.getInstance()
-        }
-
-        // Tooltip service for showing help documentation
-        // Use main app context for tooltip service to access app's tooltip layouts
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeTooltipService::class.java,
-            pluginId,
-            "tooltip"
-        ) {
-            IdeTooltipServiceImpl(context, pluginId, activityProvider)
-        }
-
-        // Editor tab service for plugin editor tab integration
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeEditorTabService::class.java,
-            pluginId,
-            "editor_tab"
-        ) {
-            IdeEditorTabServiceImpl(activityProvider)
-        }
-
-        // File service for editing project files
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeFileService::class.java,
-            pluginId,
-            "file"
-        ) {
-            IdeFileServiceImpl(
-                pluginId = pluginId,
-                permissions = permissions,
-                pathValidator = pathValidator?.let { validator ->
-                    object : IdeFileServiceImpl.PathValidator {
-                        override fun isPathAllowed(path: File): Boolean = validator.isPathAllowed(path)
-                        override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
-                    }
-                }
-            )
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeEnvironmentService::class.java,
-            pluginId,
-            "environment"
-        ) {
-            IdeEnvironmentServiceImpl(pluginId)
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeArchiveService::class.java,
-            pluginId,
-            "archive"
-        ) {
-            IdeArchiveServiceImpl(
-                pluginId = pluginId,
-                permissions = permissions,
-                pathValidator = pathValidator?.let { validator ->
-                    object : IdeFileServiceImpl.PathValidator {
-                        override fun isPathAllowed(path: File): Boolean = validator.isPathAllowed(path)
-                        override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
-                    }
-                }
-            )
-        }
-
-        // Sidebar service for plugin sidebar slot management
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeSidebarService::class.java,
-            pluginId,
-            "sidebar"
-        ) {
-            IdeSidebarServiceImpl(pluginId)
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeThemeService::class.java,
-            pluginId,
-            "theme"
-        ) {
-            IdeThemeServiceImpl(context)
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeFeatureFlagService::class.java,
-            pluginId,
-            "feature_flag"
-        ) {
-            IdeFeatureFlagServiceImpl()
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeTemplateService::class.java,
-            pluginId,
-            "template"
-        ) {
-            IdeTemplateServiceImpl(
-                pluginId = pluginId,
-                permissions = permissions,
-                onTemplatesChanged = { templateReloadListener?.invoke() }
-            )
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeSnippetService::class.java,
-            pluginId,
-            "snippet"
-        ) {
-            IdeSnippetServiceImpl().apply {
-                setRefreshCallback { pid ->
-                    snippetRefreshListener?.invoke(pid)
-                }
-            }
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeEditorService::class.java,
-            pluginId,
-            "editor"
-        ) {
-            IdeEditorServiceImpl(
-                pluginId = pluginId,
-                permissions = permissions,
-                editorProvider = delegatingEditorProvider,
-                pathValidator = pathValidator?.let { validator ->
-                    object : IdeEditorServiceImpl.PathValidator {
-                        override fun isPathAllowed(file: File): Boolean = validator.isPathAllowed(file)
-                        override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
-                    }
-                }
-            )
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeCommandService::class.java,
-            pluginId,
-            "command"
-        ) {
-            IdeCommandServiceImpl(
-                pluginId = pluginId,
-                permissions = permissions,
-                projectRootProvider = { projectProvider.getCurrentProject()?.rootDir },
-                appFilesDir = context.filesDir
-            )
-        }
-
-        // Note: Phase 2 services (IdeFileService, IdeProjectService, IdeResourceService)
-        // have been removed. Use existing services instead:
-        // - IdeFileService for file operations (now includes listFiles)
-        // - IdeProjectManipulationService for dependency management
-        // - IdeBuildService for build operations
-        // This maintains binary compatibility with existing plugins.
-
-        // Create PluginContext with resource context
-        return PluginContextImpl(
-            androidContext = resourceContext, // Use the resource context instead of app context
-            services = pluginServiceRegistry,
-            eventBus = eventBus,
-            logger = PluginLoggerImpl(pluginId, logger),
-            resources = ResourceManagerImpl(
-                pluginId = pluginId,
-                pluginsDir = pluginsDir,
-                classLoader = classLoader,
-                assetManager = resourceContext.assets
-            ),
-            pluginId = pluginId,
-            sharedServices = serviceRegistry,
-            lifecycleDispatcher = lifecycleDispatcher,
-            pluginInfoProvider = { id ->
-                loadedPlugins[id]?.let {
-                    PluginInfo(it.toPluginMetadata(), it.isEnabled, isLoaded = true)
-                }
-            }
-        )
-    }
-
-    private fun createPluginContext(
-        pluginId: String,
-        classLoader: ClassLoader,
-        permissions: Set<PluginPermission>
-    ): PluginContext {
-        val pluginServiceRegistry = ServiceRegistryImpl()
-
-        logger.debug("Creating IDE services for plugin: $pluginId")
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeProjectService::class.java,
-            pluginId,
-            "project"
-        ) {
-            IdeProjectServiceImpl(
-                pluginId = pluginId,
-                permissions = permissions,
-                projectProvider = projectProvider,
-                requiredPermissions = projectServicePermissions,
-                pathValidator = pathValidator?.let { validator ->
-                    object : IdeProjectServiceImpl.PathValidator {
-                        override fun isPathAllowed(path: File): Boolean = validator.isPathAllowed(path)
-                        override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
-                    }
-                }
-            )
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeUIService::class.java,
-            pluginId,
-            "UI"
-        ) {
-            IdeUIServiceImpl(activityProvider)
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeBuildService::class.java,
-            pluginId,
-            "build"
-        ) {
-            IdeBuildServiceImpl.getInstance()
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeProjectManipulationService::class.java,
-            pluginId,
-            "project_manipulation"
-        ) {
-            IdeProjectManipulationServiceImpl.getInstance()
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeTooltipService::class.java,
-            pluginId,
-            "tooltip"
-        ) {
-            IdeTooltipServiceImpl(context, pluginId, activityProvider)
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeEditorTabService::class.java,
-            pluginId,
-            "editor_tab"
-        ) {
-            IdeEditorTabServiceImpl(activityProvider)
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeFileService::class.java,
-            pluginId,
-            "file"
-        ) {
-            IdeFileServiceImpl(
-                pluginId = pluginId,
-                permissions = permissions,
-                pathValidator = pathValidator?.let { validator ->
-                    object : IdeFileServiceImpl.PathValidator {
-                        override fun isPathAllowed(path: File): Boolean = validator.isPathAllowed(path)
-                        override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
-                    }
-                }
-            )
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeEnvironmentService::class.java,
-            pluginId,
-            "environment"
-        ) {
-            IdeEnvironmentServiceImpl(pluginId)
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeArchiveService::class.java,
-            pluginId,
-            "archive"
-        ) {
-            IdeArchiveServiceImpl(
-                pluginId = pluginId,
-                permissions = permissions,
-                pathValidator = pathValidator?.let { validator ->
-                    object : IdeFileServiceImpl.PathValidator {
-                        override fun isPathAllowed(path: File): Boolean = validator.isPathAllowed(path)
-                        override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
-                    }
-                }
-            )
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeSidebarService::class.java,
-            pluginId,
-            "sidebar"
-        ) {
-            IdeSidebarServiceImpl(pluginId)
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeThemeService::class.java,
-            pluginId,
-            "theme"
-        ) {
-            IdeThemeServiceImpl(context)
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeFeatureFlagService::class.java,
-            pluginId,
-            "feature_flag"
-        ) {
-            IdeFeatureFlagServiceImpl()
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeTemplateService::class.java,
-            pluginId,
-            "template"
-        ) {
-            IdeTemplateServiceImpl(
-                pluginId = pluginId,
-                permissions = permissions,
-                onTemplatesChanged = { templateReloadListener?.invoke() }
-            )
-        }
-
-        registerServiceWithErrorHandling(
-            pluginServiceRegistry,
-            IdeSnippetService::class.java,
-            pluginId,
-            "snippet"
-        ) {
-            IdeSnippetServiceImpl().apply {
-                setRefreshCallback { pid ->
-                    snippetRefreshListener?.invoke(pid)
-                }
-            }
-        }
-
-        return PluginContextImpl(
-            androidContext = context,
-            services = pluginServiceRegistry,
-            eventBus = eventBus,
-            logger = PluginLoggerImpl(pluginId, logger),
-            resources = ResourceManagerImpl(pluginId, pluginsDir, classLoader),
-            pluginId = pluginId,
-            sharedServices = serviceRegistry,
-            lifecycleDispatcher = lifecycleDispatcher,
-            pluginInfoProvider = { id ->
-                loadedPlugins[id]?.let {
-                    PluginInfo(it.toPluginMetadata(), it.isEnabled, isLoaded = true)
-                }
-            }
-        )
-    }
-
-    /**
-     * Clean up ALL plugin files and cache directories
-     */
-    private fun cleanupPluginCacheFiles(pluginId: String) {
-        executeWithErrorHandling("cleanup plugin cache files", pluginId) {
-            logger.debug("Cleaning up ALL files and cache for plugin: $pluginId")
-
-            val pluginDir = File(pluginsDir, pluginId)
-            if (pluginDir.exists()) {
-                val deleted = pluginDir.deleteRecursively()
-                logger.debug("Deleted plugin directory: ${pluginDir.absolutePath} (success: $deleted)")
-            }
-
-            File(context.getDir("plugin_native_libs", Context.MODE_PRIVATE), pluginId).let { dir ->
-                if (dir.exists()) dir.deleteRecursively()
-            }
-
-            File(context.getDir("plugin_icons", Context.MODE_PRIVATE), pluginId).let { dir ->
-                if (dir.exists()) dir.deleteRecursively()
-            }
-
-            // Clean up ART cache files in oat directory
-            try {
-                val oatDir = File(pluginsDir, "oat")
-                if (oatDir.exists() && oatDir.isDirectory) {
-                    oatDir.walkTopDown().forEach { file ->
-                        if (file.name.contains(pluginId)) {
-                            val deleted = file.deleteRecursively()
-                            logger.debug("Deleted ART cache: ${file.absolutePath} (success: $deleted)")
-                        }
-                    }
-                }
-            } catch (e: Exception) {
-                logger.warn("Failed to cleanup ART cache files for: $pluginId", e)
-            }
-
-            // Clean up any other directories or files that contain the plugin ID
-            try {
-                pluginsDir.walkTopDown().forEach { file ->
-                    if (file != pluginsDir && file.name.contains(pluginId)) {
-                        val deleted = file.deleteRecursively()
-                        logger.debug("Deleted plugin-related item: ${file.absolutePath} (success: $deleted)")
-                    }
-                }
-            } catch (e: Exception) {
-                logger.warn("Failed to cleanup plugin-related files for: $pluginId", e)
-            }
-
-            logger.debug("Complete plugin cleanup finished for: $pluginId")
-        }
-    }
-
-    /**
-     * Clean up sidebar actions from the current session's action registry
-     */
-    private fun cleanupSidebarActions(pluginId: String) {
-        executeWithErrorHandling("cleanup sidebar actions", pluginId) {
-            logger.debug("Cleaning up sidebar actions for plugin: $pluginId")
-
-            val plugin = loadedPlugins[pluginId]?.plugin
-            if (plugin is UIExtension) {
-                val registryClass = Class.forName("com.itsaky.androidide.actions.ActionsRegistry")
-                val getInstanceMethod = registryClass.getMethod("getInstance")
-                val registry = getInstanceMethod.invoke(null)
-
-                plugin.getSideMenuItems().forEach { navItem ->
-                    val actionId = "plugin_sidebar_${navItem.id}"
-                    val unregisterMethod = registryClass.getMethod("unregisterAction", String::class.java)
-                    val success = unregisterMethod.invoke(registry, actionId) as Boolean
-                    logger.debug("Unregistered sidebar action: $actionId (success: $success)")
-                }
-
-                logger.debug("Sidebar actions cleanup completed for: $pluginId")
-            } else {
-                logger.debug("Plugin $pluginId does not implement UIExtension, no sidebar actions to cleanup")
-            }
-        }
-    }
+	/**
+	 * Interface for providing the current Activity context for UI operations
+	 */
+	fun interface ActivityProvider {
+		fun getCurrentActivity(): Activity?
+	}
+
+	/**
+	 * Interface for validating file/path access for plugins
+	 */
+	interface PluginPathValidator {
+		fun isPathAllowed(path: File): Boolean
+
+		fun getAllowedPaths(): List<String>
+	}
+
+	private var activityProvider: ActivityProvider? = null
+	private var pathValidator: PluginPathValidator? = null
+	private var editorProvider: IdeEditorServiceImpl.EditorProvider? = null
+
+	/**
+	 * Callbacks added by plugins before any real provider was set. We hold them here and
+	 * replay onto a real provider when one is registered, so listener registration doesn't
+	 * silently drop on the floor during the early-boot window.
+	 */
+	private val pendingFileChangeCallbacks = java.util.concurrent.CopyOnWriteArraySet<(File?) -> Unit>()
+	private val pendingContentChangeCallbacks =
+		java.util.concurrent.CopyOnWriteArraySet<(String, Int, Int, String) -> Unit>()
+
+	/**
+	 * Stable provider handed to every plugin's [IdeEditorServiceImpl]. Each call delegates to
+	 * the currently-set [editorProvider] (or returns a no-op default when none is wired). This
+	 * lets the editor activity register/unregister a real provider over its lifecycle without
+	 * having to rebuild already-loaded plugin services.
+	 */
+	private val delegatingEditorProvider =
+		object : IdeEditorServiceImpl.EditorProvider {
+			private fun current(): IdeEditorServiceImpl.EditorProvider? = editorProvider
+
+			override fun getCurrentFile(): File? = current()?.getCurrentFile()
+
+			override fun getOpenFiles(): List<File> = current()?.getOpenFiles() ?: emptyList()
+
+			override fun isFileOpen(file: File): Boolean = current()?.isFileOpen(file) ?: false
+
+			override fun getCurrentSelection(): String? = current()?.getCurrentSelection()
+
+			override fun getCurrentFileContent(): String? = current()?.getCurrentFileContent()
+
+			override fun getFileContent(file: File): String? = current()?.getFileContent(file)
+
+			override fun getCurrentCursorPosition() = current()?.getCurrentCursorPosition()
+
+			override fun getCurrentSelectionRange() = current()?.getCurrentSelectionRange()
+
+			override fun getCurrentLineText(): String? = current()?.getCurrentLineText()
+
+			override fun getLineText(
+				file: File,
+				lineNumber: Int,
+			): String? = current()?.getLineText(file, lineNumber)
+
+			override fun getLineCount(file: File): Int = current()?.getLineCount(file) ?: 0
+
+			override fun getWordAtCursor(): String? = current()?.getWordAtCursor()
 
+			override fun getCurrentLanguageId(): String? = current()?.getCurrentLanguageId()
+
+			override fun getFileLanguageId(file: File): String? = current()?.getFileLanguageId(file)
+
+			override fun isFileModified(file: File): Boolean = current()?.isFileModified(file) ?: false
+
+			override fun getModifiedFiles(): List<File> = current()?.getModifiedFiles() ?: emptyList()
+
+			override fun openFile(file: File): Boolean = current()?.openFile(file) ?: false
+
+			override fun openFileAt(
+				file: File,
+				line: Int,
+				column: Int,
+			): Boolean = current()?.openFileAt(file, line, column) ?: false
+
+			override fun saveCurrentFile(): Boolean = current()?.saveCurrentFile() ?: false
+
+			override fun insertTextAtCursor(text: String): Boolean = current()?.insertTextAtCursor(text) ?: false
+
+			override fun replaceSelection(text: String): Boolean = current()?.replaceSelection(text) ?: false
+
+			override fun appendToLine(
+				file: File,
+				line: Int,
+				text: String,
+			): Boolean = current()?.appendToLine(file, line, text) ?: false
+
+			override fun prependToLine(
+				file: File,
+				line: Int,
+				text: String,
+			): Boolean = current()?.prependToLine(file, line, text) ?: false
+
+			override fun replaceLine(
+				file: File,
+				line: Int,
+				newText: String,
+			): Boolean = current()?.replaceLine(file, line, newText) ?: false
+
+			override fun insertLineBefore(
+				file: File,
+				line: Int,
+				text: String,
+			): Boolean = current()?.insertLineBefore(file, line, text) ?: false
+
+			override fun deleteLine(
+				file: File,
+				line: Int,
+			): Boolean = current()?.deleteLine(file, line) ?: false
+
+			override fun replaceRange(
+				file: File,
+				range: com.itsaky.androidide.plugins.services.SelectionRange,
+				newText: String,
+			): Boolean = current()?.replaceRange(file, range, newText) ?: false
+
+			override fun addFileChangeCallback(callback: (File?) -> Unit) {
+				pendingFileChangeCallbacks.add(callback)
+				current()?.addFileChangeCallback(callback)
+			}
+
+			override fun removeFileChangeCallback(callback: (File?) -> Unit) {
+				pendingFileChangeCallbacks.remove(callback)
+				current()?.removeFileChangeCallback(callback)
+			}
+
+			override fun addContentChangeCallback(callback: (String, Int, Int, String) -> Unit) {
+				pendingContentChangeCallbacks.add(callback)
+				current()?.addContentChangeCallback(callback)
+			}
+
+			override fun removeContentChangeCallback(callback: (String, Int, Int, String) -> Unit) {
+				pendingContentChangeCallbacks.remove(callback)
+				current()?.removeContentChangeCallback(callback)
+			}
+
+			override fun showInlineSuggestion(
+				pluginId: String,
+				text: String,
+			) {
+				current()?.showInlineSuggestion(pluginId, text)
+			}
+
+			override fun dismissInlineSuggestion(pluginId: String) {
+				current()?.dismissInlineSuggestion(pluginId)
+			}
+		}
+
+	// Configurable permissions for different services
+	private var projectServicePermissions: Set<PluginPermission> = setOf(PluginPermission.FILESYSTEM_READ)
+
+	companion object {
+		@Volatile
+		@Suppress("ktlint:standard:property-naming")
+		private var INSTANCE: PluginManager? = null
+
+		fun getInstance(
+			context: Context,
+			eventBus: Any,
+			logger: PluginLogger,
+		): PluginManager =
+			INSTANCE ?: synchronized(this) {
+				INSTANCE ?: PluginManager(context, eventBus, logger).also { INSTANCE = it }
+			}
+
+		/**
+		 * Get the already initialized instance, or null if not yet initialized
+		 */
+		fun getInstance(): PluginManager? = INSTANCE
+	}
+
+	private val loadedPlugins = ConcurrentHashMap<String, LoadedPlugin>()
+	private val pluginStates = ConcurrentHashMap<String, Boolean>()
+	private val pluginRegistry = PluginRegistry(context)
+	private val securityManager = PluginSecurityManager()
+	private val serviceRegistry = SharedServiceRegistry()
+	private val lifecycleDispatcher = PluginLifecycleDispatcher()
+
+	private val pluginsDir = File(context.filesDir, "plugins")
+	private val documentationManager = PluginDocumentationManager(context)
+	private var templateReloadListener: (() -> Unit)? = null
+	private var snippetRefreshListener: ((String) -> Unit)? = null
+	val crashTracker = PluginCrashTracker(context, logger)
+
+	private val statePersistScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+	private val statePersistMutex = Mutex()
+
+	fun setTemplateReloadListener(listener: (() -> Unit)?) {
+		this.templateReloadListener = listener
+		PluginProjectManager.getInstance().setTemplateReloadListener(listener)
+	}
+
+	fun setSnippetRefreshListener(listener: ((String) -> Unit)?) {
+		this.snippetRefreshListener = listener
+	}
+
+	// Helper methods for cleaner error handling
+	private fun <T> executeWithErrorHandling(
+		operationDescription: String,
+		pluginId: String? = null,
+		operation: () -> T,
+	): Result<T> =
+		runCatching(operation).onFailure { exception ->
+			val contextInfo = if (pluginId != null) " for plugin $pluginId" else ""
+			logger.error("Failed to $operationDescription$contextInfo", exception)
+		}
+
+	private fun <T> registerServiceWithErrorHandling(
+		serviceRegistry: ServiceRegistryImpl,
+		serviceClass: Class<T>,
+		pluginId: String,
+		serviceName: String,
+		serviceFactory: () -> T,
+	) {
+		executeWithErrorHandling("create $serviceName service", pluginId) {
+			val serviceInstance = serviceFactory()
+			serviceRegistry.register(serviceClass, serviceInstance)
+			logger.debug("Registered $serviceName service for plugin: $pluginId")
+		}
+	}
+
+	// IDE service providers
+	private val projectProvider = CogoProjectProvider()
+
+	init {
+		if (!pluginsDir.exists()) {
+			pluginsDir.mkdirs()
+		}
+	}
+
+	suspend fun loadPlugins() =
+		withContext(Dispatchers.IO) {
+			logger.info("Loading plugins from directory: ${pluginsDir.absolutePath}")
+
+			// Load plugin states first
+			loadPluginStates()
+
+			// After loading all plugins, verify documentation for already loaded plugins
+			verifyDocumentationForLoadedPlugins()
+
+			val pluginFiles =
+				pluginsDir.listFiles { file ->
+					file.isFile && file.name.endsWith(".cgp", ignoreCase = true)
+				} ?: return@withContext
+
+			logger.info("Found ${pluginFiles.size} plugin files")
+
+			// Load plugins in parallel
+			val loadJobs =
+				pluginFiles.map { pluginFile ->
+					async {
+						try {
+							logger.debug("Loading plugin: ${pluginFile.name}")
+							val result = loadPlugin(pluginFile)
+							result.onFailure { error ->
+								logger.error("Failed to load plugin from ${pluginFile.name}: ${error.message}", error)
+							}
+						} catch (e: Exception) {
+							logger.error("Failed to load plugin from ${pluginFile.name}", e)
+						}
+					}
+				}
+
+			// Wait for all plugins to load
+			loadJobs.awaitAll()
+
+			logger.info("Successfully loaded ${loadedPlugins.size} plugins")
+
+			// Verify documentation after all plugins are loaded
+			verifyDocumentationForLoadedPlugins()
+		}
+
+	/**
+	 * Verify and recreate documentation for all loaded plugins that support it.
+	 * This ensures documentation is present even after database updates.
+	 */
+	private suspend fun verifyDocumentationForLoadedPlugins() =
+		withContext(Dispatchers.IO) {
+			val pluginsWithDocs =
+				loadedPlugins.values
+					.filter { it.plugin is DocumentationExtension }
+					.associate { it.manifest.id to it.plugin as DocumentationExtension }
+
+			if (pluginsWithDocs.isNotEmpty()) {
+				logger.info("Verifying documentation for ${pluginsWithDocs.size} plugins")
+				val recreatedCount = documentationManager.verifyAllPluginDocumentation(pluginsWithDocs)
+				if (recreatedCount > 0) {
+					logger.info("Recreated missing documentation for $recreatedCount plugins")
+				}
+			}
+		}
+
+	/**
+	 * Public method to manually trigger documentation verification.
+	 * Can be called when database changes are detected.
+	 */
+	suspend fun verifyAllPluginDocumentation() =
+		withContext(Dispatchers.IO) {
+			verifyDocumentationForLoadedPlugins()
+		}
+
+	private fun loadAndValidate(pluginFile: File): Result<Pair<PluginManifest, PluginLoader>> {
+		if (!pluginFile.exists()) return Result.failure(IllegalArgumentException("Plugin file does not exist: ${pluginFile.absolutePath}"))
+		if (!pluginFile.canRead()) return Result.failure(IllegalArgumentException("Cannot read plugin file: ${pluginFile.absolutePath}"))
+		val loader = PluginLoader(context, pluginFile)
+		val manifest =
+			loader.getPluginMetadata()
+				?: return Result.failure(IllegalArgumentException("Plugin manifest not found in: ${pluginFile.name}"))
+		return Result.success(manifest to loader)
+	}
+
+	fun getPluginMetadataOnly(pluginFile: File): Result<PluginManifest> = loadAndValidate(pluginFile).map { it.first }
+
+	fun getPluginValidation(pluginFile: File): Result<PluginValidation> =
+		loadAndValidate(pluginFile).map { (manifest, loader) ->
+			PluginValidation(
+				manifest = manifest,
+				isDebug = loader.isDebuggable(),
+				iconDayEntryExists = manifest.iconDay?.let(loader::hasEntry) ?: false,
+				iconNightEntryExists = manifest.iconNight?.let(loader::hasEntry) ?: false,
+			)
+		}
+
+	/**
+	 * Load plugin and return both the plugin instance and its metadata
+	 */
+	fun loadPluginWithMetadata(pluginFile: File): Result<Pair<IPlugin, PluginManifest>> {
+		logger.info("Attempting to load plugin with metadata: ${pluginFile.name}")
+
+		// Pre-flight checks
+		if (!pluginFile.exists()) {
+			val error = "Plugin file does not exist: ${pluginFile.absolutePath}"
+			logger.error(error)
+			return Result.failure(IllegalArgumentException(error))
+		}
+
+		if (!pluginFile.canRead()) {
+			val error = "Cannot read plugin file: ${pluginFile.absolutePath}"
+			logger.error(error)
+			return Result.failure(IllegalArgumentException(error))
+		}
+
+		if (!pluginFile.name.endsWith(".cgp", ignoreCase = true)) {
+			val error = "Only CGP plugins are supported. File: ${pluginFile.name}"
+			logger.error(error)
+			return Result.failure(IllegalArgumentException(error))
+		}
+
+		// Create plugin loader
+		val pluginLoader = PluginLoader(context, pluginFile)
+
+		// Get plugin manifest from
+		val manifest = pluginLoader.getPluginMetadata()
+		if (manifest == null) {
+			return Result.failure(IllegalArgumentException("Plugin manifest not found in CGP: ${pluginFile.name}"))
+		}
+
+		// Load the plugin
+		val pluginResult = loadPlugin(pluginFile)
+		return if (pluginResult.isSuccess) {
+			val plugin = pluginResult.getOrNull()!!
+			Result.success(plugin to manifest)
+		} else {
+			Result.failure(pluginResult.exceptionOrNull() ?: RuntimeException("Failed to load plugin"))
+		}
+	}
+
+	/**
+	 * Load plugin with full resource support
+	 */
+	fun loadPlugin(file: File): Result<IPlugin> {
+		var reservedSlotsPluginId: String? = null
+		return try {
+			logger.debug("Loading plugin from: ${file.absolutePath}")
+
+			// Validate prerequisites
+			if (!file.exists() || !file.canRead()) {
+				return Result.failure(IllegalArgumentException("Plugin  does not exist or is not readable: ${file.absolutePath}"))
+			}
+
+			// Create plugin loader
+			val pluginLoader = PluginLoader(context, file)
+
+			// Validate signature
+			if (!pluginLoader.validateSignature()) {
+				logger.warn("signature validation failed for: ${file.name}")
+				// Continue anyway for development
+			}
+
+			// Get plugin manifest from
+			val manifest = pluginLoader.getPluginMetadata()
+			if (manifest == null) {
+				return Result.failure(IllegalArgumentException("Plugin manifest not found in: ${file.name}"))
+			}
+
+			logger.debug("Parsed manifest for plugin: ${manifest.name} (${manifest.id})")
+
+			if (!securityManager.validatePlugin(file, manifest)) {
+				return Result.failure(SecurityException("plugin failed security validation: ${manifest.id}"))
+			}
+
+			// Validate sidebar slots BEFORE loading plugin code
+			if (manifest.sidebarItems > 0) {
+				val available = SidebarSlotManager.getAvailableSlotsForPlugins()
+				if (manifest.sidebarItems > available) {
+					return Result.failure(
+						SidebarSlotExceededException(manifest.sidebarItems, available, manifest.id),
+					)
+				}
+				SidebarSlotManager.reservePluginSlots(manifest.id, manifest.sidebarItems)
+				reservedSlotsPluginId = manifest.id
+			}
+
+			// Parse permissions
+			val permissions =
+				executeWithErrorHandling("parse permissions", manifest.id) {
+					manifest.permissions
+						.mapNotNull { permissionStr ->
+							PluginPermission.values().find { it.key == permissionStr } ?: run {
+								logger.warn("Invalid permission in plugin manifest: $permissionStr")
+								null
+							}
+						}.toSet()
+				}.getOrElse { emptySet() }
+
+			var nativeLibPath: String? =
+				try {
+					pluginLoader.extractNativeLibs(manifest.id)?.absolutePath
+				} catch (e: Exception) {
+					logger.warn("Failed to extract native libs for plugin: ${manifest.id}", e)
+					null
+				}
+
+			val (iconDayPath, iconNightPath) =
+				try {
+					pluginLoader.extractPluginIcons(manifest.id, manifest)
+				} catch (e: Exception) {
+					logger.warn("Failed to extract icons for plugin: ${manifest.id}", e)
+					null to null
+				}
+
+			if (nativeLibPath != null && !permissions.contains(PluginPermission.NATIVE_CODE)) {
+				File(nativeLibPath).deleteRecursively()
+				if (manifest.sidebarItems > 0) {
+					SidebarSlotManager.releasePluginSlots(manifest.id)
+				}
+				return Result.failure(
+					SecurityException(
+						"Plugin '${manifest.name}' bundles native libraries but does not declare " +
+							"'native.code' permission. Add 'native.code' to plugin.permissions in the manifest.",
+					),
+				)
+			}
+
+			val classLoader = pluginLoader.loadPluginClasses(this::class.java.classLoader!!, nativeLibPath)
+
+			logger.debug("Loading main class: ${manifest.mainClass}")
+			val pluginClass =
+				executeWithErrorHandling("load main class ${manifest.mainClass}", manifest.id) {
+					classLoader.loadClass(manifest.mainClass)
+				}.getOrElse {
+					if (manifest.sidebarItems > 0) {
+						SidebarSlotManager.releasePluginSlots(manifest.id)
+					}
+					return Result.failure(it)
+				}
+
+			logger.debug("Creating plugin instance for: ${manifest.id}")
+			val plugin =
+				executeWithErrorHandling("create plugin instance", manifest.id) {
+					pluginClass.getDeclaredConstructor().newInstance() as IPlugin
+				}.getOrElse {
+					if (manifest.sidebarItems > 0) {
+						SidebarSlotManager.releasePluginSlots(manifest.id)
+					}
+					return Result.failure(it)
+				}
+
+			// Create plugin context with  resources
+			val ctx = pluginLoader.createPluginContext(manifest.id)
+			if (ctx == null) {
+				if (manifest.sidebarItems > 0) {
+					SidebarSlotManager.releasePluginSlots(manifest.id)
+				}
+				return Result.failure(RuntimeException("Failed to create plugin context for: ${manifest.id}"))
+			}
+
+			val pluginContext = createPluginContextWithResources(manifest.id, classLoader, permissions, ctx)
+
+			logger.debug("Initializing  plugin: ${manifest.id}")
+			val initResult =
+				try {
+					plugin.initialize(pluginContext)
+				} catch (e: Exception) {
+					logger.error("Plugin initialization threw exception for: ${manifest.id}", e)
+					if (manifest.sidebarItems > 0) {
+						SidebarSlotManager.releasePluginSlots(manifest.id)
+					}
+					return Result.failure(e)
+				}
+
+			if (!initResult) {
+				logger.warn(" plugin initialization returned false for: ${manifest.id}")
+				if (manifest.sidebarItems > 0) {
+					SidebarSlotManager.releasePluginSlots(manifest.id)
+				}
+				return Result.failure(RuntimeException(" plugin initialization failed for: ${manifest.id}"))
+			}
+
+			val isLegacy = (ctx as? PluginResourceContext)?.let { !it.usesCustomPackageId() } ?: true
+			PluginFragmentHelper.registerPluginContext(manifest.id, ctx, isLegacy)
+			logger.debug("Registered resource context for plugin: ${manifest.id} (legacy=$isLegacy)")
+			PluginFragmentHelper.registerServiceRegistry(manifest.id, pluginContext.services)
+			logger.debug("Registered service registry for plugin: ${manifest.id}")
+
+			val isEnabled = getPluginState(manifest.id)
+			val loadedPlugin =
+				LoadedPlugin(
+					plugin,
+					manifest,
+					classLoader,
+					pluginContext,
+					file.absolutePath,
+					isEnabled,
+					iconDayPath = iconDayPath,
+					iconNightPath = iconNightPath,
+				)
+			loadedPlugins[manifest.id] = loadedPlugin
+
+			if (!isEnabled) {
+				logger.info("Successfully loaded  plugin (disabled): ${manifest.name} (${manifest.id})")
+				return Result.success(plugin)
+			}
+
+			activateLoadedPlugin(loadedPlugin)
+			Result.success(plugin)
+		} catch (e: Exception) {
+			reservedSlotsPluginId?.let { pluginId ->
+				SidebarSlotManager.releasePluginSlots(pluginId)
+			}
+			logger.error("Failed to load plugin from ${file.name}: ${e.javaClass.simpleName}: ${e.message}", e)
+			val prefix = if (e is RuntimeException) "" else "[${e.javaClass.simpleName}] "
+			Result.failure(RuntimeException("Error loading plugin: $prefix${e.message}", e))
+		}
+	}
+
+	private fun activateLoadedPlugin(loadedPlugin: LoadedPlugin) {
+		val plugin = loadedPlugin.plugin
+		val manifest = loadedPlugin.manifest
+		runCatching {
+			if (plugin is SnippetExtension) {
+				PluginSnippetManager.getInstance().registerPlugin(manifest.id, plugin)
+			}
+
+			plugin.activate()
+			logger.info("Successfully loaded and activated  plugin: ${manifest.name} (${manifest.id})")
+
+			if (plugin is DocumentationExtension) {
+				installPluginDocumentationAsync(manifest.id, plugin, loadedPlugin.apkPath)
+			}
+
+			val buildActionManager = PluginBuildActionManager.getInstance()
+			if (plugin is BuildActionExtension) {
+				buildActionManager.registerPlugin(manifest.id, manifest.name, plugin)
+				logger.info("Registered build actions for plugin: ${manifest.id}")
+			}
+			buildActionManager.registerManifestActions(manifest.id, manifest.name, manifest)
+			lifecycleDispatcher.notifyActivated(manifest.id)
+		}.onFailure { e ->
+			logger.error("Failed to activate  plugin: ${manifest.id}", e)
+			loadedPlugin.isEnabled = false
+			savePluginState(manifest.id, false)
+		}
+	}
+
+	private fun installPluginDocumentationAsync(
+		pluginId: String,
+		plugin: DocumentationExtension,
+		apkPath: String,
+	) {
+		CoroutineScope(Dispatchers.IO).launch {
+			runDocStep("documentation", pluginId) {
+				documentationManager.verifyAndRecreateDocumentation(pluginId, plugin)
+			}
+			runDocStep("Tier 3 docs", pluginId) {
+				documentationManager.verifyAndRecreateTier3Documentation(pluginId, plugin, apkPath)
+			}
+		}
+	}
+
+	private suspend fun runDocStep(
+		label: String,
+		pluginId: String,
+		block: suspend () -> Boolean,
+	) {
+		runCatching { block() }
+			.onSuccess { result ->
+				if (result) {
+					logger.info("$label verified/installed for plugin: $pluginId")
+				} else {
+					logger.warn("Failed to verify/install $label for plugin: $pluginId")
+				}
+			}.onFailure { e ->
+				logger.error("Error verifying/installing $label for plugin: $pluginId", e)
+			}
+	}
+
+	fun unloadPlugin(pluginId: String): Boolean {
+		val loadedPlugin = loadedPlugins.remove(pluginId) ?: return false
+
+		try {
+			// Remove documentation if plugin implements DocumentationExtension
+			if (loadedPlugin.plugin is DocumentationExtension) {
+				CoroutineScope(Dispatchers.IO).launch {
+					try {
+						val docResult = documentationManager.removePluginDocumentation(pluginId, loadedPlugin.plugin)
+						if (docResult) {
+							logger.info("Removed documentation for plugin: $pluginId")
+						} else {
+							logger.warn("Failed to remove documentation for plugin: $pluginId")
+						}
+					} catch (e: Exception) {
+						logger.error("Error removing documentation for plugin: $pluginId", e)
+					}
+
+					try {
+						val tier3Result = documentationManager.removePluginTier3Documentation(pluginId)
+						if (tier3Result) {
+							logger.info("Removed Tier 3 docs for plugin: $pluginId")
+						} else {
+							logger.warn("Failed to remove Tier 3 docs for plugin: $pluginId")
+						}
+					} catch (e: Exception) {
+						logger.error("Error removing Tier 3 docs for plugin: $pluginId", e)
+					}
+				}
+			}
+
+			PluginProjectManager.getInstance().cleanupPluginTemplates(pluginId)
+			PluginSnippetManager.getInstance().cleanupPlugin(pluginId)
+			snippetRefreshListener?.invoke(pluginId)
+
+			PluginBuildActionManager.getInstance().cleanupPlugin(pluginId)
+			val commandService = loadedPlugin.context.services.get(IdeCommandService::class.java)
+			if (commandService is IdeCommandServiceImpl) {
+				commandService.cancelAllCommands()
+			}
+
+			val templateService = loadedPlugin.context.services.get(IdeTemplateService::class.java)
+			if (templateService is IdeTemplateServiceImpl) {
+				templateService.cleanupAllTemplates()
+			}
+
+			runCatching { loadedPlugin.plugin.deactivate() }.onFailure { e ->
+				logger.error("Plugin deactivate threw during unload: $pluginId", e)
+			}
+			runCatching { loadedPlugin.plugin.dispose() }.onFailure { e ->
+				logger.error("Plugin dispose threw during unload: $pluginId", e)
+			}
+
+			val themeService = loadedPlugin.context.services.get(IdeThemeService::class.java)
+			if (themeService is IdeThemeServiceImpl) {
+				themeService.dispose()
+			}
+
+			val editorService = loadedPlugin.context.services.get(IdeEditorService::class.java)
+			if (editorService is IdeEditorServiceImpl) {
+				editorService.dispose()
+			}
+
+			// Unregister the plugin's resource context
+			PluginFragmentHelper.unregisterPluginContext(pluginId)
+
+			PluginFragmentFactory.unregisterAllClassLoadersForPlugin(pluginId)
+
+			// Drop lifecycle listeners this plugin registered; its classloader is going away.
+			lifecycleDispatcher.removeAllFrom(pluginId)
+
+			File(context.getDir("plugin_native_libs", Context.MODE_PRIVATE), pluginId).let { dir ->
+				if (dir.exists()) dir.deleteRecursively()
+			}
+
+			logger.info("Unloaded plugin: $pluginId")
+			return true
+		} catch (e: Exception) {
+			logger.error("Failed to unload plugin: $pluginId", e)
+			return false
+		}
+	}
+
+	fun haveMatchingSignatures(
+		incomingFile: File,
+		existingPluginId: String,
+	): Boolean {
+		val existingFile = File(pluginsDir, "$existingPluginId.cgp")
+		val incomingSig = PluginLoader(context, incomingFile).getSignatureHash()
+		val existingSig = PluginLoader(context, existingFile).getSignatureHash()
+		if (incomingSig == null || existingSig == null) {
+			logger.warn("Could not extract signatures for $existingPluginId; treating as mismatch")
+			return false
+		}
+		return incomingSig.contentEquals(existingSig)
+	}
+
+	fun uninstallPlugin(pluginId: String): Boolean {
+		logger.info("=== Starting uninstall for plugin: $pluginId ===")
+
+		// Release sidebar slots reserved by this plugin
+		SidebarSlotManager.releasePluginSlots(pluginId)
+
+		// Clean up sidebar actions BEFORE unloading the plugin
+		cleanupSidebarActions(pluginId)
+
+		// Then unload the plugin from memory
+		val unloaded = unloadPlugin(pluginId)
+		if (!unloaded) {
+			logger.warn("Could not unload plugin from memory: $pluginId (may already be unloaded)")
+		} else {
+			logger.info("Successfully unloaded plugin from memory: $pluginId")
+		}
+
+		// Find and delete the plugin file (CGP)
+		val pluginFiles =
+			pluginsDir.listFiles { file ->
+				file.isFile && file.name.endsWith(".cgp", ignoreCase = true)
+			}
+
+		if (pluginFiles == null || pluginFiles.isEmpty()) {
+			logger.error("No plugin files found in plugins directory")
+			return false
+		}
+
+		logger.info("Found ${pluginFiles.size} plugin files to check")
+		var deleted = false
+		for (pluginFile in pluginFiles) {
+			try {
+				// Check if this  contains the plugin we want to delete
+				val loader = PluginLoader(context, pluginFile)
+				val manifest = loader.getPluginMetadata()
+
+				if (manifest != null) {
+					if (manifest.id == pluginId) {
+						if (pluginFile.delete()) {
+							deleted = true
+							break // Found and deleted the right file
+						} else {
+							logger.error("File exists: ${pluginFile.exists()}, Can write: ${pluginFile.canWrite()}")
+						}
+					}
+				} else {
+					logger.warn("Could not read manifest from ${pluginFile.name}")
+				}
+			} catch (e: Exception) {
+				logger.error("Error checking plugin file ${pluginFile.name}: ${e.message}", e)
+			}
+		}
+
+		// Remove plugin state and cleanup contributions
+		if (deleted) {
+			removePluginState(pluginId)
+			crashTracker.removeCrashCount(pluginId)
+			cleanupPluginCacheFiles(pluginId)
+			lifecycleDispatcher.notifyUninstalled(pluginId)
+			logger.info("Plugin uninstall completed successfully: $pluginId")
+		} else {
+			logger.error("Failed to uninstall plugin: $pluginId - file not found or could not be deleted")
+		}
+		logger.info("Uninstall process ended for plugin: $pluginId (success: $deleted) ===")
+		return deleted
+	}
+
+	fun getPlugin(pluginId: String): IPlugin? = loadedPlugins[pluginId]?.plugin
+
+	fun getAllPlugins(): List<PluginInfo> =
+		loadedPlugins.values.map { loadedPlugin ->
+			PluginInfo(
+				metadata = loadedPlugin.toPluginMetadata(),
+				isEnabled = loadedPlugin.isEnabled,
+				isLoaded = true,
+			)
+		}
+
+	/**
+	 * Get all enabled plugin instances for UI integration
+	 */
+	fun getAllPluginInstances(): List<IPlugin> =
+		loadedPlugins.values
+			.filter { it.isEnabled }
+			.map { it.plugin }
+
+	fun getLoadedPlugin(pluginId: String): LoadedPlugin? = loadedPlugins[pluginId]?.takeIf { it.isEnabled }
+
+	/**
+	 * Get all enabled plugins that implement UI extensions
+	 */
+	fun getEnabledUIExtensions(): List<com.itsaky.androidide.plugins.extensions.UIExtension> =
+		loadedPlugins.values
+			.filter { it.isEnabled }
+			.map { it.plugin }
+			.filterIsInstance<com.itsaky.androidide.plugins.extensions.UIExtension>()
+
+	fun getEnabledFileOpenExtensions(): List<FileOpenExtension> =
+		loadedPlugins.values
+			.filter { it.isEnabled }
+			.map { it.plugin }
+			.filterIsInstance<FileOpenExtension>()
+
+	/**
+	 * Get all enabled plugins that contribute rows to the IDE Preferences screen.
+	 */
+	fun getEnabledSettingsExtensions(): List<SettingsExtension> =
+		loadedPlugins.values
+			.filter { it.isEnabled }
+			.map { it.plugin }
+			.filterIsInstance<SettingsExtension>()
+
+	/**
+	 * The IDE Preferences rows contributed by enabled plugins, each paired with its owning plugin
+	 * id. Sorted by [PluginSettingsEntry.order] then title; invisible entries are dropped and a
+	 * plugin that throws is skipped rather than taking down the Preferences screen.
+	 */
+	fun getPluginSettingsEntries(): List<Pair<String, PluginSettingsEntry>> {
+		val extensions =
+			loadedPlugins.entries
+				.filter { it.value.isEnabled }
+				.mapNotNull { (pluginId, loaded) ->
+					(loaded.plugin as? SettingsExtension)?.let { pluginId to it }
+				}
+
+		return collectPluginSettingsEntries(extensions) { pluginId, error ->
+			logger.error("Failed to get settings entries for plugin $pluginId", error)
+		}
+	}
+
+	/**
+	 * Get all enabled plugins that provide editor decorations (additive coloring of editor text).
+	 */
+	fun getEnabledEditorDecorationProviders(): List<EditorDecorationProvider> =
+		loadedPlugins.values
+			.filter { it.isEnabled }
+			.map { it.plugin }
+			.filterIsInstance<EditorDecorationProvider>()
+
+	fun notifyFileOpened(file: File) {
+		getEnabledFileOpenExtensions().forEach { extension ->
+			executeWithErrorHandling("notify file opened") {
+				extension.onFileOpened(file)
+			}
+		}
+	}
+
+	fun notifyFileClosed(file: File) {
+		getEnabledFileOpenExtensions().forEach { extension ->
+			executeWithErrorHandling("notify file closed") {
+				extension.onFileClosed(file)
+			}
+		}
+	}
+
+	fun getFileTabMenuItems(file: File): List<FileTabMenuItem> =
+		getEnabledFileOpenExtensions()
+			.flatMap { extension ->
+				executeWithErrorHandling("get file tab menu items") {
+					extension.getFileTabMenuItems(file)
+				}.getOrDefault(emptyList())
+			}.sortedBy { it.order }
+
+	fun delegateFileOpen(file: File): Boolean {
+		val handler =
+			getEnabledFileOpenExtensions().firstOrNull { extension ->
+				executeWithErrorHandling("check canHandleFileOpen") {
+					extension.canHandleFileOpen(file)
+				}.getOrDefault(false)
+			} ?: return false
+		return executeWithErrorHandling("handle file open") {
+			handler.handleFileOpen(file)
+		}.getOrDefault(false)
+	}
+
+	fun getPluginIdForInstance(plugin: IPlugin): String? =
+		loadedPlugins.entries
+			.find { it.value.plugin === plugin }
+			?.key
+
+	fun getClassLoaderForPlugin(plugin: IPlugin): ClassLoader? =
+		loadedPlugins.values
+			.find { it.plugin === plugin }
+			?.classLoader
+
+	fun getClassLoaderForPluginId(pluginId: String): ClassLoader? = loadedPlugins[pluginId]?.classLoader
+
+	fun enablePlugin(pluginId: String): Boolean {
+		val loadedPlugin = loadedPlugins[pluginId] ?: return false
+
+		if (loadedPlugin.isEnabled) {
+			logger.info("Plugin $pluginId is already enabled")
+			return true
+		}
+
+		loadedPlugin.isEnabled = true
+		activateLoadedPlugin(loadedPlugin)
+		return if (loadedPlugin.isEnabled) {
+			savePluginState(pluginId, true)
+			crashTracker.resetCrashCount(pluginId)
+			logger.info("Enabled plugin: $pluginId")
+			true
+		} else {
+			logger.error("Failed to enable plugin: $pluginId (activation failed)")
+			false
+		}
+	}
+
+	fun disablePlugin(pluginId: String): Boolean {
+		val loadedPlugin = loadedPlugins[pluginId] ?: return false
+
+		if (!loadedPlugin.isEnabled) {
+			logger.info("Plugin $pluginId is already disabled")
+			return true
+		}
+
+		return try {
+			cleanupPluginContributions(loadedPlugin)
+			loadedPlugin.plugin.deactivate()
+			loadedPlugin.isEnabled = false
+			savePluginState(pluginId, false)
+			lifecycleDispatcher.notifyDeactivated(pluginId)
+
+			logger.info("Disabled plugin: $pluginId")
+			true
+		} catch (e: Exception) {
+			logger.error("Failed to disable plugin: $pluginId", e)
+			false
+		}
+	}
+
+	fun forceDisablePlugin(pluginId: String) {
+		val loadedPlugin = loadedPlugins[pluginId] ?: return
+		cleanupSidebarActions(pluginId)
+		runCatching { PluginEditorTabManager.getInstance().removePluginTabs(pluginId) }.onFailure { e ->
+			logger.error("Failed to remove plugin tabs during force-disable: $pluginId", e)
+		}
+		cleanupPluginContributions(loadedPlugin)
+		runCatching { loadedPlugin.plugin.deactivate() }.onFailure { e ->
+			logger.error("Plugin deactivate threw during force-disable: $pluginId", e)
+		}
+		loadedPlugin.isEnabled = false
+		savePluginState(pluginId, false)
+		lifecycleDispatcher.notifyDeactivated(pluginId)
+		logger.warn("Force-disabled plugin due to crashes: $pluginId")
+	}
+
+	private fun cleanupPluginContributions(loadedPlugin: LoadedPlugin) {
+		val pluginId = loadedPlugin.manifest.id
+		runCatching { PluginProjectManager.getInstance().cleanupPluginTemplates(pluginId) }
+			.onFailure { logger.error("Failed to clean project templates for: $pluginId", it) }
+		runCatching {
+			PluginSnippetManager.getInstance().cleanupPlugin(pluginId)
+			snippetRefreshListener?.invoke(pluginId)
+		}.onFailure { logger.error("Failed to clean snippets for: $pluginId", it) }
+		runCatching { PluginBuildActionManager.getInstance().cleanupPlugin(pluginId) }
+			.onFailure { logger.error("Failed to clean build actions for: $pluginId", it) }
+		runCatching {
+			val commandService = loadedPlugin.context.services.get(IdeCommandService::class.java)
+			if (commandService is IdeCommandServiceImpl) commandService.cancelAllCommands()
+		}.onFailure { logger.error("Failed to cancel commands for: $pluginId", it) }
+		runCatching {
+			val templateService = loadedPlugin.context.services.get(IdeTemplateService::class.java)
+			if (templateService is IdeTemplateServiceImpl) templateService.cleanupAllTemplates()
+		}.onFailure { logger.error("Failed to cleanup templates for: $pluginId", it) }
+	}
+
+	sealed class CrashResult {
+		abstract val pluginId: String
+		abstract val pluginName: String
+
+		data class Recorded(
+			override val pluginId: String,
+			override val pluginName: String,
+			val crashCount: Int,
+		) : CrashResult()
+
+		data class Disabled(
+			override val pluginId: String,
+			override val pluginName: String,
+		) : CrashResult()
+	}
+
+	fun recordPluginCrash(pluginId: String): CrashResult {
+		val count = crashTracker.recordCrash(pluginId)
+		val name = loadedPlugins[pluginId]?.manifest?.name ?: pluginId
+		return if (crashTracker.shouldDisable(pluginId)) {
+			forceDisablePlugin(pluginId)
+			CrashResult.Disabled(pluginId, name)
+		} else {
+			CrashResult.Recorded(pluginId, name, count)
+		}
+	}
+
+	fun getLoadedPluginIds(): Set<String> = loadedPlugins.keys.toSet()
+
+	fun getServiceRegistry(): ServiceRegistry = serviceRegistry.asRegistry(SharedServiceRegistry.HOST_PROVIDER_ID)
+
+	/**
+	 * Set the activity provider to enable UI operations in plugins
+	 */
+	fun setActivityProvider(provider: ActivityProvider?) {
+		this.activityProvider = provider
+	}
+
+	fun getCurrentActivity(): Activity? = activityProvider?.getCurrentActivity()
+
+	/**
+	 * Set the path validator for validating plugin file access
+	 */
+	fun setPathValidator(validator: PluginPathValidator?) {
+		this.pathValidator = validator
+	}
+
+	/**
+	 * Set the editor provider to enable plugin access to editor state. Safe to call after
+	 * plugins have already loaded — buffered file-change callbacks are replayed on the new
+	 * provider and detached from the previous one.
+	 */
+	fun setEditorProvider(provider: IdeEditorServiceImpl.EditorProvider?) {
+		val previous = this.editorProvider
+		if (previous === provider) return
+		if (previous != null) {
+			pendingFileChangeCallbacks.forEach { cb ->
+				runCatching { previous.removeFileChangeCallback(cb) }
+			}
+			pendingContentChangeCallbacks.forEach { cb ->
+				runCatching { previous.removeContentChangeCallback(cb) }
+			}
+		}
+		this.editorProvider = provider
+		if (provider != null) {
+			pendingFileChangeCallbacks.forEach { cb ->
+				runCatching { provider.addFileChangeCallback(cb) }
+			}
+			pendingContentChangeCallbacks.forEach { cb ->
+				runCatching { provider.addContentChangeCallback(cb) }
+			}
+		}
+	}
+
+	/**
+	 * Save plugin enabled state to persistent storage
+	 */
+	private fun savePluginState(
+		pluginId: String,
+		enabled: Boolean,
+	) {
+		pluginStates[pluginId] = enabled
+		statePersistScope.launch {
+			statePersistMutex.withLock {
+				executeWithErrorHandling("save plugin state", pluginId) {
+					val prefsFile = File(context.filesDir, "plugin_states.properties")
+					val properties = java.util.Properties()
+
+					if (prefsFile.exists()) {
+						prefsFile.inputStream().use { input ->
+							properties.load(input)
+						}
+					}
+
+					properties.setProperty(pluginId, enabled.toString())
+
+					prefsFile.outputStream().use { output ->
+						properties.store(output, "Plugin enabled/disabled states")
+					}
+
+					logger.debug("Saved plugin state: $pluginId = $enabled")
+				}
+			}
+		}
+	}
+
+	/**
+	 * Load plugin enabled states from persistent storage
+	 */
+	private fun loadPluginStates() {
+		executeWithErrorHandling("load plugin states") {
+			val prefsFile = File(context.filesDir, "plugin_states.properties")
+			if (prefsFile.exists()) {
+				val properties = java.util.Properties()
+				prefsFile.inputStream().use { input ->
+					properties.load(input)
+				}
+
+				properties.forEach { key, value ->
+					val pluginId = key as String
+					val enabled = (value as String).toBoolean()
+					pluginStates[pluginId] = enabled
+					logger.debug("Loaded plugin state: $pluginId = $enabled")
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the saved enabled state for a plugin (defaults to true for new plugins)
+	 */
+	private fun getPluginState(pluginId: String): Boolean = pluginStates[pluginId] ?: true
+
+	private fun removePluginState(pluginId: String) {
+		pluginStates.remove(pluginId)
+		statePersistScope.launch {
+			statePersistMutex.withLock {
+				executeWithErrorHandling("remove plugin state", pluginId) {
+					val prefsFile = File(context.filesDir, "plugin_states.properties")
+					if (prefsFile.exists()) {
+						val properties = java.util.Properties()
+						properties.load(prefsFile.inputStream())
+						properties.remove(pluginId)
+						properties.store(prefsFile.outputStream(), "Plugin states")
+						logger.debug("Removed plugin state: $pluginId")
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Configure required permissions for project service access
+	 */
+	fun setProjectServicePermissions(permissions: Set<PluginPermission>) {
+		this.projectServicePermissions = permissions
+	}
+
+	/**
+	 * Create plugin context with  resources
+	 */
+	private fun createPluginContextWithResources(
+		pluginId: String,
+		classLoader: ClassLoader,
+		permissions: Set<PluginPermission>,
+		resourceContext: Context,
+	): PluginContext {
+		// Create a plugin-specific service registry with permission-validated services
+		val pluginServiceRegistry = ServiceRegistryImpl()
+
+		logger.debug("Creating IDE services with resources for plugin: $pluginId")
+
+		// Create services with resource context
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeProjectService::class.java,
+			pluginId,
+			"project",
+		) {
+			IdeProjectServiceImpl(
+				pluginId = pluginId,
+				permissions = permissions,
+				projectProvider = projectProvider,
+				requiredPermissions = projectServicePermissions,
+				pathValidator =
+					pathValidator?.let { validator ->
+						object : IdeProjectServiceImpl.PathValidator {
+							override fun isPathAllowed(path: File): Boolean = validator.isPathAllowed(path)
+
+							override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
+						}
+					},
+			)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeUIService::class.java,
+			pluginId,
+			"UI",
+		) {
+			IdeUIServiceImpl(activityProvider)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeBuildService::class.java,
+			pluginId,
+			"build",
+		) {
+			IdeBuildServiceImpl.getInstance()
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeProjectManipulationService::class.java,
+			pluginId,
+			"project_manipulation",
+		) {
+			IdeProjectManipulationServiceImpl.getInstance()
+		}
+
+		// Tooltip service for showing help documentation
+		// Use main app context for tooltip service to access app's tooltip layouts
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeTooltipService::class.java,
+			pluginId,
+			"tooltip",
+		) {
+			IdeTooltipServiceImpl(context, pluginId, activityProvider)
+		}
+
+		// Editor tab service for plugin editor tab integration
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeEditorTabService::class.java,
+			pluginId,
+			"editor_tab",
+		) {
+			IdeEditorTabServiceImpl(activityProvider)
+		}
+
+		// File service for editing project files
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeFileService::class.java,
+			pluginId,
+			"file",
+		) {
+			IdeFileServiceImpl(
+				pluginId = pluginId,
+				permissions = permissions,
+				pathValidator =
+					pathValidator?.let { validator ->
+						object : IdeFileServiceImpl.PathValidator {
+							override fun isPathAllowed(path: File): Boolean = validator.isPathAllowed(path)
+
+							override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
+						}
+					},
+			)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeEnvironmentService::class.java,
+			pluginId,
+			"environment",
+		) {
+			IdeEnvironmentServiceImpl(pluginId)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeArchiveService::class.java,
+			pluginId,
+			"archive",
+		) {
+			IdeArchiveServiceImpl(
+				pluginId = pluginId,
+				permissions = permissions,
+				pathValidator =
+					pathValidator?.let { validator ->
+						object : IdeFileServiceImpl.PathValidator {
+							override fun isPathAllowed(path: File): Boolean = validator.isPathAllowed(path)
+
+							override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
+						}
+					},
+			)
+		}
+
+		// Sidebar service for plugin sidebar slot management
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeSidebarService::class.java,
+			pluginId,
+			"sidebar",
+		) {
+			IdeSidebarServiceImpl(pluginId)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeThemeService::class.java,
+			pluginId,
+			"theme",
+		) {
+			IdeThemeServiceImpl(context)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeFeatureFlagService::class.java,
+			pluginId,
+			"feature_flag",
+		) {
+			IdeFeatureFlagServiceImpl()
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeTemplateService::class.java,
+			pluginId,
+			"template",
+		) {
+			IdeTemplateServiceImpl(
+				pluginId = pluginId,
+				permissions = permissions,
+				onTemplatesChanged = { templateReloadListener?.invoke() },
+			)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeSnippetService::class.java,
+			pluginId,
+			"snippet",
+		) {
+			IdeSnippetServiceImpl().apply {
+				setRefreshCallback { pid ->
+					snippetRefreshListener?.invoke(pid)
+				}
+			}
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeEditorService::class.java,
+			pluginId,
+			"editor",
+		) {
+			IdeEditorServiceImpl(
+				pluginId = pluginId,
+				permissions = permissions,
+				editorProvider = delegatingEditorProvider,
+				pathValidator =
+					pathValidator?.let { validator ->
+						object : IdeEditorServiceImpl.PathValidator {
+							override fun isPathAllowed(file: File): Boolean = validator.isPathAllowed(file)
+
+							override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
+						}
+					},
+			)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeCommandService::class.java,
+			pluginId,
+			"command",
+		) {
+			IdeCommandServiceImpl(
+				pluginId = pluginId,
+				permissions = permissions,
+				projectRootProvider = { projectProvider.getCurrentProject()?.rootDir },
+				appFilesDir = context.filesDir,
+			)
+		}
+
+		// Note: Phase 2 services (IdeFileService, IdeProjectService, IdeResourceService)
+		// have been removed. Use existing services instead:
+		// - IdeFileService for file operations (now includes listFiles)
+		// - IdeProjectManipulationService for dependency management
+		// - IdeBuildService for build operations
+		// This maintains binary compatibility with existing plugins.
+
+		// Create PluginContext with resource context
+		return PluginContextImpl(
+			androidContext = resourceContext, // Use the resource context instead of app context
+			services = pluginServiceRegistry,
+			eventBus = eventBus,
+			logger = PluginLoggerImpl(pluginId, logger),
+			resources =
+				ResourceManagerImpl(
+					pluginId = pluginId,
+					pluginsDir = pluginsDir,
+					classLoader = classLoader,
+					assetManager = resourceContext.assets,
+				),
+			pluginId = pluginId,
+			sharedServices = serviceRegistry,
+			lifecycleDispatcher = lifecycleDispatcher,
+			pluginInfoProvider = { id ->
+				loadedPlugins[id]?.let {
+					PluginInfo(it.toPluginMetadata(), it.isEnabled, isLoaded = true)
+				}
+			},
+		)
+	}
+
+	private fun createPluginContext(
+		pluginId: String,
+		classLoader: ClassLoader,
+		permissions: Set<PluginPermission>,
+	): PluginContext {
+		val pluginServiceRegistry = ServiceRegistryImpl()
+
+		logger.debug("Creating IDE services for plugin: $pluginId")
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeProjectService::class.java,
+			pluginId,
+			"project",
+		) {
+			IdeProjectServiceImpl(
+				pluginId = pluginId,
+				permissions = permissions,
+				projectProvider = projectProvider,
+				requiredPermissions = projectServicePermissions,
+				pathValidator =
+					pathValidator?.let { validator ->
+						object : IdeProjectServiceImpl.PathValidator {
+							override fun isPathAllowed(path: File): Boolean = validator.isPathAllowed(path)
+
+							override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
+						}
+					},
+			)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeUIService::class.java,
+			pluginId,
+			"UI",
+		) {
+			IdeUIServiceImpl(activityProvider)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeBuildService::class.java,
+			pluginId,
+			"build",
+		) {
+			IdeBuildServiceImpl.getInstance()
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeProjectManipulationService::class.java,
+			pluginId,
+			"project_manipulation",
+		) {
+			IdeProjectManipulationServiceImpl.getInstance()
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeTooltipService::class.java,
+			pluginId,
+			"tooltip",
+		) {
+			IdeTooltipServiceImpl(context, pluginId, activityProvider)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeEditorTabService::class.java,
+			pluginId,
+			"editor_tab",
+		) {
+			IdeEditorTabServiceImpl(activityProvider)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeFileService::class.java,
+			pluginId,
+			"file",
+		) {
+			IdeFileServiceImpl(
+				pluginId = pluginId,
+				permissions = permissions,
+				pathValidator =
+					pathValidator?.let { validator ->
+						object : IdeFileServiceImpl.PathValidator {
+							override fun isPathAllowed(path: File): Boolean = validator.isPathAllowed(path)
+
+							override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
+						}
+					},
+			)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeEnvironmentService::class.java,
+			pluginId,
+			"environment",
+		) {
+			IdeEnvironmentServiceImpl(pluginId)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeArchiveService::class.java,
+			pluginId,
+			"archive",
+		) {
+			IdeArchiveServiceImpl(
+				pluginId = pluginId,
+				permissions = permissions,
+				pathValidator =
+					pathValidator?.let { validator ->
+						object : IdeFileServiceImpl.PathValidator {
+							override fun isPathAllowed(path: File): Boolean = validator.isPathAllowed(path)
+
+							override fun getAllowedPaths(): List<String> = validator.getAllowedPaths()
+						}
+					},
+			)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeSidebarService::class.java,
+			pluginId,
+			"sidebar",
+		) {
+			IdeSidebarServiceImpl(pluginId)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeThemeService::class.java,
+			pluginId,
+			"theme",
+		) {
+			IdeThemeServiceImpl(context)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeFeatureFlagService::class.java,
+			pluginId,
+			"feature_flag",
+		) {
+			IdeFeatureFlagServiceImpl()
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeTemplateService::class.java,
+			pluginId,
+			"template",
+		) {
+			IdeTemplateServiceImpl(
+				pluginId = pluginId,
+				permissions = permissions,
+				onTemplatesChanged = { templateReloadListener?.invoke() },
+			)
+		}
+
+		registerServiceWithErrorHandling(
+			pluginServiceRegistry,
+			IdeSnippetService::class.java,
+			pluginId,
+			"snippet",
+		) {
+			IdeSnippetServiceImpl().apply {
+				setRefreshCallback { pid ->
+					snippetRefreshListener?.invoke(pid)
+				}
+			}
+		}
+
+		return PluginContextImpl(
+			androidContext = context,
+			services = pluginServiceRegistry,
+			eventBus = eventBus,
+			logger = PluginLoggerImpl(pluginId, logger),
+			resources = ResourceManagerImpl(pluginId, pluginsDir, classLoader),
+			pluginId = pluginId,
+			sharedServices = serviceRegistry,
+			lifecycleDispatcher = lifecycleDispatcher,
+			pluginInfoProvider = { id ->
+				loadedPlugins[id]?.let {
+					PluginInfo(it.toPluginMetadata(), it.isEnabled, isLoaded = true)
+				}
+			},
+		)
+	}
+
+	/**
+	 * Clean up ALL plugin files and cache directories
+	 */
+	private fun cleanupPluginCacheFiles(pluginId: String) {
+		executeWithErrorHandling("cleanup plugin cache files", pluginId) {
+			logger.debug("Cleaning up ALL files and cache for plugin: $pluginId")
+
+			val pluginDir = File(pluginsDir, pluginId)
+			if (pluginDir.exists()) {
+				val deleted = pluginDir.deleteRecursively()
+				logger.debug("Deleted plugin directory: ${pluginDir.absolutePath} (success: $deleted)")
+			}
+
+			File(context.getDir("plugin_native_libs", Context.MODE_PRIVATE), pluginId).let { dir ->
+				if (dir.exists()) dir.deleteRecursively()
+			}
+
+			File(context.getDir("plugin_icons", Context.MODE_PRIVATE), pluginId).let { dir ->
+				if (dir.exists()) dir.deleteRecursively()
+			}
+
+			// Clean up ART cache files in oat directory
+			try {
+				val oatDir = File(pluginsDir, "oat")
+				if (oatDir.exists() && oatDir.isDirectory) {
+					oatDir.walkTopDown().forEach { file ->
+						if (file.name.contains(pluginId)) {
+							val deleted = file.deleteRecursively()
+							logger.debug("Deleted ART cache: ${file.absolutePath} (success: $deleted)")
+						}
+					}
+				}
+			} catch (e: Exception) {
+				logger.warn("Failed to cleanup ART cache files for: $pluginId", e)
+			}
+
+			// Clean up any other directories or files that contain the plugin ID
+			try {
+				pluginsDir.walkTopDown().forEach { file ->
+					if (file != pluginsDir && file.name.contains(pluginId)) {
+						val deleted = file.deleteRecursively()
+						logger.debug("Deleted plugin-related item: ${file.absolutePath} (success: $deleted)")
+					}
+				}
+			} catch (e: Exception) {
+				logger.warn("Failed to cleanup plugin-related files for: $pluginId", e)
+			}
+
+			logger.debug("Complete plugin cleanup finished for: $pluginId")
+		}
+	}
+
+	/**
+	 * Clean up sidebar actions from the current session's action registry
+	 */
+	private fun cleanupSidebarActions(pluginId: String) {
+		executeWithErrorHandling("cleanup sidebar actions", pluginId) {
+			logger.debug("Cleaning up sidebar actions for plugin: $pluginId")
+
+			val plugin = loadedPlugins[pluginId]?.plugin
+			if (plugin is UIExtension) {
+				val registryClass = Class.forName("com.itsaky.androidide.actions.ActionsRegistry")
+				val getInstanceMethod = registryClass.getMethod("getInstance")
+				val registry = getInstanceMethod.invoke(null)
+
+				plugin.getSideMenuItems().forEach { navItem ->
+					val actionId = "plugin_sidebar_${navItem.id}"
+					val unregisterMethod = registryClass.getMethod("unregisterAction", String::class.java)
+					val success = unregisterMethod.invoke(registry, actionId) as Boolean
+					logger.debug("Unregistered sidebar action: $actionId (success: $success)")
+				}
+
+				logger.debug("Sidebar actions cleanup completed for: $pluginId")
+			} else {
+				logger.debug("Plugin $pluginId does not implement UIExtension, no sidebar actions to cleanup")
+			}
+		}
+	}
 }
 
 data class PluginValidation(
-    val manifest: PluginManifest,
-    val isDebug: Boolean,
-    val iconDayEntryExists: Boolean,
-    val iconNightEntryExists: Boolean
+	val manifest: PluginManifest,
+	val isDebug: Boolean,
+	val iconDayEntryExists: Boolean,
+	val iconNightEntryExists: Boolean,
 )
 
 data class LoadedPlugin(
-    val plugin: IPlugin,
-    val manifest: PluginManifest,
-    val classLoader: ClassLoader,
-    val context: PluginContext,
-    val apkPath: String,
-    var isEnabled: Boolean = true,
-    val iconDayPath: String? = null,
-    val iconNightPath: String? = null
+	val plugin: IPlugin,
+	val manifest: PluginManifest,
+	val classLoader: ClassLoader,
+	val context: PluginContext,
+	val apkPath: String,
+	var isEnabled: Boolean = true,
+	val iconDayPath: String? = null,
+	val iconNightPath: String? = null,
 )
 
 fun LoadedPlugin.toPluginMetadata(): PluginMetadata =
-    manifest.toPluginMetadata().copy(
-        iconDayPath = iconDayPath,
-        iconNightPath = iconNightPath,
-    )
\ No newline at end of file
+	manifest.toPluginMetadata().copy(
+		iconDayPath = iconDayPath,
+		iconNightPath = iconNightPath,
+	)
diff --git a/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginSettingsEntries.kt b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginSettingsEntries.kt
new file mode 100644
index 0000000000..2c13b41833
--- /dev/null
+++ b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginSettingsEntries.kt
@@ -0,0 +1,33 @@
+package com.itsaky.androidide.plugins.manager.core
+
+import com.itsaky.androidide.plugins.extensions.PluginSettingsEntry
+import com.itsaky.androidide.plugins.extensions.SettingsExtension
+
+/**
+ * Collects the preference rows contributed by [extensions], each paired with its owning plugin id.
+ *
+ * A plugin that throws from [SettingsExtension.getSettingsEntries] contributes nothing and is
+ * reported through [onError]; every other plugin's rows still reach the Preferences screen.
+ *
+ * The order is a total one - plugin id and entry id break a title tie - so repeated calls over an
+ * unchanged plugin set return an equal list. The caller relies on that: `PreferencesActivity`
+ * compares successive results to decide whether to rebuild, and the iteration order of the
+ * underlying plugin map is not stable across mutations.
+ *
+ * Lives outside [PluginManager] so the collection contract - error isolation, visibility filter,
+ * ordering - is unit-testable without a loaded plugin set behind a Context-bound singleton.
+ */
+internal fun collectPluginSettingsEntries(
+	extensions: List<Pair<String, SettingsExtension>>,
+	onError: (pluginId: String, error: Throwable) -> Unit,
+): List<Pair<String, PluginSettingsEntry>> =
+	extensions
+		.flatMap { (pluginId, extension) ->
+			runCatching { extension.getSettingsEntries() }
+				.onFailure { error -> onError(pluginId, error) }
+				.getOrDefault(emptyList())
+				.filter { it.isVisible }
+				.map { entry -> pluginId to entry }
+		}.sortedWith(
+			compareBy({ it.second.order }, { it.second.title }, { it.first }, { it.second.id }),
+		)
diff --git a/plugin-manager/src/test/kotlin/com/itsaky/androidide/plugins/manager/core/PluginSettingsEntriesTest.kt b/plugin-manager/src/test/kotlin/com/itsaky/androidide/plugins/manager/core/PluginSettingsEntriesTest.kt
new file mode 100644
index 0000000000..7ef8e080d6
--- /dev/null
+++ b/plugin-manager/src/test/kotlin/com/itsaky/androidide/plugins/manager/core/PluginSettingsEntriesTest.kt
@@ -0,0 +1,124 @@
+package com.itsaky.androidide.plugins.manager.core
+
+import com.google.common.truth.Truth.assertThat
+import com.itsaky.androidide.plugins.PluginContext
+import com.itsaky.androidide.plugins.extensions.PluginSettingsEntry
+import com.itsaky.androidide.plugins.extensions.SettingsExtension
+import org.junit.Test
+
+/**
+ * Covers the collection contract behind `PluginManager.getPluginSettingsEntries()`: rows are paired
+ * with their owning plugin, ordered, filtered by visibility, and one broken plugin cannot take the
+ * Preferences screen down with it.
+ */
+class PluginSettingsEntriesTest {
+	@Test
+	fun entriesArePairedWithTheirPluginAndSortedByOrderThenTitle() {
+		val entries =
+			collectPluginSettingsEntries(
+				listOf(
+					"plugin.b" to FakeSettingsExtension(entry("zeta", order = 0), entry("alpha", order = 0)),
+					"plugin.a" to FakeSettingsExtension(entry("first", order = -1)),
+				),
+				onError = ::failOnError,
+			)
+
+		assertThat(entries.map { it.first to it.second.id })
+			.containsExactly(
+				"plugin.a" to "first",
+				"plugin.b" to "alpha",
+				"plugin.b" to "zeta",
+			).inOrder()
+	}
+
+	@Test
+	fun aThrowingExtensionIsSkippedAndReportedWhileOthersStillContribute() {
+		val failures = mutableListOf<String>()
+
+		val entries =
+			collectPluginSettingsEntries(
+				listOf(
+					"plugin.broken" to ThrowingSettingsExtension,
+					"plugin.ok" to FakeSettingsExtension(entry("agent")),
+				),
+				onError = { pluginId, _ -> failures.add(pluginId) },
+			)
+
+		assertThat(entries.map { it.second.id }).containsExactly("agent")
+		assertThat(failures).containsExactly("plugin.broken")
+	}
+
+	@Test
+	fun invisibleEntriesAreDropped() {
+		val entries =
+			collectPluginSettingsEntries(
+				listOf(
+					"plugin.a" to
+						FakeSettingsExtension(
+							entry("hidden").copy(isVisible = false),
+							entry("shown"),
+						),
+				),
+				onError = ::failOnError,
+			)
+
+		assertThat(entries.map { it.second.id }).containsExactly("shown")
+	}
+
+	// PreferencesActivity compares successive results to decide whether to rebuild the tree, so two
+	// entries that tie on order and title must still come back in the same order every time.
+	@Test
+	fun orderIsTotalWhenTwoPluginsTieOnOrderAndTitle() {
+		val extensions =
+			listOf(
+				"plugin.z" to FakeSettingsExtension(entry("agent")),
+				"plugin.a" to FakeSettingsExtension(entry("agent")),
+			)
+
+		val forward = collectPluginSettingsEntries(extensions, onError = ::failOnError)
+		val reversed = collectPluginSettingsEntries(extensions.reversed(), onError = ::failOnError)
+
+		assertThat(forward.map { it.first }).containsExactly("plugin.a", "plugin.z").inOrder()
+		assertThat(reversed).isEqualTo(forward)
+	}
+
+	@Test
+	fun noExtensionsContributeNoRows() {
+		assertThat(collectPluginSettingsEntries(emptyList(), onError = ::failOnError)).isEmpty()
+	}
+
+	private fun entry(
+		id: String,
+		order: Int = 0,
+	) = PluginSettingsEntry(
+		id = id,
+		title = id,
+		fragmentClassName = "com.example.${id}Fragment",
+		order = order,
+	)
+
+	private fun failOnError(
+		pluginId: String,
+		error: Throwable,
+	): Unit = throw AssertionError("unexpected failure for $pluginId", error)
+
+	private open class NoOpPlugin : SettingsExtension {
+		override fun initialize(context: PluginContext) = true
+
+		override fun activate() = true
+
+		override fun deactivate() = true
+
+		override fun dispose() = Unit
+	}
+
+	private class FakeSettingsExtension(
+		private vararg val entries: PluginSettingsEntry,
+	) : NoOpPlugin() {
+		override fun getSettingsEntries(): List<PluginSettingsEntry> = entries.toList()
+	}
+
+	private object ThrowingSettingsExtension : NoOpPlugin() {
+		override fun getSettingsEntries(): List<PluginSettingsEntry> = throw IllegalStateException("boom")
+	}
+}
diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceGroup.kt b/preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceGroup.kt
index 2655308aa7..92b365fc59 100644
--- a/preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceGroup.kt
+++ b/preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceGroup.kt
@@ -27,26 +27,31 @@ import androidx.preference.PreferenceCategory
  * @author Akash Yadav
  */
 abstract class IPreferenceGroup : BasePreference() {
-
-  /** The preferences. */
-  abstract val children: List<IPreference>
-
-  /** Adds the given preference to the preferences list. */
-  fun addPreference(preference: IPreference) {
-    (children as MutableList).add(preference)
-  }
-
-  /** Removes the given preference. */
-  fun removePreference(preference: IPreference) {
-    (children as MutableList).remove(preference)
-  }
-
-  /** Removes the preference at the given index. */
-  fun removePreference(index: Int) {
-    (children as MutableList).removeAt(index)
-  }
-
-  override fun onCreatePreference(context: Context): Preference {
-    return PreferenceCategory(context)
-  }
+	/** The preferences. */
+	abstract val children: List<IPreference>
+
+	/** Adds the given preference to the preferences list. */
+	fun addPreference(preference: IPreference) {
+		(children as MutableList).add(preference)
+	}
+
+	/** Removes the given preference. */
+	fun removePreference(preference: IPreference) {
+		(children as MutableList).remove(preference)
+	}
+
+	/** Removes the preference at the given index. */
+	fun removePreference(index: Int) {
+		(children as MutableList).removeAt(index)
+	}
+
+	/**
+	 * Removes every preference from the preferences list, so the group can be rebuilt from scratch.
+	 * Use this rather than casting [children] at the call site.
+	 */
+	fun clearPreferences() {
+		(children as MutableList).clear()
+	}
+
+	override fun onCreatePreference(context: Context): Preference = PreferenceCategory(context)
 }
diff --git a/resources/src/main/res/values/strings.xml b/resources/src/main/res/values/strings.xml
index e40e72faa1..c427bf37ff 100644
--- a/resources/src/main/res/values/strings.xml
+++ b/resources/src/main/res/values/strings.xml
@@ -897,6 +897,7 @@
 	<string name="plugin_manager">Plugin Manager</string>
 	<string name="plugin_manager_title">Plugin Manager</string>
 	<string name="plugin_manager_summary">Manage IDE plugins and extensions</string>
+	<string name="msg_open_plugin_settings_failed">Could not open this plugin\'s settings</string>
 	<string name="plugins">Plugins</string>
 	<string name="no_plugins_installed">No plugins installed</string>
 	<string name="no_plugins_installed_hint">Tap the + button to install your first plugin</string>

From 070605c179212d74cae9353458f4f60efb4045ee Mon Sep 17 00:00:00 2001
From: John Trujillo <johnandrestrujillo@gmail.com>
Date: Tue, 4 Aug 2026 15:36:21 -0500
Subject: [PATCH 2/3] fix(ADFA-5017): harden plugin screen launch and
 preferences restore

Drop SINGLE_TOP/CLEAR_TOP so a reused PluginScreenActivity can't show the previous plugin's fragment; catch Exception not Throwable in PluginScreenNavigator; persist the contributed-rows snapshot so a tree that drifted during process death gets rebuilt.
---
 .../activities/PluginScreenActivity.kt        |  4 +++-
 .../activities/PluginScreenNavigator.kt       |  9 +++++----
 .../activities/PreferencesActivity.kt         | 20 +++++++++++++++++--
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/itsaky/androidide/activities/PluginScreenActivity.kt b/app/src/main/java/com/itsaky/androidide/activities/PluginScreenActivity.kt
index d724bb153a..925da53c76 100644
--- a/app/src/main/java/com/itsaky/androidide/activities/PluginScreenActivity.kt
+++ b/app/src/main/java/com/itsaky/androidide/activities/PluginScreenActivity.kt
@@ -120,6 +120,9 @@ class PluginScreenActivity : IDEActivity() {
 		 * `IdeUIServiceImpl.openPluginScreen` builds, so both entry points stay in step. Action-based
 		 * rather than explicit-component to match the manifest intent-filter; [setPackage] keeps it
 		 * inside the app.
+		 *
+		 * No reuse flags: every entry is its own screen, and the extras are only read in [onCreate],
+		 * so a reused instance would keep showing the previous plugin's fragment.
 		 */
 		fun newIntent(
 			context: Context,
@@ -132,7 +135,6 @@ class PluginScreenActivity : IDEActivity() {
 				putExtra(IdeUIService.EXTRA_PLUGIN_ID, pluginId)
 				putExtra(IdeUIService.EXTRA_FRAGMENT_CLASS_NAME, fragmentClassName)
 				putExtra(IdeUIService.EXTRA_TITLE, title)
-				flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP
 			}
 	}
 }
diff --git a/app/src/main/java/com/itsaky/androidide/activities/PluginScreenNavigator.kt b/app/src/main/java/com/itsaky/androidide/activities/PluginScreenNavigator.kt
index 0e7dc57f85..75494781c6 100644
--- a/app/src/main/java/com/itsaky/androidide/activities/PluginScreenNavigator.kt
+++ b/app/src/main/java/com/itsaky/androidide/activities/PluginScreenNavigator.kt
@@ -25,12 +25,13 @@ object PluginScreenNavigator {
 		fragmentClassName: String,
 		title: String? = null,
 	): Boolean =
-		runCatching {
+		try {
 			context.startActivity(
 				PluginScreenActivity.newIntent(context, pluginId, fragmentClassName, title),
 			)
 			true
-		}.onFailure { error ->
-			log.error("Failed to open screen $fragmentClassName of plugin $pluginId", error)
-		}.getOrDefault(false)
+		} catch (error: Exception) {
+			log.error("Failed to open screen {} of plugin {}", fragmentClassName, pluginId, error)
+			false
+		}
 }
diff --git a/app/src/main/java/com/itsaky/androidide/activities/PreferencesActivity.kt b/app/src/main/java/com/itsaky/androidide/activities/PreferencesActivity.kt
index 0a5993cefb..925313d930 100755
--- a/app/src/main/java/com/itsaky/androidide/activities/PreferencesActivity.kt
+++ b/app/src/main/java/com/itsaky/androidide/activities/PreferencesActivity.kt
@@ -22,6 +22,7 @@ import android.view.HapticFeedbackConstants
 import android.view.MotionEvent
 import android.view.View
 import androidx.core.graphics.Insets
+import androidx.core.os.BundleCompat
 import androidx.fragment.app.Fragment
 import com.itsaky.androidide.FeedbackButtonManager
 import com.itsaky.androidide.R
@@ -80,8 +81,12 @@ class PreferencesActivity : EdgeToEdgeIDEActivity() {
 		feedbackButtonManager?.setupDraggableFab()
 
 		if (savedInstanceState != null) {
-			// The restored fragment already carries its children; only record what it was built from.
-			contributedPreferences = pluginSettingsPreferences()
+			contributedPreferences =
+				BundleCompat.getParcelableArrayList(
+					savedInstanceState,
+					STATE_CONTRIBUTED_PREFERENCES,
+					PluginSettingsEntryPreference::class.java,
+				)
 			return
 		}
 
@@ -162,9 +167,20 @@ class PreferencesActivity : EdgeToEdgeIDEActivity() {
 		return super.dispatchTouchEvent(ev)
 	}
 
+	override fun onSaveInstanceState(outState: Bundle) {
+		super.onSaveInstanceState(outState)
+		contributedPreferences?.let {
+			outState.putParcelableArrayList(STATE_CONTRIBUTED_PREFERENCES, ArrayList(it))
+		}
+	}
+
 	override fun onResume() {
 		super.onResume()
 		feedbackButtonManager?.loadFabPosition()
 		reloadRootFragmentIfContributedRowsChanged()
 	}
+
+	companion object {
+		private const val STATE_CONTRIBUTED_PREFERENCES = "contributedPreferences"
+	}
 }

From 10fb9b37c5241b8627ad6e913b169be8e8d2fd7a Mon Sep 17 00:00:00 2001
From: John Trujillo <johnandrestrujillo@gmail.com>
Date: Wed, 5 Aug 2026 15:27:26 -0500
Subject: [PATCH 3/3] fix(ADFA-5017): serialize plugin editor callback hand-off
 under one lock

Resolve the activity provider per call so service creation order no longer matters.
---
 .../plugins/manager/core/PluginManager.kt     | 145 +++++++++++++-----
 1 file changed, 104 insertions(+), 41 deletions(-)

diff --git a/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginManager.kt b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginManager.kt
index f0b0892ac2..de79b82ad5 100644
--- a/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginManager.kt
+++ b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginManager.kt
@@ -74,6 +74,7 @@ import com.itsaky.androidide.plugins.services.IdeTemplateService
 import com.itsaky.androidide.plugins.services.IdeThemeService
 import com.itsaky.androidide.plugins.services.IdeTooltipService
 import com.itsaky.androidide.plugins.services.IdeUIService
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -107,18 +108,31 @@ class PluginManager private constructor(
 		fun getAllowedPaths(): List<String>
 	}
 
+	@Volatile
 	private var activityProvider: ActivityProvider? = null
 	private var pathValidator: PluginPathValidator? = null
+
+	@Volatile
 	private var editorProvider: IdeEditorServiceImpl.EditorProvider? = null
 
 	/**
-	 * Callbacks added by plugins before any real provider was set. We hold them here and
-	 * replay onto a real provider when one is registered, so listener registration doesn't
-	 * silently drop on the floor during the early-boot window.
+	 * Stable provider handed to every plugin service that needs the current Activity. Resolving
+	 * through [activityProvider] on each call means services created before the activity registers
+	 * a provider (or after it swaps one in) still see the live value.
 	 */
-	private val pendingFileChangeCallbacks = java.util.concurrent.CopyOnWriteArraySet<(File?) -> Unit>()
-	private val pendingContentChangeCallbacks =
-		java.util.concurrent.CopyOnWriteArraySet<(String, Int, Int, String) -> Unit>()
+	private val delegatingActivityProvider = ActivityProvider { activityProvider?.getCurrentActivity() }
+
+	/**
+	 * Every editor callback registered by a plugin, kept so we can detach them from an outgoing
+	 * [editorProvider] and replay them onto an incoming one — otherwise registration made during
+	 * the early-boot window (or across an editor activity restart) drops on the floor.
+	 *
+	 * Guarded by [editorCallbackLock], which serializes registration against provider swaps so a
+	 * callback can never be left attached to a replaced provider or attached twice to a new one.
+	 */
+	private val editorCallbackLock = Any()
+	private val fileChangeCallbacks = linkedSetOf<(File?) -> Unit>()
+	private val contentChangeCallbacks = linkedSetOf<(String, Int, Int, String) -> Unit>()
 
 	/**
 	 * Stable provider handed to every plugin's [IdeEditorServiceImpl]. Each call delegates to
@@ -215,23 +229,35 @@ class PluginManager private constructor(
 			): Boolean = current()?.replaceRange(file, range, newText) ?: false
 
 			override fun addFileChangeCallback(callback: (File?) -> Unit) {
-				pendingFileChangeCallbacks.add(callback)
-				current()?.addFileChangeCallback(callback)
+				synchronized(editorCallbackLock) {
+					if (fileChangeCallbacks.add(callback)) {
+						attachFileChangeCallback(editorProvider, callback)
+					}
+				}
 			}
 
 			override fun removeFileChangeCallback(callback: (File?) -> Unit) {
-				pendingFileChangeCallbacks.remove(callback)
-				current()?.removeFileChangeCallback(callback)
+				synchronized(editorCallbackLock) {
+					if (fileChangeCallbacks.remove(callback)) {
+						detachFileChangeCallback(editorProvider, callback)
+					}
+				}
 			}
 
 			override fun addContentChangeCallback(callback: (String, Int, Int, String) -> Unit) {
-				pendingContentChangeCallbacks.add(callback)
-				current()?.addContentChangeCallback(callback)
+				synchronized(editorCallbackLock) {
+					if (contentChangeCallbacks.add(callback)) {
+						attachContentChangeCallback(editorProvider, callback)
+					}
+				}
 			}
 
 			override fun removeContentChangeCallback(callback: (String, Int, Int, String) -> Unit) {
-				pendingContentChangeCallbacks.remove(callback)
-				current()?.removeContentChangeCallback(callback)
+				synchronized(editorCallbackLock) {
+					if (contentChangeCallbacks.remove(callback)) {
+						detachContentChangeCallback(editorProvider, callback)
+					}
+				}
 			}
 
 			override fun showInlineSuggestion(
@@ -355,6 +381,8 @@ class PluginManager private constructor(
 							result.onFailure { error ->
 								logger.error("Failed to load plugin from ${pluginFile.name}: ${error.message}", error)
 							}
+						} catch (e: CancellationException) {
+							throw e
 						} catch (e: Exception) {
 							logger.error("Failed to load plugin from ${pluginFile.name}", e)
 						}
@@ -1101,7 +1129,9 @@ class PluginManager private constructor(
 	fun getServiceRegistry(): ServiceRegistry = serviceRegistry.asRegistry(SharedServiceRegistry.HOST_PROVIDER_ID)
 
 	/**
-	 * Set the activity provider to enable UI operations in plugins
+	 * Set the activity provider to enable UI operations in plugins. Safe to call at any point in
+	 * the lifecycle — plugin services resolve the activity through [delegatingActivityProvider], so
+	 * services created before this call still pick up the provider registered here.
 	 */
 	fun setActivityProvider(provider: ActivityProvider?) {
 		this.activityProvider = provider
@@ -1122,27 +1152,53 @@ class PluginManager private constructor(
 	 * provider and detached from the previous one.
 	 */
 	fun setEditorProvider(provider: IdeEditorServiceImpl.EditorProvider?) {
-		val previous = this.editorProvider
-		if (previous === provider) return
-		if (previous != null) {
-			pendingFileChangeCallbacks.forEach { cb ->
-				runCatching { previous.removeFileChangeCallback(cb) }
-			}
-			pendingContentChangeCallbacks.forEach { cb ->
-				runCatching { previous.removeContentChangeCallback(cb) }
-			}
-		}
-		this.editorProvider = provider
-		if (provider != null) {
-			pendingFileChangeCallbacks.forEach { cb ->
-				runCatching { provider.addFileChangeCallback(cb) }
-			}
-			pendingContentChangeCallbacks.forEach { cb ->
-				runCatching { provider.addContentChangeCallback(cb) }
-			}
+		synchronized(editorCallbackLock) {
+			val previous = this.editorProvider
+			if (previous === provider) return
+			fileChangeCallbacks.forEach { detachFileChangeCallback(previous, it) }
+			contentChangeCallbacks.forEach { detachContentChangeCallback(previous, it) }
+			this.editorProvider = provider
+			fileChangeCallbacks.forEach { attachFileChangeCallback(provider, it) }
+			contentChangeCallbacks.forEach { attachContentChangeCallback(provider, it) }
 		}
 	}
 
+	private fun attachFileChangeCallback(
+		provider: IdeEditorServiceImpl.EditorProvider?,
+		callback: (File?) -> Unit,
+	) {
+		provider ?: return
+		runCatching { provider.addFileChangeCallback(callback) }
+			.onFailure { logger.error("Failed to attach file-change callback to editor provider", it) }
+	}
+
+	private fun detachFileChangeCallback(
+		provider: IdeEditorServiceImpl.EditorProvider?,
+		callback: (File?) -> Unit,
+	) {
+		provider ?: return
+		runCatching { provider.removeFileChangeCallback(callback) }
+			.onFailure { logger.error("Failed to detach file-change callback from editor provider", it) }
+	}
+
+	private fun attachContentChangeCallback(
+		provider: IdeEditorServiceImpl.EditorProvider?,
+		callback: (String, Int, Int, String) -> Unit,
+	) {
+		provider ?: return
+		runCatching { provider.addContentChangeCallback(callback) }
+			.onFailure { logger.error("Failed to attach content-change callback to editor provider", it) }
+	}
+
+	private fun detachContentChangeCallback(
+		provider: IdeEditorServiceImpl.EditorProvider?,
+		callback: (String, Int, Int, String) -> Unit,
+	) {
+		provider ?: return
+		runCatching { provider.removeContentChangeCallback(callback) }
+			.onFailure { logger.error("Failed to detach content-change callback from editor provider", it) }
+	}
+
 	/**
 	 * Save plugin enabled state to persistent storage
 	 */
@@ -1210,9 +1266,16 @@ class PluginManager private constructor(
 					val prefsFile = File(context.filesDir, "plugin_states.properties")
 					if (prefsFile.exists()) {
 						val properties = java.util.Properties()
-						properties.load(prefsFile.inputStream())
+						prefsFile.inputStream().use { input ->
+							properties.load(input)
+						}
+
 						properties.remove(pluginId)
-						properties.store(prefsFile.outputStream(), "Plugin states")
+
+						prefsFile.outputStream().use { output ->
+							properties.store(output, "Plugin enabled/disabled states")
+						}
+
 						logger.debug("Removed plugin state: $pluginId")
 					}
 				}
@@ -1270,7 +1333,7 @@ class PluginManager private constructor(
 			pluginId,
 			"UI",
 		) {
-			IdeUIServiceImpl(activityProvider)
+			IdeUIServiceImpl(delegatingActivityProvider)
 		}
 
 		registerServiceWithErrorHandling(
@@ -1299,7 +1362,7 @@ class PluginManager private constructor(
 			pluginId,
 			"tooltip",
 		) {
-			IdeTooltipServiceImpl(context, pluginId, activityProvider)
+			IdeTooltipServiceImpl(context, pluginId, delegatingActivityProvider)
 		}
 
 		// Editor tab service for plugin editor tab integration
@@ -1309,7 +1372,7 @@ class PluginManager private constructor(
 			pluginId,
 			"editor_tab",
 		) {
-			IdeEditorTabServiceImpl(activityProvider)
+			IdeEditorTabServiceImpl(delegatingActivityProvider)
 		}
 
 		// File service for editing project files
@@ -1519,7 +1582,7 @@ class PluginManager private constructor(
 			pluginId,
 			"UI",
 		) {
-			IdeUIServiceImpl(activityProvider)
+			IdeUIServiceImpl(delegatingActivityProvider)
 		}
 
 		registerServiceWithErrorHandling(
@@ -1546,7 +1609,7 @@ class PluginManager private constructor(
 			pluginId,
 			"tooltip",
 		) {
-			IdeTooltipServiceImpl(context, pluginId, activityProvider)
+			IdeTooltipServiceImpl(context, pluginId, delegatingActivityProvider)
 		}
 
 		registerServiceWithErrorHandling(
@@ -1555,7 +1618,7 @@ class PluginManager private constructor(
 			pluginId,
 			"editor_tab",
 		) {
-			IdeEditorTabServiceImpl(activityProvider)
+			IdeEditorTabServiceImpl(delegatingActivityProvider)
 		}
 
 		registerServiceWithErrorHandling(