@lobehub/chat 1.25.2 → 1.26.0

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+## [Version 1.26.0](https://github.com/lobehub/lobe-chat/compare/v1.25.3...v1.26.0)
+
+<sup>Released on **2024-10-27**</sup>
+
+#### ✨ Features
+
+- **misc**: experimentally support to pin assistant to sidebar.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **misc**: experimentally support to pin assistant to sidebar, closes [#4514](https://github.com/lobehub/lobe-chat/issues/4514) ([6e55865](https://github.com/lobehub/lobe-chat/commit/6e55865))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.25.3](https://github.com/lobehub/lobe-chat/compare/v1.25.2...v1.25.3)
+
+<sup>Released on **2024-10-27**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix the issue of the switch assistant portal not closing.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix the issue of the switch assistant portal not closing, closes [#4500](https://github.com/lobehub/lobe-chat/issues/4500) ([83f896b](https://github.com/lobehub/lobe-chat/commit/83f896b))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.25.2](https://github.com/lobehub/lobe-chat/compare/v1.25.1...v1.25.2)
 
 <sup>Released on **2024-10-27**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.25.2",
+  "version": "1.26.0",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/app/(main)/@nav/_layout/Desktop/PinList/index.tsx

@@ -0,0 +1,91 @@
+import { Avatar, Tooltip } from '@lobehub/ui';
+import { Divider } from 'antd';
+import { createStyles } from 'antd-style';
+import isEqual from 'fast-deep-equal';
+import { parseAsBoolean, useQueryState } from 'nuqs';
+import { useHotkeys } from 'react-hotkeys-hook';
+import { Flexbox } from 'react-layout-kit';
+
+import HotKeys from '@/components/HotKeys';
+import { useSessionStore } from '@/store/session';
+import { sessionHelpers } from '@/store/session/helpers';
+import { sessionSelectors } from '@/store/session/selectors';
+
+const useStyles = createStyles(({ css, token }) => ({
+  avatar: css`
+    position: relative;
+    transition: all 200ms ease-out 0s;
+
+    &:hover {
+      box-shadow: 0 0 0 2px ${token.colorPrimary};
+    }
+  `,
+  avatarActive: css`
+    background: ${token.colorFillQuaternary};
+    box-shadow: 0 0 0 2px ${token.colorPrimaryBorder};
+  `,
+}));
+
+const PinList = () => {
+  const { styles, cx } = useStyles();
+  const list = useSessionStore(sessionSelectors.pinnedSessions, isEqual);
+  const [activeId, switchSession] = useSessionStore((s) => [s.activeId, s.switchSession]);
+
+  const hasList = list.length > 0;
+  const [isPinned, setPinned] = useQueryState('pinned', parseAsBoolean);
+
+  const switchAgent = (id: string) => {
+    switchSession(id);
+    setPinned(true);
+  };
+
+  useHotkeys(
+    list.slice(0, 9).map((e, i) => `ctrl+${i + 1}`),
+    (keyboardEvent, hotkeysEvent) => {
+      if (!hotkeysEvent.keys?.[0]) return;
+
+      const index = parseInt(hotkeysEvent.keys?.[0]) - 1;
+      const item = list[index];
+      if (!item) return;
+
+      switchAgent(item.id);
+    },
+    { enableOnFormTags: true, preventDefault: true },
+  );
+
+  return (
+    hasList && (
+      <>
+        <Divider style={{ margin: '8px 12px' }} />
+        <Flexbox flex={1} gap={12} height={'100%'}>
+          {list.slice(0, 9).map((item, index) => (
+            <Tooltip
+              key={item.id}
+              placement={'right'}
+              title={
+                <Flexbox gap={8} horizontal>
+                  {sessionHelpers.getTitle(item.meta)}
+                  <HotKeys inverseTheme keys={`ctrl+${index + 1}`} />
+                </Flexbox>
+              }
+            >
+              <Avatar
+                avatar={sessionHelpers.getAvatar(item.meta)}
+                background={item.meta.backgroundColor}
+                className={cx(
+                  styles.avatar,
+                  isPinned && activeId === item.id ? styles.avatarActive : undefined,
+                )}
+                onClick={() => {
+                  switchAgent(item.id);
+                }}
+              />
+            </Tooltip>
+          ))}
+        </Flexbox>
+      </>
+    )
+  );
+};
+
+export default PinList;

package/src/app/(main)/@nav/_layout/Desktop/index.tsx

@@ -6,22 +6,29 @@ import { memo } from 'react';
 import { useActiveTabKey } from '@/hooks/useActiveTabKey';
 import { useGlobalStore } from '@/store/global';
 import { systemStatusSelectors } from '@/store/global/selectors';
+import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
 
 import Avatar from './Avatar';
 import BottomActions from './BottomActions';
+import PinList from './PinList';
 import TopActions from './TopActions';
 
 const Nav = memo(() => {
   const sidebarKey = useActiveTabKey();
   const inZenMode = useGlobalStore(systemStatusSelectors.inZenMode);
-
+  const { showPinList } = useServerConfigStore(featureFlagsSelectors);
   return (
     !inZenMode && (
       <SideNav
         avatar={<Avatar />}
         bottomActions={<BottomActions />}
         style={{ height: '100%', zIndex: 100 }}
-        topActions={<TopActions tab={sidebarKey} />}
+        topActions={
+          <>
+            <TopActions tab={sidebarKey} />
+            {showPinList && <PinList />}
+          </>
+        }
       />
     )
   );

package/src/app/(main)/chat/(workspace)/_layout/Desktop/ChatHeader/Main.tsx

@@ -3,6 +3,7 @@
 import { ActionIcon, Avatar, ChatHeaderTitle } from '@lobehub/ui';
 import { Skeleton } from 'antd';
 import { PanelLeftClose, PanelLeftOpen } from 'lucide-react';
+import { parseAsBoolean, useQueryState } from 'nuqs';
 import { Suspense, memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
@@ -21,6 +22,7 @@ const Main = memo(() => {
   const { t } = useTranslation('chat');
 
   useInitAgentConfig();
+  const [isPinned] = useQueryState('pinned', parseAsBoolean);
 
   const [init, isInbox, title, description, avatar, backgroundColor] = useSessionStore((s) => [
     sessionSelectors.isSomeSessionActive(s),
@@ -49,7 +51,7 @@ const Main = memo(() => {
     </Flexbox>
   ) : (
     <Flexbox align={'center'} gap={4} horizontal>
-      {
+      {!isPinned && (
         <ActionIcon
           aria-label={t('agents')}
           icon={showSessionPanel ? PanelLeftClose : PanelLeftOpen}
@@ -62,7 +64,7 @@ const Main = memo(() => {
           size={DESKTOP_HEADER_ICON_SIZE}
           title={t('agents')}
         />
-      }
+      )}
       <Avatar
         avatar={avatar}
         background={backgroundColor}

package/src/app/(main)/chat/@session/features/SessionListContent/useSwitchSession.ts

@@ -1,17 +1,20 @@
 import { useCallback } from 'react';
 
 import { useQueryRoute } from '@/hooks/useQueryRoute';
+import { useChatStore } from '@/store/chat';
 import { useServerConfigStore } from '@/store/serverConfig';
 import { useSessionStore } from '@/store/session';
 
 export const useSwitchSession = () => {
   const switchSession = useSessionStore((s) => s.switchSession);
+  const togglePortal = useChatStore((s) => s.togglePortal);
   const mobile = useServerConfigStore((s) => s.isMobile);
   const router = useQueryRoute();
 
   return useCallback(
     (id: string) => {
       switchSession(id);
+      togglePortal(false);
 
       if (mobile) {
         setTimeout(() => {

package/src/app/(main)/chat/_layout/Desktop/SessionPanel.tsx

@@ -3,6 +3,7 @@
 import { DraggablePanel, DraggablePanelContainer, type DraggablePanelProps } from '@lobehub/ui';
 import { createStyles, useResponsive } from 'antd-style';
 import isEqual from 'fast-deep-equal';
+import { parseAsBoolean, useQueryState } from 'nuqs';
 import { PropsWithChildren, memo, useEffect, useState } from 'react';
 
 import { FOLDER_WIDTH } from '@/const/layoutTokens';
@@ -20,6 +21,8 @@ export const useStyles = createStyles(({ css, token }) => ({
 const SessionPanel = memo<PropsWithChildren>(({ children }) => {
   const { md = true } = useResponsive();
 
+  const [isPinned] = useQueryState('pinned', parseAsBoolean);
+
   const { styles } = useStyles();
   const [sessionsWidth, sessionExpandable, updatePreference] = useGlobalStore((s) => [
     systemStatusSelectors.sessionWidth(s),
@@ -56,7 +59,9 @@ const SessionPanel = memo<PropsWithChildren>(({ children }) => {
     <DraggablePanel
       className={styles.panel}
       defaultSize={{ width: tmpWidth }}
-      expand={sessionExpandable}
+      // 当进入 pin 模式下，不可展开
+      expand={!isPinned && sessionExpandable}
+      expandable={!isPinned}
       maxWidth={400}
       minWidth={FOLDER_WIDTH}
       mode={md ? 'fixed' : 'float'}

package/src/config/featureFlags/schema.ts

@@ -7,6 +7,7 @@ export const FeatureFlagsSchema = z.object({
    */
   webrtc_sync: z.boolean().optional(),
   check_updates: z.boolean().optional(),
+  pin_list: z.boolean().optional(),
 
   // settings
   language_model_settings: z.boolean().optional(),
@@ -45,6 +46,7 @@ export type IFeatureFlags = z.infer<typeof FeatureFlagsSchema>;
 
 export const DEFAULT_FEATURE_FLAGS: IFeatureFlags = {
   webrtc_sync: false,
+  pin_list: false,
 
   language_model_settings: true,
 
@@ -85,6 +87,7 @@ export const mapFeatureFlagsEnvToState = (config: IFeatureFlags) => {
 
     showCreateSession: config.create_session,
     showLLM: config.language_model_settings,
+    showPinList: config.pin_list,
 
     showOpenAIApiKey: config.openai_api_key,
     showOpenAIProxyUrl: config.openai_proxy_url,

package/src/store/serverConfig/selectors.test.ts

@@ -34,6 +34,7 @@ describe('featureFlagsSelectors', () => {
       showWelcomeSuggest: true,
       enableClerkSignUp: true,
       showMarket: true,
+      showPinList: false,
       enableSTT: true,
     });
   });

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

@@ -1,8 +1,15 @@
+import { t } from 'i18next';
+
+import { DEFAULT_AVATAR } from '@/const/meta';
 import { DEFAULT_AGENT_LOBE_SESSION } from '@/const/session';
+import { MetaData } from '@/types/meta';
 import { LobeAgentSession, LobeSessions } from '@/types/session';
 
 export const getSessionPinned = (session: LobeAgentSession) => session.pinned;
 
+const getAvatar = (s: MetaData) => s.avatar || DEFAULT_AVATAR;
+const getTitle = (s: MetaData) => s.title || t('defaultSession', { ns: 'common' });
+
 const getSessionById = (id: string, sessions: LobeSessions): LobeAgentSession => {
   const session = sessions.find((s) => s.id === id);
 
@@ -12,6 +19,8 @@ const getSessionById = (id: string, sessions: LobeSessions): LobeAgentSession =>
 };
 
 export const sessionHelpers = {
+  getAvatar,
   getSessionById,
   getSessionPinned,
+  getTitle,
 };