refactor(model): derive selectable model source (#1575)

* refactor(model): derive selectable model source

* refactor(model): unify selection resolver (#1576)

* refactor(chat): split acp status bar state (#1578)

* refactor(model): unify selection resolver

* refactor(chat): extract acp status bar state

* perf(agent): refresh acp agents incrementally (#1579)

* fix(provider): gc removed model state (#1577)

* fix: address pr review feedback

---------

Co-authored-by: zerob13 <zerob13@gmail.com>

Author: zhangmo8

src/main/presenter/configPresenter/index.ts

@@ -508,6 +508,14 @@ export class ConfigPresenter implements IConfigPresenter {
       setModelStatus: this.modelStatusHelper.setModelStatus.bind(this.modelStatusHelper),
       deleteModelStatus: this.modelStatusHelper.deleteModelStatus.bind(this.modelStatusHelper)
     })
+    this.providerHelper.setCleanupHooks({
+      deleteProviderModelStatuses: this.modelStatusHelper.deleteProviderModelStatuses.bind(
+        this.modelStatusHelper
+      ),
+      clearProviderModelStore: this.providerModelHelper.clearProviderModelStore.bind(
+        this.providerModelHelper
+      )
+    })
 
     // Initialize built-in ACP agents on first run or version upgrade
     // Initialize provider models directory
@@ -1989,15 +1997,15 @@ export class ConfigPresenter implements IConfigPresenter {
       error: null
     }
     this.getAgentRepositoryOrThrow().setAgentInstallState(registryAgent.id, installingState)
-    this.notifyAcpAgentsChanged()
+    this.notifyAcpAgentsChanged([registryAgent.id])
 
     try {
       const installedState = await this.acpLaunchSpecService.ensureRegistryAgentInstalled(
         registryAgent,
         currentState
       )
       this.getAgentRepositoryOrThrow().setAgentInstallState(registryAgent.id, installedState)
-      this.notifyAcpAgentsChanged()
+      this.handleAcpAgentsMutated([registryAgent.id])
       return installedState
     } catch (error) {
       const failedState: AcpAgentInstallState = {
@@ -2011,7 +2019,7 @@ export class ConfigPresenter implements IConfigPresenter {
         error: error instanceof Error ? error.message : String(error)
       }
       this.getAgentRepositoryOrThrow().setAgentInstallState(registryAgent.id, failedState)
-      this.notifyAcpAgentsChanged()
+      this.notifyAcpAgentsChanged([registryAgent.id])
       throw error
     }
   }
@@ -2030,7 +2038,7 @@ export class ConfigPresenter implements IConfigPresenter {
       error: null
     }
     this.getAgentRepositoryOrThrow().setAgentInstallState(registryAgent.id, repairingState)
-    this.notifyAcpAgentsChanged()
+    this.notifyAcpAgentsChanged([registryAgent.id])
 
     try {
       const installedState = await this.acpLaunchSpecService.ensureRegistryAgentInstalled(
@@ -2053,7 +2061,7 @@ export class ConfigPresenter implements IConfigPresenter {
         error: error instanceof Error ? error.message : String(error)
       }
       this.getAgentRepositoryOrThrow().setAgentInstallState(registryAgent.id, failedState)
-      this.notifyAcpAgentsChanged()
+      this.notifyAcpAgentsChanged([registryAgent.id])
       throw error
     }
   }
@@ -2301,7 +2309,7 @@ export class ConfigPresenter implements IConfigPresenter {
 
   private handleAcpAgentsMutated(agentIds?: string[]) {
     this.clearProviderModelStatusCache('acp')
-    this.notifyAcpAgentsChanged()
+    this.notifyAcpAgentsChanged(agentIds)
     this.refreshAcpProviderAgents(agentIds)
   }
 
@@ -2323,10 +2331,10 @@ export class ConfigPresenter implements IConfigPresenter {
     }
   }
 
-  private notifyAcpAgentsChanged() {
+  private notifyAcpAgentsChanged(agentIds?: string[]) {
     console.log('[ACP] notifyAcpAgentsChanged: sending MODEL_LIST_CHANGED event for provider "acp"')
     eventBus.send(CONFIG_EVENTS.MODEL_LIST_CHANGED, SendTarget.ALL_WINDOWS, 'acp')
-    eventBus.send(CONFIG_EVENTS.AGENTS_CHANGED, SendTarget.ALL_WINDOWS)
+    eventBus.send(CONFIG_EVENTS.AGENTS_CHANGED, SendTarget.ALL_WINDOWS, { agentIds })
     eventBus.sendToRenderer(SESSION_EVENTS.LIST_UPDATED, SendTarget.ALL_WINDOWS)
   }
 

src/main/presenter/configPresenter/modelStatusHelper.ts

@@ -27,7 +27,7 @@ export class ModelStatusHelper {
     return `${MODEL_STATUS_KEY_PREFIX}${providerId}_${formattedModelId}`
   }
 
-  private buildStatusSnapshot(): Map<string, boolean> | null {
+  private getRawStoreEntries(): [string, unknown][] | null {
     const candidate = this.store as ElectronStore<any> & {
       store?: Record<string, unknown>
     }
@@ -36,8 +36,17 @@ export class ModelStatusHelper {
       return null
     }
 
+    return Object.entries(rawStore)
+  }
+
+  private buildStatusSnapshot(): Map<string, boolean> | null {
+    const rawEntries = this.getRawStoreEntries()
+    if (!rawEntries) {
+      return null
+    }
+
     const snapshot = new Map<string, boolean>()
-    for (const [key, value] of Object.entries(rawStore)) {
+    for (const [key, value] of rawEntries) {
       if (!key.startsWith(MODEL_STATUS_KEY_PREFIX)) {
         continue
       }
@@ -231,4 +240,39 @@ export class ModelStatusHelper {
     this.cache.delete(statusKey)
     this.statusSnapshot?.delete(statusKey)
   }
+
+  deleteProviderModelStatuses(providerId: string): void {
+    const prefix = `${MODEL_STATUS_KEY_PREFIX}${providerId}_`
+    const keysToDelete = new Set<string>()
+
+    const rawEntries = this.getRawStoreEntries()
+    if (rawEntries) {
+      for (const [key] of rawEntries) {
+        if (key.startsWith(prefix)) {
+          keysToDelete.add(key)
+        }
+      }
+    }
+
+    const statusSnapshot = this.getStatusSnapshot()
+    if (statusSnapshot) {
+      for (const key of statusSnapshot.keys()) {
+        if (key.startsWith(prefix)) {
+          keysToDelete.add(key)
+        }
+      }
+    }
+
+    for (const key of this.cache.keys()) {
+      if (key.startsWith(prefix)) {
+        keysToDelete.add(key)
+      }
+    }
+
+    for (const key of keysToDelete) {
+      this.store.delete(key)
+    }
+
+    this.clearProviderModelStatusCache(providerId)
+  }
 }

src/main/presenter/configPresenter/providerHelper.ts

@@ -18,17 +18,27 @@ interface ProviderHelperOptions {
   defaultProviders: LLM_PROVIDER[]
 }
 
+interface ProviderCleanupHooks {
+  deleteProviderModelStatuses?: (providerId: string) => void
+  clearProviderModelStore?: (providerId: string) => void
+}
+
 export class ProviderHelper {
   private readonly store: ElectronStore<any>
   private readonly setSetting: SetSetting
   private readonly defaultProviders: LLM_PROVIDER[]
+  private cleanupHooks: ProviderCleanupHooks = {}
 
   constructor(options: ProviderHelperOptions) {
     this.store = options.store
     this.setSetting = options.setSetting
     this.defaultProviders = options.defaultProviders
   }
 
+  setCleanupHooks(hooks: ProviderCleanupHooks): void {
+    this.cleanupHooks = hooks
+  }
+
   getProviders(): LLM_PROVIDER[] {
     const providers = this.store.get(PROVIDERS_STORE_KEY) as LLM_PROVIDER[] | undefined
 
@@ -196,6 +206,18 @@ export class ProviderHelper {
     const filteredProviders = providers.filter((p) => p.id !== providerId)
     this.setSetting<LLM_PROVIDER[]>(PROVIDERS_STORE_KEY, filteredProviders)
 
+    try {
+      this.cleanupHooks.deleteProviderModelStatuses?.(providerId)
+    } catch (error) {
+      console.error(`[Config] Failed to delete model statuses for ${providerId}:`, error)
+    }
+
+    try {
+      this.cleanupHooks.clearProviderModelStore?.(providerId)
+    } catch (error) {
+      console.error(`[Config] Failed to clear provider model store for ${providerId}:`, error)
+    }
+
     const change: ProviderChange = {
       operation: 'remove',
       providerId,

src/main/presenter/configPresenter/providerModelHelper.ts

@@ -238,6 +238,22 @@ export class ProviderModelHelper {
     this.invalidateProviderModelsCache(providerId)
   }
 
+  clearProviderModelStore(providerId: string): void {
+    const store = this.getProviderModelStore(providerId) as ElectronStore<IModelStore> & {
+      clear?: () => void
+    }
+
+    if (typeof store.clear === 'function') {
+      store.clear()
+    } else {
+      store.set('models', [])
+      store.set('custom_models', [])
+    }
+
+    this.stores.delete(providerId)
+    this.invalidateProviderModelsCache(providerId)
+  }
+
   addCustomModel(providerId: string, model: MODEL_META): void {
     const models = this.getCustomModels(providerId)
     const existingIndex = models.findIndex((m) => m.id === model.id)

src/main/routes/config/configRouteHandler.ts

@@ -24,6 +24,7 @@ import {
   configGetSystemPromptsRoute,
   configGetThemeRoute,
   configGetVoiceAiConfigRoute,
+  configListAgentsRoute,
   configListCustomPromptsRoute,
   configResetDefaultSystemPromptRoute,
   configResetShortcutKeysRoute,
@@ -320,6 +321,25 @@ export async function dispatchConfigRoute(
       return configGetAcpStateRoute.output.parse(await readAcpState(configPresenter))
     }
 
+    case configListAgentsRoute.name: {
+      const input = configListAgentsRoute.input.parse(rawInput)
+      const idSet = input.ids ? new Set(input.ids) : null
+      const agents = (await configPresenter.listAgents()).filter((agent) => {
+        const agentType = agent.agentType ?? agent.type
+        if (input.agentType && agentType !== input.agentType) {
+          return false
+        }
+
+        if (idSet && !idSet.has(agent.id)) {
+          return false
+        }
+
+        return true
+      })
+
+      return configListAgentsRoute.output.parse({ agents })
+    }
+
     case configResolveDeepChatAgentConfigRoute.name: {
       const input = configResolveDeepChatAgentConfigRoute.input.parse(rawInput)
       return configResolveDeepChatAgentConfigRoute.output.parse({

src/main/routes/legacyTypedEventBridge.ts

@@ -53,10 +53,11 @@ export function setupLegacyTypedEventBridge(deps: {
     })
   }
 
-  const publishAgentsChanged = async () => {
+  const publishAgentsChanged = async (agentIds?: string[]) => {
     const state = await readAcpState(configPresenter)
     publishDeepchatEvent('config.agents.changed', {
       ...state,
+      agentIds,
       version: Date.now()
     })
   }
@@ -173,8 +174,8 @@ export function setupLegacyTypedEventBridge(deps: {
     })
   })
 
-  eventBus.on(CONFIG_EVENTS.AGENTS_CHANGED, () => {
-    void publishAgentsChanged()
+  eventBus.on(CONFIG_EVENTS.AGENTS_CHANGED, (payload?: { agentIds?: string[] }) => {
+    void publishAgentsChanged(payload?.agentIds)
     publishDeepchatEvent('models.changed', {
       reason: 'agents',
       providerId: 'acp',

src/renderer/api/ConfigClient.ts

@@ -35,6 +35,7 @@ import {
   configGetSystemPromptsRoute,
   configGetThemeRoute,
   configGetVoiceAiConfigRoute,
+  configListAgentsRoute,
   configListCustomPromptsRoute,
   configResetDefaultSystemPromptRoute,
   configResetShortcutKeysRoute,
@@ -66,6 +67,7 @@ import type {
   ShortcutKeySetting,
   SystemPrompt
 } from '@shared/presenter'
+import type { Agent } from '@shared/types/agent-interface'
 import { getDeepchatBridge } from './core'
 import { createSettingsClient } from './SettingsClient'
 
@@ -313,6 +315,14 @@ export function createConfigClient(bridge: DeepchatBridge = getDeepchatBridge())
 
   type AcpAgents = Awaited<ReturnType<typeof getAcpAgents>>
 
+  async function listAgents(input?: {
+    agentType?: 'deepchat' | 'acp'
+    ids?: string[]
+  }): Promise<Agent[]> {
+    const result = await bridge.invoke(configListAgentsRoute.name, input ?? {})
+    return result.agents
+  }
+
   async function resolveDeepChatAgentConfig(agentId: string) {
     const result = await bridge.invoke(configResolveDeepChatAgentConfigRoute.name, {
       agentId
@@ -450,7 +460,12 @@ export function createConfigClient(bridge: DeepchatBridge = getDeepchatBridge())
   }
 
   function onAgentsChanged(
-    listener: (payload: { enabled: boolean; agents: AcpAgents; version: number }) => void
+    listener: (payload: {
+      enabled: boolean
+      agents: AcpAgents
+      agentIds?: string[]
+      version: number
+    }) => void
   ) {
     return bridge.on(configAgentsChangedEvent.name, listener)
   }
@@ -524,6 +539,7 @@ export function createConfigClient(bridge: DeepchatBridge = getDeepchatBridge())
     setDefaultSystemPromptId,
     getAcpEnabled,
     getAcpAgents,
+    listAgents,
     resolveDeepChatAgentConfig,
     getAgentMcpSelections,
     getAcpSharedMcpSelections,