@blocklet/pages-kit 0.2.357 → 0.2.359

package/lib/cjs/builtin/async/ai-runtime/components/ThemeProvider.js

@@ -21,23 +21,14 @@ const material_1 = require("@mui/material");
 const react_1 = require("react");
 const react_helmet_1 = require("react-helmet");
 const runtime_1 = require("../state/runtime");
+const fonts_1 = require("../utils/fonts");
 const GlobalLoading_1 = __importDefault(require("./GlobalLoading"));
-const getFontUrl = (fontList) => {
-    var _a;
-    if (!fontList.length)
-        return;
-    const BASE_URL = 'https://fonts.googleapis.com/css?family=';
-    const newFontList = (_a = fontList
-        .filter((font) => typeof font === 'string')) === null || _a === void 0 ? void 0 : _a.map((font) => font.replace(/ /g, '+')).join('|');
-    // eslint-disable-next-line consistent-return
-    return `${BASE_URL}${newFontList}`;
-};
 function ThemeProvider({ children }) {
     var _a, _b, _c;
     const { appearance } = (0, runtime_1.useRuntimeState)().agent.project;
     const theme = (0, material_1.useTheme)();
-    const titleFont = (_a = appearance === null || appearance === void 0 ? void 0 : appearance.typography) === null || _a === void 0 ? void 0 : _a.fontFamily;
-    const headFont = (_c = (_b = appearance === null || appearance === void 0 ? void 0 : appearance.typography) === null || _b === void 0 ? void 0 : _b.heading) === null || _c === void 0 ? void 0 : _c.fontFamily;
+    const bodyFontFamily = (_a = appearance === null || appearance === void 0 ? void 0 : appearance.typography) === null || _a === void 0 ? void 0 : _a.fontFamily;
+    const headingFontFamily = (_c = (_b = appearance === null || appearance === void 0 ? void 0 : appearance.typography) === null || _b === void 0 ? void 0 : _b.heading) === null || _c === void 0 ? void 0 : _c.fontFamily;
     const newTheme = (0, react_1.useMemo)(() => {
         var _a, _b, _c, _d, _e, _f;
         let { primary } = theme.palette;
@@ -164,7 +155,17 @@ function ThemeProvider({ children }) {
             ],
         });
     }, [theme]);
