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

feat(data): add task numbers schema, allocator, and backfill migration

Browse Source 
TaskEntity.Number is a global, monotonically increasing, never-reused
integer (displayed as #123), allocated from AppSettingsEntity.NextTaskNumber
via a single UPDATE...RETURNING statement rather than MAX(number)+1, which
would reissue a deleted task's number. Both insert paths (TaskRepository.
AddAsync and CreateChildAsync) route through the new TaskNumberAllocator,
with a bounded retry on a unique-index collision. One migration adds the
columns, backfills existing rows in creation order, and creates the unique
index afterwards. Data-layer only; MCP/UI wiring is later slices.
This commit is contained in:
mika kuns
2026-08-11 10:49:06 +02:00
parent 31a9e87b56
commit 9e46c96b24
25 changed files with 1416 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ClaudeDo.Data.Tests/ForeignKeyTests.cs
+4 -4
View File
@@ -47,8 +47,8 @@ public sealed class ForeignKeyTests : IDisposable
await using (var ctx = Open())
{
ctx.Lists.Add(new ListEntity { Id = listId, Name = "L", CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = parentId, ListId = listId, Title = "Predecessor", Status = TaskStatus.Idle, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = childId, ListId = listId, Title = "Blocked", Status = TaskStatus.Idle, BlockedByTaskId = parentId, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = parentId, Number = 1, ListId = listId, Title = "Predecessor", Status = TaskStatus.Idle, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = childId, Number = 2, ListId = listId, Title = "Blocked", Status = TaskStatus.Idle, BlockedByTaskId = parentId, CreatedAt = DateTime.UtcNow });
await ctx.SaveChangesAsync();
}
@@ -79,8 +79,8 @@ public sealed class ForeignKeyTests : IDisposable
await using (var ctx = Open())
{
ctx.Lists.Add(new ListEntity { Id = listId, Name = "L", CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = predecessorId, ListId = listId, Title = "Predecessor", Status = TaskStatus.Idle, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = dependentId, ListId = listId, Title = "Dependent", Status = TaskStatus.Idle, DependsOnTaskId = predecessorId, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = predecessorId, Number = 1, ListId = listId, Title = "Predecessor", Status = TaskStatus.Idle, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = dependentId, Number = 2, ListId = listId, Title = "Dependent", Status = TaskStatus.Idle, DependsOnTaskId = predecessorId, CreatedAt = DateTime.UtcNow });
await ctx.SaveChangesAsync();
}
tests/ClaudeDo.Data.Tests/MoveToListTests.cs
+6 -6
View File
@@ -42,16 +42,16 @@ public sealed class MoveToListTests : IDisposable
await SeedListsAsync("source", "target");
_ctx.Tasks.Add(new TaskEntity
{
Id = "t1", ListId = "source", Title = "Task", CreatedAt = DateTime.UtcNow, SortOrder = 0,
Id = "t1", Number = 1, ListId = "source", Title = "Task", CreatedAt = DateTime.UtcNow, SortOrder = 0,
});
// Existing tasks already in the target list, so we can assert the moved task lands after them.
_ctx.Tasks.Add(new TaskEntity
{
Id = "existing1", ListId = "target", Title = "Existing 1", CreatedAt = DateTime.UtcNow, SortOrder = 0,
Id = "existing1", Number = 2, ListId = "target", Title = "Existing 1", CreatedAt = DateTime.UtcNow, SortOrder = 0,
});
_ctx.Tasks.Add(new TaskEntity
{
Id = "existing2", ListId = "target", Title = "Existing 2", CreatedAt = DateTime.UtcNow, SortOrder = 1,
Id = "existing2", Number = 3, ListId = "target", Title = "Existing 2", CreatedAt = DateTime.UtcNow, SortOrder = 1,
});
await _ctx.SaveChangesAsync();
_ctx.ChangeTracker.Clear();
@@ -69,16 +69,16 @@ public sealed class MoveToListTests : IDisposable
await SeedListsAsync("source", "target");
_ctx.Tasks.Add(new TaskEntity
{
Id = "parent", ListId = "source", Title = "Parent", CreatedAt = DateTime.UtcNow, SortOrder = 0,
Id = "parent", Number = 1, ListId = "source", Title = "Parent", CreatedAt = DateTime.UtcNow, SortOrder = 0,
});
_ctx.Tasks.Add(new TaskEntity
{
Id = "child", ListId = "source", Title = "Child", CreatedAt = DateTime.UtcNow,
Id = "child", Number = 2, ListId = "source", Title = "Child", CreatedAt = DateTime.UtcNow,
SortOrder = 1, ParentTaskId = "parent",
});
_ctx.Tasks.Add(new TaskEntity
{
Id = "grandchild", ListId = "source", Title = "Grandchild", CreatedAt = DateTime.UtcNow,
Id = "grandchild", Number = 3, ListId = "source", Title = "Grandchild", CreatedAt = DateTime.UtcNow,
SortOrder = 2, ParentTaskId = "child",
});
await _ctx.SaveChangesAsync();
tests/ClaudeDo.Data.Tests/TaskNumberAllocatorTests.cs
+148
View File
@@ -0,0 +1,148 @@
using ClaudeDo.Data;
using ClaudeDo.Data.Models;
using ClaudeDo.Data.Repositories;
using Microsoft.EntityFrameworkCore;
using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
namespace ClaudeDo.Data.Tests;
public sealed class TaskNumberAllocatorTests : IDisposable
{
private readonly string _dbPath;
private readonly DbContextOptions<ClaudeDoDbContext> _options;
private readonly ClaudeDoDbContext _ctx;
public TaskNumberAllocatorTests()
{
_dbPath = Path.Combine(Path.GetTempPath(), $"claudedo_tasknum_{Guid.NewGuid():N}.db");
_options = new DbContextOptionsBuilder<ClaudeDoDbContext>()
.UseSqlite($"Data Source={_dbPath}")
.Options;
_ctx = new ClaudeDoDbContext(_options);
_ctx.Database.EnsureCreated();
}
public void Dispose()
{
_ctx.Dispose();
foreach (var suffix in new[] { "", "-wal", "-shm" })
try { File.Delete(_dbPath + suffix); } catch { }
}
private async Task<string> SeedListAsync(string id = "l1")
{
_ctx.Lists.Add(new ListEntity { Id = id, Name = "Test List", CreatedAt = DateTime.UtcNow });
await _ctx.SaveChangesAsync();
return id;
}
private static TaskEntity NewTask(string listId, string title = "T")
=> new()
{
Id = Guid.NewGuid().ToString(),
ListId = listId,
Title = title,
Status = TaskStatus.Idle,
CreatedAt = DateTime.UtcNow,
};
[Fact]
public async Task AddAsync_assigns_increasing_unique_numbers()
{
await SeedListAsync();
var repo = new TaskRepository(_ctx);
var first = NewTask("l1");
await repo.AddAsync(first);
var second = NewTask("l1");
await repo.AddAsync(second);
Assert.True(first.Number > 0);
Assert.True(second.Number > first.Number);
}
[Fact]
public async Task CreateChildAsync_also_allocates_a_number()
{
await SeedListAsync();
var parent = NewTask("l1");
await new TaskRepository(_ctx).AddAsync(parent);
var child = await new TaskRepository(_ctx).CreateChildAsync(parent.Id, "Child", null, null);
Assert.True(child.Number > 0);
Assert.NotEqual(parent.Number, child.Number);
}
[Fact]
public async Task Deleting_the_highest_numbered_task_does_not_recycle_its_number()
{
await SeedListAsync();
var repo = new TaskRepository(_ctx);
var t1 = NewTask("l1");
await repo.AddAsync(t1);
var t2 = NewTask("l1");
await repo.AddAsync(t2);
Assert.True(t2.Number > t1.Number);
await repo.DeleteAsync(t2.Id);
var t3 = NewTask("l1");
await repo.AddAsync(t3);
Assert.True(t3.Number > t2.Number);
Assert.NotEqual(t2.Number, t3.Number);
}
[Fact]
public async Task Repeated_creation_never_assigns_the_same_number_twice()
{
var listId = await SeedListAsync();
var numbers = new List<int>();
for (var i = 0; i < 20; i++)
{
await using var ctx = new ClaudeDoDbContext(_options);
var task = NewTask(listId, $"T{i}");
await new TaskRepository(ctx).AddAsync(task);
numbers.Add(task.Number);
}
Assert.Equal(numbers.Count, numbers.Distinct().Count());
}
[Fact]
public async Task Concurrent_creation_never_assigns_the_same_number_twice()
{
var listId = await SeedListAsync();
var tasks = Enumerable.Range(0, 10).Select(async i =>
{
await using var ctx = new ClaudeDoDbContext(_options);
var task = NewTask(listId, $"C{i}");
await new TaskRepository(ctx).AddAsync(task);
return task.Number;
});
var numbers = await Task.WhenAll(tasks);
Assert.Equal(numbers.Length, numbers.Distinct().Count());
Assert.All(numbers, n => Assert.True(n > 0));
}
[Fact]
public async Task GetByNumberAsync_finds_the_task_and_returns_null_for_unknown_numbers()
{
await SeedListAsync();
var task = NewTask("l1");
await new TaskRepository(_ctx).AddAsync(task);
var found = await new TaskRepository(_ctx).GetByNumberAsync(task.Number);
var missing = await new TaskRepository(_ctx).GetByNumberAsync(task.Number + 999);
Assert.NotNull(found);
Assert.Equal(task.Id, found!.Id);
Assert.Null(missing);
}
}
tests/ClaudeDo.Data.Tests/TaskNumberMigrationTests.cs
+84
View File
@@ -0,0 +1,84 @@
using ClaudeDo.Data;
using ClaudeDo.Data.Models;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.Extensions.DependencyInjection;
namespace ClaudeDo.Data.Tests;
// EnsureCreated (used by every other Data.Tests fixture) builds the schema straight from the
// current model and skips migrations entirely, so it can never exercise the AddTaskNumbers
// backfill. This test runs a real Migrate() against a database seeded with pre-migration rows.
public sealed class TaskNumberMigrationTests : IDisposable
{
private const string MigrationBeforeTaskNumbers = "20260810115437_AddFailureReason";
private readonly string _dbPath;
private readonly DbContextOptions<ClaudeDoDbContext> _options;
public TaskNumberMigrationTests()
{
_dbPath = Path.Combine(Path.GetTempPath(), $"claudedo_tasknum_migration_{Guid.NewGuid():N}.db");
_options = new DbContextOptionsBuilder<ClaudeDoDbContext>()
.UseSqlite($"Data Source={_dbPath}")
.Options;
}
public void Dispose()
{
foreach (var suffix in new[] { "", "-wal", "-shm" })
try { File.Delete(_dbPath + suffix); } catch { }
}
[Fact]
public async Task Migrate_backfills_task_numbers_in_creation_order_with_id_tiebreak()
{
await using (var ctx = new ClaudeDoDbContext(_options))
{
var migrator = ctx.Database.GetInfrastructure().GetRequiredService<IMigrator>();
migrator.Migrate(MigrationBeforeTaskNumbers);
var conn = ctx.Database.GetDbConnection();
await conn.OpenAsync();
await ExecAsync(conn, """
INSERT INTO lists (id, name, created_at) VALUES ('l1', 'List', '2026-01-01 00:00:00.0000000');
""");
// Inserted out of creation order, and 'd'/'c' share a timestamp to exercise the id tiebreak.
await ExecAsync(conn, InsertTaskSql("d", "2026-01-03 00:00:00.0000000"));
await ExecAsync(conn, InsertTaskSql("a", "2026-01-01 00:00:00.0000000"));
await ExecAsync(conn, InsertTaskSql("c", "2026-01-03 00:00:00.0000000"));
await ExecAsync(conn, InsertTaskSql("b", "2026-01-02 00:00:00.0000000"));
migrator.Migrate();
}
await using var verify = new ClaudeDoDbContext(_options);
var byId = await verify.Tasks.AsNoTracking().ToDictionaryAsync(t => t.Id, t => t.Number);
Assert.Equal(1, byId["a"]);
Assert.Equal(2, byId["b"]);
Assert.Equal(3, byId["c"]);
Assert.Equal(4, byId["d"]);
var numbers = byId.Values.OrderBy(n => n).ToList();
Assert.Equal(new[] { 1, 2, 3, 4 }, numbers);
var settings = await verify.AppSettings.AsNoTracking().FirstAsync(s => s.Id == AppSettingsEntity.SingletonId);
Assert.Equal(5, settings.NextTaskNumber);
}
private static string InsertTaskSql(string id, string createdAt) => $"""
INSERT INTO tasks (id, list_id, title, status, created_at)
VALUES ('{id}', 'l1', 'Task {id}', 'idle', '{createdAt}');
""";
private static async Task ExecAsync(System.Data.Common.DbConnection conn, string sql)
{
await using var cmd = conn.CreateCommand();
cmd.CommandText = sql;
await cmd.ExecuteNonQueryAsync();
}
}
tests/ClaudeDo.Worker.Tests/External/ExternalMcpServiceTests.cs
Vendored
+15 -7
View File
@@ -61,6 +61,7 @@ public sealed class ExternalMcpServiceTests : IDisposable
private readonly HubBroadcaster _broadcaster;
private readonly List<GitRepoFixture> _repos = new();
private readonly List<(string repoDir, string wtPath)> _worktreeCleanups = new();
private int _numberSeed;
private static bool GitAvailable => GitRepoFixture.IsGitAvailable();
@@ -120,6 +121,7 @@ public sealed class ExternalMcpServiceTests : IDisposable
ParentTaskId = parentId,
CreatedAt = DateTime.UtcNow,
CommitType = "chore",
Number = ++_numberSeed,
};
await _tasks.AddAsync(task);
return task;
@@ -532,9 +534,9 @@ public sealed class ExternalMcpServiceTests : IDisposable
{
ctx.Lists.Add(new ListEntity { Id = listId, Name = "L", WorkingDir = repo.RepoDir, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
Status = TaskStatus.WaitingForReview, PlanningPhase = PlanningPhase.Finalized });
Status = TaskStatus.WaitingForReview, PlanningPhase = PlanningPhase.Finalized, Number = ++_numberSeed });
ctx.Tasks.Add(new TaskEntity { Id = childId, ListId = listId, Title = "child", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1 });
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1, Number = ++_numberSeed });
var wtPath = Path.Combine(Path.GetTempPath(), $"wt_{Guid.NewGuid():N}");
_worktreeCleanups.Add((repo.RepoDir, wtPath));
@@ -582,11 +584,11 @@ public sealed class ExternalMcpServiceTests : IDisposable
{
ctx.Lists.Add(new ListEntity { Id = listId, Name = "L", WorkingDir = repo.RepoDir, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
Status = TaskStatus.WaitingForReview, PlanningPhase = PlanningPhase.Finalized });
Status = TaskStatus.WaitingForReview, PlanningPhase = PlanningPhase.Finalized, Number = ++_numberSeed });
ctx.Tasks.Add(new TaskEntity { Id = normalChildId, ListId = listId, Title = "normal child", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1 });
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1, Number = ++_numberSeed });
ctx.Tasks.Add(new TaskEntity { Id = blockedChildId, ListId = listId, Title = "blocked child", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 2, RoadblockCount = 1 });
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 2, RoadblockCount = 1, Number = ++_numberSeed });
var normalWtPath = Path.Combine(Path.GetTempPath(), $"wt_{Guid.NewGuid():N}");
_worktreeCleanups.Add((repo.RepoDir, normalWtPath));
@@ -773,6 +775,7 @@ public sealed class ExternalMcpServiceTests : IDisposable
Status = TaskStatus.Idle,
CreatedAt = DateTime.UtcNow,
CommitType = "chore",
Number = ++_numberSeed,
};
await _tasks.AddAsync(idleUnblocked);
@@ -786,6 +789,7 @@ public sealed class ExternalMcpServiceTests : IDisposable
BlockedByTaskId = "idle-unblocked",
CreatedAt = DateTime.UtcNow,
CommitType = "chore",
Number = ++_numberSeed,
};
await _tasks.AddAsync(idleBlocked);
@@ -798,6 +802,7 @@ public sealed class ExternalMcpServiceTests : IDisposable
Status = TaskStatus.Done,
CreatedAt = DateTime.UtcNow,
CommitType = "chore",
Number = ++_numberSeed,
};
await _tasks.AddAsync(doneTask);
@@ -811,6 +816,7 @@ public sealed class ExternalMcpServiceTests : IDisposable
IsMyDay = true,
CreatedAt = DateTime.UtcNow,
CommitType = "chore",
Number = ++_numberSeed,
};
await _tasks.AddAsync(myDayTask);
@@ -826,6 +832,7 @@ public sealed class ExternalMcpServiceTests : IDisposable
Status = TaskStatus.Idle,
CreatedAt = DateTime.UtcNow,
CommitType = "chore",
Number = ++_numberSeed,
};
await _tasks.AddAsync(excludedRepoTask);
@@ -841,6 +848,7 @@ public sealed class ExternalMcpServiceTests : IDisposable
Status = TaskStatus.Idle,
CreatedAt = DateTime.UtcNow,
CommitType = "chore",
Number = ++_numberSeed,
};
await _tasks.AddAsync(noRepoTask);
@@ -1792,9 +1800,9 @@ public sealed class ExternalMcpServiceTests : IDisposable
{
ctx.Lists.Add(new ListEntity { Id = listId, Name = "L", WorkingDir = repo.RepoDir, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
Status = TaskStatus.WaitingForReview, PlanningPhase = PlanningPhase.Finalized });
Status = TaskStatus.WaitingForReview, PlanningPhase = PlanningPhase.Finalized, Number = ++_numberSeed });
ctx.Tasks.Add(new TaskEntity { Id = childId, ListId = listId, Title = "child", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1 });
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1, Number = ++_numberSeed });
var wtPath = Path.Combine(Path.GetTempPath(), $"wt_{Guid.NewGuid():N}");
_worktreeCleanups.Add((repo.RepoDir, wtPath));
tests/ClaudeDo.Worker.Tests/External/QueueStateMcpToolsTests.cs
Vendored
+2
View File
@@ -22,6 +22,7 @@ public sealed class QueueStateMcpToolsTests : IDisposable
private readonly ListRepository _listRepo;
private readonly WorkerConfig _cfg;
private readonly string _tempDir;
private int _numberSeed;
public QueueStateMcpToolsTests()
{
@@ -86,6 +87,7 @@ public sealed class QueueStateMcpToolsTests : IDisposable
IsManual = isManual,
BlockedByTaskId = blockedByTaskId,
ScheduledFor = scheduledFor,
Number = ++_numberSeed,
};
// Bypass TaskRepository.AddAsync, which overwrites SortOrder with max(listId)+1 --
// these tests need to control SortOrder directly to exercise queue pick order.
tests/ClaudeDo.Worker.Tests/Planning/PlanningAggregatorTests.cs
+6 -6
View File
@@ -67,7 +67,7 @@ public class PlanningAggregatorTests : IDisposable
ctx.Tasks.Add(new TaskEntity
{
Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
Status = TaskStatus.Idle, PlanningPhase = PlanningPhase.Active, SortOrder = 0,
Status = TaskStatus.Idle, PlanningPhase = PlanningPhase.Active, SortOrder = 0, Number = 1,
});
// Two children (sorted A then B).
@@ -76,12 +76,12 @@ public class PlanningAggregatorTests : IDisposable
ctx.Tasks.Add(new TaskEntity
{
Id = subA, ListId = listId, Title = "child A", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1, Number = 2,
});
ctx.Tasks.Add(new TaskEntity
{
Id = subB, ListId = listId, Title = "child B", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 2,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 2, Number = 3,
});
await ctx.SaveChangesAsync();
@@ -171,19 +171,19 @@ public class PlanningAggregatorTests : IDisposable
ctx.Tasks.Add(new TaskEntity
{
Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
Status = TaskStatus.Idle, PlanningPhase = PlanningPhase.Active, SortOrder = 0,
Status = TaskStatus.Idle, PlanningPhase = PlanningPhase.Active, SortOrder = 0, Number = 1,
});
var subA = Guid.NewGuid().ToString();
var subB = Guid.NewGuid().ToString();
ctx.Tasks.Add(new TaskEntity
{
Id = subA, ListId = listId, Title = "A", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1, Number = 2,
});
ctx.Tasks.Add(new TaskEntity
{
Id = subB, ListId = listId, Title = "B", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 2,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 2, Number = 3,
});
await ctx.SaveChangesAsync();
tests/ClaudeDo.Worker.Tests/Planning/PlanningChainCoordinatorTests.cs
+3
View File
@@ -13,6 +13,7 @@ public sealed class PlanningChainCoordinatorTests : IDisposable
private readonly TestDbContextFactory _factory;
private readonly PlanningChainCoordinator _sut;
private readonly string _listId;
private int _numberSeed;
public PlanningChainCoordinatorTests()
{
@@ -43,6 +44,7 @@ public sealed class PlanningChainCoordinatorTests : IDisposable
CreatedAt = DateTime.UtcNow,
Status = TaskStatus.Idle,
PlanningPhase = PlanningPhase.Finalized,
Number = ++_numberSeed,
});
for (int i = 0; i < childCount; i++)
{
@@ -55,6 +57,7 @@ public sealed class PlanningChainCoordinatorTests : IDisposable
Status = childStatus,
ParentTaskId = parentId,
SortOrder = i,
Number = ++_numberSeed,
});
}
await ctx.SaveChangesAsync();
tests/ClaudeDo.Worker.Tests/Planning/PlanningMergeOrchestratorTests.cs
+16 -3
View File
@@ -47,6 +47,7 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
private readonly List<DbFixture> _dbs = new();
private readonly List<GitRepoFixture> _repos = new();
private readonly List<(string repoDir, string wtPath)> _wtCleanups = new();
private int _numberSeed;
private DbFixture NewDb() { var d = new DbFixture(); _dbs.Add(d); return d; }
private GitRepoFixture NewRepo() { var r = new GitRepoFixture(); _repos.Add(r); return r; }
@@ -102,6 +103,7 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
{
Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
Status = TaskStatus.WaitingForReview, PlanningPhase = PlanningPhase.Finalized, SortOrder = 0,
Number = ++_numberSeed,
});
var subA = Guid.NewGuid().ToString();
@@ -110,11 +112,13 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
{
Id = subA, ListId = listId, Title = "child A", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1,
Number = ++_numberSeed,
});
ctx.Tasks.Add(new TaskEntity
{
Id = subB, ListId = listId, Title = "child B", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 2,
Number = ++_numberSeed,
});
await ctx.SaveChangesAsync();
@@ -170,14 +174,15 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
{
Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
Status = TaskStatus.WaitingForReview, PlanningPhase = PlanningPhase.Finalized, SortOrder = 0,
Number = ++_numberSeed,
});
var subA = Guid.NewGuid().ToString();
var subB = Guid.NewGuid().ToString();
var subC = Guid.NewGuid().ToString();
ctx.Tasks.AddRange(
new TaskEntity { Id = subA, ListId = listId, Title = "A", CreatedAt = DateTime.UtcNow, ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1 },
new TaskEntity { Id = subB, ListId = listId, Title = "B", CreatedAt = DateTime.UtcNow, ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 2 },
new TaskEntity { Id = subC, ListId = listId, Title = "C", CreatedAt = DateTime.UtcNow, ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 3 }
new TaskEntity { Id = subA, ListId = listId, Title = "A", CreatedAt = DateTime.UtcNow, ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1, Number = ++_numberSeed },
new TaskEntity { Id = subB, ListId = listId, Title = "B", CreatedAt = DateTime.UtcNow, ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 2, Number = ++_numberSeed },
new TaskEntity { Id = subC, ListId = listId, Title = "C", CreatedAt = DateTime.UtcNow, ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 3, Number = ++_numberSeed }
);
await ctx.SaveChangesAsync();
@@ -509,6 +514,7 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
{
Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
Status = TaskStatus.Idle, PlanningPhase = PlanningPhase.Finalized, SortOrder = 0,
Number = ++_numberSeed,
});
var running = Guid.NewGuid().ToString();
ctx.Tasks.Add(new TaskEntity
@@ -516,6 +522,7 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
Id = running, ListId = listId, Title = "still running",
CreatedAt = DateTime.UtcNow, ParentTaskId = parentId,
Status = TaskStatus.Running, SortOrder = 1,
Number = ++_numberSeed,
});
await ctx.SaveChangesAsync();
SeedWorktreeWithFile(ctx, repo, running, "fileR.txt", "R\n");
@@ -574,6 +581,7 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
{
Id = parentId, ListId = listId, Title = "improve", CreatedAt = DateTime.UtcNow,
Status = TaskStatus.WaitingForReview, PlanningPhase = PlanningPhase.None, SortOrder = 0,
Number = ++_numberSeed,
});
var subA = Guid.NewGuid().ToString();
@@ -582,11 +590,13 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
{
Id = subA, ListId = listId, Title = "child A", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1,
Number = ++_numberSeed,
});
ctx.Tasks.Add(new TaskEntity
{
Id = subB, ListId = listId, Title = "child B", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 2,
Number = ++_numberSeed,
});
await ctx.SaveChangesAsync();
@@ -642,6 +652,7 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
{
Id = parentId, ListId = listId, Title = "improve", CreatedAt = DateTime.UtcNow,
Status = TaskStatus.Cancelled, PlanningPhase = PlanningPhase.None, SortOrder = 0,
Number = ++_numberSeed,
});
var subA = Guid.NewGuid().ToString();
@@ -650,11 +661,13 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
{
Id = subA, ListId = listId, Title = "child A", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1,
Number = ++_numberSeed,
});
ctx.Tasks.Add(new TaskEntity
{
Id = subB, ListId = listId, Title = "child B", CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 2,
Number = ++_numberSeed,
});
await ctx.SaveChangesAsync();
tests/ClaudeDo.Worker.Tests/Planning/TreeMergeTests.cs
+2 -2
View File
@@ -74,9 +74,9 @@ public sealed class TreeMergeTests : IDisposable
using (var ctx = db.CreateContext())
{
ctx.Lists.Add(new ListEntity { Id = listId, Name = "L", WorkingDir = repo.RepoDir, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = parentId, ListId = listId, Title = "Parent",
ctx.Tasks.Add(new TaskEntity { Id = parentId, ListId = listId, Title = "Parent", Number = 1,
Status = TaskStatus.WaitingForReview, PlanningPhase = PlanningPhase.None, SortOrder = 0, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = childId, ListId = listId, Title = "Child",
ctx.Tasks.Add(new TaskEntity { Id = childId, ListId = listId, Title = "Child", Number = 2,
Status = TaskStatus.Done, ParentTaskId = parentId, SortOrder = 1, CreatedAt = DateTime.UtcNow });
await ctx.SaveChangesAsync();
tests/ClaudeDo.Worker.Tests/Runner/StandaloneChildrenRoutingTests.cs
+3 -3
View File
@@ -33,9 +33,9 @@ public sealed class StandaloneChildrenRoutingTests : IDisposable
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 = "p1", ListId = "l1", Title = "Parent",
ctx.Tasks.Add(new TaskEntity { Id = "p1", ListId = "l1", Title = "Parent", Number = 1,
Status = TaskStatus.Running, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "kid", ListId = "l1", Title = "Improve",
ctx.Tasks.Add(new TaskEntity { Id = "kid", ListId = "l1", Title = "Improve", Number = 2,
Status = TaskStatus.Idle, ParentTaskId = "p1", CreatedBy = "p1", CreatedAt = DateTime.UtcNow });
await ctx.SaveChangesAsync();
}
@@ -63,7 +63,7 @@ public sealed class StandaloneChildrenRoutingTests : IDisposable
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 = "solo", ListId = "l1", Title = "Solo",
ctx.Tasks.Add(new TaskEntity { Id = "solo", ListId = "l1", Title = "Solo", Number = 1,
Status = TaskStatus.Running, CreatedAt = DateTime.UtcNow });
await ctx.SaveChangesAsync();
}
tests/ClaudeDo.Worker.Tests/State/TaskStateServiceTests.cs
+2
View File
@@ -25,6 +25,7 @@ public sealed class TaskStateServiceTests : IDisposable
private readonly ITaskStateService _sut;
private readonly string _listId;
private readonly List<GitRepoFixture> _repos = new();
private int _numberSeed;
private static bool GitAvailable => GitRepoFixture.IsGitAvailable();
@@ -75,6 +76,7 @@ public sealed class TaskStateServiceTests : IDisposable
Id = id,
ListId = _listId,
Title = "task",
Number = ++_numberSeed,
Status = status,
PlanningPhase = phase,
CreatedAt = DateTime.UtcNow,
tests/ClaudeDo.Worker.Tests/SuggestImprovementTests.cs
+2 -1
View File
@@ -12,6 +12,7 @@ namespace ClaudeDo.Worker.Tests;
public sealed class SuggestImprovementTests : IDisposable
{
private readonly DbFixture _db = new();
private int _numberSeed;
public void Dispose() => _db.Dispose();
private static TaskRunMcpContextAccessor AccessorFor(string callerTaskId)
@@ -26,7 +27,7 @@ public sealed class SuggestImprovementTests : IDisposable
using var ctx = _db.CreateContext();
if (!ctx.Lists.Any())
ctx.Lists.Add(new ListEntity { Id = "l1", Name = "L", CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = id, ListId = "l1", Title = "Caller",
ctx.Tasks.Add(new TaskEntity { Id = id, ListId = "l1", Title = "Caller", Number = ++_numberSeed,
Status = TaskStatus.Running, ParentTaskId = parentId, CommitType = "feat", CreatedAt = DateTime.UtcNow });
await ctx.SaveChangesAsync();
}
tests/ClaudeDo.Worker.Tests/UiVm/TasksIslandViewModelPlanningTests.cs
+5
View File
@@ -348,6 +348,7 @@ public class TasksIslandViewModelPlanningTests
public sealed class TasksIslandViewModelMyDayTests : IDisposable
{
private readonly DbFixture _db = new();
private int _numberSeed;
public void Dispose() => _db.Dispose();
[Fact]
@@ -361,6 +362,7 @@ public sealed class TasksIslandViewModelMyDayTests : IDisposable
ctx.Tasks.Add(new TaskEntity
{
Id = taskId, ListId = listId, Title = "T", CreatedAt = DateTime.UtcNow,
Number = ++_numberSeed,
Status = TaskStatus.Idle, IsMyDay = false,
});
await ctx.SaveChangesAsync();
@@ -391,16 +393,19 @@ public sealed class TasksIslandViewModelMyDayTests : IDisposable
ctx.Tasks.Add(new TaskEntity
{
Id = parentId, ListId = listId, Title = "P", CreatedAt = DateTime.UtcNow,
Number = ++_numberSeed,
Status = TaskStatus.WaitingForChildren, PlanningPhase = PlanningPhase.Finalized, IsMyDay = true,
});
ctx.Tasks.Add(new TaskEntity
{
Id = child1, ListId = listId, Title = "C1", CreatedAt = DateTime.UtcNow,
Number = ++_numberSeed,
Status = TaskStatus.Idle, ParentTaskId = parentId, IsMyDay = true,
});
ctx.Tasks.Add(new TaskEntity
{
Id = child2, ListId = listId, Title = "C2", CreatedAt = DateTime.UtcNow,
Number = ++_numberSeed,
Status = TaskStatus.Idle, ParentTaskId = parentId, IsMyDay = true,
});
await ctx.SaveChangesAsync();
tests/ClaudeDo.Worker.Tests/Usage/RunningTaskProbeTests.cs
+2
View File
@@ -8,6 +8,7 @@ namespace ClaudeDo.Worker.Tests.Usage;
public sealed class RunningTaskProbeTests : IDisposable
{
private readonly DbFixture _db = new();
private int _numberSeed;
public void Dispose() => _db.Dispose();
@@ -21,6 +22,7 @@ public sealed class RunningTaskProbeTests : IDisposable
Id = Guid.NewGuid().ToString(),
ListId = list.Id,
Title = $"task-{status}",
Number = ++_numberSeed,
Status = status,
CreatedAt = DateTime.UtcNow,
});
tests/ClaudeDo.Worker.Tests/WaitingForChildrenLifecycleTests.cs
+17 -14
View File
@@ -13,6 +13,7 @@ public sealed class WaitingForChildrenLifecycleTests : IDisposable
private readonly DbFixture _db = new();
private readonly TestDbContextFactory _factory;
private readonly TaskStateServiceBuilder.Built _built;
private int _numberSeed;
public WaitingForChildrenLifecycleTests()
{
@@ -25,7 +26,7 @@ public sealed class WaitingForChildrenLifecycleTests : IDisposable
{
using var ctx = _db.CreateContext();
ctx.Lists.Add(new ListEntity { Id = "l1", Name = "L", CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "p1", ListId = "l1", Title = "Parent",
ctx.Tasks.Add(new TaskEntity { Id = "p1", ListId = "l1", Title = "Parent", Number = ++_numberSeed,
Status = TaskStatus.Running, CreatedAt = DateTime.UtcNow });
await ctx.SaveChangesAsync();
return "p1";
@@ -58,11 +59,11 @@ public sealed class WaitingForChildrenLifecycleTests : IDisposable
using var ctx = _db.CreateContext();
if (!ctx.Lists.Any())
ctx.Lists.Add(new ListEntity { Id = "l1", Name = "L", CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "par", ListId = "l1", Title = "Parent",
ctx.Tasks.Add(new TaskEntity { Id = "par", ListId = "l1", Title = "Parent", Number = ++_numberSeed,
Status = Enum.Parse<TaskStatus>(parentStatus), Result = "parent ran", CreatedAt = DateTime.UtcNow });
int i = 0;
foreach (var cs in childStatuses)
ctx.Tasks.Add(new TaskEntity { Id = $"c{i++}", ListId = "l1", Title = "Child",
ctx.Tasks.Add(new TaskEntity { Id = $"c{i++}", ListId = "l1", Title = "Child", Number = ++_numberSeed,
Status = cs, ParentTaskId = "par", CreatedAt = DateTime.UtcNow });
await ctx.SaveChangesAsync();
}
@@ -103,9 +104,9 @@ public sealed class WaitingForChildrenLifecycleTests : IDisposable
using var ctx = _db.CreateContext();
if (!ctx.Lists.Any())
ctx.Lists.Add(new ListEntity { Id = "l1", Name = "L", CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "par", ListId = "l1", Title = "Parent",
ctx.Tasks.Add(new TaskEntity { Id = "par", ListId = "l1", Title = "Parent", Number = ++_numberSeed,
Status = TaskStatus.WaitingForChildren, PlanningPhase = parentPhase, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "kid", ListId = "l1", Title = "Child",
ctx.Tasks.Add(new TaskEntity { Id = "kid", ListId = "l1", Title = "Child", Number = ++_numberSeed,
Status = TaskStatus.Idle, ParentTaskId = "par", CreatedAt = DateTime.UtcNow });
await ctx.SaveChangesAsync();
}
@@ -135,11 +136,11 @@ public sealed class WaitingForChildrenLifecycleTests : IDisposable
using (var ctx = _db.CreateContext())
{
ctx.Lists.Add(new ListEntity { Id = "l1", Name = "L", CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "par", ListId = "l1", Title = "Parent",
ctx.Tasks.Add(new TaskEntity { Id = "par", ListId = "l1", Title = "Parent", Number = ++_numberSeed,
Status = TaskStatus.WaitingForChildren, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "c1", ListId = "l1", Title = "Child1",
ctx.Tasks.Add(new TaskEntity { Id = "c1", ListId = "l1", Title = "Child1", Number = ++_numberSeed,
Status = TaskStatus.Running, ParentTaskId = "par", CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "c2", ListId = "l1", Title = "Child2",
ctx.Tasks.Add(new TaskEntity { Id = "c2", ListId = "l1", Title = "Child2", Number = ++_numberSeed,
Status = TaskStatus.Running, ParentTaskId = "par", BlockedByTaskId = "c1",
CreatedAt = DateTime.UtcNow });
await ctx.SaveChangesAsync();
@@ -168,7 +169,7 @@ public sealed class WaitingForChildrenLifecycleTests : IDisposable
using (var ctx = _db.CreateContext())
{
ctx.Lists.Add(new ListEntity { Id = "l1", Name = "L", CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "par", ListId = "l1", Title = "Parent",
ctx.Tasks.Add(new TaskEntity { Id = "par", ListId = "l1", Title = "Parent", Number = ++_numberSeed,
Status = TaskStatus.WaitingForChildren, CreatedAt = DateTime.UtcNow });
await ctx.SaveChangesAsync();
}
@@ -189,11 +190,11 @@ public sealed class WaitingForChildrenLifecycleTests : IDisposable
using (var ctx = _db.CreateContext())
{
ctx.Lists.Add(new ListEntity { Id = "l1", Name = "L", CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "par", ListId = "l1", Title = "Parent",
ctx.Tasks.Add(new TaskEntity { Id = "par", ListId = "l1", Title = "Parent", Number = ++_numberSeed,
Status = TaskStatus.WaitingForChildren, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "c_running", ListId = "l1", Title = "Running child",
ctx.Tasks.Add(new TaskEntity { Id = "c_running", ListId = "l1", Title = "Running child", Number = ++_numberSeed,
Status = TaskStatus.Running, ParentTaskId = "par", CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "c_queued", ListId = "l1", Title = "Queued child",
ctx.Tasks.Add(new TaskEntity { Id = "c_queued", ListId = "l1", Title = "Queued child", Number = ++_numberSeed,
Status = TaskStatus.Queued, ParentTaskId = "par", BlockedByTaskId = "c_running",
CreatedAt = DateTime.UtcNow });
await ctx.SaveChangesAsync();
@@ -220,9 +221,9 @@ public sealed class WaitingForChildrenLifecycleTests : IDisposable
using (var ctx = _db.CreateContext())
{
ctx.Lists.Add(new ListEntity { Id = "l1", Name = "L", CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "par", ListId = "l1", Title = "Parent",
ctx.Tasks.Add(new TaskEntity { Id = "par", ListId = "l1", Title = "Parent", Number = ++_numberSeed,
Status = TaskStatus.WaitingForChildren, CreatedAt = DateTime.UtcNow });
ctx.Tasks.Add(new TaskEntity { Id = "c_running", ListId = "l1", Title = "Running child",
ctx.Tasks.Add(new TaskEntity { Id = "c_running", ListId = "l1", Title = "Running child", Number = ++_numberSeed,
Status = TaskStatus.Running, ParentTaskId = "par", CreatedAt = DateTime.UtcNow });
await ctx.SaveChangesAsync();
}
@@ -261,6 +262,7 @@ public sealed class WaitingForChildrenLifecycleTests : IDisposable
Id = id,
ListId = "l1",
Title = "Parent",
Number = ++_numberSeed,
Status = TaskStatus.Idle,
PlanningPhase = PlanningPhase.Active,
CreatedAt = DateTime.UtcNow,
@@ -277,6 +279,7 @@ public sealed class WaitingForChildrenLifecycleTests : IDisposable
Id = childId,
ListId = "l1",
Title = "Child",
Number = ++_numberSeed,
Status = status,
ParentTaskId = parentId,
CreatedAt = DateTime.UtcNow,