From 0d760ffa2eff1e9029ec0ae1dc7a9bdb2b05be8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=A2=E5=A5=8B=E7=8C=AB?= <kangfenmao@qq.com>
Date: Mon, 13 Oct 2025 22:34:27 +0800
Subject: [PATCH] feat: add AgentSettingsTab component and integrate into
 HomeTabs (#10668)

- Introduced the AgentSettingsTab component for managing agent settings.
- Integrated AgentSettingsTab into HomeTabs, allowing access to agent settings based on the active session or topic.
- Updated AgentEssentialSettings to conditionally render the ModelSetting based on props.
- Adjusted styles in various components for consistency and improved layout.
---
 .../src/pages/home/Tabs/AgentSettingsTab.tsx  | 40 +++++++++++++++++++
 .../src/pages/home/Tabs/AssistantsTab.tsx     |  4 +-
 .../pages/home/Tabs/components/AddButton.tsx  |  2 +-
 .../pages/home/Tabs/components/AgentItem.tsx  | 11 +----
 src/renderer/src/pages/home/Tabs/index.tsx    | 34 +++++++---------
 .../AgentSettings/AccessibleDirsSetting.tsx   |  4 +-
 .../AgentSettings/AgentEssentialSettings.tsx  |  5 ++-
 .../settings/AgentSettings/NameSetting.tsx    |  1 +
 8 files changed, 66 insertions(+), 35 deletions(-)
 create mode 100644 src/renderer/src/pages/home/Tabs/AgentSettingsTab.tsx

diff --git a/src/renderer/src/pages/home/Tabs/AgentSettingsTab.tsx b/src/renderer/src/pages/home/Tabs/AgentSettingsTab.tsx
new file mode 100644
index 000000000..7aab18816
--- /dev/null
+++ b/src/renderer/src/pages/home/Tabs/AgentSettingsTab.tsx
@@ -0,0 +1,40 @@
+import { Button, Divider } from '@heroui/react'
+import { useUpdateAgent } from '@renderer/hooks/agents/useUpdateAgent'
+import { AgentSettingsPopup } from '@renderer/pages/settings/AgentSettings'
+import AdvancedSettings from '@renderer/pages/settings/AgentSettings/AdvancedSettings'
+import AgentEssentialSettings from '@renderer/pages/settings/AgentSettings/AgentEssentialSettings'
+import { GetAgentResponse } from '@renderer/types/agent'
+import { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+
+interface Props {
+  agent: GetAgentResponse | undefined | null
+  update: ReturnType<typeof useUpdateAgent>['updateAgent']
+}
+
+const AgentSettingsTab: FC<Props> = ({ agent, update }) => {
+  const { t } = useTranslation()
+
+  const onMoreSetting = () => {
+    if (agent?.id) {
+      AgentSettingsPopup.show({ agentId: agent.id! })
+    }
+  }
+
+  if (!agent) {
+    return null
+  }
+
+  return (
+    <div className="w-[var(--assistants-width)] p-2 px-3 pt-4">
+      <AgentEssentialSettings agent={agent} update={update} showModelSetting={false} />
+      <AdvancedSettings agentBase={agent} update={update} />
+      <Divider className="my-2" />
+      <Button size="sm" fullWidth onPress={onMoreSetting}>
+        {t('settings.moresetting.label')}
+      </Button>
+    </div>
+  )
+}
+
+export default AgentSettingsTab
diff --git a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
index 3d871d76e..2eaa2ef1e 100644
--- a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
@@ -116,8 +116,6 @@ const AssistantsTab: FC<AssistantsTabProps> = (props) => {
         />
       )}
 
-      <UnifiedAddButton onCreateAssistant={onCreateAssistant} />
-
       {agentsLoading && <Spinner />}
       {apiServer.enabled && agentsError && <Alert color="danger" title={t('agent.list.error.failed')} />}
 
@@ -165,6 +163,8 @@ const AssistantsTab: FC<AssistantsTabProps> = (props) => {
         />
       )}
 
+      <UnifiedAddButton onCreateAssistant={onCreateAssistant} />
+
       {!dragging && <div style={{ minHeight: 10 }}></div>}
     </Container>
   )
