@hef2024/llmasaservice-ui 0.25.0 → 0.25.2

package/src/AIAgentPanel.tsx

@@ -516,7 +516,69 @@ const parseCallMessages = (rawMessages: unknown): TranscriptMessage[] => {
 };
 
 const shouldSkipTranscriptMessage = (message: TranscriptMessage): boolean => {
-  return message.role === 'system' || (message.role === 'user' && message.content.startsWith('__system__:'));
+  const normalizedContent = message.content.trim().toLowerCase();
+  const isInternalContinuationPrompt =
+    message.role === 'user' &&
+    normalizedContent.startsWith('original request:') &&
+    normalizedContent.includes('tool execution summary for the previous request:');
+  return (
+    message.role === 'system' ||
+    (message.role === 'user' && message.content.startsWith('__system__:')) ||
+    isInternalContinuationPrompt
+  );
+};
+
+const looksLikeToolStubResponse = (value: string): boolean => {
+  const text = value.trim();
+  if (!text) return false;
+  return (
+    text.includes('"type":"tool_use"') ||
+    text.includes('"type": "tool_use"') ||
+    text.includes('"type":"function"') ||
+    text.includes('"type": "function"')
+  );
+};
+
+const pickMoreCompleteResponse = (primaryResponse: string, fallbackResponse: string): string => {
+  const primary = primaryResponse.trim();
+  const fallback = fallbackResponse.trim();
+  if (!fallback) return primary;
+  if (!primary) return fallback;
+  if (primary === fallback) return primary;
+
+  if (looksLikeToolStubResponse(primary) && !looksLikeToolStubResponse(fallback)) {
+    return fallback;
+  }
+
+  if (fallback.startsWith(primary) || fallback.length > primary.length + 40) {
+    return fallback;
+  }
+
+  return primary;
+};
+
+const mergeContinuationResponse = (baseResponse: string, continuationResponse: string): string => {
+  const base = baseResponse.trim();
+  const continuation = continuationResponse.trim();
+  if (!base) return continuation;
+  if (!continuation) return base;
+
+  if (looksLikeToolStubResponse(base) && !looksLikeToolStubResponse(continuation)) {
+    return continuation;
+  }
+
+  if (base.includes(continuation)) {
+    return base;
+  }
+
+  const maxOverlap = Math.min(base.length, continuation.length);
+  for (let overlap = maxOverlap; overlap > 0; overlap -= 1) {
+    if (base.slice(-overlap) === continuation.slice(0, overlap)) {
+      return `${base}${continuation.slice(overlap)}`;
+    }
+  }
+
+  return `${base}\n\n${continuation}`;
 };
 
 const parseTimestampMs = (value: unknown): number | null => {
@@ -626,14 +688,21 @@ const buildTurnsFromMessages = (
     if (!prompt) continue;
 
     let response = '';
+    let lastAssistantIndex = -1;
     let reachedNextUser = false;
     for (let lookAhead = index + 1; lookAhead < messages.length; lookAhead += 1) {
       const nextMessage = messages[lookAhead];
       if (!nextMessage) continue;
       if (nextMessage.role === 'assistant') {
-        response = nextMessage.content.trim();
-        index = lookAhead;
-        break;
+        const assistantResponse = nextMessage.content.trim();
+        if (assistantResponse) {
+          // Keep scanning until the next user turn so transcript replay stores
+          // the final assistant output for this user prompt (post-tool result),
+          // not just the first assistant placeholder/tool-call message.
+          response = assistantResponse;
+          lastAssistantIndex = lookAhead;
+        }
+        continue;
       }
       if (nextMessage.role === 'user') {
         reachedNextUser = true;
@@ -641,9 +710,14 @@ const buildTurnsFromMessages = (
       }
     }
 
-    // Only pair fallback response with the final unresolved user message for this call.
-    if (!response && !reachedNextUser) {
-      response = fallbackResponse;
+    if (lastAssistantIndex >= 0) {
+      index = lastAssistantIndex;
+    }
+
+    // For the final user turn in a call, prefer the call-level fallback response
+    // when it is clearly more complete than the in-message assistant stub.
+    if (!reachedNextUser) {
+      response = pickMoreCompleteResponse(response, fallbackResponse);
     }
 
     if (!response) continue;
@@ -700,6 +774,18 @@ const buildTranscriptTurnsFromCalls = (calls: Record<string, unknown>[]): Transc
             timestampMs,
           },
         ];
+      } else if (fallbackResponse && mergedTurns.length > 0) {
+        const previousTurn = mergedTurns[mergedTurns.length - 1]!;
+        mergedTurns = [
+          ...mergedTurns.slice(0, -1),
+          {
+            ...previousTurn,
+            response: mergeContinuationResponse(previousTurn.response, fallbackResponse),
+            callId: callId || previousTurn.callId,
+            timestampMs: Math.max(previousTurn.timestampMs, timestampMs),
+          },
+        ];
+        continue;
       }
     }