diff --git a/src/Core.Application/Actor/GetOurActorsByNameQuery.cs b/src/Core.Application/Actor/GetOurActorsByNameQuery.cs
new file mode 100644
index 0000000..414be5e
--- /dev/null
+++ b/src/Core.Application/Actor/GetOurActorsByNameQuery.cs
@@ -0,0 +1,25 @@
+namespace Goodtocode.AgentFramework.Core.Application.Actor;
+
+public class GetOurActorsByNameQuery : UserScopedRequest, IRequest<ICollection<ActorDto>>
+{
+    public string Name { get; set; } = string.Empty;
+}
+
+public class GetOurActorsByNameQueryHandler(IAgentFrameworkContext context) : IRequestHandler<GetOurActorsByNameQuery, ICollection<ActorDto>>
+{
+    private readonly IAgentFrameworkContext _context = context;
+
+    public async Task<ICollection<ActorDto>> Handle(GetOurActorsByNameQuery request, CancellationToken cancellationToken)
+    {
+        var tenantId = request.UserContext.TenantId;
+        var normalizedInput = request.Name.Trim();
+
+        return await _context.Actors
+            .Where(x => x.TenantId == tenantId)
+            .Where(x =>
+                (x.FirstName != null && x.FirstName.Contains(normalizedInput))
+                || (x.LastName != null && x.LastName.Contains(normalizedInput)))
+            .Select(x => ActorDto.CreateFrom(x))
+            .ToListAsync(cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Core.Application/Actor/GetOurActorsByNameQueryValidator.cs b/src/Core.Application/Actor/GetOurActorsByNameQueryValidator.cs
new file mode 100644
index 0000000..93ffebf
--- /dev/null
+++ b/src/Core.Application/Actor/GetOurActorsByNameQueryValidator.cs
@@ -0,0 +1,9 @@
+namespace Goodtocode.AgentFramework.Core.Application.Actor;
+
+public class GetOurActorsByNameQueryValidator : SecuredValidator<GetOurActorsByNameQuery>
+{
+    public GetOurActorsByNameQueryValidator()
+    {
+        RuleFor(x => x.Name).NotEmpty();
+    }
+}
\ No newline at end of file
diff --git a/src/Core.Application/Chat/GetMyChatSessionMessagesQuery.cs b/src/Core.Application/Chat/GetMyChatSessionMessagesQuery.cs
new file mode 100644
index 0000000..c942052
--- /dev/null
+++ b/src/Core.Application/Chat/GetMyChatSessionMessagesQuery.cs
@@ -0,0 +1,26 @@
+namespace Goodtocode.AgentFramework.Core.Application.Chat;
+
+public class GetMyChatSessionMessagesQuery : UserScopedRequest, IRequest<ICollection<ChatMessageDto>>
+{
+    public Guid ChatSessionId { get; set; }
+}
+
+public class GetMyChatSessionMessagesQueryHandler(IAgentFrameworkContext context) : IRequestHandler<GetMyChatSessionMessagesQuery, ICollection<ChatMessageDto>>
+{
+    private readonly IAgentFrameworkContext _context = context;
+
+    public async Task<ICollection<ChatMessageDto>> Handle(GetMyChatSessionMessagesQuery request, CancellationToken cancellationToken)
+    {
+        ChatGuard.GuardAgainstEmptyUserForQuery(request.UserContext);
+        ChatGuard.GuardAgainstEmptyId(request.ChatSessionId);
+
+        var userContext = request.UserContext;
+        return await _context.ChatMessages
+            .Where(x => x.ChatSessionId == request.ChatSessionId
+                && x.OwnerId == userContext.OwnerId
+                && x.TenantId == userContext.TenantId)
+            .OrderBy(x => x.Timestamp)
+            .Select(x => ChatMessageDto.CreateFrom(x))
+            .ToListAsync(cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Core.Application/Chat/GetMyChatSessionMessagesQueryValidator.cs b/src/Core.Application/Chat/GetMyChatSessionMessagesQueryValidator.cs
new file mode 100644
index 0000000..7dc4d90
--- /dev/null
+++ b/src/Core.Application/Chat/GetMyChatSessionMessagesQueryValidator.cs
@@ -0,0 +1,9 @@
+namespace Goodtocode.AgentFramework.Core.Application.Chat;
+
+public class GetMyChatSessionMessagesQueryValidator : SecuredValidator<GetMyChatSessionMessagesQuery>
+{
+    public GetMyChatSessionMessagesQueryValidator()
+    {
+        RuleFor(x => x.ChatSessionId).NotEmpty();
+    }
+}
\ No newline at end of file
diff --git a/src/Infrastructure.AgentFramework/ConfigureServices.cs b/src/Infrastructure.AgentFramework/ConfigureServices.cs
index 2c37a7c..8ce86c1 100644
--- a/src/Infrastructure.AgentFramework/ConfigureServices.cs
+++ b/src/Infrastructure.AgentFramework/ConfigureServices.cs
@@ -1,5 +1,6 @@
 using Goodtocode.AgentFramework.Infrastructure.AgentFramework.Options;
 using Goodtocode.AgentFramework.Infrastructure.AgentFramework.Providers;
+using Goodtocode.AgentFramework.Infrastructure.AgentFramework.Execution;
 using Goodtocode.AgentFramework.Infrastructure.AgentFramework.Tools;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -64,6 +65,7 @@ public static IServiceCollection AddAgentFrameworkOpenAIServices(this IServiceCo
             .ValidateDataAnnotations()
             .ValidateOnStart();
 
+        services.AddScoped<IToolApplicationExecutor, ToolApplicationExecutor>();
         services.AddSingleton<ChatSessionsTool>();
         services.AddSingleton<ActorsTool>();
         services.AddSingleton<ChatMessagesTool>();
diff --git a/src/Infrastructure.AgentFramework/Execution/IToolApplicationExecutor.cs b/src/Infrastructure.AgentFramework/Execution/IToolApplicationExecutor.cs
new file mode 100644
index 0000000..f7716cc
--- /dev/null
+++ b/src/Infrastructure.AgentFramework/Execution/IToolApplicationExecutor.cs
@@ -0,0 +1,19 @@
+using Goodtocode.Mediator;
+
+namespace Goodtocode.AgentFramework.Infrastructure.AgentFramework.Execution;
+
+/// <summary>
+/// Executes application requests for AI tools through the mediator pipeline.
+/// </summary>
+public interface IToolApplicationExecutor
+{
+    /// <summary>
+    /// Sends a request with a response through the application mediator pipeline.
+    /// </summary>
+    Task<TResponse> SendAsync<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Sends a request without a response through the application mediator pipeline.
+    /// </summary>
+    Task SendAsync(IRequest request, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/Infrastructure.AgentFramework/Execution/ToolApplicationExecutor.cs b/src/Infrastructure.AgentFramework/Execution/ToolApplicationExecutor.cs
new file mode 100644
index 0000000..09bd9e2
--- /dev/null
+++ b/src/Infrastructure.AgentFramework/Execution/ToolApplicationExecutor.cs
@@ -0,0 +1,19 @@
+using Goodtocode.Mediator;
+
+namespace Goodtocode.AgentFramework.Infrastructure.AgentFramework.Execution;
+
+/// <summary>
+/// Default mediator-backed executor used by AI tools for application commands and queries.
+/// </summary>
+public sealed class ToolApplicationExecutor(ISender sender) : IToolApplicationExecutor
+{
+    private readonly ISender _sender = sender;
+
+    /// <inheritdoc />
+    public Task<TResponse> SendAsync<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken)
+        => _sender.Send(request, cancellationToken);
+
+    /// <inheritdoc />
+    public Task SendAsync(IRequest request, CancellationToken cancellationToken)
+        => _sender.Send(request, cancellationToken);
+}
\ No newline at end of file
diff --git a/src/Infrastructure.AgentFramework/Tools/ActorsTool.cs b/src/Infrastructure.AgentFramework/Tools/ActorsTool.cs
index 452f268..8a8e38b 100644
--- a/src/Infrastructure.AgentFramework/Tools/ActorsTool.cs
+++ b/src/Infrastructure.AgentFramework/Tools/ActorsTool.cs
@@ -1,7 +1,5 @@
 using System.ComponentModel;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.AI;
-using Microsoft.Extensions.DependencyInjection;
+using Goodtocode.AgentFramework.Core.Application.Actor;
 
 namespace Goodtocode.AgentFramework.Infrastructure.AgentFramework.Tools;
 
@@ -14,10 +12,8 @@ public class ActorResponse : IActorResponse
 }
 
 
-public sealed class ActorsTool(IServiceProvider serviceProvider) : AITool, IActorsTool
+public sealed class ActorsTool(IServiceProvider serviceProvider) : ScopedAgentTool(serviceProvider), IActorsTool
 {
-    private readonly IServiceProvider _serviceProvider = serviceProvider;
-
     public static string ToolName => "ActorsTool";
     public string FunctionName => _currentFunctionName;
     public Dictionary<string, object> Parameters => _currentParameters;
@@ -25,7 +21,7 @@ public sealed class ActorsTool(IServiceProvider serviceProvider) : AITool, IActo
     private string _currentFunctionName = string.Empty;
     private Dictionary<string, object> _currentParameters = [];
 
-    [Description("Returns structured actor info by ID including name, status, and explanation.")]
+    [Description("Get an actor by actorId when the user provides an identifier. Returns structured actor status: Found, Partial, or NotFound, with a brief explanation.")]
     public async Task<IActorResponse?> GetActorByIdAsync(Guid actorId, CancellationToken cancellationToken)
     {
         _currentFunctionName = "get_actor_by_id";
@@ -34,9 +30,10 @@ public sealed class ActorsTool(IServiceProvider serviceProvider) : AITool, IActo
             { "actorId", actorId }
         };
 
-        using var scope = _serviceProvider.CreateScope();
-        var context = scope.ServiceProvider.GetRequiredService<IAgentFrameworkContext>();
-        var actor = await context.Actors.FindAsync([actorId, cancellationToken], cancellationToken: cancellationToken);
+        var actor = await SendAsync(new GetOurActorQuery
+        {
+            ActorId = actorId
+        }, cancellationToken);
 
         if (actor == null)
         {
@@ -54,7 +51,7 @@ public sealed class ActorsTool(IServiceProvider serviceProvider) : AITool, IActo
         };
     }
 
-    [Description("Returns structured actor info by name including ID, status, and explanation.")]
+    [Description("Search actors in the current tenant by name when the user asks to find a person. Returns matching actor IDs, names, statuses, and explanations. Never use this to search other tenants.")]
     public async Task<ICollection<IActorResponse>> GetActorsByNameAsync(string name, CancellationToken cancellationToken)
     {
         _currentFunctionName = "get_actors_by_name";
@@ -63,31 +60,10 @@ public async Task<ICollection<IActorResponse>> GetActorsByNameAsync(string name,
             { "name", name }
         };
 
-        using var scope = _serviceProvider.CreateScope();
-        var context = scope.ServiceProvider.GetRequiredService<IAgentFrameworkContext>();
-        var nameTokens = name?.Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) ?? [];
-        var normalizedInput = name?.Trim() ?? string.Empty;
-
-        var actors = await context.Actors
-            .Where(a =>
-                nameTokens.Any(token =>
-                    EF.Functions.Like(a.FirstName, $"%{token}%") ||
-                    EF.Functions.Like(a.LastName, $"%{token}%")
-                )
-                || EF.Functions.Like(
-                    (a.FirstName + " " + a.LastName).Trim(), $"%{normalizedInput}%"
-                )
-                || EF.Functions.Like(
-                    (a.LastName + " " + a.FirstName).Trim(), $"%{normalizedInput}%"
-                )
-                || nameTokens.Any(token =>
-                    EF.Functions.Like(a.FirstName, $"{token}%") ||
-                    EF.Functions.Like(a.FirstName, $"%{token}") ||
-                    EF.Functions.Like(a.LastName, $"{token}%") ||
-                    EF.Functions.Like(a.LastName, $"%{token}")
-                )
-            )
-            .ToListAsync(cancellationToken);
+        var actors = await SendAsync(new GetOurActorsByNameQuery
+        {
+            Name = name
+        }, cancellationToken);
 
         return [.. actors.Select(a => new ActorResponse
         {
diff --git a/src/Infrastructure.AgentFramework/Tools/ChatMessagesTool.cs b/src/Infrastructure.AgentFramework/Tools/ChatMessagesTool.cs
index 0501407..03d91f7 100644
--- a/src/Infrastructure.AgentFramework/Tools/ChatMessagesTool.cs
+++ b/src/Infrastructure.AgentFramework/Tools/ChatMessagesTool.cs
@@ -1,14 +1,10 @@
 using System.ComponentModel;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.AI;
-using Microsoft.Extensions.DependencyInjection;
+using Goodtocode.AgentFramework.Core.Application.Chat;
 
 namespace Goodtocode.AgentFramework.Infrastructure.AgentFramework.Tools;
 
-public sealed class ChatMessagesTool(IServiceProvider serviceProvider) : AITool, IChatMessagesTool
+public sealed class ChatMessagesTool(IServiceProvider serviceProvider) : ScopedAgentTool(serviceProvider), IChatMessagesTool
 {
-    private readonly IServiceProvider _serviceProvider = serviceProvider;
-
     public static string ToolName => "ChatMessagesTool";
     public string FunctionName => _currentFunctionName;
     public Dictionary<string, object> Parameters => _currentParameters;
@@ -16,7 +12,7 @@ public sealed class ChatMessagesTool(IServiceProvider serviceProvider) : AITool,
     private string _currentFunctionName = string.Empty;
     private Dictionary<string, object> _currentParameters = [];
 
-    [Description("Retrieves the most recent messages from all chat sessions.")]
+    [Description("List recent messages from the current user's chat sessions. Optionally provide startDate and endDate to narrow the time range. Use for conversation-history questions.")]
     public async Task<IEnumerable<string>> ListRecentMessagesAsync(DateTime? startDate = null, DateTime? endDate = null,
         CancellationToken cancellationToken = default)
     {
@@ -27,18 +23,16 @@ public async Task<IEnumerable<string>> ListRecentMessagesAsync(DateTime? startDa
             { "endDate", endDate  ?? DateTime.UtcNow.AddSeconds(1)}
         };
 
-        using var scope = _serviceProvider.CreateScope();
-        var context = scope.ServiceProvider.GetRequiredService<IAgentFrameworkContext>();
-
-        var query = context.ChatMessages.AsQueryable();
-        if (startDate.HasValue) query = query.Where(x => x.Timestamp >= startDate.Value);
-        if (endDate.HasValue) query = query.Where(x => x.Timestamp <= endDate.Value);
-
-        var messages = await query.OrderByDescending(x => x.Timestamp).ToListAsync(cancellationToken);
-        return messages.Select(m => $"{m.ChatSessionId}: {m.Timestamp:u} - {m.Role}: {m.Content}");
+        var messages = await SendAsync(new GetMyChatMessagesPaginatedQuery
+        {
+            StartDate = startDate,
+            EndDate = endDate,
+            PageSize = 100
+        }, cancellationToken);
+        return messages.Items.Select(m => $"{m.ChatSessionId}: {m.Timestamp:u} - {m.Role}: {m.Content}");
     }
 
-    [Description("Retrieves all messages from a specific chat session.")]
+    [Description("List all messages for a chat session owned by the current user. Use when the user asks to inspect a specific conversation by sessionId.")]
     public async Task<IEnumerable<string>> GetChatMessagesAsync(Guid sessionId,
         CancellationToken cancellationToken = default)
     {
@@ -48,12 +42,10 @@ public async Task<IEnumerable<string>> GetChatMessagesAsync(Guid sessionId,
         { "sessionId", sessionId }
     };
 
-        using var scope = _serviceProvider.CreateScope();
-        var context = scope.ServiceProvider.GetRequiredService<IAgentFrameworkContext>();
-
-        var messages = await context.ChatMessages
-            .Where(x => x.ChatSessionId == sessionId)
-            .ToListAsync(cancellationToken);
+        var messages = await SendAsync(new GetMyChatSessionMessagesQuery
+        {
+            ChatSessionId = sessionId
+        }, cancellationToken);
 
         return messages.Select(m => $"{m.ChatSessionId}: {m.Timestamp:u} - {m.Role}: {m.Content}");
     }
diff --git a/src/Infrastructure.AgentFramework/Tools/ChatSessionsTool.cs b/src/Infrastructure.AgentFramework/Tools/ChatSessionsTool.cs
index 124a065..17e0894 100644
--- a/src/Infrastructure.AgentFramework/Tools/ChatSessionsTool.cs
+++ b/src/Infrastructure.AgentFramework/Tools/ChatSessionsTool.cs
@@ -1,14 +1,10 @@
 using System.ComponentModel;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.AI;
-using Microsoft.Extensions.DependencyInjection;
+using Goodtocode.AgentFramework.Core.Application.Chat;
 
 namespace Goodtocode.AgentFramework.Infrastructure.AgentFramework.Tools;
 
-public sealed class ChatSessionsTool(IServiceProvider serviceProvider) : AITool, IChatSessionsTool
+public sealed class ChatSessionsTool(IServiceProvider serviceProvider) : ScopedAgentTool(serviceProvider), IChatSessionsTool
 {
-    private readonly IServiceProvider _serviceProvider = serviceProvider;
-
     public static string ToolName => "ChatSessionsTool";
     public string FunctionName => _currentFunctionName;
     public Dictionary<string, object> Parameters => _currentParameters;
@@ -16,7 +12,7 @@ public sealed class ChatSessionsTool(IServiceProvider serviceProvider) : AITool,
     private string _currentFunctionName = string.Empty;
     private Dictionary<string, object> _currentParameters = [];
 
-    [Description("Retrieves a list of recent chat sessions. Optionally, filter results by start and/or end date to narrow the search.")]
+    [Description("List recent chat sessions owned by the current user. Optionally provide startDate and endDate to narrow the time range. Use before asking for a sessionId or conversation history.")]
     public async Task<IEnumerable<string>> ListRecentSessionsAsync(DateTime? startDate = null, DateTime? endDate = null, CancellationToken cancellationToken = default)
     {
         _currentFunctionName = "list_sessions";
@@ -26,24 +22,16 @@ public async Task<IEnumerable<string>> ListRecentSessionsAsync(DateTime? startDa
             { "endDate", endDate ?? DateTime.UtcNow.AddSeconds(1)}
         };
 
-        using var scope = _serviceProvider.CreateScope();
-        var context = scope.ServiceProvider.GetRequiredService<IAgentFrameworkContext>();
-
-        var query = context.ChatSessions.AsQueryable();
-
-        if (startDate.HasValue)
-            query = query.Where(x => x.Timestamp > startDate.Value);
-        if (endDate.HasValue)
-            query = query.Where(x => x.Timestamp < endDate.Value);
-
-        var messages = await query
-            .OrderByDescending(x => x.Timestamp)
-            .ToListAsync(cancellationToken);
+        var messages = await SendAsync(new GetMyChatSessionsQuery
+        {
+            StartDate = startDate,
+            EndDate = endDate
+        }, cancellationToken);
 
         return messages.Select(m => $"{m.Id}: {m.Timestamp} - {m.Title}");
     }
 
-    [Description("Changes the title on this chat session.")]
+    [Description("Change the title of a chat session owned by the current user. This writes data, so call it only after the user explicitly confirms the newTitle and sessionId. The result includes a follow-up action token for the chat UI.")]
     public async Task<string?> UpdateChatSessionTitleAsync(Guid sessionId, string newTitle, CancellationToken cancellationToken = default)
     {
         _currentFunctionName = "change_title";
@@ -53,21 +41,24 @@ public async Task<IEnumerable<string>> ListRecentSessionsAsync(DateTime? startDa
             { "newTitle", newTitle }
         };
 
-        using var scope = _serviceProvider.CreateScope();
-        var context = scope.ServiceProvider.GetRequiredService<IAgentFrameworkContext>();
-
-        var chatSession = await context.ChatSessions
-            .FirstOrDefaultAsync(x => x.Id == sessionId, cancellationToken: cancellationToken);
+        var result = await SendAsync(new PatchMyChatSessionCommand
+        {
+            Id = sessionId,
+            Title = newTitle
+        }, cancellationToken);
 
-        if (chatSession == null)
+        if (!result.IsSuccess)
         {
             return null;
         }
 
-        chatSession.Update(newTitle);
-        context.ChatSessions.Update(chatSession);
-        await context.SaveChangesAsync(cancellationToken);
+        var chatSession = await SendAsync(new GetMyChatSessionQuery
+        {
+            Id = sessionId
+        }, cancellationToken);
 
-        return $"{chatSession.Id}: {chatSession.Timestamp} - {chatSession.Title}";
+        return chatSession is null
+            ? null
+            : $"{chatSession.Id}: {chatSession.Timestamp} - {chatSession.Title}\n[action|Review chat sessions|List my recent chat sessions]";
     }
 }
\ No newline at end of file
diff --git a/src/Infrastructure.AgentFramework/Tools/ScopedAgentTool.cs b/src/Infrastructure.AgentFramework/Tools/ScopedAgentTool.cs
new file mode 100644
index 0000000..efa9370
--- /dev/null
+++ b/src/Infrastructure.AgentFramework/Tools/ScopedAgentTool.cs
@@ -0,0 +1,43 @@
+using Goodtocode.AgentFramework.Infrastructure.AgentFramework.Execution;
+using Goodtocode.Mediator;
+using Microsoft.Extensions.AI;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Goodtocode.AgentFramework.Infrastructure.AgentFramework.Tools;
+
+/// <summary>
+/// Shared base class for AI tools that execute application requests in an isolated scope.
+/// </summary>
+public abstract class ScopedAgentTool(IServiceProvider serviceProvider) : AITool
+{
+    private readonly IServiceProvider _serviceProvider = serviceProvider;
+
+    /// <summary>
+    /// Sends an application request with a response through a new dependency-injection scope.
+    /// </summary>
+    protected async Task<TResponse> SendAsync<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken)
+    {
+        using var scope = _serviceProvider.CreateScope();
+        var executor = scope.ServiceProvider.GetRequiredService<IToolApplicationExecutor>();
+        return await executor.SendAsync(request, cancellationToken);
+    }
+
+    /// <summary>
+    /// Sends an application request without a response through a new dependency-injection scope.
+    /// </summary>
+    protected async Task SendAsync(IRequest request, CancellationToken cancellationToken)
+    {
+        using var scope = _serviceProvider.CreateScope();
+        var executor = scope.ServiceProvider.GetRequiredService<IToolApplicationExecutor>();
+        await executor.SendAsync(request, cancellationToken);
+    }
+
+    /// <summary>
+    /// Executes a scoped infrastructure operation that is not an application request.
+    /// </summary>
+    protected async Task<TResponse> ResolveScopedAsync<TResponse>(Func<IServiceProvider, Task<TResponse>> action)
+    {
+        using var scope = _serviceProvider.CreateScope();
+        return await action(scope.ServiceProvider);
+    }
+}
\ No newline at end of file
diff --git a/src/Infrastructure.AgentFramework/Tools/WebSearchTool.cs b/src/Infrastructure.AgentFramework/Tools/WebSearchTool.cs
index 88a2ef4..f65f76b 100644
--- a/src/Infrastructure.AgentFramework/Tools/WebSearchTool.cs
+++ b/src/Infrastructure.AgentFramework/Tools/WebSearchTool.cs
@@ -1,18 +1,17 @@
 using System.ComponentModel;
-using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Goodtocode.AgentFramework.Infrastructure.AgentFramework.Tools;
 
-public sealed class WebSearchTool(IServiceProvider serviceProvider) : AITool
+public sealed class WebSearchTool(IServiceProvider serviceProvider) : ScopedAgentTool(serviceProvider)
 {
-    private readonly IServiceProvider _serviceProvider = serviceProvider;
-
-    [Description("Search the public web and return ranked results.")]
+    [Description("Search the public web for current external information and return ranked results. Use only when the answer is not available from the user's chat sessions or actor data.")]
     public async Task<WebSearchResult> SearchAsync(string query, CancellationToken cancellationToken = default)
     {
-        using var scope = _serviceProvider.CreateScope();
-        var webSearchProvider = scope.ServiceProvider.GetRequiredService<IWebSearchProvider>();
-        return await webSearchProvider.SearchAsync(query, cancellationToken);
+        return await ResolveScopedAsync(async provider =>
+        {
+            var webSearchProvider = provider.GetRequiredService<IWebSearchProvider>();
+            return await webSearchProvider.SearchAsync(query, cancellationToken);
+        });
     }
 }
\ No newline at end of file
diff --git a/src/Presentation.Web/Features/Chat/ChatPage.razor b/src/Presentation.Web/Features/Chat/ChatPage.razor
index e2aeb60..6a6d07b 100644
--- a/src/Presentation.Web/Features/Chat/ChatPage.razor
+++ b/src/Presentation.Web/Features/Chat/ChatPage.razor
@@ -7,6 +7,7 @@
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.JSInterop
+@using System.Text.RegularExpressions
 
 @attribute [Authorize]
 @implements IAsyncDisposable
@@ -45,10 +46,13 @@
     </FluentGridItem>
 
     <FluentGridItem xs="12">
+      <ChatActionStrip Actions="pendingActions" OnActionClicked="HandleActionClickedAsync" />
       <NewChatMessageInput Width="100%"
+                           @ref="chatMessageInputRef"
                            Sessions="chatSessions"
                            OnSessionCreated="HandleSessionCreated"
                            OnMessageSubmitted="HandleMessageSubmitted" />
+      <SuggestedPromptsStrip Suggestions="SuggestedPrompts" OnPromptClicked="HandleSuggestedPromptClickedAsync" />
     </FluentGridItem>
   }
   else
@@ -80,10 +84,13 @@
     <FluentGridItem xs="0" md="2"></FluentGridItem>
     <FluentGridItem xs="0" md="1"></FluentGridItem>
     <FluentGridItem xs="12" md="8">
+      <ChatActionStrip Actions="pendingActions" OnActionClicked="HandleActionClickedAsync" />
       <NewChatMessageCard Width="100%"
+                          @ref="chatMessageCardRef"
                           Sessions="chatSessions"
                           OnSessionCreated="HandleSessionCreated"
                           OnMessageSubmitted="HandleMessageSubmitted" />
+      <SuggestedPromptsStrip Suggestions="SuggestedPrompts" OnPromptClicked="HandleSuggestedPromptClickedAsync" />
     </FluentGridItem>
     <FluentGridItem xs="0" md="1"></FluentGridItem>
   }
@@ -95,9 +102,19 @@
   private ChatSessionsModel chatSessions = new ChatSessionsModel();
   private ChatSessionList? chatSessionListRef;
   private ChatSessionStrip? chatSessionStripRef;
+  private NewChatMessageCard? chatMessageCardRef;
+  private NewChatMessageInput? chatMessageInputRef;
   private bool isMobileLayout;
   private bool shouldScrollToBottom;
   private IJSObjectReference? chatPageJsModule;
+  private List<ChatActionOption> pendingActions = [];
+  private static readonly IReadOnlyList<string> SuggestedPrompts =
+  [
+    "List my recent chat sessions",
+    "Find an actor by name",
+    "Search the web for current information"
+  ];
+  private static readonly Regex ActionTokenRegex = new(@"\[action\|(?<label>[^|\]]+)\|(?<prompt>[^\]]+)\]", RegexOptions.Compiled);
 
   protected override async Task OnInitializedAsync()
   {
@@ -117,6 +134,7 @@
     chatSessionListRef?.ClearSelection();
     chatSessionStripRef?.ClearSelection();
     chatSessions.ClearActive();
+    pendingActions = [];
     StateHasChanged();
   }
 
@@ -124,6 +142,7 @@
   {
     chatSessions.Add(chatSession);
     chatSessions.SetActive(chatSession);
+    RefreshPendingActions();
     shouldScrollToBottom = true;
     StateHasChanged();
   }
@@ -132,6 +151,7 @@
   {
     chatSessions.ClearActive();
     chatSessions.SetActive(chatSession);
+    RefreshPendingActions();
     shouldScrollToBottom = true;
     StateHasChanged();
   }
@@ -144,10 +164,65 @@
       chatSessions.RefreshItem(session);
     }
 
+    RefreshPendingActions();
     shouldScrollToBottom = true;
     StateHasChanged();
   }
 
+  private async Task HandleSuggestedPromptClickedAsync(string prompt)
+  {
+    await SubmitPromptAsync(prompt);
+  }
+
+  private async Task HandleActionClickedAsync(ChatActionOption action)
+  {
+    pendingActions = [];
+    await SubmitPromptAsync(action.Prompt);
+  }
+
+  private async Task SubmitPromptAsync(string prompt)
+  {
+    if (isMobileLayout && chatMessageInputRef is not null)
+    {
+      await chatMessageInputRef.SubmitPresetMessageAsync(prompt);
+      return;
+    }
+
+    if (chatMessageCardRef is not null)
+    {
+      await chatMessageCardRef.SubmitPresetMessageAsync(prompt);
+      return;
+    }
+
+    if (chatMessageInputRef is not null)
+    {
+      await chatMessageInputRef.SubmitPresetMessageAsync(prompt);
+    }
+  }
+
+  private void RefreshPendingActions()
+  {
+    pendingActions = [];
+    var latestAssistant = chatSessions.ActiveSession?.Messages?.LastOrDefault(message =>
+      string.Equals(message.Role, "assistant", StringComparison.OrdinalIgnoreCase)
+      || string.Equals(message.Role, "system", StringComparison.OrdinalIgnoreCase));
+
+    if (string.IsNullOrWhiteSpace(latestAssistant?.Content))
+    {
+      return;
+    }
+
+    foreach (Match match in ActionTokenRegex.Matches(latestAssistant.Content))
+    {
+      var label = match.Groups["label"].Value.Trim();
+      var prompt = match.Groups["prompt"].Value.Trim();
+      if (!string.IsNullOrWhiteSpace(label) && !string.IsNullOrWhiteSpace(prompt))
+      {
+        pendingActions.Add(new ChatActionOption { Label = label, Prompt = prompt });
+      }
+    }
+  }
+
   protected override async Task OnAfterRenderAsync(bool firstRender)
   {
     if (firstRender)
diff --git a/src/Presentation.Web/Features/Chat/Components/ChatActionStrip.razor b/src/Presentation.Web/Features/Chat/Components/ChatActionStrip.razor
new file mode 100644
index 0000000..d51e064
--- /dev/null
+++ b/src/Presentation.Web/Features/Chat/Components/ChatActionStrip.razor
@@ -0,0 +1,22 @@
+@using Goodtocode.AgentFramework.Presentation.Web.Features.Chat.Models
+
+@if (Actions.Count > 0)
+{
+    <FluentStack Orientation="Orientation.Horizontal"
+                 HorizontalAlignment="HorizontalAlignment.Center"
+                 Wrap="true"
+                 Style="width:100%; margin-bottom:8px; gap:8px;">
+        @foreach (var action in Actions)
+        {
+            <FluentButton Appearance="Appearance.Stealth"
+                          OnClick="() => OnActionClicked.InvokeAsync(action)">
+                @action.Label
+            </FluentButton>
+        }
+    </FluentStack>
+}
+
+@code {
+    [Parameter] public IReadOnlyList<ChatActionOption> Actions { get; set; } = [];
+    [Parameter] public EventCallback<ChatActionOption> OnActionClicked { get; set; }
+}
\ No newline at end of file
diff --git a/src/Presentation.Web/Features/Chat/Components/ChatMessageList.razor b/src/Presentation.Web/Features/Chat/Components/ChatMessageList.razor
index 52112ee..472b599 100644
--- a/src/Presentation.Web/Features/Chat/Components/ChatMessageList.razor
+++ b/src/Presentation.Web/Features/Chat/Components/ChatMessageList.razor
@@ -1,9 +1,8 @@
 @using Goodtocode.AgentFramework.Presentation.Web.Features.Chat.Models
 @using Goodtocode.AgentFramework.Presentation.Web.Features.Chat.Formatting
 @using Microsoft.AspNetCore.Components
-@using Microsoft.JSInterop
+@using System.Text.RegularExpressions
 
-@inject IJSRuntime JSRuntime
 @inject IChatMessageFormatter ChatMessageFormatter
 
 <FluentStack Orientation="Orientation.Vertical" VerticalAlignment="VerticalAlignment.Top" VerticalGap="8" Style="@($"width:{Width}; max-width:100%; margin-inline:auto;")">
@@ -30,15 +29,20 @@
 
 
 @code {
+    private static readonly Regex ActionToken = new(@"\[action\|(?<label>[^|\]]+)\|(?<prompt>[^\]]+)\]", RegexOptions.Compiled);
+
     [Parameter]
     public IEnumerable<ChatMessageModel> Messages { get; set; } = new List<ChatMessageModel>();
 
     [Parameter]
     public string Width { get; set; } = "100%";
 
-    private bool IsUserMessage(ChatMessageModel message) =>
+    private static bool IsUserMessage(ChatMessageModel message) =>
         message?.Role?.ToLowerInvariant() == "user";
 
     private string FormatAssistantMessage(ChatMessageModel message)
-        => ChatMessageFormatter.FormatAssistantMessageAsHtml(message.Content ?? string.Empty);
+        => ChatMessageFormatter.FormatAssistantMessageAsHtml(RemoveActionTokens(message.Content ?? string.Empty));
+
+    private static string RemoveActionTokens(string message)
+        => ActionToken.Replace(message, string.Empty).Trim();
 }
diff --git a/src/Presentation.Web/Features/Chat/Components/NewChatMessageCard.razor b/src/Presentation.Web/Features/Chat/Components/NewChatMessageCard.razor
index 6b3517b..7ccac09 100644
--- a/src/Presentation.Web/Features/Chat/Components/NewChatMessageCard.razor
+++ b/src/Presentation.Web/Features/Chat/Components/NewChatMessageCard.razor
@@ -4,7 +4,7 @@
 @inject IChatService chatService
 
 <FluentCard Height="@Height" Width="@Width">
-    <EditForm FormName="ChatMessageCardSubmit" Model="messageModel" OnValidSubmit="SubmitMessage">
+    <EditForm FormName="ChatMessageCardSubmit" Model="messageModel" OnValidSubmit="SubmitMessageAsync">
         <FluentStack Orientation="Orientation.Horizontal" HorizontalAlignment="HorizontalAlignment.Center" VerticalAlignment="VerticalAlignment.Center" Wrap="true">
             <FluentTextField Style="width:70%;" @bind-Value="messageModel.NewMessage"
                              Placeholder="Type your message here..."
@@ -40,7 +40,18 @@
         editContext = new EditContext(messageModel);
     }
 
-    private async Task SubmitMessage()
+    public async Task SubmitPresetMessageAsync(string message)
+    {
+        if (string.IsNullOrWhiteSpace(message))
+        {
+            return;
+        }
+
+        messageModel.NewMessage = message;
+        await SubmitMessageAsync();
+    }
+
+    private async Task SubmitMessageAsync()
     {
         if (isSubmitting)
         {
diff --git a/src/Presentation.Web/Features/Chat/Components/NewChatMessageInput.razor b/src/Presentation.Web/Features/Chat/Components/NewChatMessageInput.razor
index 138cf9b..d19cb80 100644
--- a/src/Presentation.Web/Features/Chat/Components/NewChatMessageInput.razor
+++ b/src/Presentation.Web/Features/Chat/Components/NewChatMessageInput.razor
@@ -3,7 +3,7 @@
 
 @inject IChatService chatService
 
-<EditForm FormName="ChatMessageInputSubmit" Model="messageModel" OnValidSubmit="SubmitMessage">
+<EditForm FormName="ChatMessageInputSubmit" Model="messageModel" OnValidSubmit="SubmitMessageAsync">
     <FluentStack Orientation="Orientation.Horizontal" HorizontalAlignment="HorizontalAlignment.Center" VerticalAlignment="VerticalAlignment.Center" Wrap="true" Style="max-width:90%;">
         <FluentTextField Style="width:70%;" @bind-Value="messageModel.NewMessage"
                          Placeholder="Type your message here..."
@@ -38,7 +38,18 @@
         editContext = new EditContext(messageModel);
     }
 
-    private async Task SubmitMessage()
+    public async Task SubmitPresetMessageAsync(string message)
+    {
+        if (string.IsNullOrWhiteSpace(message))
+        {
+            return;
+        }
+
+        messageModel.NewMessage = message;
+        await SubmitMessageAsync();
+    }
+
+    private async Task SubmitMessageAsync()
     {
         if (isSubmitting)
         {
diff --git a/src/Presentation.Web/Features/Chat/Components/SuggestedPromptsStrip.razor b/src/Presentation.Web/Features/Chat/Components/SuggestedPromptsStrip.razor
new file mode 100644
index 0000000..9f6e249
--- /dev/null
+++ b/src/Presentation.Web/Features/Chat/Components/SuggestedPromptsStrip.razor
@@ -0,0 +1,20 @@
+@if (Suggestions.Count > 0)
+{
+    <FluentStack Orientation="Orientation.Horizontal"
+                 HorizontalAlignment="HorizontalAlignment.Center"
+                 Wrap="true"
+                 Style="width:100%; margin-top:8px; gap:8px;">
+        @foreach (var suggestion in Suggestions)
+        {
+            <FluentButton Appearance="Appearance.Lightweight"
+                          OnClick="() => OnPromptClicked.InvokeAsync(suggestion)">
+                @suggestion
+            </FluentButton>
+        }
+    </FluentStack>
+}
+
+@code {
+    [Parameter] public IReadOnlyList<string> Suggestions { get; set; } = [];
+    [Parameter] public EventCallback<string> OnPromptClicked { get; set; }
+}
\ No newline at end of file
diff --git a/src/Presentation.Web/Features/Chat/Models/ChatActionOption.cs b/src/Presentation.Web/Features/Chat/Models/ChatActionOption.cs
new file mode 100644
index 0000000..6e866d9
--- /dev/null
+++ b/src/Presentation.Web/Features/Chat/Models/ChatActionOption.cs
@@ -0,0 +1,7 @@
+namespace Goodtocode.AgentFramework.Presentation.Web.Features.Chat.Models;
+
+public sealed class ChatActionOption
+{
+    public string Label { get; init; } = string.Empty;
+    public string Prompt { get; init; } = string.Empty;
+}
\ No newline at end of file
diff --git a/src/Tests.Integration/Actor/GetOurActorsByNameQuery.feature b/src/Tests.Integration/Actor/GetOurActorsByNameQuery.feature
new file mode 100644
index 0000000..b6c08bf
--- /dev/null
+++ b/src/Tests.Integration/Actor/GetOurActorsByNameQuery.feature
@@ -0,0 +1,22 @@
+@getOurActorsByNameQuery
+Feature: Get Our Actors By Name Query
+As a tenant user
+When I search actors by name
+I receive only matching actors from my tenant
+
+Scenario: Get actors by name
+	Given I have a definition "<def>"
+	And I search for actor name "<name>"
+	And matching actors in my tenant exist "<exists>"
+	And matching actors in another tenant exist "<otherTenantExists>"
+	When I get actors by name
+	Then The response is "<result>"
+	And If the response has validation issues I see the "<responseErrors>" in the response
+	And The actor search response count is "<count>"
+
+Examples:
+	| def                         | result     | responseErrors | name  | exists | otherTenantExists | count |
+	| success current tenant      | Success    |                | Avery | true   | false             | 1     |
+	| success excludes other tenant | Success  |                | Avery | true   | true              | 1     |
+	| success no matching actors  | Success    |                | Avery | false  | true              | 0     |
+	| bad request empty name      | BadRequest | Name           |       | false  | false             | 0     |
\ No newline at end of file
diff --git a/src/Tests.Integration/Actor/GetOurActorsByNameQuery.feature.cs b/src/Tests.Integration/Actor/GetOurActorsByNameQuery.feature.cs
new file mode 100644
index 0000000..f95681e
--- /dev/null
+++ b/src/Tests.Integration/Actor/GetOurActorsByNameQuery.feature.cs
@@ -0,0 +1,188 @@
+// ------------------------------------------------------------------------------
+//  <auto-generated>
+//      This code was generated by Reqnroll (https://reqnroll.net/).
+//      Reqnroll Version:3.0.0.0
+//      Reqnroll Generator Version:3.0.0.0
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if
+//      the code is regenerated.
+//  </auto-generated>
+// ------------------------------------------------------------------------------
+#region Designer generated code
+#pragma warning disable
+using Reqnroll;
+namespace Goodtocode.AgentFramework.Tests.Integration.Actor
+{
+    
+    
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "3.0.0.0")]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute()]
+    public partial class GetOurActorsByNameQueryFeature
+    {
+        
+        private global::Reqnroll.ITestRunner testRunner;
+        
+        private Microsoft.VisualStudio.TestTools.UnitTesting.TestContext _testContext;
+        
+        private static string[] featureTags = new string[] {
+                "getOurActorsByNameQuery"};
+        
+        private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Actor", "Get Our Actors By Name Query", "As a tenant user\r\nWhen I search actors by name\r\nI receive only matching actors fr" +
+                "om my tenant", global::Reqnroll.ProgrammingLanguage.CSharp, featureTags, InitializeCucumberMessages());
+        
+#line 1 "GetOurActorsByNameQuery.feature"
+#line hidden
+        
+        public virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
+        {
+            get
+            {
+                return this._testContext;
+            }
+            set
+            {
+                this._testContext = value;
+            }
+        }
+        
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute()]
+        public static async global::System.Threading.Tasks.Task FeatureSetupAsync(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext testContext)
+        {
+        }
+        
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute()]
+        public static async global::System.Threading.Tasks.Task FeatureTearDownAsync()
+        {
+            await global::Reqnroll.TestRunnerManager.ReleaseFeatureAsync(featureInfo);
+        }
+        
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.TestInitializeAttribute()]
+        public async global::System.Threading.Tasks.Task TestInitializeAsync()
+        {
+            testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo);
+            try
+            {
+                if (((testRunner.FeatureContext != null) 
+                            && (testRunner.FeatureContext.FeatureInfo.Equals(featureInfo) == false)))
+                {
+                    await testRunner.OnFeatureEndAsync();
+                }
+            }
+            finally
+            {
+                if (((testRunner.FeatureContext != null) 
+                            && testRunner.FeatureContext.BeforeFeatureHookFailed))
+                {
+                    throw new global::Reqnroll.ReqnrollException("Scenario skipped because of previous before feature hook error");
+                }
+                if ((testRunner.FeatureContext == null))
+                {
+                    await testRunner.OnFeatureStartAsync(featureInfo);
+                }
+            }
+        }
+        
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.TestCleanupAttribute()]
+        public async global::System.Threading.Tasks.Task TestTearDownAsync()
+        {
+            if ((testRunner == null))
+            {
+                return;
+            }
+            try
+            {
+                await testRunner.OnScenarioEndAsync();
+            }
+            finally
+            {
+                global::Reqnroll.TestRunnerManager.ReleaseTestRunner(testRunner);
+                testRunner = null;
+            }
+        }
+        
+        public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, global::Reqnroll.RuleInfo ruleInfo)
+        {
+            testRunner.OnScenarioInitialize(scenarioInfo, ruleInfo);
+            testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs<Microsoft.VisualStudio.TestTools.UnitTesting.TestContext>(_testContext);
+        }
+        
+        public async global::System.Threading.Tasks.Task ScenarioStartAsync()
+        {
+            await testRunner.OnScenarioStartAsync();
+        }
+        
+        public async global::System.Threading.Tasks.Task ScenarioCleanupAsync()
+        {
+            await testRunner.CollectScenarioErrorsAsync();
+        }
+        
+        private static global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages InitializeCucumberMessages()
+        {
+            return new global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages("Actor/GetOurActorsByNameQuery.feature.ndjson", 6);
+        }
+        
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute(callerLineNumber: 7, DisplayName="Get actors by name")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Get actors by name")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Get Our Actors By Name Query")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.TestCategoryAttribute("getOurActorsByNameQuery")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("success current tenant", "Success", "", "Avery", "true", "false", "1", "0", null, DisplayName="Get actors by name(success current tenant,Success,,Avery,true,false,1,0)")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("success excludes other tenant", "Success", "", "Avery", "true", "true", "1", "1", null, DisplayName="Get actors by name(success excludes other tenant,Success,,Avery,true,true,1,1)")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("success no matching actors", "Success", "", "Avery", "false", "true", "0", "2", null, DisplayName="Get actors by name(success no matching actors,Success,,Avery,false,true,0,2)")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("bad request empty name", "BadRequest", "Name", "", "false", "false", "0", "3", null, DisplayName="Get actors by name(bad request empty name,BadRequest,Name,,false,false,0,3)")]
+        public async global::System.Threading.Tasks.Task GetActorsByName(string def, string result, string responseErrors, string name, string exists, string otherTenantExists, string count, string @__pickleIndex, string[] exampleTags)
+        {
+            string[] tagsOfScenario = exampleTags;
+            global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary();
+            argumentsOfScenario.Add("def", def);
+            argumentsOfScenario.Add("result", result);
+            argumentsOfScenario.Add("responseErrors", responseErrors);
+            argumentsOfScenario.Add("name", name);
+            argumentsOfScenario.Add("exists", exists);
+            argumentsOfScenario.Add("otherTenantExists", otherTenantExists);
+            argumentsOfScenario.Add("count", count);
+            string pickleIndex = @__pickleIndex;
+            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get actors by name", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex);
+            string[] tagsOfRule = ((string[])(null));
+            global::Reqnroll.RuleInfo ruleInfo = null;
+#line 7
+this.ScenarioInitialize(scenarioInfo, ruleInfo);
+#line hidden
+            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
+            {
+                await testRunner.SkipScenarioAsync();
+            }
+            else
+            {
+                await this.ScenarioStartAsync();
+#line 8
+ await testRunner.GivenAsync(string.Format("I have a definition \"{0}\"", def), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
+#line hidden
+#line 9
+ await testRunner.AndAsync(string.Format("I search for actor name \"{0}\"", name), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
+#line hidden
+#line 10
+ await testRunner.AndAsync(string.Format("matching actors in my tenant exist \"{0}\"", exists), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
+#line hidden
+#line 11
+ await testRunner.AndAsync(string.Format("matching actors in another tenant exist \"{0}\"", otherTenantExists), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
+#line hidden
+#line 12
+ await testRunner.WhenAsync("I get actors by name", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
+#line hidden
+#line 13
+ await testRunner.ThenAsync(string.Format("The response is \"{0}\"", result), ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
+#line hidden
+#line 14
+ await testRunner.AndAsync(string.Format("If the response has validation issues I see the \"{0}\" in the response", responseErrors), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
+#line hidden
+#line 15
+ await testRunner.AndAsync(string.Format("The actor search response count is \"{0}\"", count), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
+#line hidden
+            }
+            await this.ScenarioCleanupAsync();
+        }
+    }
+}
+#pragma warning restore
+#endregion
diff --git a/src/Tests.Integration/Actor/GetOurActorsByNameQueryStepDefinitions.cs b/src/Tests.Integration/Actor/GetOurActorsByNameQueryStepDefinitions.cs
new file mode 100644
index 0000000..7440fd6
--- /dev/null
+++ b/src/Tests.Integration/Actor/GetOurActorsByNameQueryStepDefinitions.cs
@@ -0,0 +1,96 @@
+using Goodtocode.AgentFramework.Core.Application.Actor;
+using Goodtocode.AgentFramework.Core.Domain.Actor;
+
+namespace Goodtocode.AgentFramework.Tests.Integration.Actor;
+
+[Binding]
+[Scope(Tag = "getOurActorsByNameQuery")]
+public class GetOurActorsByNameQueryStepDefinitions : TestBase
+{
+    private string _name = string.Empty;
+    private bool _exists;
+    private bool _otherTenantExists;
+    private ICollection<ActorDto>? _response;
+
+    [Given(@"I have a definition ""([^""]*)""")]
+    public void GivenIHaveADefinition(string def)
+    {
+        base.def = def;
+    }
+
+    [Given(@"I search for actor name ""([^""]*)""")]
+    public void GivenISearchForActorName(string name)
+    {
+        _name = name;
+    }
+
+    [Given(@"matching actors in my tenant exist ""([^""]*)""")]
+    public void GivenMatchingActorsInMyTenantExist(string exists)
+    {
+        bool.TryParse(exists, out _exists).ShouldBeTrue();
+    }
+
+    [Given(@"matching actors in another tenant exist ""([^""]*)""")]
+    public void GivenMatchingActorsInAnotherTenantExist(string exists)
+    {
+        bool.TryParse(exists, out _otherTenantExists).ShouldBeTrue();
+    }
+
+    [When(@"I get actors by name")]
+    public async Task WhenIGetActorsByName()
+    {
+        if (_exists)
+        {
+            context.Actors.Add(ActorEntity.Create(
+                ownerId: rlsContext.OwnerId,
+                tenantId: rlsContext.TenantId,
+                firstName: _name,
+                lastName: "CurrentTenant",
+                email: "current@example.test"));
+        }
+
+        if (_otherTenantExists)
+        {
+            context.Actors.Add(ActorEntity.Create(
+                ownerId: Guid.NewGuid(),
+                tenantId: Guid.NewGuid(),
+                firstName: _name,
+                lastName: "OtherTenant",
+                email: "other@example.test"));
+        }
+
+        await context.SaveChangesAsync(CancellationToken.None);
+
+        try
+        {
+            _response = await Sender.Send(new GetOurActorsByNameQuery
+            {
+                Name = _name
+            }, CancellationToken.None);
+            responseType = CommandResponseType.Successful;
+        }
+        catch (Exception exception)
+        {
+            responseType = HandleAssignResponseType(exception);
+        }
+    }
+
+    [Then(@"The response is ""([^""]*)""")]
+    public void ThenTheResponseIs(string result)
+    {
+        HandleHasResponseType(result);
+    }
+
+    [Then(@"If the response has validation issues I see the ""([^""]*)"" in the response")]
+    public void ThenIfTheResponseHasValidationIssuesISeeTheInTheResponse(string expectedErrors)
+    {
+        HandleExpectedValidationErrorsAssertions(expectedErrors);
+    }
+
+    [Then(@"The actor search response count is ""([^""]*)""")]
+    public void ThenTheActorSearchResponseCountIs(string count)
+    {
+        int.TryParse(count, out var expectedCount).ShouldBeTrue();
+        _response?.Count.ShouldBe(expectedCount);
+    }
+}
\ No newline at end of file
diff --git a/src/Tests.Integration/Chat/GetMyChatSessionMessagesQuery.feature b/src/Tests.Integration/Chat/GetMyChatSessionMessagesQuery.feature
new file mode 100644
index 0000000..790cd4f
--- /dev/null
+++ b/src/Tests.Integration/Chat/GetMyChatSessionMessagesQuery.feature
@@ -0,0 +1,22 @@
+@getMyChatSessionMessagesQuery
+Feature: Get My Chat Session Messages Query
+As a chat-session owner
+When I request messages for a chat session
+I receive only messages that I own within my tenant
+
+Scenario: Get chat session messages
+	Given I have a definition "<def>"
+	And the requested session is "<requestedSession>"
+	And messages in my chat session exist "<exists>"
+	And messages in another owner's chat session exist "<otherOwnerExists>"
+	When I get my chat session messages
+	Then The response is "<result>"
+	And If the response has validation issues I see the "<responseErrors>" in the response
+	And The chat session message response count is "<count>"
+
+Examples:
+	| def                              | result     | responseErrors | requestedSession | exists | otherOwnerExists | count |
+	| success current owner            | Success    |                | current          | true   | false            | 1     |
+	| success excludes other owner     | Success    |                | current          | true   | true             | 1     |
+	| success no messages for my session | Success  |                | other            | false  | true             | 0     |
+	| bad request empty session id     | BadRequest | ChatSessionId  | empty            | false  | false            | 0     |
\ No newline at end of file
diff --git a/src/Tests.Integration/Chat/GetMyChatSessionMessagesQuery.feature.cs b/src/Tests.Integration/Chat/GetMyChatSessionMessagesQuery.feature.cs
new file mode 100644
index 0000000..80769b3
--- /dev/null
+++ b/src/Tests.Integration/Chat/GetMyChatSessionMessagesQuery.feature.cs
@@ -0,0 +1,191 @@
+// ------------------------------------------------------------------------------
+//  <auto-generated>
+//      This code was generated by Reqnroll (https://reqnroll.net/).
+//      Reqnroll Version:3.0.0.0
+//      Reqnroll Generator Version:3.0.0.0
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if
+//      the code is regenerated.
+//  </auto-generated>
+// ------------------------------------------------------------------------------
+#region Designer generated code
+#pragma warning disable
+using Reqnroll;
+namespace Goodtocode.AgentFramework.Tests.Integration.Chat
+{
+    
+    
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "3.0.0.0")]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute()]
+    public partial class GetMyChatSessionMessagesQueryFeature
+    {
+        
+        private global::Reqnroll.ITestRunner testRunner;
+        
+        private Microsoft.VisualStudio.TestTools.UnitTesting.TestContext _testContext;
+        
+        private static string[] featureTags = new string[] {
+                "getMyChatSessionMessagesQuery"};
+        
+        private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Chat", "Get My Chat Session Messages Query", "As a chat-session owner\r\nWhen I request messages for a chat session\r\nI receive on" +
+                "ly messages that I own within my tenant", global::Reqnroll.ProgrammingLanguage.CSharp, featureTags, InitializeCucumberMessages());
+        
+#line 1 "GetMyChatSessionMessagesQuery.feature"
+#line hidden
+        
+        public virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
+        {
+            get
+            {
+                return this._testContext;
+            }
+            set
+            {
+                this._testContext = value;
+            }
+        }
+        
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute()]
+        public static async global::System.Threading.Tasks.Task FeatureSetupAsync(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext testContext)
+        {
+        }
+        
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute()]
+        public static async global::System.Threading.Tasks.Task FeatureTearDownAsync()
+        {
+            await global::Reqnroll.TestRunnerManager.ReleaseFeatureAsync(featureInfo);
+        }
+        
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.TestInitializeAttribute()]
+        public async global::System.Threading.Tasks.Task TestInitializeAsync()
+        {
+            testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo);
+            try
+            {
+                if (((testRunner.FeatureContext != null) 
+                            && (testRunner.FeatureContext.FeatureInfo.Equals(featureInfo) == false)))
+                {
+                    await testRunner.OnFeatureEndAsync();
+                }
+            }
+            finally
+            {
+                if (((testRunner.FeatureContext != null) 
+                            && testRunner.FeatureContext.BeforeFeatureHookFailed))
+                {
+                    throw new global::Reqnroll.ReqnrollException("Scenario skipped because of previous before feature hook error");
+                }
+                if ((testRunner.FeatureContext == null))
+                {
+                    await testRunner.OnFeatureStartAsync(featureInfo);
+                }
+            }
+        }
+        
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.TestCleanupAttribute()]
+        public async global::System.Threading.Tasks.Task TestTearDownAsync()
+        {
+            if ((testRunner == null))
+            {
+                return;
+            }
+            try
+            {
+                await testRunner.OnScenarioEndAsync();
+            }
+            finally
+            {
+                global::Reqnroll.TestRunnerManager.ReleaseTestRunner(testRunner);
+                testRunner = null;
+            }
+        }
+        
+        public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, global::Reqnroll.RuleInfo ruleInfo)
+        {
+            testRunner.OnScenarioInitialize(scenarioInfo, ruleInfo);
+            testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs<Microsoft.VisualStudio.TestTools.UnitTesting.TestContext>(_testContext);
+        }
+        
+        public async global::System.Threading.Tasks.Task ScenarioStartAsync()
+        {
+            await testRunner.OnScenarioStartAsync();
+        }
+        
+        public async global::System.Threading.Tasks.Task ScenarioCleanupAsync()
+        {
+            await testRunner.CollectScenarioErrorsAsync();
+        }
+        
+        private static global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages InitializeCucumberMessages()
+        {
+            return new global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages("Chat/GetMyChatSessionMessagesQuery.feature.ndjson", 6);
+        }
+        
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute(callerLineNumber: 7, DisplayName="Get chat session messages")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Get chat session messages")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Get My Chat Session Messages Query")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.TestCategoryAttribute("getMyChatSessionMessagesQuery")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("success current owner", "Success", "", "current", "true", "false", "1", "0", null, DisplayName="Get chat session messages(success current owner,Success,,current,true,false,1,0)")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("success excludes other owner", "Success", "", "current", "true", "true", "1", "1", null, DisplayName="Get chat session messages(success excludes other owner,Success,,current,true,true" +
+            ",1,1)")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("success no messages for my session", "Success", "", "other", "false", "true", "0", "2", null, DisplayName="Get chat session messages(success no messages for my session,Success,,other,false" +
+            ",true,0,2)")]
+        [global::Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("bad request empty session id", "BadRequest", "ChatSessionId", "empty", "false", "false", "0", "3", null, DisplayName="Get chat session messages(bad request empty session id,BadRequest,ChatSessionId,e" +
+            "mpty,false,false,0,3)")]
+        public async global::System.Threading.Tasks.Task GetChatSessionMessages(string def, string result, string responseErrors, string requestedSession, string exists, string otherOwnerExists, string count, string @__pickleIndex, string[] exampleTags)
+        {
+            string[] tagsOfScenario = exampleTags;
+            global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary();
+            argumentsOfScenario.Add("def", def);
+            argumentsOfScenario.Add("result", result);
+            argumentsOfScenario.Add("responseErrors", responseErrors);
+            argumentsOfScenario.Add("requestedSession", requestedSession);
+            argumentsOfScenario.Add("exists", exists);
+            argumentsOfScenario.Add("otherOwnerExists", otherOwnerExists);
+            argumentsOfScenario.Add("count", count);
+            string pickleIndex = @__pickleIndex;
+            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get chat session messages", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex);
+            string[] tagsOfRule = ((string[])(null));
+            global::Reqnroll.RuleInfo ruleInfo = null;
+#line 7
+this.ScenarioInitialize(scenarioInfo, ruleInfo);
+#line hidden
+            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
+            {
+                await testRunner.SkipScenarioAsync();
+            }
+            else
+            {
+                await this.ScenarioStartAsync();
+#line 8
+ await testRunner.GivenAsync(string.Format("I have a definition \"{0}\"", def), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
+#line hidden
+#line 9
+ await testRunner.AndAsync(string.Format("the requested session is \"{0}\"", requestedSession), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
+#line hidden
+#line 10
+ await testRunner.AndAsync(string.Format("messages in my chat session exist \"{0}\"", exists), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
+#line hidden
+#line 11
+ await testRunner.AndAsync(string.Format("messages in another owner\'s chat session exist \"{0}\"", otherOwnerExists), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
+#line hidden
+#line 12
+ await testRunner.WhenAsync("I get my chat session messages", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
+#line hidden
+#line 13
+ await testRunner.ThenAsync(string.Format("The response is \"{0}\"", result), ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
+#line hidden
+#line 14
+ await testRunner.AndAsync(string.Format("If the response has validation issues I see the \"{0}\" in the response", responseErrors), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
+#line hidden
+#line 15
+ await testRunner.AndAsync(string.Format("The chat session message response count is \"{0}\"", count), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
+#line hidden
+            }
+            await this.ScenarioCleanupAsync();
+        }
+    }
+}
+#pragma warning restore
+#endregion
diff --git a/src/Tests.Integration/Chat/GetMyChatSessionMessagesQueryStepDefinitions.cs b/src/Tests.Integration/Chat/GetMyChatSessionMessagesQueryStepDefinitions.cs
new file mode 100644
index 0000000..c877936
--- /dev/null
+++ b/src/Tests.Integration/Chat/GetMyChatSessionMessagesQueryStepDefinitions.cs
@@ -0,0 +1,122 @@
+using Goodtocode.AgentFramework.Core.Application.Chat;
+using Goodtocode.AgentFramework.Core.Domain.Chat;
+
+namespace Goodtocode.AgentFramework.Tests.Integration.Chat;
+
+[Binding]
+[Scope(Tag = "getMyChatSessionMessagesQuery")]
+public class GetMyChatSessionMessagesQueryStepDefinitions : TestBase
+{
+    private string _requestedSession = string.Empty;
+    private bool _exists;
+    private bool _otherOwnerExists;
+    private Guid _currentSessionId;
+    private Guid _otherSessionId;
+    private ICollection<ChatMessageDto>? _response;
+
+    [Given(@"I have a definition ""([^""]*)""")]
+    public void GivenIHaveADefinition(string def)
+    {
+        base.def = def;
+    }
+
+    [Given(@"the requested session is ""([^""]*)""")]
+    public void GivenTheRequestedSessionIs(string requestedSession)
+    {
+        _requestedSession = requestedSession;
+    }
+
+    [Given(@"messages in my chat session exist ""([^""]*)""")]
+    public void GivenMessagesInMyChatSessionExist(string exists)
+    {
+        bool.TryParse(exists, out _exists).ShouldBeTrue();
+    }
+
+    [Given(@"messages in another owner's chat session exist ""([^""]*)""")]
+    public void GivenMessagesInAnotherOwnersChatSessionExist(string exists)
+    {
+        bool.TryParse(exists, out _otherOwnerExists).ShouldBeTrue();
+    }
+
+    [When(@"I get my chat session messages")]
+    public async Task WhenIGetMyChatSessionMessages()
+    {
+        if (_exists)
+        {
+            var session = ChatSessionEntity.Create(
+                ownerId: rlsContext.OwnerId,
+                tenantId: rlsContext.TenantId,
+                actorId: Guid.NewGuid(),
+                title: "Current session");
+            var message = ChatMessageEntity.Create(
+                ownerId: rlsContext.OwnerId,
+                tenantId: rlsContext.TenantId,
+                chatSessionId: session.Id,
+                role: ChatMessageRole.user,
+                content: "Current owner message");
+            session.Messages.Add(message);
+            context.ChatSessions.Add(session);
+            _currentSessionId = session.Id;
+        }
+
+        if (_otherOwnerExists)
+        {
+            var otherOwnerId = Guid.NewGuid();
+            var session = ChatSessionEntity.Create(
+                ownerId: otherOwnerId,
+                tenantId: rlsContext.TenantId,
+                actorId: Guid.NewGuid(),
+                title: "Other owner session");
+            var message = ChatMessageEntity.Create(
+                ownerId: otherOwnerId,
+                tenantId: rlsContext.TenantId,
+                chatSessionId: session.Id,
+                role: ChatMessageRole.user,
+                content: "Other owner message");
+            session.Messages.Add(message);
+            context.ChatSessions.Add(session);
+            _otherSessionId = session.Id;
+        }
+
+        await context.SaveChangesAsync(CancellationToken.None);
+
+        var chatSessionId = _requestedSession switch
+        {
+            "current" => _currentSessionId,
+            "other" => _otherSessionId,
+            _ => Guid.Empty
+        };
+
+        try
+        {
+            _response = await Sender.Send(new GetMyChatSessionMessagesQuery
+            {
+                ChatSessionId = chatSessionId
+            }, CancellationToken.None);
+            responseType = CommandResponseType.Successful;
+        }
+        catch (Exception exception)
+        {
+            responseType = HandleAssignResponseType(exception);
+        }
+    }
+
+    [Then(@"The response is ""([^""]*)""")]
+    public void ThenTheResponseIs(string result)
+    {
+        HandleHasResponseType(result);
+    }
+
+    [Then(@"If the response has validation issues I see the ""([^""]*)"" in the response")]
+    public void ThenIfTheResponseHasValidationIssuesISeeTheInTheResponse(string expectedErrors)
+    {
+        HandleExpectedValidationErrorsAssertions(expectedErrors);
+    }
+
+    [Then(@"The chat session message response count is ""([^""]*)""")]
+    public void ThenTheChatSessionMessageResponseCountIs(string count)
+    {
+        int.TryParse(count, out var expectedCount).ShouldBeTrue();
+        _response?.Count.ShouldBe(expectedCount);
+    }
+}
\ No newline at end of file
diff --git a/src/Tests.Integration/TestBase.cs b/src/Tests.Integration/TestBase.cs
index f860315..939c5c2 100644
--- a/src/Tests.Integration/TestBase.cs
+++ b/src/Tests.Integration/TestBase.cs
@@ -2,6 +2,7 @@
 using Goodtocode.AgentFramework.Core.Application.Abstractions;
 using Goodtocode.AgentFramework.Core.Application.Common.Exceptions;
 using Goodtocode.AgentFramework.Infrastructure.AgentFramework.Options;
+using Goodtocode.AgentFramework.Infrastructure.AgentFramework.Execution;
 using Goodtocode.AgentFramework.Infrastructure.SqlServer.Persistence;
 using Goodtocode.AgentFramework.Tests.Integration.Mocks;
 using Microsoft.Agents.AI;
@@ -63,6 +64,7 @@ public TestBase()
             typeof(TestInjectUserContextBehavior<,>));
 
         services.AddApplicationServices();
+        services.AddScoped<IToolApplicationExecutor, ToolApplicationExecutor>();
 
         services.AddDbContext<AgentFrameworkContext>(options =>
             options.UseInMemoryDatabase($"AgentFrameworkContext-{Guid.NewGuid()}")