@theia/ai-chat-ui 1.65.0-next.55 → 1.65.0

package/lib/browser/chat-view-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-view-commands.d.ts","sourceRoot":"","sources":["../../src/browser/chat-view-commands.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAO,MAAM,aAAa,CAAC;AAG3C,yBAAiB,YAAY,CAAC;IAInB,MAAM,kBAAkB,SAIN,CAAC;IAEnB,MAAM,oBAAoB,SAIR,CAAC;IAEnB,MAAM,qBAAqB,SAIW,CAAC;IAEvC,MAAM,6BAA6B,EAAE,OAE3C,CAAC;IAEK,MAAM,0CAA0C,SAIvB,CAAC;IAE1B,MAAM,iCAAiC,SAKd,CAAC;IAE1B,MAAM,wCAAwC,SAKrB,CAAC;CACpC;AAED,eAAO,MAAM,+BAA+B,EAAE,OAG7C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,OAGxC,CAAC"}
+{"version":3,"file":"chat-view-commands.d.ts","sourceRoot":"","sources":["../../src/browser/chat-view-commands.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAO,MAAM,aAAa,CAAC;AAG3C,yBAAiB,YAAY,CAAC;IACnB,MAAM,aAAa,SAAS,CAAC;IAC7B,MAAM,iBAAiB,QAAmC,CAAC;IAE3D,MAAM,kBAAkB,SAKsB,CAAC;IAE/C,MAAM,oBAAoB,SAKsB,CAAC;IAEjD,MAAM,qBAAqB,SAKwB,CAAC;IAEpD,MAAM,6BAA6B,EAAE,OAE3C,CAAC;IAEK,MAAM,0CAA0C,SAIgB,CAAC;IAEjE,MAAM,iCAAiC,SAKqB,CAAC;IAE7D,MAAM,wCAAwC,SAKiB,CAAC;CAC1E;AAED,eAAO,MAAM,+BAA+B,SAK1C,CAAC;AAEH,eAAO,MAAM,0BAA0B,SAKrC,CAAC"}

package/lib/browser/chat-view-commands.js

@@ -20,50 +20,57 @@ const core_1 = require("@theia/core");
 const browser_1 = require("@theia/core/lib/browser");
 var ChatCommands;
 (function (ChatCommands) {
-    const CHAT_CATEGORY = 'Chat';
-    const CHAT_CATEGORY_KEY = core_1.nls.getDefaultKey(CHAT_CATEGORY);
+    ChatCommands.CHAT_CATEGORY = 'Chat';
+    ChatCommands.CHAT_CATEGORY_KEY = core_1.nls.getDefaultKey(ChatCommands.CHAT_CATEGORY);
     ChatCommands.SCROLL_LOCK_WIDGET = core_1.Command.toLocalizedCommand({
         id: 'chat:widget:lock',
-        category: CHAT_CATEGORY,
-        iconClass: (0, browser_1.codicon)('unlock')
-    }, '', CHAT_CATEGORY_KEY);
+        category: ChatCommands.CHAT_CATEGORY,
+        iconClass: (0, browser_1.codicon)('unlock'),
+        label: 'Lock Scroll'
+    }, 'theia/ai-chat-ui/scroll-lock', ChatCommands.CHAT_CATEGORY_KEY);
     ChatCommands.SCROLL_UNLOCK_WIDGET = core_1.Command.toLocalizedCommand({
         id: 'chat:widget:unlock',
-        category: CHAT_CATEGORY,
-        iconClass: (0, browser_1.codicon)('lock')
-    }, '', CHAT_CATEGORY_KEY);
+        category: ChatCommands.CHAT_CATEGORY,
+        iconClass: (0, browser_1.codicon)('lock'),
+        label: 'Unlock Scroll'
+    }, 'theia/ai-chat-ui/scroll-unlock', ChatCommands.CHAT_CATEGORY_KEY);
     ChatCommands.EDIT_SESSION_SETTINGS = core_1.Command.toLocalizedCommand({
         id: 'chat:widget:session-settings',
-        category: CHAT_CATEGORY,
-        iconClass: (0, browser_1.codicon)('bracket')
-    }, 'Set Session Settings', CHAT_CATEGORY_KEY);
+        category: ChatCommands.CHAT_CATEGORY,
+        iconClass: (0, browser_1.codicon)('bracket'),
+        label: 'Set Session Settings'
+    }, 'theia/ai-chat-ui/session-settings', ChatCommands.CHAT_CATEGORY_KEY);
     ChatCommands.AI_CHAT_NEW_WITH_TASK_CONTEXT = {
         id: 'ai-chat.new-with-task-context',
     };
     ChatCommands.AI_CHAT_INITIATE_SESSION_WITH_TASK_CONTEXT = core_1.Command.toLocalizedCommand({
         id: 'ai-chat.initiate-session-with-task-context',
         label: 'Task Context: Initiate Session',
-        category: CHAT_CATEGORY
-    }, undefined, CHAT_CATEGORY_KEY);
+        category: ChatCommands.CHAT_CATEGORY
+    }, 'theia/ai-chat-ui/initiate-session-task-context', ChatCommands.CHAT_CATEGORY_KEY);
     ChatCommands.AI_CHAT_SUMMARIZE_CURRENT_SESSION = core_1.Command.toLocalizedCommand({
         id: 'ai-chat-summary-current-session',
         iconClass: (0, browser_1.codicon)('go-to-editing-session'),
         label: 'Summarize Current Session',
-        category: CHAT_CATEGORY
-    }, undefined, CHAT_CATEGORY_KEY);
+        category: ChatCommands.CHAT_CATEGORY
+    }, 'theia/ai-chat-ui/summarize-current-session', ChatCommands.CHAT_CATEGORY_KEY);
     ChatCommands.AI_CHAT_OPEN_SUMMARY_FOR_CURRENT_SESSION = core_1.Command.toLocalizedCommand({
         id: 'ai-chat-open-current-session-summary',
         iconClass: (0, browser_1.codicon)('note'),
         label: 'Open Current Session Summary',
-        category: CHAT_CATEGORY
-    }, undefined, CHAT_CATEGORY_KEY);
+        category: ChatCommands.CHAT_CATEGORY
+    }, 'theia/ai-chat-ui/open-current-session-summary', ChatCommands.CHAT_CATEGORY_KEY);
 })(ChatCommands || (exports.ChatCommands = ChatCommands = {}));
