@lobehub/chat 0.68.0 → 0.68.1

package/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 # Changelog
 
+### [Version 0.68.1](https://github.com/lobehub/lobe-chat/compare/v0.68.0...v0.68.1)
+
+<sup>Released on **2023-09-03**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: 修正数组合并逻辑, 修正被移除插件无法看到的问题.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: 修正数组合并逻辑 ([e36e621](https://github.com/lobehub/lobe-chat/commit/e36e621))
+- **misc**: 修正被移除插件无法看到的问题 ([c17eb56](https://github.com/lobehub/lobe-chat/commit/c17eb56))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 0.68.0](https://github.com/lobehub/lobe-chat/compare/v0.67.0...v0.68.0)
 
 <sup>Released on **2023-09-03**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.68.0",
+  "version": "0.68.1",
   "description": "Lobe Chat is an open-source chatbot client using LangChain, Typescript and Next.js",
   "keywords": [
     "chatbot",
@@ -66,7 +66,7 @@
     "@emoji-mart/data": "^1",
     "@emoji-mart/react": "^1",
     "@icons-pack/react-simple-icons": "^9",
-    "@lobehub/chat-plugin-sdk": "^1.15.0",
+    "@lobehub/chat-plugin-sdk": "^1.15.1",
     "@lobehub/chat-plugins-gateway": "^1.5.0",
     "@lobehub/ui": "latest",
     "@vercel/analytics": "^1",

package/src/features/AgentSetting/AgentPlugin/LocalPluginItem.tsx

@@ -14,8 +14,8 @@ const MarketList = memo<{ id: string }>(({ id }) => {
 
   const [showModal, setModal] = useState(false);
 
-  const updateConfig = useStore((s) => s.toggleAgentPlugin);
-  const [plugins, hasPlugin] = useStore((s) => [s.config.plugins || [], !!s.config.plugins]);
+  const [toggleAgentPlugin, hasPlugin] = useStore((s) => [s.toggleAgentPlugin, !!s.config.plugins]);
+  const plugins = useStore((s) => s.config.plugins || []);
 
   const [useFetchPluginList, fetchPluginManifest, deleteCustomPlugin, updateCustomPlugin] =
     usePluginStore((s) => [
@@ -36,6 +36,7 @@ const MarketList = memo<{ id: string }>(({ id }) => {
         mode={'edit'}
         onDelete={() => {
           deleteCustomPlugin(id);
+          toggleAgentPlugin(id);
         }}
         onOpenChange={setModal}
         onSave={(value) => {
@@ -53,7 +54,7 @@ const MarketList = memo<{ id: string }>(({ id }) => {
           }
           loading={pluginManifestLoading[id]}
           onChange={(checked) => {
-            updateConfig(id);
+            toggleAgentPlugin(id);
             if (checked) {
               fetchPluginManifest(id);
             }

package/src/features/AgentSetting/AgentPlugin/MarketList.tsx

@@ -2,14 +2,14 @@ import { Avatar, Form, Icon, Tooltip } from '@lobehub/ui';
 import { Button, Skeleton, Switch, Tag } from 'antd';
 import { createStyles } from 'antd-style';
 import isEqual from 'fast-deep-equal';
-import { LucideBlocks, LucideStore } from 'lucide-react';
+import { LucideBlocks, LucideStore, LucideTrash2 } from 'lucide-react';
 import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 import DevModal from 'src/features/PluginDevModal';
 
 import { FORM_STYLE } from '@/const/layoutTokens';
-import { pluginHelpers, usePluginStore } from '@/store/plugin';
+import { pluginHelpers, pluginSelectors, usePluginStore } from '@/store/plugin';
 
 import { useStore } from '../store';
 import LocalPluginItem from './LocalPluginItem';
@@ -37,11 +37,7 @@ const MarketList = memo(() => {
 
   const [showModal, setModal] = useState(false);
 
-  // useEffect(() => {
-  //   setModal(true);
-  // }, []);
-
-  const [plugins, hasPlugin, toggleAgentPlugin] = useStore((s) => [
+  const [userEnabledPlugins, hasPlugin, toggleAgentPlugin] = useStore((s) => [
     s.config.plugins || [],
     !!s.config.plugins,
     s.toggleAgentPlugin,
@@ -57,6 +53,7 @@ const MarketList = memo(() => {
   const pluginManifestLoading = usePluginStore((s) => s.pluginManifestLoading, isEqual);
   const pluginList = usePluginStore((s) => s.pluginList, isEqual);
   const customPluginList = usePluginStore((s) => s.customPluginList, isEqual);
+  const totalList = usePluginStore(pluginSelectors.pluginList, isEqual);
 
   useFetchPluginList();
 
@@ -100,7 +97,9 @@ const MarketList = memo(() => {
       <Switch
         checked={
           // 如果在加载中，说明激活了
-          pluginManifestLoading[identifier] || !hasPlugin ? false : plugins.includes(identifier)
+          pluginManifestLoading[identifier] || !hasPlugin
+            ? false
+            : userEnabledPlugins.includes(identifier)
         }
         loading={pluginManifestLoading[identifier]}
         onChange={(checked) => {
@@ -132,6 +131,35 @@ const MarketList = memo(() => {
     tag: identifier,
   }));
 
+  //  =========== Deprecated Plugin List =========== //
+
+  // 基于 userEnabledPlugins 和完整的 totalList，检查出不在 totalList 中的插件
+  const deprecatedList = userEnabledPlugins
+    .filter((pluginId) => totalList.findIndex((p) => p.identifier === pluginId) < 0)
+    .map((id) => ({
+      avatar: <Avatar avatar={'♻️'} />,
+      children: (
+        <Switch
+          checked={true}
+          onChange={(checked) => {
+            togglePlugin(id, checked);
+          }}
+        />
+      ),
+      label: (
+        <Flexbox align={'center'} gap={8} horizontal>
+          {id}
+          <Tag bordered={false} color={'red'}>
+            {t('list.item.deprecated.title', { ns: 'plugin' })}
+          </Tag>
+        </Flexbox>
+      ),
+      minWidth: undefined,
+      tag: id,
+    }));
+
+  const hasDeprecated = deprecatedList.length > 0;
+
   return (
     <>
       <DevModal
@@ -148,27 +176,44 @@ const MarketList = memo(() => {
       <Form
         items={[
           {
-            children: isEmpty ? loadingList : [...customList, ...list],
+            children: isEmpty ? loadingList : [...deprecatedList, ...customList, ...list],
             extra: (
-              <Tooltip title={t('settingPlugin.addTooltip')}>
-                <Button
-                  icon={<Icon icon={LucideBlocks} />}
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    setModal(true);
-                  }}
-                  size={'small'}
-                >
-                  {t('settingPlugin.add')}
-                </Button>
-              </Tooltip>
+              <Flexbox gap={8} horizontal>
+                {hasDeprecated ? (
+                  <Tooltip title={t('settingPlugin.clearDeprecated')}>
+                    <Button
+                      icon={<Icon icon={LucideTrash2} />}
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        for (const i of deprecatedList) {
+                          togglePlugin(i.tag as string, false);
+                        }
+                      }}
+                      size={'small'}
+                      type={'text'}
+                    ></Button>
+                  </Tooltip>
+                ) : null}
+                <Tooltip title={t('settingPlugin.addTooltip')}>
+                  <Button
+                    icon={<Icon icon={LucideBlocks} />}
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      setModal(true);
+                    }}
+                    size={'small'}
+                  >
+                    {t('settingPlugin.add')}
+                  </Button>
+                </Tooltip>
+              </Flexbox>
             ),
             icon: LucideStore,
             title: t('settingPlugin.title'),
           },
         ]}
         {...FORM_STYLE}
-      />{' '}
+      />
     </>
   );
 });

package/src/features/AgentSetting/store/reducers/config.ts

@@ -1,8 +1,8 @@
 import { produce } from 'immer';
-import { merge } from 'lodash-es';
 
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { LobeAgentConfig } from '@/types/session';
+import { merge } from '@/utils/merge';
 
 export type ConfigDispatch =
   | { config: Partial<any>; type: 'update' }
@@ -13,7 +13,7 @@ export const configReducer = (state: LobeAgentConfig, payload: ConfigDispatch):
   switch (payload.type) {
     case 'update': {
       return produce(state, (draftState) => {
-        return merge({}, draftState, payload.config);
+        return merge(draftState, payload.config);
       });
     }
 

package/src/features/AgentSetting/store/reducers/meta.ts

@@ -1,8 +1,8 @@
 import { produce } from 'immer';
-import { merge } from 'lodash-es';
 
 import { DEFAULT_AGENT_META } from '@/const/meta';
 import { MetaData } from '@/types/meta';
+import { merge } from '@/utils/merge';
 
 export type MetaDataDispatch = { type: 'update'; value: Partial<MetaData> } | { type: 'reset' };
 
@@ -10,7 +10,7 @@ export const metaDataReducer = (state: MetaData, payload: MetaDataDispatch): Met
   switch (payload.type) {
     case 'update': {
       return produce(state, (draftState) => {
-        return merge({}, draftState, payload.value);
+        return merge(draftState, payload.value);
       });
     }
 

package/src/locales/default/plugin.ts

@@ -82,6 +82,7 @@ export default {
   },
   list: {
     item: {
+      'deprecated.title': '已删除',
       'local.config': '配置',
       'local.title': '自定义',
     },

package/src/locales/default/setting.ts

@@ -1,4 +1,3 @@
-
 export default {
   danger: {
     clear: {
@@ -131,6 +130,7 @@ export default {
   settingPlugin: {
     add: '添加',
     addTooltip: '添加自定义插件',
+    clearDeprecated: '移除无效插件',
     config: '{{id}} 插件配置',
     title: '插件列表',
   },

package/src/store/session/slices/agentConfig/selectors.ts

@@ -1,10 +1,10 @@
 import { t } from 'i18next';
-import { merge } from 'lodash-es';
 
 import { DEFAULT_AVATAR, DEFAULT_BACKGROUND_COLOR } from '@/const/meta';
 import { SessionStore } from '@/store/session';
 import { LanguageModel } from '@/types/llm';
 import { MetaData } from '@/types/meta';
+import { merge } from '@/utils/merge';
 
 import { sessionSelectors } from '../session/selectors';
 import { initialLobeAgentConfig } from './initialState';
@@ -19,7 +19,7 @@ const currentAgentTitle = (s: SessionStore) => currentAgentMeta(s)?.title || t('
 
 const currentAgentConfig = (s: SessionStore) => {
   const session = sessionSelectors.currentSession(s);
-  return merge({}, initialLobeAgentConfig, session?.config);
+  return merge(initialLobeAgentConfig, session?.config);
 };
 
 const currentAgentSystemRole = (s: SessionStore) => {

package/src/utils/merge.ts

@@ -0,0 +1,11 @@
+import { merge as _merge, mergeWith } from 'lodash-es';
+
+/**
+ * 用于合并对象，如果是数组则直接替换
+ * @param target
+ * @param source
+ */
+export const merge: typeof _merge = <T = object>(target: T, source: T) =>
+  mergeWith({}, target, source, (obj, src) => {
+    if (Array.isArray(obj)) return src;
+  });