@blocklet/pages-kit 0.2.287 → 0.2.288

package/lib/esm/builtin/async/ai-runtime/components/runtime-chat/InitialForm.js

@@ -7,22 +7,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { Alert, Box, Stack } from '@mui/material';
+import { Alert, Box, Stack, alpha } from '@mui/material';
 import omit from 'lodash/omit';
 import { useMemo, useState } from 'react';
 import { useSessionContext } from '../../../../session';
 import { createSession } from '../../api/session';
-import { useCurrentPage } from '../../hooks/navigate';
 import { useAssistantState } from '../../state/assistant';
+import { globalLoadingState } from '../../state/loading';
 import { createSessionState } from '../../state/session';
 import { MessageSuggestedQuestion } from '../common/MessageSuggestedQuestions';
 import ParameterForm from '../form/ParameterForm';
-import { globalLoadingState } from '../GlobalLoading';
 import MessageItemView from '../message/MessageItemView';
 import PoweredBy from '../PoweredBy';
 export default function InitialForm({ page }) {
     var _a;
+    const { assistantId } = page;
     const { session: authSession } = useSessionContext();
     const [assistant] = useAssistantState({ assistantId: page.assistantId });
     const { parameters } = assistant;
@@ -42,7 +53,6 @@ export default function InitialForm({ page }) {
         }
         return undefined;
     }, [assistant.release]);