-exports.AI_CHAT_NEW_CHAT_WINDOW_COMMAND = {
+exports.AI_CHAT_NEW_CHAT_WINDOW_COMMAND = core_1.Command.toDefaultLocalizedCommand({
     id: 'ai-chat-ui.new-chat',
-    iconClass: (0, browser_1.codicon)('add')
-};
-exports.AI_CHAT_SHOW_CHATS_COMMAND = {
+    iconClass: (0, browser_1.codicon)('add'),
+    category: ChatCommands.CHAT_CATEGORY,
+    label: 'New Chat'
+});
+exports.AI_CHAT_SHOW_CHATS_COMMAND = core_1.Command.toDefaultLocalizedCommand({
     id: 'ai-chat-ui.show-chats',
-    iconClass: (0, browser_1.codicon)('history')
-};
+    iconClass: (0, browser_1.codicon)('history'),
+    category: ChatCommands.CHAT_CATEGORY,
+    label: 'Show Chats...'
+});
 //# sourceMappingURL=chat-view-commands.js.map

package/lib/browser/chat-view-commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat-view-commands.js","sourceRoot":"","sources":["../../src/browser/chat-view-commands.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;;;AAEhF,sCAA2C;AAC3C,qDAAkD;AAElD,IAAiB,YAAY,CA6C5B;AA7CD,WAAiB,YAAY;IACzB,MAAM,aAAa,GAAG,MAAM,CAAC;IAC7B,MAAM,iBAAiB,GAAG,UAAG,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAE9C,+BAAkB,GAAG,cAAO,CAAC,kBAAkB,CAAC;QACzD,EAAE,EAAE,kBAAkB;QACtB,QAAQ,EAAE,aAAa;QACvB,SAAS,EAAE,IAAA,iBAAO,EAAC,QAAQ,CAAC;KAC/B,EAAE,EAAE,EAAE,iBAAiB,CAAC,CAAC;IAEb,iCAAoB,GAAG,cAAO,CAAC,kBAAkB,CAAC;QAC3D,EAAE,EAAE,oBAAoB;QACxB,QAAQ,EAAE,aAAa;QACvB,SAAS,EAAE,IAAA,iBAAO,EAAC,MAAM,CAAC;KAC7B,EAAE,EAAE,EAAE,iBAAiB,CAAC,CAAC;IAEb,kCAAqB,GAAG,cAAO,CAAC,kBAAkB,CAAC;QAC5D,EAAE,EAAE,8BAA8B;QAClC,QAAQ,EAAE,aAAa;QACvB,SAAS,EAAE,IAAA,iBAAO,EAAC,SAAS,CAAC;KAChC,EAAE,sBAAsB,EAAE,iBAAiB,CAAC,CAAC;IAEjC,0CAA6B,GAAY;QAClD,EAAE,EAAE,+BAA+B;KACtC,CAAC;IAEW,uDAA0C,GAAG,cAAO,CAAC,kBAAkB,CAAC;QACjF,EAAE,EAAE,4CAA4C;QAChD,KAAK,EAAE,gCAAgC;QACvC,QAAQ,EAAE,aAAa;KAC1B,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAEpB,8CAAiC,GAAG,cAAO,CAAC,kBAAkB,CAAC;QACxE,EAAE,EAAE,iCAAiC;QACrC,SAAS,EAAE,IAAA,iBAAO,EAAC,uBAAuB,CAAC;QAC3C,KAAK,EAAE,2BAA2B;QAClC,QAAQ,EAAE,aAAa;KAC1B,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAEpB,qDAAwC,GAAG,cAAO,CAAC,kBAAkB,CAAC;QAC/E,EAAE,EAAE,sCAAsC;QAC1C,SAAS,EAAE,IAAA,iBAAO,EAAC,MAAM,CAAC;QAC1B,KAAK,EAAE,8BAA8B;QACrC,QAAQ,EAAE,aAAa;KAC1B,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;AACrC,CAAC,EA7CgB,YAAY,4BAAZ,YAAY,QA6C5B;AAEY,QAAA,+BAA+B,GAAY;IACpD,EAAE,EAAE,qBAAqB;IACzB,SAAS,EAAE,IAAA,iBAAO,EAAC,KAAK,CAAC;CAC5B,CAAC;AAEW,QAAA,0BAA0B,GAAY;IAC/C,EAAE,EAAE,uBAAuB;IAC3B,SAAS,EAAE,IAAA,iBAAO,EAAC,SAAS,CAAC;CAChC,CAAC"}
+{"version":3,"file":"chat-view-commands.js","sourceRoot":"","sources":["../../src/browser/chat-view-commands.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;;;AAEhF,sCAA2C;AAC3C,qDAAkD;AAElD,IAAiB,YAAY,CAgD5B;AAhDD,WAAiB,YAAY;IACZ,0BAAa,GAAG,MAAM,CAAC;IACvB,8BAAiB,GAAG,UAAG,CAAC,aAAa,CAAC,aAAA,aAAa,CAAC,CAAC;IAErD,+BAAkB,GAAG,cAAO,CAAC,kBAAkB,CAAC;QACzD,EAAE,EAAE,kBAAkB;QACtB,QAAQ,EAAE,aAAA,aAAa;QACvB,SAAS,EAAE,IAAA,iBAAO,EAAC,QAAQ,CAAC;QAC5B,KAAK,EAAE,aAAa;KACvB,EAAE,8BAA8B,EAAE,aAAA,iBAAiB,CAAC,CAAC;IAEzC,iCAAoB,GAAG,cAAO,CAAC,kBAAkB,CAAC;QAC3D,EAAE,EAAE,oBAAoB;QACxB,QAAQ,EAAE,aAAA,aAAa;QACvB,SAAS,EAAE,IAAA,iBAAO,EAAC,MAAM,CAAC;QAC1B,KAAK,EAAE,eAAe;KACzB,EAAE,gCAAgC,EAAE,aAAA,iBAAiB,CAAC,CAAC;IAE3C,kCAAqB,GAAG,cAAO,CAAC,kBAAkB,CAAC;QAC5D,EAAE,EAAE,8BAA8B;QAClC,QAAQ,EAAE,aAAA,aAAa;QACvB,SAAS,EAAE,IAAA,iBAAO,EAAC,SAAS,CAAC;QAC7B,KAAK,EAAE,sBAAsB;KAChC,EAAE,mCAAmC,EAAE,aAAA,iBAAiB,CAAC,CAAC;IAE9C,0CAA6B,GAAY;QAClD,EAAE,EAAE,+BAA+B;KACtC,CAAC;IAEW,uDAA0C,GAAG,cAAO,CAAC,kBAAkB,CAAC;QACjF,EAAE,EAAE,4CAA4C;QAChD,KAAK,EAAE,gCAAgC;QACvC,QAAQ,EAAE,aAAA,aAAa;KAC1B,EAAE,gDAAgD,EAAE,aAAA,iBAAiB,CAAC,CAAC;IAE3D,8CAAiC,GAAG,cAAO,CAAC,kBAAkB,CAAC;QACxE,EAAE,EAAE,iCAAiC;QACrC,SAAS,EAAE,IAAA,iBAAO,EAAC,uBAAuB,CAAC;QAC3C,KAAK,EAAE,2BAA2B;QAClC,QAAQ,EAAE,aAAA,aAAa;KAC1B,EAAE,4CAA4C,EAAE,aAAA,iBAAiB,CAAC,CAAC;IAEvD,qDAAwC,GAAG,cAAO,CAAC,kBAAkB,CAAC;QAC/E,EAAE,EAAE,sCAAsC;QAC1C,SAAS,EAAE,IAAA,iBAAO,EAAC,MAAM,CAAC;QAC1B,KAAK,EAAE,8BAA8B;QACrC,QAAQ,EAAE,aAAA,aAAa;KAC1B,EAAE,+CAA+C,EAAE,aAAA,iBAAiB,CAAC,CAAC;AAC3E,CAAC,EAhDgB,YAAY,4BAAZ,YAAY,QAgD5B;AAEY,QAAA,+BAA+B,GAAG,cAAO,CAAC,yBAAyB,CAAC;IAC7E,EAAE,EAAE,qBAAqB;IACzB,SAAS,EAAE,IAAA,iBAAO,EAAC,KAAK,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC,aAAa;IACpC,KAAK,EAAE,UAAU;CACpB,CAAC,CAAC;AAEU,QAAA,0BAA0B,GAAG,cAAO,CAAC,yBAAyB,CAAC;IACxE,EAAE,EAAE,uBAAuB;IAC3B,SAAS,EAAE,IAAA,iBAAO,EAAC,SAAS,CAAC;IAC7B,QAAQ,EAAE,YAAY,CAAC,aAAa;IACpC,KAAK,EAAE,eAAe;CACzB,CAAC,CAAC"}

package/package.json

@@ -1,19 +1,18 @@
 {
   "name": "@theia/ai-chat-ui",
-  "version": "1.65.0-next.55+d141c3601",
+  "version": "1.65.0",
   "description": "Theia - AI Chat UI Extension",
   "dependencies": {
-    "@theia/ai-chat": "1.65.0-next.55+d141c3601",
-    "@theia/ai-core": "1.65.0-next.55+d141c3601",
-    "@theia/core": "1.65.0-next.55+d141c3601",
-    "@theia/editor": "1.65.0-next.55+d141c3601",
-    "@theia/editor-preview": "1.65.0-next.55+d141c3601",
-    "@theia/filesystem": "1.65.0-next.55+d141c3601",
-    "@theia/monaco": "1.65.0-next.55+d141c3601",
+    "@theia/ai-chat": "1.65.0",
+    "@theia/ai-core": "1.65.0",
+    "@theia/core": "1.65.0",
+    "@theia/editor": "1.65.0",
+    "@theia/editor-preview": "1.65.0",
+    "@theia/filesystem": "1.65.0",
+    "@theia/monaco": "1.65.0",
     "@theia/monaco-editor-core": "1.96.302",
-    "@theia/workspace": "1.65.0-next.55+d141c3601",
+    "@theia/workspace": "1.65.0",
     "date-fns": "^4.1.0",
-    "minimatch": "^5.1.0",
     "tslib": "^2.6.2",
     "uuid": "^9.0.1"
   },
@@ -51,10 +50,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.64.0"
+    "@theia/ext-scripts": "1.65.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "d141c3601e8c3d9cd254468790fed3566aa23305"
+  "gitHead": "500dfc80cee94fd2a623b5fb59b22d5a575247c2"
 }

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

@@ -229,14 +229,14 @@ export class AIChatContribution extends AbstractViewContribution<ChatViewWidget>
         registry.registerItem({
             id: AI_CHAT_NEW_CHAT_WINDOW_COMMAND.id,
             command: AI_CHAT_NEW_CHAT_WINDOW_COMMAND.id,
-            tooltip: nls.localizeByDefault('New Chat'),
+            tooltip: AI_CHAT_NEW_CHAT_WINDOW_COMMAND.label,
             isVisible: widget => this.activationService.isActive && this.withWidget(widget),
             when: ENABLE_AI_CONTEXT_KEY
         });
         registry.registerItem({
             id: AI_CHAT_SHOW_CHATS_COMMAND.id,
             command: AI_CHAT_SHOW_CHATS_COMMAND.id,
-            tooltip: nls.localizeByDefault('Show Chats...'),
+            tooltip: AI_CHAT_SHOW_CHATS_COMMAND.label,
             isVisible: widget => this.activationService.isActive && this.withWidget(widget),
             when: ENABLE_AI_CONTEXT_KEY
         });

package/src/browser/chat-input-history-contribution.ts

@@ -82,12 +82,18 @@ export class ChatInputHistoryContribution implements CommandContribution, Keybin
             return;
         }
 
