@lobehub/chat 0.74.0 → 0.75.0

package/src/pages/settings/features/Header/Mobile.tsx

@@ -9,7 +9,7 @@ const Header = memo(() => {
   return (
     <MobileNavBar
       center={<MobileNavBarTitle title={t('header.global')} />}
-      onBackClick={() => Router.push('/chat')}
+      onBackClick={() => Router.back()}
       showBackButton
     />
   );

package/src/pages/settings/features/Settings/Common.tsx

@@ -1,4 +1,4 @@
-import { Form, type ItemGroup, SliderWithInput } from '@lobehub/ui';
+import { Form, type ItemGroup, SelectWithImg, SliderWithInput } from '@lobehub/ui';
 import { Form as AntForm, App, Button, Input, Select } from 'antd';
 import isEqual from 'fast-deep-equal';
 import { changeLanguage } from 'i18next';
@@ -7,7 +7,6 @@ import { AppWindow, Monitor, Moon, Palette, Sun } from 'lucide-react';
 import { memo, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import SelectWithImg from '@/components/SelectWithImg';
 import { FORM_STYLE } from '@/const/layoutTokens';
 import { DEFAULT_SETTINGS } from '@/const/settings';
 import AvatarWithUpload from '@/features/AvatarWithUpload';

package/src/pages/settings/features/Settings/index.tsx

@@ -2,7 +2,7 @@ import { GridBackground, Icon, Logo, TabsNav } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
 import { PackageCheck } from 'lucide-react';
 import { rgba } from 'polished';
-import { memo } from 'react';
+import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Center, Flexbox } from 'react-layout-kit';
 
@@ -64,6 +64,21 @@ const Settings = memo(() => {
 
   const [tab, setTab] = useGlobalStore((s) => [s.settingsTab, s.switchSettingTabs]);
 
+  const content = useMemo(() => {
+    switch (tab) {
+      case 'llm': {
+        return <LLM />;
+      }
+      case 'agent': {
+        return <Agent />;
+      }
+      default:
+      case 'common': {
+        return <Common />;
+      }
+    }
+  }, [tab]);
+
   return (
     <Center gap={16} width={'100%'}>
       <Flexbox align={'flex-end'} className={styles.tabs} horizontal justify={'center'}>
@@ -91,9 +106,7 @@ const Settings = memo(() => {
           <div>{`${pkg.version}`}</div>
         </Flexbox>
       </Flexbox>
-      {tab === 'common' && <Common />}
-      {tab === 'llm' && <LLM />}
-      {tab === 'agent' && <Agent />}
+      {content}
     </Center>
   );
 });

package/src/services/agentMarket.ts

@@ -0,0 +1,21 @@
+import { getAgentIndexJSON, getAgentJSON } from '@/const/url';
+import { useGlobalStore } from '@/store/global';
+
+/**
+ * 请求助手列表
+ */
+export const getAgentList = async () => {
+  const res = await fetch(getAgentIndexJSON(useGlobalStore.getState().settings.language));
+
+  return res.json();
+};
+
+/**
+ * 请求助手 manifest
+ */
+export const getAgentManifest = async (identifier?: string) => {
+  if (!identifier) return;
+  const res = await fetch(getAgentJSON(identifier, useGlobalStore.getState().settings.language));
+
+  return res.json();
+};

package/src/store/global/initialState.ts

@@ -21,7 +21,7 @@ export interface GlobalState {
    * 用户设置
    */
   settings: GlobalSettings;
-  settingsTab: SettingsTabs;
+  settingsTab?: SettingsTabs;
   sidebarKey: SidebarTabKey;
 }
 
@@ -44,6 +44,5 @@ export const initialState: GlobalState = {
     showSessionPanel: true,
   },
   settings: DEFAULT_SETTINGS,
-  settingsTab: 'common',
   sidebarKey: 'chat',
 };

package/src/store/market/action.ts

@@ -0,0 +1,57 @@
+import isEqual from 'fast-deep-equal';
+import { produce } from 'immer';
+import useSWR, { SWRResponse } from 'swr';
+import type { StateCreator } from 'zustand/vanilla';
+
+import { getAgentList, getAgentManifest } from '@/services/agentMarket';
+import { AgentsMarketItem, LobeChatAgentsMarketIndex } from '@/types/market';
+
+import type { Store } from './store';
+
+export interface StoreAction {
+  activateAgent: (identifier: string) => void;
+  deactivateAgent: () => void;
+  updateAgentMap: (key: string, value: AgentsMarketItem) => void;
+  useFetchAgent: (identifier: string) => SWRResponse<AgentsMarketItem>;
+  useFetchAgentList: () => SWRResponse<LobeChatAgentsMarketIndex>;
+}
+
+export const createMarketAction: StateCreator<
+  Store,
+  [['zustand/devtools', never]],
+  [],
+  StoreAction
+> = (set, get) => ({
+  activateAgent: (identifier) => {
+    set({ currentIdentifier: identifier });
+  },
+  deactivateAgent: () => {
+    set({ currentIdentifier: undefined }, false, 'deactivateAgent');
+  },
+  updateAgentMap: (key, value) => {
+    const { agentMap } = get();
+
+    const nextAgentMap = produce(agentMap, (draft) => {
+      draft[key] = value;
+    });
+
+    if (isEqual(nextAgentMap, agentMap)) return;
+
+    set({ agentMap: nextAgentMap }, false, `setAgentMap/${key}`);
+  },
+  useFetchAgent: (identifier) =>
+    useSWR<AgentsMarketItem>(identifier, getAgentManifest, {
+      onError: () => {
+        get().deactivateAgent();
+      },
+      onSuccess: (data, key) => {
+        get().updateAgentMap(key, data);
+      },
+    }),
+  useFetchAgentList: () =>
+    useSWR<LobeChatAgentsMarketIndex>('fetchAgentList', getAgentList, {
+      onSuccess: (agentMarketIndex) => {
+        set({ agentList: agentMarketIndex.agents }, false, 'useFetchAgentList');
+      },
+    }),
+});

package/src/store/market/index.ts

@@ -0,0 +1,3 @@
+export { agentMarketSelectors } from './selectors';
+export { useMarketStore } from './store';
+export { type Store } from './store';

package/src/store/market/initialState.ts

@@ -0,0 +1,17 @@
+import { AgentsMarketIndexItem, AgentsMarketItem } from '@/types/market';
+
+export type MarketAgentMap = Record<string, AgentsMarketItem>;
+
+export interface StoreState {
+  agentList: AgentsMarketIndexItem[];
+  agentMap: MarketAgentMap;
+  currentIdentifier: string;
+  searchKeywords: string;
+}
+
+export const initialState: StoreState = {
+  agentList: [],
+  agentMap: {},
+  currentIdentifier: '',
+  searchKeywords: '',
+};

package/src/store/market/selectors.ts

@@ -0,0 +1,36 @@
+import { flatten } from 'lodash-es';
+
+import { DEFAULT_AGENTS_MARKET_ITEM } from '@/const/market';
+import { AgentsMarketItem } from '@/types/market';
+import { findDuplicates } from '@/utils/findDuplicates';
+
+import type { Store } from './store';
+
+const getAgentList = (s: Store) => s.agentList;
+const getAgentTagList = (s: Store) => {
+  const agentList = s.agentList;
+  const rawAgentTagList = flatten(agentList.map((item) => item.meta.tags)) as string[];
+  return findDuplicates(rawAgentTagList);
+};
+
+const getAgentItemById = (d: string) => (s: Store) => s.agentMap[d];
+
+const currentAgentItem = (s: Store) => getAgentItemById(s.currentIdentifier)(s);
+
+const currentAgentItemSafe = (s: Store): AgentsMarketItem => {
+  const item = getAgentItemById(s.currentIdentifier)(s);
+  if (!item) return DEFAULT_AGENTS_MARKET_ITEM;
+
+  return item;
+};
+
+const showSideBar = (s: Store) => !!s.currentIdentifier;
+
+export const agentMarketSelectors = {
+  currentAgentItem,
+  currentAgentItemSafe,
+  getAgentItemById,
+  getAgentList,
+  getAgentTagList,
+  showSideBar,
+};

package/src/store/market/store.ts

@@ -0,0 +1,51 @@
+import { PersistOptions, devtools, persist } from 'zustand/middleware';
+import { shallow } from 'zustand/shallow';
+import { createWithEqualityFn } from 'zustand/traditional';
+import type { StateCreator } from 'zustand/vanilla';
+
+import { createHyperStorage } from '@/store/middleware/createHyperStorage';
+import { isDev } from '@/utils/env';
+
+import { type StoreAction, createMarketAction } from './action';
+import { type StoreState, initialState } from './initialState';
+
+export type Store = StoreAction & StoreState;
+
+const LOBE_AGENT_MARKET = 'LOBE_AGENT_MARKET';
+
+const persistOptions: PersistOptions<Store> = {
+  name: LOBE_AGENT_MARKET,
+
+  skipHydration: true,
+
+  storage: createHyperStorage({
+    localStorage: {
+      dbName: 'LobeHub',
+      selectors: ['agentMap'],
+    },
+    url: {
+      mode: 'hash',
+      selectors: [
+        // map state key to storage key
+        { currentIdentifier: 'agent' },
+      ],
+    },
+  }),
+
+  version: 0,
+};
+
+const createStore: StateCreator<Store, [['zustand/devtools', never]]> = (...parameters) => ({
+  ...initialState,
+  ...createMarketAction(...parameters),
+});
+
+export const useMarketStore = createWithEqualityFn<Store>()(
+  persist(
+    devtools(createStore, {
+      name: LOBE_AGENT_MARKET + (isDev ? '_DEV' : ''),
+    }),
+    persistOptions,
+  ),
+  shallow,
+);

package/src/store/session/slices/session/action.ts

@@ -1,13 +1,14 @@
 import { produce } from 'immer';
 import { merge } from 'lodash-es';
 import Router from 'next/router';
+import { DeepPartial } from 'utility-types';
 import { StateCreator } from 'zustand/vanilla';
 
 import { INBOX_SESSION_ID } from '@/const/session';
 import { SESSION_CHAT_URL } from '@/const/url';
 import { useGlobalStore } from '@/store/global';
 import { SessionStore } from '@/store/session';
-import { LobeAgentSession, LobeSessions } from '@/types/session';
+import { LobeAgentSession, LobeAgentSettings, LobeSessions } from '@/types/session';
 import { setNamespace } from '@/utils/storeDebug';
 import { uuid } from '@/utils/uuid';
 
@@ -24,7 +25,7 @@ export interface SessionAction {
    * @param session - 会话信息
    * @returns void
    */
-  createSession: () => Promise<string>;
+  createSession: (agent?: DeepPartial<LobeAgentSettings>) => Promise<string>;
   /**
    * 变更session
    * @param payload - 聊天记录
@@ -79,7 +80,7 @@ export const createSessionSlice: StateCreator<
     set({ sessions: {} }, false, t('clearSessions'));
   },
 
-  createSession: async () => {
+  createSession: async (agent) => {
     const { dispatchSession, switchSession } = get();
 
     const timestamp = Date.now();
@@ -87,6 +88,7 @@ export const createSessionSlice: StateCreator<
     // 合并 settings 里的 defaultAgent
     const globalDefaultAgent = useGlobalStore.getState().settings.defaultAgent;
     const newSession: LobeAgentSession = merge({}, initLobeSession, globalDefaultAgent, {
+      ...agent,
       createAt: timestamp,
       id: uuid(),
       updateAt: timestamp,

package/src/store/session/slices/session/initialState.ts

@@ -16,6 +16,7 @@ export interface SessionState {
   isMobile?: boolean;
   searchKeywords: string;
   sessions: Record<string, LobeAgentSession>;
+  topicSearchKeywords: string;
 }
 
 export const initLobeSession: LobeAgentSession = {
@@ -44,4 +45,5 @@ export const initialSessionState: SessionState = {
   isMobile: false,
   searchKeywords: '',
   sessions: {},
+  topicSearchKeywords: '',
 };

package/src/store/session/slices/session/reducers/session.test.ts

@@ -109,7 +109,7 @@ describe('sessionsReducer', () => {
             avatar: 'avatar-url',
             backgroundColor: 'background-color',
             description: 'description',
-            tag: ['tag1', 'tag2'],
+            tags: ['tag1', 'tag2'],
             title: 'title',
           },
         } as LobeAgentSession,
@@ -151,7 +151,7 @@ describe('sessionsReducer', () => {
             avatar: 'avatar-url',
             backgroundColor: 'background-color',
             description: 'description',
-            tag: ['tag1', 'tag2'],
+            tags: ['tag1', 'tag2'],
             title: 'title',
           },
         } as LobeAgentSession,
@@ -185,7 +185,7 @@ describe('sessionsReducer', () => {
             avatar: 'avatar-url',
             backgroundColor: 'background-color',
             description: 'description',
-            tag: ['tag1', 'tag2'],
+            tags: ['tag1', 'tag2'],
             title: 'title',
           },
         } as LobeAgentSession,
@@ -221,7 +221,7 @@ describe('sessionsReducer', () => {
             avatar: 'avatar-url',
             backgroundColor: 'background-color',
             description: 'description',
-            tag: ['tag1', 'tag2'],
+            tags: ['tag1', 'tag2'],
             title: 'title',
           },
         } as LobeAgentSession,

package/src/types/market.ts

@@ -0,0 +1,19 @@
+import { MetaData } from '@/types/meta';
+import { LobeAgentSettings } from '@/types/session';
+
+export interface AgentsMarketIndexItem {
+  author: string;
+  createAt: string;
+  homepage: string;
+  identifier: string;
+  manifest: string;
+  meta: MetaData;
+  schemaVersion: 1;
+}
+
+export type AgentsMarketItem = AgentsMarketIndexItem & LobeAgentSettings;
+
+export interface LobeChatAgentsMarketIndex {
+  agents: AgentsMarketIndexItem[];
+  schemaVersion: 1;
+}

package/src/types/meta.ts

@@ -10,7 +10,7 @@ export interface MetaData {
    */
   backgroundColor?: string;
   description?: string;
-  tag?: string[];
+  tags?: string[];
   /**
    * 名称
    * @description 可选参数，如果不传则使用默认名称

package/src/utils/filter.ts

@@ -11,7 +11,7 @@ export const filterWithKeywords = <T extends BaseDataModel>(
     Object.entries(map).filter(([, item]) => {
       const meta = item.meta;
 
-      const keyList = [meta.title, meta.description, meta.tag?.join('')].filter(
+      const keyList = [meta.title, meta.description, meta.tags?.join('')].filter(
         Boolean,
       ) as string[];
 

package/src/utils/findDuplicates.ts

@@ -0,0 +1,22 @@
+export const findDuplicates = (arr: string[]): string[] => {
+  const duplicates: { [key: string]: number } = {};
+
+  // 统计每个项目出现的次数
+  for (const item of arr) {
+    if (duplicates[item]) {
+      duplicates[item]++;
+    } else {
+      duplicates[item] = 1;
+    }
+  }
+
+  // 挑出重复出现 3 次以上的项目
+  const COUNT = 3;
+
+  const result = Object.keys(duplicates).filter((item) => duplicates[item] >= COUNT);
+
+  // 按重复次数从多到少排序
+  result.sort((a, b) => duplicates[b] - duplicates[a]);
+
+  return result;
+};

package/scripts/genDefaultLocale.ts

@@ -1,18 +0,0 @@
-import { consola } from 'consola';
-import { colors } from 'consola/utils';
-import fs from 'node:fs';
-import { resolve } from 'node:path';
-
-import i18nConfig from '../.i18nrc';
-
-export const genDefaultLocale = (input: string) => {
-  consola.info(`Default locale is ${i18nConfig.entryLocale}...`);
-  const resources = require(`../${input}/${i18nConfig.entryLocale}`);
-  const data = Object.entries(resources.default);
-  consola.start(`Generate default locale json, found ${data.length} namespaces...`);
-  for (const [ns, value] of data) {
-    const filepath = resolve(i18nConfig.output, i18nConfig.entryLocale, `${ns}.json`);
-    fs.writeFileSync(filepath, JSON.stringify(value, null, 2));
-    consola.success(colors.bgWhiteBright(colors.black(` ${ns} `)), colors.gray(filepath));
-  }
-};

package/scripts/genResources.ts

@@ -1,51 +0,0 @@
-import { consola } from 'consola';
-import { colors } from 'consola/utils';
-import { tocForResources } from 'i18next-resources-for-ts';
-import fs from 'node:fs';
-import { resolve } from 'node:path';
-
-import i18nConfig from '../.i18nrc.js';
-
-const locales = [i18nConfig.entryLocale, ...i18nConfig.outputLocales];
-export const genResources = (output: string) => {
-  let index = '';
-  let indexObj = '';
-  consola.start(`Generate locale resources and types, found ${locales.length} locales...`);
-  for (const locale of locales) {
-    const files = fs
-      .readdirSync(resolve(i18nConfig.output, locale))
-      .filter((name) => name.includes('.json'));
-    index += `import ${locale} from "./${locale}";\n`;
-    indexObj += `   "${locale.replace('_', '-')}": ${locale},\n`;
-    const ns = [];
-    for (const file of files) {
-      ns.push({
-        name: file.replace('.json', ''),
-        path: resolve(i18nConfig.output, locale, file),
-      });
-    }
-    let toc = tocForResources(ns, resolve(output)).replaceAll('\\', '/');
-    if (locale === i18nConfig.entryLocale) {
-      toc = toc.replaceAll('.json', '').replaceAll('../../../locales/zh_CN', '../default');
-    }
-    const filepath = resolve(output, `${locale}.ts`);
-    fs.writeFileSync(filepath, toc);
-    consola.success(colors.bgBlue(colors.black(` ${locale} `)), colors.gray(filepath));
-  }
-  const indexFilepath = resolve(output, `index.ts`);
-  fs.writeFileSync(
-    indexFilepath,
-    `${index}
-const resources = {
-${indexObj}} as const;
-export default resources;
-export const defaultResources = ${i18nConfig.entryLocale};
-export type Resources = typeof resources;
-export type DefaultResources = typeof defaultResources;
-export type Namespaces = keyof DefaultResources;
-export type Locales = keyof Resources;
-`,
-  );
-
-  consola.success(colors.bgGreen(colors.black(` INDEX `)), colors.gray(indexFilepath));
-};

package/scripts/toc.ts

@@ -1,7 +0,0 @@
-import { genDefaultLocale } from './genDefaultLocale';
-import { genResources } from './genResources';
-
-const RES_OUTPUT = 'src/locales/resources';
-
-genDefaultLocale(RES_OUTPUT);
-genResources(RES_OUTPUT);

package/src/components/Empty/index.tsx

@@ -1,63 +0,0 @@
-import { ActionIcon, DivProps } from '@lobehub/ui';
-import { X } from 'lucide-react';
-import Image from 'next/image';
-import { memo } from 'react';
-import { Flexbox } from 'react-layout-kit';
-import useMergeState from 'use-merge-value';
-
-import { useStyles } from './style';
-
-interface EmptyProps extends DivProps {
-  alt: string;
-  cover: string;
-  defaultVisible?: boolean;
-  desc: string;
-  height?: number;
-  onVisibleChange?: (visible: boolean) => void;
-  title: string;
-  visible?: boolean;
-  width?: number;
-}
-
-const Empty = memo<EmptyProps>(
-  ({
-    cover,
-    visible,
-    defaultVisible,
-    onVisibleChange,
-    alt,
-    title,
-    desc,
-    width,
-    height,
-    ...props
-  }) => {
-    const [value, setValue] = useMergeState(true, {
-      defaultValue: defaultVisible,
-      onChange: onVisibleChange,
-      value: visible,
-    });
-
-    const { styles } = useStyles();
-    if (!value) return null;
-    return (
-      <Flexbox className={styles.container} {...props}>
-        <ActionIcon
-          className={styles.close}
-          icon={X}
-          onClick={() => setValue(false)}
-          size={{ blockSize: 24, fontSize: 16 }}
-        />
-        {cover && (
-          <Image alt={alt} className={styles.image} height={height} src={cover} width={width} />
-        )}
-        <div className={styles.content}>
-          {title && <h3>{title}</h3>}
-          {desc && <p className={styles.desc}>{desc}</p>}
-        </div>
-      </Flexbox>
-    );
-  },
-);
-
-export default Empty;

package/src/components/Empty/style.ts

@@ -1,31 +0,0 @@
-import { createStyles } from 'antd-style';
-
-export const useStyles = createStyles(({ css, token, isDarkMode }) => ({
-  close: css`
-    position: absolute;
-    top: 8px;
-    right: 8px;
-  `,
-  container: css`
-    position: relative;
-
-    overflow: hidden;
-
-    background: linear-gradient(
-      to bottom,
-      ${isDarkMode ? token.colorBgElevated : token.colorBgLayout},
-      ${token.colorBgContainer}
-    );
-    border: 1px solid ${token.colorBorderSecondary};
-    border-radius: ${token.borderRadius}px;
-  `,
-  content: css`
-    padding: 0 16px 16px;
-  `,
-  desc: css`
-    color: ${token.colorTextDescription};
-  `,
-  image: css`
-    align-self: center;
-  `,
-}));