-    const { assistantId } = useCurrentPage();
     const [creating, setCreating] = useState(false);
     const onSubmit = (...args_1) => __awaiter(this, [...args_1], void 0, function* (parameters = {}, entry) {
         if (!authSession.user) {
@@ -63,7 +73,7 @@ export default function InitialForm({ page }) {
                     parameters: omit(parameters, isChat ? ['question'] : []),
                     entry,
                 });
-                createSessionState({ sessionId: session.id }).getState().execute({
+                createSessionState({ sessionId: session.id, session }).getState().execute({
                     assistantId,
                     parameters,
                 });
@@ -80,9 +90,14 @@ export default function InitialForm({ page }) {
     });
     if (authSession.loading)
         return null;
-    return (_jsxs(_Fragment, { children: [opener && (_jsx(Box, { my: 2, children: _jsx(MessageItemView, { assistantId: assistantId, hideAvatar: true, assistant: assistant, message: opener }) })), ((_a = assistant.entries) === null || _a === void 0 ? void 0 : _a.length) && (_jsx(EntryListView, { assistant: assistant, onEntryClick: (entry) => onSubmit(entry.parameters, { id: entry.id, title: entry.title }) })), _jsx(Box, { flex: 1 }), _jsxs(Box, { sx: { position: 'sticky', bottom: 0 }, children: [_jsx(ParameterForm, { assistant: assistant, onSubmit: onSubmit }), error && _jsx(Alert, { severity: "error", children: error.message }), _jsx(PoweredBy, { assistantId: page.assistantId, sx: { my: 1 } })] })] }));
+    return (_jsxs(_Fragment, { children: [opener && (_jsx(Box, { my: 2, mx: 2, children: _jsx(MessageItemView, { assistantId: assistantId, hideAvatar: true, assistant: assistant, message: opener }) })), ((_a = assistant.entries) === null || _a === void 0 ? void 0 : _a.length) && (_jsx(EntryListView, { assistant: assistant, onEntryClick: (entry) => onSubmit(entry.parameters, { id: entry.id, title: entry.title }), sx: { px: 2 } })), _jsx(Box, { flex: 1 }), _jsxs(Box, { className: "ai-runtime-form-container", sx: {
+                    position: 'sticky',
+                    bottom: 0,
+                    background: (theme) => `linear-gradient(180deg, ${alpha(theme.palette.background.default, 0.1)}, ${alpha(theme.palette.background.default, 1)} 16px)`,
+                }, children: [_jsx(ParameterForm, { assistant: assistant, onSubmit: onSubmit }), error && _jsx(Alert, { severity: "error", children: error.message }), _jsx(PoweredBy, { assistantId: page.assistantId, sx: { my: 1, px: 2 } })] })] }));
 }
-function EntryListView({ assistant, onEntryClick, }) {
-    var _a;
-    return (_jsx(Stack, { gap: 1, alignItems: "flex-start", children: (_a = assistant.entries) === null || _a === void 0 ? void 0 : _a.map((entry) => entry.title && (_jsx(MessageSuggestedQuestion, { onClick: () => onEntryClick === null || onEntryClick === void 0 ? void 0 : onEntryClick(entry), children: entry.title }, entry.title))) }));
+export function EntryListView(_a) {
+    var _b;
+    var { assistant, onEntryClick } = _a, props = __rest(_a, ["assistant", "onEntryClick"]);
+    return (_jsx(Stack, Object.assign({ gap: 1, alignItems: "flex-start" }, props, { children: (_b = assistant.entries) === null || _b === void 0 ? void 0 : _b.map((entry) => entry.title && (_jsx(MessageSuggestedQuestion, { onClick: () => onEntryClick === null || onEntryClick === void 0 ? void 0 : onEntryClick(entry), children: entry.title }, entry.title))) })));
 }

package/lib/esm/builtin/async/ai-runtime/components/runtime-chat/RuntimeChatHeader.js

@@ -1,10 +1,22 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Typography } from '@mui/material';
 import Balancer, { Provider } from 'react-wrap-balancer';
 import { Avatar } from '../../../../arcblock/ux';
-export default function RuntimeChatHeader({ assistant }) {
-    var _a, _b, _c, _d, _e;
-    return (_jsx(Box, { className: "ai-chat-header", sx: { pt: 10 }, children: _jsxs(Provider, { children: [((_a = assistant.release) === null || _a === void 0 ? void 0 : _a.logo) && (_jsx(Box, { sx: { display: 'flex', justifyContent: 'center', alignItems: 'center' }, children: _jsx(Box, { component: Avatar, className: "logo", size: 100, did: (_b = globalThis.blocklet) === null || _b === void 0 ? void 0 : _b.appId, src: (_c = assistant.release) === null || _c === void 0 ? void 0 : _c.logo, sx: { borderRadius: 1 } }) })), _jsx(Typography, { component: "h1", sx: {
+export default function RuntimeChatHeader(_a) {
+    var _b, _c, _d, _e;
+    var { assistant } = _a, props = __rest(_a, ["assistant"]);
+    return (_jsx(Box, Object.assign({ className: "ai-chat-header", pt: 10 }, props, { children: _jsxs(Provider, { children: [_jsx(Box, { sx: { display: 'flex', justifyContent: 'center', alignItems: 'center' }, children: _jsx(Box, { component: Avatar, className: "logo", size: 100, did: (_b = globalThis.blocklet) === null || _b === void 0 ? void 0 : _b.appId, src: (_c = assistant.release) === null || _c === void 0 ? void 0 : _c.logo, sx: { borderRadius: 1 } }) }), _jsx(Typography, { component: "h1", sx: {
                         fontWeight: 'bold',
                         fontSize: 18,
                         mt: 1,
@@ -18,5 +30,5 @@ export default function RuntimeChatHeader({ assistant }) {
                         textAlign: 'center',
                         whiteSpace: 'pre-wrap',
                         color: '#465566',
-                    }, children: _jsxs(Balancer, { children: ["\u200C\u200C\u200C\u200C\u200C\u200C\u200C", ((_e = assistant.release) === null || _e === void 0 ? void 0 : _e.description) || (assistant === null || assistant === void 0 ? void 0 : assistant.description)] }) })] }) }));
+                    }, children: _jsxs(Balancer, { children: ["\u200C\u200C\u200C\u200C\u200C\u200C\u200C", ((_e = assistant.release) === null || _e === void 0 ? void 0 : _e.description) || (assistant === null || assistant === void 0 ? void 0 : assistant.description)] }) })] }) })));
 }

package/lib/esm/builtin/async/ai-runtime/components/runtime-chat/RuntimeChatSession.js

@@ -6,24 +6,12 @@ import { useAssistantState } from '../../state/assistant';
 import { useSessionState } from '../../state/session';
 import { MessageSuggestedQuestions } from '../common';
 import ParameterForm from '../form/ParameterForm';
-import Layout from '../layout';
 import MessageListView from '../message/MessageListView';
 import PoweredBy from '../PoweredBy';
 import { useScrollToBottomModule } from '../ScrollView';
-import RuntimeChatHeader from './RuntimeChatHeader';
+import { EntryListView } from './InitialForm';
 export default function RuntimeChatSession({ page }) {
-    const [assistant] = useAssistantState({ assistantId: page.assistantId });
-    return (_jsxs(Layout, { disableBottomPadding: true, containerProps: {
-            sx: {
-                display: 'flex',
-                flexDirection: 'column',
-                justifyContent: 'space-between',
-                height: '100%',
-            },
-        }, children: [_jsx(RuntimeChatHeader, { assistant: assistant }), _jsx(ChatForm, { page: page })] }));
-}
-function ChatForm({ page }) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const [session, state] = useSessionState({ sessionId: page.sessionId, required: true });
     const [assistant] = useAssistantState({ assistantId: page.assistantId });
     const lastMessage = (_a = state.messages) === null || _a === void 0 ? void 0 : _a.slice(-1)[0];
@@ -46,16 +34,13 @@ function ChatForm({ page }) {
             setError(error);
         });
     };
-    return (_jsxs(_Fragment, { children: [_jsx(MessageListView, { className: "ai-chat-message-list", my: 5, assistantId: page.assistantId, sessionId: page.sessionId }), !!(suggestedQuestions === null || suggestedQuestions === void 0 ? void 0 : suggestedQuestions.length) && (_jsx(Box, { ml: 6.5, mr: 2.5, mt: -4, children: _jsx(MessageSuggestedQuestions, { dataSource: suggestedQuestions, onClick: (item) => {
+    return (_jsxs(_Fragment, { children: [_jsx(MessageListView, { className: "ai-chat-message-list", my: 5, px: 2, assistantId: page.assistantId, sessionId: page.sessionId }), _jsx(Box, { ml: 6.5, mr: 2.5, mt: -4, px: 2, children: (suggestedQuestions === null || suggestedQuestions === void 0 ? void 0 : suggestedQuestions.length) ? (_jsx(MessageSuggestedQuestions, { dataSource: suggestedQuestions, onClick: (item) => {
                         onSubmit(Object.assign(Object.assign({}, lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.parameters), { question: item.question }));
-                    } }) })), _jsx(Box, { flex: 1 }), _jsxs(Box, { className: "ai-chat-question-container", sx: {
-                    pt: 1,
+                    } })) : !((_e = state.messages) === null || _e === void 0 ? void 0 : _e.length) && ((_f = assistant.entries) === null || _f === void 0 ? void 0 : _f.length) ? (_jsx(EntryListView, { assistant: assistant, onEntryClick: (entry) => onSubmit(Object.assign(Object.assign({}, lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.parameters), entry.parameters)) })) : null }), _jsx(Box, { flex: 1 }), error && (_jsx(Alert, { severity: "error", sx: { mb: 1, mx: 2 }, children: error.message })), _jsxs(Box, { className: "ai-runtime-form-container", sx: {
+                    pt: 2,
                     position: 'sticky',
                     bottom: 0,
                     // 从上透明到白色 0.72 的径向渐变
-                    background: (theme) => `linear-gradient(180deg, ${alpha(theme.palette.background.default, 0.1)}, ${alpha(theme.palette.background.default, 1)} 5%)`,
-                    '.ai-chat-question-bar > .MuiFormControl-root > .MuiInputBase-root': {
-                        backdropFilter: 'blur(60px)',
-                    },
-                }, children: [error && (_jsx(Alert, { severity: "error", sx: { mb: 1 }, children: error.message })), _jsx(ParameterForm, { sessionId: page.sessionId, defaultValues: (_e = lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.parameters) !== null && _e !== void 0 ? _e : session.parameters, assistant: assistant, onSubmit: onSubmit, isSubmitting: state.running, submitButtonTitle: (_g = (_f = assistant.release) === null || _f === void 0 ? void 0 : _f.submitButton) === null || _g === void 0 ? void 0 : _g.title }), _jsx(PoweredBy, { assistantId: page.assistantId, sx: { my: 0.5 } })] })] }));
+                    background: (theme) => `linear-gradient(180deg, ${alpha(theme.palette.background.default, 0.1)}, ${alpha(theme.palette.background.default, 1)} 16px)`,
+                }, children: [_jsx(ParameterForm, { sessionId: page.sessionId, defaultValues: lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.parameters, assistant: assistant, onSubmit: onSubmit, isSubmitting: state.running, submitButtonTitle: (_h = (_g = assistant.release) === null || _g === void 0 ? void 0 : _g.submitButton) === null || _h === void 0 ? void 0 : _h.title }), _jsx(PoweredBy, { assistantId: page.assistantId, sx: { my: 0.5, px: 2 } })] })] }));
 }

package/lib/esm/builtin/async/ai-runtime/components/runtime-chat/index.js

@@ -1,9 +1,22 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import RuntimeChatHome from './RuntimeChatHome';
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Stack } from '@mui/material';
+import { useAssistantState } from '../../state/assistant';
+import InitialForm from './InitialForm';
+import RuntimeChatHeader from './RuntimeChatHeader';
 import RuntimeChatSession from './RuntimeChatSession';