+        const position = chatInputWidget.editor.getControl().getPosition();
+        const isCursorAtBeginning = position && (position.lineNumber > 1 || position.column > 1);
+        if (isCursorAtBeginning) {
+            this.positionCursorAtBeginning(chatInputWidget);
+            return;
+        }
+
         const currentInput = chatInputWidget.editor.getControl().getValue();
         const previousPrompt = chatInputWidget.getPreviousPrompt(currentInput);
-
         if (previousPrompt !== undefined) {
             chatInputWidget.editor.getControl().setValue(previousPrompt);
-            this.positionCursorAtEnd(chatInputWidget);
+            this.positionCursorAtBeginning(chatInputWidget);
         }
     }
 
@@ -97,14 +103,31 @@ export class ChatInputHistoryContribution implements CommandContribution, Keybin
             return;
         }
 
-        const nextPrompt = chatInputWidget.getNextPrompt();
+        const position = chatInputWidget.editor.getControl().getPosition();
+        const model = chatInputWidget.editor.getControl().getModel();
+        const isCursorAtEnd = position && model && (
+            position.lineNumber < model.getLineCount() || position.column < model.getLineMaxColumn(position.lineNumber)
+        );
+        if (isCursorAtEnd) {
+            this.positionCursorAtEnd(chatInputWidget);
+            return;
+        }
 