-    return ((0, jsx_runtime_1.jsxs)(material_1.ThemeProvider, { theme: newTheme, children: [(0, jsx_runtime_1.jsx)(react_helmet_1.Helmet, { children: (0, jsx_runtime_1.jsx)("link", { rel: "stylesheet", href: getFontUrl([titleFont, headFont]) }) }), (0, jsx_runtime_1.jsxs)(material_1.CssBaseline, { children: [(0, jsx_runtime_1.jsx)(material_1.GlobalStyles, { styles: (theme) => theme.unstable_sx({
+    const fontUrls = (0, react_1.useMemo)(() => {
+        const urls = [bodyFontFamily, headingFontFamily]
+            .filter((i) => !!i)
+            .map((font) => {
+            var _a;
+            return ((_a = fonts_1.chineseFonts.find((i) => i.value === font)) === null || _a === void 0 ? void 0 : _a.link) ||
+                `https://fonts.googleapis.com/css?family=${font.replace(/ /g, '+')}`;
+        });
+        return [...new Set(urls)];
+    }, [bodyFontFamily, headingFontFamily]);
+    return ((0, jsx_runtime_1.jsxs)(material_1.ThemeProvider, { theme: newTheme, children: [(0, jsx_runtime_1.jsx)(react_helmet_1.Helmet, { children: fontUrls.map((url) => ((0, jsx_runtime_1.jsx)("link", { rel: "stylesheet", href: url }, url))) }), (0, jsx_runtime_1.jsxs)(material_1.CssBaseline, { children: [(0, jsx_runtime_1.jsx)(material_1.GlobalStyles, { styles: (theme) => theme.unstable_sx({
                             'h1,h2,h3,h4,h5': {
                                 fontFamily: `${theme.typography.h1.fontFamily} !important`,
                             },

package/lib/cjs/builtin/async/ai-runtime/contexts/CurrentAgent.js

@@ -10,7 +10,7 @@ const runtime_1 = require("../state/runtime");
 function useCurrentAid({ agentId }) {
     const { aid } = (0, runtime_1.useRuntimeState)();
     return (0, react_1.useMemo)(() => ({
-        aid: (0, aid_1.stringifyIdentity)(Object.assign(Object.assign({}, (0, aid_1.parseIdentity)(aid, { rejectWhenError: true })), { assistantId: agentId })),
+        aid: (0, aid_1.stringifyIdentity)(Object.assign(Object.assign({}, (0, aid_1.parseIdentity)(aid, { rejectWhenError: true })), { agentId })),
     }), [aid, agentId]);
 }
 const context = (0, react_1.createContext)(undefined);
@@ -22,7 +22,7 @@ function useCurrentAgent(args = {}) {
     const { blockletDid, aid: runtimeAid, working } = (0, runtime_1.useRuntimeState)();
     const aidFromParam = (0, react_1.useMemo)(() => args.aid ||
         (args.agentId
-            ? (0, aid_1.stringifyIdentity)(Object.assign(Object.assign({}, (0, aid_1.parseIdentity)(runtimeAid, { rejectWhenError: true })), { assistantId: args.agentId }))
+            ? (0, aid_1.stringifyIdentity)(Object.assign(Object.assign({}, (0, aid_1.parseIdentity)(runtimeAid, { rejectWhenError: true })), { agentId: args.agentId }))
             : undefined), [args.agentId, args.aid, runtimeAid]);
     const current = (0, react_1.useContext)(context);
     const aid = aidFromParam !== null && aidFromParam !== void 0 ? aidFromParam : current === null || current === void 0 ? void 0 : current.aid;

package/lib/cjs/builtin/async/ai-runtime/hooks/use-appearances.js

@@ -16,18 +16,25 @@ function useAppearances(args) {
     const { agent: runtimeAgent } = (0, runtime_1.useRuntimeState)();
     const { agent } = (0, CurrentAgent_1.useCurrentAgent)(args);
     const appearancePage = (0, react_1.useMemo)(() => {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const appearance = (_b = (_a = agent.outputVariables) === null || _a === void 0 ? void 0 : _a.find((i) => i.name === types_1.RuntimeOutputVariable.appearancePage)) === null || _b === void 0 ? void 0 : _b.appearance;
-        return Object.assign(Object.assign({}, appearance), { componentId: (appearance === null || appearance === void 0 ? void 0 : appearance.componentId) || constants_1.DEFAULT_PAGE_COMPONENT_ID });
+        if (appearance === null || appearance === void 0 ? void 0 : appearance.componentId)
+            return Object.assign(Object.assign({}, appearance), { componentId: appearance.componentId });
+        const runtimeAppearance = (_d = (_c = runtimeAgent.outputVariables) === null || _c === void 0 ? void 0 : _c.find((i) => i.name === types_1.RuntimeOutputVariable.appearancePage)) === null || _d === void 0 ? void 0 : _d.appearance;
+        if (runtimeAppearance === null || runtimeAppearance === void 0 ? void 0 : runtimeAppearance.componentId)
+            return Object.assign(Object.assign({}, runtimeAppearance), { componentId: runtimeAppearance.componentId });
+        return {
+            componentId: constants_1.DEFAULT_PAGE_COMPONENT_ID,
+        };
     }, [agent]);
     const appearanceInput = (0, react_1.useMemo)(() => {
         var _a, _b, _c, _d;
         const appearance = (_b = (_a = agent.outputVariables) === null || _a === void 0 ? void 0 : _a.find((i) => i.name === types_1.RuntimeOutputVariable.appearanceInput)) === null || _b === void 0 ? void 0 : _b.appearance;
-        if (appearance)
-            return appearance;
+        if (appearance === null || appearance === void 0 ? void 0 : appearance.componentId)
+            return Object.assign(Object.assign({}, appearance), { componentId: appearance.componentId });
         const runtimeAppearance = (_d = (_c = runtimeAgent.outputVariables) === null || _c === void 0 ? void 0 : _c.find((i) => i.name === types_1.RuntimeOutputVariable.appearanceInput)) === null || _d === void 0 ? void 0 : _d.appearance;
-        if (runtimeAppearance)
-            return runtimeAppearance;
+        if (runtimeAppearance === null || runtimeAppearance === void 0 ? void 0 : runtimeAppearance.componentId)
+            return Object.assign(Object.assign({}, runtimeAppearance), { componentId: runtimeAppearance.componentId });
         return {
             componentId: constants_1.DEFAULT_INPUT_COMPONENT_ID,
         };
@@ -36,10 +43,10 @@ function useAppearances(args) {
         var _a, _b, _c, _d;
         const appearance = (_b = (_a = agent.outputVariables) === null || _a === void 0 ? void 0 : _a.find((i) => i.name === types_1.RuntimeOutputVariable.appearanceOutput)) === null || _b === void 0 ? void 0 : _b.appearance;
         if (appearance === null || appearance === void 0 ? void 0 : appearance.componentId)
-            return appearance;
+            return Object.assign(Object.assign({}, appearance), { componentId: appearance.componentId });
         const runtimeAppearance = (_d = (_c = runtimeAgent.outputVariables) === null || _c === void 0 ? void 0 : _c.find((i) => i.name === types_1.RuntimeOutputVariable.appearanceOutput)) === null || _d === void 0 ? void 0 : _d.appearance;
-        if (runtimeAppearance)
-            return runtimeAppearance;
+        if (runtimeAppearance === null || runtimeAppearance === void 0 ? void 0 : runtimeAppearance.componentId)
+            return Object.assign(Object.assign({}, runtimeAppearance), { componentId: runtimeAppearance.componentId });
         return {
             componentId: constants_1.DEFAULT_OUTPUT_COMPONENT_ID,
         };

package/lib/cjs/builtin/async/ai-runtime/hooks/use-header-menu.js

@@ -21,18 +21,20 @@ const header_1 = require("../../../page/header");
 const AgentSettingsDialog_1 = require("../components/AgentSettings/AgentSettingsDialog");
 const PopperMenuButton_1 = __importDefault(require("../components/PopperMenuButton"));
 const LoadingMenuItem_1 = __importDefault(require("../components/PopperMenuButton/LoadingMenuItem"));
+const SocialShare_1 = __importDefault(require("../components/SocialShare"));
 const ComponentPreferences_1 = require("../contexts/ComponentPreferences");
 const runtime_1 = require("../state/runtime");
 const session_1 = require("../state/session");
 const use_agent_admin_1 = require("./use-agent-admin");
 function useHeaderMenu() {
-    var _a;
+    var _a, _b, _c;
     const { t, locale } = (0, locale_1.useLocaleContext)();
     const { hideHeaderMenuButton } = (_a = (0, ComponentPreferences_1.useComponentPreferences)()) !== null && _a !== void 0 ? _a : {};
     const clearSession = (0, session_1.useSessionState)((s) => s.clearSession);
     const { agent } = (0, runtime_1.useRuntimeState)();
     const isAdmin = (0, use_agent_admin_1.useIsAgentAdmin)(agent);
     const hasSettings = agent.config.secrets.length > 0;
+    const shareContent = ((_b = agent.project) === null || _b === void 0 ? void 0 : _b.name) ? `${agent.project.name}\n\n${(_c = agent.project) === null || _c === void 0 ? void 0 : _c.description}` : '';
     (0, header_1.useHeader)(() => hideHeaderMenuButton
         ? {}
         : {
@@ -41,6 +43,7 @@ function useHeaderMenu() {
                         hasSettings && isAdmin && ((0, jsx_runtime_1.jsxs)(material_1.MenuItem, { onClick: () => AgentSettingsDialog_1.settingsDialogState.getState().open(), children: [(0, jsx_runtime_1.jsx)(material_1.ListItemIcon, { children: (0, jsx_runtime_1.jsx)(react_1.Icon, { icon: "tabler:settings" }) }), t('settings')] }, "settings")),
                         (0, jsx_runtime_1.jsxs)(LoadingMenuItem_1.default, { onClick: () => __awaiter(this, void 0, void 0, function* () { return clearSession(); }), children: [(0, jsx_runtime_1.jsx)(material_1.ListItemIcon, { children: (0, jsx_runtime_1.jsx)(react_1.Icon, { icon: "mingcute:broom-line" }) }), t('clearSession')] }, "clearSession"),
                     ], children: (0, jsx_runtime_1.jsx)(react_1.Icon, { icon: "tabler:dots" }) }),
+                (0, jsx_runtime_1.jsx)(SocialShare_1.default, { content: shareContent }),
                 ...exists,
             ],
         }, [locale, hideHeaderMenuButton]);

package/lib/cjs/builtin/async/ai-runtime/runtime/Runtime/index.js

@@ -28,67 +28,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Runtime;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const material_1 = require("@mui/material");
 const react_helmet_1 = require("react-helmet");
-const ufo_1 = require("ufo");
 const CustomComponentRenderer_1 = __importDefault(require("../../../../../components/CustomComponentRenderer"));
-const ux_1 = require("../../../../arcblock/ux");
-const locale_1 = require("../../../../locale");
-const header_1 = require("../../../../page/header");
-const utils_1 = require("../../../../utils");
 const AgentSettingsDialog_1 = __importDefault(require("../../components/AgentSettings/AgentSettingsDialog"));
-const RuntimeCommonProvider_1 = __importStar(require("../../components/RuntimeCommonProvider"));
-const SocialShare_1 = __importDefault(require("../../components/SocialShare"));
+const RuntimeCommonProvider_1 = __importDefault(require("../../components/RuntimeCommonProvider"));
 const ThemeProvider_1 = __importDefault(require("../../components/ThemeProvider"));
-const constants_1 = require("../../constants");
 const ActiveAgent_1 = __importDefault(require("../../contexts/ActiveAgent"));
 const Runtime_1 = __importStar(require("../../contexts/Runtime"));
 const use_appearances_1 = __importDefault(require("../../hooks/use-appearances"));
 const use_header_menu_1 = require("../../hooks/use-header-menu");
 const runtime_1 = require("../../state/runtime");
-const logoSize = 44;
-function AgentCreatedBy({ did }) {
-    const { t } = (0, locale_1.useLocaleContext)();
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [t('by'), " ", (0, jsx_runtime_1.jsx)(material_1.Box, { component: ux_1.DID, did: did, copyable: false, responsive: true })] }));
-}
 function Runtime({ blockletDid, aid, working, }) {
     const children = ((0, jsx_runtime_1.jsx)(ThemeProvider_1.default, { children: (0, jsx_runtime_1.jsx)(ActiveAgent_1.default, { children: (0, jsx_runtime_1.jsx)(RuntimeView, {}) }) }));
     return ((0, jsx_runtime_1.jsx)(RuntimeCommonProvider_1.default, { children: aid ? ((0, jsx_runtime_1.jsx)(Runtime_1.default, { blockletDid: blockletDid, aid: aid, working: working, children: children })) : ((0, jsx_runtime_1.jsx)(Runtime_1.RuntimeProviderFromUrl, { children: children })) }));
 }
 function RuntimeView() {
-    var _a;
     const { aid, agent } = (0, runtime_1.useRuntimeState)();
     const { appearancePage } = (0, use_appearances_1.default)({ aid });
-    const theme = (0, material_1.useTheme)();
-    const isMobile = (0, material_1.useMediaQuery)(theme.breakpoints.down('sm'));
-    const { locale } = (0, locale_1.useLocaleContext)();
-    (0, header_1.useHeader)(() => {
-        const logo = (0, ufo_1.joinURL)(window.location.origin, (0, utils_1.getComponentMountPoint)(constants_1.AI_STUDIO_DID), '/api/projects', agent.project.id, '/logo.png');
-        const shareContent = `${agent.name}
-
-${agent === null || agent === void 0 ? void 0 : agent.description}
-    `;
-        return {
-            logo: logo && ((0, jsx_runtime_1.jsx)(material_1.Box, { component: ux_1.Avatar, src: logo, did: blocklet === null || blocklet === void 0 ? void 0 : blocklet.appId, borderRadius: 1, size: logoSize, sx: {
-                    width: logoSize,
-                    height: logoSize,
-                } })),
-            brand: !isMobile ? ((0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
-                    height: 18,
-                    fontSize: 18,
-                }, children: agent.project.name })) : undefined,
-            description: !isMobile && agent.createdBy ? ((0, jsx_runtime_1.jsx)(RuntimeCommonProvider_1.RuntimeLocaleProvider, { children: (0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
-                        display: 'inline-flex',
-                        alignItems: 'center',
-                        gap: 0.5,
-                        mt: 0.5,
-                        height: 12,
-                        fontSize: 12,
-                    }, children: (0, jsx_runtime_1.jsx)(AgentCreatedBy, { did: agent.project.createdBy }) }) })) : undefined,
-            addons: (exists) => [(0, jsx_runtime_1.jsx)(SocialShare_1.default, { content: shareContent }), ...exists].filter(Boolean),
-        };
-    }, [locale, isMobile, agent]);
     (0, use_header_menu_1.useHeaderMenu)();
-    const componentId = (_a = appearancePage === null || appearancePage === void 0 ? void 0 : appearancePage.componentId) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PAGE_COMPONENT_ID;
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(react_helmet_1.Helmet, { children: [agent.project.name && (0, jsx_runtime_1.jsx)("title", { children: agent.project.name }), agent.project.description && (0, jsx_runtime_1.jsx)("meta", { name: "description", content: agent.project.description })] }), (0, jsx_runtime_1.jsx)(CustomComponentRenderer_1.default, { componentId: componentId, properties: appearancePage === null || appearancePage === void 0 ? void 0 : appearancePage.componentProperties }), (0, jsx_runtime_1.jsx)(AgentSettingsDialog_1.default, {})] }));
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(react_helmet_1.Helmet, { children: [agent.project.name && (0, jsx_runtime_1.jsx)("title", { children: agent.project.name }), agent.project.description && (0, jsx_runtime_1.jsx)("meta", { name: "description", content: agent.project.description })] }), (0, jsx_runtime_1.jsx)(CustomComponentRenderer_1.default, { componentId: appearancePage.componentId, properties: appearancePage.componentProperties }), (0, jsx_runtime_1.jsx)(AgentSettingsDialog_1.default, {})] }));
 }

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

@@ -274,6 +274,7 @@ const createSessionState = ({ aid }) => {
                     parameters: Object.assign(Object.assign({}, parameters), { $clientTime: new Date().toISOString() }),
                 });
                 let responseStarted = false;
+                let mainTaskId;
                 try {
                     for (var _e = true, stream_1 = __asyncValues(stream), stream_1_1; stream_1_1 = yield stream_1.next(), _b = stream_1_1.done, !_b; _e = true) {
                         _d = stream_1_1.value;
@@ -285,9 +286,10 @@ const createSessionState = ({ aid }) => {
                         }
                         if ((value === null || value === void 0 ? void 0 : value.type) === 'CHUNK') {
                             if (!message) {
+                                mainTaskId = value.taskId;
                                 message = {
-                                    id: value.taskId,
-                                    agentId: identity.assistantId,
+                                    id: value.messageId,
+                                    agentId: identity.agentId,
                                     sessionId,
                                     inputs: parameters,
                                     createdAt: new Date().toISOString(),
@@ -303,7 +305,7 @@ const createSessionState = ({ aid }) => {
                                     s.messages.push(message);
                                 });
                             }
-                            if (message.id === value.taskId) {
+                            if (mainTaskId === value.taskId) {
                                 requestAnimationFrame(() => {
                                     set((state) => {
                                         var _a, _b, _c, _d;

package/lib/cjs/builtin/async/ai-runtime/utils/fonts.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.chineseFonts = void 0;
+exports.chineseFonts = [
+    {
+        key: '东方大楷',
+        value: 'Alimama DongFangDaKai',
+        link: 'https://cdn.jsdelivr.net/npm/cn-fontsource-alimama-dong-fang-da-kai-regular/font.css',
+    },
+    {
+        key: '鸿雷行书',
+        value: 'hongleixingshu',
+        link: 'https://cdn.jsdelivr.net/npm/cn-fontsource-hongleixingshu-regular/font.css',
+    },
+    {
+        key: '方正楷体',
+        value: 'FZKai-Z03',
+        link: 'https://cdn.jsdelivr.net/npm/cn-fontsource-fz-kai-z-03-regular/font.css',
+    },
+    {
+        key: '方正宋体',
+        value: 'FZShuSong-Z01',
+        link: 'https://cdn.jsdelivr.net/npm/cn-fontsource-fz-shu-song-z-01-regular/font.css',
+    },
+    {
+        key: '方正黑体',
+        value: 'FZHei-B01',
+        link: 'https://cdn.jsdelivr.net/npm/cn-fontsource-fz-hei-b-01-regular/font.css',
+    },
+    {
+        key: '方正仿宋',
+        value: 'FZFangSong-Z02S',
+        link: 'https://cdn.jsdelivr.net/npm/cn-fontsource-fz-fang-song-z-02-s-regular/font.css',
+    },
+];