@flamingo-stack/openframe-frontend-core 0.0.584-1973.5461.1 → 0.0.584

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flamingo-stack/openframe-frontend-core",
-  "version": "0.0.584-1973.5461.1",
+  "version": "0.0.584",
   "description": "Shared design system and components for all Flamingo platforms",
   "type": "module",
   "main": "./dist/index.js",

package/src/chat-protocol/__tests__/nats-decoder-golden.test.ts

@@ -329,133 +329,3 @@ describe('decodeNatsChunk — seq envelope', () => {
     }).toMatchSnapshot();
   });
 });
-
-describe('decodeNatsChunk — Mingo source metadata', () => {
-  it.each(['GUIDE', 'SOURCES'] as const)('decodes %s payloads into safe sources and playable refs', type => {
-    expect(
-      decodeNatsChunk({
-        type,
-        streamSeq: 81,
-        payload: {
-          sources: [
-            {
-              index: 1,
-              name: 'Install agent',
-              path: 'docs/install.md',
-              documentType: 'markdown',
-              externalUrl: 'https://docs.example.test/install',
-            },
-            {
-              index: 2,
-              name: 'Unsafe source',
-              path: 'docs/unsafe.md',
-              documentType: 'markdown',
-              externalUrl: 'javascript:alert(1)',
-            },
-            {
-              index: 1,
-              name: 'Duplicate',
-              path: 'docs/duplicate.md',
-              documentType: 'markdown',
-            },
-            { index: 3, name: '', path: 'docs/empty.md', documentType: 'markdown' },
-          ],
-          videos: [
-            {
-              ref: '[card://video:MdFJNoJeqZQ]',
-              title: 'Install the agent',
-              url: 'https://www.youtube.com/watch?v=MdFJNoJeqZQ',
-              sourceRepo: 'embedded-videos',
-              metadata: { youtubeUrl: 'MdFJNoJeqZQ' },
-            },
-            {
-              ref: '[card://video:mux-9b6586b494]',
-              title: 'Community demo',
-              url: 'https://stream.mux.com/playback-id.m3u8',
-              metadata: { videoUrl: 'javascript:alert(1)' },
-            },
-            {
-              ref: '[card://video:mp4-1b2047dc1b]',
-              title: 'Product overview',
-              url: 'https://cdn.example.test/product-overview.mp4',
-              metadata: { videoUrl: 'https://cdn.example.test/product-overview.mp4' },
-            },
-            {
-              ref: '[card://video:MdFJNoJeqZQ]',
-              title: 'Duplicate video',
-              url: 'https://cdn.example.test/duplicate.mp4',
-            },
-          ],
-          cards: [
-            {
-              ref: '[card://markdown:install-agent]',
-              entityType: 'markdown',
-              entityId: 'install-agent',
-            },
-          ],
-        },
-      }),
-    ).toEqual({
-      type: 'sources',
-      seq: 81,
-      sources: [
-        {
-          index: 1,
-          name: 'Install agent',
-          path: 'docs/install.md',
-          documentType: 'markdown',
-          externalUrl: 'https://docs.example.test/install',
-        },
-        {
-          index: 2,
-          name: 'Unsafe source',
-          path: 'docs/unsafe.md',
-          documentType: 'markdown',
-        },
-      ],
-      refs: [
-        {
-          type: 'video',
-          id: 'MdFJNoJeqZQ',
-          title: 'Install the agent',
-          url: 'https://www.youtube.com/watch?v=MdFJNoJeqZQ',
-          sourceRepo: 'embedded-videos',
-          metadata: { youtubeUrl: 'MdFJNoJeqZQ' },
-        },
-        {
-          type: 'video',
-          id: 'mux-9b6586b494',
-          title: 'Community demo',
-          url: 'https://stream.mux.com/playback-id.m3u8',
-          metadata: { videoUrl: 'https://stream.mux.com/playback-id.m3u8' },
-        },
-        {
-          type: 'video',
-          id: 'mp4-1b2047dc1b',
-          title: 'Product overview',
-          url: 'https://cdn.example.test/product-overview.mp4',
-          metadata: { videoUrl: 'https://cdn.example.test/product-overview.mp4' },
-        },
-        {
-          type: 'markdown',
-          id: 'install-agent',
-          title: 'install-agent',
-          url: null,
-        },
-      ],
-    });
-  });
-
-  it('drops a metadata payload with no valid sources or refs', () => {
-    expect(
-      decodeNatsChunk({
-        type: 'SOURCES',
-        payload: {
-          sources: [{ index: 0, name: 'Invalid', path: '', documentType: '' }],
-          videos: [{ ref: 'https://example.test/video' }],
-          cards: [{ ref: '[CARD://blog:wrong-case]' }],
-        },
-      }),
-    ).toBeNull();
-  });
-});