+        const nextPrompt = chatInputWidget.getNextPrompt();
         if (nextPrompt !== undefined) {
             chatInputWidget.editor.getControl().setValue(nextPrompt);
             this.positionCursorAtEnd(chatInputWidget);
         }
     }
 
+    protected positionCursorAtBeginning(widget: AIChatInputWidget): void {
+        const editor = widget.editor?.getControl();
+        if (editor) {
+            editor.setPosition({ lineNumber: 1, column: 1 });
+            editor.focus();
+        }
+    }
+
     protected positionCursorAtEnd(widget: AIChatInputWidget): void {
         const editor = widget.editor?.getControl();
         const model = editor?.getModel();
@@ -114,13 +137,6 @@ export class ChatInputHistoryContribution implements CommandContribution, Keybin
             const lastColumn = model.getLineContent(lastLine).length + 1;
             editor.setPosition({ lineNumber: lastLine, column: lastColumn });
             editor.focus();
-
-            setTimeout(() => {
-                // Trigger cursor position update after setting value
-                if (widget.editor?.getControl().hasWidgetFocus()) {
-                    widget.updateCursorPositionKeys();
-                }
-            }, 0);
         }
     }
 

package/src/browser/chat-input-widget.tsx

@@ -15,13 +15,14 @@
 // *****************************************************************************
 import {
     ChangeSet, ChangeSetElement, ChatAgent, ChatChangeEvent, ChatHierarchyBranch,
-    ChatModel, ChatRequestModel, ChatService, ChatSuggestion, EditableChatRequestModel
+    ChatModel, ChatRequestModel, ChatService, ChatSuggestion, EditableChatRequestModel,
+    ChatRequestParser
 } from '@theia/ai-chat';
 import { ChangeSetDecoratorService } from '@theia/ai-chat/lib/browser/change-set-decorator-service';
 import { ImageContextVariable } from '@theia/ai-chat/lib/common/image-context-variable';
 import { AIVariableResolutionRequest } from '@theia/ai-core';
 import { AgentCompletionNotificationService, FrontendVariableService, AIActivationService } from '@theia/ai-core/lib/browser';
