@pikku/assistant-ui 0.12.6 → 0.12.8

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

@@ -8,187 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
-var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
-    function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-};
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertDbMessages = exports.usePikkuApproval = exports.PikkuApprovalContext = void 0;
 exports.isDeniedResult = isDeniedResult;
 exports.resolvePikkuToolStatus = resolvePikkuToolStatus;
 exports.usePikkuAgentRuntime = usePikkuAgentRuntime;
-exports.usePikkuAgentNonStreamingRuntime = usePikkuAgentNonStreamingRuntime;
 const react_1 = require("react");
+const client_1 = require("@ag-ui/client");
+const react_ag_ui_1 = require("@assistant-ui/react-ag-ui");
 const react_2 = require("@assistant-ui/react");
 exports.PikkuApprovalContext = (0, react_1.createContext)({
     pendingApprovals: [],
-    handleApproval: () => { },
+    handleApproval: () => __awaiter(void 0, void 0, void 0, function* () { return false; }),
 });
 const usePikkuApproval = () => (0, react_1.useContext)(exports.PikkuApprovalContext);
 exports.usePikkuApproval = usePikkuApproval;
-function parseSSEStream(reader) {
-    return __asyncGenerator(this, arguments, function* parseSSEStream_1() {
-        const decoder = new TextDecoder();
-        let buffer = '';
-        while (true) {
-            const { done, value } = yield __await(reader.read());
-            if (done)
-                break;
-            buffer += decoder.decode(value, { stream: true });
-            const lines = buffer.split('\n');
-            buffer = lines.pop();
-            for (const line of lines) {
-                if (line.startsWith('data: ')) {
-                    const data = line.slice(6);
-                    if (data) {
-                        try {
-                            yield yield __await(JSON.parse(data));
-                        }
-                        catch (_a) {
-                            // skip unparseable lines
-                        }
-                    }
-                }
-            }
-        }
-    });
-}
-/**
- * Shared helper: consume an SSE stream and populate text/toolCalls.
- * Returns an array of PendingApprovals when the stream requests them, or empty when done.
- */
-function processStream(reader, text, toolCalls, structuredParts, yieldContent, onFinish) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, e_1, _b, _c;
-        const pendingApprovals = [];
-        try {
-            for (var _d = true, _e = __asyncValues(parseSSEStream(reader)), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
-                _c = _f.value;
-                _d = false;
-                const event = _c;
-                switch (event.type) {
-                    case 'text-delta':
-                        text.value += event.text;
-                        break;
-                    case 'tool-call': {
-                        let parsedArgs = event.args;
-                        if (typeof event.args === 'string') {
-                            try {
-                                parsedArgs = JSON.parse(event.args);
-                            }
-                            catch (_g) {
-                                parsedArgs = {};
-                            }
-                        }
-                        toolCalls.push({
-                            type: 'tool-call',
-                            toolCallId: event.toolCallId,
-                            toolName: event.toolName,
-                            args: parsedArgs,
-                        });
-                        break;
-                    }
-                    case 'tool-result': {
-                        // Skip tool-results that contain __approvalRequired
-                        const resultObj = typeof event.result === 'object' ? event.result : null;
-                        if (resultObj && '__approvalRequired' in resultObj) {
-                            break;
-                        }
-                        const tc = toolCalls.find((t) => t.toolCallId === event.toolCallId);
-                        if (tc) {
-                            tc.result =
-                                typeof event.result === 'string'
-                                    ? event.result
-                                    : JSON.stringify(event.result);
-                            if (event.isError) {
-                                tc.isError = true;
-                            }
-                        }
-                        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,
-                            toolName: event.toolName,
-                            args: event.args,
-                            reason: event.reason,
-                            runId: event.runId,
-                            type: 'approval-request',
-                        });
-                        break;
-                    case 'credential-request':
-                        pendingApprovals.push({
-                            toolCallId: event.toolCallId,
-                            toolName: event.toolName,
-                            args: event.args,
-                            runId: event.runId,
-                            type: 'credential-request',
-                            credentialName: event.credentialName,
-                            credentialType: event.credentialType,
-                            connectUrl: event.connectUrl,
-                        });
-                        break;
-                    case 'error':
-                        text.value += `\n\nError: ${event.message || event.errorText || 'Unknown error'}`;
-                        break;
-                    case 'done':
-                        onFinish === null || onFinish === void 0 ? void 0 : onFinish();
-                        continue;
-                }
-                yieldContent();
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        return pendingApprovals;
-    });
-}
 function isDeniedResult(result) {
     if (result == null)
         return false;
@@ -230,263 +64,6 @@ function resolvePikkuToolStatus(status, result) {
         return { type: 'error' };
     return { type: 'completed' };
 }
-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 {
-        run(_a) {
-            return __asyncGenerator(this, arguments, function* run_1({ messages, abortSignal }) {
-                var _b, _c, _d, _e;
-                const opts = optionsRef.current;
-                // Check if this run() is a continuation after approval decisions.
-                // assistant-ui calls run() again after addResult provides tool results for ALL tool calls.
-                const pendingApprovals = pendingApprovalsRef.current;
-                if (pendingApprovals.length > 0) {
-                    // Read the decisions accumulated by handleApproval() from click handlers.
-                    const decisions = approvalDecisionsRef.current;
-                    approvalDecisionsRef.current = [];
-                    if (decisions.length === 0) {
-                        // No decisions set — shouldn't happen if composer is disabled.
-                        return yield __await(void 0);
-                    }
-                    // Clear pending approvals state
-                    pendingApprovalsRef.current = [];
-                    setPendingApprovalsRef.current([]);
-                    // Send /resume for each decision sequentially.
-                    // All but the last resume will return quickly (just tool-result + done).
-                    // 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];
-                        // Find the runId from the matching pending approval
-                        const matchingApproval = pendingApprovals.find((p) => p.toolCallId === decision.toolCallId);
-                        const runId = (_b = matchingApproval === null || matchingApproval === void 0 ? void 0 : matchingApproval.runId) !== null && _b !== void 0 ? _b : (_c = pendingApprovals[0]) === null || _c === void 0 ? void 0 : _c.runId;
-                        const resumeResponse = yield __await(fetch(`${opts.api}/${opts.agentName}/resume`, {
-                            method: 'POST',
-                            headers: Object.assign({ 'Content-Type': 'application/json' }, opts.headers),
-                            body: JSON.stringify({
-                                runId,
-                                toolCallId: decision.toolCallId,
-                                approved: decision.approved,
-                            }),
-                            signal: abortSignal,
-                            credentials: opts.credentials,
-                        }));
-                        if (!resumeResponse.ok || !resumeResponse.body) {
-                            const errorText = resumeResponse.body
-                                ? yield __await(resumeResponse.text().catch(() => ''))
-                                : '';
-                            throw new Error(`Resume failed: ${resumeResponse.status}${errorText ? ` - ${errorText}` : ''}`);
-                        }
-                        const text = { value: '' };
-                        const toolCalls = [];
-                        const structuredParts = [];
-                        const reader = resumeResponse.body.getReader();
-                        const streamApprovals = yield __await(processStream(reader, text, toolCalls, structuredParts, () => { }, i === decisions.length - 1
-                            ? ((_d = onFinishRef.current) !== null && _d !== void 0 ? _d : undefined)
-                            : undefined)
-                        // Keep the last resume's output (it has continuation content)
-                        );
-                        // 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 = buildRichContent(lastText, lastStructuredParts, lastToolCalls);
-                    if (nextApprovals.length > 0) {
-                        // More approvals from continuation — show them
-                        pendingApprovalsRef.current = nextApprovals;
-                        setPendingApprovalsRef.current(nextApprovals);
-                        // Add approval tool calls to content
-                        for (const approval of nextApprovals) {
-                            const approvalToolCall = {
-                                type: 'tool-call',
-                                toolCallId: approval.toolCallId,
-                                toolName: approval.toolName,
-                                args: Object.assign(Object.assign({}, (typeof approval.args === 'object' && approval.args !== null
-                                    ? approval.args
-                                    : {})), (approval.reason
-                                    ? { __approvalReason: approval.reason }
-                                    : {})),
-                            };
-                            const idx = lastToolCalls.findIndex((tc) => tc.toolCallId === approval.toolCallId && !tc.result);
-                            if (idx !== -1) {
-                                lastToolCalls[idx] = approvalToolCall;
-                            }
-                            else {
-                                lastToolCalls.push(approvalToolCall);
-                            }
-                        }
-                        const updatedContent = buildRichContent(lastText, lastStructuredParts, lastToolCalls);
-                        yield yield __await({
-                            content: updatedContent,
-                            status: {
-                                type: 'requires-action',
-                                reason: 'tool-calls',
-                            },
-                        });
-                    }
-                    else if (content.length > 0) {
-                        yield yield __await({ content });
-                    }
-                    return yield __await(void 0);
-                }
-                // Normal flow: new user message → stream
-                const lastUserMsg = [...messages].reverse().find((m) => m.role === 'user');
-                if (!lastUserMsg)
-                    return yield __await(void 0);
-                let messageText = '';
-                if (lastUserMsg.content) {
-                    for (const part of lastUserMsg.content) {
-                        if ('text' in part && part.type === 'text') {
-                            messageText += part.text;
-                        }
-                    }
-                }
-                let response;
-                try {
-                    response = yield __await(fetch(`${opts.api}/${opts.agentName}/stream`, {
-                        method: 'POST',
-                        headers: Object.assign({ 'Content-Type': 'application/json' }, opts.headers),
-                        body: JSON.stringify(Object.assign({ agentName: opts.agentName, message: messageText, threadId: opts.threadId, resourceId: opts.resourceId, model: opts.model, temperature: opts.temperature }, (opts.context ? { context: opts.context } : {}))),
-                        signal: abortSignal,
-                        credentials: opts.credentials,
-                    }));
-                }
-                catch (e) {
-                    const msg = (e === null || e === void 0 ? void 0 : e.message) || 'Unknown error';
-                    let errorText = 'Failed to connect to the agent.';
-                    if (msg.includes('Failed to fetch') ||
-                        msg.includes('NetworkError') ||
-                        msg.includes('CORS')) {
-                        errorText =
-                            'Unable to reach the agent server. The deployment may be down or the URL may be incorrect.';
-                    }
-                    else if (msg.includes('abort')) {
-                        return yield __await(void 0);
-                    }
-                    yield yield __await({ content: [{ type: 'text', text: `⚠️ ${errorText}` }] });
-                    return yield __await(void 0);
-                }
-                if (!response.ok || !response.body) {
-                    let errorText = `Request failed (${response.status}).`;
-                    if (response.status === 401 || response.status === 403) {
-                        errorText = 'Authentication error.';
-                    }
-                    else if (response.status === 404) {
-                        errorText =
-                            'Agent not found — the agent may not be configured for this project.';
-                    }
-                    else if (response.status === 502 || response.status === 503) {
-                        errorText =
-                            'The agent server is currently unavailable. Try again in a moment.';
-                    }
-                    else if (response.status === 429) {
-                        errorText = 'Rate limited — too many requests. Please wait a moment.';
-                    }
-                    yield yield __await({ content: [{ type: 'text', text: `⚠️ ${errorText}` }] });
-                    return yield __await(void 0);
-                }
-                const text = { value: '' };
-                const toolCalls = [];
-                const structuredParts = [];
-                let pendingContent = null;
-                const yieldContent = () => {
-                    const content = buildRichContent(text, structuredParts, toolCalls);
-                    if (content.length > 0)
-                        pendingContent = content;
-                };
-                const reader = response.body.getReader();
-                const approvals = yield __await(processStream(reader, text, toolCalls, structuredParts, yieldContent, (_e = onFinishRef.current) !== null && _e !== void 0 ? _e : undefined));
-                if (approvals.length === 0) {
-                    // No approval needed — yield final content and done
-                    if (pendingContent) {
-                        yield yield __await({ content: pendingContent });
-                    }
-                    return yield __await(void 0);
-                }
-                // Approvals requested: store them for the next run() call
-                pendingApprovalsRef.current = approvals;
-                setPendingApprovalsRef.current(approvals);
-                // Each approval tool call needs to be shown without a result
-                // so assistant-ui renders them as requires-action
-                for (const approval of approvals) {
-                    const approvalToolCall = {
-                        type: 'tool-call',
-                        toolCallId: approval.toolCallId,
-                        toolName: approval.toolName,
-                        args: Object.assign(Object.assign({}, (typeof approval.args === 'object' && approval.args !== null
-                            ? approval.args
-                            : {})), (approval.reason ? { __approvalReason: approval.reason } : {})),
-                    };
-                    // Replace the existing tool call (if any) with the approval version
-                    const parentIdx = toolCalls.findIndex((tc) => tc.toolCallId === approval.toolCallId && !tc.result);
-                    if (parentIdx !== -1) {
-                        toolCalls[parentIdx] = approvalToolCall;
-                    }
-                    else {
-                        toolCalls.push(approvalToolCall);
-                    }
-                }
-                // Remove any forwarded sub-agent tool calls that duplicate approval tool names
-                const approvalToolCallIds = new Set(approvals.map((a) => a.toolCallId));
-                const approvalToolNames = new Set(approvals.map((a) => a.toolName));
-                for (let i = toolCalls.length - 1; i >= 0; i--) {
-                    if (approvalToolNames.has(toolCalls[i].toolName) &&
-                        !approvalToolCallIds.has(toolCalls[i].toolCallId)) {
-                        toolCalls.splice(i, 1);
-                    }
-                }
-                const content = buildRichContent(text, structuredParts, toolCalls);
-                yield yield __await({
-                    content,
-                    status: {
-                        type: 'requires-action',
-                        reason: 'tool-calls',
-                    },
-                }
-                // Generator returns here. assistant-ui will show the approval UI for each tool call.
-                // When the user clicks Approve/Deny on ALL tools → handleApproval accumulates decisions →
-                // addResult for each → run() is called again when all have results.
-                );
-                // Generator returns here. assistant-ui will show the approval UI for each tool call.
-                // When the user clicks Approve/Deny on ALL tools → handleApproval accumulates decisions →
-                // addResult for each → run() is called again when all have results.
-            });
-        },
-    };
-}
 const convertDbMessages = (dbMessages) => {
     const result = [];
     let currentAssistant = null;
@@ -586,207 +163,175 @@ const convertDbMessages = (dbMessages) => {
     return result;
 };
 exports.convertDbMessages = convertDbMessages;
+function extractLastUserMessage(messages) {
+    const lastUser = [...messages].reverse().find((m) => m.role === 'user');
+    if (!lastUser)
+        return '';
+    const content = lastUser.content;
+    if (typeof content === 'string')
+        return content;
+    if (Array.isArray(content)) {
+        return content
+            .filter((p) => p.type === 'text')
+            .map((p) => { var _a; return (_a = p.text) !== null && _a !== void 0 ? _a : ''; })
+            .join('');
+    }
+    return '';
+}
+class PikkuAgent extends client_1.HttpAgent {
+    constructor(opts) {
+        super({
+            url: `${opts.api}/${opts.agentName}/stream`,
+            threadId: opts.threadId,
+        });
+        this._pendingResume = null;
+        this._currentResume = null;
+        this.pikkuOpts = opts;
+    }
+    updateOpts(opts) {
+        this.pikkuOpts = opts;
+    }
+    queueResume(data) {
+        this._pendingResume = data;
+    }
+    run(input) {
+        const resume = this._pendingResume;
+        this._pendingResume = null;
+        this._currentResume = resume;
+        this.url = resume
+            ? `${this.pikkuOpts.api}/${this.pikkuOpts.agentName}/resume`
+            : `${this.pikkuOpts.api}/${this.pikkuOpts.agentName}/stream`;
+        return super.run(input);
+    }
+    requestInit(input) {
+        const base = super.requestInit(input);
+        const resume = this._currentResume;
+        const opts = this.pikkuOpts;
+        const headers = Object.assign({ 'Content-Type': 'application/json', Accept: 'text/event-stream' }, opts.headers);
+        if (resume) {
+            return Object.assign(Object.assign({}, base), { headers, credentials: opts.credentials, body: JSON.stringify(resume) });
+        }
+        return Object.assign(Object.assign({}, base), { headers, credentials: opts.credentials, body: JSON.stringify(Object.assign({ agentName: opts.agentName, message: extractLastUserMessage(input.messages), threadId: opts.threadId, resourceId: opts.resourceId, model: opts.model, temperature: opts.temperature }, (opts.context ? { context: opts.context } : {}))) });
+    }
+}
 function usePikkuAgentRuntime(options) {
     const [pendingApprovals, setPendingApprovals] = (0, react_1.useState)([]);
-    const optionsRef = (0, react_1.useRef)(options);
-    optionsRef.current = options;
-    const onFinishRef = (0, react_1.useRef)(options.onFinish);
-    onFinishRef.current = options.onFinish;
+    // Authoritative pending list, mutated synchronously so two approval clicks
+    // in the same tick can't both read a stale "remaining" and skip the resume.
+    // State mirrors it purely for rendering.
     const pendingApprovalsRef = (0, react_1.useRef)([]);
-    const approvalDecisionsRef = (0, react_1.useRef)([]);
-    const setPendingApprovalsRef = (0, react_1.useRef)(setPendingApprovals);
-    setPendingApprovalsRef.current = setPendingApprovals;
-    const adapter = (0, react_1.useMemo)(() => createPikkuStreamingAdapter(optionsRef, pendingApprovalsRef, approvalDecisionsRef, setPendingApprovalsRef, onFinishRef), []);
-    const initialMessages = (0, react_1.useMemo)(() => options.initialMessages
-        ? (0, exports.convertDbMessages)(options.initialMessages)
-        : undefined, [options.initialMessages]);
-    const runtime = (0, react_2.useLocalRuntime)(adapter, { initialMessages });
-    // handleApproval is called from the Approve/Deny button click handler.
-    // It accumulates the decision in the ref. assistant-ui will call run()
-    // when ALL tool calls have results (via addResult).
-    const handleApproval = (0, react_1.useCallback)((toolCallId, approved) => {
-        approvalDecisionsRef.current.push({ toolCallId, approved });
+    const commitPending = (0, react_1.useCallback)((next) => {
+        pendingApprovalsRef.current = next;
+        setPendingApprovals(next);
     }, []);
-    const isAwaitingApproval = pendingApprovals.length > 0;
-    return {
-        runtime,
-        pendingApprovals,
-        isAwaitingApproval,
-        handleApproval,
-    };
-}
-function createPikkuNonStreamingAdapter(optionsRef, pendingApprovalsRef, approvalDecisionsRef, setPendingApprovalsRef, onFinishRef) {
-    return {
-        run(_a) {
-            return __asyncGenerator(this, arguments, function* run_2({ messages, abortSignal }) {
-                var _b, _c, _d, _e, _f;
-                const opts = optionsRef.current;
-                // Continuation after approval decisions
-                const pendingApprovals = pendingApprovalsRef.current;
-                if (pendingApprovals.length > 0) {
-                    const decisions = approvalDecisionsRef.current;
-                    approvalDecisionsRef.current = [];
-                    if (decisions.length === 0)
-                        return yield __await(void 0);
-                    pendingApprovalsRef.current = [];
-                    setPendingApprovalsRef.current([]);
-                    // 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];
-                        const matchingApproval = pendingApprovals.find((p) => p.toolCallId === decision.toolCallId);
-                        const runId = (_b = matchingApproval === null || matchingApproval === void 0 ? void 0 : matchingApproval.runId) !== null && _b !== void 0 ? _b : (_c = pendingApprovals[0]) === null || _c === void 0 ? void 0 : _c.runId;
-                        const resumeResponse = yield __await(fetch(`${opts.api}/${opts.agentName}/resume`, {
-                            method: 'POST',
-                            headers: Object.assign({ 'Content-Type': 'application/json' }, opts.headers),
-                            body: JSON.stringify({
-                                runId,
-                                toolCallId: decision.toolCallId,
-                                approved: decision.approved,
-                            }),
-                            signal: abortSignal,
-                            credentials: opts.credentials,
-                        }));
-                        if (!resumeResponse.ok || !resumeResponse.body) {
-                            const errorText = resumeResponse.body
-                                ? yield __await(resumeResponse.text().catch(() => ''))
-                                : '';
-                            throw new Error(`Resume failed: ${resumeResponse.status}${errorText ? ` - ${errorText}` : ''}`);
-                        }
-                        const text = { value: '' };
-                        const toolCalls = [];
-                        const structuredParts = [];
-                        const reader = resumeResponse.body.getReader();
-                        const streamApprovals = yield __await(processStream(reader, text, toolCalls, structuredParts, () => { }, i === decisions.length - 1
-                            ? ((_d = onFinishRef.current) !== null && _d !== void 0 ? _d : undefined)
-                            : undefined));
-                        lastText = text;
-                        lastToolCalls = toolCalls;
-                        lastStructuredParts = structuredParts;
-                        if (streamApprovals.length > 0) {
-                            nextApprovals = streamApprovals;
-                        }
-                    }
-                    const content = buildRichContent(lastText, lastStructuredParts, lastToolCalls);
-                    if (nextApprovals.length > 0) {
-                        pendingApprovalsRef.current = nextApprovals;
-                        setPendingApprovalsRef.current(nextApprovals);
-                        for (const approval of nextApprovals) {
-                            const approvalToolCall = {
-                                type: 'tool-call',
-                                toolCallId: approval.toolCallId,
-                                toolName: approval.toolName,
-                                args: Object.assign(Object.assign({}, (typeof approval.args === 'object' && approval.args !== null
-                                    ? approval.args
-                                    : {})), (approval.reason
-                                    ? { __approvalReason: approval.reason }
-                                    : {})),
-                            };
-                            const idx = lastToolCalls.findIndex((tc) => tc.toolCallId === approval.toolCallId && !tc.result);
-                            if (idx !== -1) {
-                                lastToolCalls[idx] = approvalToolCall;
-                            }
-                            else {
-                                lastToolCalls.push(approvalToolCall);
-                            }
-                        }
-                        const updatedContent = buildRichContent(lastText, lastStructuredParts, lastToolCalls);
-                        yield yield __await({
-                            content: updatedContent,
-                            status: {
-                                type: 'requires-action',
-                                reason: 'tool-calls',
-                            },
-                        });
-                    }
-                    else if (content.length > 0) {
-                        yield yield __await({ content });
-                    }
-                    return yield __await(void 0);
-                }
-                // Normal flow: new user message → non-streaming POST
-                const lastUserMsg = [...messages].reverse().find((m) => m.role === 'user');
-                if (!lastUserMsg)
-                    return yield __await(void 0);
-                let messageText = '';
-                if (lastUserMsg.content) {
-                    for (const part of lastUserMsg.content) {
-                        if ('text' in part && part.type === 'text') {
-                            messageText += part.text;
-                        }
-                    }
-                }
-                const response = yield __await(fetch(`${opts.api}/${opts.agentName}`, {
-                    method: 'POST',
-                    headers: Object.assign({ 'Content-Type': 'application/json' }, opts.headers),
-                    body: JSON.stringify(Object.assign({ agentName: opts.agentName, message: messageText, threadId: opts.threadId, resourceId: opts.resourceId, model: opts.model, temperature: opts.temperature }, (opts.context ? { context: opts.context } : {}))),
-                    signal: abortSignal,
-                    credentials: opts.credentials,
-                }));
-                if (!response.ok) {
-                    throw new Error(`Agent run failed: ${response.status}`);
-                }
-                const json = yield __await(response.json());
-                if (json.status === 'suspended' && ((_e = json.pendingApprovals) === null || _e === void 0 ? void 0 : _e.length) > 0) {
-                    const approvals = json.pendingApprovals;
-                    pendingApprovalsRef.current = approvals;
-                    setPendingApprovalsRef.current(approvals);
-                    const toolCalls = approvals.map((approval) => ({
-                        type: 'tool-call',
-                        toolCallId: approval.toolCallId,
-                        toolName: approval.toolName,
-                        args: Object.assign(Object.assign({}, (typeof approval.args === 'object' && approval.args !== null
-                            ? approval.args
-                            : {})), (approval.reason ? { __approvalReason: approval.reason } : {})),
-                    }));
-                    const content = [];
-                    content.push(...buildContentFromAgentResult(json.result));
-                    content.push(...toolCalls);
-                    yield yield __await({
-                        content,
-                        status: {
-                            type: 'requires-action',
-                            reason: 'tool-calls',
+    const onFinishRef = (0, react_1.useRef)(options.onFinish);
+    onFinishRef.current = options.onFinish;
+    const agent = (0, react_1.useMemo)(() => new PikkuAgent(options), 
+    // agent is intentionally created once; opts are synced via updateOpts
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []);
+    (0, react_1.useEffect)(() => {
+        agent.updateOpts(options);
+    });
+    (0, react_1.useEffect)(() => {
+        const { unsubscribe } = agent.subscribe({
+            onCustomEvent: ({ event }) => {
+                const e = event;
+                if (e.name === 'pikku:approval-request') {
+                    const v = e.value;
+                    commitPending([
+                        ...pendingApprovalsRef.current,
+                        {
+                            toolCallId: v.toolCallId,
+                            toolName: v.toolName,
+                            args: v.args,
+                            reason: v.reason,
+                            runId: v.runId,
+                            type: 'approval-request',
                         },
-                    });
-                    return yield __await(void 0);
+                    ]);
                 }
-                // No approvals — yield complete content
-                (_f = onFinishRef.current) === null || _f === void 0 ? void 0 : _f.call(onFinishRef);
-                const content = buildContentFromAgentResult(json.result);
-                if (content.length > 0) {
-                    yield yield __await({ content });
+                else if (e.name === 'pikku:credential-request') {
+                    const v = e.value;
+                    commitPending([
+                        ...pendingApprovalsRef.current,
+                        {
+                            toolCallId: v.toolCallId,
+                            toolName: v.toolName,
+                            args: v.args,
+                            runId: v.runId,
+                            type: 'credential-request',
+                            credentialName: v.credentialName,
+                            credentialType: v.credentialType,
+                            connectUrl: v.connectUrl,
+                        },
+                    ]);
                 }
-            });
-        },
-    };
-}
-function usePikkuAgentNonStreamingRuntime(options) {
-    const [pendingApprovals, setPendingApprovals] = (0, react_1.useState)([]);
+            },
+            onRunFinalized: () => {
+                var _a;
+                (_a = onFinishRef.current) === null || _a === void 0 ? void 0 : _a.call(onFinishRef);
+            },
+        });
+        return unsubscribe;
+    }, [agent, commitPending]);
+    // Hydrate the thread from prior messages via the AG-UI history adapter,
+    // which useAgUiRuntime loads once on mount. Built once — see the
+    // initialMessages doc note about keeping the chat unmounted until ready.
+    const history = (0, react_1.useMemo)(() => {
+        var _a;
+        if (!((_a = options.initialMessages) === null || _a === void 0 ? void 0 : _a.length))
+            return undefined;
+        const repository = react_2.ExportedMessageRepository.fromArray(options.initialMessages);
+        return {
+            load: () => __awaiter(this, void 0, void 0, function* () { return repository; }),
+            append: () => __awaiter(this, void 0, void 0, function* () { }),
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+    const runtime = (0, react_ag_ui_1.useAgUiRuntime)(history ? { agent, adapters: { history } } : { agent });
     const optionsRef = (0, react_1.useRef)(options);
     optionsRef.current = options;
-    const onFinishRef = (0, react_1.useRef)(options.onFinish);
-    onFinishRef.current = options.onFinish;
-    const pendingApprovalsRef = (0, react_1.useRef)([]);
-    const approvalDecisionsRef = (0, react_1.useRef)([]);
-    const setPendingApprovalsRef = (0, react_1.useRef)(setPendingApprovals);
-    setPendingApprovalsRef.current = setPendingApprovals;
-    const adapter = (0, react_1.useMemo)(() => createPikkuNonStreamingAdapter(optionsRef, pendingApprovalsRef, approvalDecisionsRef, setPendingApprovalsRef, onFinishRef), []);
-    const initialMessages = (0, react_1.useMemo)(() => options.initialMessages
-        ? (0, exports.convertDbMessages)(options.initialMessages)
-        : undefined, [options.initialMessages]);
-    const runtime = (0, react_2.useLocalRuntime)(adapter, { initialMessages });
-    const handleApproval = (0, react_1.useCallback)((toolCallId, approved) => {
-        approvalDecisionsRef.current.push({ toolCallId, approved });
-    }, []);
-    const isAwaitingApproval = pendingApprovals.length > 0;
+    const resumeChainRef = (0, react_1.useRef)(Promise.resolve());
+    // The runtime only aggregates events from runs it starts itself, so the
+    // final approval is queued on the agent and triggered by the caller's
+    // addResult (which makes the runtime start the resume run once every tool
+    // call has a result). Earlier approvals in a batch are acknowledged with
+    // plain requests — their stream carries no content beyond 'done'.
+    const handleApproval = (0, react_1.useCallback)((toolCallId, approved) => __awaiter(this, void 0, void 0, function* () {
+        const approval = pendingApprovalsRef.current.find((p) => p.toolCallId === toolCallId);
+        if (!approval || !approval.runId)
+            return false;
+        const remaining = pendingApprovalsRef.current.filter((p) => p.toolCallId !== toolCallId);
+        commitPending(remaining);
+        const resume = { runId: approval.runId, toolCallId, approved };
+        if (remaining.length > 0) {
+            resumeChainRef.current = resumeChainRef.current.then(() => __awaiter(this, void 0, void 0, function* () {
+                const opts = optionsRef.current;
+                try {
+                    const response = yield fetch(`${opts.api}/${opts.agentName}/resume`, {
+                        method: 'POST',
+                        headers: Object.assign({ 'Content-Type': 'application/json', Accept: 'text/event-stream' }, opts.headers),
+                        credentials: opts.credentials,
+                        body: JSON.stringify(resume),
+                    });
+                    yield response.text();
+                }
+                catch (err) {
+                    console.error('[pikku] failed to resolve approval', err);
+                }
+            }));
+            yield resumeChainRef.current;
+            return true;
+        }
+        yield resumeChainRef.current;
+        agent.queueResume(resume);
+        return true;
+    }), [agent, commitPending]);
     return {
         runtime,
         pendingApprovals,
-        isAwaitingApproval,
+        isAwaitingApproval: pendingApprovals.length > 0,
         handleApproval,
     };
 }