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

refactor(data): retire legacy TaskStatus values and backfill existing rows

Browse Source 
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:
Mika Kuns
2026-04-27 15:28:55 +02:00
parent ff7c239959
commit dc3fc443b4
37 changed files with 306 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/ClaudeDo.Ui.Tests/ViewModels/DetailsIslandPlanningTests.cs
View File

@@ -175,7 +175,8 @@ public class DetailsIslandPlanningTests : IDisposable
ctx.Tasks.Add(new TaskEntity
{
Id = parentId, ListId = listId, Title = "Parent",
Status = TaskStatus.Planning, CreatedAt = DateTime.UtcNow,
Status = TaskStatus.Idle, PlanningPhase = PlanningPhase.Active,
CreatedAt = DateTime.UtcNow,
});
ctx.Tasks.Add(new TaskEntity
{
@@ -199,7 +200,8 @@ public class DetailsIslandPlanningTests : IDisposable
// Bind triggers BindAsync → LoadPlanningChildrenAsync → GetMergeTargetsAsync
var parentRow = new TaskRowViewModel { Id = parentId };
parentRow.Status = TaskStatus.Planning;
parentRow.Status = TaskStatus.Idle;
parentRow.PlanningPhase = PlanningPhase.Active;
vm.Bind(parentRow);
// Wait for the background load to settle

12
tests/ClaudeDo.Ui.Tests/ViewModels/TasksIslandRegroupTests.cs
View File

@@ -49,7 +49,8 @@ public class TasksIslandRegroupTests : IDisposable
TaskStatus parentStatus,
TaskStatus childStatus,
string parentId = "p1",
string childId = "c1")
string childId = "c1",
PlanningPhase parentPhase = PlanningPhase.None)
{
await using var db = NewContext();
var list = new ListEntity
@@ -67,6 +68,7 @@ public class TasksIslandRegroupTests : IDisposable
Title = "Parent",
CreatedAt = DateTime.UtcNow,
Status = parentStatus,
PlanningPhase = parentPhase,
SortOrder = 0,
});
db.Tasks.Add(new TaskEntity
@@ -110,7 +112,7 @@ public class TasksIslandRegroupTests : IDisposable
public async Task VirtualQueued_QueuedChildOfPlanningParent_IsNotStandaloneRow()
{
await SeedPlanningWithChildAsync(
parentStatus: TaskStatus.Planning,
parentStatus: TaskStatus.Idle, parentPhase: PlanningPhase.Active,
childStatus: TaskStatus.Queued,
parentId: "p1",
childId: "c1");
@@ -126,7 +128,7 @@ public class TasksIslandRegroupTests : IDisposable
public async Task VirtualQueued_PlannedParentWithQueuedChild_ParentIsStandaloneRow_ChildIsNot()
{
await SeedPlanningWithChildAsync(
parentStatus: TaskStatus.Planned,
parentStatus: TaskStatus.Idle, parentPhase: PlanningPhase.Finalized,
childStatus: TaskStatus.Queued,
parentId: "p1",
childId: "c1");
@@ -142,7 +144,7 @@ public class TasksIslandRegroupTests : IDisposable
public async Task VirtualRunning_RunningChildOfPlanningParent_IsNotStandaloneRow()
{
await SeedPlanningWithChildAsync(
parentStatus: TaskStatus.Planning,
parentStatus: TaskStatus.Idle, parentPhase: PlanningPhase.Active,
childStatus: TaskStatus.Running,
parentId: "p1",
childId: "c1");
@@ -158,7 +160,7 @@ public class TasksIslandRegroupTests : IDisposable
public async Task Done_ChildOfOpenPlanningParent_StaysNestedUnderParent()
{
await SeedPlanningWithChildAsync(
parentStatus: TaskStatus.Planning,
parentStatus: TaskStatus.Idle, parentPhase: PlanningPhase.Active,
childStatus: TaskStatus.Done,
parentId: "p1",
childId: "c1");

2
tests/ClaudeDo.Worker.Tests/External/ExternalMcpServiceTests.cs vendored
View File

@@ -74,7 +74,7 @@ public sealed class ExternalMcpServiceTests : IDisposable
return id;
}
private async Task<TaskEntity> SeedTaskAsync(string listId, string title = "t", TaskStatus status = TaskStatus.Manual)
private async Task<TaskEntity> SeedTaskAsync(string listId, string title = "t", TaskStatus status = TaskStatus.Idle)
{
var task = new TaskEntity
{

11
tests/ClaudeDo.Worker.Tests/Hub/PlanningHubTests.cs
View File

@@ -75,7 +75,7 @@ public sealed class PlanningHubTests : IDisposable
Id = Guid.NewGuid().ToString(),
ListId = listId,
Title = "Do something",
Status = TaskStatus.Manual,
Status = TaskStatus.Idle,
CreatedAt = DateTime.UtcNow,
CommitType = "feat",
};
@@ -96,7 +96,8 @@ public sealed class PlanningHubTests : IDisposable
Assert.Equal(0, _launcher.LaunchResumeCalls);
var loaded = await _tasks.GetByIdAsync(taskId);
Assert.Equal(TaskStatus.Planning, loaded!.Status);
Assert.Equal(TaskStatus.Idle, loaded!.Status);
Assert.Equal(PlanningPhase.Active, loaded.PlanningPhase);
Assert.Contains(_proxy.Sent, m => m.method == "TaskUpdated");
}
@@ -112,7 +113,8 @@ public sealed class PlanningHubTests : IDisposable
hub.StartPlanningSessionAsync(taskId));
var loaded = await _tasks.GetByIdAsync(taskId);
Assert.Equal(TaskStatus.Manual, loaded!.Status);
Assert.Equal(TaskStatus.Idle, loaded!.Status);
Assert.Equal(PlanningPhase.None, loaded.PlanningPhase);
var sessionDir = Path.Combine(_rootDir, taskId);
Assert.False(Directory.Exists(sessionDir));
@@ -130,7 +132,8 @@ public sealed class PlanningHubTests : IDisposable
await hub.DiscardPlanningSessionAsync(taskId);
var loaded = await _tasks.GetByIdAsync(taskId);
Assert.Equal(TaskStatus.Manual, loaded!.Status);
Assert.Equal(TaskStatus.Idle, loaded!.Status);
Assert.Equal(PlanningPhase.None, loaded.PlanningPhase);
Assert.Contains(_proxy.Sent, m => m.method == "TaskUpdated");
}

4
tests/ClaudeDo.Worker.Tests/Planning/PlanningAggregatorTests.cs
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.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();

15
tests/ClaudeDo.Worker.Tests/Planning/PlanningChainCoordinatorTests.cs
View File

@@ -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()
{

4
tests/ClaudeDo.Worker.Tests/Planning/PlanningEndToEndTests.cs
View File

@@ -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",
};

6
tests/ClaudeDo.Worker.Tests/Planning/PlanningMcpServiceTests.cs
View File

@@ -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]

10
tests/ClaudeDo.Worker.Tests/Planning/PlanningMergeOrchestratorTests.cs
View File

@@ -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

8
tests/ClaudeDo.Worker.Tests/Planning/PlanningSessionManagerTests.cs
View File

@@ -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);
}

