MaxTimeoutSeconds was 170s against runs that take tens of minutes, forcing a dozen full-context wait rounds per long-running batch. Raise it to 900s and raise MCP_TOOL_TIMEOUT in lockstep (ClaudeProcess + every InteractiveLaunchSpecService launch spec) to 930000ms so the client connection actually stays open that long instead of aborting first. Add get_queue_state (QueueStateMcpTools): configured vs. effective parallel-slot count (via QueueService.GetSlotCountsAsync, extracted from the former GetEffectiveMaxParallelAsync), active slots with taskId + startedAt including the run_task_now override slot, and queued tasks in pick order -- so a caller can observe queue occupancy instead of inferring it from maxParallelExecutions.
130 lines
4.4 KiB
C#
130 lines
4.4 KiB
C#
using System.Diagnostics;
|
|
using ClaudeDo.Data;
|
|
using ClaudeDo.Data.Models;
|
|
using ClaudeDo.Data.Repositories;
|
|
using ClaudeDo.Worker.External;
|
|
using ClaudeDo.Worker.Tests.Infrastructure;
|
|
using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
|
|
|
|
namespace ClaudeDo.Worker.Tests.External;
|
|
|
|
public sealed class TaskWaitMcpToolsTests : IDisposable
|
|
{
|
|
private readonly DbFixture _db = new();
|
|
private readonly ClaudeDoDbContext _ctx;
|
|
private readonly TaskRepository _tasks;
|
|
private readonly ListRepository _lists;
|
|
|
|
public TaskWaitMcpToolsTests()
|
|
{
|
|
_ctx = _db.CreateContext();
|
|
_tasks = new TaskRepository(_ctx);
|
|
_lists = new ListRepository(_ctx);
|
|
}
|
|
|
|
public void Dispose() { _ctx.Dispose(); _db.Dispose(); }
|
|
|
|
private TaskWaitMcpTools BuildSut() => new(_db.CreateFactory());
|
|
|
|
private async Task<TaskEntity> SeedTaskAsync(TaskStatus status)
|
|
{
|
|
var listId = Guid.NewGuid().ToString();
|
|
await _lists.AddAsync(new ListEntity { Id = listId, Name = "L", CreatedAt = DateTime.UtcNow });
|
|
var task = new TaskEntity
|
|
{
|
|
Id = Guid.NewGuid().ToString(), ListId = listId, Title = "t",
|
|
Status = status, CreatedAt = DateTime.UtcNow, CommitType = "chore",
|
|
};
|
|
await _tasks.AddAsync(task);
|
|
return task;
|
|
}
|
|
|
|
[Fact]
|
|
public async Task WaitForTaskChange_AlreadyOutOfQueuedRunning_ReturnsImmediately()
|
|
{
|
|
var task = await SeedTaskAsync(TaskStatus.WaitingForReview);
|
|
var sut = BuildSut();
|
|
var sw = Stopwatch.StartNew();
|
|
|
|
var result = await sut.WaitForTaskChange([task.Id], timeoutSeconds: 30, CancellationToken.None);
|
|
|
|
sw.Stop();
|
|
Assert.False(result.TimedOut);
|
|
Assert.Equal(task.Id, Assert.Single(result.Changed).TaskId);
|
|
Assert.Equal("WaitingForReview", result.Changed[0].Status);
|
|
Assert.True(sw.Elapsed < TimeSpan.FromSeconds(2), $"took {sw.Elapsed}");
|
|
}
|
|
|
|
[Fact]
|
|
public async Task WaitForTaskChange_UnknownId_ReturnsImmediatelyAsNotFound()
|
|
{
|
|
var sut = BuildSut();
|
|
var sw = Stopwatch.StartNew();
|
|
|
|
var result = await sut.WaitForTaskChange(["missing-id"], timeoutSeconds: 30, CancellationToken.None);
|
|
|
|
sw.Stop();
|
|
Assert.False(result.TimedOut);
|
|
Assert.Equal("NotFound", Assert.Single(result.Changed).Status);
|
|
Assert.True(sw.Elapsed < TimeSpan.FromSeconds(2), $"took {sw.Elapsed}");
|
|
}
|
|
|
|
[Fact]
|
|
public async Task WaitForTaskChange_StatusChangesWhileWaiting_ReturnsBeforeTimeout()
|
|
{
|
|
var task = await SeedTaskAsync(TaskStatus.Running);
|
|
var sut = BuildSut();
|
|
var sw = Stopwatch.StartNew();
|
|
|
|
var waitTask = sut.WaitForTaskChange([task.Id], timeoutSeconds: 10, CancellationToken.None);
|
|
|
|
await Task.Delay(150);
|
|
// Simulate the status change a broadcast would announce, via a separate context
|
|
// (mirrors what TaskStateService does from a different scope/process).
|
|
await using (var writeCtx = _db.CreateContext())
|
|
{
|
|
var writeRepo = new TaskRepository(writeCtx);
|
|
var loaded = await writeRepo.GetByIdAsync(task.Id);
|
|
loaded!.Status = TaskStatus.Done;
|
|
await writeRepo.UpdateAsync(loaded);
|
|
}
|
|
|
|
var result = await waitTask;
|
|
sw.Stop();
|
|
|
|
Assert.False(result.TimedOut);
|
|
Assert.Equal("Done", Assert.Single(result.Changed).Status);
|
|
Assert.True(sw.Elapsed < TimeSpan.FromSeconds(5), $"took {sw.Elapsed}");
|
|
}
|
|
|
|
[Fact]
|
|
public async Task WaitForTaskChange_NoChange_TimesOut()
|
|
{
|
|
var task = await SeedTaskAsync(TaskStatus.Running);
|
|
var sut = BuildSut();
|
|
var sw = Stopwatch.StartNew();
|
|
|
|
var result = await sut.WaitForTaskChange([task.Id], timeoutSeconds: 1, CancellationToken.None);
|
|
|
|
sw.Stop();
|
|
Assert.True(result.TimedOut);
|
|
Assert.Empty(result.Changed);
|
|
Assert.True(sw.Elapsed >= TimeSpan.FromMilliseconds(900), $"took {sw.Elapsed}");
|
|
}
|
|
|
|
[Fact]
|
|
public async Task WaitForTaskChange_EmptyTaskIds_Throws()
|
|
{
|
|
var sut = BuildSut();
|
|
await Assert.ThrowsAsync<ArgumentException>(() =>
|
|
sut.WaitForTaskChange([], timeoutSeconds: 5, CancellationToken.None));
|
|
}
|
|
|
|
[Fact]
|
|
public void MaxTimeoutSeconds_StaysComfortablyUnderMcpToolTimeout()
|
|
{
|
|
// ClaudeProcess / InteractiveLaunchSpecService set MCP_TOOL_TIMEOUT=930000ms.
|
|
Assert.True(TaskWaitMcpTools.MaxTimeoutSeconds < 930);
|
|
}
|
|
}
|