Skip to content

Refactors agent activity system #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sfmskywalker merged 6 commits into from
Dec 28, 2025
Merged

Refactors agent activity system #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d04435
Refactor agent and activity system: remove `IAgent` abstraction, enha…
sfmskywalker Dec 25, 2025
cafb803
Remove code-first agent system and related abstractions (`IAgentResol…
sfmskywalker Dec 26, 2025
537de2d
Refactor agent activity system: rename classes and dependencies (`Con…
sfmskywalker Dec 26, 2025
b1d64b9
Refactor host method activity execution and cleanup.
sfmskywalker Dec 27, 2025
99765c3
Update Elsa package versions to 3.6.0-preview builds
sfmskywalker Dec 28, 2025
c72368c
Add `DistributedLock` dependencies to project files
sfmskywalker Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
</PropertyGroup>

<PropertyGroup Label="PackageVersions">
<ElsaVersion>3.6.0-rc1</ElsaVersion>
<ElsaStudioVersion>3.6.0-rc1</ElsaStudioVersion>
<ElsaVersion>3.6.0-preview.4162</ElsaVersion>
<ElsaStudioVersion>3.6.0-preview.1345</ElsaStudioVersion>
Comment on lines +40 to +41
Copy link

Copilot AI Dec 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Elsa package versions have been changed from release candidate (3.6.0-rc1) to preview builds (3.6.0-preview.4162 and 3.6.0-preview.1345). This appears to be a downgrade in version stability, moving from a release candidate back to preview builds. Verify that this is intentional and that these specific preview builds exist and are compatible with the refactored code.

Suggested change
<ElsaVersion>3.6.0-preview.4162</ElsaVersion>
<ElsaStudioVersion>3.6.0-preview.1345</ElsaStudioVersion>
<ElsaVersion>3.6.0-rc1</ElsaVersion>
<ElsaStudioVersion>3.6.0-rc1</ElsaStudioVersion>

Copilot uses AI. Check for mistakes.
</PropertyGroup>

</Project>
3 changes: 3 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@
<PackageVersion Include="Cronos" Version="0.11.1"/>
<PackageVersion Include="CsvHelper" Version="33.1.0"/>
<PackageVersion Include="Dapper" Version="2.1.66"/>
<PackageVersion Include="DistributedLock" Version="2.7.1"/>
<PackageVersion Include="DistributedLock.Postgres" Version="1.3.0"/>
<PackageVersion Include="DistributedLock.Redis" Version="1.1.1"/>
<PackageVersion Include="DistributedLock.FileSystem" Version="1.0.3"/>
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.2.2"/>
<PackageVersion Include="FastEndpoints" Version="7.1.1"/>
Expand Down
4 changes: 2 additions & 2 deletions ...ies/Activities/ConfiguredAgentActivity.cs → ...ts.Activities/Activities/AgentActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
namespace Elsa.Agents.Activities;

/// <summary>
/// An activity that executes a function of a skilled agent. This is an internal activity that is used by <see cref="ConfigurationAgentActivityProvider"/>.
/// An activity that executes a function of a skilled agent. This is an internal activity that is used by <see cref="AgentActivityProvider"/>.
/// </summary>
[Browsable(false)]
public class ConfiguredAgentActivity : CodeActivity
public class AgentActivity : CodeActivity
{
private static JsonSerializerOptions? _serializerOptions;

Expand Down
82 changes: 0 additions & 82 deletions src/modules/agents/Elsa.Agents.Activities/Activities/CodeFirstAgentActivity.cs
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions ...viders/ConfiguredAgentActivityProvider.cs → ...ctivityProviders/AgentActivityProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Elsa.Agents.Activities.ActivityProviders;
/// Provides activities for each registered agent.
/// </summary>
[UsedImplicitly]
public class ConfigurationAgentActivityProvider(
public class AgentActivityProvider(
IKernelConfigProvider kernelConfigProvider,
IActivityDescriber activityDescriber,
IWellKnownTypeRegistry wellKnownTypeRegistry
Expand All @@ -37,7 +37,7 @@ public async ValueTask<IEnumerable<ActivityDescriptor>> GetDescriptorsAsync(Canc

private async Task<ActivityDescriptor> CreateAgentActivityDescriptor(AgentConfig agentConfig, CancellationToken cancellationToken)
{
var activityDescriptor = await activityDescriber.DescribeActivityAsync(typeof(ConfiguredAgentActivity), cancellationToken);
var activityDescriptor = await activityDescriber.DescribeActivityAsync(typeof(AgentActivity), cancellationToken);
var functionName = string.IsNullOrWhiteSpace(agentConfig.FunctionName) ? agentConfig.Name : agentConfig.FunctionName;
var activityTypeName = $"Elsa.Agents.{activityDescriptor.Name.Pascalize()}.{functionName.Pascalize()}";
activityDescriptor.Name = functionName.Pascalize();
Expand All @@ -48,11 +48,11 @@ private async Task<ActivityDescriptor> CreateAgentActivityDescriptor(AgentConfig
activityDescriptor.Category = "Agents";
activityDescriptor.Kind = ActivityKind.Task;
activityDescriptor.RunAsynchronously = true;
activityDescriptor.ClrType = typeof(ConfiguredAgentActivity);
activityDescriptor.ClrType = typeof(AgentActivity);

activityDescriptor.Constructor = context =>
{
var activity = context.CreateActivity<ConfiguredAgentActivity>();
var activity = context.CreateActivity<AgentActivity>();
activity.Type = activityTypeName;
activity.AgentName = agentConfig.Name;
activity.RunAsynchronously = true;
Expand Down
175 changes: 0 additions & 175 deletions ...modules/agents/Elsa.Agents.Activities/ActivityProviders/CodeFirstAgentActivityProvider.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/modules/agents/Elsa.Agents.Activities/Features/AgentActivitiesFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ public class AgentActivitiesFeature(IModule module) : FeatureBase(module)
public override void Apply()
{
Services
.AddActivityProvider<ConfigurationAgentActivityProvider>()
.AddActivityProvider<CodeFirstAgentActivityProvider>()
.AddActivityProvider<AgentActivityProvider>()
.AddNotificationHandler<RefreshActivityRegistry>()
;
}
Expand Down
4 changes: 2 additions & 2 deletions src/modules/agents/Elsa.Agents.Activities/Handlers/RefreshActivityRegistry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
namespace Elsa.Agents.Activities.Handlers;

[UsedImplicitly]
public class RefreshActivityRegistry(IActivityRegistry activityRegistry, ConfigurationAgentActivityProvider configurationAgentActivityProvider) :
public class RefreshActivityRegistry(IActivityRegistry activityRegistry, AgentActivityProvider agentActivityProvider) :
INotificationHandler<AgentDefinitionCreated>,
INotificationHandler<AgentDefinitionUpdated>,
INotificationHandler<AgentDefinitionDeleted>,
Expand All @@ -17,5 +17,5 @@ public class RefreshActivityRegistry(IActivityRegistry activityRegistry, Configu
public Task HandleAsync(AgentDefinitionUpdated notification, CancellationToken cancellationToken) => RefreshRegistryAsync(cancellationToken);
public Task HandleAsync(AgentDefinitionDeleted notification, CancellationToken cancellationToken) => RefreshRegistryAsync(cancellationToken);
public Task HandleAsync(AgentDefinitionsDeletedInBulk notification, CancellationToken cancellationToken) => RefreshRegistryAsync(cancellationToken);
private Task RefreshRegistryAsync(CancellationToken cancellationToken) => activityRegistry.RefreshDescriptorsAsync(configurationAgentActivityProvider, cancellationToken);
private Task RefreshRegistryAsync(CancellationToken cancellationToken) => activityRegistry.RefreshDescriptorsAsync(agentActivityProvider, cancellationToken);
}
8 changes: 0 additions & 8 deletions src/modules/agents/Elsa.Agents.Core/Contracts/IAgent.cs
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/modules/agents/Elsa.Agents.Core/Contracts/IAgentResolver.cs
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions src/modules/agents/Elsa.Agents.Core/Features/AgentsCoreFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Elsa.Agents.Features;
[UsedImplicitly]
public class AgentsCoreFeature(IModule module) : FeatureBase(module)
{
private Func<IServiceProvider, IKernelConfigProvider> _kernelConfigProviderFactory = sp => sp.GetRequiredService<ConfigurationKernelConfigProvider>();
private Func<IServiceProvider, IKernelConfigProvider> _kernelConfigProviderFactory = sp => sp.GetRequiredService<KernelConfigProvider>();

public AgentsCoreFeature UseKernelConfigProvider(Func<IServiceProvider, IKernelConfigProvider> factory)
{
Expand All @@ -30,8 +30,7 @@ public override void Apply()
.AddScoped<IAgentFactory, AgentFactory>()
.AddScoped<ISkillDiscoverer, SkillDiscoverer>()
.AddScoped(_kernelConfigProviderFactory)
.AddScoped<ConfigurationKernelConfigProvider>()
.AddScoped<IAgentResolver, AgentResolver>()
.AddScoped<KernelConfigProvider>()
.AddSkillsProvider<ImageGeneratorSkillsProvider>()
.AddSkillsProvider<DocumentQuerySkillsProvider>()
;
Expand Down
Loading
Loading