@pikku/assistant-ui 0.12.3 → 0.12.5

package/dist/esm/pikku-agent-chat.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { createContext, useContext, useState, useMemo } from 'react';
+import { createContext, useContext, useState, useMemo, useEffect, useRef, } from 'react';
 import Markdown from 'react-markdown';
-import { AssistantRuntimeProvider, ThreadPrimitive, MessagePrimitive, ComposerPrimitive, } from '@assistant-ui/react';
+import { AssistantRuntimeProvider, ThreadPrimitive, MessagePrimitive, ComposerPrimitive, useComposerRuntime, } from '@assistant-ui/react';
 import { usePikkuAgentRuntime, PikkuApprovalContext, usePikkuApproval, resolvePikkuToolStatus, } from './use-pikku-agent-runtime.js';
 const lightColors = {
     bg: '#ffffff',
@@ -45,6 +45,9 @@ const darkColors = {
 };
 const ColorsContext = createContext(lightColors);
 const HideToolCallsContext = createContext(undefined);
+const ToolComponentsContext = createContext(undefined);
+const GenerativeUIComponentsContext = createContext(undefined);
+const RenderAssistantTextContext = createContext(undefined);
 function shouldHideToolCall(hideToolCalls, toolName) {
     if (!hideToolCalls)
         return false;
@@ -135,7 +138,9 @@ const ToolCallDisplay = ({ toolCallId, toolName, args, result, status, addResult
                         padding: '2px 6px',
                         borderRadius: 3,
                         background: responded === 'approved' ? colors.successBg : colors.errorBg,
-                        color: responded === 'approved' ? colors.successColor : colors.errorColor,
+                        color: responded === 'approved'
+                            ? colors.successColor
+                            : colors.errorColor,
                     }, children: responded })] }));
     }
     return (_jsxs("div", { style: {
@@ -185,7 +190,12 @@ const ToolCallDisplay = ({ toolCallId, toolName, args, result, status, addResult
                             borderRadius: 4,
                             overflow: 'auto',
                             color: colors.text,
-                        }, children: JSON.stringify(displayArgs, null, 2) }), result !== undefined && (_jsxs(_Fragment, { children: [_jsx("div", { style: { fontSize: 12, color: colors.textMuted, marginTop: 8, marginBottom: 2 }, children: "Result:" }), _jsx("pre", { style: {
+                        }, children: JSON.stringify(displayArgs, null, 2) }), result !== undefined && (_jsxs(_Fragment, { children: [_jsx("div", { style: {
+                                    fontSize: 12,
+                                    color: colors.textMuted,
+                                    marginTop: 8,
+                                    marginBottom: 2,
+                                }, children: "Result:" }), _jsx("pre", { style: {
                                     fontSize: 11,
                                     background: colors.codeBg,
                                     padding: 8,
@@ -196,25 +206,68 @@ const ToolCallDisplay = ({ toolCallId, toolName, args, result, status, addResult
                                     ? result
                                     : JSON.stringify(result, null, 2) })] }))] }))] }));
 };
-const MarkdownText = ({ text, colors }) => {
+const MarkdownText = ({ text, colors, }) => {
     const components = useMemo(() => ({
-        p: ({ children }) => (_jsx("p", { style: { margin: '0 0 8px', fontSize: 14, lineHeight: 1.6, color: colors.text }, children: children })),
+        p: ({ children }) => (_jsx("p", { style: {
+                margin: '0 0 8px',
+                fontSize: 14,
+                lineHeight: 1.6,
+                color: colors.text,
+            }, children: children })),
         strong: ({ children }) => (_jsx("strong", { style: { fontWeight: 600, color: colors.text }, children: children })),
         em: ({ children }) => (_jsx("em", { style: { color: colors.text }, children: children })),
-        ul: ({ children }) => (_jsx("ul", { style: { margin: '4px 0 8px', paddingLeft: 20, fontSize: 14, color: colors.text }, children: children })),
-        ol: ({ children }) => (_jsx("ol", { style: { margin: '4px 0 8px', paddingLeft: 20, fontSize: 14, color: colors.text }, children: children })),
+        ul: ({ children }) => (_jsx("ul", { style: {
+                margin: '4px 0 8px',
+                paddingLeft: 20,
+                fontSize: 14,
+                color: colors.text,
+            }, children: children })),
+        ol: ({ children }) => (_jsx("ol", { style: {
+                margin: '4px 0 8px',
+                paddingLeft: 20,
+                fontSize: 14,
+                color: colors.text,
+            }, children: children })),
         li: ({ children }) => (_jsx("li", { style: { marginBottom: 2, lineHeight: 1.6 }, children: children })),
         code: ({ children, className }) => {
             const isBlock = className?.startsWith('language-');
             if (isBlock) {
-                return (_jsx("pre", { style: { background: colors.codeBg, padding: 10, borderRadius: 4, overflow: 'auto', margin: '4px 0 8px', fontSize: 12 }, children: _jsx("code", { style: { color: colors.text }, children: children }) }));
+                return (_jsx("pre", { style: {
+                        background: colors.codeBg,
+                        padding: 10,
+                        borderRadius: 4,
+                        overflow: 'auto',
+                        margin: '4px 0 8px',
+                        fontSize: 12,
+                    }, children: _jsx("code", { style: { color: colors.text }, children: children }) }));
             }
-            return (_jsx("code", { style: { background: colors.codeBg, padding: '1px 4px', borderRadius: 3, fontSize: 13, color: colors.text }, children: children }));
+            return (_jsx("code", { style: {
+                    background: colors.codeBg,
+                    padding: '1px 4px',
+                    borderRadius: 3,
+                    fontSize: 13,
+                    color: colors.text,
+                }, children: children }));
         },
         pre: ({ children }) => _jsx(_Fragment, { children: children }),
-        h1: ({ children }) => _jsx("h3", { style: { margin: '8px 0 4px', fontSize: 16, fontWeight: 600, color: colors.text }, children: children }),
-        h2: ({ children }) => _jsx("h4", { style: { margin: '8px 0 4px', fontSize: 15, fontWeight: 600, color: colors.text }, children: children }),
-        h3: ({ children }) => _jsx("h5", { style: { margin: '8px 0 4px', fontSize: 14, fontWeight: 600, color: colors.text }, children: children }),
+        h1: ({ children }) => (_jsx("h3", { style: {
+                margin: '8px 0 4px',
+                fontSize: 16,
+                fontWeight: 600,
+                color: colors.text,
+            }, children: children })),
+        h2: ({ children }) => (_jsx("h4", { style: {
+                margin: '8px 0 4px',
+                fontSize: 15,
+                fontWeight: 600,
+                color: colors.text,
+            }, children: children })),
+        h3: ({ children }) => (_jsx("h5", { style: {
+                margin: '8px 0 4px',
+                fontSize: 14,
+                fontWeight: 600,
+                color: colors.text,
+            }, children: children })),
         a: ({ href, children }) => (_jsx("a", { href: href, target: "_blank", rel: "noopener noreferrer", style: { color: colors.textMuted, textDecoration: 'underline' }, children: children })),
     }), [colors]);
     return _jsx(Markdown, { components: components, children: text });
@@ -235,11 +288,18 @@ const UserMessage = () => {
                         borderRadius: 12,
                         backgroundColor: colors.userBubble,
                     }, children: _jsx(MessagePrimitive.Content, { components: {
-                            Text: ({ text }) => (_jsx("span", { style: { fontSize: 14, whiteSpace: 'pre-wrap', color: colors.text }, children: text })),
+                            Text: ({ text }) => (_jsx("span", { style: {
+                                    fontSize: 14,
+                                    whiteSpace: 'pre-wrap',
+                                    color: colors.text,
+                                }, children: text })),
                         } }) })] }) }));
 };
 const AssistantMessage = () => {
     const colors = useContext(ColorsContext);
+    const toolComponents = useContext(ToolComponentsContext);
+    const generativeUIComponents = useContext(GenerativeUIComponentsContext);
+    const renderAssistantText = useContext(RenderAssistantTextContext);
     return (_jsx("div", { style: {
             display: 'flex',
             justifyContent: 'flex-start',
@@ -249,10 +309,18 @@ const AssistantMessage = () => {
                         borderRadius: 12,
                         backgroundColor: colors.assistantBubble,
                     }, children: [_jsx(MessagePrimitive.Content, { components: {
-                                Text: ({ text }) => (_jsx(MarkdownText, { text: text, colors: colors })),
+                                Text: ({ text }) => renderAssistantText ? (_jsx(_Fragment, { children: renderAssistantText(text) })) : (_jsx(MarkdownText, { text: text, colors: colors })),
                                 tools: {
+                                    by_name: toolComponents,
                                     Fallback: (props) => (_jsx(ToolCallDisplay, { toolCallId: props.toolCallId, toolName: props.toolName, args: props.args, result: props.result, status: resolvePikkuToolStatus(props.status, props.result), addResult: props.addResult })),
                                 },
+                                ...(generativeUIComponents
+                                    ? {
+                                        generativeUI: {
+                                            components: generativeUIComponents,
+                                        },
+                                    }
+                                    : {}),
                             } }), _jsx(MessagePrimitive.If, { last: true, children: _jsx(ThreadPrimitive.If, { running: true, children: _jsx("div", { style: {
                                         display: 'flex',
                                         alignItems: 'center',
@@ -262,81 +330,112 @@ const AssistantMessage = () => {
                                         color: colors.textMuted,
                                     }, children: "Thinking..." }) }) })] })] }) }));
 };
