@theia/ai-chat 1.60.2 → 1.61.0

package/src/browser/task-context-variable.ts

@@ -0,0 +1,28 @@
+// *****************************************************************************
+// Copyright (C) 2025 EclipseSource GmbH and others.
+//
+// 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 { AIVariable } from '@theia/ai-core';
+import { codiconArray } from '@theia/core/lib/browser';
+
+export const TASK_CONTEXT_VARIABLE: AIVariable = {
+    id: 'taskContext',
+    description: 'Provides context information for a task, e.g. the plan for completing a task or a summary of a previous sessions',
+    name: 'taskContext',
+    label: 'Task Context',
+    iconClasses: codiconArray('clippy'),
+    isContextVariable: true,
+    args: [{ name: 'context-id', description: 'The ID of the task context to retrieve, or a chat session to summarize.' }]
+};

package/src/common/chat-agents.ts

@@ -22,11 +22,13 @@
 import {
     AgentSpecificVariables,
     AIVariableContext,
+    AIVariableResolutionRequest,
     CommunicationRecordingService,
     getTextOfResponse,
     isTextResponsePart,
     isThinkingResponsePart,
     isToolCallResponsePart,
+    isUsageResponsePart,
     LanguageModel,
     LanguageModelMessage,
     LanguageModelRequirement,
@@ -58,9 +60,9 @@ import {
     MarkdownChatResponseContentImpl,
     ToolCallChatResponseContentImpl,
     ChatRequestModel,
-    ThinkingChatResponseContentImpl
+    ThinkingChatResponseContentImpl,
 } from './chat-model';
-import { findFirstMatch, parseContents } from './parse-contents';
+import { parseContents } from './parse-contents';
 import { DefaultResponseContentFactory, ResponseContentMatcher, ResponseContentMatcherProvider } from './response-content-matcher';
 import { ChatToolRequest, ChatToolRequestService } from './chat-tool-request-service';
 
@@ -90,6 +92,10 @@ export namespace ChatSessionContext {
     export function is(candidate: unknown): candidate is ChatSessionContext {
         return typeof candidate === 'object' && !!candidate && 'model' in candidate;
     }
+
+    export function getVariables(context: ChatSessionContext): readonly AIVariableResolutionRequest[] {
+        return context.request?.context.variables.map(AIVariableResolutionRequest.fromResolved) ?? context.model.context.getVariables();
+    }
 }
 
 /**
@@ -389,28 +395,35 @@ export abstract class AbstractStreamParsingChatAgent extends AbstractChatAgent {
     }
 
     protected async addStreamResponse(languageModelResponse: LanguageModelStreamResponse, request: MutableChatRequestModel): Promise<void> {
-        for await (const token of languageModelResponse.stream) {
-            const newContents = this.parse(token, request);
-            if (isArray(newContents)) {
-                request.response.response.addContents(newContents);
-            } else {
-                request.response.response.addContent(newContents);
-            }
+        let completeTextBuffer = '';
+        let startIndex = Math.max(0, request.response.response.content.length - 1);
 
-            const lastContent = request.response.response.content.pop();
-            if (lastContent === undefined) {
-                return;
-            }
-            const text = lastContent.asString?.();
-            if (text === undefined) {
-                return;
-            }
-
-            const result: ChatResponseContent[] = findFirstMatch(this.contentMatchers, text) ? this.parseContents(text, request) : [];
-            if (result.length > 0) {
-                request.response.response.addContents(result);
+        for await (const token of languageModelResponse.stream) {
+            const newContent = this.parse(token, request);
+
+            if (!(isTextResponsePart(token) && token.content)) {
+                // For non-text tokens (like tool calls), add them directly
+                if (isArray(newContent)) {
+                    request.response.response.addContents(newContent);
+                } else {
+                    request.response.response.addContent(newContent);
+                }
+                // And reset the marker index and the text buffer as we skip matching across non-text tokens
+                startIndex = request.response.response.content.length - 1;
+                completeTextBuffer = '';
             } else {
-                request.response.response.addContent(lastContent);
+                // parse the entire text so far (since beginning of the stream or last non-text token)
+                // and replace the entire content with the currently parsed content parts
+                completeTextBuffer += token.content;
+
+                const parsedContents = this.parseContents(completeTextBuffer, request);
+                const contentBeforeMarker = startIndex > 0
+                    ? request.response.response.content.slice(0, startIndex)
+                    : [];
+
+                request.response.response.clearContent();
+                request.response.response.addContents(contentBeforeMarker);
+                request.response.response.addContents(parsedContents);
             }
         }
     }
@@ -435,6 +448,9 @@ export abstract class AbstractStreamParsingChatAgent extends AbstractChatAgent {
         if (isThinkingResponsePart(token)) {
             return new ThinkingChatResponseContentImpl(token.thought, token.signature);
         }
+        if (isUsageResponsePart(token)) {
+            return [];
+        }
         return this.defaultContentFactory.create('', request);
     }