SD comments

Author: colin-grant-work

packages/ai-chat-ui/src/browser/ai-chat-ui-contribution.ts

@@ -17,7 +17,7 @@
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { CommandRegistry, Emitter, isOSX, nls, QuickInputButton, QuickInputService, QuickPickItem } from '@theia/core';
 import { Widget } from '@theia/core/lib/browser';
-import { AI_CHAT_NEW_CHAT_WINDOW_COMMAND, AI_CHAT_NEW_WITH_TASK_CONTEXT, AI_CHAT_SHOW_CHATS_COMMAND, AI_CHAT_SUMMARIZE_CURRENT_SESSION, ChatCommands } from './chat-view-commands';
+import { AI_CHAT_NEW_CHAT_WINDOW_COMMAND, AI_CHAT_NEW_WITH_TASK_CONTEXT, AI_CHAT_OPEN_SUMMARY_FOR_CURRENT_SESSION, AI_CHAT_SHOW_CHATS_COMMAND, AI_CHAT_SUMMARIZE_CURRENT_SESSION, ChatCommands } from './chat-view-commands';
 import { ChatAgentLocation, ChatService } from '@theia/ai-chat';
 import { AbstractViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
 import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
@@ -109,11 +109,29 @@ export class AIChatContribution extends AbstractViewContribution<ChatViewWidget>
             isVisible: widget => {
                 if (widget && !this.withWidget(widget)) { return false; }
                 const activeSession = this.chatService.getActiveSession();
-                return !!activeSession?.model.getRequests().length
-                    && activeSession?.model.location === ChatAgentLocation.Panel
+                return activeSession?.model.location === ChatAgentLocation.Panel
+                    && !this.taskContextService.hasSummary(activeSession);
+            },
+            isEnabled: widget => {
+                if (widget && !this.withWidget(widget)) { return false; }
+                const activeSession = this.chatService.getActiveSession();
+                return activeSession?.model.location === ChatAgentLocation.Panel
+                    && !activeSession.model.isEmpty()
                     && !this.taskContextService.hasSummary(activeSession);
             }
         });
+        registry.registerCommand(AI_CHAT_OPEN_SUMMARY_FOR_CURRENT_SESSION, {
+            execute: async () => {
+                const id = await this.summarizeActiveSession();
+                if (!id) { return; }
+                await this.taskContextService.open(id);
+            },
+            isVisible: widget => {
+                if (widget && !this.withWidget(widget)) { return false; }
+                const activeSession = this.chatService.getActiveSession();
+                return !!activeSession && this.taskContextService.hasSummary(activeSession);
+            }
+        });
         registry.registerCommand(AI_CHAT_SHOW_CHATS_COMMAND, {
             execute: () => this.selectChat(),
             isEnabled: widget => this.withWidget(widget) && this.chatService.getSessions().length > 1,
@@ -172,6 +190,11 @@ export class AIChatContribution extends AbstractViewContribution<ChatViewWidget>
             command: AI_CHAT_SUMMARIZE_CURRENT_SESSION.id,
             onDidChange: sessionSummarizibilityChangedEmitter.event
         });