+const ComposerPrefill = ({ text }) => {
+    const composer = useComposerRuntime();
+    const filled = useRef(false);
+    useEffect(() => {
+        if (filled.current || !text)
+            return;
+        filled.current = true;
+        if (composer.getState().text === '')
+            composer.setText(text);
+    }, [text, composer]);
+    return null;
+};
 const PikkuComposer = ({ disabled, }) => {
     const colors = useContext(ColorsContext);
     return (_jsx("div", { style: { padding: '8px 0 16px' }, children: _jsx(ComposerPrimitive.Root, { children: _jsxs("div", { style: {
-                    border: `1px solid ${colors.border}`,
-                    borderRadius: 12,
-                    overflow: 'hidden',
+                    position: 'relative',
+                    zIndex: 2,
                     display: 'flex',
-                    alignItems: 'flex-end',
-                    padding: '6px 12px',
-                    gap: 8,
-                    ...(disabled ? { opacity: 0.5, pointerEvents: 'none' } : {}),
-                }, children: [_jsx(ComposerPrimitive.Input, { placeholder: disabled ? 'Respond to approval request above...' : 'Message...', rows: 2, disabled: disabled, style: {
-                            flex: 1,
+                    flexDirection: 'column',
+                    gap: 10,
+                    backgroundColor: colors.assistantBubble,
+                    border: `1px solid ${colors.border}`,
+                    borderRadius: 24,
+                    padding: '14px 12px 10px',
+                    boxShadow: darkColors.text === colors.text
+                        ? '0 14px 30px rgba(0,0,0,0.24)'
+                        : '0 14px 30px rgba(0,0,0,0.08)',
+                    ...(disabled
+                        ? { opacity: 0.5, pointerEvents: 'none' }
+                        : {}),
+                }, children: [_jsx(ComposerPrimitive.Input, { placeholder: disabled ? 'Respond to approval request above...' : 'Message...', rows: 1, disabled: disabled ?? false, style: {
+                            width: '100%',
+                            background: 'transparent',
                             border: 'none',
                             outline: 'none',
-                            resize: 'none',
+                            color: colors.text,
                             fontSize: 14,
                             fontFamily: 'inherit',
-                            padding: '4px 0',
-                            background: colors.inputBg,
-                            color: colors.text,
-                        } }), _jsx(ComposerPrimitive.Send, { disabled: disabled, style: {
-                            width: 28,
-                            height: 28,
-                            borderRadius: '50%',
-                            border: 'none',
-                            background: disabled ? colors.textMuted : colors.sendBg,
-                            color: colors.sendColor,
-                            cursor: disabled ? 'not-allowed' : 'pointer',
+                            resize: 'none',
+                            lineHeight: 1.5,
+                            overflowY: 'auto',
+                        } }), _jsx("div", { style: {
+                            width: '100%',
                             display: 'flex',
                             alignItems: 'center',
-                            justifyContent: 'center',
-                            flexShrink: 0,
-                            marginBottom: 2,
-                            fontSize: 14,
-                        }, children: "\u25B6" })] }) }) }));
+                            gap: 6,
+                            minWidth: 0,
+                            justifyContent: 'flex-end',
+                        }, children: _jsx(ComposerPrimitive.Send, { disabled: disabled ?? false, style: {
+                                width: 30,
+                                height: 30,
+                                borderRadius: 999,
+                                border: `1px solid ${colors.border}`,
+                                background: '#e8e8e8',
+                                color: '#111111',
+                                cursor: disabled ? 'not-allowed' : 'pointer',
+                                display: 'flex',
+                                alignItems: 'center',
+                                justifyContent: 'center',
+                                flexShrink: 0,
+                                transition: 'background-color 150ms ease, color 150ms ease, border-color 150ms ease',
+                            }, children: "\u2191" }) })] }) }) }));
 };
 export function PikkuAgentChat(props) {
-    const { emptyMessage, hideToolCalls, dark, maxWidth = 768, ...runtimeOptions } = props;
+    const { emptyMessage, hideToolCalls, dark, maxWidth = 768, toolComponents, renderAssistantText, generativeUIComponents, initialPrompt, ...runtimeOptions } = props;
     const { runtime, isAwaitingApproval, pendingApprovals, handleApproval } = usePikkuAgentRuntime(runtimeOptions);
     const colors = dark ? darkColors : lightColors;
-    return (_jsx(ColorsContext.Provider, { value: colors, children: _jsx(PikkuApprovalContext.Provider, { value: { pendingApprovals, handleApproval }, children: _jsx(HideToolCallsContext.Provider, { value: hideToolCalls, children: _jsx(AssistantRuntimeProvider, { runtime: runtime, children: _jsx("div", { style: {
-                            height: '100%',
-                            display: 'flex',
-                            flexDirection: 'column',
-                            background: colors.bg,
-                        }, children: _jsxs(ThreadPrimitive.Root, { style: {
-                                display: 'flex',
-                                flexDirection: 'column',
-                                flex: 1,
-                                minHeight: 0,
-                            }, children: [_jsx(ThreadPrimitive.Viewport, { style: {
-                                        flex: 1,
-                                        minHeight: 0,
-                                        overflowY: 'auto',
-                                    }, children: _jsxs("div", { style: {
-                                            maxWidth: maxWidth === 'none' ? undefined : maxWidth,
-                                            margin: '0 auto',
-                                            padding: 16,
+    return (_jsx(ColorsContext.Provider, { value: colors, children: _jsx(PikkuApprovalContext.Provider, { value: { pendingApprovals, handleApproval }, children: _jsx(HideToolCallsContext.Provider, { value: hideToolCalls, children: _jsx(ToolComponentsContext.Provider, { value: toolComponents, children: _jsx(GenerativeUIComponentsContext.Provider, { value: generativeUIComponents, children: _jsx(RenderAssistantTextContext.Provider, { value: renderAssistantText, children: _jsxs(AssistantRuntimeProvider, { runtime: runtime, children: [_jsx(ComposerPrefill, { text: initialPrompt }), _jsx("div", { style: {
+                                            height: '100%',
                                             display: 'flex',
                                             flexDirection: 'column',
-                                            gap: 16,
-                                        }, children: [_jsx(ThreadPrimitive.Empty, { children: _jsx("div", { style: {
-                                                        display: 'flex',
-                                                        alignItems: 'center',
-                                                        justifyContent: 'center',
-                                                        minHeight: 300,
-                                                        color: colors.textMuted,
-                                                        textAlign: 'center',
-                                                        fontSize: 14,
-                                                    }, children: emptyMessage ??
-                                                        (props.threadId
-                                                            ? 'Send a message to start the conversation.'
-                                                            : 'Start a new conversation.') }) }), _jsx(ThreadPrimitive.Messages, { components: {
-                                                    UserMessage,
-                                                    AssistantMessage,
-                                                } })] }) }), _jsx("div", { style: { maxWidth: maxWidth === 'none' ? undefined : maxWidth, margin: '0 auto', width: '100%', padding: '0 16px' }, children: _jsx(PikkuComposer, { disabled: isAwaitingApproval }) })] }) }) }) }) }) }));
+                                            background: colors.bg,
+                                        }, children: _jsxs(ThreadPrimitive.Root, { style: {
+                                                display: 'flex',
+                                                flexDirection: 'column',
+                                                flex: 1,
+                                                minHeight: 0,
+                                            }, children: [_jsx(ThreadPrimitive.Viewport, { style: {
+                                                        flex: 1,
+                                                        minHeight: 0,
+                                                        overflowY: 'auto',
+                                                    }, children: _jsxs("div", { style: {
+                                                            maxWidth: maxWidth === 'none' ? undefined : maxWidth,
+                                                            margin: '0 auto',
+                                                            padding: 16,
+                                                            display: 'flex',
+                                                            flexDirection: 'column',
+                                                            gap: 16,
+                                                        }, children: [_jsx(ThreadPrimitive.Empty, { children: _jsx("div", { style: {
+                                                                        display: 'flex',
+                                                                        alignItems: 'center',
+                                                                        justifyContent: 'center',
+                                                                        minHeight: 300,
+                                                                        color: colors.textMuted,
+                                                                        textAlign: 'center',
+                                                                        fontSize: 14,
+                                                                    }, children: emptyMessage ??
+                                                                        (props.threadId
+                                                                            ? 'Send a message to start the conversation.'
+                                                                            : 'Start a new conversation.') }) }), _jsx(ThreadPrimitive.Messages, { components: {
+                                                                    UserMessage,
+                                                                    AssistantMessage,
+                                                                } })] }) }), _jsx("div", { style: {
+                                                        maxWidth: maxWidth === 'none' ? undefined : maxWidth,
+                                                        margin: '0 auto',
+                                                        width: '100%',
+                                                        padding: '0 16px',
+                                                    }, children: _jsx(PikkuComposer, { disabled: isAwaitingApproval }) })] }) })] }) }) }) }) }) }) }));
 }

