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:
@@ -67,7 +67,7 @@ public class PlanningAggregatorTests : IDisposable
|
||||
ctx.Tasks.Add(new TaskEntity
|
||||
{
|
||||
Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
|
||||
Status = TaskStatus.Planning, SortOrder = 0,
|
||||
Status = TaskStatus.Idle, PlanningPhase = PlanningPhase.Active, SortOrder = 0,
|
||||
});
|
||||
|
||||
// Two children (sorted A then B).
|
||||
@@ -171,7 +171,7 @@ public class PlanningAggregatorTests : IDisposable
|
||||
ctx.Tasks.Add(new TaskEntity
|
||||
{
|
||||
Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
|
||||
Status = TaskStatus.Planning, SortOrder = 0,
|
||||
Status = TaskStatus.Idle, PlanningPhase = PlanningPhase.Active, SortOrder = 0,
|
||||
});
|
||||
var subA = Guid.NewGuid().ToString();
|
||||
var subB = Guid.NewGuid().ToString();
|
||||
|
||||
@@ -32,7 +32,7 @@ public sealed class PlanningChainCoordinatorTests : IDisposable
|
||||
|
||||
public void Dispose() => _db.Dispose();
|
||||
|
||||
private async Task SeedPlanningFamilyAsync(string parentId, int childCount, TaskStatus childStatus = TaskStatus.Manual)
|
||||
private async Task SeedPlanningFamilyAsync(string parentId, int childCount, TaskStatus childStatus = TaskStatus.Idle)
|
||||
{
|
||||
await using var ctx = _factory.CreateDbContext();
|
||||
ctx.Tasks.Add(new TaskEntity
|
||||
@@ -41,7 +41,8 @@ public sealed class PlanningChainCoordinatorTests : IDisposable
|
||||
ListId = _listId,
|
||||
Title = "Parent",
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
Status = TaskStatus.Planned,
|
||||
Status = TaskStatus.Idle,
|
||||
PlanningPhase = PlanningPhase.Finalized,
|
||||
});
|
||||
for (int i = 0; i < childCount; i++)
|
||||
{
|
||||
@@ -108,16 +109,6 @@ public sealed class PlanningChainCoordinatorTests : IDisposable
|
||||
Assert.Equal(2, count);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task SetupChain_AcceptsDraftChildren()
|
||||
{
|
||||
await SeedPlanningFamilyAsync("P", 2, childStatus: TaskStatus.Draft);
|
||||
|
||||
var count = await _sut.SetupChainAsync("P", default);
|
||||
|
||||
Assert.Equal(2, count);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task OnChildDone_UnblocksTheSuccessor()
|
||||
{
|
||||
|
||||
@@ -99,7 +99,7 @@ public sealed class PlanningEndToEndTests : IDisposable
|
||||
Id = Guid.NewGuid().ToString(),
|
||||
ListId = listId,
|
||||
Title = "Big Task",
|
||||
Status = TaskStatus.Manual,
|
||||
Status = TaskStatus.Idle,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
CommitType = "chore",
|
||||
};
|
||||
@@ -145,7 +145,7 @@ public sealed class PlanningEndToEndTests : IDisposable
|
||||
Id = Guid.NewGuid().ToString(),
|
||||
ListId = listId,
|
||||
Title = "Parent",
|
||||
Status = TaskStatus.Manual,
|
||||
Status = TaskStatus.Idle,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
CommitType = "chore",
|
||||
};
|
||||
|
||||
@@ -93,7 +93,7 @@ public sealed class PlanningMcpServiceTests : IDisposable
|
||||
Id = Guid.NewGuid().ToString(),
|
||||
ListId = listId,
|
||||
Title = "p",
|
||||
Status = TaskStatus.Manual,
|
||||
Status = TaskStatus.Idle,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
CommitType = "chore",
|
||||
};
|
||||
@@ -110,10 +110,10 @@ public sealed class PlanningMcpServiceTests : IDisposable
|
||||
|
||||
var result = await sut.CreateChildTask("My child", "desc", null, null, CancellationToken.None);
|
||||
|
||||
Assert.Equal("Draft", result.Status);
|
||||
Assert.Equal("Idle", result.Status);
|
||||
var child = await _tasks.GetByIdAsync(result.TaskId);
|
||||
Assert.Equal("My child", child!.Title);
|
||||
Assert.Equal(TaskStatus.Draft, child.Status);
|
||||
Assert.Equal(TaskStatus.Idle, child.Status);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
||||
@@ -101,7 +101,7 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
|
||||
ctx.Tasks.Add(new TaskEntity
|
||||
{
|
||||
Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
|
||||
Status = TaskStatus.Planned, SortOrder = 0,
|
||||
Status = TaskStatus.Idle, PlanningPhase = PlanningPhase.Finalized, SortOrder = 0,
|
||||
});
|
||||
|
||||
var subA = Guid.NewGuid().ToString();
|
||||
@@ -169,7 +169,7 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
|
||||
ctx.Tasks.Add(new TaskEntity
|
||||
{
|
||||
Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
|
||||
Status = TaskStatus.Planned, SortOrder = 0,
|
||||
Status = TaskStatus.Idle, PlanningPhase = PlanningPhase.Finalized, SortOrder = 0,
|
||||
});
|
||||
var subA = Guid.NewGuid().ToString();
|
||||
var subB = Guid.NewGuid().ToString();
|
||||
@@ -232,7 +232,7 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
|
||||
|
||||
using var ctx = db.CreateContext();
|
||||
// Planning stays in Planned — NOT flipped to Done.
|
||||
Assert.Equal(TaskStatus.Planned, ctx.Tasks.Single(t => t.Id == parentId).Status);
|
||||
Assert.Equal(PlanningPhase.Finalized, ctx.Tasks.Single(t => t.Id == parentId).PlanningPhase);
|
||||
// Earlier successful merge stays merged.
|
||||
Assert.Equal(WorktreeState.Merged, ctx.Worktrees.Single(w => w.TaskId == subA).State);
|
||||
// Conflicted subtask's worktree stays Active (abort doesn't flip it).
|
||||
@@ -280,7 +280,7 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
|
||||
Assert.Contains(runningSub, ex.Message);
|
||||
|
||||
using var ctx = db.CreateContext();
|
||||
Assert.Equal(TaskStatus.Planned, ctx.Tasks.Single(t => t.Id == parentId).Status);
|
||||
Assert.Equal(PlanningPhase.Finalized, ctx.Tasks.Single(t => t.Id == parentId).PlanningPhase);
|
||||
Assert.Empty(spy);
|
||||
}
|
||||
|
||||
@@ -337,7 +337,7 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
|
||||
ctx.Tasks.Add(new TaskEntity
|
||||
{
|
||||
Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
|
||||
Status = TaskStatus.Planned, SortOrder = 0,
|
||||
Status = TaskStatus.Idle, PlanningPhase = PlanningPhase.Finalized, SortOrder = 0,
|
||||
});
|
||||
var running = Guid.NewGuid().ToString();
|
||||
ctx.Tasks.Add(new TaskEntity
|
||||
|
||||
@@ -67,7 +67,7 @@ public sealed class PlanningSessionManagerTests : IDisposable
|
||||
ListId = listId,
|
||||
Title = "Brainstorm auth",
|
||||
Description = "- review tokens\n- plan rollout",
|
||||
Status = TaskStatus.Manual,
|
||||
Status = TaskStatus.Idle,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
CommitType = "feat",
|
||||
};
|
||||
@@ -101,7 +101,8 @@ public sealed class PlanningSessionManagerTests : IDisposable
|
||||
Assert.Contains("review tokens", initial);
|
||||
|
||||
var loaded = await _tasks.GetByIdAsync(parent.Id);
|
||||
Assert.Equal(TaskStatus.Planning, loaded!.Status);
|
||||
Assert.Equal(TaskStatus.Idle, loaded!.Status);
|
||||
Assert.Equal(PlanningPhase.Active, loaded.PlanningPhase);
|
||||
Assert.NotNull(loaded.PlanningSessionToken);
|
||||
}
|
||||
|
||||
@@ -220,7 +221,8 @@ public sealed class PlanningSessionManagerTests : IDisposable
|
||||
|
||||
Assert.False(Directory.Exists(startCtx.Files.SessionDirectory));
|
||||
var loaded = await _tasks.GetByIdAsync(parent.Id);
|
||||
Assert.Equal(TaskStatus.Manual, loaded!.Status);
|
||||
Assert.Equal(TaskStatus.Idle, loaded!.Status);
|
||||
Assert.Equal(PlanningPhase.None, loaded.PlanningPhase);
|
||||
Assert.Null(loaded.PlanningSessionToken);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user