diff --git a/src/renderer/src/pages/home/Tabs/components/AddButton.tsx b/src/renderer/src/pages/home/Tabs/components/AddButton.tsx
index 1195710ae..99868861b 100644
--- a/src/renderer/src/pages/home/Tabs/components/AddButton.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/AddButton.tsx
@@ -12,7 +12,7 @@ const AddButton: FC<Props> = ({ children, className, ...props }) => {
       {...props}
       onPress={props.onPress}
       className={cn(
-        'h-9 w-[calc(var(--assistants-width)-20px)] justify-start rounded-full bg-transparent px-3 text-[13px] text-[var(--color-text-2)] hover:bg-[var(--color-list-item)]',
+        'h-9 w-[calc(var(--assistants-width)-20px)] justify-start rounded-lg bg-transparent px-3 text-[13px] text-[var(--color-text-2)] hover:bg-[var(--color-list-item)]',
         className
       )}
       startContent={<PlusIcon size={16} className="shrink-0" />}>
diff --git a/src/renderer/src/pages/home/Tabs/components/AgentItem.tsx b/src/renderer/src/pages/home/Tabs/components/AgentItem.tsx
index 80c4b6db9..f31242080 100644
--- a/src/renderer/src/pages/home/Tabs/components/AgentItem.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/AgentItem.tsx
@@ -45,19 +45,12 @@ const AgentItem: FC<AgentItemProps> = ({ agent, isActive, onDelete, onPress }) =
             </AgentNameWrapper>
           </AssistantNameRow>
           <MenuButton>
-            {isActive ? <SessionCount>{sessions.length}</SessionCount> : <Bot size={12} className="text-primary" />}
+            {isActive ? <SessionCount>{sessions.length}</SessionCount> : <Bot size={14} className="text-primary" />}
           </MenuButton>
         </Container>
       </ContextMenuTrigger>
       <ContextMenuContent>
-        <ContextMenuItem
-          key="edit"
-          onClick={async () => {
-            // onOpen()
-            await AgentSettingsPopup.show({
-              agentId: agent.id
-            })
-          }}>
+        <ContextMenuItem key="edit" onClick={() => AgentSettingsPopup.show({ agentId: agent.id })}>
           <EditIcon size={14} />
           {t('common.edit')}
         </ContextMenuItem>
diff --git a/src/renderer/src/pages/home/Tabs/index.tsx b/src/renderer/src/pages/home/Tabs/index.tsx
index f1adf9e4f..1e2559c08 100644
--- a/src/renderer/src/pages/home/Tabs/index.tsx
+++ b/src/renderer/src/pages/home/Tabs/index.tsx
@@ -1,4 +1,6 @@
 import AddAssistantPopup from '@renderer/components/Popups/AddAssistantPopup'
+import { useAgent } from '@renderer/hooks/agents/useAgent'
+import { useUpdateAgent } from '@renderer/hooks/agents/useUpdateAgent'
 import { useAssistants, useDefaultAssistant } from '@renderer/hooks/useAssistant'
 import { useRuntime } from '@renderer/hooks/useRuntime'
 import { useNavbarPosition, useSettings } from '@renderer/hooks/useSettings'
@@ -11,6 +13,7 @@ import { FC, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
+import AgentSettingsTab from './AgentSettingsTab'
 import Assistants from './AssistantsTab'
 import Settings from './SettingsTab'
 import Topics from './TopicsTab'
@@ -41,11 +44,12 @@ const HomeTabs: FC<Props> = ({
   const { defaultAssistant } = useDefaultAssistant()
   const { toggleShowTopics } = useShowTopics()
   const { isLeftNavbar } = useNavbarPosition()
-
   const { t } = useTranslation()
-
   const { chat } = useRuntime()
-  const { activeTopicOrSession } = chat
+  const { activeTopicOrSession, activeAgentId } = chat
+  const { agent } = useAgent(activeAgentId)
+  const { updateAgent } = useUpdateAgent()
+
   const isSessionView = activeTopicOrSession === 'session'
   const isTopicView = activeTopicOrSession === 'topic'
 
@@ -61,7 +65,6 @@ const HomeTabs: FC<Props> = ({
   }
 
   const showTab = position === 'left' && topicPosition === 'left'
-  const shouldShowSettingsTab = !isSessionView
 
   const onCreateAssistant = async () => {
     const assistant = await AddAssistantPopup.show()
@@ -104,12 +107,6 @@ const HomeTabs: FC<Props> = ({
     }
   }, [position, tab, topicPosition, forceToSeeAllTab])
 
-  useEffect(() => {
-    if (activeTopicOrSession === 'session' && tab === 'settings') {
-      setTab('topic')
-    }
-  }, [activeTopicOrSession, tab])
-
   return (
     <Container
       style={{ ...border, ...style }}
@@ -120,13 +117,11 @@ const HomeTabs: FC<Props> = ({
             {t('assistants.abbr')}
           </TabItem>
           <TabItem active={tab === 'topic'} onClick={() => setTab('topic')}>
-            {isTopicView ? t('common.topics') : t('agent.session.label_other')}
+            {t('common.topics')}
+          </TabItem>
+          <TabItem active={tab === 'settings'} onClick={() => setTab('settings')}>
+            {t('settings.title')}
           </TabItem>
-          {shouldShowSettingsTab && (
-            <TabItem active={tab === 'settings'} onClick={() => setTab('settings')}>
-              {t('settings.title')}
-            </TabItem>
-          )}
         </CustomTabs>
       )}
 
@@ -158,7 +153,8 @@ const HomeTabs: FC<Props> = ({
             position={position}
           />
         )}
-        {tab === 'settings' && shouldShowSettingsTab && <Settings assistant={activeAssistant} />}
+        {tab === 'settings' && isTopicView && <Settings assistant={activeAssistant} />}
+        {tab === 'settings' && isSessionView && <AgentSettingsTab agent={agent} update={updateAgent} />}
       </TabContent>
     </Container>
   )
@@ -214,7 +210,7 @@ const CustomTabs = styled.div`
 
 const TabItem = styled.button<{ active: boolean }>`
   flex: 1;
-  height: 32px;
+  height: 30px;
   border: none;
   background: transparent;
   color: ${(props) => (props.active ? 'var(--color-text)' : 'var(--color-text-secondary)')};
@@ -239,7 +235,7 @@ const TabItem = styled.button<{ active: boolean }>`
   &::after {
     content: '';
     position: absolute;
-    bottom: -9px;
+    bottom: -8px;
     left: 50%;
     transform: translateX(-50%);
     width: ${(props) => (props.active ? '30px' : '0')};
diff --git a/src/renderer/src/pages/settings/AgentSettings/AccessibleDirsSetting.tsx b/src/renderer/src/pages/settings/AgentSettings/AccessibleDirsSetting.tsx
index 2a19b5441..ad228d227 100644
--- a/src/renderer/src/pages/settings/AgentSettings/AccessibleDirsSetting.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/AccessibleDirsSetting.tsx
@@ -71,11 +71,11 @@ export const AccessibleDirsSetting: React.FC<AccessibleDirsSettingProps> = ({ ba
         }>
         {t('agent.session.accessible_paths.label')}
       </SettingsTitle>
-      <ul className="mt-2 flex flex-col gap-2 rounded-xl border p-2">
+      <ul className="flex flex-col gap-2">
         {base.accessible_paths.map((path) => (
           <li
             key={path}
-            className="flex items-center justify-between gap-2 rounded-medium border border-default-200 px-3 py-2">
+            className="flex items-center justify-between gap-2 rounded-medium border border-default-200 px-2 py-1">
             <span className="w-0 flex-1 overflow-hidden text-ellipsis whitespace-nowrap text-sm" title={path}>
               {path}
             </span>
diff --git a/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx b/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx
index af9dcfd75..e0329404d 100644
--- a/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx
@@ -18,9 +18,10 @@ import { SettingsContainer, SettingsItem, SettingsTitle } from './shared'
 interface AgentEssentialSettingsProps {
   agent: GetAgentResponse | undefined | null
   update: ReturnType<typeof useUpdateAgent>['updateAgent']
+  showModelSetting?: boolean
 }
 
-const AgentEssentialSettings: FC<AgentEssentialSettingsProps> = ({ agent, update }) => {
+const AgentEssentialSettings: FC<AgentEssentialSettingsProps> = ({ agent, update, showModelSetting = true }) => {
   const { t } = useTranslation()
 
   if (!agent) return null
@@ -36,7 +37,7 @@ const AgentEssentialSettings: FC<AgentEssentialSettingsProps> = ({ agent, update
       </SettingsItem>
       <AvatarSetting agent={agent} update={update} />
       <NameSetting base={agent} update={update} />
-      <ModelSetting base={agent} update={update} />
+      {showModelSetting && <ModelSetting base={agent} update={update} />}
       <AccessibleDirsSetting base={agent} update={update} />
       <DescriptionSetting base={agent} update={update} />
     </SettingsContainer>
diff --git a/src/renderer/src/pages/settings/AgentSettings/NameSetting.tsx b/src/renderer/src/pages/settings/AgentSettings/NameSetting.tsx
index 364e464b5..26346bc9a 100644
--- a/src/renderer/src/pages/settings/AgentSettings/NameSetting.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/NameSetting.tsx
@@ -25,6 +25,7 @@ export const NameSetting: React.FC<NameSettingsProps> = ({ base, update }) => {
       <Input
         placeholder={t('common.agent_one') + t('common.name')}
         value={name}
+        size="sm"
         onValueChange={(value) => setName(value)}
         onBlur={() => {
           if (name !== base.name) {