From 1eee19a3ea9db9a33cf770ae9f8796c31898300f Mon Sep 17 00:00:00 2001
From: wsp <mr.wanger2018@outlook.com>
Date: Fri, 21 Aug 2026 13:07:33 +0800
Subject: [PATCH] feat(settings): simplify memory configuration

- combine memory generation and session usage into one toggle
- keep common policies and model selectors directly accessible
- move extraction and consolidation limits into advanced settings
- update localized copy and settings search metadata
---
 .../settings/settingsTabSearchContent.ts      |  10 +-
 .../config/components/MemoriesConfig.scss     |  36 +++
 .../config/components/MemoriesConfig.tsx      | 303 ++++++++++--------
 .../src/locales/en-US/settings/memories.json  |  14 +-
 .../src/locales/zh-CN/settings/memories.json  |  14 +-
 .../src/locales/zh-TW/settings/memories.json  |  14 +-
 6 files changed, 243 insertions(+), 148 deletions(-)
 create mode 100644 src/web-ui/src/infrastructure/config/components/MemoriesConfig.scss

diff --git a/src/web-ui/src/app/scenes/settings/settingsTabSearchContent.ts b/src/web-ui/src/app/scenes/settings/settingsTabSearchContent.ts
index 8a504458b5..4e1e77ed26 100644
--- a/src/web-ui/src/app/scenes/settings/settingsTabSearchContent.ts
+++ b/src/web-ui/src/app/scenes/settings/settingsTabSearchContent.ts
@@ -141,11 +141,13 @@ export const SETTINGS_TAB_SEARCH_CONTENT: Record<ConfigTab, readonly SettingsTab
     { ns: 'settings/memories', key: 'subtitle' },
     { ns: 'settings/memories', key: 'sections.basic.title' },
     { ns: 'settings/memories', key: 'sections.basic.description' },
-    { ns: 'settings/memories', key: 'sections.extraction.title' },
-    { ns: 'settings/memories', key: 'sections.consolidation.title' },
-    { ns: 'settings/memories', key: 'fields.generateMemories.label' },
-    { ns: 'settings/memories', key: 'fields.useMemories.label' },
+    { ns: 'settings/memories', key: 'sections.models.title' },
+    { ns: 'settings/memories', key: 'sections.advanced.title' },
+    { ns: 'settings/memories', key: 'fields.memoryEnabled.label' },
+    { ns: 'settings/memories', key: 'fields.generateForBtwSessions.label' },
     { ns: 'settings/memories', key: 'fields.externalContextPolicy.label' },
+    { ns: 'settings/memories', key: 'fields.extractModel.label' },
+    { ns: 'settings/memories', key: 'fields.consolidationModel.label' },
     { ns: 'settings/memories', key: 'fields.maxRolloutsPerStartup.label' },
     { ns: 'settings/memories', key: 'fields.maxRolloutsScanLimit.label' },
     { ns: 'settings/memories', key: 'fields.phase1MaxConcurrency.label' },
