Compare commits
10 Commits
74255ddc82
...
d4a46420c9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d4a46420c9 | ||
|
|
f704244b84 | ||
|
|
782110604b | ||
|
|
19bf032a2e | ||
|
|
b7464c9a11 | ||
|
|
524aaf85af | ||
|
|
a9e7479326 | ||
|
|
2e80cc606e | ||
|
|
d099138487 | ||
|
|
2278d97b7e |
@@ -45,6 +45,13 @@ public class ClaudeDoDbContext : DbContext
|
||||
walCmd.ExecuteNonQuery();
|
||||
}
|
||||
|
||||
// Enable FK enforcement — SQLite defaults to OFF per connection.
|
||||
using (var fkCmd = conn.CreateCommand())
|
||||
{
|
||||
fkCmd.CommandText = "PRAGMA foreign_keys=ON;";
|
||||
fkCmd.ExecuteNonQuery();
|
||||
}
|
||||
|
||||
// If the 'lists' table exists but __EFMigrationsHistory does not,
|
||||
// this is a pre-EF database. Baseline the InitialCreate migration.
|
||||
using (var cmd = conn.CreateCommand())
|
||||
|
||||
@@ -267,6 +267,143 @@ public sealed class TaskRepository
|
||||
return child;
|
||||
}
|
||||
|
||||
public async Task<TaskEntity?> SetPlanningStartedAsync(
|
||||
string taskId,
|
||||
string sessionToken,
|
||||
CancellationToken ct = default)
|
||||
{
|
||||
var affected = await _context.Tasks
|
||||
.Where(t => t.Id == taskId && t.Status == TaskStatus.Manual)
|
||||
.ExecuteUpdateAsync(s => s
|
||||
.SetProperty(t => t.Status, TaskStatus.Planning)
|
||||
.SetProperty(t => t.PlanningSessionToken, sessionToken), ct);
|
||||
|
||||
if (affected == 0) return null;
|
||||
return await _context.Tasks.AsNoTracking().FirstOrDefaultAsync(t => t.Id == taskId, ct);
|
||||
}
|
||||
|
||||
public async Task UpdatePlanningSessionIdAsync(
|
||||
string parentId,
|
||||
string sessionId,
|
||||
CancellationToken ct = default)
|
||||
{
|
||||
await _context.Tasks
|
||||
.Where(t => t.Id == parentId)
|
||||
.ExecuteUpdateAsync(s => s
|
||||
.SetProperty(t => t.PlanningSessionId, sessionId), ct);
|
||||
}
|
||||
|
||||
public async Task<TaskEntity?> FindByPlanningTokenAsync(
|
||||
string token,
|
||||
CancellationToken ct = default)
|
||||
{
|
||||
if (string.IsNullOrEmpty(token)) return null;
|
||||
return await _context.Tasks
|
||||
.AsNoTracking()
|
||||
.FirstOrDefaultAsync(t => t.PlanningSessionToken == token, ct);
|
||||
}
|
||||
|
||||
public async Task<int> FinalizePlanningAsync(
|
||||
string parentId,
|
||||
bool queueAgentTasks,
|
||||
CancellationToken ct = default)
|
||||
{
|
||||
using var tx = await _context.Database.BeginTransactionAsync(ct);
|
||||
|
||||
var parent = await _context.Tasks
|
||||
.AsNoTracking()
|
||||
.Include(t => t.List).ThenInclude(l => l.Tags)
|
||||
.FirstOrDefaultAsync(t => t.Id == parentId, ct);
|
||||
if (parent is null || parent.Status != TaskStatus.Planning)
|
||||
throw new InvalidOperationException($"Task {parentId} is not in Planning state.");
|
||||
|
||||
var listHasAgentTag = parent.List.Tags.Any(t => t.Name == "agent");
|
||||
|
||||
var drafts = await _context.Tasks
|
||||
.Include(t => t.Tags)
|
||||
.Where(t => t.ParentTaskId == parentId && t.Status == TaskStatus.Draft)
|
||||
.ToListAsync(ct);
|
||||
|
||||
int count = 0;
|
||||
foreach (var draft in drafts)
|
||||
{
|
||||
var childHasAgentTag = draft.Tags.Any(t => t.Name == "agent");
|
||||
var shouldQueue = queueAgentTasks && (childHasAgentTag || listHasAgentTag);
|
||||
draft.Status = shouldQueue ? TaskStatus.Queued : TaskStatus.Manual;
|
||||
count++;
|
||||
}
|
||||
|
||||
var finalizedAt = DateTime.UtcNow;
|
||||
await _context.Tasks
|
||||
.Where(t => t.Id == parentId)
|
||||
.ExecuteUpdateAsync(s => s
|
||||
.SetProperty(t => t.Status, TaskStatus.Planned)
|
||||
.SetProperty(t => t.PlanningFinalizedAt, finalizedAt)
|
||||
.SetProperty(t => t.PlanningSessionToken, (string?)null), ct);
|
||||
|
||||
await _context.SaveChangesAsync(ct);
|
||||
await tx.CommitAsync(ct);
|
||||
return count;
|
||||
}
|
||||
|
||||
public async Task<bool> DiscardPlanningAsync(
|
||||
string parentId,
|
||||
CancellationToken ct = default)
|
||||
{
|
||||
using var tx = await _context.Database.BeginTransactionAsync(ct);
|
||||
|
||||
var parent = await _context.Tasks
|
||||
.AsNoTracking()
|
||||
.FirstOrDefaultAsync(t => t.Id == parentId, ct);
|
||||
if (parent is null || parent.Status != TaskStatus.Planning)
|
||||
{
|
||||
await tx.RollbackAsync(ct);
|
||||
return false;
|
||||
}
|
||||
|
||||
await _context.Tasks
|
||||
.Where(t => t.ParentTaskId == parentId && t.Status == TaskStatus.Draft)
|
||||
.ExecuteDeleteAsync(ct);
|
||||
|
||||
await _context.Tasks
|
||||
.Where(t => t.Id == parentId)
|
||||
.ExecuteUpdateAsync(s => s
|
||||
.SetProperty(t => t.Status, TaskStatus.Manual)
|
||||
.SetProperty(t => t.PlanningSessionId, (string?)null)
|
||||
.SetProperty(t => t.PlanningSessionToken, (string?)null)
|
||||
.SetProperty(t => t.PlanningFinalizedAt, (DateTime?)null), ct);
|
||||
|
||||
await tx.CommitAsync(ct);
|
||||
return true;
|
||||
}
|
||||
|
||||
public async Task TryCompleteParentAsync(
|
||||
string parentId,
|
||||
CancellationToken ct = default)
|
||||
{
|
||||
var parent = await _context.Tasks.AsNoTracking().FirstOrDefaultAsync(t => t.Id == parentId, ct);
|
||||
if (parent is null || parent.Status != TaskStatus.Planned) return;
|
||||
|
||||
var children = await _context.Tasks
|
||||
.Where(t => t.ParentTaskId == parentId)
|
||||
.Select(t => t.Status)
|
||||
.ToListAsync(ct);
|
||||
|
||||
if (children.Count == 0) return;
|
||||
|
||||
bool allTerminal = children.All(s => s == TaskStatus.Done || s == TaskStatus.Failed);
|
||||
if (!allTerminal) return;
|
||||
|
||||
bool anyFailed = children.Any(s => s == TaskStatus.Failed);
|
||||
var finalStatus = anyFailed ? TaskStatus.Failed : TaskStatus.Done;
|
||||
var finishedAt = DateTime.UtcNow;
|
||||
await _context.Tasks
|
||||
.Where(t => t.Id == parentId)
|
||||
.ExecuteUpdateAsync(s => s
|
||||
.SetProperty(t => t.Status, finalStatus)
|
||||
.SetProperty(t => t.FinishedAt, finishedAt), ct);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Queue selection
|
||||
|
||||
@@ -331,6 +331,8 @@ public sealed class TaskRunner
|
||||
{
|
||||
var taskRepo = new TaskRepository(context);
|
||||
await taskRepo.MarkDoneAsync(task.Id, finishedAt, result.ResultMarkdown, CancellationToken.None);
|
||||
if (task.ParentTaskId is not null)
|
||||
await taskRepo.TryCompleteParentAsync(task.ParentTaskId, CancellationToken.None);
|
||||
}
|
||||
await _broadcaster.WorkerLog($"Finished \"{task.Title}\" (done)", WorkerLogLevel.Success, DateTime.UtcNow);
|
||||
await _broadcaster.TaskFinished(slot, task.Id, "done", finishedAt);
|
||||
@@ -346,6 +348,9 @@ public sealed class TaskRunner
|
||||
using var context = _dbFactory.CreateDbContext();
|
||||
var taskRepo = new TaskRepository(context);
|
||||
await taskRepo.MarkFailedAsync(taskId, finishedAt, result.ErrorMarkdown, CancellationToken.None);
|
||||
var justFailed = await taskRepo.GetByIdAsync(taskId, CancellationToken.None);
|
||||
if (justFailed?.ParentTaskId is not null)
|
||||
await taskRepo.TryCompleteParentAsync(justFailed.ParentTaskId, CancellationToken.None);
|
||||
await _broadcaster.WorkerLog($"Finished \"{taskTitle}\" (failed)", WorkerLogLevel.Error, DateTime.UtcNow);
|
||||
await _broadcaster.TaskFinished(slot, taskId, "failed", finishedAt);
|
||||
_logger.LogWarning("Task {TaskId} failed (turns={Turns}): {Error}", taskId, result.TurnCount, result.ErrorMarkdown);
|
||||
@@ -360,6 +365,9 @@ public sealed class TaskRunner
|
||||
using var context = _dbFactory.CreateDbContext();
|
||||
var taskRepo = new TaskRepository(context);
|
||||
await taskRepo.MarkFailedAsync(taskId, now, error, CancellationToken.None);
|
||||
var justFailed = await taskRepo.GetByIdAsync(taskId, CancellationToken.None);
|
||||
if (justFailed?.ParentTaskId is not null)
|
||||
await taskRepo.TryCompleteParentAsync(justFailed.ParentTaskId, CancellationToken.None);
|
||||
await _broadcaster.WorkerLog($"Finished \"{taskTitle}\" (failed)", WorkerLogLevel.Error, DateTime.UtcNow);
|
||||
await _broadcaster.TaskFinished(slot, taskId, "failed", now);
|
||||
await _broadcaster.TaskUpdated(taskId);
|
||||
|
||||
@@ -0,0 +1,136 @@
|
||||
using ClaudeDo.Data;
|
||||
using ClaudeDo.Data.Models;
|
||||
using ClaudeDo.Data.Repositories;
|
||||
using ClaudeDo.Worker.Tests.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
|
||||
|
||||
namespace ClaudeDo.Worker.Tests.Repositories;
|
||||
|
||||
public sealed class TaskRepositoryParentCompletionTests : IDisposable
|
||||
{
|
||||
private readonly DbFixture _db = new();
|
||||
private readonly ClaudeDoDbContext _ctx;
|
||||
private readonly TaskRepository _tasks;
|
||||
private readonly ListRepository _lists;
|
||||
|
||||
public TaskRepositoryParentCompletionTests()
|
||||
{
|
||||
_ctx = _db.CreateContext();
|
||||
_tasks = new TaskRepository(_ctx);
|
||||
_lists = new ListRepository(_ctx);
|
||||
}
|
||||
|
||||
public void Dispose() { _ctx.Dispose(); _db.Dispose(); }
|
||||
|
||||
private async Task<string> ListAsync()
|
||||
{
|
||||
var id = Guid.NewGuid().ToString();
|
||||
await _lists.AddAsync(new ListEntity { Id = id, Name = "L", CreatedAt = DateTime.UtcNow });
|
||||
return id;
|
||||
}
|
||||
|
||||
private async Task<TaskEntity> PlannedParentAsync(string listId)
|
||||
{
|
||||
var parent = new TaskEntity
|
||||
{
|
||||
Id = Guid.NewGuid().ToString(),
|
||||
ListId = listId,
|
||||
Title = "p",
|
||||
Status = TaskStatus.Planned,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
CommitType = "chore",
|
||||
};
|
||||
await _tasks.AddAsync(parent);
|
||||
return parent;
|
||||
}
|
||||
|
||||
private async Task<TaskEntity> ChildAsync(string listId, string parentId, TaskStatus status)
|
||||
{
|
||||
var child = new TaskEntity
|
||||
{
|
||||
Id = Guid.NewGuid().ToString(),
|
||||
ListId = listId,
|
||||
Title = "c",
|
||||
Status = status,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
CommitType = "chore",
|
||||
ParentTaskId = parentId,
|
||||
};
|
||||
await _tasks.AddAsync(child);
|
||||
return child;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task TryCompleteParentAsync_AllChildrenDone_ParentBecomesDone()
|
||||
{
|
||||
var listId = await ListAsync();
|
||||
var parent = await PlannedParentAsync(listId);
|
||||
await ChildAsync(listId, parent.Id, TaskStatus.Done);
|
||||
await ChildAsync(listId, parent.Id, TaskStatus.Done);
|
||||
|
||||
await _tasks.TryCompleteParentAsync(parent.Id);
|
||||
|
||||
var loaded = await _tasks.GetByIdAsync(parent.Id);
|
||||
Assert.Equal(TaskStatus.Done, loaded!.Status);
|
||||
Assert.NotNull(loaded.FinishedAt);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task TryCompleteParentAsync_OneFailedRestDone_ParentBecomesFailed()
|
||||
{
|
||||
var listId = await ListAsync();
|
||||
var parent = await PlannedParentAsync(listId);
|
||||
await ChildAsync(listId, parent.Id, TaskStatus.Done);
|
||||
await ChildAsync(listId, parent.Id, TaskStatus.Failed);
|
||||
|
||||
await _tasks.TryCompleteParentAsync(parent.Id);
|
||||
|
||||
var loaded = await _tasks.GetByIdAsync(parent.Id);
|
||||
Assert.Equal(TaskStatus.Failed, loaded!.Status);
|
||||
Assert.NotNull(loaded.FinishedAt);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task TryCompleteParentAsync_OneStillRunning_ParentStaysPlanned()
|
||||
{
|
||||
var listId = await ListAsync();
|
||||
var parent = await PlannedParentAsync(listId);
|
||||
await ChildAsync(listId, parent.Id, TaskStatus.Done);
|
||||
await ChildAsync(listId, parent.Id, TaskStatus.Running);
|
||||
|
||||
await _tasks.TryCompleteParentAsync(parent.Id);
|
||||
|
||||
var loaded = await _tasks.GetByIdAsync(parent.Id);
|
||||
Assert.Equal(TaskStatus.Planned, loaded!.Status);
|
||||
Assert.Null(loaded.FinishedAt);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task TryCompleteParentAsync_ChildStillDraft_ParentStaysPlanned()
|
||||
{
|
||||
var listId = await ListAsync();
|
||||
var parent = await PlannedParentAsync(listId);
|
||||
await ChildAsync(listId, parent.Id, TaskStatus.Done);
|
||||
await ChildAsync(listId, parent.Id, TaskStatus.Draft);
|
||||
|
||||
await _tasks.TryCompleteParentAsync(parent.Id);
|
||||
|
||||
var loaded = await _tasks.GetByIdAsync(parent.Id);
|
||||
Assert.Equal(TaskStatus.Planned, loaded!.Status);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task TryCompleteParentAsync_ParentIsNotPlanned_NoChange()
|
||||
{
|
||||
var listId = await ListAsync();
|
||||
var parent = await PlannedParentAsync(listId);
|
||||
await _ctx.Database.ExecuteSqlRawAsync("UPDATE tasks SET status = 'planning' WHERE id = {0}", parent.Id);
|
||||
await ChildAsync(listId, parent.Id, TaskStatus.Done);
|
||||
|
||||
await _tasks.TryCompleteParentAsync(parent.Id);
|
||||
|
||||
var loaded = await _tasks.GetByIdAsync(parent.Id);
|
||||
Assert.Equal(TaskStatus.Planning, loaded!.Status);
|
||||
}
|
||||
}
|
||||
@@ -119,4 +119,211 @@ public sealed class TaskRepositoryPlanningTests : IDisposable
|
||||
await Assert.ThrowsAsync<InvalidOperationException>(() =>
|
||||
_tasks.CreateChildAsync("nonexistent-parent-id", "t", null, null, null));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task SetPlanningStartedAsync_ManualTask_TransitionsToPlanning()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var task = MakeTask(listId, TaskStatus.Manual);
|
||||
await _tasks.AddAsync(task);
|
||||
|
||||
var result = await _tasks.SetPlanningStartedAsync(task.Id, "tok-abc");
|
||||
|
||||
Assert.NotNull(result);
|
||||
Assert.Equal(TaskStatus.Planning, result!.Status);
|
||||
Assert.Equal("tok-abc", result.PlanningSessionToken);
|
||||
|
||||
var loaded = await _tasks.GetByIdAsync(task.Id);
|
||||
Assert.Equal(TaskStatus.Planning, loaded!.Status);
|
||||
Assert.Equal("tok-abc", loaded.PlanningSessionToken);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task SetPlanningStartedAsync_NonManualTask_ReturnsNull()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var task = MakeTask(listId, TaskStatus.Queued);
|
||||
await _tasks.AddAsync(task);
|
||||
|
||||
var result = await _tasks.SetPlanningStartedAsync(task.Id, "tok-xyz");
|
||||
|
||||
Assert.Null(result);
|
||||
var loaded = await _tasks.GetByIdAsync(task.Id);
|
||||
Assert.Equal(TaskStatus.Queued, loaded!.Status);
|
||||
Assert.Null(loaded.PlanningSessionToken);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdatePlanningSessionIdAsync_StoresClaudeSessionId()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var task = MakeTask(listId, TaskStatus.Manual);
|
||||
await _tasks.AddAsync(task);
|
||||
await _tasks.SetPlanningStartedAsync(task.Id, "tok");
|
||||
|
||||
await _tasks.UpdatePlanningSessionIdAsync(task.Id, "claude-session-42");
|
||||
|
||||
var loaded = await _tasks.GetByIdAsync(task.Id);
|
||||
Assert.Equal("claude-session-42", loaded!.PlanningSessionId);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task FindByPlanningTokenAsync_ReturnsTask_WhenTokenMatches()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var task = MakeTask(listId, TaskStatus.Manual);
|
||||
await _tasks.AddAsync(task);
|
||||
await _tasks.SetPlanningStartedAsync(task.Id, "unique-token-123");
|
||||
|
||||
var found = await _tasks.FindByPlanningTokenAsync("unique-token-123");
|
||||
|
||||
Assert.NotNull(found);
|
||||
Assert.Equal(task.Id, found!.Id);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task FindByPlanningTokenAsync_ReturnsNull_WhenTokenUnknown()
|
||||
{
|
||||
var found = await _tasks.FindByPlanningTokenAsync("no-such-token");
|
||||
Assert.Null(found);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task FinalizePlanningAsync_TransitionsDraftsAndParent()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var parent = MakeTask(listId, TaskStatus.Manual);
|
||||
await _tasks.AddAsync(parent);
|
||||
await _tasks.SetPlanningStartedAsync(parent.Id, "tok");
|
||||
|
||||
var c1 = await _tasks.CreateChildAsync(parent.Id, "c1", null, tagNames: new[] { "agent" }, commitType: null);
|
||||
var c2 = await _tasks.CreateChildAsync(parent.Id, "c2", null, tagNames: null, commitType: null);
|
||||
|
||||
var count = await _tasks.FinalizePlanningAsync(parent.Id, queueAgentTasks: true);
|
||||
|
||||
Assert.Equal(2, count);
|
||||
|
||||
var c1Loaded = await _tasks.GetByIdAsync(c1.Id);
|
||||
var c2Loaded = await _tasks.GetByIdAsync(c2.Id);
|
||||
var parentLoaded = await _tasks.GetByIdAsync(parent.Id);
|
||||
|
||||
Assert.Equal(TaskStatus.Queued, c1Loaded!.Status);
|
||||
Assert.Equal(TaskStatus.Manual, c2Loaded!.Status);
|
||||
Assert.Equal(TaskStatus.Planned, parentLoaded!.Status);
|
||||
Assert.NotNull(parentLoaded.PlanningFinalizedAt);
|
||||
Assert.Null(parentLoaded.PlanningSessionToken);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task FinalizePlanningAsync_QueueAgentTasksFalse_AllToManual()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var parent = MakeTask(listId, TaskStatus.Manual);
|
||||
await _tasks.AddAsync(parent);
|
||||
await _tasks.SetPlanningStartedAsync(parent.Id, "tok");
|
||||
var c = await _tasks.CreateChildAsync(parent.Id, "c", null, tagNames: new[] { "agent" }, commitType: null);
|
||||
|
||||
await _tasks.FinalizePlanningAsync(parent.Id, queueAgentTasks: false);
|
||||
|
||||
var cLoaded = await _tasks.GetByIdAsync(c.Id);
|
||||
Assert.Equal(TaskStatus.Manual, cLoaded!.Status);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task FinalizePlanningAsync_ParentWithAgentListTag_ChildIsQueued()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var agentTagId = await _tags.GetOrCreateAsync("agent");
|
||||
await _lists.AddTagAsync(listId, agentTagId);
|
||||
|
||||
var parent = MakeTask(listId, TaskStatus.Manual);
|
||||
await _tasks.AddAsync(parent);
|
||||
await _tasks.SetPlanningStartedAsync(parent.Id, "tok");
|
||||
var c = await _tasks.CreateChildAsync(parent.Id, "c", null, tagNames: null, commitType: null);
|
||||
|
||||
await _tasks.FinalizePlanningAsync(parent.Id, queueAgentTasks: true);
|
||||
|
||||
var cLoaded = await _tasks.GetByIdAsync(c.Id);
|
||||
Assert.Equal(TaskStatus.Queued, cLoaded!.Status);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DiscardPlanningAsync_DeletesDraftsAndResetsParent()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var parent = MakeTask(listId, TaskStatus.Manual);
|
||||
await _tasks.AddAsync(parent);
|
||||
await _tasks.SetPlanningStartedAsync(parent.Id, "tok");
|
||||
await _tasks.UpdatePlanningSessionIdAsync(parent.Id, "claude-42");
|
||||
var c1 = await _tasks.CreateChildAsync(parent.Id, "c1", null, null, null);
|
||||
var c2 = await _tasks.CreateChildAsync(parent.Id, "c2", null, null, null);
|
||||
|
||||
var ok = await _tasks.DiscardPlanningAsync(parent.Id);
|
||||
|
||||
Assert.True(ok);
|
||||
Assert.Null(await _tasks.GetByIdAsync(c1.Id));
|
||||
Assert.Null(await _tasks.GetByIdAsync(c2.Id));
|
||||
|
||||
var parentLoaded = await _tasks.GetByIdAsync(parent.Id);
|
||||
Assert.Equal(TaskStatus.Manual, parentLoaded!.Status);
|
||||
Assert.Null(parentLoaded.PlanningSessionId);
|
||||
Assert.Null(parentLoaded.PlanningSessionToken);
|
||||
Assert.Null(parentLoaded.PlanningFinalizedAt);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DiscardPlanningAsync_OnNonPlanningTask_ReturnsFalse()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var task = MakeTask(listId, TaskStatus.Manual);
|
||||
await _tasks.AddAsync(task);
|
||||
|
||||
var ok = await _tasks.DiscardPlanningAsync(task.Id);
|
||||
|
||||
Assert.False(ok);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteAsync_ParentWithChildren_ThrowsOrDoesNotDelete()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var parent = MakeTask(listId, TaskStatus.Planning);
|
||||
await _tasks.AddAsync(parent);
|
||||
await _tasks.CreateChildAsync(parent.Id, "c", null, null, null);
|
||||
|
||||
// ExecuteDelete bypasses EF change tracking, so SQLite's FK enforcement
|
||||
// (foreign_keys = ON, set by ClaudeDoDbContext) throws SqliteException directly.
|
||||
await Assert.ThrowsAsync<Microsoft.Data.Sqlite.SqliteException>(async () =>
|
||||
{
|
||||
await _tasks.DeleteAsync(parent.Id);
|
||||
});
|
||||
|
||||
var stillThere = await _tasks.GetByIdAsync(parent.Id);
|
||||
Assert.NotNull(stillThere);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetNextQueuedAgentTask_SkipsDraftPlanningPlanned()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var agentTagId = await _tags.GetOrCreateAsync("agent");
|
||||
|
||||
async Task<TaskEntity> T(TaskStatus s, bool withTag, string? parent = null)
|
||||
{
|
||||
var t = MakeTask(listId, s, parentId: parent);
|
||||
await _tasks.AddAsync(t);
|
||||
if (withTag) await _tasks.AddTagAsync(t.Id, agentTagId);
|
||||
return t;
|
||||
}
|
||||
|
||||
var planning = await T(TaskStatus.Planning, withTag: true);
|
||||
var planned = await T(TaskStatus.Planned, withTag: true);
|
||||
var draft = await T(TaskStatus.Draft, withTag: true, parent: planning.Id);
|
||||
var queued = await T(TaskStatus.Queued, withTag: true);
|
||||
|
||||
var picked = await _tasks.GetNextQueuedAgentTaskAsync(DateTime.UtcNow);
|
||||
|
||||
Assert.NotNull(picked);
|
||||
Assert.Equal(queued.Id, picked!.Id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
using ClaudeDo.Data;
|
||||
using ClaudeDo.Data.Models;
|
||||
using ClaudeDo.Data.Repositories;
|
||||
using ClaudeDo.Worker.Tests.Infrastructure;
|
||||
using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
|
||||
|
||||
namespace ClaudeDo.Worker.Tests.Runner;
|
||||
|
||||
public sealed class TaskRunnerParentCompletionTests : IDisposable
|
||||
{
|
||||
private readonly DbFixture _db = new();
|
||||
private readonly ClaudeDoDbContext _ctx;
|
||||
private readonly TaskRepository _tasks;
|
||||
private readonly ListRepository _lists;
|
||||
|
||||
public TaskRunnerParentCompletionTests()
|
||||
{
|
||||
_ctx = _db.CreateContext();
|
||||
_tasks = new TaskRepository(_ctx);
|
||||
_lists = new ListRepository(_ctx);
|
||||
}
|
||||
|
||||
public void Dispose() { _ctx.Dispose(); _db.Dispose(); }
|
||||
|
||||
[Fact]
|
||||
public async Task ChildMarkedDone_LastOne_ParentFinalized()
|
||||
{
|
||||
var listId = Guid.NewGuid().ToString();
|
||||
await _lists.AddAsync(new ListEntity { Id = listId, Name = "L", CreatedAt = DateTime.UtcNow });
|
||||
|
||||
var parent = new TaskEntity
|
||||
{
|
||||
Id = Guid.NewGuid().ToString(),
|
||||
ListId = listId,
|
||||
Title = "p",
|
||||
Status = TaskStatus.Planned,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
CommitType = "chore",
|
||||
};
|
||||
await _tasks.AddAsync(parent);
|
||||
|
||||
var c1 = new TaskEntity
|
||||
{
|
||||
Id = Guid.NewGuid().ToString(),
|
||||
ListId = listId,
|
||||
Title = "c1",
|
||||
Status = TaskStatus.Done,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
CommitType = "chore",
|
||||
ParentTaskId = parent.Id,
|
||||
};
|
||||
var c2 = new TaskEntity
|
||||
{
|
||||
Id = Guid.NewGuid().ToString(),
|
||||
ListId = listId,
|
||||
Title = "c2",
|
||||
Status = TaskStatus.Running,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
CommitType = "chore",
|
||||
ParentTaskId = parent.Id,
|
||||
};
|
||||
await _tasks.AddAsync(c1);
|
||||
await _tasks.AddAsync(c2);
|
||||
|
||||
// Simulate the runner finishing the second child:
|
||||
await _tasks.MarkDoneAsync(c2.Id, DateTime.UtcNow, "done");
|
||||
if (c2.ParentTaskId is not null)
|
||||
await _tasks.TryCompleteParentAsync(c2.ParentTaskId);
|
||||
|
||||
var parentLoaded = await _tasks.GetByIdAsync(parent.Id);
|
||||
Assert.Equal(TaskStatus.Done, parentLoaded!.Status);
|
||||
Assert.NotNull(parentLoaded.FinishedAt);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user