package/src/chat-protocol/events.ts

@@ -12,8 +12,7 @@
 // rows straight to the accumulator, so restating them here would be two
 // declarations of one wire contract. Type-only import from a React-free
 // module; `nats-decoder.ts` already depends on the same file for MESSAGE_TYPE.
-import type { ChatRef } from '../components/chat/chat-ref.types';
-import type { AskOptionData, ChatSource } from '../components/chat/types/message.types';
+import type { AskOptionData } from '../components/chat/types/message.types';
 // The wire-frame shapes these events carry through are defined ONCE in
 // `./frames.ts` — reuse them here rather than restating their fields.
 import type { ApprovalRequestField, DecisionResolvedFrame, UsageTelemetry } from './frames';
@@ -241,12 +240,6 @@ export interface ChatMetadataEvent extends ChatStreamEventBase {
   };
 }
 
-export interface SourcesEvent extends ChatStreamEventBase {
-  type: 'sources';
-  sources: ChatSource[];
-  refs?: ChatRef[];
-}
-
 /** SSE usage frames — raw wire keys (snake_case) preserved. */
 export interface UsageEvent extends ChatStreamEventBase {
   type: 'usage';
@@ -369,7 +362,6 @@ export type ChatStreamEvent =
   | TicketEscalatedEvent
   | TicketEventEvent
   | ChatMetadataEvent
-  | SourcesEvent
   | UsageEvent
   | TokenUsageEvent
   | CompactionEvent

package/src/chat-protocol/nats-decoder.ts

@@ -20,7 +20,6 @@ import { MESSAGE_TYPE } from '../components/chat/types/message.types';
 import type { AskOptionData } from '../components/chat/types/message.types';
 import { ESCALATION_STATE, escalationResolvedStatus } from './events';
 import type { ApprovalToolCall, ChatStreamEvent } from './events';
-import { sourceMetadataEvent } from './source-metadata';
 
 /** Minimal structural view of a NATS chunk (see `ChunkData` in
  *  `src/components/chat/types/network.types.ts`). */
@@ -126,12 +125,6 @@ export function decodeNatsChunk(chunk: unknown): ChatStreamEvent | null {
       }
       return null;
 
-    case MESSAGE_TYPE.GUIDE:
-    case MESSAGE_TYPE.SOURCES: {
-      const event = sourceMetadataEvent(data.payload);
-      return event ? { ...event, ...seq } : null;
-    }
-
     // An ask card is only an ask card with something to pick: a question and at
     // least one option. Anything less is dropped rather than rendered as an
     // empty card the user can't answer — the backend already falls back to a

package/src/components/chat/__tests__/chat-message-list.test.tsx

@@ -146,76 +146,6 @@ describe('ChatMessageList force-scroll decisions', () => {
   });
 });
 