diff --git a/src/web-ui/src/infrastructure/config/components/MemoriesConfig.scss b/src/web-ui/src/infrastructure/config/components/MemoriesConfig.scss
new file mode 100644
index 0000000000..1bcc512334
--- /dev/null
+++ b/src/web-ui/src/infrastructure/config/components/MemoriesConfig.scss
@@ -0,0 +1,36 @@
+.bitfun-memories-config__advanced {
+  border: 1px solid var(--bf-appearance-token-config-page-section-border);
+  border-radius: var(--bf-appearance-token-size-radius-md);
+  background: var(--bf-appearance-token-config-page-section-bg);
+
+  > summary {
+    padding: var(--bf-appearance-token-size-gap-4);
+    cursor: pointer;
+    font-size: var(--bf-appearance-token-font-size-sm);
+    font-weight: var(--bf-appearance-token-font-weight-semibold);
+    color: var(--bf-appearance-token-color-text-primary);
+  }
+
+  &[open] > summary {
+    border-bottom: 1px solid var(--bf-appearance-token-config-page-divider);
+  }
+}
+
+.bitfun-memories-config__advanced-content {
+  padding: var(--bf-appearance-token-size-gap-4);
+
+  .bitfun-config-page-section {
+    gap: var(--bf-appearance-token-size-gap-3);
+  }
+
+  .bitfun-config-page-section__header {
+    display: none;
+  }
+
+  .bitfun-config-page-section__body {
+    background: transparent;
+    border: 0;
+    border-radius: 0;
+    box-shadow: none;
+  }
+}
diff --git a/src/web-ui/src/infrastructure/config/components/MemoriesConfig.tsx b/src/web-ui/src/infrastructure/config/components/MemoriesConfig.tsx
index f1d6c81bb7..dd48cef290 100644
--- a/src/web-ui/src/infrastructure/config/components/MemoriesConfig.tsx
+++ b/src/web-ui/src/infrastructure/config/components/MemoriesConfig.tsx
@@ -24,6 +24,7 @@ import {
   ConfigPageRow,
   ConfigPageSection,
 } from './common';
+import './MemoriesConfig.scss';
 
 const log = createLogger('MemoriesConfig');
 
@@ -160,6 +161,27 @@ const MemoriesConfig: React.FC = () => {
     }
   }, [config, notifyError, notifySuccess, t]);
 
