From 2db12160dfa42e411607267c37f6ad5ab6bd1d2f Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Fri, 24 Jul 2026 18:01:33 +0800
Subject: [PATCH 1/4] feat(ui): consolidate sidebar modules into hubs

---
 apps/desktop/e2e/mcp.spec.ts                  |  32 +++--
 apps/desktop/e2e/scroll-geometry.spec.ts      |   2 +-
 apps/desktop/e2e/session-workbar.spec.ts      |   4 +-
 ...and-palette-plan-reminder-contract.test.ts |   2 +-
 ...aily-review-copy-feedback-contract.test.ts |   2 +-
 .../icon-governance-contract.test.ts          |  10 +-
 .../main/__tests__/navigation-state.test.ts   |  46 ++++++
 .../renderer-lazy-fallback-contract.test.ts   |   4 +-
 ...sion-health-notice-layout-contract.test.ts |   2 +-
 .../session-project-view-contract.test.ts     |  20 +--
 .../src/main/__tests__/shell-copy.test.ts     |   2 +-
 .../sidebar-extensions-tree-contract.test.ts  |  55 --------
 .../sidebar-module-hubs-contract.test.ts      |  43 ++++++
 .../__tests__/sidebar-scroll-contract.test.ts |  12 +-
 .../desktop/src/main/__tests__/skills.test.ts |   2 +-
 .../src/renderer/app-shell-e2e-fixture.ts     |   8 +-
 .../desktop/src/renderer/app-shell-effects.ts |  16 +--
 apps/desktop/src/renderer/app-shell.tsx       |  79 ++++++++---
 .../src/renderer/command-palette-commands.ts  |   8 +-
 apps/desktop/src/renderer/mcp-page.tsx        |  11 +-
 apps/desktop/src/renderer/nav-selection.ts    | 133 ++++++++++++++----
 .../styles/module-pages/module-shell.css      |  10 ++
 apps/desktop/src/renderer/styles/sidebar.css  |  98 +++----------
 apps/desktop/stories/app-shell.stories.tsx    |   5 +-
 apps/desktop/stories/module-hubs.stories.tsx  |  72 ++++++++++
 .../__tests__/sidebar-subtraction.test.tsx    |  91 ++++++++++++
 packages/ui/src/components.tsx                |  10 +-
 packages/ui/src/daily-review-panel.tsx        |   8 +-
 packages/ui/src/module-hub-switch.tsx         |  53 +++++++
 packages/ui/src/module-pages.tsx              |  26 ++--
 packages/ui/src/nav-selection.ts              |  13 +-
 packages/ui/src/plan-reminder-panel.tsx       |   8 +-
 packages/ui/src/session-list-panel.tsx        |  38 +++--
 packages/ui/src/session-sidebar-nav.tsx       |  93 +++---------
 packages/ui/src/shared-ui-copy.ts             |  48 +++++++
 packages/ui/src/shell-controls-copy.ts        |  11 +-
 packages/ui/src/skills-panel.tsx              |  10 +-
 .../ui/stories/interaction-states.stories.tsx |   2 +-
 38 files changed, 715 insertions(+), 374 deletions(-)
 create mode 100644 apps/desktop/src/main/__tests__/navigation-state.test.ts
 delete mode 100644 apps/desktop/src/main/__tests__/sidebar-extensions-tree-contract.test.ts
 create mode 100644 apps/desktop/src/main/__tests__/sidebar-module-hubs-contract.test.ts
 create mode 100644 apps/desktop/stories/module-hubs.stories.tsx
 create mode 100644 packages/ui/src/__tests__/sidebar-subtraction.test.tsx
 create mode 100644 packages/ui/src/module-hub-switch.tsx

