@theia/ai-core 1.55.1 → 1.57.0-next.112

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@theia/ai-core",
-  "version": "1.55.1",
+  "version": "1.57.0-next.112+f4778c273",
   "description": "Theia - AI Core",
   "dependencies": {
-    "@theia/core": "1.55.1",
-    "@theia/editor": "1.55.1",
-    "@theia/filesystem": "1.55.1",
-    "@theia/monaco": "1.55.1",
-    "@theia/monaco-editor-core": "1.83.101",
-    "@theia/output": "1.55.1",
-    "@theia/variable-resolver": "1.55.1",
-    "@theia/workspace": "1.55.1",
+    "@theia/core": "1.57.0-next.112+f4778c273",
+    "@theia/editor": "1.57.0-next.112+f4778c273",
+    "@theia/filesystem": "1.57.0-next.112+f4778c273",
+    "@theia/monaco": "1.57.0-next.112+f4778c273",
+    "@theia/monaco-editor-core": "1.96.302",
+    "@theia/output": "1.57.0-next.112+f4778c273",
+    "@theia/variable-resolver": "1.57.0-next.112+f4778c273",
+    "@theia/workspace": "1.57.0-next.112+f4778c273",
     "@types/js-yaml": "^4.0.9",
     "js-yaml": "^4.1.0",
     "minimatch": "^5.1.0",
@@ -52,10 +52,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.55.1"
+    "@theia/ext-scripts": "1.58.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "be4713a778be16ba831af63a6fbd43b2301e882d"
+  "gitHead": "f4778c2737bb75613f0e1f99da8996bad91f6e17"
 }

package/src/browser/ai-configuration/agent-configuration-widget.tsx

@@ -23,8 +23,8 @@ import {
     AIVariableService,
     LanguageModel,
     LanguageModelRegistry,
+    matchVariablesRegEx,
     PROMPT_FUNCTION_REGEX,
-    PROMPT_VARIABLE_REGEX,
     PromptCustomizationService,
     PromptService,
 } from '../../common';
@@ -112,7 +112,7 @@ export class AIAgentConfigurationWidget extends ReactWidget {
     }
 
     private renderAgentName(agent: Agent): React.ReactNode {
-        const tagsSuffix = agent.tags?.length ? <span>{agent.tags.map(tag => <span className='agent-tag'>{tag}</span>)}</span> : '';
+        const tagsSuffix = agent.tags?.length ? <span>{agent.tags.map(tag => <span key={tag} className='agent-tag'>{tag}</span>)}</span> : '';
         return <span>{agent.name} {tagsSuffix}</span>;
     }
 
