@theia/ai-chat 1.67.0-next.59 → 1.67.0

package/src/common/chat-model.ts

@@ -408,6 +408,7 @@ export interface ToolCallContentData {
     arguments?: string;
     finished?: boolean;
     result?: ToolCallResult;
+    data?: Record<string, string>;
 }
 
 export interface CommandContentData {
@@ -477,6 +478,7 @@ export interface ToolCallChatResponseContent extends Required<ChatResponseConten
     finished: boolean;
     result?: ToolCallResult;
     confirmed: Promise<boolean>;
+    data?: Record<string, string>;
     confirm(): void;
     deny(): void;
     cancelConfirmation(reason?: unknown): void;
@@ -1936,16 +1938,18 @@ export class ToolCallChatResponseContentImpl implements ToolCallChatResponseCont
     protected _arguments?: string;
     protected _finished?: boolean;
     protected _result?: ToolCallResult;
+    protected _data?: Record<string, string>;
     protected _confirmed: Promise<boolean>;
     protected _confirmationResolver?: (value: boolean) => void;
     protected _confirmationRejecter?: (reason?: unknown) => void;
 
-    constructor(id?: string, name?: string, arg_string?: string, finished?: boolean, result?: ToolCallResult) {
+    constructor(id?: string, name?: string, arg_string?: string, finished?: boolean, result?: ToolCallResult, data?: Record<string, string>) {
         this._id = id;
         this._name = name;
         this._arguments = arg_string;
         this._finished = finished;
         this._result = result;
+        this._data = data;
         // Initialize the confirmation promise immediately
         this._confirmed = this.createConfirmationPromise();
     }
@@ -1969,6 +1973,10 @@ export class ToolCallChatResponseContentImpl implements ToolCallChatResponseCont
         return this._result;
     }
 
+    get data(): Record<string, string> | undefined {
+        return this._data;
+    }
+
     get confirmed(): Promise<boolean> {
         return this._confirmed;
     }
@@ -2030,6 +2038,7 @@ export class ToolCallChatResponseContentImpl implements ToolCallChatResponseCont
             this._result = nextChatResponseContent.result;
             const args = nextChatResponseContent.arguments;
             this._arguments = (args && args.length > 0) ? args : this._arguments;
+            this._data = { ...nextChatResponseContent.data, ...this._data };
             // Don't merge confirmation promises - they should be managed separately
             return true;
         }
@@ -2049,7 +2058,8 @@ export class ToolCallChatResponseContentImpl implements ToolCallChatResponseCont
             type: 'tool_use',
             id: this.id ?? '',
             input: this.arguments && this.arguments.length !== 0 ? JSON.parse(this.arguments) : {},
-            name: this.name ?? ''
+            name: this.name ?? '',
+            data: this.data
         }, {
             actor: 'user',
             type: 'tool_result',

package/src/common/chat-service.ts

@@ -283,7 +283,9 @@ export class ChatServiceImpl implements ChatService {
         session.pinnedAgent = agent;
 
         if (agent === undefined) {
-            const error = 'No ChatAgents available to handle request!';
+            const error = 'No agent was found to handle this request. ' +
+                'Please ensure you have configured a default agent in the preferences and that the agent is enabled in the AI Configuration view. ' +
+                'Alternatively, mention a specific agent with @AgentName.';
             this.logger.error(error);
             const chatResponseModel = new ErrorChatResponseModel(generateUuid(), new Error(error));
             return {
@@ -407,18 +409,13 @@ export class ChatServiceImpl implements ChatService {
         if (agentPart) {
             return this.chatAgentService.getAgent(agentPart.agentId);
         }
-        let chatAgent = undefined;
         if (this.defaultChatAgentId) {
-            chatAgent = this.chatAgentService.getAgent(this.defaultChatAgentId.id);
+            return this.chatAgentService.getAgent(this.defaultChatAgentId.id);
         }
-        if (!chatAgent && this.fallbackChatAgentId) {
-            chatAgent = this.chatAgentService.getAgent(this.fallbackChatAgentId.id);
+        if (this.fallbackChatAgentId) {
+            return this.chatAgentService.getAgent(this.fallbackChatAgentId.id);
         }
-        if (chatAgent) {
-            return chatAgent;
-        }
-        this.logger.warn('Neither the default chat agent nor the fallback chat agent are configured or available. Falling back to the first registered agent');
-        return this.chatAgentService.getAgents()[0] ?? undefined;
+        return undefined;
     }
 
     protected getMentionedAgent(parsedRequest: ParsedChatRequest): ParsedChatRequestAgentPart | undefined {

package/src/common/index.ts

@@ -15,6 +15,7 @@
 // *****************************************************************************
 export * from './chat-agents';
 export * from './chat-agent-service';
+export * from './chat-agent-recommendation-service';
 export * from './chat-model';
 export * from './chat-model-serialization';
 export * from './chat-content-deserializer';