feat(attachments): inject reference files into the run + clean up files on delete

TaskRunner appends attached files (absolute paths) to the run prompt as the
read-only Reference files section. Task and list deletes now remove the
on-disk attachment dir eagerly, and a startup AttachmentOrphanRecovery sweep
drops any attachments/<taskId>/ whose task no longer exists (covers list
cascade and planning-discard paths).
This commit is contained in:
Mika Kuns
2026-06-22 17:22:36 +02:00
parent 5be4b5c5fb
commit 6a0c0f59a5
15 changed files with 265 additions and 12 deletions

View File

@@ -9,6 +9,18 @@ public sealed class AttachmentStore
public AttachmentStore(string? root = null)
=> _root = root ?? Paths.Expand("~/.todo-app/attachments");
public string Root => _root;
public IReadOnlyList<string> EnumerateTaskIds()
{
if (!Directory.Exists(_root)) return Array.Empty<string>();
return Directory.GetDirectories(_root)
.Select(Path.GetFileName)
.Where(n => n is not null)
.Select(n => n!)
.ToList();
}
public string TaskDir(string taskId)
=> Path.Combine(_root, taskId);

View File

@@ -6,8 +6,13 @@ namespace ClaudeDo.Data.Repositories;
public sealed class ListRepository
{
private readonly ClaudeDoDbContext _context;
private readonly AttachmentStore _attachments;
public ListRepository(ClaudeDoDbContext context) => _context = context;
public ListRepository(ClaudeDoDbContext context, AttachmentStore? attachments = null)
{
_context = context;
_attachments = attachments ?? new AttachmentStore();
}
public async Task AddAsync(ListEntity entity, CancellationToken ct = default)
{
@@ -23,7 +28,13 @@ public sealed class ListRepository
public async Task DeleteAsync(string listId, CancellationToken ct = default)
{
var taskIds = await _context.Tasks
.Where(t => t.ListId == listId)
.Select(t => t.Id)
.ToListAsync(ct);
await _context.Lists.Where(l => l.Id == listId).ExecuteDeleteAsync(ct);
foreach (var id in taskIds)
_attachments.DeleteTaskDir(id);
}
public async Task<ListEntity?> GetByIdAsync(string listId, CancellationToken ct = default)

View File

@@ -7,8 +7,13 @@ namespace ClaudeDo.Data.Repositories;
public sealed class TaskRepository
{
private readonly ClaudeDoDbContext _context;
private readonly AttachmentStore _attachments;
public TaskRepository(ClaudeDoDbContext context) => _context = context;
public TaskRepository(ClaudeDoDbContext context, AttachmentStore? attachments = null)
{
_context = context;
_attachments = attachments ?? new AttachmentStore();
}
#region CRUD
@@ -37,6 +42,7 @@ public sealed class TaskRepository
public async Task DeleteAsync(string taskId, CancellationToken ct = default)
{
await _context.Tasks.Where(t => t.Id == taskId).ExecuteDeleteAsync(ct);
_attachments.DeleteTaskDir(taskId);
}
public async Task<TaskEntity?> GetByIdAsync(string taskId, CancellationToken ct = default)

View File

@@ -0,0 +1,51 @@
using ClaudeDo.Data;
using Microsoft.EntityFrameworkCore;
namespace ClaudeDo.Worker.Lifecycle;
/// <summary>
/// Startup-only sweep: deletes attachment directories whose task no longer exists in the DB.
/// </summary>
public sealed class AttachmentOrphanRecovery : IHostedService
{
private readonly IDbContextFactory<ClaudeDoDbContext> _dbFactory;
private readonly AttachmentStore _store;
private readonly ILogger<AttachmentOrphanRecovery> _logger;
public AttachmentOrphanRecovery(
IDbContextFactory<ClaudeDoDbContext> dbFactory,
AttachmentStore store,
ILogger<AttachmentOrphanRecovery> logger)
{
_dbFactory = dbFactory;
_store = store;
_logger = logger;
}
public async Task StartAsync(CancellationToken cancellationToken)
{
var taskIds = _store.EnumerateTaskIds();
if (taskIds.Count == 0)
{
_logger.LogInformation("Attachment orphan recovery: no attachment directories found");
return;
}
await using var ctx = await _dbFactory.CreateDbContextAsync(cancellationToken);
var existingIds = (await ctx.Tasks
.Where(t => taskIds.Contains(t.Id))
.Select(t => t.Id)
.ToListAsync(cancellationToken)).ToHashSet();
var orphans = taskIds.Where(id => !existingIds.Contains(id)).ToList();
foreach (var id in orphans)
_store.DeleteTaskDir(id);
if (orphans.Count > 0)
_logger.LogWarning("Attachment orphan recovery: removed {Count} orphaned attachment director(ies)", orphans.Count);
else
_logger.LogInformation("Attachment orphan recovery: no orphaned attachment directories found");
}
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
}

View File

@@ -46,8 +46,10 @@ builder.Services.AddDbContextFactory<ClaudeDoDbContext>(opt =>
opt.UseSqlite($"Data Source={cfg.DbPath}"));
builder.Services.AddSingleton(cfg);
builder.Services.AddSingleton<AttachmentStore>();
builder.Services.AddHostedService<StaleTaskRecovery>();
builder.Services.AddHostedService<OrphanRecovery>();
builder.Services.AddHostedService<AttachmentOrphanRecovery>();
builder.Services.AddSignalR().AddJsonProtocol(options =>
{
options.PayloadSerializerOptions.Converters.Add(new System.Text.Json.Serialization.JsonStringEnumConverter());

View File

@@ -21,6 +21,7 @@ public sealed class TaskRunner
private readonly ILogger<TaskRunner> _logger;
private readonly ITaskStateService _state;
private readonly TaskRunTokenRegistry _tokens;
private readonly AttachmentStore _attachments;
public TaskRunner(
IClaudeProcess claude,
@@ -31,7 +32,8 @@ public sealed class TaskRunner
WorkerConfig cfg,
ILogger<TaskRunner> logger,
ITaskStateService state,
TaskRunTokenRegistry tokens)
TaskRunTokenRegistry tokens,
AttachmentStore attachments)
{
_claude = claude;
_dbFactory = dbFactory;
@@ -42,6 +44,7 @@ public sealed class TaskRunner
_logger = logger;
_state = state;
_tokens = tokens;
_attachments = attachments;
}
public async Task RunAsync(TaskEntity task, string slot, CancellationToken ct, bool alreadyClaimed = false)
@@ -54,6 +57,7 @@ public sealed class TaskRunner
ListConfigEntity? listConfig;
List<SubtaskEntity> subtasks;
List<string>? attachmentPaths = null;
using (var context = _dbFactory.CreateDbContext())
{
var listRepo = new ListRepository(context);
@@ -67,6 +71,11 @@ public sealed class TaskRunner
var subtaskRepo = new SubtaskRepository(context);
subtasks = await subtaskRepo.GetByTaskIdAsync(task.Id, ct);
var attachmentRepo = new TaskAttachmentRepository(context);
var attachments = await attachmentRepo.ListByTaskIdAsync(task.Id, ct);
if (attachments.Count > 0)
attachmentPaths = attachments.Select(a => Path.Combine(_attachments.TaskDir(task.Id), a.FileName)).ToList();
}
// Determine working directory: worktree or sandbox.
@@ -114,7 +123,8 @@ public sealed class TaskRunner
// Build prompt: title + description + only the OPEN sub-tasks (resolved ones are dropped).
var prompt = TaskPromptComposer.Compose(
task.Title, task.Description,
subtasks.Select(s => (s.Title, s.Completed)));
subtasks.Select(s => (s.Title, s.Completed)),
attachmentPaths);
// Run 1.
var result = await RunOnceAsync(task.Id, task.Title, slot, runDir, resolvedConfig, 1, false, prompt, ct);