+  const updateMemoryEnabled = useCallback(async (enabled: boolean) => {
+    const previous = config;
+    const next = {
+      ...config,
+      generate_memories: enabled,
+      use_memories: enabled,
+    };
+    setSavingKey('generate_memories');
+    setConfig(next);
+    try {
+      await configManager.setConfig('memories', next);
+      notifySuccess(t('messages.saved'));
+    } catch (error) {
+      log.error('Failed to save memory enabled state', error);
+      setConfig(previous);
+      notifyError(error instanceof Error ? error.message : t('messages.saveFailed'));
+    } finally {
+      setSavingKey(null);
+    }
+  }, [config, notifyError, notifySuccess, t]);
+
   const updateModelSelector = useCallback((
     key: 'extract_model' | 'consolidation_model',
     value: string | number | (string | number)[],
@@ -211,7 +233,11 @@ const MemoriesConfig: React.FC = () => {
 
   if (loading) {
     return (
-      <ConfigPageLayout>
+      <ConfigPageLayout
+        className="bitfun-memories-config"
+        data-bf-component="config"
+        data-bf-part="root"
+      >
         <ConfigPageHeader title={t('title')} subtitle={t('subtitle')} />
         <ConfigPageContent>
           <ConfigPageLoading text={t('messages.loading')} />
@@ -220,10 +246,15 @@ const MemoriesConfig: React.FC = () => {
     );
   }
 
-  const memoryWorkDisabled = !config.generate_memories;
+  const memoryEnabled = config.generate_memories && config.use_memories;
+  const memoryWorkDisabled = !memoryEnabled;
 
   return (
-    <ConfigPageLayout>
+    <ConfigPageLayout
+      className="bitfun-memories-config"
+      data-bf-component="config"
+      data-bf-part="root"
+    >
       <ConfigPageHeader
         title={t('title')}
         subtitle={t('subtitle')}
@@ -274,27 +305,14 @@ const MemoriesConfig: React.FC = () => {
       <ConfigPageContent>
         <ConfigPageSection title={t('sections.basic.title')} description={t('sections.basic.description')}>
           <ConfigPageRow
-            label={t('fields.generateMemories.label')}
-            description={t('fields.generateMemories.description')}
-            align="center"
-          >
-            <Switch
-              checked={config.generate_memories}
-              onChange={(event) => void updateConfig('generate_memories', event.target.checked)}
-              disabled={savingKey === 'generate_memories'}
-              size="small"
-            />
-          </ConfigPageRow>
-
-          <ConfigPageRow
-            label={t('fields.useMemories.label')}
-            description={t('fields.useMemories.description')}
+            label={t('fields.memoryEnabled.label')}
+            description={t('fields.memoryEnabled.description')}
             align="center"
           >
             <Switch
-              checked={config.use_memories}
-              onChange={(event) => void updateConfig('use_memories', event.target.checked)}
-              disabled={savingKey === 'use_memories'}
+              checked={memoryEnabled}
+              onChange={(event) => void updateMemoryEnabled(event.target.checked)}
+              disabled={savingKey === 'generate_memories' || savingKey === 'use_memories'}
               size="small"
             />
           </ConfigPageRow>
@@ -307,7 +325,7 @@ const MemoriesConfig: React.FC = () => {
             <Switch
               checked={config.generate_for_btw_sessions}
               onChange={(event) => void updateConfig('generate_for_btw_sessions', event.target.checked)}
-              disabled={savingKey === 'generate_for_btw_sessions'}
+              disabled={savingKey === 'generate_for_btw_sessions' || memoryWorkDisabled}
               size="small"
             />
           </ConfigPageRow>
@@ -332,89 +350,7 @@ const MemoriesConfig: React.FC = () => {
           </ConfigPageRow>
         </ConfigPageSection>
 
-        <ConfigPageSection title={t('sections.extraction.title')} description={t('sections.extraction.description')}>
-          <ConfigPageRow
-            label={t('fields.minRolloutIdleHours.label')}
-            description={t('fields.minRolloutIdleHours.description')}
-            align="center"
-          >
-            <NumberInput
-              value={config.min_rollout_idle_hours}
-              onChange={(value) => void updateConfig('min_rollout_idle_hours', value)}
-              min={1}
-              max={48}
-              step={1}
-              unit={t('units.hours')}
-              size="small"
-              disabled={savingKey === 'min_rollout_idle_hours' || memoryWorkDisabled}
-            />
-          </ConfigPageRow>
-
-          <ConfigPageRow
-            label={t('fields.maxRolloutAgeDays.label')}
-            description={t('fields.maxRolloutAgeDays.description')}
-            align="center"
-          >
-            <NumberInput
-              value={config.max_rollout_age_days}
-              onChange={(value) => void updateConfig('max_rollout_age_days', value)}
-              min={0}
-              max={config.max_unused_days}
-              step={1}
-              unit={t('units.days')}
-              size="small"
-              disabled={savingKey === 'max_rollout_age_days' || memoryWorkDisabled}
-            />
-          </ConfigPageRow>
-
-          <ConfigPageRow
-            label={t('fields.maxRolloutsPerStartup.label')}
-            description={t('fields.maxRolloutsPerStartup.description')}
-            align="center"
-          >
-            <NumberInput
-              value={config.max_rollouts_per_startup}
-              onChange={(value) => void updateConfig('max_rollouts_per_startup', value)}
-              min={1}
-              max={128}
-              step={1}
-              size="small"
-              disabled={savingKey === 'max_rollouts_per_startup' || memoryWorkDisabled}
-            />
-          </ConfigPageRow>
-
-          <ConfigPageRow
-            label={t('fields.maxRolloutsScanLimit.label')}
-            description={t('fields.maxRolloutsScanLimit.description')}
-            align="center"
-          >
-            <NumberInput
-              value={config.max_rollouts_scan_limit}
-              onChange={(value) => void updateConfig('max_rollouts_scan_limit', value)}
-              min={1}
-              max={50000}
-              step={100}
-              size="small"
-              disabled={savingKey === 'max_rollouts_scan_limit' || memoryWorkDisabled}
-            />
-          </ConfigPageRow>
-
-          <ConfigPageRow
-            label={t('fields.phase1MaxConcurrency.label')}
-            description={t('fields.phase1MaxConcurrency.description')}
-            align="center"
-          >
-            <NumberInput
-              value={config.phase1_max_concurrency}
-              onChange={(value) => void updateConfig('phase1_max_concurrency', value)}
-              min={1}
-              max={16}
-              step={1}
-              size="small"
-              disabled={savingKey === 'phase1_max_concurrency' || memoryWorkDisabled}
-            />
-          </ConfigPageRow>
-
+        <ConfigPageSection title={t('sections.models.title')} description={t('sections.models.description')}>
           <ConfigPageRow
             label={t('fields.extractModel.label')}
             description={t('fields.extractModel.description')}
@@ -428,42 +364,6 @@ const MemoriesConfig: React.FC = () => {
               disabled={savingKey === 'extract_model' || memoryWorkDisabled}
             />
           </ConfigPageRow>
-        </ConfigPageSection>
-
-        <ConfigPageSection title={t('sections.consolidation.title')} description={t('sections.consolidation.description')}>
-          <ConfigPageRow
-            label={t('fields.maxRawMemories.label')}
-            description={t('fields.maxRawMemories.description')}
-            align="center"
-          >
-            <NumberInput
-              value={config.max_raw_memories_for_consolidation}
-              onChange={(value) => void updateConfig('max_raw_memories_for_consolidation', value)}
-              min={1}
-              max={4096}
-              step={1}
-              size="small"
-              disabled={savingKey === 'max_raw_memories_for_consolidation' || memoryWorkDisabled}
-            />
-          </ConfigPageRow>
-
-          <ConfigPageRow
-            label={t('fields.maxUnusedDays.label')}
-            description={t('fields.maxUnusedDays.description')}
-            align="center"
-          >
-            <NumberInput
-              value={config.max_unused_days}
-              onChange={(value) => void updateConfig('max_unused_days', value)}
-              min={config.max_rollout_age_days}
-              max={365}
-              step={1}
-              unit={t('units.days')}
-              size="small"
-              disabled={savingKey === 'max_unused_days' || memoryWorkDisabled}
-            />
-          </ConfigPageRow>
-
           <ConfigPageRow
             label={t('fields.consolidationModel.label')}
             description={t('fields.consolidationModel.description')}
@@ -478,6 +378,127 @@ const MemoriesConfig: React.FC = () => {
             />
           </ConfigPageRow>
         </ConfigPageSection>
+
+        <details className="bitfun-memories-config__advanced">
+          <summary>{t('sections.advanced.title')}</summary>
+          <div className="bitfun-memories-config__advanced-content">
+            <ConfigPageSection title={t('sections.advanced.title')} description={t('sections.advanced.description')}>
+              <ConfigPageRow
+                label={t('fields.minRolloutIdleHours.label')}
+                description={t('fields.minRolloutIdleHours.description')}
+                align="center"
+              >
+                <NumberInput
+                  value={config.min_rollout_idle_hours}
+                  onChange={(value) => void updateConfig('min_rollout_idle_hours', value)}
+                  min={1}
+                  max={48}
+                  step={1}
+                  unit={t('units.hours')}
+                  size="small"
+                  disabled={savingKey === 'min_rollout_idle_hours' || memoryWorkDisabled}
+                />
+              </ConfigPageRow>
+
+              <ConfigPageRow
+                label={t('fields.maxRolloutAgeDays.label')}
+                description={t('fields.maxRolloutAgeDays.description')}
+                align="center"
+              >
+                <NumberInput
+                  value={config.max_rollout_age_days}
+                  onChange={(value) => void updateConfig('max_rollout_age_days', value)}
+                  min={0}
+                  max={config.max_unused_days}
+                  step={1}
+                  unit={t('units.days')}
+                  size="small"
+                  disabled={savingKey === 'max_rollout_age_days' || memoryWorkDisabled}
+                />
+              </ConfigPageRow>
+
+              <ConfigPageRow
+                label={t('fields.maxRolloutsPerStartup.label')}
+                description={t('fields.maxRolloutsPerStartup.description')}
+                align="center"
+              >
+                <NumberInput
+                  value={config.max_rollouts_per_startup}
+                  onChange={(value) => void updateConfig('max_rollouts_per_startup', value)}
+                  min={1}
+                  max={128}
+                  step={1}
+                  size="small"
+                  disabled={savingKey === 'max_rollouts_per_startup' || memoryWorkDisabled}
+                />
+              </ConfigPageRow>
+
+              <ConfigPageRow
+                label={t('fields.maxRolloutsScanLimit.label')}
+                description={t('fields.maxRolloutsScanLimit.description')}
+                align="center"
+              >
+                <NumberInput
+                  value={config.max_rollouts_scan_limit}
+                  onChange={(value) => void updateConfig('max_rollouts_scan_limit', value)}
+                  min={1}
+                  max={50000}
+                  step={100}
+                  size="small"
+                  disabled={savingKey === 'max_rollouts_scan_limit' || memoryWorkDisabled}
+                />
+              </ConfigPageRow>
+
+              <ConfigPageRow
+                label={t('fields.phase1MaxConcurrency.label')}
+                description={t('fields.phase1MaxConcurrency.description')}
+                align="center"
+              >
+                <NumberInput
+                  value={config.phase1_max_concurrency}
+                  onChange={(value) => void updateConfig('phase1_max_concurrency', value)}
+                  min={1}
+                  max={16}
+                  step={1}
+                  size="small"
+                  disabled={savingKey === 'phase1_max_concurrency' || memoryWorkDisabled}
+                />
+              </ConfigPageRow>
+              <ConfigPageRow
+                label={t('fields.maxRawMemories.label')}
+                description={t('fields.maxRawMemories.description')}
+                align="center"
+              >
+                <NumberInput
+                  value={config.max_raw_memories_for_consolidation}
+                  onChange={(value) => void updateConfig('max_raw_memories_for_consolidation', value)}
+                  min={1}
+                  max={4096}
+                  step={1}
+                  size="small"
+                  disabled={savingKey === 'max_raw_memories_for_consolidation' || memoryWorkDisabled}
+                />
+              </ConfigPageRow>
+
+              <ConfigPageRow
+                label={t('fields.maxUnusedDays.label')}
+                description={t('fields.maxUnusedDays.description')}
+                align="center"
+              >
+                <NumberInput
+                  value={config.max_unused_days}
+                  onChange={(value) => void updateConfig('max_unused_days', value)}
+                  min={config.max_rollout_age_days}
+                  max={365}
+                  step={1}
+                  unit={t('units.days')}
+                  size="small"
+                  disabled={savingKey === 'max_unused_days' || memoryWorkDisabled}
+                />
+              </ConfigPageRow>
+            </ConfigPageSection>
+          </div>
+        </details>
       </ConfigPageContent>
       <ConfirmDialog
         isOpen={resetMemoryConfirmOpen}
diff --git a/src/web-ui/src/locales/en-US/settings/memories.json b/src/web-ui/src/locales/en-US/settings/memories.json
index 574c10d47a..e73f78585b 100644
--- a/src/web-ui/src/locales/en-US/settings/memories.json
+++ b/src/web-ui/src/locales/en-US/settings/memories.json
@@ -6,6 +6,14 @@
       "title": "Basics",
       "description": "Control whether new memories are generated and whether consolidated memories are used in sessions."
     },
+    "models": {
+      "title": "Models",
+      "description": "Choose the models used to extract and consolidate memories."
+    },
+    "advanced": {
+      "title": "Advanced settings",
+      "description": "Tune memory extraction and consolidation limits. These settings are optional."
+    },
     "extraction": {
       "title": "Extraction",
       "description": "Control which completed sessions are eligible for memory extraction."
@@ -16,6 +24,10 @@
     }
   },
   "fields": {
+    "memoryEnabled": {
+      "label": "Memory",
+      "description": "When enabled, memories are generated automatically and used in sessions."
+    },
     "generateMemories": {
       "label": "Generate memories automatically",
       "description": "Extract and consolidate reusable memory from completed local sessions in the background."
@@ -26,7 +38,7 @@
     },
     "generateForBtwSessions": {
       "label": "Generate memories from BTW sessions",
-      "description": "Allow newly created persistent BTW sessions to contribute to global memory. This requires automatic memory generation to be enabled."
+      "description": "Allow BTW sessions to contribute to global memory."
     },
     "externalContextPolicy": {
       "label": "External context handling",
diff --git a/src/web-ui/src/locales/zh-CN/settings/memories.json b/src/web-ui/src/locales/zh-CN/settings/memories.json
index ab1cb7875e..3fc5fcd1d7 100644
--- a/src/web-ui/src/locales/zh-CN/settings/memories.json
+++ b/src/web-ui/src/locales/zh-CN/settings/memories.json
@@ -6,6 +6,14 @@
       "title": "基础",
       "description": "控制是否生成新记忆，以及是否在会话中使用已整理的记忆。"
     },
+    "models": {
+      "title": "模型",
+      "description": "选择用于抽取和整理记忆的模型。"
+    },
+    "advanced": {
+      "title": "高级设置",
+      "description": "调整记忆抽取和整理的限制参数，通常无需修改。"
+    },
     "extraction": {
       "title": "抽取",
       "description": "控制哪些已完成会话会进入记忆抽取。"
@@ -16,6 +24,10 @@
     }
   },
   "fields": {
+    "memoryEnabled": {
+      "label": "记忆",
+      "description": "启用后将自动生成记忆，并在会话中使用记忆。"
+    },
     "generateMemories": {
       "label": "自动生成记忆",
       "description": "后台从已结束的本地会话中抽取并整理可复用记忆。"
@@ -26,7 +38,7 @@
     },
     "generateForBtwSessions": {
       "label": "从 BTW 会话生成记忆",
-      "description": "允许新创建的持久化 BTW 会话贡献全局记忆，需要同时开启自动生成记忆。"
+      "description": "允许 BTW 会话贡献全局记忆。"
     },
     "externalContextPolicy": {
       "label": "外部上下文处理",
diff --git a/src/web-ui/src/locales/zh-TW/settings/memories.json b/src/web-ui/src/locales/zh-TW/settings/memories.json
index 98781c3d61..b49cac7752 100644
--- a/src/web-ui/src/locales/zh-TW/settings/memories.json
+++ b/src/web-ui/src/locales/zh-TW/settings/memories.json
@@ -6,6 +6,14 @@
       "title": "基礎",
       "description": "控制是否生成新記憶，以及是否在會話中使用已整理的記憶。"
     },
+    "models": {
+      "title": "模型",
+      "description": "選擇用於抽取和整理記憶的模型。"
+    },
+    "advanced": {
+      "title": "進階設定",
+      "description": "調整記憶抽取和整理的限制參數，通常無需修改。"
+    },
     "extraction": {
       "title": "抽取",
       "description": "控制哪些已完成會話會進入記憶抽取。"
@@ -16,6 +24,10 @@
     }
   },
   "fields": {
+    "memoryEnabled": {
+      "label": "記憶",
+      "description": "啟用後將自動產生記憶，並在會話中使用記憶。"
+    },
     "generateMemories": {
       "label": "自動生成記憶",
       "description": "後台從已結束的本地會話中抽取並整理可復用記憶。"
@@ -26,7 +38,7 @@
     },
     "generateForBtwSessions": {
       "label": "從 BTW 會話生成記憶",
-      "description": "允許新建立的持久化 BTW 會話貢獻全域記憶，需同時開啟自動生成記憶。"
+      "description": "允許 BTW 會話貢獻全域記憶。"
     },
     "externalContextPolicy": {
       "label": "外部上下文處理",