chore: align with ai-features preferences

eclipse-theia · Sep 20, 2024 · 574940b · 574940b
1 parent c029ec3
commit 574940b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/packages/ai-core/src/browser/ai-settings-service.ts b/packages/ai-core/src/browser/ai-settings-service.ts
@@ -22,7 +22,7 @@ import { AISettings, AISettingsService, AgentSettings } from '../common';
 @injectable()
 export class AISettingsServiceImpl implements AISettingsService {
     @inject(PreferenceService) protected preferenceService: PreferenceService;
-    static readonly PREFERENCE_NAME = 'ai.settings';
+    static readonly PREFERENCE_NAME = 'ai-features.agentSettings';
 
     protected toDispose = new DisposableCollection();
 
@@ -31,21 +31,20 @@ export class AISettingsServiceImpl implements AISettingsService {
 
     async updateAgentSettings(agent: string, agentSettings: Partial<AgentSettings>): Promise<void> {
         const settings = await this.getSettings();
-        const newAgentSettings = { ...settings.agents[agent], ...agentSettings };
-        settings.agents[agent] = newAgentSettings;
+        const newAgentSettings = { ...settings[agent], ...agentSettings };
+        settings[agent] = newAgentSettings;
         this.preferenceService.set(AISettingsServiceImpl.PREFERENCE_NAME, settings, PreferenceScope.User);
         this.onDidChangeEmitter.fire();
     }
 
     async getAgentSettings(agent: string): Promise<AgentSettings | undefined> {
         const settings = await this.getSettings();
-        return settings.agents[agent];
+        return settings[agent];
     }
 
     async getSettings(): Promise<AISettings> {
         await this.preferenceService.ready;
         const pref = this.preferenceService.inspect<AISettings & JSONObject>(AISettingsServiceImpl.PREFERENCE_NAME);
-        return pref?.value ? pref.value : { agents: {} };
+        return pref?.value ? pref.value : {};
     }
-
 }
diff --git a/packages/ai-core/src/common/agent-service.ts b/packages/ai-core/src/common/agent-service.ts
@@ -66,8 +66,7 @@ export class AgentServiceImpl implements AgentService {
     @postConstruct()
     protected init(): void {
         this.aiSettingsService?.getSettings().then(settings => {
-            const allAgentsSettings = settings.agents;
-            Object.entries(allAgentsSettings).forEach(([agentId, agentSettings]) => {
+            Object.entries(settings).forEach(([agentId, agentSettings]) => {
                 if (agentSettings.enable === false) {
                     this.disabledAgents.add(agentId);
                 }

diff --git a/packages/ai-core/src/common/settings-service.ts b/packages/ai-core/src/common/settings-service.ts
@@ -17,16 +17,16 @@ import { Event } from '@theia/core';
 import { LanguageModelRequirement } from './language-model';
 
 export const AISettingsService = Symbol('AISettingsService');
+/**
+ * Service to store and retrieve settings on a per-agent basis.
+ */
 export interface AISettingsService {
     updateAgentSettings(agent: string, agentSettings: Partial<AgentSettings>): Promise<void>;
     getAgentSettings(agent: string): Promise<AgentSettings | undefined>;
     getSettings(): Promise<AISettings>;
     onDidChange: Event<void>;
 }
-export interface AISettings {
-    agents: Record<string, AgentSettings>
-}
-
+export type AISettings = Record<string, AgentSettings>;
 export interface AgentSettings {
     languageModelRequirements: LanguageModelRequirement[];
     enable: boolean;