@@ -137,14 +137,31 @@ export class AIAgentConfigurationWidget extends ReactWidget {
                     Enable Agent
                 </label>
             </div>
-            <div className='ai-templates'>
-                {agent.promptTemplates?.map(template =>
-                    <TemplateRenderer
-                        key={agent?.id + '.' + template.id}
-                        agentId={agent.id}
-                        template={template}
-                        promptCustomizationService={this.promptCustomizationService} />)}
+            <div className="settings-section-subcategory-title ai-settings-section-subcategory-title">
+                Prompt Templates
             </div>
+            <div className="ai-templates">
+                {(() => {
+                    const defaultTemplates = agent.promptTemplates?.filter(template => !template.variantOf) || [];
+                    return defaultTemplates.length > 0 ? (
+                        defaultTemplates.map(template => (
+                            <div key={agent.id + '.' + template.id}>
+                                <TemplateRenderer
+                                    key={agent.id + '.' + template.id}
+                                    agentId={agent.id}
+                                    template={template}
+                                    promptService={this.promptService}
+                                    aiSettingsService={this.aiSettingsService}
+                                    promptCustomizationService={this.promptCustomizationService}
+                                />
+                            </div>
+                        ))
+                    ) : (
+                        <div>No default template available</div>
+                    );
+                })()}
+            </div>
+
             <div className='ai-lm-requirements'>
                 <LanguageModelRenderer
                     agent={agent}
@@ -180,9 +197,9 @@ export class AIAgentConfigurationWidget extends ReactWidget {
         const promptTemplates = agent.promptTemplates;
         const result: ParsedPrompt = { functions: [], globalVariables: [], agentSpecificVariables: [] };
         promptTemplates.forEach(template => {
-            const storedPrompt = this.promptService.getRawPrompt(template.id);
+            const storedPrompt = this.promptService.getUnresolvedPrompt(template.id);
             const prompt = storedPrompt?.template ?? template.template;
-            const variableMatches = [...prompt.matchAll(PROMPT_VARIABLE_REGEX)];
+            const variableMatches = matchVariablesRegEx(prompt);
 
             variableMatches.forEach(match => {
                 const variableId = match[1];

package/src/browser/ai-configuration/language-model-renderer.tsx

@@ -99,7 +99,7 @@ export const LanguageModelRenderer: React.FC<LanguageModelSettingsProps> = (
                             onChange={event => onSelectedModelChange(requirements.purpose, event)}
                         >
                             <option value=""></option>
-                            {languageModels?.map(model => (
+                            {languageModels?.sort((a, b) => (a.name ?? a.id).localeCompare(b.name ?? b.id)).map(model => (
                                 <option key={model.id} value={model.id}>{model.name ?? model.id}</option>
                             ))}
                         </select>

package/src/browser/ai-configuration/template-settings-renderer.tsx

@@ -14,26 +14,115 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 import * as React from '@theia/core/shared/react';
-import { PromptCustomizationService } from '../../common/prompt-service';
-import { PromptTemplate } from '../../common';
+import { PromptCustomizationService, PromptService } from '../../common/prompt-service';
+import { AISettingsService, PromptTemplate } from '../../common';
 
-export interface TemplateSettingProps {
+const DEFAULT_VARIANT = 'default';
+
+export interface TemplateRendererProps {
     agentId: string;
     template: PromptTemplate;
     promptCustomizationService: PromptCustomizationService;
+    promptService: PromptService;
+    aiSettingsService: AISettingsService;
 }
 
-export const TemplateRenderer: React.FC<TemplateSettingProps> = ({ agentId, template, promptCustomizationService }) => {
-    const openTemplate = React.useCallback(async () => {
-        promptCustomizationService.editTemplate(template.id, template.template);
-    }, [template, promptCustomizationService]);
-    const resetTemplate = React.useCallback(async () => {
-        promptCustomizationService.resetTemplate(template.id);
-    }, [promptCustomizationService, template]);
-
-    return <>
-        {template.id}
-        <button className='theia-button main' onClick={openTemplate}>Edit</button>
-        <button className='theia-button secondary' onClick={resetTemplate}>Reset</button>
-    </>;
+export const TemplateRenderer: React.FC<TemplateRendererProps> = ({
+    agentId,
+    template,
+    promptCustomizationService,
+    promptService,
+    aiSettingsService,
+}) => {
+    const variantIds = [DEFAULT_VARIANT, ...promptService.getVariantIds(template.id)];
+    const [selectedVariant, setSelectedVariant] = React.useState<string>(DEFAULT_VARIANT);
+
+    React.useEffect(() => {
+        (async () => {
+            const agentSettings = await aiSettingsService.getAgentSettings(agentId);
+            const currentVariant =
+                agentSettings?.selectedVariants?.[template.id] || DEFAULT_VARIANT;
+            setSelectedVariant(currentVariant);
+        })();
+    }, [template.id, aiSettingsService, agentId]);
+
+    const isInvalidVariant = !variantIds.includes(selectedVariant);
+
+    const handleVariantChange = async (event: React.ChangeEvent<HTMLSelectElement>) => {
+        const newVariant = event.target.value;
+        setSelectedVariant(newVariant);
+
+        const agentSettings = await aiSettingsService.getAgentSettings(agentId);
+        const selectedVariants = agentSettings?.selectedVariants || {};
+
+        const updatedVariants = { ...selectedVariants };
+        if (newVariant === DEFAULT_VARIANT) {
+            delete updatedVariants[template.id];
+        } else {
+            updatedVariants[template.id] = newVariant;
+        }
+
+        await aiSettingsService.updateAgentSettings(agentId, {
+            selectedVariants: updatedVariants,
+        });
+    };
+
+    const openTemplate = () => {
+        const templateId = selectedVariant === DEFAULT_VARIANT ? template.id : selectedVariant;
+        const selectedTemplate = promptService.getRawPrompt(templateId);
+        promptCustomizationService.editTemplate(templateId, selectedTemplate?.template || '');
+    };
+
+    const resetTemplate = () => {
+        const templateId = selectedVariant === DEFAULT_VARIANT ? template.id : selectedVariant;
+        promptCustomizationService.resetTemplate(templateId);
+    };
+
+    return (
+        <div className="template-renderer">
+            <div className="settings-section-title template-header">
+                <strong>{template.id}</strong>
+            </div>
+            <div className="template-controls">
+                {(variantIds.length > 1 || isInvalidVariant) && (
+                    <>
+                        <label htmlFor={`variant-selector-${template.id}`} className="template-select-label">
+                            Select Variant:
+                        </label>
+                        <select
+                            id={`variant-selector-${template.id}`}
+                            className={`theia-select template-variant-selector ${isInvalidVariant ? 'error' : ''}`}
+                            value={isInvalidVariant ? 'invalid' : selectedVariant}
+                            onChange={handleVariantChange}
+                        >
+                            {isInvalidVariant && (
+                                <option value="invalid" disabled>
+                                    The selected variant is no longer available
+                                </option>
+                            )}
+                            {variantIds.map(variantId => (
+                                <option key={variantId} value={variantId}>
+                                    {variantId}
+                                </option>
+                            ))}
+                        </select>
+                    </>
+                )}
+                <button
+                    className="theia-button main"
+                    onClick={openTemplate}
+                    disabled={isInvalidVariant}
+                >
+                    Edit
+                </button>
+                <button
+                    className="theia-button secondary"
+                    onClick={resetTemplate}
+                    disabled={isInvalidVariant}
+                >
+                    Reset
+                </button>
+            </div>
+        </div>
+    );
 };

package/src/browser/ai-core-preferences.ts

@@ -21,6 +21,7 @@ import { interfaces } from '@theia/core/shared/inversify';
 export const AI_CORE_PREFERENCES_TITLE = '✨ AI Features [Experimental]';
 export const PREFERENCE_NAME_ENABLE_EXPERIMENTAL = 'ai-features.AiEnable.enableAI';
 export const PREFERENCE_NAME_PROMPT_TEMPLATES = 'ai-features.promptTemplates.promptTemplatesFolder';
+export const PREFERENCE_NAME_REQUEST_SETTINGS = 'ai-features.modelSettings.requestSettings';
 
 export const aiCorePreferenceSchema: PreferenceSchema = {
     type: 'object',
@@ -55,13 +56,51 @@ export const aiCorePreferenceSchema: PreferenceSchema = {
                     canSelectMany: false
                 }
             },
-
+        },
+        [PREFERENCE_NAME_REQUEST_SETTINGS]: {
+            title: 'Custom Request Settings',
+            markdownDescription: 'Allows specifying custom request settings for multiple models.\n\
+            Each object represents the configuration for a specific model. The `modelId` field specifies the model ID, `requestSettings` defines model-specific settings.\n\
+            The `providerId` field is optional and allows you to apply the settings to a specific provider. If not set, the settings will be applied to all providers.\n\
+            Example providerIds: huggingface, openai, ollama, llamafile.\n\
+            Refer to [our documentation](https://theia-ide.org/docs/user_ai/#custom-request-settings) for more information.',
+            type: 'array',
+            items: {
+                type: 'object',
+                properties: {
+                    modelId: {
+                        type: 'string',
+                        description: 'The model id'
+                    },
+                    requestSettings: {
+                        type: 'object',
+                        additionalProperties: true,
+                        description: 'Settings for the specific model ID.',
+                    },
+                    providerId: {
+                        type: 'string',
+                        description: 'The (optional) provider id to apply the settings to. If not set, the settings will be applied to all providers.',
+                    },
+                },
+            },
+            default: [],
         }
     }
 };
 export interface AICoreConfiguration {
     [PREFERENCE_NAME_ENABLE_EXPERIMENTAL]: boolean | undefined;
     [PREFERENCE_NAME_PROMPT_TEMPLATES]: string | undefined;
+    [PREFERENCE_NAME_REQUEST_SETTINGS]: Array<{
+        modelId: string;
+        requestSettings?: { [key: string]: unknown };
+        providerId?: string;
+    }> | undefined;
+}
+
+export interface RequestSetting {
+    modelId: string;
+    requestSettings?: { [key: string]: unknown };
+    providerId?: string;
 }
 
 export const AICorePreferences = Symbol('AICorePreferences');

package/src/browser/frontend-language-model-registry.ts

@@ -61,6 +61,10 @@ export class LanguageModelDelegateClientImpl
         return this.receiver.toolCall(requestId, toolId, args_string);
     }
 
+    error(id: string, error: Error): void {
+        this.receiver.error(id, error);
+    }
+
     languageModelAdded(metadata: LanguageModelMetaData): void {
         this.receiver.languageModelAdded(metadata);
     }
@@ -74,6 +78,7 @@ interface StreamState {
     id: string;
     tokens: (LanguageModelStreamResponsePart | undefined)[];
     resolve?: (_: unknown) => void;
+    reject?: (_: unknown) => void;
 }
 
 @injectable()
@@ -249,8 +254,9 @@ export class FrontendLanguageModelRegistryImpl
                     yield token;
                 }
             } else {
-                await new Promise(resolve => {
+                await new Promise((resolve, reject) => {
                     state.resolve = resolve;
+                    state.reject = reject;
                 });
             }
         }
@@ -286,6 +292,19 @@ export class FrontendLanguageModelRegistryImpl
         throw new Error(`Could not find a tool for ${toolId}!`);
     }
 
+    // called by backend via the "delegate client" with the error to use for rejection
+    error(id: string, error: Error): void {
+        if (!this.streams.has(id)) {
+            const newStreamState = {
+                id,
+                tokens: [],
+            };
+            this.streams.set(id, newStreamState);
+        }
+        const streamState = this.streams.get(id)!;
+        streamState.reject?.(error);
+    }
+
     override async selectLanguageModels(request: LanguageModelSelector): Promise<LanguageModel[]> {
         await this.initialized;
         const userSettings = (await this.settingsService.getAgentSettings(request.agent))?.languageModelRequirements?.find(req => req.purpose === request.purpose);
@@ -347,7 +366,7 @@ const languageModelOutputHandler = (
                     'Sending request:'
                 );
                 const formattedRequest = formatJsonWithIndentation(args[0]);
-                formattedRequest.forEach(line => outputChannel.appendLine(line));
+                outputChannel.append(formattedRequest.join('\n'));
                 if (args[1]) {
                     args[1] = new Proxy(args[1], {
                         get<CK extends keyof CancellationToken>(

package/src/browser/frontend-prompt-customization-service.ts

@@ -116,6 +116,10 @@ export class FrontendPromptCustomizationServiceImpl implements PromptCustomizati
         }));
 
         this.onDidChangeCustomAgentsEmitter.fire();
+
+        if (!(await this.fileService.exists(templateURI))) {
+            return;
+        }
         const stat = await this.fileService.resolve(templateURI);
         if (stat.children === undefined) {
             return;
@@ -165,6 +169,10 @@ export class FrontendPromptCustomizationServiceImpl implements PromptCustomizati
         return this.templates.get(id);
     }
 
+    getCustomPromptTemplateIDs(): string[] {
+        return Array.from(this.templates.keys());
+    }
+
     async editTemplate(id: string, defaultContent?: string): Promise<void> {
         const editorUri = await this.getTemplateURI(id);
         if (! await this.fileService.exists(editorUri)) {

package/src/browser/prompttemplate-contribution.ts

@@ -14,15 +14,15 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { inject, injectable, named } from '@theia/core/shared/inversify';
+import { inject, injectable } from '@theia/core/shared/inversify';
 import { GrammarDefinition, GrammarDefinitionProvider, LanguageGrammarDefinitionContribution, TextmateRegistry } from '@theia/monaco/lib/browser/textmate';
 import * as monaco from '@theia/monaco-editor-core';
-import { Command, CommandContribution, CommandRegistry, ContributionProvider, MessageService } from '@theia/core';
+import { Command, CommandContribution, CommandRegistry, MessageService } from '@theia/core';
 import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 
 import { codicon, Widget } from '@theia/core/lib/browser';
 import { EditorWidget, ReplaceOperation } from '@theia/editor/lib/browser';
-import { PromptCustomizationService, PromptService, ToolProvider } from '../common';
+import { PromptCustomizationService, PromptService, ToolInvocationRegistry } from '../common';
 import { ProviderResult } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
 
 const PROMPT_TEMPLATE_LANGUAGE_ID = 'theia-ai-prompt-template';
@@ -56,9 +56,8 @@ export class PromptTemplateContribution implements LanguageGrammarDefinitionCont
     @inject(PromptCustomizationService)
     protected readonly customizationService: PromptCustomizationService;
 
-    @inject(ContributionProvider)
-    @named(ToolProvider)
-    private toolProviders: ContributionProvider<ToolProvider>;
+    @inject(ToolInvocationRegistry)
+    protected readonly toolInvocationRegistry: ToolInvocationRegistry;
 
     readonly config: monaco.languages.LanguageConfiguration =
         {
@@ -115,7 +114,7 @@ export class PromptTemplateContribution implements LanguageGrammarDefinitionCont
             model,
             position,
             '~{',
-            this.toolProviders.getContributions().map(provider => provider.getTool()),
+            this.toolInvocationRegistry.getAllFunctions(),
             monaco.languages.CompletionItemKind.Function,
             tool => tool.id,
             tool => tool.name,

package/src/browser/style/index.css

@@ -14,12 +14,44 @@
   margin-left: var(--theia-ui-padding);
 }
 
+.theia-settings-container .settings-section-subcategory-title.ai-settings-section-subcategory-title {
+  padding-left: 0;
+}
+
 .ai-templates {
-  display: grid;
-  /** Display content in 3 columns */
-  grid-template-columns: 1fr auto auto;
-  /** add a 3px gap between rows */
-  row-gap: 3px;
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+}
+
+.template-renderer {
+  display: flex;
+  flex-direction: column;
+  padding: 10px;
+}
+
+.template-header {
+  margin-bottom: 8px;
+}
+
+.template-controls {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.template-select-label {
+  margin-right: 5px;
+}
+
+.template-variant-selector {
+  min-width: 120px;
+}
+
+.template-variant-selector.error {
+  border-color: var(--theia-errorForeground);
+  background-color: var(--theia-errorBackground, rgba(255, 0, 0, 0.1));
+  color: var(--theia-errorForeground);
 }
 
 #ai-variable-configuration-container-widget,

package/src/common/agent-service.ts

@@ -99,7 +99,7 @@ export class AgentServiceImpl implements AgentService {
     registerAgent(agent: Agent): void {
         this._agents.push(agent);
         agent.promptTemplates.forEach(
-            template => this.promptService.storePrompt(template.id, template.template)
+            template => this.promptService.storePromptTemplate(template)
         );
         this.onDidChangeAgentsEmitter.fire();
     }

package/src/common/agent.ts

@@ -60,7 +60,7 @@ export interface Agent {
     readonly languageModelRequirements: LanguageModelRequirement[];
 
     /** A list of tags to filter agents and to display capabilities in the UI */
-    readonly tags?: String[];
+    readonly tags?: string[];
 
     /** The list of local variable identifiers this agent needs to clarify its context requirements. */
     readonly agentSpecificVariables: AgentSpecificVariables[];

package/src/common/communication-recording-service.ts

@@ -26,18 +26,22 @@ export interface CommunicationHistoryEntry {
     request?: string;
     response?: string;
     responseTime?: number;
+    systemMessage?: string;
     messages?: unknown[];
 }
 
 export type CommunicationRequestEntry = Omit<CommunicationHistoryEntry, 'response' | 'responseTime'>;
 export type CommunicationResponseEntry = Omit<CommunicationHistoryEntry, 'request'>;
 
+export type CommunicationRequestEntryParam = Omit<CommunicationRequestEntry, 'timestamp'> & Partial<Pick<CommunicationHistoryEntry, 'timestamp'>>;
+export type CommunicationResponseEntryParam = Omit<CommunicationResponseEntry, 'timestamp'> & Partial<Pick<CommunicationHistoryEntry, 'timestamp'>>;
+
 export const CommunicationRecordingService = Symbol('CommunicationRecordingService');
 export interface CommunicationRecordingService {
-    recordRequest(requestEntry: CommunicationRequestEntry): void;
+    recordRequest(requestEntry: CommunicationRequestEntryParam): void;
     readonly onDidRecordRequest: Event<CommunicationRequestEntry>;
 
-    recordResponse(responseEntry: CommunicationResponseEntry): void;
+    recordResponse(responseEntry: CommunicationResponseEntryParam): void;
     readonly onDidRecordResponse: Event<CommunicationResponseEntry>;
 
     getHistory(agentId: string): CommunicationHistory;

package/src/common/language-model-delegate.ts

@@ -21,6 +21,7 @@ export const LanguageModelDelegateClient = Symbol('LanguageModelDelegateClient')
 export interface LanguageModelDelegateClient {
     toolCall(requestId: string, toolId: string, args_string: string): Promise<unknown>;
     send(id: string, token: LanguageModelStreamResponsePart | undefined): void;
+    error(id: string, error: Error): void;
 }
 export const LanguageModelRegistryFrontendDelegate = Symbol('LanguageModelRegistryFrontendDelegate');
 export interface LanguageModelRegistryFrontendDelegate {

package/src/common/language-model.ts

@@ -32,13 +32,42 @@ export const isLanguageModelRequestMessage = (obj: unknown): obj is LanguageMode
         'query' in obj &&
         typeof (obj as { query: unknown }).query === 'string'
     );
+export type ToolRequestParametersProperties = Record<string, { type: string, [key: string]: unknown }>;
+export interface ToolRequestParameters {
+    type?: 'object';
+    properties: ToolRequestParametersProperties;
+    required?: string[];
+}
 export interface ToolRequest {
     id: string;
     name: string;
-    parameters?: { type?: 'object', properties: Record<string, { type: string, [key: string]: unknown }> };
+    parameters?: ToolRequestParameters
     description?: string;
-    handler: (arg_string: string) => Promise<unknown>;
+    handler: (arg_string: string, ctx?: unknown) => Promise<unknown>;
+    providerName?: string;
 }
+
+export namespace ToolRequest {
+    export function isToolRequestParametersProperties(obj: unknown): obj is ToolRequestParametersProperties {
+        if (!obj || typeof obj !== 'object') { return false; };
+
+        return Object.entries(obj).every(([key, value]) =>
+            typeof key === 'string' &&
+            value &&
+            typeof value === 'object' &&
+            'type' in value &&
+            typeof value.type === 'string' &&
+            Object.keys(value).every(k => typeof k === 'string')
+        );
+    }
+    export function isToolRequestParameters(obj: unknown): obj is ToolRequestParameters {
+        return !!obj && typeof obj === 'object' &&
+            (!('type' in obj) || obj.type === 'object') &&
+            'properties' in obj && isToolRequestParametersProperties(obj.properties) &&
+            (!('required' in obj) || (Array.isArray(obj.required) && obj.required.every(prop => typeof prop === 'string')));
+    }
+}
+
 export interface LanguageModelRequest {
     messages: LanguageModelRequestMessage[],
     tools?: ToolRequest[];
@@ -107,6 +136,11 @@ export interface LanguageModelMetaData {
     readonly family?: string;
     readonly maxInputTokens?: number;
     readonly maxOutputTokens?: number;
+    /**
+     * Default request settings for the language model. These settings can be set by a user preferences.
+     * Settings in a request will override these default settings.
+     */
+    readonly defaultRequestSettings?: { [key: string]: unknown };
 }
 
 export namespace LanguageModelMetaData {

package/src/common/prompt-service-util.ts

@@ -14,8 +14,18 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-/** Should match the one from VariableResolverService. The format is `{{variableName:arg}}`. */
-export const PROMPT_VARIABLE_REGEX = /\{\{\s*(.*?)\s*\}\}/g;
+/** Should match the one from VariableResolverService. The format is `{{variableName:arg}}`. We allow {{}} and {{{}}} but no mixtures */
+export const PROMPT_VARIABLE_TWO_BRACES_REGEX = /(?<!\{)\{\{\s*([^{}]+?)\s*\}\}(?!\})/g;
+export const PROMPT_VARIABLE_THREE_BRACES_REGEX = /(?<!\{)\{\{\{\s*([^{}]+?)\s*\}\}\}(?!\})/g;
+export function matchVariablesRegEx(template: string): RegExpMatchArray[] {
+    const twoBraceMatches = [...template.matchAll(PROMPT_VARIABLE_TWO_BRACES_REGEX)];
+    const threeBraceMatches = [...template.matchAll(PROMPT_VARIABLE_THREE_BRACES_REGEX)];
+    return twoBraceMatches.concat(threeBraceMatches);
+}
 
 /** Match function/tool references in the prompt. The format is `~{functionId}`. */
 export const PROMPT_FUNCTION_REGEX = /\~\{\s*(.*?)\s*\}/g;
+
+export function matchFunctionsRegEx(template: string): RegExpMatchArray[] {
+    return [...template.matchAll(PROMPT_FUNCTION_REGEX)];
+}