@blocklet/pages-kit 0.2.358 → 0.2.359

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

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

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

@@ -10,18 +10,25 @@ export default function useAppearances(args) {
     const { agent: runtimeAgent } = useRuntimeState();
     const { agent } = useCurrentAgent(args);
     const appearancePage = 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 === 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) || 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 === 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: DEFAULT_PAGE_COMPONENT_ID,
+        };
     }, [agent]);
     const appearanceInput = useMemo(() => {
         var _a, _b, _c, _d;
         const appearance = (_b = (_a = agent.outputVariables) === null || _a === void 0 ? void 0 : _a.find((i) => i.name === 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 === 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: DEFAULT_INPUT_COMPONENT_ID,
         };
@@ -30,10 +37,10 @@ export default 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 === 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 === 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: DEFAULT_OUTPUT_COMPONENT_ID,
         };

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

@@ -15,18 +15,20 @@ import { useHeader } from '../../../page/header';
 import { settingsDialogState } from '../components/AgentSettings/AgentSettingsDialog';
 import PopperMenuButton from '../components/PopperMenuButton';
 import LoadingMenuItem from '../components/PopperMenuButton/LoadingMenuItem';
+import SocialShare from '../components/SocialShare';
 import { useComponentPreferences } from '../contexts/ComponentPreferences';
 import { useRuntimeState } from '../state/runtime';
 import { useSessionState } from '../state/session';
 import { useIsAgentAdmin } from './use-agent-admin';
 export function useHeaderMenu() {
-    var _a;
+    var _a, _b, _c;
     const { t, locale } = useLocaleContext();
     const { hideHeaderMenuButton } = (_a = useComponentPreferences()) !== null && _a !== void 0 ? _a : {};
     const clearSession = useSessionState((s) => s.clearSession);
     const { agent } = useRuntimeState();
     const isAdmin = 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}` : '';
     useHeader(() => hideHeaderMenuButton
         ? {}
         : {
@@ -35,6 +37,7 @@ export function useHeaderMenu() {
                         hasSettings && isAdmin && (_jsxs(MenuItem, { onClick: () => settingsDialogState.getState().open(), children: [_jsx(ListItemIcon, { children: _jsx(Icon, { icon: "tabler:settings" }) }), t('settings')] }, "settings")),
                         _jsxs(LoadingMenuItem, { onClick: () => __awaiter(this, void 0, void 0, function* () { return clearSession(); }), children: [_jsx(ListItemIcon, { children: _jsx(Icon, { icon: "mingcute:broom-line" }) }), t('clearSession')] }, "clearSession"),
                     ], children: _jsx(Icon, { icon: "tabler:dots" }) }),
+                _jsx(SocialShare, { content: shareContent }),
                 ...exists,
             ],
         }, [locale, hideHeaderMenuButton]);

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

@@ -1,65 +1,21 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { Box, useMediaQuery, useTheme } from '@mui/material';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Helmet } from 'react-helmet';
-import { joinURL } from 'ufo';
 import CustomComponentRenderer from '../../../../../components/CustomComponentRenderer';
-import { Avatar, DID } from '../../../../arcblock/ux';
-import { useLocaleContext } from '../../../../locale';
-import { useHeader } from '../../../../page/header';
-import { getComponentMountPoint } from '../../../../utils';
 import AgentSettingsDialog from '../../components/AgentSettings/AgentSettingsDialog';
-import RuntimeCommonProvider, { RuntimeLocaleProvider } from '../../components/RuntimeCommonProvider';
-import SocialShare from '../../components/SocialShare';
+import RuntimeCommonProvider from '../../components/RuntimeCommonProvider';
 import ThemeProvider from '../../components/ThemeProvider';
-import { AI_STUDIO_DID, DEFAULT_PAGE_COMPONENT_ID } from '../../constants';
 import ActiveAgentProvider from '../../contexts/ActiveAgent';
 import RuntimeProvider, { RuntimeProviderFromUrl } from '../../contexts/Runtime';
 import useAppearances from '../../hooks/use-appearances';
 import { useHeaderMenu } from '../../hooks/use-header-menu';
 import { useRuntimeState } from '../../state/runtime';
-const logoSize = 44;
-function AgentCreatedBy({ did }) {
-    const { t } = useLocaleContext();
-    return (_jsxs(_Fragment, { children: [t('by'), " ", _jsx(Box, { component: DID, did: did, copyable: false, responsive: true })] }));
-}
 export default function Runtime({ blockletDid, aid, working, }) {
     const children = (_jsx(ThemeProvider, { children: _jsx(ActiveAgentProvider, { children: _jsx(RuntimeView, {}) }) }));
     return (_jsx(RuntimeCommonProvider, { children: aid ? (_jsx(RuntimeProvider, { blockletDid: blockletDid, aid: aid, working: working, children: children })) : (_jsx(RuntimeProviderFromUrl, { children: children })) }));
 }
 function RuntimeView() {
-    var _a;
     const { aid, agent } = useRuntimeState();
     const { appearancePage } = useAppearances({ aid });
-    const theme = useTheme();
-    const isMobile = useMediaQuery(theme.breakpoints.down('sm'));
-    const { locale } = useLocaleContext();
-    useHeader(() => {
-        const logo = joinURL(window.location.origin, getComponentMountPoint(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 && (_jsx(Box, { component: Avatar, src: logo, did: blocklet === null || blocklet === void 0 ? void 0 : blocklet.appId, borderRadius: 1, size: logoSize, sx: {
-                    width: logoSize,
-                    height: logoSize,
-                } })),
-            brand: !isMobile ? (_jsx(Box, { sx: {
-                    height: 18,
-                    fontSize: 18,
-                }, children: agent.project.name })) : undefined,
-            description: !isMobile && agent.createdBy ? (_jsx(RuntimeLocaleProvider, { children: _jsx(Box, { sx: {
-                        display: 'inline-flex',
-                        alignItems: 'center',
-                        gap: 0.5,
-                        mt: 0.5,
-                        height: 12,
-                        fontSize: 12,
-                    }, children: _jsx(AgentCreatedBy, { did: agent.project.createdBy }) }) })) : undefined,
-            addons: (exists) => [_jsx(SocialShare, { content: shareContent }), ...exists].filter(Boolean),
-        };
-    }, [locale, isMobile, agent]);
     useHeaderMenu();
-    const componentId = (_a = appearancePage === null || appearancePage === void 0 ? void 0 : appearancePage.componentId) !== null && _a !== void 0 ? _a : DEFAULT_PAGE_COMPONENT_ID;
-    return (_jsxs(_Fragment, { children: [_jsxs(Helmet, { children: [agent.project.name && _jsx("title", { children: agent.project.name }), agent.project.description && _jsx("meta", { name: "description", content: agent.project.description })] }), _jsx(CustomComponentRenderer, { componentId: componentId, properties: appearancePage === null || appearancePage === void 0 ? void 0 : appearancePage.componentProperties }), _jsx(AgentSettingsDialog, {})] }));
+    return (_jsxs(_Fragment, { children: [_jsxs(Helmet, { children: [agent.project.name && _jsx("title", { children: agent.project.name }), agent.project.description && _jsx("meta", { name: "description", content: agent.project.description })] }), _jsx(CustomComponentRenderer, { componentId: appearancePage.componentId, properties: appearancePage.componentProperties }), _jsx(AgentSettingsDialog, {})] }));
 }

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

@@ -268,6 +268,7 @@ export 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;
@@ -279,9 +280,10 @@ export 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(),
@@ -297,7 +299,7 @@ export const createSessionState = ({ aid }) => {
                                     s.messages.push(message);
                                 });
                             }
-                            if (message.id === value.taskId) {
+                            if (mainTaskId === value.taskId) {
                                 requestAnimationFrame(() => {
                                     set((state) => {
                                         var _a, _b, _c, _d;