Skip to content

ADFA-6279 | Show connected capabilities as tags under chat input #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jatezzz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ADFA-6279 | Show connected capabilities as tags under chat input #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions plugins/AI-Agent-Gemini/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
android:name="plugin.author"
android:value="App Dev for All" />

<!-- 26.36: the first release to ship KeystoreSecretStore in plugin-api, which this
plugin's SecureApiKeyStore builds on. ADFA-5269 landed after 26.35 was tagged, so
26.35 would name a release that cannot run this plugin. Do not lower it. -->
<!-- 26.41: the first release whose plugin-api carries the capability-tag contract;
this backend reports getActiveModelName() and notifyBackendChanged() (ADFA-6278).
Do not lower it. -->
<meta-data
android:name="plugin.min_ide_version"
android:value="26.39" />
android:value="26.41" />

<meta-data
android:name="plugin.max_ide_version"
Expand Down
8 changes: 7 additions & 1 deletion ...mini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/backend/GeminiBackend.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private const val TAG = "$LOG_PREFIX.AgentTrace"
class GeminiBackend(
private val context: PluginContext
) : HistoryCapableBackend, CancellableBackend, ConfigurableBackend, ToolCallingBackend,
EmbeddingBackend {
EmbeddingBackend, ActiveModelReportingBackend {

private val scope = CoroutineScope(Dispatchers.IO)

Expand Down Expand Up @@ -324,6 +324,12 @@ class GeminiBackend(

override fun getName(): String = "Gemini API"

/**
* The chat model requests go to, for the Agent's backend tag. Read from preferences like every
* request, so it is never stale; the plugin reports a change through `notifyBackendChanged`.
*/
override fun getActiveModelName(): String = getModelName()

/**
* Written for a large cloud model; see [GeminiSystemPrompt] for why the wording belongs here
* rather than with the caller.
Expand Down
107 changes: 14 additions & 93 deletions ...Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/plugin/GeminiPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ package com.itsaky.androidide.plugins.aiagentgemini.plugin

import com.itsaky.androidide.plugins.IPlugin
import com.itsaky.androidide.plugins.PluginContext
import com.itsaky.androidide.plugins.PluginLifecycleListener
import com.itsaky.androidide.plugins.ai.LlmBackendRegistration
import com.itsaky.androidide.plugins.aiagentgemini.backend.GeminiBackend
import com.itsaky.androidide.plugins.aiagentgemini.preferences.GeminiPreferences
import com.itsaky.androidide.plugins.extensions.DocumentationExtension
import com.itsaky.androidide.plugins.extensions.PluginTooltipButton
import com.itsaky.androidide.plugins.extensions.PluginTooltipEntry
import com.itsaky.androidide.plugins.services.LlmInferenceService
import com.itsaky.androidide.plugins.services.SharedServices

/**
* Registers the Google Gemini API backend with AI Core's inference router.
Expand All @@ -22,22 +20,15 @@ class GeminiPlugin : IPlugin, DocumentationExtension {

private lateinit var context: PluginContext

/**
* Volatile because [activate] writes it on the loading thread while the host may deliver
* `onPluginActivated` on another: a plain field lets [registerBackend] read null and give up
* without scheduling a retry, leaving the selector permanently empty.
*/
/** The live backend, from [activate] until [deactivate] releases it. */
@Volatile private var backend: GeminiBackend? = null

/** True once [backend] is registered with the router, so re-registration is idempotent. */
@Volatile private var registered = false
/** Keeps [backend] registered with AI Core across its restarts, and reports setting changes. */
private lateinit var registration: LlmBackendRegistration

companion object {
const val PLUGIN_ID = "com.itsaky.androidide.plugins.aiagentgemini"

/** Provider of [LlmInferenceService]; this plugin is useless without it. */
private const val AI_CORE_PLUGIN_ID = "com.itsaky.androidide.plugins.aicore"

/**
* The whole-plugin entry, and the only one carrying the Tier-3 guide button. Anchored to
* the key status line on this backend's settings pane — the one element this plugin always
Expand All @@ -57,6 +48,9 @@ class GeminiPlugin : IPlugin, DocumentationExtension {
const val TOOLTIP_TAG_SETTINGS_GEMINI_EMBEDDING_MODEL = "ai_gemini_embedding_model"
const val TOOLTIP_TAG_SETTINGS_GET_KEY = "ai_gemini_get_free_key"

/** The settings that change what [GeminiBackend.isAvailable] or its model name answers. */
private val WATCHED_KEYS = setOf(GeminiPreferences.KEY_API_KEY, GeminiPreferences.KEY_MODEL)

@Volatile
private var pluginContext: PluginContext? = null

Expand All @@ -73,31 +67,16 @@ class GeminiPlugin : IPlugin, DocumentationExtension {
fun getBackend(): GeminiBackend? = activeBackend
}

/**
* Re-registers when AI Core activates. Plugins load in parallel with no ordering, so
* [activate] may run before AI Core has published its service; this closes that race
* instead of polling for it.
*/
private val aiCoreLifecycle = object : PluginLifecycleListener {
override fun onPluginActivated(pluginId: String) {
if (pluginId == AI_CORE_PLUGIN_ID) registerBackend()
}

override fun onPluginDeactivated(pluginId: String) {
// The router went away and took the registration with it; allow a fresh one.
if (pluginId == AI_CORE_PLUGIN_ID) registered = false
}

override fun onPluginUninstalled(pluginId: String) {
if (pluginId == AI_CORE_PLUGIN_ID) registered = false
}
}

override fun initialize(context: PluginContext): Boolean {
return try {
this.context = context
// Published for the settings pane, which the hosting screen constructs directly.
pluginContext = context
registration = LlmBackendRegistration(
context = context,
preferences = { GeminiPreferences.of(context) },
watchedKeys = WATCHED_KEYS,
)
context.logger.info("GeminiPlugin: Plugin initialized successfully")
true
} catch (e: Exception) {
Expand All @@ -123,15 +102,7 @@ class GeminiPlugin : IPlugin, DocumentationExtension {

// Decrypt the key off-thread now, so a main-thread isAvailable() can't say "no key".
gemini.warmKeyCache()

// Listen first, then try: a listener added after a successful attempt would still be
// needed for a later AI Core restart, and one added before costs nothing.
context.addPluginLifecycleListener(aiCoreLifecycle)
if (!registerBackend()) {
context.logger.info(
"GeminiPlugin: AI Core is not active yet; will register when it activates"
)
}
registration.start(gemini)

true
} catch (e: Exception) {
Expand All @@ -140,57 +111,10 @@ class GeminiPlugin : IPlugin, DocumentationExtension {
}
}

/**
* Registers the Gemini backend with AI Core's router, if the router is reachable.
*
* @return true when the backend is registered (now or already), false when AI Core is absent
*/
private fun registerBackend(): Boolean {
if (registered) return true
val gemini = backend ?: return false

val service = resolveInferenceService()
if (service == null) {
context.logger.debug("GeminiPlugin: LlmInferenceService not available yet")
return false
}

return try {
service.registerBackend(gemini)
registered = true
context.logger.info("GeminiPlugin: Registered '${gemini.getId()}' backend with AI Core")
true
} catch (e: Exception) {
context.logger.error("GeminiPlugin: Could not register the Gemini backend", e)
false
}
}

/**
* Resolves AI Core's router, preferring the process-global registry and falling back to the
* provider-scoped lookup so a registry cleared by another plugin is not fatal.
*/
private fun resolveInferenceService(): LlmInferenceService? = try {
SharedServices.get(LlmInferenceService::class.java)
?: context.getPluginService(AI_CORE_PLUGIN_ID, LlmInferenceService::class.java)
} catch (e: Exception) {
context.logger.warn("GeminiPlugin: Could not resolve LlmInferenceService: ${e.message}")
null
}

override fun deactivate(): Boolean {
context.logger.info("GeminiPlugin: Deactivating plugin")

return try {
context.removePluginLifecycleListener(aiCoreLifecycle)

val gemini = backend
if (gemini != null && registered) {
resolveInferenceService()?.unregisterBackend(gemini.getId())
registered = false
context.logger.info("GeminiPlugin: Unregistered '${gemini.getId()}' backend")
}

// A disabled plugin must not keep the decrypted key on the host heap.
releaseBackend()

Expand All @@ -206,18 +130,15 @@ class GeminiPlugin : IPlugin, DocumentationExtension {
* backend. Idempotent, so a [deactivate] followed by [dispose] closes nothing twice.
*/
private fun releaseBackend() {
if (::registration.isInitialized) registration.stop()
backend?.close()
backend = null
activeBackend = null
registered = false
}

override fun dispose() {
context.logger.info("GeminiPlugin: Disposing plugin")

// deactivate() removes this too; a dispose without one would leave the host holding this.
runCatching { context.removePluginLifecycleListener(aiCoreLifecycle) }

releaseBackend()
pluginContext = null
context.logger.info("GeminiPlugin: Released Gemini backend")
Expand Down
7 changes: 4 additions & 3 deletions plugins/AI-Agent-Local/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@
android:name="plugin.author"
android:value="App Dev for All" />

<!-- 26.32: this plugin calls getPluginService() and the plugin lifecycle listener API,
and pairs with ai-core, which requires the same release. -->
<!-- 26.41: the first release whose plugin-api carries the capability-tag contract;
this backend reports getActiveModelName() and notifyBackendChanged() (ADFA-6278).
Do not lower it. -->
<meta-data
android:name="plugin.min_ide_version"
android:value="26.32" />
android:value="26.41" />

<meta-data
android:name="plugin.max_ide_version"
Expand Down
17 changes: 16 additions & 1 deletion ...cal/src/main/kotlin/com/itsaky/androidide/plugins/aiagentlocal/backend/LocalLlmBackend.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class LocalLlmBackend(
private val modelSourceOverride: NativeModelSource? = null,
private val engineOverride: ModelResidencyEngine? = null,
private val watcherOverride: ModelSourceWatcher? = null,
) : HistoryCapableBackend, CancellableBackend, ConfigurableBackend {
) : HistoryCapableBackend, CancellableBackend, ConfigurableBackend, ActiveModelReportingBackend {

companion object {
/**
Expand Down Expand Up @@ -197,6 +197,21 @@ class LocalLlmBackend(

override fun getName(): String = "Local LLM"

/**
* The configured model's name, for the Agent's backend tag: the one the settings pane saved at
* selection, else a plain file path's own name. A `content://` reference with no saved name
* says nothing readable, so it reports none rather than a document id.
*/
override fun getActiveModelName(): String? {
val prefs = LocalLlmPreferences.of(context)
prefs.getString(LocalLlmPreferences.KEY_MODEL_NAME, null)?.trim()
?.takeIf { it.isNotEmpty() }?.let { return it }
val path = prefs.getString(LocalLlmPreferences.KEY_MODEL_PATH, null)?.trim()
?.takeIf { it.isNotEmpty() } ?: return null
if (path.startsWith("content:")) return null
return File(path).name.takeIf { it.isNotEmpty() }
}

/**
* Whether the user's current selection names this backend.
*
Expand Down
Loading
Loading