5
tests/ClaudeDo.Worker.Tests/Queue/QueuePickerTests.cs
View File

@@ -127,11 +127,6 @@ public sealed class QueuePickerTests : IDisposable
await SeedAsync(listId, status: TaskStatus.Done);
await SeedAsync(listId, status: TaskStatus.Failed);
await SeedAsync(listId, status: TaskStatus.Cancelled);
await SeedAsync(listId, status: TaskStatus.Manual);
await SeedAsync(listId, status: TaskStatus.Draft);
await SeedAsync(listId, status: TaskStatus.Planning);
await SeedAsync(listId, status: TaskStatus.Planned);
await SeedAsync(listId, status: TaskStatus.Waiting);
var picked = await _picker.ClaimNextAsync(DateTime.UtcNow, CancellationToken.None);
Assert.Null(picked);

19
tests/ClaudeDo.Worker.Tests/Repositories/TaskRepositoryParentCompletionTests.cs
View File

@@ -37,7 +37,8 @@ public sealed class TaskRepositoryParentCompletionTests : IDisposable
Id = Guid.NewGuid().ToString(),
ListId = listId,
Title = "p",
Status = TaskStatus.Planned,
Status = TaskStatus.Idle,
PlanningPhase = PlanningPhase.Finalized,
CreatedAt = DateTime.UtcNow,
CommitType = "chore",
};
@@ -102,35 +103,37 @@ public sealed class TaskRepositoryParentCompletionTests : IDisposable
await _tasks.TryCompleteParentAsync(parent.Id);
var loaded = await _tasks.GetByIdAsync(parent.Id);
Assert.Equal(TaskStatus.Planned, loaded!.Status);
Assert.Equal(TaskStatus.Idle, loaded!.Status);
Assert.Equal(PlanningPhase.Finalized, loaded.PlanningPhase);
Assert.Null(loaded.FinishedAt);
}
[Fact]
public async Task TryCompleteParentAsync_ChildStillDraft_ParentStaysPlanned()
public async Task TryCompleteParentAsync_ChildStillIdle_ParentStaysFinalized()
{
var listId = await ListAsync();
var parent = await PlannedParentAsync(listId);
await ChildAsync(listId, parent.Id, TaskStatus.Done);
await ChildAsync(listId, parent.Id, TaskStatus.Draft);
await ChildAsync(listId, parent.Id, TaskStatus.Idle);
await _tasks.TryCompleteParentAsync(parent.Id);
var loaded = await _tasks.GetByIdAsync(parent.Id);
Assert.Equal(TaskStatus.Planned, loaded!.Status);
Assert.Equal(PlanningPhase.Finalized, loaded!.PlanningPhase);
}
[Fact]
public async Task TryCompleteParentAsync_ParentIsNotPlanned_NoChange()
public async Task TryCompleteParentAsync_ParentIsNotFinalized_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 _ctx.Database.ExecuteSqlRawAsync(
"UPDATE tasks SET planning_phase = 'active' 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);
Assert.Equal(PlanningPhase.Active, loaded!.PlanningPhase);
}
}