+        registry.registerItem({
+            id: 'chat-view.' + AI_CHAT_OPEN_SUMMARY_FOR_CURRENT_SESSION.id,
+            command: AI_CHAT_OPEN_SUMMARY_FOR_CURRENT_SESSION.id,
+            onDidChange: sessionSummarizibilityChangedEmitter.event
+        });
     }
 
     protected async selectChat(sessionId?: string): Promise<void> {

packages/ai-chat-ui/src/browser/chat-input-agent-suggestions.tsx

@@ -57,7 +57,7 @@ interface ChatInputAgestSuggestionProps {
 
 const ChatInputAgentSuggestion: React.FC<ChatInputAgestSuggestionProps> = ({ suggestion, opener, handler }) => {
     const ref = useMarkdownRendering(getContent(suggestion), opener, true, handler);
-    return <div className="chat-agent-suggestion" style={ChatSuggestionCallback.containsCallbackLink(suggestion) ? undefined : { cursor: 'pointer' }} ref={ref} />;
+    return <div className="chat-agent-suggestion" style={(!handler || ChatSuggestionCallback.containsCallbackLink(suggestion)) ? undefined : { cursor: 'pointer' }} ref={ref} />;
 };
 
 class ChatSuggestionClickHandler implements DeclaredEventsEventListenerObject {

packages/ai-chat-ui/src/browser/chat-input-widget.tsx

@@ -13,7 +13,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-import { ChangeSet, ChatAgent, ChatChangeEvent, ChatModel, ChatRequestModel, ChatSuggestion } from '@theia/ai-chat';
+import { ChangeSet, ChatAgent, ChatChangeEvent, ChatModel, ChatRequestModel, ChatService, ChatSuggestion } from '@theia/ai-chat';
 import { Disposable, DisposableCollection, InMemoryResources, URI, nls } from '@theia/core';
 import { ContextMenuRenderer, LabelProvider, Message, OpenerService, ReactWidget } from '@theia/core/lib/browser';
 import { Deferred } from '@theia/core/lib/common/promise-util';
@@ -79,6 +79,9 @@ export class AIChatInputWidget extends ReactWidget {
     @inject(OpenerService)
     protected readonly openerService: OpenerService;
 
+    @inject(ChatService)
+    protected readonly chatService: ChatService;
+
     protected editorRef: MonacoEditor | undefined = undefined;
     protected readonly editorReady = new Deferred<void>();
 
@@ -104,10 +107,6 @@ export class AIChatInputWidget extends ReactWidget {
     set onDeleteChangeSetElement(deleteChangeSetElement: DeleteChangeSetElement) {
         this._onDeleteChangeSetElement = deleteChangeSetElement;
     }
-    private _onOpenContextELement: OpenContextElement;
-    set onOpenContextElement(opener: OpenContextElement) {
-        this._onOpenContextELement = opener;
-    }
 
     private _initialValue?: string;
     set initialValue(value: string | undefined) {
@@ -166,7 +165,7 @@ export class AIChatInputWidget extends ReactWidget {
                 onAddContextElement={this.addContextElement.bind(this)}
                 onDeleteContextElement={this.deleteContextElement.bind(this)}
                 context={this.getContext()}
-                onOpenContextElement={this._onOpenContextELement.bind(this)}
+                onOpenContextElement={this.openContextElement.bind(this)}
                 chatModel={this._chatModel}
                 pinnedAgent={this._pinnedAgent}
                 editorProvider={this.editorProvider}
@@ -225,6 +224,13 @@ export class AIChatInputWidget extends ReactWidget {
         });
     }
 
+
+    protected async openContextElement(request: AIVariableResolutionRequest): Promise<void> {
+        const session = this.chatService.getSessions().find(candidate => candidate.model.id === this._chatModel.id);
+        const context = { session };
+        await this.variableService.open(request, context);
+    }
+
     public setEnabled(enabled: boolean): void {
         this.isEnabled = enabled;
         this.update();

packages/ai-chat-ui/src/browser/chat-view-commands.ts

@@ -51,9 +51,16 @@ export const AI_CHAT_NEW_WITH_TASK_CONTEXT: Command = {
 
 export const AI_CHAT_SUMMARIZE_CURRENT_SESSION: Command = {
     id: 'ai-chat-summary-current-session',
-    iconClass: codicon('note')
+    iconClass: codicon('go-to-editing-session'),
+    label: 'Summarize Current Session'
 };
 
+export const AI_CHAT_OPEN_SUMMARY_FOR_CURRENT_SESSION: Command = {
+    id: 'ai-chat-open-current-session-summary',
+    iconClass: codicon('note'),
+    label: 'Open Current Session Summary'
+}
+
 export const AI_CHAT_SHOW_CHATS_COMMAND: Command = {
     id: 'ai-chat-ui.show-chats',
     iconClass: codicon('history')

packages/ai-chat-ui/src/browser/chat-view-widget.tsx

@@ -106,7 +106,6 @@ export class ChatViewWidget extends BaseWidget implements ExtractableWidget, Sta
         this.inputWidget.pinnedAgent = this.chatSession.pinnedAgent;
         this.inputWidget.onDeleteChangeSet = this.onDeleteChangeSet.bind(this);
         this.inputWidget.onDeleteChangeSetElement = this.onDeleteChangeSetElement.bind(this);
-        this.inputWidget.onOpenContextElement = this.onOpenContextElement.bind(this);
         this.treeWidget.trackChatModel(this.chatSession.model);
 
         this.initListeners();
@@ -215,11 +214,6 @@ export class ChatViewWidget extends BaseWidget implements ExtractableWidget, Sta
         this.chatService.deleteChangeSetElement(sessionId, index);
     }
 
-    protected async onOpenContextElement(request: AIVariableResolutionRequest): Promise<void> {
-        const context = { session: this.chatSession };
-        await this.variableService.open(request, context);
-    }
-
     lock(): void {
         this.state = { ...deepClone(this.state), locked: true };
     }

packages/ai-chat/src/browser/task-context-service.ts

@@ -19,7 +19,7 @@ import { MaybePromise, ProgressService, URI, generateUuid, Event } from '@theia/
 import { ChatAgent, ChatAgentLocation, ChatService, ChatSession, MutableChatModel, MutableChatRequestModel, ParsedChatRequestTextPart } from '../common';
 import { ChatSessionSummaryAgent } from '../common/chat-session-summary-agent';
 import { Deferred } from '@theia/core/lib/common/promise-util';
-import { PromptService } from '@theia/ai-core';
+import { AgentService, PromptService } from '@theia/ai-core';
 import { CHAT_SESSION_SUMMARY_PROMPT } from '../common/chat-session-summary-agent-prompt';
 
 export interface SummaryMetadata {
@@ -49,7 +49,7 @@ export class TaskContextService {
     protected pendingSummaries = new Map<string, Promise<Summary>>();
 
     @inject(ChatService) protected readonly chatService: ChatService;
-    @inject(ChatSessionSummaryAgent) protected readonly summaryAgent: ChatSessionSummaryAgent;
+    @inject(AgentService) protected readonly agentService: AgentService;
     @inject(PromptService) protected readonly promptService: PromptService;
     @inject(TaskContextStorageService) protected readonly storageService: TaskContextStorageService;
     @inject(ProgressService) protected readonly progressService: ProgressService;
@@ -104,7 +104,13 @@ export class TaskContextService {
         }
     }
 
-    protected async getLlmSummary(session: ChatSession, promptId: string = CHAT_SESSION_SUMMARY_PROMPT.id, agent: ChatAgent = this.summaryAgent): Promise<string> {
+    protected async getLlmSummary(session: ChatSession, promptId: string = CHAT_SESSION_SUMMARY_PROMPT.id, agent?: ChatAgent): Promise<string> {
+        agent = agent || this.agentService.getAgents().find<ChatAgent>((candidate): candidate is ChatAgent =>
+            'invoke' in candidate
+            && typeof candidate.invoke === 'function'
+            && candidate.id === ChatSessionSummaryAgent.ID
+        );
+        if (!agent) { throw new Error('Unable to identify agent for summary.'); }
         const model = new MutableChatModel(ChatAgentLocation.Panel);
         const prompt = await this.promptService.getPrompt(promptId || CHAT_SESSION_SUMMARY_PROMPT.id, undefined, { model: session.model });
         if (!prompt) { return ''; }

packages/ai-chat/src/common/chat-session-summary-agent.ts

@@ -38,4 +38,5 @@ export class ChatSessionSummaryAgent extends AbstractStreamParsingChatAgent impl
     override agentSpecificVariables = [];
     override functions = [];
     override locations = [];
+    override tags = [];
 }