refactor(data): retire legacy TaskStatus values and backfill existing rows
Slice 6 of the worker state and queue consolidation refactor. * Drop Manual, Planning, Planned, Draft, Waiting from the TaskStatus enum and from the EF value converter; only the lifecycle values remain (Idle, Queued, Running, Done, Failed, Cancelled). * Add migration RetireLegacyTaskStatus that rewrites existing rows: manual/draft -> idle, planning -> idle+planning_phase=active, planned -> idle+planning_phase=finalized, waiting -> queued+blocked_by derived from sort_order via a CTE with LAG(). * Reroute every call site that compared/set legacy values to the new three-field model (Status + PlanningPhase + BlockedByTaskId), including the planning repo helpers, MCP services, the planning chain coordinator, and the UI view-models. TaskRowViewModel now exposes PlanningPhase to drive the planning badge. * Refresh Worker/CLAUDE.md and Data/CLAUDE.md, the docs/plan.md status section, and the planning verification notes in docs/open.md.
This commit is contained in:
@@ -40,12 +40,17 @@ public sealed class TaskRepositoryPlanningTests : IDisposable
|
||||
return listId;
|
||||
}
|
||||
|
||||
private TaskEntity MakeTask(string listId, TaskStatus status = TaskStatus.Manual, string? parentId = null) => new()
|
||||
private TaskEntity MakeTask(
|
||||
string listId,
|
||||
TaskStatus status = TaskStatus.Idle,
|
||||
string? parentId = null,
|
||||
PlanningPhase phase = PlanningPhase.None) => new()
|
||||
{
|
||||
Id = Guid.NewGuid().ToString(),
|
||||
ListId = listId,
|
||||
Title = "t",
|
||||
Status = status,
|
||||
PlanningPhase = phase,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
CommitType = "feat",
|
||||
ParentTaskId = parentId,
|
||||
@@ -55,23 +60,23 @@ public sealed class TaskRepositoryPlanningTests : IDisposable
|
||||
public async Task GetChildrenAsync_ReturnsOnlyDirectChildren_Sorted()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var parent = MakeTask(listId, TaskStatus.Planning);
|
||||
var parent = MakeTask(listId, phase: PlanningPhase.Active);
|
||||
parent.Title = "parent";
|
||||
await _tasks.AddAsync(parent);
|
||||
|
||||
var childA = MakeTask(listId, TaskStatus.Draft, parentId: parent.Id);
|
||||
var childA = MakeTask(listId, parentId: parent.Id);
|
||||
childA.Title = "a";
|
||||
await _tasks.AddAsync(childA);
|
||||
childA.SortOrder = 1;
|
||||
await _tasks.UpdateAsync(childA);
|
||||
|
||||
var childB = MakeTask(listId, TaskStatus.Draft, parentId: parent.Id);
|
||||
var childB = MakeTask(listId, parentId: parent.Id);
|
||||
childB.Title = "b";
|
||||
await _tasks.AddAsync(childB);
|
||||
childB.SortOrder = 0;
|
||||
await _tasks.UpdateAsync(childB);
|
||||
|
||||
var unrelated = MakeTask(listId, TaskStatus.Manual);
|
||||
var unrelated = MakeTask(listId);
|
||||
await _tasks.AddAsync(unrelated);
|
||||
|
||||
var children = await _tasks.GetChildrenAsync(parent.Id);
|
||||
@@ -82,10 +87,10 @@ public sealed class TaskRepositoryPlanningTests : IDisposable
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task CreateChildAsync_CreatesDraftUnderParent()
|
||||
public async Task CreateChildAsync_CreatesIdleChildUnderParent()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var parent = MakeTask(listId, TaskStatus.Planning);
|
||||
var parent = MakeTask(listId, phase: PlanningPhase.Active);
|
||||
await _tasks.AddAsync(parent);
|
||||
|
||||
var child = await _tasks.CreateChildAsync(
|
||||
@@ -95,7 +100,7 @@ public sealed class TaskRepositoryPlanningTests : IDisposable
|
||||
tagNames: new[] { "agent" },
|
||||
commitType: "feat");
|
||||
|
||||
Assert.Equal(TaskStatus.Draft, child.Status);
|
||||
Assert.Equal(TaskStatus.Idle, child.Status);
|
||||
Assert.Equal(parent.Id, child.ParentTaskId);
|
||||
Assert.Equal(listId, child.ListId);
|
||||
Assert.Equal("child title", child.Title);
|
||||
@@ -104,7 +109,7 @@ public sealed class TaskRepositoryPlanningTests : IDisposable
|
||||
|
||||
var loaded = await _tasks.GetByIdAsync(child.Id);
|
||||
Assert.NotNull(loaded);
|
||||
Assert.Equal(TaskStatus.Draft, loaded!.Status);
|
||||
Assert.Equal(TaskStatus.Idle, loaded!.Status);
|
||||
|
||||
var tags = await _tasks.GetTagsAsync(child.Id);
|
||||
Assert.Contains(tags, t => t.Name == "agent");
|
||||
@@ -114,32 +119,33 @@ public sealed class TaskRepositoryPlanningTests : IDisposable
|
||||
public async Task CreateChildAsync_ThrowsIfParentNotFound()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
_ = listId; // just to create the DB
|
||||
_ = listId;
|
||||
|
||||
await Assert.ThrowsAsync<InvalidOperationException>(() =>
|
||||
_tasks.CreateChildAsync("nonexistent-parent-id", "t", null, null, null));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task SetPlanningStartedAsync_ManualTask_TransitionsToPlanning()
|
||||
public async Task SetPlanningStartedAsync_IdleTask_TransitionsToActivePhase()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var task = MakeTask(listId, TaskStatus.Manual);
|
||||
var task = MakeTask(listId);
|
||||
await _tasks.AddAsync(task);
|
||||
|
||||
var result = await _tasks.SetPlanningStartedAsync(task.Id, "tok-abc");
|
||||
|
||||
Assert.NotNull(result);
|
||||
Assert.Equal(TaskStatus.Planning, result!.Status);
|
||||
Assert.Equal(TaskStatus.Idle, result!.Status);
|
||||
Assert.Equal(PlanningPhase.Active, result.PlanningPhase);
|
||||
Assert.Equal("tok-abc", result.PlanningSessionToken);
|
||||
|
||||
var loaded = await _tasks.GetByIdAsync(task.Id);
|
||||
Assert.Equal(TaskStatus.Planning, loaded!.Status);
|
||||
Assert.Equal(PlanningPhase.Active, loaded!.PlanningPhase);
|
||||
Assert.Equal("tok-abc", loaded.PlanningSessionToken);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task SetPlanningStartedAsync_NonManualTask_ReturnsNull()
|
||||
public async Task SetPlanningStartedAsync_NonIdleTask_ReturnsNull()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var task = MakeTask(listId, TaskStatus.Queued);
|
||||
@@ -157,7 +163,7 @@ public sealed class TaskRepositoryPlanningTests : IDisposable
|
||||
public async Task UpdatePlanningSessionIdAsync_StoresClaudeSessionId()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var task = MakeTask(listId, TaskStatus.Manual);
|
||||
var task = MakeTask(listId);
|
||||
await _tasks.AddAsync(task);
|
||||
await _tasks.SetPlanningStartedAsync(task.Id, "tok");
|
||||
|
||||
@@ -171,7 +177,7 @@ public sealed class TaskRepositoryPlanningTests : IDisposable
|
||||
public async Task FindByPlanningTokenAsync_ReturnsTask_WhenTokenMatches()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var task = MakeTask(listId, TaskStatus.Manual);
|
||||
var task = MakeTask(listId);
|
||||
await _tasks.AddAsync(task);
|
||||
await _tasks.SetPlanningStartedAsync(task.Id, "unique-token-123");
|
||||
|
||||
@@ -192,7 +198,7 @@ public sealed class TaskRepositoryPlanningTests : IDisposable
|
||||
public async Task DiscardPlanningAsync_DeletesDraftsAndResetsParent()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var parent = MakeTask(listId, TaskStatus.Manual);
|
||||
var parent = MakeTask(listId);
|
||||
await _tasks.AddAsync(parent);
|
||||
await _tasks.SetPlanningStartedAsync(parent.Id, "tok");
|
||||
await _tasks.UpdatePlanningSessionIdAsync(parent.Id, "claude-42");
|
||||
@@ -206,7 +212,8 @@ public sealed class TaskRepositoryPlanningTests : IDisposable
|
||||
Assert.Null(await _tasks.GetByIdAsync(c2.Id));
|
||||
|
||||
var parentLoaded = await _tasks.GetByIdAsync(parent.Id);
|
||||
Assert.Equal(TaskStatus.Manual, parentLoaded!.Status);
|
||||
Assert.Equal(TaskStatus.Idle, parentLoaded!.Status);
|
||||
Assert.Equal(PlanningPhase.None, parentLoaded.PlanningPhase);
|
||||
Assert.Null(parentLoaded.PlanningSessionId);
|
||||
Assert.Null(parentLoaded.PlanningSessionToken);
|
||||
Assert.Null(parentLoaded.PlanningFinalizedAt);
|
||||
@@ -216,7 +223,7 @@ public sealed class TaskRepositoryPlanningTests : IDisposable
|
||||
public async Task DiscardPlanningAsync_OnNonPlanningTask_ReturnsFalse()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var task = MakeTask(listId, TaskStatus.Manual);
|
||||
var task = MakeTask(listId);
|
||||
await _tasks.AddAsync(task);
|
||||
|
||||
var ok = await _tasks.DiscardPlanningAsync(task.Id);
|
||||
@@ -228,12 +235,10 @@ public sealed class TaskRepositoryPlanningTests : IDisposable
|
||||
public async Task DeleteAsync_ParentWithChildren_ThrowsOrDoesNotDelete()
|
||||
{
|
||||
var listId = await CreateListAsync();
|
||||
var parent = MakeTask(listId, TaskStatus.Planning);
|
||||
var parent = MakeTask(listId, phase: PlanningPhase.Active);
|
||||
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);
|
||||
|
||||
Reference in New Issue
Block a user