-import { DisposableCollection, Emitter, InMemoryResources, URI, nls } from '@theia/core';
+import { DisposableCollection, Emitter, InMemoryResources, URI, nls, Disposable } from '@theia/core';
 import { ContextMenuRenderer, LabelProvider, Message, OpenerService, ReactWidget } from '@theia/core/lib/browser';
 import { ContextKey, ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { Deferred } from '@theia/core/lib/common/promise-util';
@@ -36,6 +37,7 @@ import { CHAT_VIEW_LANGUAGE_EXTENSION } from './chat-view-language-contribution'
 import { ContextVariablePicker } from './context-variable-picker';
 import { TASK_CONTEXT_VARIABLE } from '@theia/ai-chat/lib/browser/task-context-variable';
 import { IModelDeltaDecoration } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
+import { EditorOption } from '@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions';
 import { ChatInputHistoryService, ChatInputNavigationState } from './chat-input-history';
 
 type Query = (query: string) => Promise<void>;
@@ -101,6 +103,9 @@ export class AIChatInputWidget extends ReactWidget {
     @inject(ChatInputHistoryService)
     protected readonly historyService: ChatInputHistoryService;
 
+    @inject(ChatRequestParser)
+    protected readonly chatRequestParser: ChatRequestParser;
+
     protected navigationState: ChatInputNavigationState;
 
     @inject(ContextKeyService)
@@ -134,10 +139,13 @@ export class AIChatInputWidget extends ReactWidget {
     protected chatInputFocusKey: ContextKey<boolean>;
     protected chatInputFirstLineKey: ContextKey<boolean>;
     protected chatInputLastLineKey: ContextKey<boolean>;
+    protected chatInputReceivingAgentKey: ContextKey<string>;
 
     protected isEnabled = false;
     protected heightInLines = 12;
 
+    protected updateReceivingAgentTimeout: number | undefined;
+
     protected _branch?: ChatHierarchyBranch;
     set branch(branch: ChatHierarchyBranch | undefined) {
         if (this._branch !== branch) {
@@ -189,11 +197,13 @@ export class AIChatInputWidget extends ReactWidget {
             }
         }));
         this._chatModel = chatModel;
+        this.scheduleUpdateReceivingAgent();
         this.update();
     }
     protected _pinnedAgent: ChatAgent | undefined;
     set pinnedAgent(pinnedAgent: ChatAgent | undefined) {
         this._pinnedAgent = pinnedAgent;
+        this.scheduleUpdateReceivingAgent();
         this.update();
     }
 
@@ -209,6 +219,12 @@ export class AIChatInputWidget extends ReactWidget {
             this.setEnabled(this.aiActivationService.isActive);
         }));
         this.toDispose.push(this.onDidResizeEmitter);
