feat(worker): AskUser MCP tool so a running task can ask the user mid-run
A running task can call mcp__claudedo_run__AskUser(question) to block (up to 3 min) on a human answer. PendingQuestionRegistry holds the pending question + TaskCompletionSource; the tool broadcasts TaskQuestionAsked, awaits the answer (WorkerHub.AnswerTaskQuestion resolves it), and returns it as the tool result — or a 'proceed on your judgment' fallback on timeout. The run stays Running throughout (no status/schema change). ClaudeProcess raises MCP_TOOL_TIMEOUT so the 60s HTTP-MCP cap doesn't kill the wait; the run MCP is now wired for every task, not just standalone ones. System prompt updated to reconcile 'unattended'.
This commit is contained in:
@@ -13,12 +13,28 @@ public sealed class TaskRunMcpService
|
||||
private readonly TaskRepository _tasks;
|
||||
private readonly TaskRunMcpContextAccessor _ctx;
|
||||
private readonly HubBroadcaster _broadcaster;
|
||||
private readonly PendingQuestionRegistry _pending;
|
||||
|
||||
public TaskRunMcpService(TaskRepository tasks, TaskRunMcpContextAccessor ctx, HubBroadcaster broadcaster)
|
||||
// How long a running task blocks waiting for the user to answer an AskUser question
|
||||
// before it gives up and proceeds autonomously. NOTE: the spawned claude process must
|
||||
// run with MCP_TOOL_TIMEOUT raised above this (ClaudeProcess sets it) — Claude Code
|
||||
// otherwise caps HTTP MCP tool calls at 60 s and would kill the call early.
|
||||
internal static readonly TimeSpan QuestionWindow = TimeSpan.FromMinutes(3);
|
||||
|
||||
internal const string TimeoutFallback =
|
||||
"No response received within 3 minutes — proceed using your best judgment, "
|
||||
+ "note the assumption you made, and continue.";
|
||||
|
||||
public TaskRunMcpService(
|
||||
TaskRepository tasks,
|
||||
TaskRunMcpContextAccessor ctx,
|
||||
HubBroadcaster broadcaster,
|
||||
PendingQuestionRegistry pending)
|
||||
{
|
||||
_tasks = tasks;
|
||||
_ctx = ctx;
|
||||
_broadcaster = broadcaster;
|
||||
_pending = pending;
|
||||
}
|
||||
|
||||
[McpServerTool, Description(
|
||||
@@ -47,4 +63,57 @@ public sealed class TaskRunMcpService
|
||||
await _broadcaster.TaskUpdated(callerId);
|
||||
return new SuggestedImprovementDto(child.Id);
|
||||
}
|
||||
|
||||
[McpServerTool, Description(
|
||||
"Ask the user a question and wait up to 3 minutes for their answer. Use this ONLY "
|
||||
+ "when you genuinely need a human decision to proceed correctly and a wrong guess "
|
||||
+ "would be costly or hard to undo (an irreversible action, contradictory "
|
||||
+ "requirements, or a real fork where both options have meaningful consequences). "
|
||||
+ "Do NOT use it for routine choices you can reasonably make yourself — for those, "
|
||||
+ "pick the most sensible option and continue. The returned string is the user's "
|
||||
+ "answer; if no one responds in time it tells you to proceed on your own judgment.")]
|
||||
public Task<string> AskUser(string question, CancellationToken cancellationToken)
|
||||
{
|
||||
var callerId = _ctx.Current.CallerTaskId;
|
||||
return AwaitAnswerAsync(
|
||||
_pending, callerId, question ?? string.Empty,
|
||||
(questionId, q) => _broadcaster.TaskQuestionAsked(callerId, questionId, q),
|
||||
questionId => _broadcaster.TaskQuestionResolved(callerId, questionId),
|
||||
QuestionWindow, cancellationToken);
|
||||
}
|
||||
|
||||
// Registers the question, signals it, and blocks until the user answers, the window
|
||||
// elapses (returns the fallback), or the run is cancelled (rethrows). Pure except for
|
||||
// the two broadcast callbacks, so it is unit-testable without a real hub or DbContext.
|
||||
internal static async Task<string> AwaitAnswerAsync(
|
||||
PendingQuestionRegistry pending,
|
||||
string taskId,
|
||||
string question,
|
||||
Func<string, string, Task> onAsked,
|
||||
Func<string, Task> onResolved,
|
||||
TimeSpan timeout,
|
||||
CancellationToken ct)
|
||||
{
|
||||
var (questionId, answer) = pending.Register(taskId, question);
|
||||
await onAsked(questionId, question);
|
||||
try
|
||||
{
|
||||
using var timeoutCts = CancellationTokenSource.CreateLinkedTokenSource(ct);
|
||||
timeoutCts.CancelAfter(timeout);
|
||||
try
|
||||
{
|
||||
return await answer.WaitAsync(timeoutCts.Token);
|
||||
}
|
||||
catch (OperationCanceledException) when (!ct.IsCancellationRequested)
|
||||
{
|
||||
// The window elapsed (not a run cancellation) — let the agent carry on.
|
||||
return TimeoutFallback;
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
pending.Remove(taskId, questionId);
|
||||
await onResolved(questionId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user