package/dist/esm/use-pikku-agent-runtime.js

@@ -34,7 +34,7 @@ async function* parseSSEStream(reader) {
  * Shared helper: consume an SSE stream and populate text/toolCalls.
  * Returns an array of PendingApprovals when the stream requests them, or empty when done.
  */
-async function processStream(reader, text, toolCalls, yieldContent, onFinish) {
+async function processStream(reader, text, toolCalls, structuredParts, yieldContent, onFinish) {
     const pendingApprovals = [];
     for await (const event of parseSSEStream(reader)) {
         switch (event.type) {
@@ -77,6 +77,31 @@ async function processStream(reader, text, toolCalls, yieldContent, onFinish) {
                 }
                 break;
             }
+            case 'generative-ui': {
+                const nextPart = {
+                    type: 'generative-ui',
+                    spec: event.spec,
+                };
+                const existingIndex = structuredParts.findIndex((part) => part.type === 'generative-ui');
+                if (existingIndex === -1)
+                    structuredParts.push(nextPart);
+                else
+                    structuredParts[existingIndex] = nextPart;
+                break;
+            }
+            case 'data': {
+                const nextPart = {
+                    type: 'data',
+                    name: event.name,
+                    data: event.data,
+                };
+                const existingIndex = structuredParts.findIndex((part) => part.type === 'data' && part.name === event.name);
+                if (existingIndex === -1)
+                    structuredParts.push(nextPart);
+                else
+                    structuredParts[existingIndex] = nextPart;
+                break;
+            }
             case 'approval-request':
                 pendingApprovals.push({
                     toolCallId: event.toolCallId,
@@ -151,13 +176,32 @@ export function resolvePikkuToolStatus(status, result) {
         return { type: 'error' };
     return { type: 'completed' };
 }
-function buildContent(text, toolCalls) {
+function buildRichContent(text, structuredParts, toolCalls) {
     const content = [];
     if (text.value)
         content.push({ type: 'text', text: text.value });
+    content.push(...structuredParts);
     content.push(...toolCalls);
     return content;
 }
+function buildContentFromAgentResult(result) {
+    const content = [];
+    if (typeof result === 'string') {
+        if (result)
+            content.push({ type: 'text', text: result });
+        return content;
+    }
+    if (!result || typeof result !== 'object')
+        return content;
+    const record = result;
+    if (typeof record.text === 'string' && record.text) {
+        content.push({ type: 'text', text: record.text });
+    }
+    if (record.ui != null) {
+        content.push({ type: 'generative-ui', spec: record.ui });
+    }
+    return content;
+}
 function createPikkuStreamingAdapter(optionsRef, pendingApprovalsRef, approvalDecisionsRef, setPendingApprovalsRef, onFinishRef) {
     return {
         async *run({ messages, abortSignal }) {
@@ -181,6 +225,7 @@ function createPikkuStreamingAdapter(optionsRef, pendingApprovalsRef, approvalDe
                 // The last resume triggers continuation (next LLM step).
                 let lastText = { value: '' };
                 let lastToolCalls = [];
+                let lastStructuredParts = [];
                 let nextApprovals = [];
                 for (let i = 0; i < decisions.length; i++) {
                     const decision = decisions[i];
@@ -209,19 +254,21 @@ function createPikkuStreamingAdapter(optionsRef, pendingApprovalsRef, approvalDe
                     }
                     const text = { value: '' };
                     const toolCalls = [];
+                    const structuredParts = [];
                     const reader = resumeResponse.body.getReader();
-                    const streamApprovals = await processStream(reader, text, toolCalls, () => { }, i === decisions.length - 1
+                    const streamApprovals = await processStream(reader, text, toolCalls, structuredParts, () => { }, i === decisions.length - 1
                         ? (onFinishRef.current ?? undefined)
                         : undefined);
                     // Keep the last resume's output (it has continuation content)
                     lastText = text;
                     lastToolCalls = toolCalls;
+                    lastStructuredParts = structuredParts;
                     if (streamApprovals.length > 0) {
                         nextApprovals = streamApprovals;
                     }
                 }
                 // Build content from the last resume's output
-                const content = buildContent(lastText, lastToolCalls);
+                const content = buildRichContent(lastText, lastStructuredParts, lastToolCalls);
                 if (nextApprovals.length > 0) {
                     // More approvals from continuation — show them
                     pendingApprovalsRef.current = nextApprovals;
@@ -249,7 +296,7 @@ function createPikkuStreamingAdapter(optionsRef, pendingApprovalsRef, approvalDe
                             lastToolCalls.push(approvalToolCall);
                         }
                     }
-                    const updatedContent = buildContent(lastText, lastToolCalls);
+                    const updatedContent = buildRichContent(lastText, lastStructuredParts, lastToolCalls);
                     yield {
                         content: updatedContent,
                         status: {
@@ -328,14 +375,15 @@ function createPikkuStreamingAdapter(optionsRef, pendingApprovalsRef, approvalDe
             }
             const text = { value: '' };
             const toolCalls = [];
+            const structuredParts = [];
             let pendingContent = null;
             const yieldContent = () => {
-                const content = buildContent(text, toolCalls);
+                const content = buildRichContent(text, structuredParts, toolCalls);
                 if (content.length > 0)
                     pendingContent = content;
             };
             const reader = response.body.getReader();
-            const approvals = await processStream(reader, text, toolCalls, yieldContent, onFinishRef.current ?? undefined);
+            const approvals = await processStream(reader, text, toolCalls, structuredParts, yieldContent, onFinishRef.current ?? undefined);
             if (approvals.length === 0) {
                 // No approval needed — yield final content and done
                 if (pendingContent) {
@@ -378,7 +426,7 @@ function createPikkuStreamingAdapter(optionsRef, pendingApprovalsRef, approvalDe
                     toolCalls.splice(i, 1);
                 }
             }
-            const content = buildContent(text, toolCalls);
+            const content = buildRichContent(text, structuredParts, toolCalls);
             yield {
                 content,
                 status: {
@@ -446,7 +494,12 @@ export const convertDbMessages = (dbMessages) => {
             continue;
         const parts = [];
         if (msg.content) {
-            parts.push({ type: 'text', text: msg.content });
+            if (Array.isArray(msg.content)) {
+                parts.push(...msg.content);
+            }
+            else {
+                parts.push({ type: 'text', text: msg.content });
+            }
         }
         if (Array.isArray(msg.toolCalls)) {
             for (const tc of msg.toolCalls) {
@@ -533,6 +586,7 @@ function createPikkuNonStreamingAdapter(optionsRef, pendingApprovalsRef, approva
                 // Resume uses SSE (same as streaming mode)
                 let lastText = { value: '' };
                 let lastToolCalls = [];
+                let lastStructuredParts = [];
                 let nextApprovals = [];
                 for (let i = 0; i < decisions.length; i++) {
                     const decision = decisions[i];
@@ -560,17 +614,19 @@ function createPikkuNonStreamingAdapter(optionsRef, pendingApprovalsRef, approva
                     }
                     const text = { value: '' };
                     const toolCalls = [];
+                    const structuredParts = [];
                     const reader = resumeResponse.body.getReader();
-                    const streamApprovals = await processStream(reader, text, toolCalls, () => { }, i === decisions.length - 1
+                    const streamApprovals = await processStream(reader, text, toolCalls, structuredParts, () => { }, i === decisions.length - 1
                         ? (onFinishRef.current ?? undefined)
                         : undefined);
                     lastText = text;
                     lastToolCalls = toolCalls;
+                    lastStructuredParts = structuredParts;
                     if (streamApprovals.length > 0) {
                         nextApprovals = streamApprovals;
                     }
                 }
-                const content = buildContent(lastText, lastToolCalls);
+                const content = buildRichContent(lastText, lastStructuredParts, lastToolCalls);
                 if (nextApprovals.length > 0) {
                     pendingApprovalsRef.current = nextApprovals;
                     setPendingApprovalsRef.current(nextApprovals);
@@ -596,7 +652,7 @@ function createPikkuNonStreamingAdapter(optionsRef, pendingApprovalsRef, approva
                             lastToolCalls.push(approvalToolCall);
                         }
                     }
-                    const updatedContent = buildContent(lastText, lastToolCalls);
+                    const updatedContent = buildRichContent(lastText, lastStructuredParts, lastToolCalls);
                     yield {
                         content: updatedContent,
                         status: {
@@ -656,9 +712,7 @@ function createPikkuNonStreamingAdapter(optionsRef, pendingApprovalsRef, approva
                     },
                 }));
                 const content = [];
-                if (json.result) {
-                    content.push({ type: 'text', text: json.result });
-                }
+                content.push(...buildContentFromAgentResult(json.result));
                 content.push(...toolCalls);
                 yield {
                     content,
@@ -671,10 +725,7 @@ function createPikkuNonStreamingAdapter(optionsRef, pendingApprovalsRef, approva
             }
             // No approvals — yield complete content
             onFinishRef.current?.();
-            const content = [];
-            if (json.result) {
-                content.push({ type: 'text', text: String(json.result) });
-            }
+            const content = buildContentFromAgentResult(json.result);
             if (content.length > 0) {
                 yield { content };
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/assistant-ui",
-  "version": "0.12.3",
+  "version": "0.12.5",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
   "type": "module",