+        this.toDispose.push(Disposable.create(() => {
+            if (this.updateReceivingAgentTimeout !== undefined) {
+                clearTimeout(this.updateReceivingAgentTimeout);
+                this.updateReceivingAgentTimeout = undefined;
+            }
+        }));
         this.setEnabled(this.aiActivationService.isActive);
         this.historyService.init().then(() => {
             this.navigationState = new ChatInputNavigationState(this.historyService);
@@ -221,6 +237,7 @@ export class AIChatInputWidget extends ReactWidget {
         this.chatInputFocusKey = this.contextKeyService.createKey<boolean>('chatInputFocus', false);
         this.chatInputFirstLineKey = this.contextKeyService.createKey<boolean>('chatInputFirstLine', false);
         this.chatInputLastLineKey = this.contextKeyService.createKey<boolean>('chatInputLastLine', false);
+        this.chatInputReceivingAgentKey = this.contextKeyService.createKey<string>('chatInputReceivingAgent', '');
     }
 
     updateCursorPositionKeys(): void {
@@ -240,11 +257,57 @@ export class AIChatInputWidget extends ReactWidget {
             return;
         }
 
-        const isFirstLine = position.lineNumber === 1;
-        const isLastLine = position.lineNumber === model.getLineCount();
+        const line = position.lineNumber;
+        const col = position.column;
+
+        const topAtPos = editor.getTopForPosition(line, col);
+        const topAtLineStart = editor.getTopForLineNumber(line);
+        const topAtLineEnd = editor.getTopForPosition(line, model.getLineMaxColumn(line));
+        const lineHeight = editor.getOption(EditorOption.lineHeight);
+        const toleranceValue = 0.5;
+
+        const isFirstVisualOfThisLine = Math.abs(topAtPos - topAtLineStart) < toleranceValue;
+        const isLastVisualOfThisLine = Math.abs(topAtPos - topAtLineEnd) < toleranceValue || (topAtPos > topAtLineEnd - lineHeight + toleranceValue);
+        const isFirstVisualOverall = line === 1 && isFirstVisualOfThisLine;
 
-        this.chatInputFirstLineKey.set(isFirstLine);
-        this.chatInputLastLineKey.set(isLastLine);
+        const isLastVisualOverall = line === model.getLineCount() && isLastVisualOfThisLine;
+
+        this.chatInputFirstLineKey.set(isFirstVisualOverall);
+        this.chatInputLastLineKey.set(isLastVisualOverall);
+    }
+
+    protected scheduleUpdateReceivingAgent(): void {
+        if (this.updateReceivingAgentTimeout !== undefined) {
+            clearTimeout(this.updateReceivingAgentTimeout);
+        }
+        this.updateReceivingAgentTimeout = window.setTimeout(() => {
+            this.updateReceivingAgent();
+            this.updateReceivingAgentTimeout = undefined;
+        }, 200);
+    }
+
+    protected async updateReceivingAgent(): Promise<void> {
+        if (!this.editorRef || !this._chatModel) {
+            this.chatInputReceivingAgentKey.set('');
+            return;
+        }
+
+        try {
+            const inputText = this.editorRef.getControl().getValue();
+            const request = { text: inputText };
+            const resolvedContext = { variables: [] };
+            const parsedRequest = await this.chatRequestParser.parseChatRequest(request, this._chatModel.location, resolvedContext);
+            const session = this.chatService.getSessions().find(s => s.model.id === this._chatModel.id);
+            if (session) {
+                const agent = this.chatService.getAgent(parsedRequest, session);
+                this.chatInputReceivingAgentKey.set(agent?.id ?? '');
+            } else {
+                this.chatInputReceivingAgentKey.set('');
+            }
+        } catch (error) {
+            console.warn('Failed to determine receiving agent:', error);
+            this.chatInputReceivingAgentKey.set('');
+        }
     }
 
     protected setupEditorEventListeners(): void {
@@ -275,6 +338,7 @@ export class AIChatInputWidget extends ReactWidget {
             if (editor.hasWidgetFocus()) {
                 this.updateCursorPositionKeys();
             }
+            this.scheduleUpdateReceivingAgent();
         }));
 
         if (editor.hasWidgetFocus()) {
@@ -319,7 +383,6 @@ export class AIChatInputWidget extends ReactWidget {
         const isEditing = !!(currentRequest && (EditableChatRequestModel.isEditing(currentRequest)));
         const isPending = () => !!(currentRequest && !isEditing && ChatRequestModel.isInProgress(currentRequest));
         const pending = isPending();
-        const hasPromptHistory = this.configuration?.enablePromptHistory && this.historyService.getPrompts().length > 0;
 
         return (
             <ChatInput
@@ -353,7 +416,7 @@ export class AIChatInputWidget extends ReactWidget {
                 showPinnedAgent={this.configuration?.showPinnedAgent}
                 showChangeSet={this.configuration?.showChangeSet}
                 showSuggestions={this.configuration?.showSuggestions}
-                hasPromptHistory={hasPromptHistory}
+                hasPromptHistory={this.configuration?.enablePromptHistory}
                 labelProvider={this.labelProvider}
                 actionService={this.changeSetActionService}
                 decoratorService={this.changeSetDecoratorService}
@@ -529,6 +592,8 @@ const ChatInput: React.FunctionComponent<ChatInputProperties> = (props: ChatInpu
     const onDeleteChangeSetElement = (uri: URI) => props.onDeleteChangeSetElement(props.chatModel.id, uri);
 
     const [isInputEmpty, setIsInputEmpty] = React.useState(true);
+    const [isInputFocused, setIsInputFocused] = React.useState(false);
+    const [placeholderText, setPlaceholderText] = React.useState('');
     const [changeSetUI, setChangeSetUI] = React.useState(
         () => buildChangeSetUI(
             props.chatModel.changeSet,
@@ -552,11 +617,16 @@ const ChatInput: React.FunctionComponent<ChatInputProperties> = (props: ChatInpu
     const isFirstRequest = props.chatModel.getRequests().length === 0;
     const shouldUseTaskPlaceholder = isFirstRequest && props.pinnedAgent && hasTaskContext(props.chatModel);
     const taskPlaceholder = nls.localize('theia/ai/chat-ui/performThisTask', 'Perform this task.');
-    const placeholderText = !props.isEnabled
-        ? nls.localize('theia/ai/chat-ui/aiDisabled', 'AI features are disabled')
-        : shouldUseTaskPlaceholder
-            ? taskPlaceholder
-            : nls.localizeByDefault('Ask a question') + (props.hasPromptHistory ? nls.localizeByDefault(' ({0} for history)', '⇅') : '');
+
+    // Update placeholder text when focus state or other dependencies change
+    React.useEffect(() => {
+        const newPlaceholderText = !props.isEnabled
+            ? nls.localize('theia/ai/chat-ui/aiDisabled', 'AI features are disabled')
+            : shouldUseTaskPlaceholder
+                ? taskPlaceholder
+                : nls.localizeByDefault('Ask a question') + (props.hasPromptHistory && isInputFocused ? nls.localizeByDefault(' ({0} for history)', '⇅') : '');
+        setPlaceholderText(newPlaceholderText);
+    }, [props.isEnabled, shouldUseTaskPlaceholder, taskPlaceholder, props.hasPromptHistory, isInputFocused]);
 
     // Handle paste events on the container
     const handlePaste = React.useCallback((event: ClipboardEvent) => {
@@ -797,6 +867,7 @@ const ChatInput: React.FunctionComponent<ChatInputProperties> = (props: ChatInpu
     }, [props.isEnabled, submit]);
 
     const handleInputFocus = () => {
+        setIsInputFocused(true);
         hidePlaceholderIfEditorFilled();
     };
 
@@ -806,6 +877,7 @@ const ChatInput: React.FunctionComponent<ChatInputProperties> = (props: ChatInpu
     };
 
     const handleInputBlur = () => {
+        setIsInputFocused(false);
         showPlaceholderIfEditorEmpty();
     };
 

package/src/browser/chat-view-commands.ts

@@ -18,26 +18,29 @@ import { Command, nls } from '@theia/core';
 import { codicon } from '@theia/core/lib/browser';
 
 export namespace ChatCommands {
-    const CHAT_CATEGORY = 'Chat';
-    const CHAT_CATEGORY_KEY = nls.getDefaultKey(CHAT_CATEGORY);
+    export const CHAT_CATEGORY = 'Chat';
+    export const CHAT_CATEGORY_KEY = nls.getDefaultKey(CHAT_CATEGORY);
 
     export const SCROLL_LOCK_WIDGET = Command.toLocalizedCommand({
         id: 'chat:widget:lock',
         category: CHAT_CATEGORY,
-        iconClass: codicon('unlock')
-    }, '', CHAT_CATEGORY_KEY);
+        iconClass: codicon('unlock'),
+        label: 'Lock Scroll'
+    }, 'theia/ai-chat-ui/scroll-lock', CHAT_CATEGORY_KEY);
 
     export const SCROLL_UNLOCK_WIDGET = Command.toLocalizedCommand({
         id: 'chat:widget:unlock',
         category: CHAT_CATEGORY,
-        iconClass: codicon('lock')
-    }, '', CHAT_CATEGORY_KEY);
+        iconClass: codicon('lock'),
+        label: 'Unlock Scroll'
+    }, 'theia/ai-chat-ui/scroll-unlock', CHAT_CATEGORY_KEY);
 
     export const EDIT_SESSION_SETTINGS = Command.toLocalizedCommand({
         id: 'chat:widget:session-settings',
         category: CHAT_CATEGORY,
-        iconClass: codicon('bracket')
-    }, 'Set Session Settings', CHAT_CATEGORY_KEY);
+        iconClass: codicon('bracket'),
+        label: 'Set Session Settings'
+    }, 'theia/ai-chat-ui/session-settings', CHAT_CATEGORY_KEY);
 
     export const AI_CHAT_NEW_WITH_TASK_CONTEXT: Command = {
         id: 'ai-chat.new-with-task-context',
@@ -47,29 +50,33 @@ export namespace ChatCommands {
         id: 'ai-chat.initiate-session-with-task-context',
         label: 'Task Context: Initiate Session',
         category: CHAT_CATEGORY
-    }, undefined, CHAT_CATEGORY_KEY);
+    }, 'theia/ai-chat-ui/initiate-session-task-context', CHAT_CATEGORY_KEY);
 
     export const AI_CHAT_SUMMARIZE_CURRENT_SESSION = Command.toLocalizedCommand({
         id: 'ai-chat-summary-current-session',
         iconClass: codicon('go-to-editing-session'),
         label: 'Summarize Current Session',
         category: CHAT_CATEGORY
-    }, undefined, CHAT_CATEGORY_KEY);
+    }, 'theia/ai-chat-ui/summarize-current-session', CHAT_CATEGORY_KEY);
 
     export const AI_CHAT_OPEN_SUMMARY_FOR_CURRENT_SESSION = Command.toLocalizedCommand({
         id: 'ai-chat-open-current-session-summary',
         iconClass: codicon('note'),
         label: 'Open Current Session Summary',
         category: CHAT_CATEGORY
-    }, undefined, CHAT_CATEGORY_KEY);
+    }, 'theia/ai-chat-ui/open-current-session-summary', CHAT_CATEGORY_KEY);
 }
 
-export const AI_CHAT_NEW_CHAT_WINDOW_COMMAND: Command = {
+export const AI_CHAT_NEW_CHAT_WINDOW_COMMAND = Command.toDefaultLocalizedCommand({
     id: 'ai-chat-ui.new-chat',
-    iconClass: codicon('add')
-};
+    iconClass: codicon('add'),
+    category: ChatCommands.CHAT_CATEGORY,
+    label: 'New Chat'
+});
 
-export const AI_CHAT_SHOW_CHATS_COMMAND: Command = {
+export const AI_CHAT_SHOW_CHATS_COMMAND = Command.toDefaultLocalizedCommand({
     id: 'ai-chat-ui.show-chats',
-    iconClass: codicon('history')
-};
+    iconClass: codicon('history'),
+    category: ChatCommands.CHAT_CATEGORY,
+    label: 'Show Chats...'
+});