-export default function RuntimeChat({ page }) {
-    if (page.page === 'session') {
-        return _jsx(RuntimeChatSession, { page: page });
-    }
-    return _jsx(RuntimeChatHome, { page: page });
+export default function RuntimeChat(_a) {
+    var { page } = _a, props = __rest(_a, ["page"]);
+    const [assistant] = useAssistantState({ assistantId: page.assistantId });
+    return (_jsxs(Stack, Object.assign({ flexGrow: 1, width: "100%", height: "100%", maxWidth: 750, mx: "auto", justifyContent: page.page === 'session' ? 'space-between' : 'unset' }, props, { children: [_jsx(RuntimeChatHeader, { assistant: assistant, sx: { mx: 2 } }), page.page === 'session' ? _jsx(RuntimeChatSession, { page: page }) : _jsx(InitialForm, { page: page })] })));
 }

package/lib/esm/builtin/async/ai-runtime/components/runtime-form/RuntimeFormForms.js

@@ -27,6 +27,7 @@ import { alpha } from '../../../../mui/material';
 import { useSessionContext } from '../../../../session';
 import { createSession } from '../../api/session';
 import { useAssistantState } from '../../state/assistant';
+import { globalLoadingState } from '../../state/loading';
 import { createSessionState } from '../../state/session';
 import ParameterFormFields from '../form/ParameterFormFields';
 import RuntimeFormSubmit from './RuntimeFormSubmit';
@@ -54,22 +55,38 @@ export default function RuntimeFormForms(_a) {
     const form = useForm({ defaultValues: defaultForm });
     const [error, setError] = useState();
     const { session } = useSessionContext();
+    const [submitting, setSubmitting] = useState(false);
     useEffect(() => {
         form.reset(defaultForm);
     }, [defaultForm]);
     const onSubmit = (parameters) => __awaiter(this, void 0, void 0, function* () {
         try {
-            const { created: session } = yield createSession({ assistantId: page.assistantId, parameters });
-            createSessionState({ sessionId: session.id, session });
-            page.navigate({ page: 'session', assistantId: page.assistantId, sessionId: session.id });
-            yield createSessionState({ sessionId: session.id })
-                .getState()
-                .execute({ assistantId: page.assistantId, parameters });
+            setSubmitting(true);
+            let { sessionId } = page;
+            if (!sessionId) {
+                const session = yield globalLoadingState.getState().run(() => __awaiter(this, void 0, void 0, function* () {
+                    const { created: session } = yield createSession({ assistantId: page.assistantId, parameters });
+                    yield createSessionState({ sessionId: session.id }).getState().load();
+                    return session;
+                }));
+                sessionId = session.id;
+                page.navigate({ page: 'session', assistantId: page.assistantId, sessionId: session.id });
+            }
+            const sid = sessionId;
+            yield new Promise((resolve, reject) => {
+                setTimeout(() => {
+                    const session = createSessionState({ sessionId: sid }).getState();
+                    session.execute({ assistantId: page.assistantId, parameters }).then(resolve).catch(reject);
+                });
+            });
         }
         catch (error) {
             setError(error);
             throw error;
         }
+        finally {
+            setSubmitting(false);
+        }
     });
     const handleSubmit = (e) => __awaiter(this, void 0, void 0, function* () {
         e.preventDefault();
@@ -89,7 +106,7 @@ export default function RuntimeFormForms(_a) {
                         pt: 1,
                         // 从上透明到白色 0.72 的径向渐变
                         background: (theme) => `linear-gradient(180deg, ${alpha(theme.palette.background.default, 0.1)}, ${alpha(theme.palette.background.default, 1)} 5%)`,
-                    }, children: [error && _jsx(Alert, { severity: "error", children: error.message }), _jsx(RuntimeFormSubmit, { page: page, type: "submit", variant: "contained", fullWidth: true, loading: form.formState.isSubmitting, sx: {
+                    }, children: [error && _jsx(Alert, { severity: "error", children: error.message }), _jsx(RuntimeFormSubmit, { page: page, type: "submit", variant: "contained", fullWidth: true, loading: submitting, sx: {
                                 borderRadius: 100,
                                 height: 44,
                                 background: 'linear-gradient(90deg, rgb(69, 228, 250) 0%, rgb(138, 69, 250) 52.08%, rgb(250, 69, 188) 100%)',

package/lib/esm/builtin/async/ai-runtime/components/session/CheckSession.js

@@ -7,53 +7,53 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { useEffect, useState } from 'react';
-import { useSessionContext } from '../../../../session';
+import { useEffect } from 'react';
 import { createSession, getSessions } from '../../api/session';
+import useAsync from '../../hooks/useAsync';
 import { useAssistantState } from '../../state/assistant';
+import { globalLoadingState } from '../../state/loading';
 import { createSessionState } from '../../state/session';
 import { parseIdentity } from '../../utils';
-import { globalLoadingState } from '../GlobalLoading';
-export default function CheckSession({ assistantId, sessionId, autoCreateSession, children, navigate, }) {
+export default function CheckSession({ cacheId, page, autoCreateSession, children, }) {
+    const { assistantId, sessionId } = page;
     useAssistantState({ assistantId });
-    const { session: authSession } = useSessionContext();
-    const [done, setDone] = useState(false);
-    const [error, setError] = useState();
-    useEffect(() => {
-        if (!authSession.user)
-            return;
-        globalLoadingState.getState().run(() => __awaiter(this, void 0, void 0, function* () {
+    const result = useAsync(() => {
+        if (sessionId && createSessionState({ sessionId }).getState().session)
+            return undefined;
+        return globalLoadingState.getState().run(() => __awaiter(this, void 0, void 0, function* () {
             var _a;
-            try {
-                if (!sessionId) {
-                    if (authSession.user) {
-                        const { sessions } = yield getSessions(parseIdentity(assistantId, { rejectWhenError: true }));
-                        const session = (_a = sessions[0]) !== null && _a !== void 0 ? _a : (autoCreateSession ? (yield createSession({ assistantId })).created : undefined);
-                        if (session) {
-                            yield createSessionState({ sessionId: session.id, session }).getState().load();
-                            navigate === null || navigate === void 0 ? void 0 : navigate({ page: 'session', assistantId, sessionId: session.id });
-                        }
+            if (!sessionId) {
+                try {
+                    // get the last session or create a new session if `autoCreateSession` is enabled
+                    const { sessions } = yield getSessions(parseIdentity(assistantId, { rejectWhenError: true }));
+                    const session = (_a = sessions[0]) !== null && _a !== void 0 ? _a : (autoCreateSession ? (yield createSession({ assistantId })).created : undefined);
+                    if (session) {
+                        yield createSessionState({ sessionId: session.id, session }).getState().load();
+                        return [{ page: 'session', assistantId, sessionId: session.id }];
                     }
                 }
-                else {
-                    const state = createSessionState({ sessionId });
-                    yield state.getState().load();
+                catch (error) {
+                    console.error('get first session or auto create a new session error', { error });
                 }
-                setDone(true);
             }
-            catch (error) {
-                if (sessionId) {
-                    navigate === null || navigate === void 0 ? void 0 : navigate({ page: 'assistant', assistantId, sessionId: undefined }, { replace: true });
+            else {
+                try {
+                    const state = createSessionState({ sessionId });
+                    yield state.getState().load();
                 }
-                else {
-                    setError(error);
+                catch (error) {
+                    console.error('load session error', { error });
+                    return [{ page: 'assistant', assistantId, sessionId: undefined }, { replace: true }];
                 }
             }
+            return undefined;
         }));
-    }, [assistantId, sessionId, authSession.user]);
-    if (error)
-        throw error;
-    if (authSession.loading)
+    }, [sessionId, cacheId]);
+    useEffect(() => {
+        if (result)
+            page.navigate(...result);
+    }, [result, page.navigate]);
+    if (result)
         return null;
-    return done && children;
+    return children;
 }

package/lib/esm/builtin/async/ai-runtime/error.js

@@ -0,0 +1,6 @@
+export class CustomError extends Error {
+    constructor(status, message) {
+        super(message);
+        this.status = status;
+    }
+}

package/lib/esm/builtin/async/ai-runtime/hooks/navigate.js

@@ -1,6 +1,7 @@
 import { useCallback, useMemo } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { getQuery, withQuery } from 'ufo';
+import { CustomError } from '../error';
 export function useNavigateTo() {
     const location = useLocation();
     return useCallback((query) => withQuery(`${location.pathname}${location.search}`, query), [location]);
@@ -27,5 +28,5 @@ export function useCurrentPage(page) {
         return { page: currentPage, assistantId, navigate };
     if (currentPage === 'session' && assistantId && sessionId)
         return { page: currentPage, assistantId, sessionId, navigate };
-    throw new Error('Not Found: missing required query');
+    throw new CustomError(404, 'Missing required query parameters `assistantId`');
 }

package/lib/esm/builtin/async/ai-runtime/hooks/useAsync.js

@@ -0,0 +1,29 @@
+const PROMISE_CACHE = {};
+export default function useAsync(fn, keys) {
+    const key = keys.join('_');
+    let cache = PROMISE_CACHE[key];
+    if (!cache) {
+        const promise = fn();
+        const isPromise = promise instanceof Promise;
+        cache = {
+            promise: Promise.resolve(promise)
+                .then((result) => {
+                PROMISE_CACHE[key].result = result;
+            })
+                .catch((error) => {
+                PROMISE_CACHE[key].error = error;
+            })
+                .finally(() => {
+                PROMISE_CACHE[key].done = true;
+            }),
+            done: !isPromise,
+            result: isPromise ? undefined : promise,
+        };
+        PROMISE_CACHE[key] = cache;
+    }
+    if (cache.error)
+        throw cache.error;
+    if (cache.done)
+        return cache.result;
+    throw cache.promise;
+}

package/lib/esm/builtin/async/ai-runtime/index.js

@@ -9,7 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Stack } from '@mui/material';
-import { useCallback, useMemo, useState } from 'react';
+import { Suspense, useCallback, useEffect, useId, useMemo, useState } from 'react';
+import { ErrorBoundary } from 'react-error-boundary';
+import { Toast } from '../../arcblock/ux';
 import { getQuery } from '../../utils';
 import { getAssistant } from './api/assistant';
 import { ChatBot as ChatBotWrapper } from './components/common';
@@ -19,7 +21,7 @@ import RuntimeProvider from './components/RuntimeProvider';
 import ScrollView from './components/ScrollView';
 import CheckSession from './components/session/CheckSession';
 import { useSetHeader } from './hooks/header';
-import { useCurrentPage, useNavigateWithQuery } from './hooks/navigate';
+import { useCurrentPage } from './hooks/navigate';
 import { createAssistantState, useAssistantState } from './state/assistant';
 import { parseIdentity } from './utils';
 export function getServerSideProps() {
@@ -31,25 +33,22 @@ export function getServerSideProps() {
         return { props: { preload: assistantId ? { assistantId, assistant } : undefined } };
     });
 }
-export default function AIRuntime({ preload }) {
-    const { assistantId, sessionId } = useCurrentPage();
-    const navigate = useNavigateWithQuery();
+export default function App(props) {
+    const cacheId = useId();
+    return (_jsx(RuntimeProvider, { children: _jsx(AIRuntime, Object.assign({}, props, { cacheId: cacheId })) }));
+}
+function AIRuntime({ cacheId, preload }) {
+    var _a;
+    const page = useCurrentPage();
+    const { assistantId } = page;
+    const [assistant] = useAssistantState({ assistantId });
+    useSetHeader({ assistant });
     useMemo(() => {
         // preload assistant from server side props
         if (preload)
             createAssistantState(preload);
     }, []);
-    return (_jsx(RuntimeProvider, { children: _jsx(CheckSession, { assistantId: assistantId, sessionId: sessionId, navigate: navigate, children: _jsx(ScrollView, { scroller: "window", initialScrollBehavior: "auto", children: _jsx(Stack, { flexGrow: 1, height: "100%", className: "ai-runtime-root", children: _jsx(Main, {}) }) }) }) }));
-}
-function Main() {
-    var _a;
-    const page = useCurrentPage();
-    const [assistant] = useAssistantState({ assistantId: page.assistantId });
-    useSetHeader({ assistant });
-    if (((_a = assistant.release) === null || _a === void 0 ? void 0 : _a.template) === 'form') {
-        return _jsx(RuntimeForm, { page: page });
-    }
-    return _jsx(RuntimeChat, { page: page });
+    return (_jsx(CheckSession, { cacheId: cacheId, page: page, children: _jsx(ScrollView, { scroller: "window", initialScrollBehavior: "auto", children: _jsx(Stack, { flexGrow: 1, height: "100%", className: "ai-runtime-root", children: ((_a = assistant.release) === null || _a === void 0 ? void 0 : _a.template) === 'form' ? _jsx(RuntimeForm, { page: page }) : _jsx(RuntimeChat, { page: page }) }) }) }));
 }
 export function ChatBot(props) {
     if (!props.assistantId)
@@ -62,5 +61,12 @@ export function ChatBot(props) {
         assistantId: props.assistantId,
         navigate,
     });
-    return (_jsx(RuntimeProvider, { children: _jsx(CheckSession, { assistantId: props.assistantId, autoCreateSession: true, navigate: page.navigate, children: _jsx(ChatBotWrapper, Object.assign({}, props, { children: _jsx(RuntimeChat, { page: page }) })) }) }));
+    const cacheId = useId();
+    return (_jsx(RuntimeProvider, { children: _jsx(ErrorBoundary, { FallbackComponent: ChatBotErrorView, children: _jsx(Suspense, { children: _jsx(ChatBotWrapper, Object.assign({}, props, { children: _jsx(CheckSession, { cacheId: cacheId, autoCreateSession: true, page: page, children: _jsx(RuntimeChat, { page: page }) }) })) }) }) }));
+}
+function ChatBotErrorView({ error }) {
+    useEffect(() => {
+        Toast.error(error.message);
+    }, [error]);
+    return null;
 }

package/lib/esm/builtin/async/ai-runtime/locales/index.js

@@ -119,7 +119,7 @@ export const translations = {
         thanksForSubscription: '感谢您的订阅，现在，您可以开始尽情体验了！',
         clickTheButton: '点我生成 👉',
         cleanSessionTip: '清除会话消息记录',
-        poweredBy: '技术支持源自',
+        poweredBy: '技术支持来自',
         selectPromptToStart: '选择一个提示词开始吧',
         history: '历史记录',
         unnamed: '未命名',

package/lib/esm/builtin/async/ai-runtime/state/loading.js

@@ -0,0 +1,36 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { create } from 'zustand';
+import { immer } from 'zustand/middleware/immer';
+export const globalLoadingState = create()(immer((set, get) => ({
+    loading: false,
+    count: 0,
+    run: (fn) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            get().start();
+            return (yield (typeof fn === 'function' ? fn() : fn));
+        }
+        finally {
+            get().end();
+        }
+    }),
+    start: () => {
+        set((state) => {
+            state.count += 1;
+            state.loading = true;
+        });
+    },
+    end: () => {
+        set((state) => {
+            state.count = Math.max(0, state.count - 1);
+            state.loading = state.count > 0;
+        });
+    },
+})));

package/lib/esm/builtin/async/ai-runtime/state/session.js

@@ -28,7 +28,7 @@ export const createSessionState = ({ sessionId, session }) => {
         session,
         clearSession: (_b) => __awaiter(void 0, [_b], void 0, function* ({ sessionId }) {
             yield deleteMessages({ sessionId });
-            get().load();
+            yield get().load();
         }),
         updateSession: (_c) => __awaiter(void 0, [_c], void 0, function* ({ parameters }) {
             const { updated } = yield updateSession({ sessionId, parameters });

package/lib/types/builtin/async/ai-runtime/components/GlobalLoading.d.ts

@@ -1,33 +1,2 @@
 import { LinearProgressProps } from '@mui/material';
 export default function GlobalLoading({ ...props }: LinearProgressProps): import("react/jsx-runtime").JSX.Element | null;
-interface Run<T = any> {
-    (fn: Promise<T> | (() => Promise<T>)): Promise<T>;
-}
-export declare const globalLoadingState: import("zustand").UseBoundStore<Omit<import("zustand").StoreApi<{
-    loading: boolean;
-    count: number;
-    run: Run;
-    start: () => void;
-    end: () => void;
-}>, "setState"> & {
-    setState(nextStateOrUpdater: {
-        loading: boolean;
-        count: number;
-        run: Run;
-        start: () => void;
-        end: () => void;
-    } | Partial<{
-        loading: boolean;
-        count: number;
-        run: Run;
-        start: () => void;
-        end: () => void;
-    }> | ((state: {
-        loading: boolean;
-        count: number;
-        run: Run;
-        start: () => void;
-        end: () => void;
-    }) => void), shouldReplace?: boolean | undefined): void;
-}>;
-export {};

package/lib/types/builtin/async/ai-runtime/components/LoadingListItemButton.d.ts

@@ -1,2 +1,5 @@
 import { ListItemButtonProps } from '@mui/material';
-export default function LoadingListItemButton({ ...props }: ListItemButtonProps): import("react/jsx-runtime").JSX.Element;
+import { ReactNode } from 'react';
+export default function LoadingListItemButton({ children, confirmation, ...props }: ListItemButtonProps & {
+    confirmation?: ReactNode;
+}): import("react/jsx-runtime").JSX.Element;

package/lib/types/builtin/async/ai-runtime/components/form/ParameterFormDialog.d.ts

@@ -19,10 +19,10 @@ export declare const parameterFormDialogState: import("zustand").UseBoundStore<O
         callback?: (() => any) | undefined;
         open: () => any;
         close: () => void;
-    }> | ((state: {
+    }> | ((state: import("immer").WritableDraft<{
         isOpen: boolean;
         callback?: (() => any) | undefined;
         open: () => any;
         close: () => void;
-    }) => void), shouldReplace?: boolean | undefined): void;
+    }>) => void), shouldReplace?: boolean | undefined): void;
 }>;

package/lib/types/builtin/async/ai-runtime/components/form/ParameterFormFields.d.ts

@@ -1,8 +1,11 @@
 import { Parameter } from '@blocklet/ai-runtime/types';
+import { StackProps } from '@mui/material';
 import { UseFormReturn } from 'react-hook-form';
-export default function ParameterFormFields({ disabled, readOnly, parameters, form, }: {
+export declare const SUPPORTED_PARAMETER_TYPES: NonNullable<Parameter['type']>[];
+export default function ParameterFormFields({ autoFocus, disabled, readOnly, parameters, form, ...props }: {
+    autoFocus?: boolean;
     disabled?: boolean;
     readOnly?: boolean;
     parameters?: Parameter[];
     form: UseFormReturn;
-}): import("react/jsx-runtime").JSX.Element;
+} & StackProps): import("react/jsx-runtime").JSX.Element;

package/lib/types/builtin/async/ai-runtime/components/form/SettingButton.d.ts

@@ -1,4 +1,6 @@
 import { ButtonProps } from '@mui/material';
-export default function SettingButton({ sessionId, ...props }: {
+import { UseFormReturn } from 'react-hook-form';
+export default function SettingButton({ sessionId, form, ...props }: {
     sessionId: string;
-} & ButtonProps): import("react/jsx-runtime").JSX.Element[];
+    form: UseFormReturn<any>;
+} & Omit<ButtonProps, 'form'>): import("react/jsx-runtime").JSX.Element[];

package/lib/types/builtin/async/ai-runtime/components/message/MessageItemView.d.ts

@@ -1,10 +1,8 @@
 import { Assistant } from '../../api/assistant';
 import { MessageItem } from '../../state/session';
-export default function MessageItemView({ assistantId, assistant, message, previousMessageTime, messageTimeType, hideAvatar, }: {
+export default function MessageItemView({ assistantId, assistant, message, hideAvatar, }: {
     assistantId: string;
     assistant: Assistant;
     message: MessageItem;
-    previousMessageTime?: string;
-    messageTimeType?: 'user' | 'previous';
     hideAvatar?: boolean;
 }): import("react/jsx-runtime").JSX.Element;