@theia/ai-core 1.61.0 → 1.62.0

package/src/common/prompt-variable-contribution.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 import { CommandService, ILogger, nls } from '@theia/core';
-import { injectable, inject, optional } from '@theia/core/shared/inversify';
+import { injectable, inject } from '@theia/core/shared/inversify';
 import * as monaco from '@theia/monaco-editor-core';
 import {
     AIVariable,
@@ -26,7 +26,7 @@ import {
     AIVariableResolverWithVariableDependencies,
     AIVariableArg
 } from './variable-service';
-import { PromptCustomizationService, PromptService } from './prompt-service';
+import { isCustomizedPromptFragment, PromptService } from './prompt-service';
 import { PromptText } from './prompt-text';
 
 export const PROMPT_VARIABLE: AIVariable = {
@@ -47,9 +47,6 @@ export class PromptVariableContribution implements AIVariableContribution, AIVar
     @inject(PromptService)
     protected readonly promptService: PromptService;
 
-    @inject(PromptCustomizationService) @optional()
-    protected readonly promptCustomizationService: PromptCustomizationService;
-
     @inject(ILogger)
     protected logger: ILogger;
 
@@ -74,7 +71,7 @@ export class PromptVariableContribution implements AIVariableContribution, AIVar
         if (request.variable.name === PROMPT_VARIABLE.name) {
             const promptId = request.arg?.trim();
             if (promptId) {
-                const resolvedPrompt = await this.promptService.getPromptFragment(promptId, undefined, context, resolveDependency);
+                const resolvedPrompt = await this.promptService.getResolvedPromptFragmentWithoutFunctions(promptId, undefined, context, resolveDependency);
                 if (resolvedPrompt) {
                     return {
                         variable: request.variable,
@@ -121,26 +118,24 @@ export class PromptVariableContribution implements AIVariableContribution, AIVar
 
         const range = new monaco.Range(position.lineNumber, triggerCharIndex + 2, position.lineNumber, position.column);
 
-        const customPromptIds = this.promptCustomizationService?.getCustomPromptTemplateIDs() ?? [];
-        const builtinPromptIds = Object.keys(this.promptService.getAllPrompts());
-
-        const customPromptCompletions = customPromptIds.map(promptId => ({
-            label: promptId,
-            kind: monaco.languages.CompletionItemKind.Enum,
-            insertText: promptId,
-            range,
-            detail: nls.localize('theia/ai/core/promptVariable/completions/detail/custom', 'Custom prompt template'),
-            sortText: `AAA${promptId}` // Sort before everything else including all built-in prompts
-        }));
-        const builtinPromptCompletions = builtinPromptIds.map(promptId => ({
-            label: promptId,
-            kind: monaco.languages.CompletionItemKind.Variable,
-            insertText: promptId,
-            range,
-            detail: nls.localize('theia/ai/core/promptVariable/completions/detail/builtin', 'Built-in prompt template'),
-            sortText: `AAB${promptId}` // Sort after all custom prompts but before others
-        }));
-
-        return [...customPromptCompletions, ...builtinPromptCompletions];
+        const activePrompts = this.promptService.getActivePromptFragments();
+        let builtinPromptCompletions: monaco.languages.CompletionItem[] | undefined = undefined;
+
+        if (activePrompts.length > 0) {
+            builtinPromptCompletions = [];
+            activePrompts.forEach(prompt => (builtinPromptCompletions!.push(
+                {
+                    label: prompt.id,
+                    kind: isCustomizedPromptFragment(prompt) ? monaco.languages.CompletionItemKind.Enum : monaco.languages.CompletionItemKind.Variable,
+                    insertText: prompt.id,
+                    range,
+                    detail: isCustomizedPromptFragment(prompt) ?
+                        nls.localize('theia/ai/core/promptVariable/completions/detail/custom', 'Customized prompt fragment') :
+                        nls.localize('theia/ai/core/promptVariable/completions/detail/builtin', 'Built-in prompt fragment'),
+                    sortText: `${prompt.id}`
+                })));
+        }
+
+        return builtinPromptCompletions;
     }
 }

package/lib/common/communication-recording-service.d.ts

@@ -1,30 +0,0 @@
-import { Event } from '@theia/core';
-import { LanguageModelMessage } from './language-model';
-export type CommunicationHistory = CommunicationHistoryEntry[];
-export interface CommunicationHistoryEntryBase {
-    agentId: string;
-    sessionId: string;
-    timestamp: number;
-    requestId: string;
-}
-export interface CommunicationHistoryEntry extends CommunicationHistoryEntryBase {
-    request?: LanguageModelMessage[];
-    response?: LanguageModelMessage[];
-    responseTime?: number;
-}
-export type CommunicationRequestEntry = Omit<CommunicationHistoryEntry, 'response' | 'responseTime'>;
-export type CommunicationResponseEntry = Omit<CommunicationHistoryEntry, 'request'>;
-export type CommunicationRequestEntryParam = Omit<CommunicationRequestEntry, 'timestamp'> & Partial<Pick<CommunicationRequestEntry, 'timestamp'>>;
-export type CommunicationResponseEntryParam = Omit<CommunicationResponseEntry, 'timestamp'> & Partial<Pick<CommunicationResponseEntry, 'timestamp'>>;
-export declare const CommunicationRecordingService: unique symbol;
-export interface CommunicationRecordingService {
-    recordRequest(requestEntry: CommunicationRequestEntryParam): void;
-    readonly onDidRecordRequest: Event<CommunicationRequestEntry>;
-    recordResponse(responseEntry: CommunicationResponseEntryParam): void;
-    readonly onDidRecordResponse: Event<CommunicationResponseEntry>;
-    getHistory(agentId: string): CommunicationHistory;
-    getSessionHistory(sessionId: string): CommunicationHistory;
-    clearHistory(): void;
-    readonly onStructuralChange: Event<void>;
-}
-//# sourceMappingURL=communication-recording-service.d.ts.map

package/lib/common/communication-recording-service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"communication-recording-service.d.ts","sourceRoot":"","sources":["../../src/common/communication-recording-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,MAAM,MAAM,oBAAoB,GAAG,yBAAyB,EAAE,CAAC;AAE/D,MAAM,WAAW,6BAA6B;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,yBAA0B,SAAQ,6BAA6B;IAC5E,OAAO,CAAC,EAAE,oBAAoB,EAAE,CAAC;IACjC,QAAQ,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAAC,yBAAyB,EAAE,UAAU,GAAG,cAAc,CAAC,CAAC;AACrG,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAAC,yBAAyB,EAAE,SAAS,CAAC,CAAC;AAEpF,MAAM,MAAM,8BAA8B,GAAG,IAAI,CAAC,yBAAyB,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,yBAAyB,EAAE,WAAW,CAAC,CAAC,CAAC;AAClJ,MAAM,MAAM,+BAA+B,GAAG,IAAI,CAAC,0BAA0B,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,0BAA0B,EAAE,WAAW,CAAC,CAAC,CAAC;AAErJ,eAAO,MAAM,6BAA6B,eAA0C,CAAC;AACrF,MAAM,WAAW,6BAA6B;IAC1C,aAAa,CAAC,YAAY,EAAE,8BAA8B,GAAG,IAAI,CAAC;IAClE,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAE9D,cAAc,CAAC,aAAa,EAAE,+BAA+B,GAAG,IAAI,CAAC;IACrE,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAEhE,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,oBAAoB,CAAC;IAElD,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,oBAAoB,CAAC;IAE3D,YAAY,IAAI,IAAI,CAAC;IACrB,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;CAC5C"}

package/lib/common/communication-recording-service.js

@@ -1,20 +0,0 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2024 EclipseSource GmbH.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommunicationRecordingService = void 0;
-exports.CommunicationRecordingService = Symbol('CommunicationRecordingService');
-//# sourceMappingURL=communication-recording-service.js.map

package/lib/common/communication-recording-service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"communication-recording-service.js","sourceRoot":"","sources":["../../src/common/communication-recording-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AA0BnE,QAAA,6BAA6B,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAC"}

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

@@ -1,55 +0,0 @@
-// *****************************************************************************
-// Copyright (C) 2024 EclipseSource GmbH.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { Event } from '@theia/core';
-import { LanguageModelMessage } from './language-model';
-
-export type CommunicationHistory = CommunicationHistoryEntry[];
-
-export interface CommunicationHistoryEntryBase {
-    agentId: string;
-    sessionId: string;
-    timestamp: number;
-    requestId: string;
-}
-
-export interface CommunicationHistoryEntry extends CommunicationHistoryEntryBase {
-    request?: LanguageModelMessage[];
-    response?: LanguageModelMessage[];
-    responseTime?: number;
-}
-
-export type CommunicationRequestEntry = Omit<CommunicationHistoryEntry, 'response' | 'responseTime'>;
-export type CommunicationResponseEntry = Omit<CommunicationHistoryEntry, 'request'>;
-
-export type CommunicationRequestEntryParam = Omit<CommunicationRequestEntry, 'timestamp'> & Partial<Pick<CommunicationRequestEntry, 'timestamp'>>;
-export type CommunicationResponseEntryParam = Omit<CommunicationResponseEntry, 'timestamp'> & Partial<Pick<CommunicationResponseEntry, 'timestamp'>>;
-
-export const CommunicationRecordingService = Symbol('CommunicationRecordingService');
-export interface CommunicationRecordingService {
-    recordRequest(requestEntry: CommunicationRequestEntryParam): void;
-    readonly onDidRecordRequest: Event<CommunicationRequestEntry>;
-
-    recordResponse(responseEntry: CommunicationResponseEntryParam): void;
-    readonly onDidRecordResponse: Event<CommunicationResponseEntry>;
-
-    getHistory(agentId: string): CommunicationHistory;
-
-    getSessionHistory(sessionId: string): CommunicationHistory;
-
-    clearHistory(): void;
-    readonly onStructuralChange: Event<void>;
-}