-describe('ChatMessageList message footers', () => {
-  const renderSourceFooter = (message: Message) =>
-    message.sources?.map(source => <span key={`${message.id}-${source.index}`}>{source.name}</span>);
-
-  it('keeps a sourced assistant footer after a later plain assistant message', () => {
-    const sourcedAssistant: Message = {
-      ...msg('a1', 'assistant'),
-      sources: [
-        {
-          index: 1,
-          name: 'Windows installation guide',
-          path: '/docs/windows',
-          documentType: 'openframe-docs',
-        },
-      ],
-    };
-    const plainAssistant = msg('a2', 'assistant');
-
-    render(
-      <ChatMessageList
-        dialogId="d1"
-        messages={[sourcedAssistant, plainAssistant]}
-        renderAfterMessage={renderSourceFooter}
-      />,
-    );
-
-    const sourceFooter = screen.getByText('Windows installation guide');
-    expect(sourceFooter).toBeInTheDocument();
-    expect(screen.getByText('body of a1')).toAppearBefore(sourceFooter);
-  });
-
-  it('renders separate source names when citation indices restart on each turn', () => {
-    const firstAssistant: Message = {
-      ...msg('a1', 'assistant'),
-      sources: [
-        {
-          index: 1,
-          name: 'First turn source',
-          path: '/docs/first',
-          documentType: 'openframe-docs',
-        },
-      ],
-    };
-    const secondAssistant: Message = {
-      ...msg('a2', 'assistant'),
-      sources: [
-        {
-          index: 1,
-          name: 'Second turn source',
-          path: '/docs/second',
-          documentType: 'openframe-docs',
-        },
-      ],
-    };
-
-    render(
-      <ChatMessageList
-        dialogId="d1"
-        messages={[firstAssistant, secondAssistant]}
-        renderAfterMessage={renderSourceFooter}
-      />,
-    );
-
-    const firstSourceFooter = screen.getByText('First turn source');
-    const secondSourceFooter = screen.getByText('Second turn source');
-    expect(screen.getByText('body of a1')).toAppearBefore(firstSourceFooter);
-    expect(screen.getByText('body of a2')).toAppearBefore(secondSourceFooter);
-  });
-});
-
 // The library's own `isAtBottom` lock is lost silently when the scroller's
 // box changes (source chips mounting below it) or when a card settling out
 // of its skeleton produces a resize-driven scroll the library reads as a

package/src/components/chat/__tests__/chat-message-streaming-memo.test.tsx

@@ -20,7 +20,6 @@
 import { render } from '@testing-library/react';
 import type React from 'react';
 import { describe, it, expect, vi } from 'vitest';
