fix: surface handoff specialist activity\n\nQueue per-agent thinking updates from synchronous Copilot SDK session\nevents, flush them through the workflow runner, and promote handoff\ntargets to thinking immediately after handoff activity is emitted.\nThis fixes the UI case where downstream agents stayed on 'No status\nyet' during handoff patterns.\n\nAlso add targeted handoff diagnostics and regression tests.\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

2026-08-26 21:03:58 +02:00 · 2026-03-27 20:49:52 +01:00
parent 2a952dfebe
commit 85a9327f65
4 changed files with 344 additions and 22 deletions
@@ -9,6 +9,7 @@ internal sealed class CopilotTurnExecutionState
 {
    private readonly RunTurnCommandDto _command;
    private readonly HashSet<string> _startedAgents = new(StringComparer.OrdinalIgnoreCase);
+    private readonly ConcurrentQueue<AgentActivityEventDto> _pendingActivityEvents = new();
    private readonly ConcurrentQueue<McpOauthRequiredEventDto> _pendingMcpOauthRequests = new();
    private readonly ConcurrentDictionary<string, AgentIdentity> _observedAgentsByMessageId = new(StringComparer.Ordinal);
    private readonly StreamingTranscriptBuffer _transcriptBuffer = new();
@@ -31,22 +32,22 @@ internal sealed class CopilotTurnExecutionState
        AgentIdentity agent,
        Func<AgentActivityEventDto, Task> onActivity)
    {
-        ActiveAgent = agent;
-
-        if (!_startedAgents.Add(agent.AgentId))
+        AgentActivityEventDto? thinkingActivity = CreateThinkingActivityIfNeeded(agent);
+        if (thinkingActivity is null)
        {
            return;
        }

-        await onActivity(new AgentActivityEventDto
+        await onActivity(thinkingActivity).ConfigureAwait(false);
+    }
+
+    public void QueueThinkingIfNeeded(AgentIdentity agent)
+    {
+        AgentActivityEventDto? thinkingActivity = CreateThinkingActivityIfNeeded(agent);
+        if (thinkingActivity is not null)
        {
-            Type = "agent-activity",
-            RequestId = _command.RequestId,
-            SessionId = _command.SessionId,
-            ActivityType = "thinking",
-            AgentId = agent.AgentId,
-            AgentName = agent.AgentName,
-        }).ConfigureAwait(false);
+            _pendingActivityEvents.Enqueue(thinkingActivity);
+        }
    }

    public void ApplyActivity(AgentActivityEventDto activity)
@@ -70,12 +71,15 @@ internal sealed class CopilotTurnExecutionState
        {
            case AssistantMessageDeltaEvent messageDelta when !string.IsNullOrWhiteSpace(messageDelta.Data?.MessageId):
                RecordObservedAgentForMessage(agent, messageDelta.Data!.MessageId);
+                QueueThinkingIfNeeded(agent);
                break;
            case AssistantMessageEvent assistantMessage when !string.IsNullOrWhiteSpace(assistantMessage.Data?.MessageId):
                RecordObservedAgentForMessage(agent, assistantMessage.Data!.MessageId);
+                QueueThinkingIfNeeded(agent);
                break;
            case AssistantReasoningDeltaEvent:
                ActiveAgent = agent;
+                QueueThinkingIfNeeded(agent);
                break;
            case McpOauthRequiredEvent:
                ActiveAgent = agent;
@@ -87,6 +91,17 @@ internal sealed class CopilotTurnExecutionState
        }
    }

+    public IReadOnlyList<AgentActivityEventDto> DrainPendingActivityEvents()
+    {
+        List<AgentActivityEventDto> pending = [];
+        while (_pendingActivityEvents.TryDequeue(out AgentActivityEventDto? activity))
+        {
+            pending.Add(activity);
+        }
+
+        return pending;
+    }
+
    public void EnqueuePendingMcpOauthRequest(McpOauthRequiredEventDto request)
    {
        ArgumentNullException.ThrowIfNull(request);
@@ -139,6 +154,26 @@ internal sealed class CopilotTurnExecutionState
        _observedAgentsByMessageId[messageId] = agent;
    }

+    private AgentActivityEventDto? CreateThinkingActivityIfNeeded(AgentIdentity agent)
+    {
+        ActiveAgent = agent;
+
+        if (!_startedAgents.Add(agent.AgentId))
+        {
+            return null;
+        }
+
+        return new AgentActivityEventDto
+        {
+            Type = "agent-activity",
+            RequestId = _command.RequestId,
+            SessionId = _command.SessionId,
+            ActivityType = "thinking",
+            AgentId = agent.AgentId,
+            AgentName = agent.AgentName,
+        };
+    }
+
    public void UpdateCompletedMessages(
        IReadOnlyList<ChatMessage> allMessages,
        IReadOnlyList<ChatMessage> inputMessages)