starred/aryx
1
0
Fork 0
mirror of https://github.com/davidkaya/aryx.git synced 2026-08-06 19:58:43 +02:00
Code Issues 3 Packages Projects Releases 10 Wiki Activity

fix: correct handoff output attribution

Browse Source 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
David Kaya
2026-03-24 23:55:30 +01:00
co-authored by Copilot
parent 2fc03454c4
commit 7c848113c0
4 changed files with 98 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sidecar/src/Eryx.AgentHost/Services/CopilotAgentBundle.cs
+1 -20
View File
@@ -56,7 +56,7 @@ internal sealed class CopilotAgentBundle : IAsyncDisposable
Streaming = true,
};
if (ShouldDisableSessionTools(command.Pattern, definition, command.WorkspaceKind))
if (isScratchpad)
{
sessionConfig.AvailableTools = [];
}
@@ -90,25 +90,6 @@ internal sealed class CopilotAgentBundle : IAsyncDisposable
return bundle;
}
internal static bool ShouldDisableSessionTools(
PatternDefinitionDto pattern,
PatternAgentDefinitionDto definition,
string workspaceKind)
{
if (string.Equals(workspaceKind, "scratchpad", StringComparison.OrdinalIgnoreCase))
{
return true;
}
if (!string.Equals(pattern.Mode, "handoff", StringComparison.OrdinalIgnoreCase))
{
return false;
}
PatternHandoffTopology topology = PatternGraphResolver.ResolveHandoff(pattern);
return string.Equals(definition.Id, topology.EntryAgentId, StringComparison.OrdinalIgnoreCase);
}
public Workflow BuildWorkflow(PatternDefinitionDto pattern)
{
return pattern.Mode switch
sidecar/src/Eryx.AgentHost/Services/WorkflowTranscriptProjector.cs
+56 -5
View File
@@ -30,14 +30,20 @@ internal static class WorkflowTranscriptProjector
AgentIdentity? fallbackAgent = null)
{
List<ChatMessageDto> mapped = [];
int segmentIndex = 0;
int fallbackOutputIndex = 0;
string createdAt = DateTimeOffset.UtcNow.ToString("O");
List<(string MessageId, string AuthorName, string Content)> remainingSegments = segments.ToList();
List<ChatMessage> assistantMessages = newMessages.Where(message => message.Role != ChatRole.User).ToList();
foreach (ChatMessage message in newMessages.Where(message => message.Role != ChatRole.User))
for (int messageIndex = 0; messageIndex < assistantMessages.Count; messageIndex++)
{
(string MessageId, string AuthorName, string Content)? segment =
segmentIndex < segments.Count ? segments[segmentIndex] : null;
ChatMessage message = assistantMessages[messageIndex];
(string MessageId, string AuthorName, string Content)? segment = TryMatchSegment(
message,
remainingSegments,
assistantMessages.Count - messageIndex,
command.Pattern,
fallbackAgent);
string content = message.Text ?? segment?.Content ?? string.Empty;
if (string.IsNullOrWhiteSpace(content))
{
@@ -46,7 +52,7 @@ internal static class WorkflowTranscriptProjector
if (segment.HasValue)
{
segmentIndex++;
remainingSegments.Remove(segment.Value);
}
fallbackOutputIndex++;
@@ -80,6 +86,51 @@ internal static class WorkflowTranscriptProjector
return mapped;
}
private static (string MessageId, string AuthorName, string Content)? TryMatchSegment(
ChatMessage message,
IReadOnlyList<(string MessageId, string AuthorName, string Content)> remainingSegments,
int remainingMessageCount,
PatternDefinitionDto pattern,
AgentIdentity? fallbackAgent)
{
if (remainingSegments.Count == 0)
{
return null;
}
string? messageText = string.IsNullOrWhiteSpace(message.Text) ? null : message.Text;
if (messageText is not null)
{
string resolvedAuthorName = ResolveProjectedAuthorName(
pattern,
message.AuthorName,
fallbackIdentifier: null,
fallbackAgent);
(string MessageId, string AuthorName, string Content)? authorMatchedSegment = remainingSegments.FirstOrDefault(
segment => string.Equals(segment.Content, messageText, StringComparison.Ordinal)
&& string.Equals(
AgentIdentityResolver.ResolveDisplayAuthorName(pattern, segment.AuthorName),
resolvedAuthorName,
StringComparison.Ordinal));
if (authorMatchedSegment.HasValue)
{
return authorMatchedSegment.Value;
}
(string MessageId, string AuthorName, string Content)? contentMatchedSegment = remainingSegments.FirstOrDefault(
segment => string.Equals(segment.Content, messageText, StringComparison.Ordinal));
if (contentMatchedSegment.HasValue)
{
return contentMatchedSegment.Value;
}
}
return remainingSegments.Count == remainingMessageCount
? remainingSegments[0]
: null;
}
public static List<ChatMessage> SelectNewOutputMessages(
IReadOnlyList<ChatMessage> outputMessages,
IReadOnlyList<ChatMessage> inputMessages)