refactor: extract computeModeDefaults to shared and use lodash uniq

- Move duplicated `computeModeDefaults` function to shared.tsx
- Replace custom `unique` function with lodash `uniq` for consistency
- Both PermissionModeSettings and ToolsAndMCPSettings now import from shared

Author: kangfenmao

src/renderer/src/pages/settings/AgentSettings/PermissionModeSettings.tsx

@@ -4,7 +4,6 @@ import type {
   GetAgentResponse,
   GetAgentSessionResponse,
   PermissionMode,
-  Tool,
   UpdateAgentBaseForm,
   UpdateAgentFunction,
   UpdateAgentSessionFunction
@@ -16,7 +15,7 @@ import type { FC } from 'react'
 import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { SettingsContainer, SettingsItem, SettingsTitle } from './shared'
+import { computeModeDefaults, SettingsContainer, SettingsItem, SettingsTitle, uniq } from './shared'
 
 type PermissionModeSettingsProps =
   | {
@@ -32,35 +31,6 @@ type AgentConfigurationState = AgentConfiguration & Record<string, unknown>
 
 const defaultConfiguration: AgentConfigurationState = AgentConfigurationSchema.parse({})
 
-/**
- * Computes the list of tool IDs that should be automatically approved for a given permission mode.
- */
-export const computeModeDefaults = (mode: PermissionMode, tools: Tool[]): string[] => {
-  const defaultToolIds = tools.filter((tool) => !tool.requirePermissions).map((tool) => tool.id)
-  switch (mode) {
-    case 'acceptEdits':
-      return [
-        ...defaultToolIds,
-        'Edit',
-        'MultiEdit',
-        'NotebookEdit',
-        'Write',
-        'Bash(mkdir:*)',
-        'Bash(touch:*)',
-        'Bash(rm:*)',
-        'Bash(mv:*)',
-        'Bash(cp:*)'
-      ]
-    case 'bypassPermissions':
-      return tools.map((tool) => tool.id)
-    case 'default':
-    case 'plan':
-      return defaultToolIds
-  }
-}
-
-export const unique = (values: string[]) => Array.from(new Set(values))
-
 export const PermissionModeSettings: FC<PermissionModeSettingsProps> = ({ agentBase, update }) => {
   const { t } = useTranslation()
   const [isUpdatingMode, setIsUpdatingMode] = useState(false)
@@ -78,7 +48,7 @@ export const PermissionModeSettings: FC<PermissionModeSettingsProps> = ({ agentB
   const approvedToolIds = useMemo(() => {
     const allowed = agentBase?.allowed_tools ?? []
     const sanitized = allowed.filter((id) => availableTools.some((tool) => tool.id === id))
-    const merged = unique([...sanitized, ...autoToolIds])
+    const merged = uniq([...sanitized, ...autoToolIds])
     return merged
   }, [agentBase?.allowed_tools, autoToolIds, availableTools])
   const userAddedIds = useMemo(() => {
@@ -91,7 +61,7 @@ export const PermissionModeSettings: FC<PermissionModeSettingsProps> = ({ agentB
         return
       }
       const defaults = computeModeDefaults(nextMode, availableTools)
-      const merged = unique([...defaults, ...userAddedIds])
+      const merged = uniq([...defaults, ...userAddedIds])
       const removedDefaults = autoToolIds.filter((id) => !defaults.includes(id))
 
       const applyChange = async () => {

src/renderer/src/pages/settings/AgentSettings/ToolsAndMCPSettings.tsx

@@ -4,8 +4,6 @@ import type {
   AgentConfiguration,
   GetAgentResponse,
   GetAgentSessionResponse,
-  PermissionMode,
-  Tool,
   UpdateAgentBaseForm,
   UpdateAgentFunction,
   UpdateAgentSessionFunction
@@ -17,7 +15,7 @@ import type { FC } from 'react'
 import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { SettingsContainer, SettingsItem, SettingsTitle } from './shared'
+import { computeModeDefaults, SettingsContainer, SettingsItem, SettingsTitle, uniq } from './shared'
 
 type ToolsAndMCPSettingsProps =
   | {
@@ -33,32 +31,6 @@ type AgentConfigurationState = AgentConfiguration & Record<string, unknown>
 
 const defaultConfiguration: AgentConfigurationState = AgentConfigurationSchema.parse({})
 
-const computeModeDefaults = (mode: PermissionMode, tools: Tool[]): string[] => {
-  const defaultToolIds = tools.filter((tool) => !tool.requirePermissions).map((tool) => tool.id)
-  switch (mode) {
-    case 'acceptEdits':
-      return [
-        ...defaultToolIds,
-        'Edit',
-        'MultiEdit',
-        'NotebookEdit',
-        'Write',
-        'Bash(mkdir:*)',
-        'Bash(touch:*)',
-        'Bash(rm:*)',
-        'Bash(mv:*)',
-        'Bash(cp:*)'
-      ]
-    case 'bypassPermissions':
-      return tools.map((tool) => tool.id)
-    case 'default':
-    case 'plan':
-      return defaultToolIds
-  }
-}
-
-const unique = (values: string[]) => Array.from(new Set(values))
-
 export const ToolsAndMCPSettings: FC<ToolsAndMCPSettingsProps> = ({ agentBase, update }) => {
   const { t } = useTranslation()
   const { mcpServers: allServers } = useMCPServers()
@@ -75,7 +47,7 @@ export const ToolsAndMCPSettings: FC<ToolsAndMCPSettingsProps> = ({ agentBase, u
   const approvedToolIds = useMemo(() => {
     const allowed = agentBase?.allowed_tools ?? []
     const sanitized = allowed.filter((id) => availableTools.some((tool) => tool.id === id))
-    const merged = unique([...sanitized, ...autoToolIds])
+    const merged = uniq([...sanitized, ...autoToolIds])
     return merged
   }, [agentBase?.allowed_tools, autoToolIds, availableTools])
   const selectedMcpIds = useMemo(() => agentBase?.mcps ?? [], [agentBase?.mcps])
@@ -107,7 +79,7 @@ export const ToolsAndMCPSettings: FC<ToolsAndMCPSettingsProps> = ({ agentBase, u
       }
       setIsUpdatingTools(true)
       const next = isApproved ? [...approvedToolIds, toolId] : approvedToolIds.filter((id) => id !== toolId)
-      const sanitized = unique(next.filter((id) => availableTools.some((tool) => tool.id === id)).concat(autoToolIds))
+      const sanitized = uniq(next.filter((id) => availableTools.some((tool) => tool.id === id)).concat(autoToolIds))
       try {
         await update({ id: agentBase.id, allowed_tools: sanitized } satisfies UpdateAgentBaseForm)
       } finally {

src/renderer/src/pages/settings/AgentSettings/shared.tsx

@@ -2,15 +2,45 @@ import EmojiIcon from '@renderer/components/EmojiIcon'
 import type { ScrollbarProps } from '@renderer/components/Scrollbar'
 import Scrollbar from '@renderer/components/Scrollbar'
 import { getAgentTypeLabel } from '@renderer/i18n/label'
-import type { AgentEntity, AgentSessionEntity } from '@renderer/types'
+import type { AgentEntity, AgentSessionEntity, PermissionMode, Tool } from '@renderer/types'
 import { cn } from '@renderer/utils'
 import { Menu, Modal } from 'antd'
+import { uniq } from 'lodash'
 import type { ReactNode } from 'react'
 import React from 'react'
 import styled from 'styled-components'
 
 import { SettingDivider } from '..'
 
+/**
+ * Computes the list of tool IDs that should be automatically approved for a given permission mode.
+ */
+export const computeModeDefaults = (mode: PermissionMode, tools: Tool[]): string[] => {
+  const defaultToolIds = tools.filter((tool) => !tool.requirePermissions).map((tool) => tool.id)
+  switch (mode) {
+    case 'acceptEdits':
+      return [
+        ...defaultToolIds,
+        'Edit',
+        'MultiEdit',
+        'NotebookEdit',
+        'Write',
+        'Bash(mkdir:*)',
+        'Bash(touch:*)',
+        'Bash(rm:*)',
+        'Bash(mv:*)',
+        'Bash(cp:*)'
+      ]
+    case 'bypassPermissions':
+      return tools.map((tool) => tool.id)
+    case 'default':
+    case 'plan':
+      return defaultToolIds
+  }
+}
+
+export { uniq }
+
 export interface SettingsTitleProps extends React.ComponentPropsWithRef<'div'> {
   contentAfter?: ReactNode
 }