feat(worker): resolve and seed session skills before each run
This commit is contained in:
@@ -4,6 +4,7 @@ using ClaudeDo.Data.Models;
|
||||
using ClaudeDo.Data.Repositories;
|
||||
using ClaudeDo.Worker.Config;
|
||||
using ClaudeDo.Worker.Hub;
|
||||
using ClaudeDo.Worker.Skills;
|
||||
using ClaudeDo.Worker.State;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
|
||||
@@ -22,6 +23,7 @@ public sealed class TaskRunner
|
||||
private readonly ITaskStateService _state;
|
||||
private readonly TaskRunTokenRegistry _tokens;
|
||||
private readonly AttachmentStore _attachments;
|
||||
private readonly ISessionSkillSeeder _skillSeeder;
|
||||
|
||||
public TaskRunner(
|
||||
IClaudeProcess claude,
|
||||
@@ -33,7 +35,8 @@ public sealed class TaskRunner
|
||||
ILogger<TaskRunner> logger,
|
||||
ITaskStateService state,
|
||||
TaskRunTokenRegistry tokens,
|
||||
AttachmentStore attachments)
|
||||
AttachmentStore attachments,
|
||||
ISessionSkillSeeder skillSeeder)
|
||||
{
|
||||
_claude = claude;
|
||||
_dbFactory = dbFactory;
|
||||
@@ -45,6 +48,7 @@ public sealed class TaskRunner
|
||||
_state = state;
|
||||
_tokens = tokens;
|
||||
_attachments = attachments;
|
||||
_skillSeeder = skillSeeder;
|
||||
}
|
||||
|
||||
public async Task RunAsync(TaskEntity task, string slot, CancellationToken ct, bool alreadyClaimed = false)
|
||||
@@ -122,6 +126,8 @@ public sealed class TaskRunner
|
||||
}
|
||||
await _broadcaster.TaskStarted(slot, task.Id, now);
|
||||
|
||||
await _skillSeeder.SeedAsync(runDir, resolvedConfig.SkillNames, wtCtx is not null, ct);
|
||||
|
||||
// Build prompt: title + description + only the OPEN sub-tasks (resolved ones are dropped).
|
||||
var prompt = TaskPromptComposer.Compose(
|
||||
task.Title, task.Description,
|
||||
@@ -242,6 +248,8 @@ public sealed class TaskRunner
|
||||
}
|
||||
await _broadcaster.TaskStarted(slot, taskId, now);
|
||||
|
||||
await _skillSeeder.SeedAsync(runDir, resolvedConfig.SkillNames, wtCtx is not null, ct);
|
||||
|
||||
try
|
||||
{
|
||||
var nextRunNumber = lastRun.RunNumber + 1;
|
||||
@@ -505,13 +513,70 @@ public sealed class TaskRunner
|
||||
var instructions = MergeInstructions(
|
||||
systemFile, improvementPrompt, global.DefaultClaudeInstructions, listConfig?.SystemPrompt, task.SystemPrompt);
|
||||
|
||||
var requestedSkills = UnionSkillNames(task.SessionSkills, listConfig?.SessionSkills, global.SessionSkills);
|
||||
var skillNames = await FilterToInstalledSkillsAsync(task.Id, requestedSkills, ct);
|
||||
|
||||
return new ClaudeRunConfig(
|
||||
Model: task.Model ?? listConfig?.Model ?? global.DefaultModel,
|
||||
SystemPrompt: string.IsNullOrWhiteSpace(instructions) ? null : instructions,
|
||||
AgentPath: task.AgentPath ?? listConfig?.AgentPath,
|
||||
ResumeSessionId: resumeSessionId,
|
||||
MaxTurns: ResolveMaxTurns(task.MaxTurns, listConfig?.MaxTurns, global.DefaultMaxTurns),
|
||||
PermissionMode: global.DefaultPermissionMode);
|
||||
PermissionMode: global.DefaultPermissionMode,
|
||||
SkillNames: skillNames);
|
||||
}
|
||||
|
||||
private async Task<IReadOnlyList<string>> FilterToInstalledSkillsAsync(
|
||||
string taskId, IReadOnlyList<string> requestedSkills, CancellationToken ct)
|
||||
{
|
||||
if (requestedSkills.Count == 0) return requestedSkills;
|
||||
|
||||
List<SessionSkillEntity> installed;
|
||||
using (var ctx = _dbFactory.CreateDbContext())
|
||||
{
|
||||
var skillRepo = new SessionSkillRepository(ctx);
|
||||
installed = (await skillRepo.ListAsync(ct)).ToList();
|
||||
}
|
||||
|
||||
var installedNames = installed.Select(s => s.Name).ToHashSet(StringComparer.Ordinal);
|
||||
var resolved = requestedSkills.Where(installedNames.Contains).ToList();
|
||||
var dropped = requestedSkills.Where(n => !installedNames.Contains(n)).ToList();
|
||||
if (dropped.Count > 0)
|
||||
{
|
||||
_logger.LogWarning(
|
||||
"Task {TaskId}: dropped unknown session skill(s) not found in registry: {SkillNames}",
|
||||
taskId, string.Join(", ", dropped));
|
||||
}
|
||||
|
||||
return resolved;
|
||||
}
|
||||
|
||||
internal static IReadOnlyList<string> UnionSkillNames(params string?[] jsonArrays)
|
||||
{
|
||||
var names = new List<string>();
|
||||
var seen = new HashSet<string>(StringComparer.Ordinal);
|
||||
foreach (var json in jsonArrays)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(json)) continue;
|
||||
|
||||
string[]? parsed;
|
||||
try
|
||||
{
|
||||
parsed = JsonSerializer.Deserialize<string[]>(json);
|
||||
}
|
||||
catch (JsonException)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if (parsed is null) continue;
|
||||
|
||||
foreach (var name in parsed)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(name) && seen.Add(name))
|
||||
names.Add(name);
|
||||
}
|
||||
}
|
||||
return names;
|
||||
}
|
||||
|
||||
internal static int? ResolveMaxTurns(int? taskTurns, int? listTurns, int globalDefault)
|
||||
|
||||
Reference in New Issue
Block a user