51
tests/ClaudeDo.Worker.Tests/Repositories/TaskRepositoryPlanningTests.cs
View File

@@ -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);

2
tests/ClaudeDo.Worker.Tests/Repositories/TaskRepositoryTests.cs
View File

@@ -163,7 +163,7 @@ public sealed class TaskRepositoryTests : IDisposable
using var readCtx = _db.CreateContext();
var after = await new TaskRepository(readCtx).GetByIdAsync(task.Id);
Assert.NotNull(after);
Assert.Equal(TaskStatus.Manual, after!.Status);
Assert.Equal(TaskStatus.Idle, after!.Status);
Assert.Null(after.StartedAt);
Assert.Null(after.FinishedAt);
Assert.Null(after.Result);

3
tests/ClaudeDo.Worker.Tests/Runner/TaskRunnerParentCompletionTests.cs
View File

@@ -33,7 +33,8 @@ public sealed class TaskRunnerParentCompletionTests : IDisposable
Id = Guid.NewGuid().ToString(),
ListId = listId,
Title = "p",
Status = TaskStatus.Planned,
Status = TaskStatus.Idle,
PlanningPhase = PlanningPhase.Finalized,
CreatedAt = DateTime.UtcNow,
CommitType = "chore",
};

2
tests/ClaudeDo.Worker.Tests/Services/WorktreeMaintenanceServiceTests.cs
View File

@@ -161,7 +161,7 @@ public class WorktreeMaintenanceServiceTests : IDisposable
var db = NewDb();
var (list, t1) = MakeEntities(repo.RepoDir, status: ClaudeDo.Data.Models.TaskStatus.Done);
var t2 = MakeTaskForList(list.Id, ClaudeDo.Data.Models.TaskStatus.Manual);
var t2 = MakeTaskForList(list.Id, ClaudeDo.Data.Models.TaskStatus.Idle);
var wt1 = await CreateWorktreeAsync(git, repo.RepoDir, t1.Id);
var wt2 = await CreateWorktreeAsync(git, repo.RepoDir, t2.Id);

28
tests/ClaudeDo.Worker.Tests/State/TaskStateServiceTests.cs
View File

