releases/ClaudeDo
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 24 Wiki Activity

feat(worker): resolve and seed session skills before each run

Browse Source
This commit is contained in:
Mika Kuns
2026-07-23 16:47:14 +02:00
committed by mika kuns
parent dea2b7db8b
commit 4626481359
17 changed files with 546 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ClaudeDo.Worker.Tests/Runner/ContinueAsyncExceptionTests.cs
+1 -1
View File
@@ -36,7 +36,7 @@ public sealed class ContinueAsyncExceptionTests : IDisposable
var state = TaskStateServiceBuilder.Build(dbFactory).State;
var wt = new WorktreeManager(new ClaudeDo.Data.Git.GitService(), dbFactory, _cfg, NullLogger<WorktreeManager>.Instance);
return new TaskRunner(claude, dbFactory, broadcaster, wt, new ClaudeArgsBuilder(), _cfg,
NullLogger<TaskRunner>.Instance, state, new TaskRunTokenRegistry(), new AttachmentStore());
NullLogger<TaskRunner>.Instance, state, new TaskRunTokenRegistry(), new AttachmentStore(), new FakeSessionSkillSeeder());
}
[Fact]
tests/ClaudeDo.Worker.Tests/Runner/SkillResolutionTests.cs
+44
View File
@@ -0,0 +1,44 @@
using ClaudeDo.Worker.Runner;
using Xunit;
namespace ClaudeDo.Worker.Tests.Runner;
public class SkillResolutionTests
{
[Fact]
public void Null_and_empty_sources_contribute_nothing()
=> Assert.Empty(TaskRunner.UnionSkillNames(null, "", " ", "[]"));
[Fact]
public void Single_source_is_returned_in_order()
=> Assert.Equal(["a", "b"], TaskRunner.UnionSkillNames("""["a","b"]"""));
[Fact]
public void Unions_across_task_list_global_levels()
{
var result = TaskRunner.UnionSkillNames("""["a"]""", """["b"]""", """["c"]""");
Assert.Equal(["a", "b", "c"], result);
}
[Fact]
public void Dedups_ordinal_preserving_first_occurrence_order()
{
var result = TaskRunner.UnionSkillNames("""["a","b"]""", """["b","c"]""", """["a","d"]""");
Assert.Equal(["a", "b", "c", "d"], result);
}
[Fact]
public void Dedup_is_case_sensitive_ordinal()
{
var result = TaskRunner.UnionSkillNames("""["Foo"]""", """["foo"]""");
Assert.Equal(["Foo", "foo"], result);
}
[Fact]
public void Malformed_json_is_ignored_not_thrown()
=> Assert.Equal(["a"], TaskRunner.UnionSkillNames("not json", """["a"]"""));
[Fact]
public void Blank_entries_within_array_are_skipped()
=> Assert.Equal(["a"], TaskRunner.UnionSkillNames("""["a", "", " ", null]"""));
}
tests/ClaudeDo.Worker.Tests/Runner/SkillSeedingWireTests.cs
+141
View File
@@ -0,0 +1,141 @@
using ClaudeDo.Data;
using ClaudeDo.Data.Git;
using ClaudeDo.Data.Models;
using ClaudeDo.Data.Repositories;
using ClaudeDo.Worker.Config;
using ClaudeDo.Worker.Hub;
using ClaudeDo.Worker.Runner;
using ClaudeDo.Worker.Tests.Infrastructure;
using Microsoft.Extensions.Logging.Abstractions;
using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
using Xunit;
namespace ClaudeDo.Worker.Tests.Runner;
/// Verifies that ResolveConfigAsync's skill resolution (union of task/list/global,
/// filtered to what's actually installed in the registry) reaches the seeder call
/// before Claude is invoked.
public sealed class SkillSeedingWireTests : IDisposable
{
private readonly DbFixture _db = new();
private readonly string _tempDir;
private readonly WorkerConfig _cfg;
public SkillSeedingWireTests()
{
_tempDir = Path.Combine(Path.GetTempPath(), $"cd_skillwire_{Guid.NewGuid():N}");
Directory.CreateDirectory(_tempDir);
_cfg = new WorkerConfig { SandboxRoot = _tempDir, LogRoot = _tempDir };
}
public void Dispose() { _db.Dispose(); try { Directory.Delete(_tempDir, true); } catch { } }
private (TaskRunner Runner, FakeSessionSkillSeeder Seeder) BuildRunner()
{
var dbFactory = _db.CreateFactory();
var state = TaskStateServiceBuilder.Build(dbFactory).State;
var wt = new WorktreeManager(new GitService(), dbFactory, _cfg, NullLogger<WorktreeManager>.Instance);
var fake = new FakeClaudeProcess((_, _, _, _, _) =>
Task.FromResult(new RunResult { ExitCode = 0, ResultMarkdown = "ok" }));
var seeder = new FakeSessionSkillSeeder();
var runner = new TaskRunner(fake, dbFactory, new HubBroadcaster(new CapturingHubContext()), wt,
new ClaudeArgsBuilder(), _cfg, NullLogger<TaskRunner>.Instance, state, new TaskRunTokenRegistry(),
new AttachmentStore(), seeder);
return (runner, seeder);
}
private async Task SeedInstalledSkillAsync(string name)
{
using var ctx = _db.CreateContext();
await new SessionSkillRepository(ctx).UpsertAsync(new SessionSkillEntity
{
Name = name,
SourceUrl = "https://example.test/repo.git",
PinnedRef = "deadbeef",
Subpath = $"skills/{name}",
Description = "test skill",
AddedAt = DateTimeOffset.UtcNow,
});
}
[Fact]
public async Task Union_of_task_list_global_skills_reaches_seeder_when_all_installed()
{
await SeedInstalledSkillAsync("alpha");
await SeedInstalledSkillAsync("beta");
await SeedInstalledSkillAsync("gamma");
var dbFactory = _db.CreateFactory();
using (var ctx = _db.CreateContext())
{
ctx.Lists.Add(new ListEntity { Id = "l1", Name = "L", WorkingDir = null, CreatedAt = DateTime.UtcNow });
ctx.ListConfigs.Add(new ListConfigEntity { ListId = "l1", SessionSkills = """["beta"]""" });
ctx.Tasks.Add(new TaskEntity
{
Id = "t1", ListId = "l1", Title = "Task", Status = TaskStatus.Idle,
CreatedAt = DateTime.UtcNow, SessionSkills = """["alpha"]""",
});
// AppSettingsRepository.UpdateAsync doesn't round-trip SessionSkills yet (out of
// scope here), so seed the singleton row directly.
await new AppSettingsRepository(ctx).GetAsync();
ctx.AppSettings.First(s => s.Id == AppSettingsEntity.SingletonId).SessionSkills = """["gamma"]""";
await ctx.SaveChangesAsync();
}
var (runner, seeder) = BuildRunner();
using (var ctx = _db.CreateContext())
await runner.RunAsync((await new TaskRepository(ctx).GetByIdAsync("t1"))!, "slot-1", CancellationToken.None);
Assert.Single(seeder.Calls);
var call = seeder.Calls.Single();
Assert.Equal(["alpha", "beta", "gamma"], call.SkillNames);
Assert.False(call.IsWorktree);
}
[Fact]
public async Task Unknown_skill_names_are_dropped_before_seeding()
{
await SeedInstalledSkillAsync("known");
var dbFactory = _db.CreateFactory();
using (var ctx = _db.CreateContext())
{
ctx.Lists.Add(new ListEntity { Id = "l1", Name = "L", WorkingDir = null, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity
{
Id = "t1", ListId = "l1", Title = "Task", Status = TaskStatus.Idle,
CreatedAt = DateTime.UtcNow, SessionSkills = """["known","not-installed"]""",
});
await ctx.SaveChangesAsync();
}
var (runner, seeder) = BuildRunner();
using (var ctx = _db.CreateContext())
await runner.RunAsync((await new TaskRepository(ctx).GetByIdAsync("t1"))!, "slot-1", CancellationToken.None);
Assert.Single(seeder.Calls);
Assert.Equal(["known"], seeder.Calls.Single().SkillNames);
}
[Fact]
public async Task No_skills_configured_seeds_empty_list()
{
var dbFactory = _db.CreateFactory();
using (var ctx = _db.CreateContext())
{
ctx.Lists.Add(new ListEntity { Id = "l1", Name = "L", WorkingDir = null, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity
{
Id = "t1", ListId = "l1", Title = "Task", Status = TaskStatus.Idle, CreatedAt = DateTime.UtcNow,
});
await ctx.SaveChangesAsync();
}
var (runner, seeder) = BuildRunner();
using (var ctx = _db.CreateContext())
await runner.RunAsync((await new TaskRepository(ctx).GetByIdAsync("t1"))!, "slot-1", CancellationToken.None);
Assert.Single(seeder.Calls);
Assert.Empty(seeder.Calls.Single().SkillNames);
}
}
tests/ClaudeDo.Worker.Tests/Runner/StandaloneChildrenRoutingTests.cs
+2 -2
View File
@@ -45,7 +45,7 @@ public sealed class StandaloneChildrenRoutingTests : IDisposable
var state = TaskStateServiceBuilder.Build(dbFactory).State;
var wt = new WorktreeManager(new GitService(), dbFactory, _cfg, NullLogger<WorktreeManager>.Instance);
var runner = new TaskRunner(fake, dbFactory, broadcaster, wt, new ClaudeArgsBuilder(), _cfg,
NullLogger<TaskRunner>.Instance, state, new TaskRunTokenRegistry(), new AttachmentStore());
NullLogger<TaskRunner>.Instance, state, new TaskRunTokenRegistry(), new AttachmentStore(), new FakeSessionSkillSeeder());
using (var ctx = _db.CreateContext())
await runner.RunAsync((await new TaskRepository(ctx).GetByIdAsync("p1"))!, "slot-1", default, alreadyClaimed: true);
@@ -72,7 +72,7 @@ public sealed class StandaloneChildrenRoutingTests : IDisposable
var state = TaskStateServiceBuilder.Build(dbFactory).State;
var wt = new WorktreeManager(new GitService(), dbFactory, _cfg, NullLogger<WorktreeManager>.Instance);
var runner = new TaskRunner(fake, dbFactory, new HubBroadcaster(new CapturingHubContext()), wt,
new ClaudeArgsBuilder(), _cfg, NullLogger<TaskRunner>.Instance, state, new TaskRunTokenRegistry(), new AttachmentStore());
new ClaudeArgsBuilder(), _cfg, NullLogger<TaskRunner>.Instance, state, new TaskRunTokenRegistry(), new AttachmentStore(), new FakeSessionSkillSeeder());
using (var ctx = _db.CreateContext())
await runner.RunAsync((await new TaskRepository(ctx).GetByIdAsync("solo"))!, "slot-1", default, alreadyClaimed: true);
tests/ClaudeDo.Worker.Tests/Runner/StartRunningGuardTests.cs
+1 -1
View File
@@ -33,7 +33,7 @@ public sealed class StartRunningGuardTests : IDisposable
var state = TaskStateServiceBuilder.Build(dbFactory).State;
var wt = new WorktreeManager(new ClaudeDo.Data.Git.GitService(), dbFactory, _cfg, NullLogger<WorktreeManager>.Instance);
return new TaskRunner(claude, dbFactory, new HubBroadcaster(new CapturingHubContext()), wt,
new ClaudeArgsBuilder(), _cfg, NullLogger<TaskRunner>.Instance, state, new TaskRunTokenRegistry(), new AttachmentStore());
new ClaudeArgsBuilder(), _cfg, NullLogger<TaskRunner>.Instance, state, new TaskRunTokenRegistry(), new AttachmentStore(), new FakeSessionSkillSeeder());
}
[Fact]