@theia/ai-core 1.63.0-next.52 → 1.63.0

package/src/common/prompt-service.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { Event, Emitter, URI } from '@theia/core';
+import { Event, Emitter, URI, ILogger } from '@theia/core';
 import { inject, injectable, optional, postConstruct } from '@theia/core/shared/inversify';
 import { AIVariableArg, AIVariableContext, AIVariableService, createAIResolveVariableCache, ResolvedAIVariable } from './variable-service';
 import { ToolInvocationRegistry } from './tool-invocation-registry';
@@ -363,12 +363,21 @@ export interface PromptService {
     getVariantIds(promptVariantSetId: string): string[];
 
     /**
-     * Gets the currently selected variant ID of the given set
+     * Gets the explicitly selected variant ID for a prompt fragment from settings.
+     * This returns only the variant that was explicitly selected in settings, not the default.
      * @param promptVariantSetId The prompt variant set id
-     * @returns The selected variant ID or the main ID if no variant is selected
+     * @returns The selected variant ID from settings, or undefined if none is selected
      */
     getSelectedVariantId(promptVariantSetId: string): Promise<string | undefined>;
 
+    /**
+     * Gets the effective variant ID that is guaranteed to be valid if one exists.
+     * This checks if the selected variant ID is valid, and falls back to the default variant if it isn't.
+     * @param promptVariantSetId The prompt variant set id
+     * @returns A valid variant ID if one exists, or undefined if no valid variant can be found
+     */
+    getEffectiveVariantId(promptVariantSetId: string): Promise<string | undefined>;
+
     /**
      * Gets the default variant ID of the given set
      * @param promptVariantSetId The prompt variant set id
@@ -408,6 +417,8 @@ export interface PromptService {
 
 @injectable()
 export class PromptServiceImpl implements PromptService {
+    @inject(ILogger)
+    protected readonly logger: ILogger;
     @inject(AISettingsService) @optional()
     protected readonly settingsService: AISettingsService | undefined;
 
@@ -505,17 +516,48 @@ export class PromptServiceImpl implements PromptService {
                 }
             }
         }
-        return this.getDefaultVariantId(fragmentId);
+        return undefined;
+    }
+
+    async getEffectiveVariantId(fragmentId: string): Promise<string | undefined> {
+        const selectedVariantId = await this.getSelectedVariantId(fragmentId);
+
+        // Check if the selected variant actually exists
+        if (selectedVariantId) {
+            const variantIds = this.getVariantIds(fragmentId);
+            if (!variantIds.includes(selectedVariantId)) {
+                this.logger.warn(`Selected variant '${selectedVariantId}' for prompt set '${fragmentId}' does not exist. Falling back to default variant.`);
+            } else {
+                return selectedVariantId;
+            }
+        }
+
+        // Fall back to default variant
+        const defaultVariantId = this.getDefaultVariantId(fragmentId);
+        if (defaultVariantId) {
+            const variantIds = this.getVariantIds(fragmentId);
+            if (!variantIds.includes(defaultVariantId)) {
+                this.logger.error(`Default variant '${defaultVariantId}' for prompt set '${fragmentId}' does not exist.`);
+                return undefined;
+            }
+            return defaultVariantId;
+        }
+
+        // No valid selected or default variant
+        if (this.getVariantIds(fragmentId).length > 0) {
+            this.logger.error(`No valid selected or default variant found for prompt set '${fragmentId}'.`);
+        }
+        return undefined;
     }
 
     protected async resolvePotentialSystemPrompt(promptFragmentId: string): Promise<PromptFragment | undefined> {
         if (this._promptVariantSetsMap.has(promptFragmentId)) {
-            // This is a systemPrompt find the selected variant
-            const selectedVariantId = await this.getSelectedVariantId(promptFragmentId);
-            if (selectedVariantId === undefined) {
+            // This is a systemPrompt find the effective variant
+            const effectiveVariantId = await this.getEffectiveVariantId(promptFragmentId);
+            if (effectiveVariantId === undefined) {
                 return undefined;
             }
-            return this.getPromptFragment(selectedVariantId);
+            return this.getPromptFragment(effectiveVariantId);
         }
         return this.getPromptFragment(promptFragmentId);
     }
@@ -725,8 +767,29 @@ export class PromptServiceImpl implements PromptService {
         this._onPromptsChangeEmitter.fire();
     }
 
-    getVariantIds(fragmentId: string): string[] {
-        return this._promptVariantSetsMap.get(fragmentId) || [];
+    getVariantIds(variantSetId: string): string[] {
+        const builtInVariants = this._promptVariantSetsMap.get(variantSetId) || [];
+
+        // Check for custom variants from customization service
+        if (this.customizationService) {
+            const allCustomizedIds = this.customizationService.getCustomizedPromptFragmentIds();
+            // Find customizations that start with the variant set ID
+            // These are considered variants of this variant set
+            // Only include IDs that are not the variant set ID itself, start with the variant set ID,
+            // and are not customizations of existing variants in this set
+            const customVariants = allCustomizedIds.filter(id =>
+                id !== variantSetId &&
+                id.startsWith(variantSetId) &&
+                !builtInVariants.includes(id)
+            );
+
+            if (customVariants.length > 0) {
+                // Combine built-in variants with custom variants, without modifying the internal state
+                return [...builtInVariants, ...customVariants];
+            }
+        }
+
+        return builtInVariants;
     }
 
     getDefaultVariantId(promptVariantSetId: string): string | undefined {
@@ -734,7 +797,31 @@ export class PromptServiceImpl implements PromptService {
     }
 
     getPromptVariantSets(): Map<string, string[]> {
-        return new Map(this._promptVariantSetsMap);
+        const result = new Map(this._promptVariantSetsMap);
+
+        // Check for custom variants from customization service
+        if (this.customizationService) {
+            const allCustomizedIds = this.customizationService.getCustomizedPromptFragmentIds();
+
+            // Add custom variants to existing variant sets
+            for (const [variantSetId, variants] of result.entries()) {
+                // Filter out customized fragments that are just customizations of existing variants
+                // so we don't treat them as separate variants themselves
+                // Only include IDs that are not the variant set ID itself, start with the variant set ID,
+                // and are not customizations of existing variants in this set
+                const customVariants = allCustomizedIds.filter(id =>
+                    id !== variantSetId &&
+                    id.startsWith(variantSetId) &&
+                    !variants.includes(id)
+                );
+
+                if (customVariants.length > 0) {
+                    // Create a new array without modifying the original
+                    result.set(variantSetId, [...variants, ...customVariants]);
+                }
+            }
+        }
+        return result;
     }
 
     addBuiltInPromptFragment(promptFragment: BasePromptFragment, promptVariantSetId?: string, isDefault: boolean = false): void {
@@ -861,7 +948,9 @@ export class PromptServiceImpl implements PromptService {
     }
 
     async resetToBuiltIn(fragmentId: string): Promise<void> {
-        if (this.customizationService) {
+        const builtIn = this._builtInFragments.find(b => b.id === fragmentId);
+        // Only reset this if it has a built-in, otherwise a delete would be the correct operation
+        if (this.customizationService && builtIn) {
             await this.customizationService.removeAllPromptFragmentCustomizations(fragmentId);
         }
     }

package/src/common/settings-service.ts

@@ -15,6 +15,7 @@
 // *****************************************************************************
 import { Event } from '@theia/core';
 import { LanguageModelRequirement } from './language-model';
+import { NotificationType } from './notification-types';
 
 export const AISettingsService = Symbol('AISettingsService');
 /**
@@ -35,4 +36,9 @@ export interface AgentSettings {
      * If a main template is not present in this mapping, it means the main template is used.
      */
     selectedVariants?: Record<string, string>;
+    /**
+     * Configuration for completion notifications when the agent finishes a task.
+     * If undefined, defaults to 'off'.
+     */
+    completionNotification?: NotificationType;
 }