diff --git a/apps/desktop/e2e/mcp.spec.ts b/apps/desktop/e2e/mcp.spec.ts
index 6fa8794f58..b79478d6ee 100644
--- a/apps/desktop/e2e/mcp.spec.ts
+++ b/apps/desktop/e2e/mcp.spec.ts
@@ -11,22 +11,26 @@ test('MCP module completes stdio add, discovery, disable, JSON import, and delet
   await page.getByRole('button', { name: '展开侧边栏' }).click();
   const sidebar = page.getByRole('complementary', { name: '对话列表' });
   const extensions = sidebar.getByRole('button', { name: '扩展', exact: true });
-  await expect(extensions).toHaveAttribute('aria-expanded', 'true');
-  await expect(sidebar.getByRole('button', { name: '技能', exact: true })).toBeVisible();
-  await expect(sidebar.getByRole('button', { name: 'MCP', exact: true })).toBeVisible();
+  await expect(sidebar.getByRole('button', { name: '技能', exact: true })).toHaveCount(0);
+  await expect(sidebar.getByRole('button', { name: 'MCP', exact: true })).toHaveCount(0);
   await extensions.click();
-  await expect(extensions).toHaveAttribute('aria-expanded', 'false');
-  await expect(sidebar.getByRole('button', { name: 'MCP', exact: true })).toBeHidden();
-  if (screenshotPath) {
-    await extensions.hover();
-    await page.screenshot({ path: variantPath(screenshotPath, 'extensions-hover') });
-  }
-  await extensions.click();
-  await sidebar.getByRole('button', { name: 'MCP', exact: true }).click();
-  await expect(sidebar.getByRole('group', { name: '会话分组方式' })).toHaveCount(0);
+  await expect(extensions).toHaveAttribute('aria-current', 'page');
+  await expect(sidebar.getByRole('button', { name: '会话分组方式' })).toHaveCount(0);
   await expect(sidebar.locator('.maka-session-list')).toBeVisible();
-  const mcp = page.getByRole('main', { name: 'MCP' });
-  await expect(mcp.getByRole('heading', { name: 'MCP' })).toBeVisible();
+
+  const extensionSwitch = page.getByRole('group', { name: '扩展内容' });
+  await expect(extensionSwitch.getByRole('button', { name: '技能' })).toHaveAttribute('aria-pressed', 'true');
+  await extensionSwitch.getByRole('button', { name: 'MCP' }).click();
+  const mcp = page.getByRole('main', { name: '扩展' });
+  await expect(mcp.getByRole('heading', { name: '扩展' })).toBeVisible();
+  await expect(extensionSwitch.getByRole('button', { name: 'MCP' })).toHaveAttribute('aria-pressed', 'true');
+
+  // Each hub restores its last module when the user returns from another
+  // sidebar destination.
+  await sidebar.getByRole('button', { name: '定时任务', exact: true }).click();
+  await extensions.click();
+  await expect(page.getByRole('main', { name: '扩展' })).toBeVisible();
+  await expect(extensionSwitch.getByRole('button', { name: 'MCP' })).toHaveAttribute('aria-pressed', 'true');
   if (screenshotPath) {
     await page.screenshot({ path: variantPath(screenshotPath, 'market') });
     await page.getByRole('button', { name: '设置', exact: true }).click();
diff --git a/apps/desktop/e2e/scroll-geometry.spec.ts b/apps/desktop/e2e/scroll-geometry.spec.ts
index 3e1bc82735..fb5b74b5ce 100644
--- a/apps/desktop/e2e/scroll-geometry.spec.ts
+++ b/apps/desktop/e2e/scroll-geometry.spec.ts
@@ -150,7 +150,7 @@ test('returning to the session after visiting skills re-settles the new transcri
   // `.maka-turn` node with no remembered size, so the warm-up must walk the
   // NEW DOM. Fixture windows don't pass OS hit-testing — dispatch clicks.
   await page.locator('button[aria-label="展开侧边栏"]').dispatchEvent('click');
-  await page.locator('button[aria-label="技能"]').dispatchEvent('click');
+  await page.locator('button[aria-label="扩展"]').dispatchEvent('click');
   await expect(page.locator('.maka-turn')).toHaveCount(0);
   await page.getByText('超长会话滚动几何').first().dispatchEvent('click');
   await expect(page.locator('.maka-turn')).toHaveCount(24);
diff --git a/apps/desktop/e2e/session-workbar.spec.ts b/apps/desktop/e2e/session-workbar.spec.ts
index 29658bf300..adf535d9f5 100644
--- a/apps/desktop/e2e/session-workbar.spec.ts
+++ b/apps/desktop/e2e/session-workbar.spec.ts
@@ -25,9 +25,9 @@ test('session tools share one user-controlled workbar', async ({ sessionWorkbarW
   expect(narrowLayout.height).toBeLessThanOrEqual(narrowLayout.viewportHeight * 0.42 + 1);
 
   await page.locator('button[aria-label="展开侧边栏"]').dispatchEvent('click');
-  await page.locator('button[aria-label="技能"]').dispatchEvent('click');
+  await page.locator('button[aria-label="扩展"]').dispatchEvent('click');
   await expect(workbar).toBeHidden();
-  await expect(page.getByRole('main', { name: '技能' })).toBeVisible();
+  await expect(page.getByRole('main', { name: '扩展' })).toBeVisible();
 });
 
 test('workbar toggle stays unmounted without an active session', async ({ window: page }) => {
diff --git a/apps/desktop/src/main/__tests__/command-palette-plan-reminder-contract.test.ts b/apps/desktop/src/main/__tests__/command-palette-plan-reminder-contract.test.ts
index cb16b93191..b75e31e160 100644
--- a/apps/desktop/src/main/__tests__/command-palette-plan-reminder-contract.test.ts
+++ b/apps/desktop/src/main/__tests__/command-palette-plan-reminder-contract.test.ts
@@ -26,7 +26,7 @@ describe('command palette plan reminder contract', () => {
     const dialog = await readFile(resolve(REPO_ROOT, 'packages/ui/src/plan-reminder-form-dialog.tsx'), 'utf8');
 
     assert.match(main, /function\s+openPlanReminderForm\(\)/);
-    assert.match(main, /setNavSelection\(\{\s*section:\s*'automations'\s*\}\)/);
+    assert.match(main, /setNavSelection\(\{\s*section:\s*'automations',\s*module:\s*'plan-reminders'\s*\}\)/);
     // #1045: run() reads openPlanReminderForm from the live options ref.
     assert.match(main, /onStartPlanReminder:\s*\(\)\s*=>\s*optionsRef\.current\.openPlanReminderForm\(\)/);
     assert.match(main, /querySelector<HTMLInputElement>\('\[data-maka-plan-title-input="true"\]'\)/);
diff --git a/apps/desktop/src/main/__tests__/daily-review-copy-feedback-contract.test.ts b/apps/desktop/src/main/__tests__/daily-review-copy-feedback-contract.test.ts
index 409079db08..34434d0610 100644
--- a/apps/desktop/src/main/__tests__/daily-review-copy-feedback-contract.test.ts
+++ b/apps/desktop/src/main/__tests__/daily-review-copy-feedback-contract.test.ts
@@ -36,7 +36,7 @@ describe('Daily Review copy feedback contract', () => {
     assert.match(main, /async function copyDailyReviewMarkdown\([\s\S]*?await navigator\.clipboard\.writeText\(input\.markdown\)/);
     assert.match(
       main,
-      /function isDailyReviewSurfaceActive\(\): boolean \{[\s\S]*return navSelectionRef\.current\.section === 'daily-review';[\s\S]*\}/,
+      /function isDailyReviewSurfaceActive\(\): boolean \{[\s\S]*return navSelectionRef\.current\.section === 'automations' && navSelectionRef\.current\.module === 'daily-review';[\s\S]*\}/,
       'Daily Review action feedback must be owned by the active Daily Review surface',
     );
     assert.match(
diff --git a/apps/desktop/src/main/__tests__/icon-governance-contract.test.ts b/apps/desktop/src/main/__tests__/icon-governance-contract.test.ts
index aa29b963ed..550608320a 100644
--- a/apps/desktop/src/main/__tests__/icon-governance-contract.test.ts
+++ b/apps/desktop/src/main/__tests__/icon-governance-contract.test.ts
@@ -208,12 +208,10 @@ describe('icon + typography governance contract', () => {
       .map((name) => name.trim())
       .filter(Boolean)
       .sort();
-    // Decided semantic mapping (maintainer 2026-07-10: 新任务 matches the
-    // collapsed-topbar compose icon): 新任务 → SquarePen, 每日回顾 → CalendarCheck,
-    // 扩展 → Blocks/ChevronDown, 定时任务 → Timer, 设置 → Settings. The
-    // expanded tree uses text-only children so Skills and MCP read as one
-    // nested branch instead of a second row of primary navigation icons.
-    const expected = ['Blocks', 'CalendarCheck', 'ChevronDown', 'ChevronRight', 'Settings', 'SquarePen', 'Timer'];
+    // Hub-level mapping: 新任务 → SquarePen, 扩展 → Blocks,
+    // 定时任务 → Timer, 设置 → Settings. Skills/MCP and Plan reminders/
+    // Daily review switch inside their main surfaces, not in sidebar rows.
+    const expected = ['Blocks', 'Settings', 'SquarePen', 'Timer'];
     assert.deepEqual(
       imported,
       expected,
diff --git a/apps/desktop/src/main/__tests__/navigation-state.test.ts b/apps/desktop/src/main/__tests__/navigation-state.test.ts
new file mode 100644
index 0000000000..9fa5451e9a
--- /dev/null
+++ b/apps/desktop/src/main/__tests__/navigation-state.test.ts
@@ -0,0 +1,46 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+import { parseNavigationState, selectNavigation } from '../../renderer/nav-selection.js';
+
+describe('sidebar navigation state', () => {
+  it('migrates legacy module destinations into their hub tabs', () => {
+    assert.deepEqual(parseNavigationState(JSON.stringify({ section: 'skills' })), {
+      selection: { section: 'extensions', module: 'skills' },
+      moduleMemory: { extensions: 'skills', automations: 'plan-reminders' },
+    });
+    assert.deepEqual(parseNavigationState(JSON.stringify({ section: 'mcp' })), {
+      selection: { section: 'extensions', module: 'mcp' },
+      moduleMemory: { extensions: 'mcp', automations: 'plan-reminders' },
+    });
+    assert.deepEqual(parseNavigationState(JSON.stringify({ section: 'daily-review' })), {
+      selection: { section: 'automations', module: 'daily-review' },
+      moduleMemory: { extensions: 'skills', automations: 'daily-review' },
+    });
+    assert.deepEqual(parseNavigationState(JSON.stringify({ section: 'automations' })), {
+      selection: { section: 'automations', module: 'plan-reminders' },
+      moduleMemory: { extensions: 'skills', automations: 'plan-reminders' },
+    });
+  });
+
+  it('remembers each hub tab while navigating elsewhere', () => {
+    const initial = parseNavigationState(null);
+    const mcp = selectNavigation(initial, { section: 'extensions', module: 'mcp' });
+    const dailyReview = selectNavigation(mcp, { section: 'automations', module: 'daily-review' });
+    const sessions = selectNavigation(dailyReview, { section: 'sessions', filter: 'chats' });
+
+    assert.deepEqual(sessions, {
+      selection: { section: 'sessions', filter: 'chats' },
+      moduleMemory: { extensions: 'mcp', automations: 'daily-review' },
+    });
+  });
+
+  it('restores persisted tab memory independently of the active destination', () => {
+    assert.deepEqual(parseNavigationState(JSON.stringify({
+      selection: { section: 'sessions', filter: 'chats' },
+      moduleMemory: { extensions: 'mcp', automations: 'daily-review' },
+    })), {
+      selection: { section: 'sessions', filter: 'chats' },
+      moduleMemory: { extensions: 'mcp', automations: 'daily-review' },
+    });
+  });
+});
diff --git a/apps/desktop/src/main/__tests__/renderer-lazy-fallback-contract.test.ts b/apps/desktop/src/main/__tests__/renderer-lazy-fallback-contract.test.ts
index fdc0728c16..c799e730f7 100644
--- a/apps/desktop/src/main/__tests__/renderer-lazy-fallback-contract.test.ts
+++ b/apps/desktop/src/main/__tests__/renderer-lazy-fallback-contract.test.ts
@@ -38,8 +38,8 @@ describe('renderer lazy fallback contract', () => {
 
     assert.match(modulePages, /function ModulePageFallback/, 'whole-page modules must reserve a module loading shell');
     assert.match(modulePages, /function ModulePanelFallback/, 'daily review content must reserve a panel loading shell');
-    assert.match(modulePages, /<Suspense fallback=\{<ModulePageFallback label=\{copy\.skills\} message=\{copy\.loadingSkills\} \/>\}>/);
-    assert.match(modulePages, /<Suspense fallback=\{<ModulePageFallback label=\{copy\.automations\} message=\{copy\.loadingAutomations\} \/>\}>/);
+    assert.match(modulePages, /<Suspense fallback=\{<ModulePageFallback label=\{props\.hubHeader\?\.title \?\? copy\.skills\} message=\{copy\.loadingSkills\} \/>\}>/);
+    assert.match(modulePages, /<Suspense fallback=\{<ModulePageFallback label=\{props\.hubHeader\?\.title \?\? copy\.automations\} message=\{copy\.loadingAutomations\} \/>\}>/);
     assert.match(modulePages, /<Suspense fallback=\{<ModulePanelFallback message=\{copy\.loadingDailyReview\} \/>\}>/);
     assert.doesNotMatch(modulePages, /<Suspense fallback=\{null\}>/);
   });
diff --git a/apps/desktop/src/main/__tests__/session-health-notice-layout-contract.test.ts b/apps/desktop/src/main/__tests__/session-health-notice-layout-contract.test.ts
index ce22352301..af3b133c80 100644
--- a/apps/desktop/src/main/__tests__/session-health-notice-layout-contract.test.ts
+++ b/apps/desktop/src/main/__tests__/session-health-notice-layout-contract.test.ts
@@ -40,7 +40,7 @@ describe('session health notice layout contract (#1032)', () => {
     );
     assert.match(
       shell,
-      /navSelection\.section === 'daily-review' \?[\s\S]*<ChatMessageSurface/,
+      /navSelection\.section === 'automations' && navSelection\.module === 'daily-review' \?[\s\S]*<ChatMessageSurface/,
       'the message surface must stay on the conversation surface, not Skills/Automations/Daily Review',
     );
     assert.match(
diff --git a/apps/desktop/src/main/__tests__/session-project-view-contract.test.ts b/apps/desktop/src/main/__tests__/session-project-view-contract.test.ts
index fa73436122..98594c10d0 100644
--- a/apps/desktop/src/main/__tests__/session-project-view-contract.test.ts
+++ b/apps/desktop/src/main/__tests__/session-project-view-contract.test.ts
@@ -46,16 +46,16 @@ describe('sidebar project view mode', () => {
     assert.match(fallbackMarkup, /待发送/);
   });
 
-  it('renders the status/project view mode controls as a pressed segmented control', () => {
-    // #571 routes the toggle through the shared Segmented primitive,
-    // whose <button> carries aria-pressed and puts the label inline (no <span>).
-    const statusMarkup = renderSessionListPanel({ viewMode: 'status' });
-    assert.match(statusMarkup, /<button[^>]*aria-pressed="true"[^>]*>按状态/);
-    assert.match(statusMarkup, /<button[^>]*aria-pressed="false"[^>]*>按项目/);
-
-    const projectMarkup = renderSessionListPanel({ viewMode: 'project' });
-    assert.match(projectMarkup, /<button[^>]*aria-pressed="false"[^>]*>按状态/);
-    assert.match(projectMarkup, /<button[^>]*aria-pressed="true"[^>]*>按项目/);
+  it('moves the status/project controls into the session-list heading menu', async () => {
+    const markup = renderSessionListPanel({ viewMode: 'status' });
+    const panel = await readRepo('packages/ui/src/session-list-panel.tsx');
+
+    assert.match(markup, /class="maka-session-list-heading"[^>]*>会话/);
+    assert.match(markup, /aria-label="会话分组方式"/);
+    assert.doesNotMatch(markup, />按状态|>按项目/);
+    assert.match(panel, /<MenuRadioGroup value=\{viewMode\}/);
+    assert.match(panel, /<MenuRadioItem value="status">\{copy\.groupByStatus\}/);
+    assert.match(panel, /<MenuRadioItem value="project">\{copy\.groupByProject\}/);
   });
 
   it('renders project groups as folder headers with an initial four-session preview', () => {
diff --git a/apps/desktop/src/main/__tests__/shell-copy.test.ts b/apps/desktop/src/main/__tests__/shell-copy.test.ts
index 3b96c48dba..a10b250e9f 100644
--- a/apps/desktop/src/main/__tests__/shell-copy.test.ts
+++ b/apps/desktop/src/main/__tests__/shell-copy.test.ts
@@ -43,7 +43,7 @@ describe('shell copy catalog', () => {
     const mcpCommand = commands.find((command) => command.id === 'nav:mcp');
     assert.equal(mcpCommand?.label, 'Open · MCP');
     mcpCommand?.run();
-    assert.deepEqual(selectedModule, { section: 'mcp' });
+    assert.deepEqual(selectedModule, { section: 'extensions', module: 'mcp' });
 
     const sessionCommands = buildSessionCommands({
       locale: 'en',
diff --git a/apps/desktop/src/main/__tests__/sidebar-extensions-tree-contract.test.ts b/apps/desktop/src/main/__tests__/sidebar-extensions-tree-contract.test.ts
deleted file mode 100644
index 4d1d1060bf..0000000000
--- a/apps/desktop/src/main/__tests__/sidebar-extensions-tree-contract.test.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { readFile } from 'node:fs/promises';
-import { resolve } from 'node:path';
-import { describe, it } from 'node:test';
-import { readRendererContractCss } from './contract-css-helpers.js';
-
-const repoRoot = resolve(process.cwd(), '..', '..');
-
-describe('sidebar extensions tree contract', () => {
-  it('renders Extensions as a disclosure with only Skills and MCP children', async () => {
-    const source = await readFile(
-      resolve(repoRoot, 'packages/ui/src/session-sidebar-nav.tsx'),
-      'utf8',
-    );
-
-    assert.match(source, /aria-expanded=\{extensionsOpen\}/);
-    assert.match(source, /aria-controls=\{extensionsTreeId\}/);
-    assert.match(source, /className="maka-sidebar-nav-tree"/);
-    assert.match(source, /hidden=\{!extensionsOpen\}/);
-    assert.match(source, /maka-nav-extension-hover-icon/);
-    assert.match(source, /moduleNavLabel\.skills/);
-    assert.match(source, /moduleNavLabel\.mcp/);
-    assert.doesNotMatch(source, /专家套件|连接器/);
-  });
-
-  it('uses a hairline tree guide and an expanded state surface', async () => {
-    const css = await readRendererContractCss();
-
-    assert.match(
-      css,
-      /\.maka-nav-extension-toggle\[data-expanded="true"\]\s*\{[^}]*background:\s*var\(--state-selected-bg\)/s,
-    );
-    assert.match(
-      css,
-      /\.maka-sidebar-nav-tree\s*\{[^}]*border-left:\s*var\(--border-width-hairline\)\s+solid\s+var\(--border\)/s,
-    );
-    assert.match(
-      css,
-      /\.maka-nav-extension-toggle:not\(\[data-expanded="true"\]\):is\(:hover, :focus-visible\) \.maka-nav-extension-hover-icon/s,
-    );
-  });
-
-  it('hides only session grouping on module pages and preserves history', async () => {
-    const source = await readFile(
-      resolve(repoRoot, 'packages/ui/src/session-list-panel.tsx'),
-      'utf8',
-    );
-
-    assert.match(source, /showSessionNavigation\s*=\s*props\.selection\.section\s*===\s*'sessions'/);
-    assert.match(source, /showSessionNavigation\s*&&\s*onViewModeChange/);
-    assert.match(source, /<SessionHistoryList/);
-    assert.doesNotMatch(source, /showSessionNavigation\s*\?\s*\(\s*<SessionHistoryList/s);
-    assert.match(source, /data-content=\{showSessionNavigation\s*\?\s*'sessions'\s*:\s*'module'\}/);
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/sidebar-module-hubs-contract.test.ts b/apps/desktop/src/main/__tests__/sidebar-module-hubs-contract.test.ts
new file mode 100644
index 0000000000..92de93044c
--- /dev/null
+++ b/apps/desktop/src/main/__tests__/sidebar-module-hubs-contract.test.ts
@@ -0,0 +1,43 @@
+import { strict as assert } from 'node:assert';
+import { readFile } from 'node:fs/promises';
+import { resolve } from 'node:path';
+import { describe, it } from 'node:test';
+
+const repoRoot = resolve(process.cwd(), '..', '..');
+
+async function readSource(path: string): Promise<string> {
+  return readFile(resolve(repoRoot, path), 'utf8');
+}
+
+describe('sidebar module hubs contract', () => {
+  it('renders Extensions as one destination that restores its remembered module', async () => {
+    const source = await readSource('packages/ui/src/session-sidebar-nav.tsx');
+
+    assert.match(
+      source,
+      /props\.onSelect\(\{ section: 'extensions', module: moduleMemory\.extensions \}\)/,
+    );
+    assert.doesNotMatch(source, /aria-expanded=|maka-sidebar-nav-tree|moduleNavLabel\.skills|moduleNavLabel\.mcp/);
+  });
+
+  it('projects both hubs through one localized title switch without parallel legacy pages', async () => {
+    const shell = await readSource('apps/desktop/src/renderer/app-shell.tsx');
+
+    assert.match(shell, /<ModuleHubSwitch[\s\S]*hub="extensions"[\s\S]*hub="automations"/);
+    assert.match(shell, /<SkillsPage[\s\S]*hubHeader=\{extensionsHubHeader\}/);
+    assert.match(shell, /<McpPage hubHeader=\{extensionsHubHeader\}/);
+    assert.match(shell, /<AutomationsPage[\s\S]*hubHeader=\{automationsHubHeader\}/);
+    assert.match(shell, /<DailyReviewPage[\s\S]*hubHeader=\{automationsHubHeader\}/);
+    assert.doesNotMatch(shell, /navSelection\.section === '(?:skills|mcp|daily-review)'/);
+  });
+
+  it('hides only session grouping on module pages and preserves history', async () => {
+    const source = await readSource('packages/ui/src/session-list-panel.tsx');
+
+    assert.match(source, /showSessionNavigation\s*=\s*props\.selection\.section\s*===\s*'sessions'/);
+    assert.match(source, /showSessionNavigation\s*&&\s*onViewModeChange/);
+    assert.match(source, /<SessionHistoryList/);
+    assert.doesNotMatch(source, /showSessionNavigation\s*\?\s*\(\s*<SessionHistoryList/s);
+    assert.match(source, /data-content=\{showSessionNavigation\s*\?\s*'sessions'\s*:\s*'module'\}/);
+  });
+});
diff --git a/apps/desktop/src/main/__tests__/sidebar-scroll-contract.test.ts b/apps/desktop/src/main/__tests__/sidebar-scroll-contract.test.ts
index e865634e04..a4c01ae5dc 100644
--- a/apps/desktop/src/main/__tests__/sidebar-scroll-contract.test.ts
+++ b/apps/desktop/src/main/__tests__/sidebar-scroll-contract.test.ts
@@ -107,21 +107,21 @@ describe('sidebar session list CSS scroll contract (PR-SIDEBAR-IA-0 Phase 1)', (
     );
   });
 
-  it('.maka-session-panel reserves explicit rows for header, nav, view toggle, list, and footer', async () => {
+  it('.maka-session-panel reserves explicit rows for header, nav, session heading, list, and footer', async () => {
     const css = await readRendererContractCss();
     const ruleBody = extractRuleBody(css, '.maka-session-panel');
     assert.ok(ruleBody, '.maka-session-panel rule must exist');
     assert.match(
       ruleBody,
       /grid-template-rows:\s*auto\s+auto\s+auto\s+minmax\(\s*0\s*,\s*1fr\s*\)\s+auto/,
-      'sidebar panel must keep the view-mode toggle in its own row above the constrained session list',
+      'sidebar panel must keep the session heading in its own row above the constrained session list',
     );
   });
 
-  it('.maka-session-panel[data-collapsed="true"] uses a 4-row grid because the view toggle is hidden', async () => {
-    // Collapsed rail sets the view-mode toggle to display:none. A display:none
+  it('.maka-session-panel[data-collapsed="true"] uses a 4-row grid because the session heading is hidden', async () => {
+    // Collapsed rail sets the session heading row to display:none. A display:none
     // item does NOT participate in grid layout, so the collapsed panel must not
-    // keep a 5th row reserved for the toggle — otherwise the footer drops into
+    // keep a 5th row reserved for it — otherwise the footer drops into
     // the minmax(0, 1fr) track and the settings button floats mid-panel.
     const css = await readRendererContractCss();
     const ruleBody = extractRuleBody(css, '.maka-session-panel[data-collapsed="true"]');
@@ -129,7 +129,7 @@ describe('sidebar session list CSS scroll contract (PR-SIDEBAR-IA-0 Phase 1)', (
     assert.match(
       ruleBody,
       /grid-template-rows:\s*auto\s+auto\s+minmax\(\s*0\s*,\s*1fr\s*\)\s+auto/,
-      'collapsed panel must use a 4-row grid: the hidden view toggle must not reserve a 5th track',
+      'collapsed panel must use a 4-row grid: the hidden session heading must not reserve a 5th track',
     );
   });
 
diff --git a/apps/desktop/src/main/__tests__/skills.test.ts b/apps/desktop/src/main/__tests__/skills.test.ts
index 53f52b08ca..b206e21017 100644
--- a/apps/desktop/src/main/__tests__/skills.test.ts
+++ b/apps/desktop/src/main/__tests__/skills.test.ts
@@ -1656,7 +1656,7 @@ description: Exercise workspace-contained open paths.
 
     assert.match(
       renderer,
-      /function isSkillsSurfaceActive\(\): boolean \{[\s\S]*return navSelectionRef\.current\.section === 'skills';[\s\S]*\}/,
+      /function isSkillsSurfaceActive\(\): boolean \{[\s\S]*return navSelectionRef\.current\.section === 'extensions' && navSelectionRef\.current\.module === 'skills';[\s\S]*\}/,
       'Skills feedback must be owned by the current Skills surface',
     );
     assert.match(
diff --git a/apps/desktop/src/renderer/app-shell-e2e-fixture.ts b/apps/desktop/src/renderer/app-shell-e2e-fixture.ts
index 0497a18504..7f812dc7fb 100644
--- a/apps/desktop/src/renderer/app-shell-e2e-fixture.ts
+++ b/apps/desktop/src/renderer/app-shell-e2e-fixture.ts
@@ -149,13 +149,13 @@ export function createAppShellE2eFixtureActions(options: {
       openPalette();
     }
     if (state.sidebarSection === 'automations') {
-      setNavSelection({ section: 'automations' });
+      setNavSelection({ section: 'automations', module: 'plan-reminders' });
     } else if (state.sidebarSection === 'skills') {
-      setNavSelection({ section: 'skills' });
+      setNavSelection({ section: 'extensions', module: 'skills' });
     } else if (state.sidebarSection === 'mcp') {
-      setNavSelection({ section: 'mcp' });
+      setNavSelection({ section: 'extensions', module: 'mcp' });
     } else if (state.sidebarSection === 'daily-review') {
-      setNavSelection({ section: 'daily-review' });
+      setNavSelection({ section: 'automations', module: 'daily-review' });
     } else if (state.sidebarSection === 'sessions') {
       setNavSelection({ section: 'sessions', filter: 'chats' });
     }
diff --git a/apps/desktop/src/renderer/app-shell-effects.ts b/apps/desktop/src/renderer/app-shell-effects.ts
index 9ff99b0416..70796ef2ac 100644
--- a/apps/desktop/src/renderer/app-shell-effects.ts
+++ b/apps/desktop/src/renderer/app-shell-effects.ts
@@ -17,6 +17,7 @@ import { getDesktopConversationCopy } from './locales/conversation-copy.js';
 import { getShellRemainingCopy } from './locales/shell-remaining-copy.js';
 import { applyTheme, applyThemePalette } from './theme';
 import { safeLocalStorageSet } from './browser-storage';
+import type { NavigationState } from './nav-selection.js';
 import {
   createSessionEventStreamSubscription,
   evaluateSessionEventStreamSnapshot,
@@ -103,7 +104,7 @@ export function useAppShellHostEffects(options: {
 }
 
 export function useAppShellPersistenceEffects(options: {
-  navSelection: NavSelection;
+  navigationState: NavigationState;
   sessionListCollapsed: boolean;
   sessionListWidth: number;
   workbarCollapsed: boolean;
@@ -162,13 +163,12 @@ export function useAppShellPersistenceEffects(options: {
     safeLocalStorageSet('maka-session-workbar-tab-v1', options.workbarTab);
   }, [options.workbarTab]);
 
-  // Persist sidebar nav selection so the app remembers what bucket the user
-  // had open (Chats / Pinned / Archived / Skills) across restarts. Strict
-  // localStorage availability check — Vite dev sometimes runs through a
-  // worker where it isn't defined.
+  // Persist the active destination and each hub's last selected module.
+  // Strict localStorage availability check — Vite dev sometimes runs through
+  // a worker where it isn't defined.
   useEffect(() => {
-    safeLocalStorageSet('maka-nav-selection-v1', JSON.stringify(options.navSelection));
-  }, [options.navSelection]);
+    safeLocalStorageSet('maka-nav-selection-v1', JSON.stringify(options.navigationState));
+  }, [options.navigationState]);
 }
 
 export function useAppShellBootstrapSubscriptions(options: {
@@ -267,7 +267,7 @@ export function useAppShellBootstrapSubscriptions(options: {
       duration: 8000,
       action: {
         label: copy.viewScheduledTasks,
-        onClick: () => options.setNavSelection({ section: 'automations' }),
+        onClick: () => options.setNavSelection({ section: 'automations', module: 'plan-reminders' }),
       },
     });
   });
diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index 0517d4ad54..9929a00b69 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -35,6 +35,7 @@ import {
   type MakaUriDest,
   MakaUriContext,
   LocaleProvider,
+  ModuleHubSwitch,
   ToastProvider,
   type NavSelection,
   SessionListPanel,
@@ -43,6 +44,7 @@ import {
   type TurnFooterActionMeta,
   useToast,
   activeInteractionFor,
+  getSharedUiCopy,
 } from '@maka/ui';
 import { useKeyboardHelp } from './keyboard-help';
 import { useCommandPalette } from './command-palette';
@@ -71,7 +73,7 @@ import { deriveSessionStatusGroups } from './session-status-grouping';
 import { deriveAppShellTurnViewModel } from './app-shell-turn-view-model';
 import { readScrollMotionBehavior } from './scroll-motion-policy';
 import { deriveBranchBanner } from './branch-banner';
-import { readNavSelection } from './nav-selection';
+import { readNavigationState, selectNavigation } from './nav-selection';
 import { sessionMatchesNavSelection } from './session-nav-filter';
 import { deriveSessionRevisionNavigation } from './session-revisions';
 import {
@@ -243,7 +245,14 @@ function AppShellContent({
   // P3: session ids with a live embedded-browser view. The right-side
   // BrowserPanel mounts only for these, so ordinary chats reserve no space.
   const [liveBrowserSessionIds, setLiveBrowserSessionIds] = useState<string[]>([]);
-  const [navSelection, setNavSelection] = useState<NavSelection>(() => readNavSelection());
+  const [navigationState, setNavigationState] = useState(() => readNavigationState());
+  const navSelection = navigationState.selection;
+  const setNavSelection = useCallback<Dispatch<SetStateAction<NavSelection>>>((nextSelection) => {
+    setNavigationState((current) => selectNavigation(
+      current,
+      typeof nextSelection === 'function' ? nextSelection(current.selection) : nextSelection,
+    ));
+  }, []);
   const navSelectionRef = useRef<NavSelection>(navSelection);
   const {
     messageLoadErrorBySession,
@@ -301,6 +310,29 @@ function AppShellContent({
     setUiLocalePreference,
   });
   const shellCopy = getShellCopy(uiLocale).app;
+  const moduleHubCopy = getSharedUiCopy(uiLocale).moduleHubs;
+  const extensionsHubHeader = {
+    title: moduleHubCopy.extensions.title,
+    subtitle: moduleHubCopy.extensions.description,
+    badge: (
+      <ModuleHubSwitch
+        hub="extensions"
+        value={navSelection.section === 'extensions' ? navSelection.module : navigationState.moduleMemory.extensions}
+        onChange={(module) => setNavSelection({ section: 'extensions', module })}
+      />
+    ),
+  };
+  const automationsHubHeader = {
+    title: moduleHubCopy.automations.title,
+    subtitle: moduleHubCopy.automations.description,
+    badge: (
+      <ModuleHubSwitch
+        hub="automations"
+        value={navSelection.section === 'automations' ? navSelection.module : navigationState.moduleMemory.automations}
+        onChange={(module) => setNavSelection({ section: 'automations', module })}
+      />
+    ),
+  };
   // Persisted composer defaults seed the empty-state model, project path, and
   // recent workspace history so the home view is populated before the async
   // `app:info` round-trip completes on mount.
@@ -957,15 +989,15 @@ function AppShellContent({
   }, [quotePanel, workbarCollapsed, activeId]);
 
   function isAutomationsSurfaceActive(): boolean {
-    return navSelectionRef.current.section === 'automations';
+    return navSelectionRef.current.section === 'automations' && navSelectionRef.current.module === 'plan-reminders';
   }
 
   function isSkillsSurfaceActive(): boolean {
-    return navSelectionRef.current.section === 'skills';
+    return navSelectionRef.current.section === 'extensions' && navSelectionRef.current.module === 'skills';
   }
 
   function isDailyReviewSurfaceActive(): boolean {
-    return navSelectionRef.current.section === 'daily-review';
+    return navSelectionRef.current.section === 'automations' && navSelectionRef.current.module === 'daily-review';
   }
 
   const {
@@ -1347,7 +1379,7 @@ function AppShellContent({
     toastApi,
   });
   useAppShellPersistenceEffects({
-    navSelection,
+    navigationState,
     sessionListCollapsed,
     sessionListWidth,
     workbarCollapsed,
@@ -1433,7 +1465,7 @@ function AppShellContent({
   }
 
   function openPlanReminderForm() {
-    setNavSelection({ section: 'automations' });
+    setNavSelection({ section: 'automations', module: 'plan-reminders' });
     closePalette();
     window.requestAnimationFrame(() => {
       document.querySelector<HTMLInputElement>('[data-maka-plan-title-input="true"]')?.focus({ preventScroll: false });
@@ -1600,6 +1632,7 @@ function AppShellContent({
             onViewModeChange={setViewMode}
             statusGroups={sessionListGroups}
             childSessionsByParentId={visibleSessionTree.childrenByParentId}
+            moduleMemory={navigationState.moduleMemory}
             onSelect={setNavSelection}
             onSelectSession={sessionListSelectSession}
             onOpenSettings={openSettings}
@@ -1626,14 +1659,10 @@ function AppShellContent({
           data-sidebar-state={sessionListCollapsed ? 'collapsed' : 'expanded'}
           data-agents-view={
             navSelection.section === 'automations'
-              ? 'cron'
-              : navSelection.section === 'skills'
-                ? 'skills'
-                : navSelection.section === 'mcp'
-                  ? 'mcp'
-                : navSelection.section === 'sessions'
-                  ? 'im_hub'
-                  : navSelection.section
+              ? navSelection.module === 'daily-review' ? 'daily-review' : 'cron'
+              : navSelection.section === 'extensions'
+                ? navSelection.module
+                : 'im_hub'
           }
         >
           <AppShellWorkspaceTopActions
@@ -1656,8 +1685,9 @@ function AppShellContent({
           <MakaUriContext.Provider value={dispatchMakaUri}>
           <div className="maka-detail-with-artifacts">
             <div className="mainColumn" data-home-surface={homeSurfaceActive ? 'true' : undefined}>
-              {navSelection.section === 'skills' ? (
+              {navSelection.section === 'extensions' && navSelection.module === 'skills' ? (
                 <SkillsPage
+                  hubHeader={extensionsHubHeader}
                   skills={skills}
                   planReminders={planReminders}
                   onRefreshSkills={() => refreshSkills()}
@@ -1678,10 +1708,11 @@ function AppShellContent({
                   onSetSkillPinned={(skillRef, pinned) => setSkillPinned(skillRef, pinned)}
                   onDeleteSkill={(skillId) => deleteSkill(skillId)}
                 />
-              ) : navSelection.section === 'mcp' ? (
-                <McpPage />
-              ) : navSelection.section === 'automations' ? (
+              ) : navSelection.section === 'extensions' && navSelection.module === 'mcp' ? (
+                <McpPage hubHeader={extensionsHubHeader} />
+              ) : navSelection.section === 'automations' && navSelection.module === 'plan-reminders' ? (
                 <AutomationsPage
+                  hubHeader={automationsHubHeader}
                   skills={skills}
                   reminders={planReminders}
                   keepSystemAwake={
@@ -1707,8 +1738,9 @@ function AppShellContent({
                   onClearRunHistory={(id) => clearPlanReminderRunHistory(id)}
                   onDelete={(id) => deletePlanReminder(id)}
                 />
-              ) : navSelection.section === 'daily-review' ? (
+              ) : navSelection.section === 'automations' && navSelection.module === 'daily-review' ? (
                 <DailyReviewPage
+                  hubHeader={automationsHubHeader}
                   bridge={dailyReviewBridge}
                   onSelectSession={openSessionInChat}
                   onCopyMarkdown={(input) => copyDailyReviewMarkdown(input, { shouldShowFeedback: isDailyReviewSurfaceActive })}
@@ -1845,7 +1877,10 @@ function AppShellContent({
                 }}
                 onOpenSettingsSection={(section) => openSettingsSection(section)}
                 onOpenSidebarModule={(target) => {
-                  setNavSelection({ section: target });
+                  setNavSelection({
+                    section: 'automations',
+                    module: target === 'daily-review' ? 'daily-review' : 'plan-reminders',
+                  });
                 }}
                 onStartPlanReminder={openPlanReminderForm}
                 conversationItems={planConversationItems}
@@ -2064,7 +2099,7 @@ function AppShellContent({
         settingsCreateProviderType={settingsCreateProviderType}
         onOpenDailyReview={() => {
           closeSettings();
-          setNavSelection({ section: 'daily-review' });
+          setNavSelection({ section: 'automations', module: 'daily-review' });
         }}
         onOpenSettingsSession={(sessionId) => {
           closeSettings();
diff --git a/apps/desktop/src/renderer/command-palette-commands.ts b/apps/desktop/src/renderer/command-palette-commands.ts
index 0c3c691b47..78198b6d42 100644
--- a/apps/desktop/src/renderer/command-palette-commands.ts
+++ b/apps/desktop/src/renderer/command-palette-commands.ts
@@ -238,7 +238,7 @@ export function buildCommandList(args: {
       ...staticCopy('nav:automations'),
       Icon: Clock,
       keywords: [...copy.staticKeywords['nav:automations']],
-      run: () => select({ section: 'automations' }),
+      run: () => select({ section: 'automations', module: 'plan-reminders' }),
     });
     cmds.push({
       id: 'nav:skills',
@@ -246,7 +246,7 @@ export function buildCommandList(args: {
       ...staticCopy('nav:skills'),
       Icon: Blocks,
       keywords: [...copy.staticKeywords['nav:skills']],
-      run: () => select({ section: 'skills' }),
+      run: () => select({ section: 'extensions', module: 'skills' }),
     });
     cmds.push({
       id: 'nav:mcp',
@@ -254,7 +254,7 @@ export function buildCommandList(args: {
       ...staticCopy('nav:mcp'),
       Icon: Plug,
       keywords: [...copy.staticKeywords['nav:mcp']],
-      run: () => select({ section: 'mcp' }),
+      run: () => select({ section: 'extensions', module: 'mcp' }),
     });
     cmds.push({
       id: 'nav:daily-review',
@@ -262,7 +262,7 @@ export function buildCommandList(args: {
       ...staticCopy('nav:daily-review'),
       Icon: CalendarDays,
       keywords: [...copy.staticKeywords['nav:daily-review']],
-      run: () => select({ section: 'daily-review' }),
+      run: () => select({ section: 'automations', module: 'daily-review' }),
     });
   }
 
diff --git a/apps/desktop/src/renderer/mcp-page.tsx b/apps/desktop/src/renderer/mcp-page.tsx
index bb8a5457cc..96d6bcb7e2 100644
--- a/apps/desktop/src/renderer/mcp-page.tsx
+++ b/apps/desktop/src/renderer/mcp-page.tsx
@@ -13,6 +13,7 @@ import {
   InputGroupAddon,
   InputGroupInput,
   PageHeader,
+  type ModuleHubHeader,
   SettingsSwitch as Switch,
   TabsList,
   TabsPanel,
@@ -65,7 +66,7 @@ const MIN_INSTALL_INDICATOR_MS = 500;
 
 type InstallPhase = 'installing' | 'cancelling';
 
-export function McpPage() {
+export function McpPage(props: { hubHeader?: ModuleHubHeader }) {
   const locale = useUiLocale();
   const copy = getMcpCopy(locale);
   const catalog = getMcpCatalog(locale);
@@ -263,12 +264,14 @@ export function McpPage() {
   }
 
   return (
-    <main className="maka-main detailPane maka-module-main maka-mcp-page agents-chat-panel" data-module="mcp" aria-label="MCP">
+    <main className="maka-main detailPane maka-module-main maka-mcp-page agents-chat-panel" data-module="mcp" aria-label={props.hubHeader?.title ?? 'MCP'}>
       <PageHeader
         className="maka-module-main-header"
         as="h2"
-        title="MCP"
-        subtitle={copy.page.subtitle}
+        title={props.hubHeader?.title ?? 'MCP'}
+        subtitle={props.hubHeader?.subtitle ?? copy.page.subtitle}
+        badge={props.hubHeader?.badge}
+        headingRowClassName={props.hubHeader ? 'maka-module-hub-heading' : undefined}
         actions={
           <div className="maka-module-main-actions" role="group" aria-label={copy.page.actionsAria}>
             <Button variant="secondary" onClick={() => void reload()} disabled={busy === 'load'}>
diff --git a/apps/desktop/src/renderer/nav-selection.ts b/apps/desktop/src/renderer/nav-selection.ts
index 8e30d352ab..2034d3fc67 100644
--- a/apps/desktop/src/renderer/nav-selection.ts
+++ b/apps/desktop/src/renderer/nav-selection.ts
@@ -1,30 +1,113 @@
-import type { NavSelection } from '@maka/ui';
-import { safeLocalStorageGet } from './browser-storage';
+import type {
+  AutomationModule,
+  ExtensionModule,
+  NavModuleMemory,
+  NavSelection,
+  SessionFilter,
+} from '@maka/ui';
+import { safeLocalStorageGet } from './browser-storage.js';
 
-export function readNavSelection(): NavSelection {
+export type NavigationState = {
+  selection: NavSelection;
+  moduleMemory: NavModuleMemory;
+};
+
+const DEFAULT_MODULE_MEMORY: NavModuleMemory = {
+  extensions: 'skills',
+  automations: 'plan-reminders',
+};
+
+function defaultNavigationState(): NavigationState {
+  return {
+    selection: { section: 'sessions', filter: 'chats' },
+    moduleMemory: { ...DEFAULT_MODULE_MEMORY },
+  };
+}
+
+function isSessionFilter(value: unknown): value is SessionFilter {
+  return value === 'chats' || value === 'flagged' || value === 'archived';
+}
+
+function isExtensionModule(value: unknown): value is ExtensionModule {
+  return value === 'skills' || value === 'mcp';
+}
+
+function isAutomationModule(value: unknown): value is AutomationModule {
+  return value === 'plan-reminders' || value === 'daily-review';
+}
+
+function parseSelection(value: unknown): NavSelection | null {
+  if (!value || typeof value !== 'object') return null;
+  const candidate = value as { section?: unknown; filter?: unknown; module?: unknown };
+  if (candidate.section === 'sessions' && isSessionFilter(candidate.filter)) {
+    return { section: 'sessions', filter: candidate.filter };
+  }
+  if (candidate.section === 'extensions' && isExtensionModule(candidate.module)) {
+    return { section: 'extensions', module: candidate.module };
+  }
+  if (candidate.section === 'automations' && isAutomationModule(candidate.module)) {
+    return { section: 'automations', module: candidate.module };
+  }
+
+  // Migrate the pre-hub destinations written by maka-nav-selection-v1.
+  if (candidate.section === 'skills' || candidate.section === 'mcp') {
+    return { section: 'extensions', module: candidate.section };
+  }
+  if (candidate.section === 'daily-review') {
+    return { section: 'automations', module: 'daily-review' };
+  }
+  if (candidate.section === 'automations') {
+    return { section: 'automations', module: 'plan-reminders' };
+  }
+  return null;
+}
+
+function parseModuleMemory(value: unknown): NavModuleMemory {
+  if (!value || typeof value !== 'object') return { ...DEFAULT_MODULE_MEMORY };
+  const candidate = value as { extensions?: unknown; automations?: unknown };
+  return {
+    extensions: isExtensionModule(candidate.extensions) ? candidate.extensions : DEFAULT_MODULE_MEMORY.extensions,
+    automations: isAutomationModule(candidate.automations) ? candidate.automations : DEFAULT_MODULE_MEMORY.automations,
+  };
+}
+
+export function selectNavigation(state: NavigationState, selection: NavSelection): NavigationState {
+  if (selection.section === 'extensions') {
+    return {
+      selection,
+      moduleMemory: { ...state.moduleMemory, extensions: selection.module },
+    };
+  }
+  if (selection.section === 'automations') {
+    return {
+      selection,
+      moduleMemory: { ...state.moduleMemory, automations: selection.module },
+    };
+  }
+  return { selection, moduleMemory: state.moduleMemory };
+}
+
+export function parseNavigationState(raw: string | null): NavigationState {
+  if (!raw) return defaultNavigationState();
   try {
-    const raw = safeLocalStorageGet('maka-nav-selection-v1');
-    if (!raw) return { section: 'sessions', filter: 'chats' };
-    const parsed = JSON.parse(raw) as { section?: string; filter?: string };
-    // PR-SIDEBAR-IA-0 Phase 2 fixup (xuan `94c7bf0f`): fail-closed.
-    // `'search'` was briefly a `NavSelection.section` during the
-    // Phase 2 initial commit; the fixup removes it because `搜索`
-    // is now a modal trigger, not a section. An older localStorage
-    // entry with `{section:'search'}` would otherwise leave the
-    // app stuck on an invalid section. Reject anything that is not
-    // in the current closed-enum.
-    if (parsed.section === 'skills') return { section: 'skills' };
-    if (parsed.section === 'mcp') return { section: 'mcp' };
-    if (parsed.section === 'automations') return { section: 'automations' };
-    if (parsed.section === 'daily-review') return { section: 'daily-review' };
-    if (
-      parsed.section === 'sessions' &&
-      (parsed.filter === 'chats' || parsed.filter === 'flagged' || parsed.filter === 'archived')
-    ) {
-      return parsed as NavSelection;
-    }
+    const parsed = JSON.parse(raw) as unknown;
+    const candidate = parsed && typeof parsed === 'object'
+      ? parsed as { selection?: unknown; moduleMemory?: unknown }
+      : null;
+    const selection = parseSelection(candidate?.selection ?? parsed);
+    if (!selection) return defaultNavigationState();
+    return selectNavigation(
+      {
+        selection,
+        moduleMemory: parseModuleMemory(candidate?.moduleMemory),
+      },
+      selection,
+    );
   } catch {
-    /* fall through */
+    return defaultNavigationState();
   }
-  return { section: 'sessions', filter: 'chats' };
+}
+
+export function readNavigationState(): NavigationState {
+  return parseNavigationState(safeLocalStorageGet('maka-nav-selection-v1'));
 }
diff --git a/apps/desktop/src/renderer/styles/module-pages/module-shell.css b/apps/desktop/src/renderer/styles/module-pages/module-shell.css
index bb346ff693..53c789dd59 100644
--- a/apps/desktop/src/renderer/styles/module-pages/module-shell.css
+++ b/apps/desktop/src/renderer/styles/module-pages/module-shell.css
@@ -52,6 +52,16 @@
   line-height: var(--leading-normal);
 }
 
+.maka-module-hub-heading {
+  align-items: center;
+  column-gap: var(--space-3);
+  row-gap: var(--space-2);
+}
+
+.maka-module-hub-switch {
+  flex: none;
+}
+
 .maka-module-main-actions {
   display: inline-flex;
   align-items: center;
diff --git a/apps/desktop/src/renderer/styles/sidebar.css b/apps/desktop/src/renderer/styles/sidebar.css
index d6c24dfaf0..7094c53da8 100644
--- a/apps/desktop/src/renderer/styles/sidebar.css
+++ b/apps/desktop/src/renderer/styles/sidebar.css
@@ -4,10 +4,7 @@
   min-height: 0;
   height: 100%;
   display: grid;
-  /* 5 rows: header / nav / view-mode toggle / list (scroll) / footer.
-     The toggle row was missing after the grouping control was inserted —
-     with only 4 tracks the 1fr row collapsed to 0 and the toggle
-     overflowed on top of the list's 会话 group label. */
+  /* 5 rows: header / hub nav / session-list heading / list / footer. */
   grid-template-rows: auto auto auto minmax(0, 1fr) auto;
   overflow: hidden;
   background: transparent;
@@ -15,7 +12,7 @@
 }
 
 .maka-session-panel[data-collapsed="true"] {
-  /* Collapsed rail hides the view-mode toggle (display: none above). A
+  /* Collapsed rail hides the session-list heading (display: none below). A
      display:none item does NOT participate in grid layout, so reserving a
      5th row for it drops the footer into the minmax(0, 1fr) track. Keep the
      4-row layout matching the four participating children
@@ -149,62 +146,6 @@
   font-variant-numeric: tabular-nums;
 }
 
-.maka-sidebar-nav-group {
-  display: grid;
-  gap: 1px;
-}
-
-.maka-nav-extension-toggle[data-expanded="true"] {
-  background: var(--state-selected-bg);
-  color: var(--foreground);
-}
-
-.maka-nav-extension-glyph {
-  position: relative;
-  width: var(--icon-size);
-  height: var(--icon-size);
-}
-
-.maka-nav-extension-glyph > .maka-nav-icon {
-  position: absolute;
-  inset: 0;
-  transition: opacity var(--duration-quick) var(--ease-out-strong);
-}
-
-.maka-nav-extension-hover-icon,
-.maka-nav-extension-open-icon,
-.maka-nav-extension-toggle[data-expanded="true"] .maka-nav-extension-default-icon {
-  opacity: 0;
-}
-
-.maka-nav-extension-toggle:not([data-expanded="true"]):is(:hover, :focus-visible) .maka-nav-extension-default-icon {
-  opacity: 0;
-}
-
-.maka-nav-extension-toggle:not([data-expanded="true"]):is(:hover, :focus-visible) .maka-nav-extension-hover-icon,
-.maka-nav-extension-toggle[data-expanded="true"] .maka-nav-extension-open-icon {
-  opacity: 1;
-}
-
-.maka-sidebar-nav-tree {
-  display: grid;
-  gap: 1px;
-  margin: var(--space-0-5) 0 var(--space-1) calc(var(--icon-size) / 2);
-  padding-left: calc(var(--space-3) + var(--icon-size) / 2);
-  border-left: var(--border-width-hairline) solid var(--border);
-}
-
-.maka-nav-tree-row {
-  grid-template-columns: minmax(0, 1fr);
-}
-
-.maka-nav-tree-row > span {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
 .maka-nav-count {
   min-width: 16px;
   height: 16px;
@@ -232,11 +173,7 @@
   display: none;
 }
 
-.maka-session-panel[data-collapsed="true"] .maka-sidebar-nav-tree {
-  display: none;
-}
-
-.maka-session-panel[data-collapsed="true"] .maka-view-mode-toggle {
+.maka-session-panel[data-collapsed="true"] .maka-session-list-toolbar {
   display: none;
 }
 
@@ -506,25 +443,22 @@
 }
 
 
-/* View-mode toggle row (按状态 / 按项目) — chrome comes from the shared
-   `.maka-segmented` recipe in styles/segmented.css (same control family
-   as the daily-review range tabs); this wrapper only owns sidebar
-   spacing. The retired `.maka-view-mode-btn` family referenced tokens
-   that never existed in maka-tokens (--surface-secondary/-primary/
-   -tertiary, --foreground-primary, --shadow-sm), so its chrome rendered
-   invisible. */
-.maka-view-mode-toggle {
-  display: flex;
-  padding: 0 var(--space-2) var(--space-1);
-}
-
-.maka-view-mode-toggle .maka-view-mode-segmented {
-  flex: 1 1 auto;
+/* The session-list heading carries grouping as a quiet menu action. The
+   selected mode is already visible in the groups below, so the previous
+   full-width segmented control added permanent chrome without information. */
+.maka-session-list-toolbar {
   display: flex;
+  min-height: var(--h-control-lg);
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 var(--space-2) var(--space-0-5);
 }
 
-.maka-view-mode-toggle .maka-view-mode-segmented > button {
-  flex: 1 1 0;
+.maka-session-list-heading {
+  padding-left: var(--space-1-5);
+  color: var(--muted-foreground);
+  font-size: var(--font-size-caption);
+  font-weight: var(--font-weight-semibold);
 }
 
 /* List-row status family — merged back from onboarding.css — issue #546 PR3. */
diff --git a/apps/desktop/stories/app-shell.stories.tsx b/apps/desktop/stories/app-shell.stories.tsx
index 1c24f9ea85..c31d2cb7b5 100644
--- a/apps/desktop/stories/app-shell.stories.tsx
+++ b/apps/desktop/stories/app-shell.stories.tsx
@@ -3,7 +3,7 @@ import { useState, type ReactNode } from 'react';
 import type { ComponentProps } from 'react';
 import type { SessionSummary, StoredMessage } from '@maka/core';
 import { ChatView, Composer, SessionListPanel } from '@maka/ui';
-import type { ChatModelChoice } from '@maka/ui';
+import type { ChatModelChoice, SessionViewMode } from '@maka/ui';
 import { AppShellTopbarActions, AppShellWorkspaceTopActions } from '../src/renderer/app-shell-chrome-actions';
 
 const NOW = Date.UTC(2026, 6, 1, 9, 30, 0);
@@ -184,6 +184,7 @@ function ComposedShell(props: {
   detailChildren?: ReactNode;
 }) {
   const [collapsed, setCollapsed] = useState(props.sidebarCollapsed ?? false);
+  const [viewMode, setViewMode] = useState<SessionViewMode>('status');
   const sidebarWidth = collapsed ? 0 : 260;
   const sessions = sidebarSessions.map((s) =>
     s.id === activeSession.id && (props.session?.status || props.session?.blockedReason)
@@ -232,6 +233,8 @@ function ComposedShell(props: {
               activeId={active.id}
               statusGroups={groups}
               streamingSessionIds={streamingIds}
+              viewMode={viewMode}
+              onViewModeChange={setViewMode}
               onSelect={noop}
               onSelectSession={noop}
               onOpenSettings={noop}
diff --git a/apps/desktop/stories/module-hubs.stories.tsx b/apps/desktop/stories/module-hubs.stories.tsx
new file mode 100644
index 0000000000..1a4980c579
--- /dev/null
+++ b/apps/desktop/stories/module-hubs.stories.tsx
@@ -0,0 +1,72 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+import type { ReactNode } from 'react';
+import {
+  AutomationsPage,
+  getSharedUiCopy,
+  ModuleHubSwitch,
+  SkillsPage,
+  ToastProvider,
+  useUiLocale,
+} from '@maka/ui';
+
+const meta = {
+  title: 'Product/Module Hubs',
+  parameters: { layout: 'fullscreen' },
+} satisfies Meta;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+function Surface(props: { children: ReactNode; agentsView: 'skills' | 'cron' }) {
+  return (
+    <div
+      data-maka-e2e-fixture="true"
+      className="maka-panel maka-panel-detail maka-floating-panel agents-content-area agents-parchment-paper-surface"
+      data-agents-view={props.agentsView}
+      style={{ width: '100%', height: '100vh', minHeight: 720 }}
+    >
+      <ToastProvider>{props.children}</ToastProvider>
+    </div>
+  );
+}
+
+function ExtensionsSkillsSurface() {
+  const copy = getSharedUiCopy(useUiLocale()).moduleHubs.extensions;
+  return (
+    <Surface agentsView="skills">
+      <SkillsPage
+        hubHeader={{
+          title: copy.title,
+          subtitle: copy.description,
+          badge: <ModuleHubSwitch hub="extensions" value="skills" onChange={() => {}} />,
+        }}
+        skills={[]}
+        managedSkillSources={[]}
+        bundledSkillCatalog={[]}
+      />
+    </Surface>
+  );
+}
+
+function ScheduledPlanRemindersSurface() {
+  const copy = getSharedUiCopy(useUiLocale()).moduleHubs.automations;
+  return (
+    <Surface agentsView="cron">
+      <AutomationsPage
+        hubHeader={{
+          title: copy.title,
+          subtitle: copy.description,
+          badge: <ModuleHubSwitch hub="automations" value="plan-reminders" onChange={() => {}} />,
+        }}
+        skills={[]}
+        reminders={[]}
+      />
+    </Surface>
+  );
+}
+
+// Real path: sidebar → 扩展 → 技能.
+export const ExtensionsSkills: Story = { render: () => <ExtensionsSkillsSurface /> };
+
+// Real path: sidebar → 定时任务 → 计划提醒.
+export const ScheduledPlanReminders: Story = { render: () => <ScheduledPlanRemindersSurface /> };
diff --git a/packages/ui/src/__tests__/sidebar-subtraction.test.tsx b/packages/ui/src/__tests__/sidebar-subtraction.test.tsx
new file mode 100644
index 0000000000..fcbe600132
--- /dev/null
+++ b/packages/ui/src/__tests__/sidebar-subtraction.test.tsx
@@ -0,0 +1,91 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+import { renderToStaticMarkup } from 'react-dom/server';
+import type { SessionSummary } from '@maka/core';
+import { LocaleProvider } from '../locale-context.js';
+import { ModuleHubSwitch } from '../module-hub-switch.js';
+import { SessionListPanel } from '../session-list-panel.js';
+import { SessionSidebarNav } from '../session-sidebar-nav.js';
+
+function renderSidebarNav(): string {
+  return renderToStaticMarkup(
+    <LocaleProvider locale="zh">
+      <SessionSidebarNav
+        selection={{ section: 'sessions', filter: 'chats' }}
+        onSelect={() => {}}
+        onNew={() => {}}
+      />
+    </LocaleProvider>,
+  );
+}
+
+describe('sidebar subtraction', () => {
+  it('keeps only the hub-level destinations in permanent navigation', () => {
+    const markup = renderSidebarNav();
+
+    assert.match(markup, />新任务</);
+    assert.match(markup, />扩展</);
+    assert.match(markup, />定时任务</);
+    assert.doesNotMatch(markup, />技能</);
+    assert.doesNotMatch(markup, />MCP</);
+    assert.doesNotMatch(markup, />每日回顾</);
+    assert.doesNotMatch(markup, /aria-expanded=/);
+  });
+
+  it('renders the two hub switches as localized persistent choices', () => {
+    const extensions = renderToStaticMarkup(
+      <LocaleProvider locale="zh">
+        <ModuleHubSwitch hub="extensions" value="skills" onChange={() => {}} />
+      </LocaleProvider>,
+    );
+    const automations = renderToStaticMarkup(
+      <LocaleProvider locale="zh">
+        <ModuleHubSwitch hub="automations" value="plan-reminders" onChange={() => {}} />
+      </LocaleProvider>,
+    );
+
+    assert.match(extensions, /aria-label="扩展内容"/);
+    assert.match(extensions, />技能</);
+    assert.match(extensions, />MCP</);
+    assert.match(automations, /aria-label="定时任务内容"/);
+    assert.match(automations, />计划提醒</);
+    assert.match(automations, />每日回顾</);
+  });
+
+  it('moves session grouping from a permanent segmented control into the list heading', () => {
+    const session: SessionSummary = {
+      id: 'session-1',
+      name: '侧栏减法',
+      status: 'active',
+      isFlagged: false,
+      isArchived: false,
+      labels: [],
+      hasUnread: false,
+      lastMessageAt: 1,
+      backend: 'ai-sdk',
+      llmConnectionSlug: 'anthropic-main',
+      connectionLocked: false,
+      model: 'claude-sonnet-4-5',
+      permissionMode: 'ask',
+    };
+    const markup = renderToStaticMarkup(
+      <LocaleProvider locale="zh">
+        <SessionListPanel
+          selection={{ section: 'sessions', filter: 'chats' }}
+          sessions={[session]}
+          viewMode="status"
+          onViewModeChange={() => {}}
+          onSelectSession={() => {}}
+          onSelect={() => {}}
+          onOpenSettings={() => {}}
+          onNew={() => {}}
+        />
+      </LocaleProvider>,
+    );
+
+    assert.match(markup, /class="maka-session-list-heading"[^>]*>会话</);
+    assert.match(markup, /aria-label="会话分组方式"/);
+    assert.doesNotMatch(markup, />按状态</);
+    assert.doesNotMatch(markup, />按项目</);
+  });
+});
diff --git a/packages/ui/src/components.tsx b/packages/ui/src/components.tsx
index dddb4ed410..bca8600804 100644
--- a/packages/ui/src/components.tsx
+++ b/packages/ui/src/components.tsx
@@ -1,5 +1,13 @@
-export type { NavSelection } from './nav-selection.js';
+export type {
+  AutomationModule,
+  ExtensionModule,
+  NavModuleMemory,
+  NavSelection,
+  SessionFilter,
+} from './nav-selection.js';
 export { CapabilityAuditStrip } from './capability-audit-strip.js';
+export { ModuleHubSwitch } from './module-hub-switch.js';
+export type { ModuleHubHeader } from './module-hub-switch.js';
 export { SearchModal } from './search-modal.js';
 export { SessionListPanel } from './session-list-panel.js';
 export type { SessionViewMode } from './session-list-panel.js';
diff --git a/packages/ui/src/daily-review-panel.tsx b/packages/ui/src/daily-review-panel.tsx
index 18dd184fa0..2850ebe889 100644
--- a/packages/ui/src/daily-review-panel.tsx
+++ b/packages/ui/src/daily-review-panel.tsx
@@ -29,6 +29,7 @@ import { StatTile } from './primitives/stat-tile.js';
 import { SectionHeader } from './primitives/section-header.js';
 import { PageHeader } from './primitives/page-header.js';
 import type { DailyReviewBridge, DailyReviewMarkdownActionInput } from './module-panel-types.js';
+import type { ModuleHubHeader } from './module-hub-switch.js';
 import { RelativeTime } from './relative-time.js';
 import { Markdown } from './markdown.js';
 import { useUiLocale } from './locale-context.js';
@@ -51,6 +52,7 @@ function dailyReviewArchiveChipTone(status: DailyReviewArchive['status']): ChipP
 
 export function DailyReviewPanel(props: {
   bridge: DailyReviewBridge;
+  hubHeader?: ModuleHubHeader;
   onSelectSession?: (sessionId: string) => void;
   onCopyMarkdown?: (input: DailyReviewMarkdownActionInput) => Promise<void> | void;
   onAppendMarkdown?: (input: DailyReviewMarkdownActionInput) => Promise<void> | void;
@@ -347,8 +349,10 @@ export function DailyReviewPanel(props: {
       <PageHeader
         className="maka-module-main-header"
         as="h2"
-        title={copy.page.title}
-        subtitle={copy.page.subtitle}
+        title={props.hubHeader?.title ?? copy.page.title}
+        subtitle={props.hubHeader?.subtitle ?? copy.page.subtitle}
+        badge={props.hubHeader?.badge}
+        headingRowClassName={props.hubHeader ? 'maka-module-hub-heading' : undefined}
         actions={canManualRun ? (
           <div className="maka-daily-review-generate" role="group" aria-label={copy.page.generateAriaLabel}>
             {modelOptions.length > 0 && (
diff --git a/packages/ui/src/module-hub-switch.tsx b/packages/ui/src/module-hub-switch.tsx
new file mode 100644
index 0000000000..7e7e292070
--- /dev/null
+++ b/packages/ui/src/module-hub-switch.tsx
@@ -0,0 +1,53 @@
+import type { ReactNode } from 'react';
+import type { AutomationModule, ExtensionModule } from './nav-selection.js';
+import { useUiLocale } from './locale-context.js';
+import { Segmented } from './primitives/segmented.js';
+import { getSharedUiCopy } from './shared-ui-copy.js';
+
+export type ModuleHubHeader = {
+  title: string;
+  subtitle?: string;
+  badge: ReactNode;
+};
+
+type ModuleHubSwitchProps =
+  | {
+      hub: 'extensions';
+      value: ExtensionModule;
+      onChange(value: ExtensionModule): void;
+    }
+  | {
+      hub: 'automations';
+      value: AutomationModule;
+      onChange(value: AutomationModule): void;
+    };
+
+export function ModuleHubSwitch(props: ModuleHubSwitchProps) {
+  const copy = getSharedUiCopy(useUiLocale()).moduleHubs;
+  if (props.hub === 'extensions') {
+    return (
+      <Segmented
+        value={props.value}
+        options={[
+          ['skills', copy.extensions.skills],
+          ['mcp', copy.extensions.mcp],
+        ]}
+        onChange={props.onChange}
+        ariaLabel={copy.extensions.switchLabel}
+        className="maka-module-hub-switch"
+      />
+    );
+  }
+  return (
+    <Segmented
+      value={props.value}
+      options={[
+        ['plan-reminders', copy.automations.planReminders],
+        ['daily-review', copy.automations.dailyReview],
+      ]}
+      onChange={props.onChange}
+      ariaLabel={copy.automations.switchLabel}
+      className="maka-module-hub-switch"
+    />
+  );
+}
diff --git a/packages/ui/src/module-pages.tsx b/packages/ui/src/module-pages.tsx
index b40a17c34a..6ef1690d56 100644
--- a/packages/ui/src/module-pages.tsx
+++ b/packages/ui/src/module-pages.tsx
@@ -3,8 +3,10 @@ import type { PlanReminder } from '@maka/core';
 import { deriveCapabilityAuditReport } from '@maka/core';
 import { CalendarDays } from './icons.js';
 import { EmptyState } from './empty-state.js';
+import { PageHeader } from './primitives/page-header.js';
 import { useUiLocale } from './locale-context.js';
 import { getSharedUiCopy } from './shared-ui-copy.js';
+import type { ModuleHubHeader } from './module-hub-switch.js';
 import type {
   BundledSkillCatalogEntry,
   DailyReviewBridge,
@@ -40,6 +42,7 @@ function ModulePanelFallback(props: { message: string }) {
 
 export function SkillsPage(props: {
   skills?: SkillEntry[];
+  hubHeader?: ModuleHubHeader;
   planReminders?: PlanReminder[];
   onRefreshSkills?(): void | Promise<void>;
   onCreateSkillTemplate?(): void | Promise<void>;
@@ -65,7 +68,7 @@ export function SkillsPage(props: {
     planReminders: props.planReminders ?? [],
   });
   return (
-    <Suspense fallback={<ModulePageFallback label={copy.skills} message={copy.loadingSkills} />}>
+    <Suspense fallback={<ModulePageFallback label={props.hubHeader?.title ?? copy.skills} message={copy.loadingSkills} />}>
       <SkillsModuleMain {...props} auditReport={auditReport} />
     </Suspense>
   );
@@ -73,6 +76,7 @@ export function SkillsPage(props: {
 
 export function AutomationsPage(props: {
   skills?: SkillEntry[];
+  hubHeader?: ModuleHubHeader;
   reminders?: PlanReminder[];
   keepSystemAwake?: boolean;
   onKeepSystemAwakeChange?: (next: boolean) => Promise<void>;
@@ -91,8 +95,8 @@ export function AutomationsPage(props: {
     planReminders: props.reminders ?? [],
   });
   return (
-    <Suspense fallback={<ModulePageFallback label={copy.automations} message={copy.loadingAutomations} />}>
-      <main className="maka-main detailPane maka-module-main agents-chat-panel" aria-label={copy.automations}>
+    <Suspense fallback={<ModulePageFallback label={props.hubHeader?.title ?? copy.automations} message={copy.loadingAutomations} />}>
+      <main className="maka-main detailPane maka-module-main agents-chat-panel" aria-label={props.hubHeader?.title ?? copy.automations}>
         <PlanReminderPanel {...props} reminders={props.reminders ?? []} auditReport={auditReport} />
       </main>
     </Suspense>
@@ -101,6 +105,7 @@ export function AutomationsPage(props: {
 
 export function DailyReviewPage(props: {
   bridge?: DailyReviewBridge;
+  hubHeader?: ModuleHubHeader;
   onSelectSession?: (sessionId: string) => void;
   onCopyMarkdown?: (input: DailyReviewMarkdownActionInput) => Promise<void> | void;
   onAppendMarkdown?: (input: DailyReviewMarkdownActionInput) => Promise<void> | void;
@@ -108,7 +113,7 @@ export function DailyReviewPage(props: {
 }) {
   const copy = getSharedUiCopy(useUiLocale()).modules;
   return (
-    <main className="maka-main detailPane maka-module-main agents-chat-panel" data-module="daily-review" aria-label={copy.dailyReview}>
+    <main className="maka-main detailPane maka-module-main agents-chat-panel" data-module="daily-review" aria-label={props.hubHeader?.title ?? copy.dailyReview}>
       {props.bridge ? (
         // The PageHeader (title + subtitle + the 生成 actions) now lives INSIDE
         // the panel so the generation buttons can ride the header's actions slot
@@ -119,12 +124,13 @@ export function DailyReviewPage(props: {
         </Suspense>
       ) : (
         <>
-          <header className="maka-module-main-header">
-            <div>
-              <h2>{copy.dailyReview}</h2>
-              <p>{copy.dailyReviewDescription}</p>
-            </div>
-          </header>
+          <PageHeader
+            className="maka-module-main-header"
+            title={props.hubHeader?.title ?? copy.dailyReview}
+            subtitle={props.hubHeader?.subtitle ?? copy.dailyReviewDescription}
+            badge={props.hubHeader?.badge}
+            headingRowClassName={props.hubHeader ? 'maka-module-hub-heading' : undefined}
+          />
           <EmptyState Icon={CalendarDays} title={copy.dailyReviewDisconnectedTitle} body={copy.dailyReviewDisconnectedBody} />
         </>
       )}
diff --git a/packages/ui/src/nav-selection.ts b/packages/ui/src/nav-selection.ts
index 7f08ad028f..f9e4d75323 100644
--- a/packages/ui/src/nav-selection.ts
+++ b/packages/ui/src/nav-selection.ts
@@ -1,8 +1,13 @@
 export type SessionFilter = 'chats' | 'flagged' | 'archived';
+export type ExtensionModule = 'skills' | 'mcp';
+export type AutomationModule = 'plan-reminders' | 'daily-review';
 
 export type NavSelection =
   | { section: 'sessions'; filter: SessionFilter }
-  | { section: 'automations' }
-  | { section: 'skills' }
-  | { section: 'mcp' }
-  | { section: 'daily-review' };
+  | { section: 'extensions'; module: ExtensionModule }
+  | { section: 'automations'; module: AutomationModule };
+
+export type NavModuleMemory = {
+  extensions: ExtensionModule;
+  automations: AutomationModule;
+};
diff --git a/packages/ui/src/plan-reminder-panel.tsx b/packages/ui/src/plan-reminder-panel.tsx
index 3dbb2275ab..0dcb9fabc8 100644
--- a/packages/ui/src/plan-reminder-panel.tsx
+++ b/packages/ui/src/plan-reminder-panel.tsx
@@ -61,6 +61,7 @@ import { Input } from './primitives/input.js';
 import { Menu, MenuItem, MenuPopup, MenuTrigger } from './primitives/menu.js';
 import { EmptyState } from './empty-state.js';
 import { CapabilityAuditStrip } from './capability-audit-strip.js';
+import type { ModuleHubHeader } from './module-hub-switch.js';
 import type {
   PlanReminderDraftInput,
   PlanReminderUpdatePatch,
@@ -82,6 +83,7 @@ function planRunStatusChipTone(
 
 export function PlanReminderPanel(props: {
   reminders: PlanReminder[];
+  hubHeader?: ModuleHubHeader;
   auditReport?: CapabilityAuditReport;
   /**
    * Current persisted 保持系统唤醒 state. `undefined` means the capability is
@@ -255,8 +257,10 @@ export function PlanReminderPanel(props: {
           as_wrapper="div"
           className="maka-plan-hero"
           as="h2"
-          title={copy.page.title}
-          subtitle={copy.page.subtitle}
+          title={props.hubHeader?.title ?? copy.page.title}
+          subtitle={props.hubHeader?.subtitle ?? copy.page.subtitle}
+          badge={props.hubHeader?.badge}
+          headingRowClassName={props.hubHeader ? 'maka-module-hub-heading' : undefined}
           contentClassName="maka-plan-heading"
           actions={
           <div className="maka-plan-top-actions" aria-label={copy.page.actionsAriaLabel}>
diff --git a/packages/ui/src/session-list-panel.tsx b/packages/ui/src/session-list-panel.tsx
index 3e5611f107..38a8c4da6d 100644
--- a/packages/ui/src/session-list-panel.tsx
+++ b/packages/ui/src/session-list-panel.tsx
@@ -1,8 +1,10 @@
 import type { PlanReminder, SessionSummary } from '@maka/core';
-import type { NavSelection } from './nav-selection.js';
+import type { NavModuleMemory, NavSelection } from './nav-selection.js';
 import { SessionHistoryList, type SessionHistoryStatusGroup, type SessionRowActions } from './session-history-list.js';
 import { SessionSidebarFooter, SessionSidebarNav } from './session-sidebar-nav.js';
-import { Segmented } from './primitives/segmented.js';
+import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from './primitives/menu.js';
+import { Button as UiButton } from './ui.js';
+import { ListTodo } from './icons.js';
 import { useUiLocale } from './locale-context.js';
 import { getConversationCopy } from './conversation-copy.js';
 
@@ -20,6 +22,7 @@ export function SessionListPanel(props: {
   viewMode?: SessionViewMode;
   onViewModeChange?: (mode: SessionViewMode) => void;
   onSelectSession(sessionId: string): void;
+  moduleMemory?: NavModuleMemory;
   onSelect(selection: NavSelection): void;
   onOpenSettings(): void;
   onNew(): void;
@@ -47,22 +50,29 @@ export function SessionListPanel(props: {
       <SessionSidebarNav
         selection={props.selection}
         planReminders={props.planReminders}
+        moduleMemory={props.moduleMemory}
         onSelect={props.onSelect}
         onNew={props.onNew}
       />
       {showSessionNavigation && onViewModeChange && (
-        <div className="maka-view-mode-toggle">
-          {/* Shared segmented primitive — same control family as the
-              daily-review range tabs. The previous hand-rolled buttons
-              referenced tokens that don't exist in maka-tokens
-              (--surface-secondary etc.), rendering an invisible chrome. */}
-          <Segmented
-            value={viewMode}
-            options={[['status', copy.groupByStatus], ['project', copy.groupByProject]]}
-            onChange={(mode) => onViewModeChange(mode)}
-            ariaLabel={copy.groupingAriaLabel}
-            className="maka-view-mode-segmented"
-          />
+        <div className="maka-session-list-toolbar">
+          <span className="maka-session-list-heading">{copy.title}</span>
+          <Menu>
+            <MenuTrigger
+              render={<UiButton variant="quiet" size="icon-sm" />}
+              type="button"
+              aria-label={copy.groupingAriaLabel}
+              title={copy.groupingAriaLabel}
+            >
+              <ListTodo size={15} aria-hidden="true" />
+            </MenuTrigger>
+            <MenuPopup align="end">
+              <MenuRadioGroup value={viewMode} onValueChange={(mode) => onViewModeChange(mode as SessionViewMode)}>
+                <MenuRadioItem value="status">{copy.groupByStatus}</MenuRadioItem>
+                <MenuRadioItem value="project">{copy.groupByProject}</MenuRadioItem>
+              </MenuRadioGroup>
+            </MenuPopup>
+          </Menu>
         </div>
       )}
       <SessionHistoryList
diff --git a/packages/ui/src/session-sidebar-nav.tsx b/packages/ui/src/session-sidebar-nav.tsx
index 96c1b43252..8d8fcf1b6d 100644
--- a/packages/ui/src/session-sidebar-nav.tsx
+++ b/packages/ui/src/session-sidebar-nav.tsx
@@ -1,10 +1,9 @@
 import type { PlanReminder } from '@maka/core';
-import { Blocks, CalendarCheck, ChevronDown, ChevronRight, Settings, SquarePen, Timer } from './icons.js';
-import type { NavSelection } from './nav-selection.js';
+import { Blocks, Settings, SquarePen, Timer } from './icons.js';
+import type { NavModuleMemory, NavSelection } from './nav-selection.js';
 import { cn } from './ui.js';
 import { cva } from 'class-variance-authority';
 import { Button as BaseButton } from '@base-ui/react/button';
-import { useId, useState } from 'react';
 import { useUiLocale } from './locale-context.js';
 import { getShellControlsCopy } from './shell-controls-copy.js';
 
@@ -38,8 +37,6 @@ const navRowVariants = cva(
   },
 );
 
-type ModuleNavId = 'daily-review' | 'skills' | 'mcp' | 'automations';
-
 const settingsButtonClass =
   'w-full min-w-0 gap-2 rounded-sm border-0 bg-transparent px-1.5 py-1.5 ' +
   'text-left text-sm font-medium text-[var(--foreground-secondary)] ' +
@@ -49,28 +46,19 @@ const settingsButtonClass =
 export function SessionSidebarNav(props: {
   selection: NavSelection;
   planReminders?: PlanReminder[];
+  moduleMemory?: NavModuleMemory;
   onSelect(selection: NavSelection): void;
   onNew(): void;
 }) {
   const locale = useUiLocale();
   const copy = getShellControlsCopy(locale).navigation;
-  const extensionsTreeId = useId();
-  const [extensionsOpen, setExtensionsOpen] = useState(true);
-  const moduleNavLabel: Record<ModuleNavId, string> = {
-    automations: copy.automations,
-    skills: copy.skills,
-    mcp: copy.mcp,
-    'daily-review': copy.dailyReview,
-  };
-  const isModuleActive = (id: ModuleNavId) => props.selection.section === id;
+  const extensionsActive = props.selection.section === 'extensions';
+  const automationsActive = props.selection.section === 'automations';
+  const moduleMemory = props.moduleMemory ?? { extensions: 'skills', automations: 'plan-reminders' };
   const activePlanReminderCount = (props.planReminders ?? []).filter(
     (reminder) => reminder.status !== 'completed',
   ).length;
 
-  function selectModule(id: ModuleNavId) {
-    props.onSelect({ section: id });
-  }
-
   return (
     <nav className="maka-sidebar-modules" aria-label={copy.mainLabel}>
       <BaseButton
@@ -85,74 +73,27 @@ export function SessionSidebarNav(props: {
           ⌘ N
         </kbd>
       </BaseButton>
-      <div className="maka-sidebar-nav-group" data-open={extensionsOpen ? 'true' : 'false'}>
-        <BaseButton
-          className={cn('maka-nav-row maka-nav-extension-toggle', navRowVariants())}
-          data-expanded={extensionsOpen ? 'true' : 'false'}
-          aria-expanded={extensionsOpen}
-          aria-controls={extensionsTreeId}
-          type="button"
-          onClick={() => setExtensionsOpen((open) => !open)}
-        >
-          <span className="maka-nav-extension-glyph" aria-hidden="true">
-            <Blocks className="maka-nav-icon maka-nav-extension-default-icon" />
-            <ChevronRight className="maka-nav-icon maka-nav-extension-hover-icon" />
-            <ChevronDown className="maka-nav-icon maka-nav-extension-open-icon" />
-          </span>
-          <span>{copy.extensions}</span>
-        </BaseButton>
-        <div
-          id={extensionsTreeId}
-          className="maka-sidebar-nav-tree"
-          role="group"
-          aria-label={copy.extensions}
-          hidden={!extensionsOpen}
-        >
-          <BaseButton
-            className={cn('maka-nav-row maka-nav-tree-row', navRowVariants())}
-            data-active={isModuleActive('skills')}
-            aria-current={isModuleActive('skills') ? 'page' : undefined}
-            aria-label={moduleNavLabel.skills}
-            type="button"
-            onClick={() => selectModule('skills')}
-          >
-            <span>{moduleNavLabel.skills}</span>
-          </BaseButton>
-          <BaseButton
-            className={cn('maka-nav-row maka-nav-tree-row', navRowVariants())}
-            data-active={isModuleActive('mcp')}
-            aria-current={isModuleActive('mcp') ? 'page' : undefined}
-            aria-label={moduleNavLabel.mcp}
-            type="button"
-            onClick={() => selectModule('mcp')}
-          >
-            <span>{moduleNavLabel.mcp}</span>
-          </BaseButton>
-        </div>
-      </div>
       <BaseButton
         className={cn('maka-nav-row', navRowVariants())}
-        data-active={isModuleActive('daily-review')}
-        aria-current={isModuleActive('daily-review') ? 'page' : undefined}
-        aria-label={moduleNavLabel['daily-review']}
+        data-active={extensionsActive}
+        aria-current={extensionsActive ? 'page' : undefined}
+        aria-label={copy.extensions}
         type="button"
-        onClick={() => selectModule('daily-review')}
+        onClick={() => props.onSelect({ section: 'extensions', module: moduleMemory.extensions })}
       >
-        <CalendarCheck className="maka-nav-icon" aria-hidden="true" />
-        <span>{moduleNavLabel['daily-review']}</span>
+        <Blocks className="maka-nav-icon" aria-hidden="true" />
+        <span>{copy.extensions}</span>
       </BaseButton>
       <BaseButton
         className={cn('maka-nav-row', navRowVariants())}
-        data-active={isModuleActive('automations')}
-        aria-current={isModuleActive('automations') ? 'page' : undefined}
+        data-active={automationsActive}
+        aria-current={automationsActive ? 'page' : undefined}
         type="button"
-        onClick={() => selectModule('automations')}
-        aria-label={
-          activePlanReminderCount > 0 ? copy.pendingReminders(activePlanReminderCount) : moduleNavLabel.automations
-        }
+        onClick={() => props.onSelect({ section: 'automations', module: moduleMemory.automations })}
+        aria-label={activePlanReminderCount > 0 ? copy.pendingReminders(activePlanReminderCount) : copy.automations}
       >
         <Timer className="maka-nav-icon" aria-hidden="true" />
-        <span>{moduleNavLabel.automations}</span>
+        <span>{copy.automations}</span>
         {activePlanReminderCount > 0 && (
           <small className="maka-nav-count" aria-hidden="true">
             {activePlanReminderCount}
diff --git a/packages/ui/src/shared-ui-copy.ts b/packages/ui/src/shared-ui-copy.ts
index 492bc4768a..2593a04ecb 100644
--- a/packages/ui/src/shared-ui-copy.ts
+++ b/packages/ui/src/shared-ui-copy.ts
@@ -21,6 +21,22 @@ export interface SharedUiCopy {
     searchPlaceholder: string;
     searchAriaLabel: string;
   };
+  moduleHubs: {
+    extensions: {
+      title: string;
+      description: string;
+      switchLabel: string;
+      skills: string;
+      mcp: string;
+    };
+    automations: {
+      title: string;
+      description: string;
+      switchLabel: string;
+      planReminders: string;
+      dailyReview: string;
+    };
+  };
   modules: {
     skills: string;
     loadingSkills: string;
@@ -87,6 +103,22 @@ const SHARED_UI_COPY = {
       searchPlaceholder: '搜索模型…',
       searchAriaLabel: '搜索模型',
     },
+    moduleHubs: {
+      extensions: {
+        title: '扩展',
+        description: '管理 Maka 可调用的技能与外部工具。',
+        switchLabel: '扩展内容',
+        skills: '技能',
+        mcp: 'MCP',
+      },
+      automations: {
+        title: '定时任务',
+        description: '安排计划提醒，并回顾本机对话中的工作进展。',
+        switchLabel: '定时任务内容',
+        planReminders: '计划提醒',
+        dailyReview: '每日回顾',
+      },
+    },
     modules: {
       skills: '技能',
       loadingSkills: '正在加载技能…',
@@ -137,6 +169,22 @@ const SHARED_UI_COPY = {
       searchPlaceholder: 'Search models…',
       searchAriaLabel: 'Search models',
     },
+    moduleHubs: {
+      extensions: {
+        title: 'Extensions',
+        description: 'Manage the skills and external tools Maka can use.',
+        switchLabel: 'Extension content',
+        skills: 'Skills',
+        mcp: 'MCP',
+      },
+      automations: {
+        title: 'Scheduled tasks',
+        description: 'Schedule reminders and review progress from local conversations.',
+        switchLabel: 'Scheduled task content',
+        planReminders: 'Plan reminders',
+        dailyReview: 'Daily review',
+      },
+    },
     modules: {
       skills: 'Skills',
       loadingSkills: 'Loading skills…',
diff --git a/packages/ui/src/shell-controls-copy.ts b/packages/ui/src/shell-controls-copy.ts
index 1de5bbea77..7c1fd499a2 100644
--- a/packages/ui/src/shell-controls-copy.ts
+++ b/packages/ui/src/shell-controls-copy.ts
@@ -9,9 +9,6 @@ type ShellControlsCopy = {
     newTask: string;
     automations: string;
     extensions: string;
-    skills: string;
-    mcp: string;
-    dailyReview: string;
     settings: string;
     pendingReminders(count: number): string;
   };
@@ -43,9 +40,6 @@ const SHELL_CONTROLS_COPY_BY_LOCALE = {
       newTask: '新任务',
       automations: '定时任务',
       extensions: '扩展',
-      skills: '技能',
-      mcp: 'MCP',
-      dailyReview: '每日回顾',
       settings: '设置',
       pendingReminders: (count: number) => `定时任务，${count} 个未完成提醒`,
     },
@@ -73,11 +67,8 @@ const SHELL_CONTROLS_COPY_BY_LOCALE = {
     navigation: {
       mainLabel: 'Main navigation',
       newTask: 'New task',
-      automations: 'Automations',
+      automations: 'Scheduled tasks',
       extensions: 'Extensions',
-      skills: 'Skills',
-      mcp: 'MCP',
-      dailyReview: 'Daily Review',
       settings: 'Settings',
       pendingReminders: (count: number) => `Automations, ${count} unfinished ${count === 1 ? 'reminder' : 'reminders'}`,
     },
diff --git a/packages/ui/src/skills-panel.tsx b/packages/ui/src/skills-panel.tsx
index 3e0f4e1107..bc41b73750 100644
--- a/packages/ui/src/skills-panel.tsx
+++ b/packages/ui/src/skills-panel.tsx
@@ -22,6 +22,7 @@ import { SettingsSelect, type SettingsSelectOption } from './primitives/settings
 import { EmptyState } from './empty-state.js';
 import { SectionHeader } from './primitives/section-header.js';
 import { CapabilityAuditStrip } from './capability-audit-strip.js';
+import type { ModuleHubHeader } from './module-hub-switch.js';
 import type { BundledSkillCatalogEntry, ManagedSkillCategory, ManagedSkillSourceEntry, ManagedSkillUpdatePreview, SkillEntry } from './module-panel-types.js';
 import { getSkillsCopy, type SkillsCopy } from './skills-copy.js';
 import { useUiLocale } from './locale-context.js';
@@ -773,6 +774,7 @@ function previewText(content: string): string {
 
 export function SkillsModuleMain(props: {
   skills?: SkillEntry[];
+  hubHeader?: ModuleHubHeader;
   managedSkillSources?: ManagedSkillSourceEntry[];
   bundledSkillCatalog?: BundledSkillCatalogEntry[];
   auditReport?: CapabilityAuditReport;
@@ -825,12 +827,14 @@ export function SkillsModuleMain(props: {
   const skillCreateLegacyLabel = pendingSkillAction === 'create' ? copy.page.creating : copy.page.createExample;
   const auditReport = props.auditReport ?? deriveCapabilityAuditReport({ skills: props.skills ?? [] });
   return (
-    <main className="maka-main detailPane maka-module-main agents-chat-panel" aria-label={copy.page.title}>
+    <main className="maka-main detailPane maka-module-main agents-chat-panel" aria-label={props.hubHeader?.title ?? copy.page.title}>
       <PageHeader
         className="maka-module-main-header"
         as="h2"
-        title={copy.page.title}
-        subtitle={copy.page.subtitle}
+        title={props.hubHeader?.title ?? copy.page.title}
+        subtitle={props.hubHeader?.subtitle ?? copy.page.subtitle}
+        badge={props.hubHeader?.badge}
+        headingRowClassName={props.hubHeader ? 'maka-module-hub-heading' : undefined}
         actions={
         <div className="maka-module-main-actions" role="group" aria-label={copy.page.actions}>
           <label className="maka-skill-search" aria-label={copy.page.search}>
diff --git a/packages/ui/stories/interaction-states.stories.tsx b/packages/ui/stories/interaction-states.stories.tsx
index 05c129fe72..210630f153 100644
--- a/packages/ui/stories/interaction-states.stories.tsx
+++ b/packages/ui/stories/interaction-states.stories.tsx
@@ -94,7 +94,7 @@ export const ListRowStates: Story = {
     >
       <div style={{ height: 440, overflow: 'hidden', width: 260 }}>
         <SessionListPanel
-          selection={{ section: 'skills' }}
+          selection={{ section: 'extensions', module: 'skills' }}
           sessions={COMPOSITE_ROW_SESSIONS}
           activeId="interaction-active"
           onSelectSession={noop}

From ee8b29104dfee3c906a7789165320f9cedd3d162 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Fri, 24 Jul 2026 18:17:56 +0800
Subject: [PATCH 2/4] feat(ui): replace hub switches with path selectors

---
 apps/desktop/e2e/mcp.spec.ts                  | 11 ++-
 .../sidebar-module-hubs-contract.test.ts      |  2 +-
 apps/desktop/src/renderer/app-shell.tsx       |  6 +-
 .../styles/module-pages/module-shell.css      | 47 ++++++++-
 apps/desktop/stories/module-hubs.stories.tsx  |  6 +-
 .../__tests__/sidebar-subtraction.test.tsx    | 19 ++--
 packages/ui/src/components.tsx                |  4 +-
 packages/ui/src/daily-review-panel.tsx        |  2 +-
 packages/ui/src/module-hub-selector.tsx       | 99 +++++++++++++++++++
 packages/ui/src/module-hub-switch.tsx         | 53 ----------
 packages/ui/src/module-pages.tsx              |  2 +-
 packages/ui/src/plan-reminder-panel.tsx       |  2 +-
 packages/ui/src/shared-ui-copy.ts             | 12 +--
 packages/ui/src/skills-panel.tsx              |  2 +-
 14 files changed, 180 insertions(+), 87 deletions(-)
 create mode 100644 packages/ui/src/module-hub-selector.tsx
 delete mode 100644 packages/ui/src/module-hub-switch.tsx

diff --git a/apps/desktop/e2e/mcp.spec.ts b/apps/desktop/e2e/mcp.spec.ts
index b79478d6ee..ab623b464c 100644
--- a/apps/desktop/e2e/mcp.spec.ts
+++ b/apps/desktop/e2e/mcp.spec.ts
@@ -18,19 +18,20 @@ test('MCP module completes stdio add, discovery, disable, JSON import, and delet
   await expect(sidebar.getByRole('button', { name: '会话分组方式' })).toHaveCount(0);
   await expect(sidebar.locator('.maka-session-list')).toBeVisible();
 
-  const extensionSwitch = page.getByRole('group', { name: '扩展内容' });
-  await expect(extensionSwitch.getByRole('button', { name: '技能' })).toHaveAttribute('aria-pressed', 'true');
-  await extensionSwitch.getByRole('button', { name: 'MCP' }).click();
+  const extensionSelector = page.locator('.maka-module-hub-selector-trigger');
+  await expect(extensionSelector).toHaveAccessibleName('扩展内容：技能');
+  await extensionSelector.click();
+  await page.getByRole('menuitemradio', { name: 'MCP' }).click();
   const mcp = page.getByRole('main', { name: '扩展' });
   await expect(mcp.getByRole('heading', { name: '扩展' })).toBeVisible();
-  await expect(extensionSwitch.getByRole('button', { name: 'MCP' })).toHaveAttribute('aria-pressed', 'true');
+  await expect(extensionSelector).toHaveAccessibleName('扩展内容：MCP');
 
   // Each hub restores its last module when the user returns from another
   // sidebar destination.
   await sidebar.getByRole('button', { name: '定时任务', exact: true }).click();
   await extensions.click();
   await expect(page.getByRole('main', { name: '扩展' })).toBeVisible();
-  await expect(extensionSwitch.getByRole('button', { name: 'MCP' })).toHaveAttribute('aria-pressed', 'true');
+  await expect(extensionSelector).toHaveAccessibleName('扩展内容：MCP');
   if (screenshotPath) {
     await page.screenshot({ path: variantPath(screenshotPath, 'market') });
     await page.getByRole('button', { name: '设置', exact: true }).click();
diff --git a/apps/desktop/src/main/__tests__/sidebar-module-hubs-contract.test.ts b/apps/desktop/src/main/__tests__/sidebar-module-hubs-contract.test.ts
index 92de93044c..15a8a66fda 100644
--- a/apps/desktop/src/main/__tests__/sidebar-module-hubs-contract.test.ts
+++ b/apps/desktop/src/main/__tests__/sidebar-module-hubs-contract.test.ts
@@ -23,7 +23,7 @@ describe('sidebar module hubs contract', () => {
   it('projects both hubs through one localized title switch without parallel legacy pages', async () => {
     const shell = await readSource('apps/desktop/src/renderer/app-shell.tsx');
 
-    assert.match(shell, /<ModuleHubSwitch[\s\S]*hub="extensions"[\s\S]*hub="automations"/);
+    assert.match(shell, /<ModuleHubSelector[\s\S]*hub="extensions"[\s\S]*hub="automations"/);
     assert.match(shell, /<SkillsPage[\s\S]*hubHeader=\{extensionsHubHeader\}/);
     assert.match(shell, /<McpPage hubHeader=\{extensionsHubHeader\}/);
     assert.match(shell, /<AutomationsPage[\s\S]*hubHeader=\{automationsHubHeader\}/);
diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx
index 9929a00b69..4fb803db14 100644
--- a/apps/desktop/src/renderer/app-shell.tsx
+++ b/apps/desktop/src/renderer/app-shell.tsx
@@ -35,7 +35,7 @@ import {
   type MakaUriDest,
   MakaUriContext,
   LocaleProvider,
-  ModuleHubSwitch,
+  ModuleHubSelector,
   ToastProvider,
   type NavSelection,
   SessionListPanel,
@@ -315,7 +315,7 @@ function AppShellContent({
     title: moduleHubCopy.extensions.title,
     subtitle: moduleHubCopy.extensions.description,
     badge: (
-      <ModuleHubSwitch
+      <ModuleHubSelector
         hub="extensions"
         value={navSelection.section === 'extensions' ? navSelection.module : navigationState.moduleMemory.extensions}
         onChange={(module) => setNavSelection({ section: 'extensions', module })}
@@ -326,7 +326,7 @@ function AppShellContent({
     title: moduleHubCopy.automations.title,
     subtitle: moduleHubCopy.automations.description,
     badge: (
-      <ModuleHubSwitch
+      <ModuleHubSelector
         hub="automations"
         value={navSelection.section === 'automations' ? navSelection.module : navigationState.moduleMemory.automations}
         onChange={(module) => setNavSelection({ section: 'automations', module })}
diff --git a/apps/desktop/src/renderer/styles/module-pages/module-shell.css b/apps/desktop/src/renderer/styles/module-pages/module-shell.css
index 53c789dd59..1b7c69c917 100644
--- a/apps/desktop/src/renderer/styles/module-pages/module-shell.css
+++ b/apps/desktop/src/renderer/styles/module-pages/module-shell.css
@@ -54,14 +54,57 @@
 
 .maka-module-hub-heading {
   align-items: center;
-  column-gap: var(--space-3);
+  column-gap: var(--space-2);
   row-gap: var(--space-2);
 }
 
-.maka-module-hub-switch {
+.maka-module-hub-selector {
+  display: inline-flex;
+  flex: none;
+  align-items: center;
+  gap: var(--space-2);
+  white-space: nowrap;
+}
+
+.maka-module-hub-separator {
+  color: var(--border-strong);
+  font-size: 2em;
+  font-weight: var(--font-weight-normal);
+  line-height: var(--leading-tight);
+}
+
+.maka-module-hub-selector-trigger {
+  width: auto;
+  min-width: 0;
+  height: auto;
+  min-height: 0;
+  gap: var(--space-2);
+  padding: var(--space-1);
+  color: var(--foreground);
+  font-size: 2em;
+  font-weight: var(--font-weight-semibold);
+  letter-spacing: var(--tracking-normal);
+  line-height: var(--leading-tight);
+}
+
+.maka-module-hub-selector-trigger > svg {
   flex: none;
 }
 
+.maka-module-hub-selector-chevron {
+  color: var(--foreground-secondary);
+}
+
+.maka-module-hub-selector-menu {
+  min-width: 180px;
+}
+
+.maka-module-hub-selector-option {
+  display: inline-flex;
+  align-items: center;
+  gap: var(--space-2);
+}
+
 .maka-module-main-actions {
   display: inline-flex;
   align-items: center;
diff --git a/apps/desktop/stories/module-hubs.stories.tsx b/apps/desktop/stories/module-hubs.stories.tsx
index 1a4980c579..b02d0cef14 100644
--- a/apps/desktop/stories/module-hubs.stories.tsx
+++ b/apps/desktop/stories/module-hubs.stories.tsx
@@ -3,7 +3,7 @@ import type { ReactNode } from 'react';
 import {
   AutomationsPage,
   getSharedUiCopy,
-  ModuleHubSwitch,
+  ModuleHubSelector,
   SkillsPage,
   ToastProvider,
   useUiLocale,
@@ -38,7 +38,7 @@ function ExtensionsSkillsSurface() {
         hubHeader={{
           title: copy.title,
           subtitle: copy.description,
-          badge: <ModuleHubSwitch hub="extensions" value="skills" onChange={() => {}} />,
+          badge: <ModuleHubSelector hub="extensions" value="skills" onChange={() => {}} />,
         }}
         skills={[]}
         managedSkillSources={[]}
@@ -56,7 +56,7 @@ function ScheduledPlanRemindersSurface() {
         hubHeader={{
           title: copy.title,
           subtitle: copy.description,
-          badge: <ModuleHubSwitch hub="automations" value="plan-reminders" onChange={() => {}} />,
+          badge: <ModuleHubSelector hub="automations" value="plan-reminders" onChange={() => {}} />,
         }}
         skills={[]}
         reminders={[]}
diff --git a/packages/ui/src/__tests__/sidebar-subtraction.test.tsx b/packages/ui/src/__tests__/sidebar-subtraction.test.tsx
index fcbe600132..7172a58a76 100644
--- a/packages/ui/src/__tests__/sidebar-subtraction.test.tsx
+++ b/packages/ui/src/__tests__/sidebar-subtraction.test.tsx
@@ -3,7 +3,7 @@ import { describe, it } from 'node:test';
 import { renderToStaticMarkup } from 'react-dom/server';
 import type { SessionSummary } from '@maka/core';
 import { LocaleProvider } from '../locale-context.js';
-import { ModuleHubSwitch } from '../module-hub-switch.js';
+import { ModuleHubSelector } from '../module-hub-selector.js';
 import { SessionListPanel } from '../session-list-panel.js';
 import { SessionSidebarNav } from '../session-sidebar-nav.js';
 
@@ -32,24 +32,27 @@ describe('sidebar subtraction', () => {
     assert.doesNotMatch(markup, /aria-expanded=/);
   });
 
-  it('renders the two hub switches as localized persistent choices', () => {
+  it('renders each child module as a localized path selector instead of a segmented control', () => {
     const extensions = renderToStaticMarkup(
       <LocaleProvider locale="zh">
-        <ModuleHubSwitch hub="extensions" value="skills" onChange={() => {}} />
+        <ModuleHubSelector hub="extensions" value="skills" onChange={() => {}} />
       </LocaleProvider>,
     );
     const automations = renderToStaticMarkup(
       <LocaleProvider locale="zh">
-        <ModuleHubSwitch hub="automations" value="plan-reminders" onChange={() => {}} />
+        <ModuleHubSelector hub="automations" value="plan-reminders" onChange={() => {}} />
       </LocaleProvider>,
     );
 
-    assert.match(extensions, /aria-label="扩展内容"/);
+    assert.match(extensions, /class="maka-module-hub-selector"/);
+    assert.match(extensions, /aria-label="扩展内容：技能"/);
+    assert.match(extensions, /aria-haspopup="menu"/);
     assert.match(extensions, />技能</);
-    assert.match(extensions, />MCP</);
-    assert.match(automations, /aria-label="定时任务内容"/);
+    assert.doesNotMatch(extensions, /maka-segmented/);
+    assert.match(automations, /class="maka-module-hub-selector"/);
+    assert.match(automations, /aria-label="定时任务内容：计划提醒"/);
     assert.match(automations, />计划提醒</);
-    assert.match(automations, />每日回顾</);
+    assert.doesNotMatch(automations, /maka-segmented/);
   });
 
   it('moves session grouping from a permanent segmented control into the list heading', () => {
diff --git a/packages/ui/src/components.tsx b/packages/ui/src/components.tsx
index bca8600804..7abc4648df 100644
--- a/packages/ui/src/components.tsx
+++ b/packages/ui/src/components.tsx
@@ -6,8 +6,8 @@ export type {
   SessionFilter,
 } from './nav-selection.js';
 export { CapabilityAuditStrip } from './capability-audit-strip.js';
-export { ModuleHubSwitch } from './module-hub-switch.js';
-export type { ModuleHubHeader } from './module-hub-switch.js';
+export { ModuleHubSelector } from './module-hub-selector.js';
+export type { ModuleHubHeader } from './module-hub-selector.js';
 export { SearchModal } from './search-modal.js';
 export { SessionListPanel } from './session-list-panel.js';
 export type { SessionViewMode } from './session-list-panel.js';
diff --git a/packages/ui/src/daily-review-panel.tsx b/packages/ui/src/daily-review-panel.tsx
index 2850ebe889..9af6013fe2 100644
--- a/packages/ui/src/daily-review-panel.tsx
+++ b/packages/ui/src/daily-review-panel.tsx
@@ -29,7 +29,7 @@ import { StatTile } from './primitives/stat-tile.js';
 import { SectionHeader } from './primitives/section-header.js';
 import { PageHeader } from './primitives/page-header.js';
 import type { DailyReviewBridge, DailyReviewMarkdownActionInput } from './module-panel-types.js';
-import type { ModuleHubHeader } from './module-hub-switch.js';
+import type { ModuleHubHeader } from './module-hub-selector.js';
 import { RelativeTime } from './relative-time.js';
 import { Markdown } from './markdown.js';
 import { useUiLocale } from './locale-context.js';
diff --git a/packages/ui/src/module-hub-selector.tsx b/packages/ui/src/module-hub-selector.tsx
new file mode 100644
index 0000000000..009006cf82
--- /dev/null
+++ b/packages/ui/src/module-hub-selector.tsx
@@ -0,0 +1,99 @@
+import type { ReactNode } from 'react';
+import type { AutomationModule, ExtensionModule } from './nav-selection.js';
+import { useUiLocale } from './locale-context.js';
+import { Blocks, CalendarCheck, ChevronDown, Plug, Sun } from './icons.js';
+import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from './primitives/menu.js';
+import { getSharedUiCopy } from './shared-ui-copy.js';
+import { Button } from './ui.js';
+
+export type ModuleHubHeader = {
+  title: string;
+  subtitle?: string;
+  badge: ReactNode;
+};
+
+type ModuleHubSelectorProps =
+  | {
+      hub: 'extensions';
+      value: ExtensionModule;
+      onChange(value: ExtensionModule): void;
+    }
+  | {
+      hub: 'automations';
+      value: AutomationModule;
+      onChange(value: AutomationModule): void;
+    };
+
+type SelectorOption = readonly [value: string, label: string, icon: ReactNode];
+
+function Selector(props: {
+  value: string;
+  options: readonly SelectorOption[];
+  ariaLabel: string;
+  onChange(value: string): void;
+}) {
+  const selected = props.options.find(([value]) => value === props.value) ?? props.options[0];
+  if (!selected) return null;
+
+  return (
+    <span className="maka-module-hub-selector">
+      <span className="maka-module-hub-separator" aria-hidden="true">/</span>
+      <Menu>
+        <MenuTrigger
+          render={<Button variant="quiet" />}
+          className="maka-module-hub-selector-trigger"
+          aria-label={props.ariaLabel}
+        >
+          {selected[2]}
+          <span>{selected[1]}</span>
+          <ChevronDown className="maka-module-hub-selector-chevron" size={15} aria-hidden="true" />
+        </MenuTrigger>
+        <MenuPopup className="maka-module-hub-selector-menu" align="start" sideOffset={6}>
+          <MenuRadioGroup value={props.value} onValueChange={props.onChange}>
+            {props.options.map(([value, label, icon]) => (
+              <MenuRadioItem key={value} value={value}>
+                <span className="maka-module-hub-selector-option">
+                  {icon}
+                  <span>{label}</span>
+                </span>
+              </MenuRadioItem>
+            ))}
+          </MenuRadioGroup>
+        </MenuPopup>
+      </Menu>
+    </span>
+  );
+}
+
+export function ModuleHubSelector(props: ModuleHubSelectorProps) {
+  const copy = getSharedUiCopy(useUiLocale()).moduleHubs;
+  if (props.hub === 'extensions') {
+    const options = [
+      ['skills', copy.extensions.skills, <Blocks key="skills" size={16} aria-hidden="true" />],
+      ['mcp', copy.extensions.mcp, <Plug key="mcp" size={16} aria-hidden="true" />],
+    ] as const;
+    const selectedLabel = options.find(([value]) => value === props.value)?.[1] ?? copy.extensions.skills;
+    return (
+      <Selector
+        value={props.value}
+        options={options}
+        ariaLabel={copy.extensions.selectorLabel(selectedLabel)}
+        onChange={(value) => props.onChange(value as ExtensionModule)}
+      />
+    );
+  }
+
+  const options = [
+    ['plan-reminders', copy.automations.planReminders, <CalendarCheck key="plan-reminders" size={16} aria-hidden="true" />],
+    ['daily-review', copy.automations.dailyReview, <Sun key="daily-review" size={16} aria-hidden="true" />],
+  ] as const;
+  const selectedLabel = options.find(([value]) => value === props.value)?.[1] ?? copy.automations.planReminders;
+  return (
+    <Selector
+      value={props.value}
+      options={options}
+      ariaLabel={copy.automations.selectorLabel(selectedLabel)}
+      onChange={(value) => props.onChange(value as AutomationModule)}
+    />
+  );
+}
diff --git a/packages/ui/src/module-hub-switch.tsx b/packages/ui/src/module-hub-switch.tsx
deleted file mode 100644
index 7e7e292070..0000000000
--- a/packages/ui/src/module-hub-switch.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import type { ReactNode } from 'react';
-import type { AutomationModule, ExtensionModule } from './nav-selection.js';
-import { useUiLocale } from './locale-context.js';
-import { Segmented } from './primitives/segmented.js';
-import { getSharedUiCopy } from './shared-ui-copy.js';
-
-export type ModuleHubHeader = {
-  title: string;
-  subtitle?: string;
-  badge: ReactNode;
-};
-
-type ModuleHubSwitchProps =
-  | {
-      hub: 'extensions';
-      value: ExtensionModule;
-      onChange(value: ExtensionModule): void;
-    }
-  | {
-      hub: 'automations';
-      value: AutomationModule;
-      onChange(value: AutomationModule): void;
-    };
-
-export function ModuleHubSwitch(props: ModuleHubSwitchProps) {
-  const copy = getSharedUiCopy(useUiLocale()).moduleHubs;
-  if (props.hub === 'extensions') {
-    return (
-      <Segmented
-        value={props.value}
-        options={[
-          ['skills', copy.extensions.skills],
-          ['mcp', copy.extensions.mcp],
-        ]}
-        onChange={props.onChange}
-        ariaLabel={copy.extensions.switchLabel}
-        className="maka-module-hub-switch"
-      />
-    );
-  }
-  return (
-    <Segmented
-      value={props.value}
-      options={[
-        ['plan-reminders', copy.automations.planReminders],
-        ['daily-review', copy.automations.dailyReview],
-      ]}
-      onChange={props.onChange}
-      ariaLabel={copy.automations.switchLabel}
-      className="maka-module-hub-switch"
-    />
-  );
-}
diff --git a/packages/ui/src/module-pages.tsx b/packages/ui/src/module-pages.tsx
index 6ef1690d56..d3178a6c2f 100644
--- a/packages/ui/src/module-pages.tsx
+++ b/packages/ui/src/module-pages.tsx
@@ -6,7 +6,7 @@ import { EmptyState } from './empty-state.js';
 import { PageHeader } from './primitives/page-header.js';
 import { useUiLocale } from './locale-context.js';
 import { getSharedUiCopy } from './shared-ui-copy.js';
-import type { ModuleHubHeader } from './module-hub-switch.js';
+import type { ModuleHubHeader } from './module-hub-selector.js';
 import type {
   BundledSkillCatalogEntry,
   DailyReviewBridge,
diff --git a/packages/ui/src/plan-reminder-panel.tsx b/packages/ui/src/plan-reminder-panel.tsx
index 0dcb9fabc8..f2014936ec 100644
--- a/packages/ui/src/plan-reminder-panel.tsx
+++ b/packages/ui/src/plan-reminder-panel.tsx
@@ -61,7 +61,7 @@ import { Input } from './primitives/input.js';
 import { Menu, MenuItem, MenuPopup, MenuTrigger } from './primitives/menu.js';
 import { EmptyState } from './empty-state.js';
 import { CapabilityAuditStrip } from './capability-audit-strip.js';
-import type { ModuleHubHeader } from './module-hub-switch.js';
+import type { ModuleHubHeader } from './module-hub-selector.js';
 import type {
   PlanReminderDraftInput,
   PlanReminderUpdatePatch,
diff --git a/packages/ui/src/shared-ui-copy.ts b/packages/ui/src/shared-ui-copy.ts
index 2593a04ecb..ef84d281e2 100644
--- a/packages/ui/src/shared-ui-copy.ts
+++ b/packages/ui/src/shared-ui-copy.ts
@@ -25,14 +25,14 @@ export interface SharedUiCopy {
     extensions: {
       title: string;
       description: string;
-      switchLabel: string;
+      selectorLabel: (module: string) => string;
       skills: string;
       mcp: string;
     };
     automations: {
       title: string;
       description: string;
-      switchLabel: string;
+      selectorLabel: (module: string) => string;
       planReminders: string;
       dailyReview: string;
     };
@@ -107,14 +107,14 @@ const SHARED_UI_COPY = {
       extensions: {
         title: '扩展',
         description: '管理 Maka 可调用的技能与外部工具。',
-        switchLabel: '扩展内容',
+        selectorLabel: (module) => `扩展内容：${module}`,
         skills: '技能',
         mcp: 'MCP',
       },
       automations: {
         title: '定时任务',
         description: '安排计划提醒，并回顾本机对话中的工作进展。',
-        switchLabel: '定时任务内容',
+        selectorLabel: (module) => `定时任务内容：${module}`,
         planReminders: '计划提醒',
         dailyReview: '每日回顾',
       },
@@ -173,14 +173,14 @@ const SHARED_UI_COPY = {
       extensions: {
         title: 'Extensions',
         description: 'Manage the skills and external tools Maka can use.',
-        switchLabel: 'Extension content',
+        selectorLabel: (module) => `Extension content: ${module}`,
         skills: 'Skills',
         mcp: 'MCP',
       },
       automations: {
         title: 'Scheduled tasks',
         description: 'Schedule reminders and review progress from local conversations.',
-        switchLabel: 'Scheduled task content',
+        selectorLabel: (module) => `Scheduled task content: ${module}`,
         planReminders: 'Plan reminders',
         dailyReview: 'Daily review',
       },
diff --git a/packages/ui/src/skills-panel.tsx b/packages/ui/src/skills-panel.tsx
index bc41b73750..432fd87808 100644
--- a/packages/ui/src/skills-panel.tsx
+++ b/packages/ui/src/skills-panel.tsx
@@ -22,7 +22,7 @@ import { SettingsSelect, type SettingsSelectOption } from './primitives/settings
 import { EmptyState } from './empty-state.js';
 import { SectionHeader } from './primitives/section-header.js';
 import { CapabilityAuditStrip } from './capability-audit-strip.js';
-import type { ModuleHubHeader } from './module-hub-switch.js';
+import type { ModuleHubHeader } from './module-hub-selector.js';
 import type { BundledSkillCatalogEntry, ManagedSkillCategory, ManagedSkillSourceEntry, ManagedSkillUpdatePreview, SkillEntry } from './module-panel-types.js';
 import { getSkillsCopy, type SkillsCopy } from './skills-copy.js';
 import { useUiLocale } from './locale-context.js';

From d714c744d95abb1e1147d8cae73f7f8b84fdb429 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Fri, 24 Jul 2026 18:54:26 +0800
Subject: [PATCH 3/4] fix(ui): preserve scheduled task accessible name

---
 .../__tests__/sidebar-subtraction.test.tsx    | 32 ++++++++++++++++++-
 packages/ui/src/shell-controls-copy.ts        |  2 +-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/__tests__/sidebar-subtraction.test.tsx b/packages/ui/src/__tests__/sidebar-subtraction.test.tsx
index 7172a58a76..c0128746d6 100644
--- a/packages/ui/src/__tests__/sidebar-subtraction.test.tsx
+++ b/packages/ui/src/__tests__/sidebar-subtraction.test.tsx
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 import { renderToStaticMarkup } from 'react-dom/server';
-import type { SessionSummary } from '@maka/core';
+import type { PlanReminder, SessionSummary } from '@maka/core';
 import { LocaleProvider } from '../locale-context.js';
 import { ModuleHubSelector } from '../module-hub-selector.js';
 import { SessionListPanel } from '../session-list-panel.js';
@@ -32,6 +32,36 @@ describe('sidebar subtraction', () => {
     assert.doesNotMatch(markup, /aria-expanded=/);
   });
 
+  it('keeps the visible scheduled-task label in its pending-reminder accessible name', () => {
+    const reminder: PlanReminder = {
+      id: 'reminder-1',
+      title: 'Review open work',
+      note: '',
+      schedule: { kind: 'once', runAt: 1 },
+      delivery: { channel: 'local' },
+      status: 'scheduled',
+      enabled: true,
+      createdAt: 1,
+      updatedAt: 1,
+      runs: [],
+      runCount: 0,
+    };
+    const markup = renderToStaticMarkup(
+      <LocaleProvider locale="en">
+        <SessionSidebarNav
+          selection={{ section: 'automations', module: 'plan-reminders' }}
+          planReminders={[reminder]}
+          onSelect={() => {}}
+          onNew={() => {}}
+        />
+      </LocaleProvider>,
+    );
+
+    assert.match(markup, /aria-label="Scheduled tasks, 1 unfinished reminder"/);
+    assert.match(markup, />Scheduled tasks</);
+    assert.doesNotMatch(markup, /aria-label="Automations,/);
+  });
+
   it('renders each child module as a localized path selector instead of a segmented control', () => {
     const extensions = renderToStaticMarkup(
       <LocaleProvider locale="zh">
diff --git a/packages/ui/src/shell-controls-copy.ts b/packages/ui/src/shell-controls-copy.ts
index 7c1fd499a2..e86be3b204 100644
--- a/packages/ui/src/shell-controls-copy.ts
+++ b/packages/ui/src/shell-controls-copy.ts
@@ -70,7 +70,7 @@ const SHELL_CONTROLS_COPY_BY_LOCALE = {
       automations: 'Scheduled tasks',
       extensions: 'Extensions',
       settings: 'Settings',
-      pendingReminders: (count: number) => `Automations, ${count} unfinished ${count === 1 ? 'reminder' : 'reminders'}`,
+      pendingReminders: (count: number) => `Scheduled tasks, ${count} unfinished ${count === 1 ? 'reminder' : 'reminders'}`,
     },
     search: {
       title: 'Search',

From bd4f507bb1fc7c68e5944dd4fd64df67f7bdac28 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Fri, 24 Jul 2026 18:54:26 +0800
Subject: [PATCH 4/4] test(e2e): cover sidebar choice persistence

---
 apps/desktop/e2e/sidebar-navigation.spec.ts | 39 +++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 apps/desktop/e2e/sidebar-navigation.spec.ts

diff --git a/apps/desktop/e2e/sidebar-navigation.spec.ts b/apps/desktop/e2e/sidebar-navigation.spec.ts
new file mode 100644
index 0000000000..28b3ab1a05
--- /dev/null
+++ b/apps/desktop/e2e/sidebar-navigation.spec.ts
@@ -0,0 +1,39 @@
+import type { Page } from '@playwright/test';
+import { test, expect } from './fixtures.js';
+
+async function expandedSidebar(page: Page) {
+  const expand = page.getByRole('button', { name: '展开侧边栏' });
+  if (await expand.count()) await expand.click();
+  return page.getByRole('complementary', { name: '对话列表' });
+}
+
+test('session grouping menu applies and retains the selected mode', async ({ window: page }) => {
+  const sidebar = await expandedSidebar(page);
+  const grouping = sidebar.getByRole('button', { name: '会话分组方式' });
+
+  await grouping.click();
+  const byStatus = page.getByRole('menuitemradio', { name: '按状态' });
+  const byProject = page.getByRole('menuitemradio', { name: '按项目' });
+  await expect(byStatus).toHaveAttribute('aria-checked', 'true');
+  await byProject.click();
+
+  await grouping.click();
+  await expect(page.getByRole('menuitemradio', { name: '按项目' })).toHaveAttribute('aria-checked', 'true');
+  await expect(page.getByRole('menuitemradio', { name: '按状态' })).toHaveAttribute('aria-checked', 'false');
+});
+
+test('scheduled-task hub restores the last selected child module', async ({ window: page }) => {
+  const sidebar = await expandedSidebar(page);
+  const scheduledTasks = sidebar.getByRole('button', { name: '定时任务', exact: true });
+  await scheduledTasks.click();
+
+  const selector = page.locator('.maka-module-hub-selector-trigger');
+  await expect(selector).toHaveAccessibleName('定时任务内容：计划提醒');
+  await selector.click();
+  await page.getByRole('menuitemradio', { name: '每日回顾' }).click();
+  await expect(selector).toHaveAccessibleName('定时任务内容：每日回顾');
+
+  await sidebar.getByRole('button', { name: '扩展', exact: true }).click();
+  await scheduledTasks.click();
+  await expect(selector).toHaveAccessibleName('定时任务内容：每日回顾');
+});