-import type { ChatRef } from '../chat-ref.types';
 import type { MessageSegment } from '../types';
 
 /** Every `componentOverrides` / `additionalRemarkPlugins` identity the
@@ -130,89 +129,4 @@ describe('ChatMessageEnhanced — override identity across a streamed turn', ()
     expect(seenRefs).toEqual([{ type: 'blog', id: 'abc' }]);
     expect(view.container.textContent).toContain('card:abc');
   });
-
-  it('enriches exact video markers with YouTube, hashed Mux, and hashed MP4 metadata', () => {
-    const seenRefs: Array<{ id: string; metadata?: Record<string, unknown> }> = [];
-    const refs: ChatRef[] = [
-      {
-        type: 'video',
-        id: 'MdFJNoJeqZQ',
-        title: 'Install the agent',
-        url: 'https://www.youtube.com/watch?v=MdFJNoJeqZQ',
-        metadata: { youtubeUrl: 'MdFJNoJeqZQ' },
-      },
-      {
-        type: 'video',
-        id: 'mux-9b6586b494',
-        title: 'Community demo',
-        url: 'https://stream.mux.com/playback-id.m3u8',
-        metadata: { videoUrl: 'https://stream.mux.com/playback-id.m3u8' },
-      },
-      {
-        type: 'video',
-        id: 'mp4-1b2047dc1b',
-        title: 'Product overview',
-        url: 'https://cdn.example.test/product-overview.mp4',
-        metadata: { videoUrl: 'https://cdn.example.test/product-overview.mp4' },
-      },
-    ];
-
-    render(
-      <ChatMessageEnhanced
-        role="assistant"
-        content={[
-          {
-            type: 'text',
-            text: 'Watch [card://video:MdFJNoJeqZQ] [card://video:mux-9b6586b494] [card://video:mp4-1b2047dc1b].',
-          },
-        ]}
-        refs={refs}
-        renderEntityCard={ref => {
-          seenRefs.push({ id: ref.id, metadata: ref.metadata });
-          return <div data-testid={`card-${ref.id}`}>{ref.title}</div>;
-        }}
-        NavLinkAnchor={NavLinkAnchor}
-      />,
-    );
-
-    expect(seenRefs).toEqual([
-      { id: 'MdFJNoJeqZQ', metadata: { youtubeUrl: 'MdFJNoJeqZQ' } },
-      { id: 'mux-9b6586b494', metadata: { videoUrl: 'https://stream.mux.com/playback-id.m3u8' } },
-      { id: 'mp4-1b2047dc1b', metadata: { videoUrl: 'https://cdn.example.test/product-overview.mp4' } },
-    ]);
-  });
-
-  it('rerenders a completed marker when its enriched metadata arrives later', () => {
-    const seenMetadata: Array<Record<string, unknown> | undefined> = [];
-    const content: MessageSegment[] = [{ type: 'text', text: 'Watch [card://video:mux-9b6586b494].' }];
-    const props = {
-      role: 'assistant' as const,
-      content,
-      renderEntityCard: (ref: ChatRef) => {
-        seenMetadata.push(ref.metadata);
-        return <div>video</div>;
-      },
-      NavLinkAnchor,
-    };
-    const view = render(<ChatMessageEnhanced {...props} />);
-
-    view.rerender(
-      <ChatMessageEnhanced
-        {...props}
-        refs={[
-          {
-            type: 'video',
-            id: 'mux-9b6586b494',
-            title: 'Community demo',
-            url: 'https://stream.mux.com/playback-id.m3u8',
-            metadata: { videoUrl: 'https://stream.mux.com/playback-id.m3u8' },
-          },
-        ]}
-      />,
-    );
-
-    expect(seenMetadata[seenMetadata.length - 1]).toEqual({
-      videoUrl: 'https://stream.mux.com/playback-id.m3u8',
-    });
-  });
 });

package/src/components/chat/chat-message-enhanced.tsx

@@ -103,7 +103,6 @@ const ChatMessageEnhanced = forwardRef<HTMLDivElement, ChatMessageEnhancedProps>
       renderContextItem,
       renderMention,
       renderEntityCard,
-      refs,
       onAskSelect,
       NavLinkAnchor,
       ...props
@@ -128,11 +127,6 @@ const ChatMessageEnhanced = forwardRef<HTMLDivElement, ChatMessageEnhancedProps>
     // literal `[card://...]` URL.
     const hasMarkerSupport = !!renderEntityCard;
 
-    const refsByKey = useMemo(
-      () => new Map((refs ?? []).map(reference => [`${reference.type}:${reference.id}`, reference])),
-      [refs],
-    );
-
     const segments = useMemo(() => normalizeContent(content), [content]);
 
     const askRuns = useMemo(() => groupAskRuns(segments), [segments]);
@@ -186,14 +180,7 @@ const ChatMessageEnhanced = forwardRef<HTMLDivElement, ChatMessageEnhancedProps>
     // (and its open menu) survives across chunks. Invalidated per key when the
     // render fn identity changes.
     const renderedCardNodeCache = useRef(
-      new Map<
-        string,
-        {
-          render: ((ref: ChatRef) => React.ReactNode) | undefined;
-          reference: ChatRef;
-          node: React.ReactNode;
-        }
-      >(),
+      new Map<string, { render: ((ref: ChatRef) => React.ReactNode) | undefined; node: React.ReactNode }>(),
     );
 
     /**
@@ -255,17 +242,10 @@ const ChatMessageEnhanced = forwardRef<HTMLDivElement, ChatMessageEnhancedProps>
           // menu / re-fetching) on every stream chunk. Also dedups the same
           // key emitted twice within one message.
           let entry = cache.get(key);
-          const enrichedRef = refsByKey.get(key);
-          const refForRender: ChatRef = enrichedRef ?? {
-            type: cardType,
-            id: cardId,
-            title: cardId,
-            url: null,
-          };
-          if (!entry || entry.render !== render || entry.reference !== refForRender) {
-            // Prefer same-turn SOURCES metadata when available. Otherwise
-            // cards hydrate by id from the host's per-object APIs, so a
-            // minimal {type, id} descriptor still mounts the loader.
+          if (!entry || entry.render !== render) {
+            // The marker is the ONLY data on the wire: cards hydrate by id
+            // from the host's per-object APIs, so a minimal {type, id}
+            // descriptor is all the renderer needs to mount the loader.
             // For types with nothing to fetch the host's render() returns
             // null and we fall through to the bare-cardId fallback in the
             // `<a card://…>` override below.
@@ -277,7 +257,13 @@ const ChatMessageEnhanced = forwardRef<HTMLDivElement, ChatMessageEnhancedProps>
             // the id rather than `undefined`) and `url` to null (matches
             // the no-link semantics fetch-mode cards rely on — they
             // resolve their own URL after fetch).
-            entry = { render, reference: refForRender, node: render(refForRender) };
+            const refForRender: ChatRef = {
+              type: cardType,
+              id: cardId,
+              title: cardId,
+              url: null,
+            };
+            entry = { render, node: render(refForRender) };
             cache.set(key, entry);
           }
           const rendered = entry.node;
@@ -340,7 +326,7 @@ const ChatMessageEnhanced = forwardRef<HTMLDivElement, ChatMessageEnhancedProps>
         }
       });
       return { inlineByKey, partsBySegment, usedKeys };
-    }, [hasMarkerSupport, refsByKey, renderEntityCard, segments]);
+    }, [hasMarkerSupport, renderEntityCard, segments]);
 
     // Drop cached nodes for markers no longer present so the cache can't grow
     // unbounded as a long message's markers change. Deliberately an EFFECT,
@@ -730,7 +716,6 @@ const MemoizedChatMessageEnhanced = memo(ChatMessageEnhanced, (prevProps, nextPr
     // equality holds across streaming chunks.
     prevProps.renderMention === nextProps.renderMention &&
     prevProps.renderEntityCard === nextProps.renderEntityCard &&
-    prevProps.refs === nextProps.refs &&
     // Same stability contract as the renderers above: hosts pass a `useCallback`
     // (EmbeddableChat passes its memoized `handleSend`), so this holds across
     // streaming chunks instead of re-rendering every ask card per chunk.

package/src/components/chat/chat-message-list.tsx

@@ -1,7 +1,6 @@
 'use client';
 
 import {
-  Fragment,
   useRef,
   useState,
   useCallback,
@@ -139,7 +138,6 @@ const ChatMessageList = forwardRef<HTMLDivElement, ChatMessageListProps>(
       renderContextItem,
       renderMention,
       onAskSelect,
-      renderAfterMessage,
       NavLinkAnchor,
       ...props
     },
@@ -988,31 +986,28 @@ const ChatMessageList = forwardRef<HTMLDivElement, ChatMessageListProps>(
                     (!Array.isArray(message.content) || message.content.every(s => s.type === 'text'));
                   if (isEmptyPendingTurn) return null;
                   return (
-                    <Fragment key={message.id}>
-                      <ChatMessageEnhanced
-                        ref={getRegisterMessageEl(message.id)}
-                        role={message.role}
-                        name={message.name}
-                        content={message.content}
-                        timestamp={message.timestamp}
-                        isTyping={index === messages.length - 1 && isTyping && message.role === 'assistant'}
-                        avatar={showAvatars ? message.avatar : null}
-                        showAvatar={showAvatars}
-                        assistantType={message.assistantType || assistantType}
-                        approvalVariant={approvalVariant}
-                        authorType={message.authorType}
-                        assistantIcon={message.role !== 'user' ? assistantIcon : undefined}
-                        contextItems={message.contextItems}
-                        resolveContextIcon={resolveContextIcon}
-                        renderContextItem={renderContextItem}
-                        renderMention={renderMention}
-                        renderEntityCard={renderEntityCard}
-                        refs={message.refs}
-                        onAskSelect={index > lastUserMessageIndex ? onAskSelect : undefined}
-                        NavLinkAnchor={NavLinkAnchor}
-                      />
-                      {renderAfterMessage?.(message, index)}
-                    </Fragment>
+                    <ChatMessageEnhanced
+                      key={message.id}
+                      ref={getRegisterMessageEl(message.id)}
+                      role={message.role}
+                      name={message.name}
+                      content={message.content}
+                      timestamp={message.timestamp}
+                      isTyping={index === messages.length - 1 && isTyping && message.role === 'assistant'}
+                      avatar={showAvatars ? message.avatar : null}
+                      showAvatar={showAvatars}
+                      assistantType={message.assistantType || assistantType}
+                      approvalVariant={approvalVariant}
+                      authorType={message.authorType}
+                      assistantIcon={message.role !== 'user' ? assistantIcon : undefined}
+                      contextItems={message.contextItems}
+                      resolveContextIcon={resolveContextIcon}
+                      renderContextItem={renderContextItem}
+                      renderMention={renderMention}
+                      renderEntityCard={renderEntityCard}
+                      onAskSelect={index > lastUserMessageIndex ? onAskSelect : undefined}
+                      NavLinkAnchor={NavLinkAnchor}
+                    />
                   );
                 })}
               </div>

package/src/components/chat/embeddable-chat.tsx

@@ -808,14 +808,13 @@ function SourceChips({
   const [expanded, setExpanded] = useState(false);
 
   if (cited.length === 0) {
-    const visible = expanded ? uncited : uncited.slice(0, FALLBACK_TOP_RETRIEVED);
-    const hiddenCount = Math.max(0, uncited.length - FALLBACK_TOP_RETRIEVED);
-    if (visible.length === 0) return null;
+    const fallback = uncited.slice(0, FALLBACK_TOP_RETRIEVED);
+    if (fallback.length === 0) return null;
     return (
       <div className="mt-2 flex flex-col gap-1.5 border-t border-ods-border pt-2">
         <span className="uppercase text-ods-text-muted text-h6">Top retrieved sources</span>
-        <div className={`flex flex-wrap gap-1.5 ${expanded ? 'max-h-[200px] overflow-y-auto overscroll-contain' : ''}`}>
-          {visible.map(src => (
+        <div className="flex flex-wrap gap-1.5">
+          {fallback.map(src => (
             <SourceChip
               key={src.index}
               src={src}
@@ -825,16 +824,6 @@ function SourceChips({
               onDiscuss={onDiscuss}
             />
           ))}
-          {hiddenCount > 0 && (
-            <button
-              onClick={() => setExpanded(!expanded)}
-              className="inline-flex cursor-pointer items-center gap-1 rounded border border-ods-accent bg-ods-card px-2 py-0.5 text-ods-accent transition-colors text-h6 hover:bg-ods-accent/10"
-              aria-expanded={expanded}
-              aria-label={expanded ? 'Show fewer sources' : `Show ${hiddenCount} additional retrieved sources`}
-            >
-              {expanded ? 'Show less' : `+${hiddenCount} more retrieved ${hiddenCount === 1 ? 'source' : 'sources'}`}
-            </button>
-          )}
         </div>
       </div>
     );
@@ -1590,10 +1579,6 @@ function EmbeddableChatInner({
         // explicitly — see `Message.hidden` and `chat-message-list`'s skip.
         ...(m.hidden ? { hidden: true } : {}),
         ...(m.scrollAnchor ? { scrollAnchor: m.scrollAnchor } : {}),
-        // Preserve same-turn rich metadata. Source chips and entity-card
-        // renderers consume it after this raw-to-Message projection.
-        ...(m.sources && m.sources.length > 0 ? { sources: m.sources } : {}),
-        ...(m.refs && m.refs.length > 0 ? { refs: m.refs } : {}),
         // Forward attached context items so the user bubble renders its chips.
         ...(m.contextItems && m.contextItems.length > 0 ? { contextItems: m.contextItems } : {}),
       };
@@ -1844,41 +1829,24 @@ function EmbeddableChatInner({
     return out;
   }, [commandsById, enabledSet]);
 
-  const renderSourcesAfterMessage = useCallback(
-    (message: Message, index: number) => {
-      if (message.role !== 'assistant' || !message.sources?.length) return null;
-      if (chatLoading && index === messages.length - 1) return null;
-      const content =
-        typeof message.content === 'string'
-          ? message.content
-          : message.content
-              .filter(segment => segment.type === 'text')
-              .map(segment => segment.text)
-              .join('\n');
-      const citationOrder = [...content.matchAll(/\[(\d+)\]/g)].map(m => parseInt(m[1], 10));
-      const seenOrder = new Map<number, number>();
-      citationOrder.forEach(idx => {
-        if (!seenOrder.has(idx)) seenOrder.set(idx, seenOrder.size);
-      });
-      const cited = message.sources
-        .filter(s => seenOrder.has(s.index))
-        .sort((a, b) => (seenOrder.get(a.index) ?? 0) - (seenOrder.get(b.index) ?? 0));
-      const uncited = message.sources.filter(s => !seenOrder.has(s.index));
-      return (
-        <div className="flex-shrink-0 pb-2">
-          <SourceChips
-            cited={cited}
-            uncited={uncited}
-            baseRoute={resolvedBaseRoute}
-            chipBasePlatform={chipBasePlatform}
-            onClose={handleNavigationClose}
-            onDiscuss={discussRef}
-          />
-        </div>
-      );
-    },
-    [chatLoading, messages.length, resolvedBaseRoute, chipBasePlatform, handleNavigationClose, discussRef],
-  );
+  // Find sources for the last assistant message; split into cited / uncited.
+  const lastAssistantMsg = [...rawMessages].reverse().find(m => m.role === 'assistant');
+  const lastSources = useMemo(() => {
+    if (chatLoading) return undefined;
+    const sources = lastAssistantMsg?.sources;
+    if (!sources || sources.length === 0) return undefined;
+    const content = lastAssistantMsg?.content || '';
+    const citationOrder = [...content.matchAll(/\[(\d+)\]/g)].map(m => parseInt(m[1], 10));
+    const seenOrder = new Map<number, number>();
+    citationOrder.forEach(idx => {
+      if (!seenOrder.has(idx)) seenOrder.set(idx, seenOrder.size);
+    });
+    const cited = sources
+      .filter(s => seenOrder.has(s.index))
+      .sort((a, b) => (seenOrder.get(a.index) ?? 0) - (seenOrder.get(b.index) ?? 0));
+    const uncited = sources.filter(s => !seenOrder.has(s.index));
+    return { cited, uncited };
+  }, [lastAssistantMsg, chatLoading]);
 
   // Host node for in-panel Radix portals (see the body wrapper below).
   const [portalHost, setPortalHost] = useState<HTMLDivElement | null>(null);
@@ -2422,7 +2390,6 @@ function EmbeddableChatInner({
                                   resolveContextIcon={resolveContextIcon}
                                   renderContextItem={renderContextItem}
                                   renderMention={renderMention}
-                                  renderAfterMessage={renderSourcesAfterMessage}
                                   // Gated on `chatLoading` for the same reason the composer
                                   // is: no second send while a turn is in flight. Passive
                                   // demo hosts (previewMode) stay read-only.
@@ -2460,6 +2427,20 @@ function EmbeddableChatInner({
                                   onLoadMore={loadMoreMessages}
                                 />
                               )}
+                              {lastSources &&
+                                (lastSources.cited.length > 0 || lastSources.uncited.length > 0) &&
+                                !chatLoading && (
+                                  <div className="flex-shrink-0 pb-2">
+                                    <SourceChips
+                                      cited={lastSources.cited}
+                                      uncited={lastSources.uncited}
+                                      baseRoute={resolvedBaseRoute}
+                                      chipBasePlatform={chipBasePlatform}
+                                      onClose={handleNavigationClose}
+                                      onDiscuss={discussRef}
+                                    />
+                                  </div>
+                                )}
                             </div>
                           ) : activeMode === 'mingo' ? (
                             /* Figma node 7532:222444 — default (Mingo-mode) empty state: