Fix panel member streaming and persist full transcript with images
Three related panel-member improvements:
Tool-box streaming fix: correlate tool boxes by tool ID instead of a
single pointer (fixes orphaned spinners and empty boxes when a member
calls multiple tools in one message), forward CLI ToolEnd to capture the
tool input (command/path), normalize tool names, clean up orphaned
spinners on finalize, and add a blinking cursor during text streaming.
Image/screenshot support: CLI panel members now extract image refs from
the last user message (like the worker) and drop them as temp files
readable via the Read tool, so members can see screenshots and file
attachments instead of being blind on image-based questions.
Reload persistence: each member persists a structured JSON transcript
({name, model, segments:[text|tool]}) instead of plain text, so a reload
restores text AND tool boxes interleaved exactly like live. history.js
renders the transcript and keeps back-compat for the old [Panel: Name]
plaintext format.
- AnthropicService.Agents.cs: NonStreamingLoopCallbacks.TranscriptSink,
loop collects text/tool segments, tool input added to combined event
- AnthropicService.Panel.cs: CLI member ID-correlation + ToolEnd input +
image refs + transcript; RunPanelMember persists one JSON transcript
- stream-ui.js: tool boxes keyed by ID, name normalization, cursor,
orphaned-spinner cleanup
- history.js: render JSON transcript with tool boxes, plaintext fallback
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
1 parent
aa0b8ee493
commit
c32d1e004f
4 files changed
+211
-67
No files matched your search
@@ -441,6 +441,14 @@ public partial class AnthropicService
|
||||
/// Bei Fehler Exception werfen. Wenn null, wird Standard-Executor verwendet.
|
||||
/// </summary>
|
||||
public Func<string, JsonElement, CancellationToken, Task<string>> ExecuteTool { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Optionaler Transkript-Sammler (Panel-Member). Wenn gesetzt, sammelt der Loop
|
||||
/// die interleavte Abfolge aus Text- und Tool-Segmenten, damit der Caller sie als
|
||||
/// EINE strukturierte Message persistieren kann (Reload-Wiederherstellung der
|
||||
/// Tool-Boxen). Segmente: {t:"text", v:...} bzw. {t:"tool", name, input, result, error}.
|
||||
/// </summary>
|
||||
public List<object> TranscriptSink { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -570,6 +578,8 @@ public partial class AnthropicService
|
||||
}
|
||||
if (cb.SseResponse != null)
|
||||
await SseHelper.TryWriteSse(cb.SseResponse, $"{cb.SsePrefix}_text", new { index = cb.MemberIndex, text, agentName = cb.AgentName }, cb.SseCt, cb.SseGate);
|
||||
|
||||
cb.TranscriptSink?.Add(new Dictionary<string, object> { ["t"] = "text", ["v"] = text });
|
||||
}
|
||||
else if (blockType == "tool_use")
|
||||
{
|
||||
@@ -628,7 +638,13 @@ public partial class AnthropicService
|
||||
});
|
||||
|
||||
if (cb.SseResponse != null)
|
||||
await SseHelper.TryWriteSse(cb.SseResponse, $"{cb.SsePrefix}_tool", new { index = cb.MemberIndex, name = toolName, result = TruncateToolResult(toolResult), isError, agentName = cb.AgentName }, cb.SseCt, cb.SseGate);
|
||||
await SseHelper.TryWriteSse(cb.SseResponse, $"{cb.SsePrefix}_tool", new { index = cb.MemberIndex, name = toolName, input = inputEl.ToString(), result = TruncateToolResult(toolResult), isError, agentName = cb.AgentName }, cb.SseCt, cb.SseGate);
|
||||
|
||||
cb.TranscriptSink?.Add(new Dictionary<string, object>
|
||||
{
|
||||
["t"] = "tool", ["name"] = toolName, ["input"] = inputEl.ToString(),
|
||||
["result"] = TruncateToolResult(toolResult), ["error"] = isError
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -164,25 +164,30 @@ public partial class AnthropicService
|
||||
// workerMessages oder parallele Member leckt.
|
||||
var memberMessages = CloneForMember(workerMessages, previousLayerBlock);
|
||||
string text;
|
||||
List<object> segments = null; // interleavtes Transkript (Text + Tools) für die Reload-Persistenz
|
||||
try
|
||||
{
|
||||
if (!string.IsNullOrEmpty(member.Provider) && _openAiService != null)
|
||||
{
|
||||
// OpenAI-kompatibler Member: tool-los (CompleteText), Proposer aus Kontext.
|
||||
// Kein Tool-Transkript → unten als einzelnes Text-Segment persistiert.
|
||||
var systemText = ExtractSystemPromptText(member.SystemPrompt);
|
||||
text = await _openAiService.CompleteText(member.ModelId, systemText, memberMessages, apiToken);
|
||||
}
|
||||
else if (string.IsNullOrEmpty(apiToken) && _cliService != null && _cliService.IsAvailable)
|
||||
{
|
||||
// Kein API-Key → CLI-Member, read-only (Plan-Modus: nur Read/Glob/Grep).
|
||||
// Streamt LIVE (Token + Tool-Uses) über panel_member_*-Events.
|
||||
text = await RunPanelMemberViaCli(response, member, memberMessages, index, sseGate, workCt, sseCt);
|
||||
// Streamt LIVE (Token + Tool-Uses) über panel_member_*-Events und liefert das Transkript.
|
||||
var (t, segs) = await RunPanelMemberViaCli(response, member, memberMessages, index, sseGate, workCt, sseCt);
|
||||
text = t; segments = segs;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Anthropic-API-Member: read-only (PlanMode) + NICHT persistieren (Caller persistiert einmal).
|
||||
// Live-Streaming über den Loop: pro Tool-Runde panel_member_text / panel_member_tool.
|
||||
// TranscriptSink sammelt Text-/Tool-Segmente für die Reload-Persistenz.
|
||||
var memberUsage = new TokenUsage();
|
||||
segments = new List<object>();
|
||||
var (t, _) = await RunNonStreamingToolLoop(
|
||||
member.ModelId, member.SystemPrompt,
|
||||
new ToolPayloadOptions
|
||||
@@ -197,28 +202,42 @@ public partial class AnthropicService
|
||||
{
|
||||
Persist = false,
|
||||
SseResponse = response, SseCt = sseCt, SseGate = sseGate,
|
||||
SsePrefix = "panel_member", MemberIndex = index, AgentName = name
|
||||
SsePrefix = "panel_member", MemberIndex = index, AgentName = name,
|
||||
TranscriptSink = segments
|
||||
},
|
||||
member.Effort);
|
||||
text = t;
|
||||
}
|
||||
}
|
||||
catch (OperationCanceledException) { throw; }
|
||||
catch (Exception ex) { text = $"[Fehler bei {name}: {ex.Message}]"; }
|
||||
catch (Exception ex) { text = $"[Fehler bei {name}: {ex.Message}]"; segments = null; }
|
||||
|
||||
text = (text ?? "").Trim();
|
||||
|
||||
// Proposal als EINE Message persistieren: Tag="panel" → aus Worker-History gefiltert,
|
||||
// [Panel: Name]-Prefix → Label beim History-Rendering. Iteration=index+1 → stabile Reihenfolge.
|
||||
// Nur die FINALE Runde persistieren (MoA-Zwischenrunden sind live-only, überleben kein F5).
|
||||
if (persist && !string.IsNullOrEmpty(text))
|
||||
// Member-Transkript als EINE strukturierte Message persistieren (Tag="panel" → aus
|
||||
// Worker-History gefiltert, Iteration=index+1 → stabile Reihenfolge). Content = JSON
|
||||
// {name, model, segments:[{t:"text"|"tool",...}]} → der Reload stellt Text UND Tool-Boxen
|
||||
// wieder her (genau wie live). Fällt auf ein einzelnes Text-Segment zurück (OpenAI-Member,
|
||||
// Fehler oder wenn nichts gestreamt wurde). Nur die FINALE Runde (MoA-Zwischenrunden sind
|
||||
// live-only und überleben kein F5).
|
||||
if (persist)
|
||||
{
|
||||
await _db.SaveMessage(new MessageRecord
|
||||
if (segments == null || segments.Count == 0)
|
||||
{
|
||||
ChainId = chainId, Iteration = index + 1,
|
||||
Role = "assistant", Type = "text",
|
||||
Content = $"[Panel: {name}]\n{text}", Tag = "panel"
|
||||
});
|
||||
segments = new List<object>();
|
||||
if (!string.IsNullOrEmpty(text))
|
||||
segments.Add(new Dictionary<string, object> { ["t"] = "text", ["v"] = text });
|
||||
}
|
||||
if (segments.Count > 0)
|
||||
{
|
||||
var content = JsonSerializer.Serialize(new { name, model = member.ModelId, segments });
|
||||
await _db.SaveMessage(new MessageRecord
|
||||
{
|
||||
ChainId = chainId, Iteration = index + 1,
|
||||
Role = "assistant", Type = "text",
|
||||
Content = content, Tag = "panel"
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
await SseHelper.TryWriteSse(response, "panel_member_done",
|
||||
@@ -235,7 +254,7 @@ public partial class AnthropicService
|
||||
/// laufen durch den geteilten <paramref name="sseGate"/> (parallele Member → sonst
|
||||
/// vermischen sich die Frames). Persistiert nichts – der Caller speichert eine Proposal-Message.
|
||||
/// </summary>
|
||||
private async Task<string> RunPanelMemberViaCli(
|
||||
private async Task<(string text, List<object> segments)> RunPanelMemberViaCli(
|
||||
HttpResponse response,
|
||||
SubAgentContext member,
|
||||
List<object> memberMessages,
|
||||
@@ -244,48 +263,92 @@ public partial class AnthropicService
|
||||
CancellationToken workCt,
|
||||
CancellationToken sseCt)
|
||||
{
|
||||
if (_cliService == null || !_cliService.IsAvailable) return "";
|
||||
if (_cliService == null || !_cliService.IsAvailable) return ("", new List<object>());
|
||||
|
||||
var systemText = ExtractSystemPromptText(member.SystemPrompt);
|
||||
var prompt = ExtractLastUserText(memberMessages) ?? "";
|
||||
|
||||
// Bild-/Datei-Anhänge der letzten User-Message als Temp-Dateien ablegen, damit der
|
||||
// CLI-Member sie per Read-Tool sehen kann (Screenshots, PDFs etc.) – exakt wie der Worker.
|
||||
// Ohne das wären die Member bei bildbasierten Fragen blind → read-only Tools nutzlos.
|
||||
var tempImagePaths = new List<string>();
|
||||
var imageRefs = ExtractLastUserImageRefs(memberMessages, tempImagePaths);
|
||||
if (!string.IsNullOrEmpty(imageRefs))
|
||||
prompt = imageRefs + "\n" + prompt;
|
||||
|
||||
var historyContext = BuildHistoryContext(memberMessages);
|
||||
if (!string.IsNullOrEmpty(historyContext))
|
||||
prompt = $"<conversation_history>\n{historyContext}\n</conversation_history>\n\n<current_request>\n{prompt}\n</current_request>";
|
||||
|
||||
var fullText = new StringBuilder();
|
||||
string currentToolName = null; // ToolResult trägt keinen Namen → vom ToolStart merken
|
||||
await _cliService.ChatStreamingAsync(
|
||||
prompt,
|
||||
async evt =>
|
||||
{
|
||||
switch (evt.Type)
|
||||
// Transkript-Segmente (Text + Tools interleaved) für die Reload-Persistenz.
|
||||
var segments = new List<object>();
|
||||
var segText = new StringBuilder();
|
||||
void FlushText()
|
||||
{
|
||||
if (segText.Length == 0) return;
|
||||
segments.Add(new Dictionary<string, object> { ["t"] = "text", ["v"] = segText.ToString() });
|
||||
segText.Clear();
|
||||
}
|
||||
// Tool-Uses per ID korrelieren: Ein Member kann MEHRERE Tools in einer Assistant-Message
|
||||
// aufrufen (ToolStart#1,#2,… ToolResult#1,#2,…). Ein einzelner "currentTool"-Zeiger würde
|
||||
// dann Boxen vertauschen/verwaisen lassen. Außerdem ist der Tool-Input erst bei ToolEnd
|
||||
// (content_block_stop) vollständig – ToolStart/ToolResult tragen ihn nicht.
|
||||
var toolNames = new Dictionary<string, string>(); // toolId -> CLI-Name
|
||||
var toolInputs = new Dictionary<string, string>(); // toolId -> Input-JSON
|
||||
try
|
||||
{
|
||||
await _cliService.ChatStreamingAsync(
|
||||
prompt,
|
||||
async evt =>
|
||||
{
|
||||
case CliEventType.TextDelta:
|
||||
fullText.Append(evt.Text);
|
||||
await SseHelper.TryWriteSse(response, "panel_member_text",
|
||||
new { index, text = evt.Text }, sseCt, sseGate);
|
||||
break;
|
||||
case CliEventType.ToolStart:
|
||||
currentToolName = evt.ToolName;
|
||||
await SseHelper.TryWriteSse(response, "panel_member_tool_use",
|
||||
new { index, name = evt.ToolName }, sseCt, sseGate);
|
||||
break;
|
||||
case CliEventType.ToolResult:
|
||||
await SseHelper.TryWriteSse(response, "panel_member_tool_end",
|
||||
new { index, name = currentToolName, result = evt.ToolResultContent, isError = evt.ToolResultIsError }, sseCt, sseGate);
|
||||
currentToolName = null;
|
||||
break;
|
||||
}
|
||||
},
|
||||
modelId: member.ModelId,
|
||||
systemPrompt: systemText,
|
||||
workspace: member.Workspace,
|
||||
hasWorkspace: !string.IsNullOrEmpty(member.Workspace),
|
||||
planMode: true,
|
||||
effort: member.Effort,
|
||||
cancellationToken: workCt
|
||||
);
|
||||
return fullText.ToString();
|
||||
switch (evt.Type)
|
||||
{
|
||||
case CliEventType.TextDelta:
|
||||
fullText.Append(evt.Text);
|
||||
segText.Append(evt.Text);
|
||||
await SseHelper.TryWriteSse(response, "panel_member_text",
|
||||
new { index, text = evt.Text }, sseCt, sseGate);
|
||||
break;
|
||||
case CliEventType.ToolStart:
|
||||
FlushText(); // Text-Segment vor der Tool-Box schließen (Reihenfolge wie live)
|
||||
if (!string.IsNullOrEmpty(evt.ToolId)) toolNames[evt.ToolId] = evt.ToolName;
|
||||
await SseHelper.TryWriteSse(response, "panel_member_tool_use",
|
||||
new { index, id = evt.ToolId, name = evt.ToolName }, sseCt, sseGate);
|
||||
break;
|
||||
case CliEventType.ToolEnd:
|
||||
// Input streamt erst nach ToolStart ein → hier vollständig. Für ToolResult merken.
|
||||
if (!string.IsNullOrEmpty(evt.ToolId)) toolInputs[evt.ToolId] = evt.ToolInput;
|
||||
break;
|
||||
case CliEventType.ToolResult:
|
||||
var rid = evt.ToolId ?? "";
|
||||
toolNames.TryGetValue(rid, out var rName);
|
||||
toolInputs.TryGetValue(rid, out var rInput);
|
||||
segments.Add(new Dictionary<string, object>
|
||||
{
|
||||
["t"] = "tool", ["name"] = rName ?? "", ["input"] = rInput ?? "",
|
||||
["result"] = TruncateToolResult(evt.ToolResultContent), ["error"] = evt.ToolResultIsError
|
||||
});
|
||||
await SseHelper.TryWriteSse(response, "panel_member_tool_end",
|
||||
new { index, id = rid, name = rName, input = rInput, result = evt.ToolResultContent, isError = evt.ToolResultIsError }, sseCt, sseGate);
|
||||
break;
|
||||
}
|
||||
},
|
||||
modelId: member.ModelId,
|
||||
systemPrompt: systemText,
|
||||
workspace: member.Workspace,
|
||||
hasWorkspace: !string.IsNullOrEmpty(member.Workspace),
|
||||
planMode: true,
|
||||
effort: member.Effort,
|
||||
cancellationToken: workCt
|
||||
);
|
||||
}
|
||||
finally
|
||||
{
|
||||
CleanupTempImages(tempImagePaths);
|
||||
}
|
||||
FlushText(); // restliches Text-Segment am Ende sichern
|
||||
return (fullText.ToString(), segments);
|
||||
}
|
||||
|
||||
/// <summary>Extrahiert den System-Prompt-Text aus den List<object>-Blöcken eines SubAgentContext.</summary>
|
||||
|
||||
Reference in new issue
Block a user