@@ -40,7 +40,8 @@ public sealed class TaskStateServiceTests : IDisposable
TaskStatus status,
string? parentId = null,
int sortOrder = 0,
string? blockedBy = null)
string? blockedBy = null,
PlanningPhase phase = PlanningPhase.None)
{
var id = Guid.NewGuid().ToString();
await using var ctx = _factory.CreateDbContext();
@@ -50,6 +51,7 @@ public sealed class TaskStateServiceTests : IDisposable
ListId = _listId,
Title = "task",
Status = status,
PlanningPhase = phase,
CreatedAt = DateTime.UtcNow,
ParentTaskId = parentId,
SortOrder = sortOrder,
@@ -256,15 +258,15 @@ public sealed class TaskStateServiceTests : IDisposable
// ─── StartPlanningAsync ───────────────────────────────────────────────
[Fact]
public async Task StartPlanningAsync_FromManual_FlipsStatus_AndPlanningPhase()
public async Task StartPlanningAsync_FromIdle_SetsPlanningPhase()
{
var id = await SeedTaskAsync(TaskStatus.Manual);
var id = await SeedTaskAsync(TaskStatus.Idle);
var result = await _sut.StartPlanningAsync(id, default);
Assert.True(result.Ok);
var t = await GetTaskAsync(id);
Assert.Equal(TaskStatus.Planning, t.Status);
Assert.Equal(TaskStatus.Idle, t.Status);
Assert.Equal(PlanningPhase.Active, t.PlanningPhase);
}
@@ -283,7 +285,7 @@ public sealed class TaskStateServiceTests : IDisposable
[Fact]
public async Task FinalizePlanningAsync_OnActivePhase_TransitionsToFinalized()
{
var id = await SeedTaskAsync(TaskStatus.Manual);
var id = await SeedTaskAsync(TaskStatus.Idle);
await _sut.StartPlanningAsync(id, default);
var result = await _sut.FinalizePlanningAsync(id, default);
@@ -297,7 +299,7 @@ public sealed class TaskStateServiceTests : IDisposable
[Fact]
public async Task FinalizePlanningAsync_OnNonePhase_Rejects()
{
var id = await SeedTaskAsync(TaskStatus.Manual);
var id = await SeedTaskAsync(TaskStatus.Idle);
var result = await _sut.FinalizePlanningAsync(id, default);
@@ -335,18 +337,6 @@ public sealed class TaskStateServiceTests : IDisposable
Assert.True(_built.WakeCount() > wakesBefore);
}
[Fact]
public async Task UnblockAsync_OnWaitingTask_FlipsToQueued()
{
// Bridge to legacy chain layout: a Status=Waiting sibling becomes Queued on unblock.
var task = await SeedTaskAsync(TaskStatus.Waiting);
var result = await _sut.UnblockAsync(task, default);
Assert.True(result.Ok);
Assert.Equal(TaskStatus.Queued, await GetStatusAsync(task));
}
// ─── RecoverStaleRunningAsync ─────────────────────────────────────────
[Fact]
@@ -371,7 +361,7 @@ public sealed class TaskStateServiceTests : IDisposable
[Fact]
public async Task CompleteAsync_OnChild_AdvancesNextBlockedSibling()
{
var parent = await SeedTaskAsync(TaskStatus.Planned);
var parent = await SeedTaskAsync(TaskStatus.Idle, phase: PlanningPhase.Finalized);
var c0 = await SeedTaskAsync(TaskStatus.Running, parentId: parent, sortOrder: 0);
var c1 = await SeedTaskAsync(TaskStatus.Queued, parentId: parent, sortOrder: 1, blockedBy: c0);
var c2 = await SeedTaskAsync(TaskStatus.Queued, parentId: parent, sortOrder: 2, blockedBy: c1);

24
tests/ClaudeDo.Worker.Tests/UiVm/TaskRowViewModelPlanningTests.cs
View File

@@ -7,38 +7,42 @@ namespace ClaudeDo.Worker.Tests.UiVm;
public class TaskRowViewModelPlanningTests
{
private static TaskRowViewModel MakeRow(TaskStatus status, string? parentTaskId = null)
=> new TaskRowViewModel { Id = "t", Status = status, ParentTaskId = parentTaskId };
private static TaskRowViewModel MakeRow(
TaskStatus status,
string? parentTaskId = null,
PlanningPhase phase = PlanningPhase.None)
=> new TaskRowViewModel { Id = "t", Status = status, ParentTaskId = parentTaskId, PlanningPhase = phase };
[Fact]
public void Draft_Status_SetsIsChildFlag_WhenParentIdIsNotNull()
public void IdleChild_IsDraft_WhenParentIdIsNotNull()
{
var vm = MakeRow(TaskStatus.Draft, "parent-id");
var vm = MakeRow(TaskStatus.Idle, parentTaskId: "parent-id");
Assert.True(vm.IsChild);
Assert.True(vm.IsDraft);
Assert.False(vm.IsPlanningParent);
}
[Fact]
public void Planning_Status_SetsIsPlanningParent()
public void ActivePlanning_SetsIsPlanningParent()
{
var vm = MakeRow(TaskStatus.Planning);
var vm = MakeRow(TaskStatus.Idle, phase: PlanningPhase.Active);
Assert.True(vm.IsPlanningParent);
Assert.False(vm.IsChild);
Assert.Equal("PLANNING", vm.PlanningBadge);
}
[Fact]
public void Planned_Status_ShowsPlannedBadge()
public void FinalizedPlanning_ShowsPlannedBadge()
{
var vm = MakeRow(TaskStatus.Planned);
var vm = MakeRow(TaskStatus.Idle, phase: PlanningPhase.Finalized);
Assert.True(vm.IsPlanningParent);
Assert.Equal("PLANNED", vm.PlanningBadge);
}
[Fact]
public void NonPlanningStatus_NoBadge()
public void PlainIdle_NoBadge()
{
var vm = MakeRow(TaskStatus.Manual);
var vm = MakeRow(TaskStatus.Idle);
Assert.False(vm.IsPlanningParent);
Assert.Null(vm.PlanningBadge);
}

2
tests/ClaudeDo.Worker.Tests/UiVm/TaskRowViewModelTests.cs
View File

@@ -12,7 +12,7 @@ public class TaskRowViewModelTests
[InlineData(TaskStatus.Failed, "error")]
[InlineData(TaskStatus.Done, "review")]
[InlineData(TaskStatus.Queued, "queued")]
[InlineData(TaskStatus.Manual, "idle")]
[InlineData(TaskStatus.Idle, "idle")]
public void StatusChipClass_Maps_Correctly(TaskStatus s, string expected)
{
var vm = new TaskRowViewModel { Id = "t" };

25
tests/ClaudeDo.Worker.Tests/UiVm/TasksIslandViewModelPlanningTests.cs
View File

@@ -96,15 +96,20 @@ file static class VmFactory
public class TasksIslandViewModelPlanningTests
{
private static TaskRowViewModel MakeRow(string id, TaskStatus status, string? parentId = null, int sortOrder = 0)
=> new TaskRowViewModel { Id = id, Status = status, ParentTaskId = parentId };
private static TaskRowViewModel MakeRow(
string id,
TaskStatus status,
string? parentId = null,
int sortOrder = 0,
PlanningPhase phase = PlanningPhase.None)
=> new TaskRowViewModel { Id = id, Status = status, ParentTaskId = parentId, PlanningPhase = phase };
[Fact]
public void ToggleExpand_CollapsesChildrenOfPlanningParent()
{
var parent = MakeRow("p1", TaskStatus.Planning);
var child1 = MakeRow("c1", TaskStatus.Draft, "p1");
var child2 = MakeRow("c2", TaskStatus.Draft, "p1");
var parent = MakeRow("p1", TaskStatus.Idle, phase: PlanningPhase.Active);
var child1 = MakeRow("c1", TaskStatus.Idle, "p1");
var child2 = MakeRow("c2", TaskStatus.Idle, "p1");
var (vm, _) = VmFactory.Create([parent, child1, child2]);
@@ -123,7 +128,7 @@ public class TasksIslandViewModelPlanningTests
}
[Fact]
public async Task OpenPlanningSession_IgnoresNonManualRow()
public async Task OpenPlanningSession_IgnoresNonIdleRow()
{
var row = MakeRow("t1", TaskStatus.Queued);
var (vm, worker) = VmFactory.Create([row]);
@@ -134,9 +139,9 @@ public class TasksIslandViewModelPlanningTests
}
[Fact]
public async Task OpenPlanningSession_CallsWorkerForManualRow()
public async Task OpenPlanningSession_CallsWorkerForIdleRow()
{
var row = MakeRow("t1", TaskStatus.Manual);
var row = MakeRow("t1", TaskStatus.Idle);
var (vm, worker) = VmFactory.Create([row]);
await ((IAsyncRelayCommand<TaskRowViewModel?>)vm.OpenPlanningSessionCommand).ExecuteAsync(row);
@@ -147,8 +152,8 @@ public class TasksIslandViewModelPlanningTests
[Fact]
public void ToggleExpand_ExpandsCollapsedParentAgain()
{
var parent = MakeRow("p1", TaskStatus.Planned);
var child = MakeRow("c1", TaskStatus.Draft, "p1");
var parent = MakeRow("p1", TaskStatus.Idle, phase: PlanningPhase.Finalized);
var child = MakeRow("c1", TaskStatus.Idle, "p1");
var (vm, _) = VmFactory.Create([parent, child]);