rebase on top of 15146

Author: eneufeld

package-lock.json

@@ -33,8 +33,8 @@ import {
     HorizontalLayoutPartRenderer,
     InsertCodeAtCursorButtonAction,
     MarkdownPartRenderer,
-    TextPartRenderer,
     ToolCallPartRenderer,
+    ThinkingPartRenderer,
 } from './chat-response-renderer';
 import {
     GitHubSelectionResolver,
@@ -80,14 +80,14 @@ export default new ContainerModule((bind, _unbind, _isBound, rebind) => {
 
     bind(ContextVariablePicker).toSelf().inSingletonScope();
 
-    bind(ChatResponsePartRenderer).to(TextPartRenderer).inSingletonScope();
     bind(ChatResponsePartRenderer).to(HorizontalLayoutPartRenderer).inSingletonScope();
     bind(ChatResponsePartRenderer).to(ErrorPartRenderer).inSingletonScope();
     bind(ChatResponsePartRenderer).to(MarkdownPartRenderer).inSingletonScope();
     bind(ChatResponsePartRenderer).to(CodePartRenderer).inSingletonScope();
     bind(ChatResponsePartRenderer).to(CommandPartRenderer).inSingletonScope();
     bind(ChatResponsePartRenderer).to(ToolCallPartRenderer).inSingletonScope();
     bind(ChatResponsePartRenderer).to(ErrorPartRenderer).inSingletonScope();
+    bind(ChatResponsePartRenderer).to(ThinkingPartRenderer).inSingletonScope();
     bind(ChatResponsePartRenderer).to(QuestionPartRenderer).inSingletonScope();
     [CommandContribution, MenuContribution].forEach(serviceIdentifier =>
         bind(serviceIdentifier).to(ChatViewMenuContribution).inSingletonScope()

packages/ai-chat-ui/src/browser/ai-chat-ui-frontend-module.ts

@@ -21,3 +21,4 @@ export * from './horizontal-layout-part-renderer';
 export * from './markdown-part-renderer';
 export * from './text-part-renderer';
 export * from './toolcall-part-renderer';
+export * from './thinking-part-renderer';

packages/ai-chat-ui/src/browser/chat-response-renderer/index.ts

@@ -0,0 +1,45 @@
+// *****************************************************************************
+// 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 { ChatResponsePartRenderer } from '../chat-response-part-renderer';
+import { injectable } from '@theia/core/shared/inversify';
+import { ChatResponseContent, ThinkingChatResponseContent } from '@theia/ai-chat/lib/common';
+import { ReactNode } from '@theia/core/shared/react';
+import { nls } from '@theia/core/lib/common/nls';
+import * as React from '@theia/core/shared/react';
+
+@injectable()
+export class ThinkingPartRenderer implements ChatResponsePartRenderer<ThinkingChatResponseContent> {
+
+    canHandle(response: ChatResponseContent): number {
+        if (ThinkingChatResponseContent.is(response)) {
+            return 10;
+        }
+        return -1;
+    }
+
+    render(response: ThinkingChatResponseContent): ReactNode {
+        return (
+            <div className='theia-thinking'>
+                <details>
+                    <summary>{nls.localize('theia/ai/chat-ui/thinking-part-renderer/thinking', 'Thinking')}</summary>
+                    <pre>{response.content}</pre>
+                    <pre>{response.signature}</pre>
+                </details>
+            </div>
+        );
+    }
+}

packages/ai-chat-ui/src/browser/chat-response-renderer/thinking-part-renderer.tsx

@@ -316,7 +316,7 @@ export abstract class AbstractChatAgent implements ChatAgent {
                 sessionId: request.session.id,
                 requestId: request.id,
                 response: request.response.response.content.flatMap(c =>
-                    ({ type: 'text', actor: 'ai', query: c.asDisplayString?.() ?? c.asString?.() ?? JSON.stringify(c) }))
+                    c.toLanguageModelMessage?.() ?? ({ type: 'text', actor: 'ai', text: c.asDisplayString?.() ?? c.asString?.() ?? JSON.stringify(c) }))
             }
         );
         return request.response.complete();

packages/ai-chat/src/common/chat-agents.ts

@@ -143,7 +143,7 @@ export class CodeCompletionAgentImpl implements CodeCompletionAgent {
                 agentId: this.id,
                 sessionId,
                 requestId,
-                response: [{ actor: 'ai', query: completionText, type: 'text' }]
+                response: [{ actor: 'ai', text: completionText, type: 'text' }]
             });
 
             const postProcessedCompletionText = this.postProcessor.postProcess(completionText);

packages/ai-code-completion/src/browser/code-completion-agent.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { Event } from '@theia/core';
-import { LanguageModelRequestMessage } from './language-model';
+import { LanguageModelMessage } from './language-model';
 
 export type CommunicationHistory = CommunicationHistoryEntry[];
 
@@ -27,8 +27,8 @@ export interface CommunicationHistoryEntryBase {
 }
 
 export interface CommunicationHistoryEntry extends CommunicationHistoryEntryBase {
-    request?: LanguageModelRequestMessage[];
-    response?: LanguageModelRequestMessage[];
+    request?: LanguageModelMessage[];
+    response?: LanguageModelMessage[];
     responseTime?: number;
 }
 

packages/ai-core/src/common/communication-recording-service.ts

@@ -17,47 +17,47 @@ import { ILogger } from '@theia/core';
 import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
 import { DefaultCommunicationRecordingService } from './communication-recording-service';
 import { expect } from 'chai';
-import { LanguageModelRequestMessage } from '@theia/ai-core';
+import { TextMessage } from '@theia/ai-core';
 
 describe('DefaultCommunicationRecordingService', () => {
 
     it('records history', () => {
         const service = new DefaultCommunicationRecordingService();
         (service as unknown as { logger: ILogger }).logger = new MockLogger();
-        service.recordRequest({ agentId: 'agent', requestId: '1', sessionId: '1', timestamp: 100, request: [{ type: 'text', actor: 'user', query: 'dummy request' }] });
+        service.recordRequest({ agentId: 'agent', requestId: '1', sessionId: '1', timestamp: 100, request: [{ type: 'text', actor: 'user', text: 'dummy request' }] });
 
         const history1 = service.getHistory('agent');
-        expect((history1[0].request?.[0] as LanguageModelRequestMessage).query).to.eq('dummy request');
+        expect((history1[0].request?.[0] as TextMessage).text).to.eq('dummy request');
 
-        service.recordResponse({ agentId: 'agent', requestId: '1', sessionId: '1', timestamp: 200, response: [{ type: 'text', actor: 'ai', query: 'dummy response' }] });
+        service.recordResponse({ agentId: 'agent', requestId: '1', sessionId: '1', timestamp: 200, response: [{ type: 'text', actor: 'ai', text: 'dummy response' }] });
         const history2 = service.getHistory('agent');
-        expect((history2[0].request?.[0] as LanguageModelRequestMessage).query).to.eq('dummy request');
-        expect((history2[0].response?.[0] as LanguageModelRequestMessage).query).to.eq('dummy response');
+        expect((history2[0].request?.[0] as TextMessage).text).to.eq('dummy request');
+        expect((history2[0].response?.[0] as TextMessage).text).to.eq('dummy response');
     });
 
     it('returns session history', () => {
         const service = new DefaultCommunicationRecordingService();
         (service as unknown as { logger: ILogger }).logger = new MockLogger();
         // some requests and responses for session 1
-        service.recordRequest({ agentId: 'agent', requestId: '1', sessionId: '1', timestamp: 100, request: [{ type: 'text', actor: 'user', query: 'session 1 request 1' }] });
-        service.recordResponse({ agentId: 'agent', requestId: '1', sessionId: '1', timestamp: 200, response: [{ type: 'text', actor: 'ai', query: 'session 1 response 1' }] });
-        service.recordRequest({ agentId: 'agent2', requestId: '2', sessionId: '1', timestamp: 100, request: [{ type: 'text', actor: 'user', query: 'session 1 request 2' }] });
-        service.recordResponse({ agentId: 'agent2', requestId: '2', sessionId: '1', timestamp: 200, response: [{ type: 'text', actor: 'ai', query: 'session 1 response 2' }] });
+        service.recordRequest({ agentId: 'agent', requestId: '1', sessionId: '1', timestamp: 100, request: [{ type: 'text', actor: 'user', text: 'session 1 request 1' }] });
+        service.recordResponse({ agentId: 'agent', requestId: '1', sessionId: '1', timestamp: 200, response: [{ type: 'text', actor: 'ai', text: 'session 1 response 1' }] });
+        service.recordRequest({ agentId: 'agent2', requestId: '2', sessionId: '1', timestamp: 100, request: [{ type: 'text', actor: 'user', text: 'session 1 request 2' }] });
+        service.recordResponse({ agentId: 'agent2', requestId: '2', sessionId: '1', timestamp: 200, response: [{ type: 'text', actor: 'ai', text: 'session 1 response 2' }] });
         // some requests and responses for session 2
-        service.recordRequest({ agentId: 'agent', requestId: '3', sessionId: '2', timestamp: 100, request: [{ type: 'text', actor: 'user', query: 'different session request' }] });
-        service.recordResponse({ agentId: 'agent', requestId: '3', sessionId: '2', timestamp: 200, response: [{ type: 'text', actor: 'ai', query: 'different session request' }] });
+        service.recordRequest({ agentId: 'agent', requestId: '3', sessionId: '2', timestamp: 100, request: [{ type: 'text', actor: 'user', text: 'different session request' }] });
+        service.recordResponse({ agentId: 'agent', requestId: '3', sessionId: '2', timestamp: 200, response: [{ type: 'text', actor: 'ai', text: 'different session request' }] });
 
         const history1 = service.getSessionHistory('1');
         expect(history1.length).to.eq(2);
-        expect((history1[0].request?.[0] as LanguageModelRequestMessage).query).to.eq('session 1 request 1');
-        expect((history1[0].response?.[0] as LanguageModelRequestMessage).query).to.eq('session 1 response 1');
-        expect((history1[1].request?.[0] as LanguageModelRequestMessage).query).to.eq('session 1 request 2');
-        expect((history1[1].response?.[0] as LanguageModelRequestMessage).query).to.eq('session 1 response 2');
+        expect((history1[0].request?.[0] as TextMessage).text).to.eq('session 1 request 1');
+        expect((history1[0].response?.[0] as TextMessage).text).to.eq('session 1 response 1');
+        expect((history1[1].request?.[0] as TextMessage).text).to.eq('session 1 request 2');
+        expect((history1[1].response?.[0] as TextMessage).text).to.eq('session 1 response 2');
 
         const history2 = service.getSessionHistory('2');
         expect(history2.length).to.eq(1);
-        expect((history2[0].request?.[0] as LanguageModelRequestMessage).query).to.eq('different session request');
-        expect((history2[0].response?.[0] as LanguageModelRequestMessage).query).to.eq('different session request');
+        expect((history2[0].request?.[0] as TextMessage).text).to.eq('different session request');
+        expect((history2[0].response?.[0] as TextMessage).text).to.eq('different session request');
     });
 
 });

packages/ai-history/src/common/communication-recording-service.spec.ts

@@ -135,7 +135,12 @@ export class AIAgentConfigurationWidget extends ReactWidget {
         const functions = Array.from(new Set([...parsedPromptParts.functions, ...agent.functions]));
 
         return <div key={agent.id} style={{ display: 'flex', flexDirection: 'column', alignItems: 'flex-start' }}>
-            <div className='settings-section-title settings-section-category-title' style={{ paddingLeft: 0, paddingBottom: 10 }}>{this.renderAgentName(agent)}</div>
+            <div className='settings-section-title settings-section-category-title' style={{ paddingLeft: 0, paddingBottom: 10 }}>
+                {this.renderAgentName(agent)}
+                <pre style={{ fontSize: 'small', margin: 0 }}>
+                    Id: {agent.id}
+                </pre>
+            </div>
             <div style={{ paddingBottom: 10 }}>{agent.description}</div>
             <div style={{ paddingBottom: 10 }}>
                 <label>

packages/ai-ide/src/browser/ai-configuration/agent-configuration-widget.tsx

@@ -39,17 +39,4 @@ export class ArchitectAgent extends AbstractStreamParsingChatAgent {
     override functions = [GET_WORKSPACE_FILE_LIST_FUNCTION_ID, FILE_CONTENT_FUNCTION_ID];
     protected override systemPromptId: string | undefined = architectPromptTemplate.id;
 
-    protected override getLlmSettings(): { [key: string]: unknown; } | undefined {
-        const parentSettings = super.getLlmSettings() ?? {};
-        const currentSettings = {
-            max_tokens: 12238,
-            temperature: 1,
-            thinking: {
-                type: 'enabled',
-                budget_tokens: 8192
-            }
-        };
-        return { ...parentSettings, ...currentSettings };
-    }
-
 }