From 6e721b9fdd5524b31fc399bf7b72f0cba0f32cba Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 00:16:05 +0800
Subject: [PATCH 01/15] feat(gui): settings panel with locale and theme
 preferences

Add the browser Settings surface as slot-composed plugins over new
preference services:

- Rename dsh-client-i18n to dsh-client-locale (locale is the domain
  name); LocaleService adds getLocale()/setLocale(id), immutable
  snapshots, a locale/change event, and dsh.locale persistence.
- ThemeService owns the light/dark/system preference (default system),
  resolves system via prefers-color-scheme, publishes theme/change
  snapshots, persists dsh.theme, and no longer touches the DOM;
  ui-layout's ThemePresenter applies resolved snapshots
  (body[data-ds-dark-theme] + alias tokens) and cleans up on dispose.
- ui-sidebar drops the phase-1 settings dropdown/modal; the foot renders
  the new sidebar.settings slot with the column state.
- New ui-settings shell occupies sidebar.settings: foot trigger row and
  the centered 1080x700 panel (figma 501:29947) with 24% mask, close
  button / mask click / Escape all closing, and a 188px nav projected
  from the settings.section list slot it declares. Nav labels are
  registrant-localized; sections re-register on locale change, so the
  ledger version is the shell's only subscription.
- ui-settings-general registers the General section: Permission and
  Tool Call skeletons, live Language (locale menu) and Appearance
  (Light/Dark/System cubes following the persisted preference); its
  slot store mirrors both service snapshots via apply-side listeners.
- ui-settings-models registers the Models nav entry with an empty
  content column.
- Portaled menus pin z-index above modal overlays (a menu anchored
  inside the settings dialog rendered underneath it and was
  unclickable).
- theme/data/list-pen icons in ui-primitives; settings copy ships as
  zh/en dictionaries; fixture manifests gain the settings rows.
---
 ...6-07-25-client-settings-locale-theme.zh.md |  99 +++++++++
 apps/cli/cordis.yml                           |  13 +-
 apps/cli/package.json                         |   5 +-
 apps/cli/tsconfig.json                        |  11 +-
 apps/web/tests/session-title.snapshot.ts      |   5 +-
 apps/web/tests/smoke-real.e2e.ts              |   2 +-
 apps/web/tests/workspace-flow.snapshot.ts     |   5 +-
 packages/client/i18n/README.md                |  16 --
 packages/client/i18n/src/client/index.ts      | 108 ---------
 packages/client/i18n/tests/i18n.spec.ts       |  53 -----
 packages/client/i18n/tests/invariant.spec.ts  |  30 ---
 packages/client/i18n/tsdown.config.ts         |   3 -
 packages/client/locale/README.md              |  16 ++
 packages/client/{i18n => locale}/package.json |  13 +-
 packages/client/locale/src/client/index.ts    | 195 +++++++++++++++++
 packages/client/{i18n => locale}/src/index.ts |   2 +-
 .../client/{i18n => locale}/src/invariant.ts  |   8 +-
 .../client/{i18n => locale}/src/locales/en.ts |   0
 .../client/{i18n => locale}/src/locales/zh.ts |   0
 .../client/locale/tests/invariant.spec.ts     |  30 +++
 packages/client/locale/tests/locale.spec.ts   |  90 ++++++++
 .../client/{i18n => locale}/tsconfig.json     |   3 -
 packages/client/locale/tsdown.config.ts       |   3 +
 packages/client/tsdown.client.ts              |   2 +-
 packages/client/ui-conversation/package.json  |   2 +-
 .../tests/apply-inject.spec.tsx               |   2 +-
 .../ui-conversation/tests/chat-apply.spec.tsx |   2 +-
 .../tests/chat-toolview-slot.spec.tsx         |   4 +-
 packages/client/ui-conversation/tsconfig.json |   2 +-
 packages/client/ui-layout/README.md           |   2 +-
 packages/client/ui-layout/package.json        |   5 +-
 packages/client/ui-layout/src/client/index.ts |  19 +-
 .../ui-layout/src/client/theme-presenter.ts   |  43 ++++
 packages/client/ui-layout/tests/apply.spec.ts |  21 +-
 .../ui-layout/tests/theme-presenter.spec.ts   |  56 +++++
 packages/client/ui-layout/tsconfig.json       |   3 +
 .../client/ui-primitives/src/Menu.module.css  |   4 +-
 .../client/ui-primitives/src/icons/index.tsx  |  87 ++++++++
 .../client/ui-primitives/tests/icons.spec.tsx |   4 +-
 packages/client/ui-settings-general/README.md |  15 ++
 .../client/ui-settings-general/package.json   |  70 ++++++
 .../src/client/GeneralSection.module.css      | 131 +++++++++++
 .../src/client/GeneralSection.tsx             | 118 ++++++++++
 .../src/client/contract.ts                    |  66 ++++++
 .../ui-settings-general/src/client/index.ts   | 111 ++++++++++
 .../ui-settings-general/src/client/locales.ts |  42 ++++
 .../ui-settings-general/src/client/store.ts   |  43 ++++
 .../ui-settings-general/src/css-modules.d.ts  |   6 +
 .../client/ui-settings-general/src/index.ts   |   4 +
 .../ui-settings-general/src/invariant.ts      |  32 +++
 .../client/ui-settings-general/tsconfig.json  |  36 +++
 .../ui-settings-general/tsdown.config.ts      |   3 +
 packages/client/ui-settings-models/README.md  |  15 ++
 .../client/ui-settings-models/package.json    |  63 ++++++
 .../src/client/ModelsSection.tsx              |  13 ++
 .../ui-settings-models/src/client/index.ts    |  63 ++++++
 .../ui-settings-models/src/css-modules.d.ts   |   6 +
 .../client/ui-settings-models/src/index.ts    |   4 +
 .../ui-settings-models/src/invariant.ts       |  31 +++
 .../client/ui-settings-models/tsconfig.json   |  30 +++
 .../ui-settings-models/tsdown.config.ts       |   3 +
 packages/client/ui-settings/README.md         |  15 ++
 packages/client/ui-settings/package.json      |  68 ++++++
 .../src/client/SettingsRoot.module.css        | 192 ++++++++++++++++
 .../ui-settings/src/client/SettingsRoot.tsx   | 125 +++++++++++
 .../ui-settings/src/client/contract/slots.ts  |  62 ++++++
 .../client/ui-settings/src/client/index.ts    |  66 ++++++
 .../client/ui-settings/src/css-modules.d.ts   |   6 +
 packages/client/ui-settings/src/index.ts      |   4 +
 packages/client/ui-settings/src/invariant.ts  |  32 +++
 packages/client/ui-settings/tsconfig.json     |  33 +++
 packages/client/ui-settings/tsdown.config.ts  |   3 +
 packages/client/ui-sidebar/README.md          |   4 +-
 .../src/client/SidebarRoot.module.css         |  46 +---
 .../ui-sidebar/src/client/SidebarRoot.tsx     |   9 +-
 .../ui-sidebar/src/client/contract/slots.ts   |  22 +-
 .../client/ui-sidebar/src/client/index.ts     |  11 +-
 .../ui-sidebar/tests/sidebar-root.spec.tsx    |  16 +-
 packages/client/ui-theme/README.md            |   5 +-
 packages/client/ui-theme/package.json         |   8 +-
 packages/client/ui-theme/src/client/index.ts  | 207 ++++++++++++++----
 packages/client/ui-theme/src/invariant.ts     |   7 +-
 packages/client/ui-theme/tests/theme.spec.ts  | 109 +++++----
 packages/client/web/src/boot.tsx              |   2 +-
 pnpm-lock.yaml                                | 120 +++++++++-
 .../verify-package-readme-model-experience.ts |   2 +-
 tsconfig.base.json                            |   5 +-
 tsconfig.client.json                          |   5 +-
 88 files changed, 2653 insertions(+), 404 deletions(-)
 create mode 100644 .agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
 delete mode 100644 packages/client/i18n/README.md
 delete mode 100644 packages/client/i18n/src/client/index.ts
 delete mode 100644 packages/client/i18n/tests/i18n.spec.ts
 delete mode 100644 packages/client/i18n/tests/invariant.spec.ts
 delete mode 100644 packages/client/i18n/tsdown.config.ts
 create mode 100644 packages/client/locale/README.md
 rename packages/client/{i18n => locale}/package.json (78%)
 create mode 100644 packages/client/locale/src/client/index.ts
 rename packages/client/{i18n => locale}/src/index.ts (61%)
 rename packages/client/{i18n => locale}/src/invariant.ts (86%)
 rename packages/client/{i18n => locale}/src/locales/en.ts (100%)
 rename packages/client/{i18n => locale}/src/locales/zh.ts (100%)
 create mode 100644 packages/client/locale/tests/invariant.spec.ts
 create mode 100644 packages/client/locale/tests/locale.spec.ts
 rename packages/client/{i18n => locale}/tsconfig.json (87%)
 create mode 100644 packages/client/locale/tsdown.config.ts
 create mode 100644 packages/client/ui-layout/src/client/theme-presenter.ts
 create mode 100644 packages/client/ui-layout/tests/theme-presenter.spec.ts
 create mode 100644 packages/client/ui-settings-general/README.md
 create mode 100644 packages/client/ui-settings-general/package.json
 create mode 100644 packages/client/ui-settings-general/src/client/GeneralSection.module.css
 create mode 100644 packages/client/ui-settings-general/src/client/GeneralSection.tsx
 create mode 100644 packages/client/ui-settings-general/src/client/contract.ts
 create mode 100644 packages/client/ui-settings-general/src/client/index.ts
 create mode 100644 packages/client/ui-settings-general/src/client/locales.ts
 create mode 100644 packages/client/ui-settings-general/src/client/store.ts
 create mode 100644 packages/client/ui-settings-general/src/css-modules.d.ts
 create mode 100644 packages/client/ui-settings-general/src/index.ts
 create mode 100644 packages/client/ui-settings-general/src/invariant.ts
 create mode 100644 packages/client/ui-settings-general/tsconfig.json
 create mode 100644 packages/client/ui-settings-general/tsdown.config.ts
 create mode 100644 packages/client/ui-settings-models/README.md
 create mode 100644 packages/client/ui-settings-models/package.json
 create mode 100644 packages/client/ui-settings-models/src/client/ModelsSection.tsx
 create mode 100644 packages/client/ui-settings-models/src/client/index.ts
 create mode 100644 packages/client/ui-settings-models/src/css-modules.d.ts
 create mode 100644 packages/client/ui-settings-models/src/index.ts
 create mode 100644 packages/client/ui-settings-models/src/invariant.ts
 create mode 100644 packages/client/ui-settings-models/tsconfig.json
 create mode 100644 packages/client/ui-settings-models/tsdown.config.ts
 create mode 100644 packages/client/ui-settings/README.md
 create mode 100644 packages/client/ui-settings/package.json
 create mode 100644 packages/client/ui-settings/src/client/SettingsRoot.module.css
 create mode 100644 packages/client/ui-settings/src/client/SettingsRoot.tsx
 create mode 100644 packages/client/ui-settings/src/client/contract/slots.ts
 create mode 100644 packages/client/ui-settings/src/client/index.ts
 create mode 100644 packages/client/ui-settings/src/css-modules.d.ts
 create mode 100644 packages/client/ui-settings/src/index.ts
 create mode 100644 packages/client/ui-settings/src/invariant.ts
 create mode 100644 packages/client/ui-settings/tsconfig.json
 create mode 100644 packages/client/ui-settings/tsdown.config.ts

diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
new file mode 100644
index 0000000000..d3c61794b9
--- /dev/null
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
@@ -0,0 +1,99 @@
+# Agent Note: Client Settings、Locale 与 Theme 分层
+
+Status: proposed
+
+## Problem
+
+浏览器端已有的 Settings 直接写在 Sidebar 内，语言和主题也由组件本地状态直接改 DOM。这使 Settings 无法由独立插件扩展，偏好状态没有稳定的跨插件服务契约，主题 registry 同时承担状态与呈现职责。
+
+## Proposal
+
+Sidebar 声明 `sidebar.settings` 单坑位，`ui-settings` 占用它并声明 `settings.section` list 坑位。每个 section 由独立插件贡献；Settings 壳只从 slot ledger 读取 entry metadata 生成导航，通过 `only` 渲染当前 section。
+
+Settings 入口是 sidebar Foot 的 Settings 行，点击直接打开 1080×700 居中浮层（黑 24% 遮罩）；close 按钮、点击遮罩、ESC 均关闭。无任何中间菜单形态。
+
+`@deepseek-ai/dsh-client-locale` 提供 `ctx.locale`，`ui-theme` 提供 `ctx.theme`。两个 service 都以 getter 读取、setter 写入并用 typed Cordis change event 发布 immutable snapshot；service 自己持久化偏好（只存 id，坏值回退默认）。
+
+General 的 apply 层订阅 `locale/change` 和 `theme/change`，把 snapshot 投影到该 section 声明的 Zustand store。React 组件只读 `useStore`、写注入的 setter callback，不读取 ctx 或 service。
+
+Theme 偏好三态：`light`、`dark`、`system`，默认 `system`（无持久化偏好或坏值时）。system 的解析属主题领域：ThemeService 持有 `prefers-color-scheme` matchMedia 监听（环境感知，非 DOM 呈现），偏好为 system 且系统配色变化时重发 snapshot；snapshot 同时携带 `preference` 与解析后的 `active` 定义。
+
+Theme service 不操作 DOM。`ui-layout` 初始读取 Theme getter，随后订阅 `theme/change`，由 Layout 持有的 presenter 按 `active` 更新 `body[data-ds-dark-theme]` 和主题 token；presenter 不感知 system，只消费已解析结果。
+
+### 首期 section 范围
+
+| section | 插件 | 首期内容 |
+|---|---|---|
+| General | `ui-settings-general` | Language（Selector 下拉）与 Appearance（Light/Dark/System 三 cube）真实可切；Permission、Tool Call 仅视觉骨架，无写操作 |
+| Models | `ui-settings-models` | 仅导航项，内容区为空 |
+| Plugin | 不建包 | 首期不做，导航不出现该项（无目标的外链入口不上屏；后续插件注册 section 即自动出现） |
+
+首期只翻译 Settings 浮层内文案（General 各行 + 导航）；其他页面文案不动。
+
+### Slot topology
+
+```text
+root
+└─ sidebar
+   └─ sidebar.settings                 single/root
+      └─ ui-settings
+         └─ settings.section           list/root
+            ├─ general                 ui-settings-general
+            └─ models                  ui-settings-models
+```
+
+section contribution 使用 declaration-aware deferral，不依赖 client manifest 的 apply 顺序。
+
+### Service contracts
+
+```ts
+type ThemePreference = 'light' | 'dark' | 'system'
+
+interface ThemeSnapshot {
+  preference: ThemePreference
+  active: ThemeDefinition            // system 已解析为具体 light/dark 定义
+  themes: readonly ThemeDefinition[]
+  revision: number
+}
+
+interface LocaleSnapshot {
+  active: 'zh' | 'en'
+  locales: readonly LocaleDefinition[]
+  revision: number
+}
+
+interface Events {
+  /** @param snapshot - Current locale registry snapshot. @mode emit */
+  'locale/change'(snapshot: LocaleSnapshot): void
+  /** @param snapshot - Current theme registry snapshot. @mode emit */
+  'theme/change'(snapshot: ThemeSnapshot): void
+}
+```
+
+Locale 内置中文和 English；`setLocale`/`setTheme` 是唯一写入口，未知 id 失败。
+
+## Alternatives considered
+
+**由 app shell 统一订阅偏好并重渲染 root slot tree。** 语言和主题变化只需要更新实际消费者；全树刷新放大影响面，也把业务偏好接入 shell。
+
+**Theme service 直接修改 DOM。** registry service 因此依赖呈现环境，生命周期与全局样式所有权不清；Layout 已经拥有页面根呈现边界。
+
+**system 由 Layout presenter 解析。** presenter 需自带 matchMedia 订阅并在 themes 列表里挑选具体定义，呈现层被迫理解偏好语义；解析放服务侧则所有消费者拿到一致的已解析 snapshot。
+
+**Settings import 并枚举各 section。** 新增页面必须修改壳插件，破坏「每个功能由自己的插件占坑」的组合模型。
+
+**把 Locale/Theme snapshot 直接注入 React。** inject 结果按 entry identity 缓存，易变值会陈旧；为每个 service 自造 React hook 也绕开 slot store 的统一绑定。
+
+## Acceptance criteria
+
+- Settings 壳只依赖 slot ledger，不依赖任一 section 实现。
+- Locale 与 Theme 的写入只走 setter，持续同步只走 change event。
+- General store 初始化走 getter，后续由两个 event 更新并局部重渲染。
+- Layout 独立应用 Theme snapshot，Theme service 不访问 DOM；presenter 不出现 system 分支。
+- 中文/English 与 Light/Dark/System 能切换并刷新后恢复；偏好为 system 时系统配色变化即时生效。
+- Models 只有导航项与空内容区；Permission、Tool Call 骨架无写操作。
+- 浮层经 close 按钮、遮罩点击、ESC 均可关闭。
+
+## Risks
+
+slot 声明与 contribution 的 apply 顺序不固定，所有新 section 必须保留 declaration-aware registration 和幂等防护。service event 可能早于 section 首次渲染，General store 的 init 与 controller attach 都必须从 getter 对齐当前 snapshot。Layout 卸载时必须清理自己设置的全局属性，ThemeService dispose 时必须移除 matchMedia 监听，避免 HMR 后残留。
diff --git a/apps/cli/cordis.yml b/apps/cli/cordis.yml
index b89df77c46..8412a313b4 100644
--- a/apps/cli/cordis.yml
+++ b/apps/cli/cordis.yml
@@ -221,8 +221,8 @@
 - id: ui-theme
   name: '@deepseek-ai/dsh-client-ui-theme'
 
-- id: i18n
-  name: '@deepseek-ai/dsh-client-i18n'
+- id: locale
+  name: '@deepseek-ai/dsh-client-locale'
 
 - id: ui-layout
   name: '@deepseek-ai/dsh-client-ui-layout'
@@ -230,6 +230,15 @@
 - id: ui-sidebar
   name: '@deepseek-ai/dsh-client-ui-sidebar'
 
+- id: ui-settings
+  name: '@deepseek-ai/dsh-client-ui-settings'
+
+- id: ui-settings-general
+  name: '@deepseek-ai/dsh-client-ui-settings-general'
+
+- id: ui-settings-models
+  name: '@deepseek-ai/dsh-client-ui-settings-models'
+
 - id: ui-conversation
   name: '@deepseek-ai/dsh-client-ui-conversation'
 
diff --git a/apps/cli/package.json b/apps/cli/package.json
index e1c07f90b5..74a6e417e1 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -23,13 +23,16 @@
     "@deepseek-ai/dsh-bash-local": "workspace:^",
     "@deepseek-ai/dsh-client-connection": "workspace:^",
     "@deepseek-ai/dsh-client-hmr": "workspace:^",
-    "@deepseek-ai/dsh-client-i18n": "workspace:^",
+    "@deepseek-ai/dsh-client-locale": "workspace:^",
     "@deepseek-ai/dsh-client-modules": "workspace:^",
     "@deepseek-ai/dsh-client-runtime": "workspace:^",
     "@deepseek-ai/dsh-client-ui-conversation": "workspace:^",
     "@deepseek-ai/dsh-client-ui-layout": "workspace:^",
     "@deepseek-ai/dsh-client-ui-question": "workspace:^",
     "@deepseek-ai/dsh-client-ui-sidebar": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-settings": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-settings-general": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-settings-models": "workspace:^",
     "@deepseek-ai/dsh-client-ui-theme": "workspace:^",
     "@deepseek-ai/dsh-client-ui-trajectory": "workspace:^",
     "@deepseek-ai/dsh-client-ui-workspace": "workspace:^",
diff --git a/apps/cli/tsconfig.json b/apps/cli/tsconfig.json
index 4db4861b93..7614ae2e31 100644
--- a/apps/cli/tsconfig.json
+++ b/apps/cli/tsconfig.json
@@ -42,7 +42,16 @@
       "path": "../../packages/client/ui-theme"
     },
     {
-      "path": "../../packages/client/i18n"
+      "path": "../../packages/client/ui-settings"
+    },
+    {
+      "path": "../../packages/client/ui-settings-general"
+    },
+    {
+      "path": "../../packages/client/ui-settings-models"
+    },
+    {
+      "path": "../../packages/client/locale"
     },
     {
       "path": "../../packages/client/ui-layout"
diff --git a/apps/web/tests/session-title.snapshot.ts b/apps/web/tests/session-title.snapshot.ts
index c1616bb724..b8ee3408a3 100644
--- a/apps/web/tests/session-title.snapshot.ts
+++ b/apps/web/tests/session-title.snapshot.ts
@@ -10,9 +10,12 @@ const PLUGINS: readonly (WebBootEntry & { dir: string })[] = [
   { id: '@deepseek-ai/dsh-client-connection', dir: 'connection', url: '/plugins/connection.js', rev: 'fx', inject: [], immediately: true },
   { id: '@deepseek-ai/dsh-client-runtime', dir: 'runtime', url: '/plugins/runtime.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-connection'], immediately: true },
   { id: '@deepseek-ai/dsh-client-ui-theme', dir: 'ui-theme', url: '/plugins/ui-theme.js', rev: 'fx', inject: [], immediately: true },
-  { id: '@deepseek-ai/dsh-client-i18n', dir: 'i18n', url: '/plugins/i18n.js', rev: 'fx', inject: [], immediately: true },
+  { id: '@deepseek-ai/dsh-client-locale', dir: 'locale', url: '/plugins/locale.js', rev: 'fx', inject: [], immediately: true },
   { id: '@deepseek-ai/dsh-client-ui-layout', dir: 'ui-layout', url: '/plugins/ui-layout.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-runtime'] },
   { id: '@deepseek-ai/dsh-client-ui-sidebar', dir: 'ui-sidebar', url: '/plugins/ui-sidebar.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] },
+  { id: '@deepseek-ai/dsh-client-ui-settings', dir: 'ui-settings', url: '/plugins/ui-settings.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-sidebar', '@deepseek-ai/dsh-client-locale'] },
+  { id: '@deepseek-ai/dsh-client-ui-settings-general', dir: 'ui-settings-general', url: '/plugins/ui-settings-general.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings'] },
+  { id: '@deepseek-ai/dsh-client-ui-settings-models', dir: 'ui-settings-models', url: '/plugins/ui-settings-models.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings'] },
   { id: '@deepseek-ai/dsh-client-ui-conversation', dir: 'ui-conversation', url: '/plugins/ui-conversation.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] },
   { id: '@deepseek-ai/dsh-client-ui-workspace', dir: 'ui-workspace', url: '/plugins/ui-workspace.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-runtime', '@deepseek-ai/dsh-client-ui-conversation', '@deepseek-ai/dsh-client-ui-sidebar'] },
   { id: '@deepseek-ai/dsh-client-ui-trajectory', dir: 'ui-trajectory', url: '/plugins/ui-trajectory.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-conversation'] },
diff --git a/apps/web/tests/smoke-real.e2e.ts b/apps/web/tests/smoke-real.e2e.ts
index a3d511df16..70d1d81523 100644
--- a/apps/web/tests/smoke-real.e2e.ts
+++ b/apps/web/tests/smoke-real.e2e.ts
@@ -147,7 +147,7 @@ async function detailsTrack(page: Page): Promise<number> {
 // Readiness gate: `dsh web` serves ALL nine manifest plugins; until every UI
 // plugin's client bundle exists and exports apply, the loader fail-louds and
 // the frame never appears.
-const UI_PLUGIN_DIRS = ['connection', 'runtime', 'ui-theme', 'i18n', 'ui-layout', 'ui-sidebar', 'ui-conversation', 'ui-question', 'ui-trajectory']
+const UI_PLUGIN_DIRS = ['connection', 'runtime', 'ui-theme', 'locale', 'ui-layout', 'ui-sidebar', 'ui-conversation', 'ui-question', 'ui-trajectory']
 const ROUND_DONE_MARKER = 'WEB_ROUND_DONE'
 const notReady = UI_PLUGIN_DIRS.filter((dir) => {
   const bundle = join(REPO_ROOT, 'packages/client', dir, 'lib/client.js')
diff --git a/apps/web/tests/workspace-flow.snapshot.ts b/apps/web/tests/workspace-flow.snapshot.ts
index 78ac843a64..e232d8e123 100644
--- a/apps/web/tests/workspace-flow.snapshot.ts
+++ b/apps/web/tests/workspace-flow.snapshot.ts
@@ -10,9 +10,12 @@ const PLUGINS: readonly (WebBootEntry & { dir: string })[] = [
   { id: '@deepseek-ai/dsh-client-connection', dir: 'connection', url: '/plugins/connection.js', rev: 'fx', inject: [], immediately: true },
   { id: '@deepseek-ai/dsh-client-runtime', dir: 'runtime', url: '/plugins/runtime.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-connection'], immediately: true },
   { id: '@deepseek-ai/dsh-client-ui-theme', dir: 'ui-theme', url: '/plugins/ui-theme.js', rev: 'fx', inject: [], immediately: true },
-  { id: '@deepseek-ai/dsh-client-i18n', dir: 'i18n', url: '/plugins/i18n.js', rev: 'fx', inject: [], immediately: true },
+  { id: '@deepseek-ai/dsh-client-locale', dir: 'locale', url: '/plugins/locale.js', rev: 'fx', inject: [], immediately: true },
   { id: '@deepseek-ai/dsh-client-ui-layout', dir: 'ui-layout', url: '/plugins/ui-layout.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-runtime'] },
   { id: '@deepseek-ai/dsh-client-ui-sidebar', dir: 'ui-sidebar', url: '/plugins/ui-sidebar.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] },
+  { id: '@deepseek-ai/dsh-client-ui-settings', dir: 'ui-settings', url: '/plugins/ui-settings.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-sidebar', '@deepseek-ai/dsh-client-locale'] },
+  { id: '@deepseek-ai/dsh-client-ui-settings-general', dir: 'ui-settings-general', url: '/plugins/ui-settings-general.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings'] },
+  { id: '@deepseek-ai/dsh-client-ui-settings-models', dir: 'ui-settings-models', url: '/plugins/ui-settings-models.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings'] },
   { id: '@deepseek-ai/dsh-client-ui-conversation', dir: 'ui-conversation', url: '/plugins/ui-conversation.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] },
   {
     id: '@deepseek-ai/dsh-client-ui-workspace',
diff --git a/packages/client/i18n/README.md b/packages/client/i18n/README.md
deleted file mode 100644
index db6be0fe2a..0000000000
--- a/packages/client/i18n/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# @deepseek-ai/dsh-client-i18n
-
-i18n plugin: I18nService (ns×locale dictionaries, bind(ns)→t with a stable function identity, locale store). Contract: api-contracts v3 §8.
-
-## Model Experience
-
-None, as the i18n registry serves browser UI copy; nothing here reaches a model request.
-
-#### KV Cache effect
-
-None; this package neither assembles nor sends a provider request.
-
-## Known Limitations and Deferred Work
-
-- **zh/en ship as empty structures** — the existing UI copy is inline Chinese; extraction into dictionaries is deferred repo-wide work, so `bind(ns)` consumers today mostly receive key-echo fallbacks.
-- **Locale switching re-renders the whole tree** — accepted as a low-frequency operation; no per-namespace subscription granularity.
diff --git a/packages/client/i18n/src/client/index.ts b/packages/client/i18n/src/client/index.ts
deleted file mode 100644
index 9dea9c4bd4..0000000000
--- a/packages/client/i18n/src/client/index.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Browser-side locale registry. Bound translation functions retain stable
- * identity for injected consumers.
- */
-import type { Context } from 'cordis'
-// Snapshot stores are framework-neutral; React consumers bind hooks at their
-// rendering boundary.
-import type { SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client'
-import { createSnapshotStore } from '@deepseek-ai/dsh-client-runtime/client'
-import { en } from '../locales/en.ts'
-import { zh } from '../locales/zh.ts'
-
-/** Translate a key with optional params. */
-export type Translate = (key: string, params?: Record<string, unknown>) => string
-
-/** Locale dictionary: flat key to template string ({name} placeholders). */
-export type LocaleDict = Record<string, string>
-
-declare module 'cordis' {
-  interface Context {
-    i18n: I18nService
-  }
-}
-
-/** Fallback locale consulted after the active locale misses. */
-export const FALLBACK_LOCALE = 'zh'
-
-/** Shared namespace for shell-level texts. */
-export const COMMON_NS = 'common'
-
-/**
- * Dictionary registry plus locale switch. Lookup chain per key: active locale
- * -> zh fallback -> the key itself (missing text stays visible, fail loud in
- * the UI rather than blank).
- */
-export class I18nService {
-  private dicts = new Map<string, Map<string, LocaleDict>>()
-  private bound = new Map<string, Translate>()
-  private localeStore = createSnapshotStore<string>(FALLBACK_LOCALE)
-
-  /**
-   * Register a dictionary for a namespace and locale. Duplicate (ns, locale)
-   * throws (single occupant; a namespace's texts have one owner).
-   * @param ns - namespace.
-   * @param locale - locale tag (zh/en to start).
-   * @param dict - dictionary.
-   * @returns disposer (idempotent).
-   */
-  register(ns: string, locale: string, dict: LocaleDict): () => void {
-    let locales = this.dicts.get(ns)
-    if (!locales) {
-      locales = new Map()
-      this.dicts.set(ns, locales)
-    }
-    if (locales.has(locale)) throw new Error(`i18n namespace "${ns}" already has locale "${locale}"`)
-    locales.set(locale, dict)
-    return () => {
-      const owner = this.dicts.get(ns)
-      if (owner?.get(locale) === dict) owner.delete(locale)
-    }
-  }
-
-  /**
-   * Bind a namespace to a translate function. The returned reference is
-   * stable per namespace (repeat binds return the same function), so it can
-   * ride inject surfaces without breaking memoization.
-   * @param ns - namespace.
-   * @returns the translate function (reads the locale store at call time).
-   */
-  bind(ns: string): Translate {
-    let t = this.bound.get(ns)
-    if (!t) {
-      t = (key, params) => this.translate(ns, key, params)
-      this.bound.set(ns, t)
-      return t
-    }
-    return t
-  }
-
-  /** Active locale store (switching re-renders the tree; low frequency). */
-  get locale(): SnapshotStore<string> {
-    return this.localeStore
-  }
-
-  private translate(ns: string, key: string, params?: Record<string, unknown>): string {
-    const locales = this.dicts.get(ns)
-    const template = locales?.get(this.localeStore.getSnapshot())?.[key]
-      ?? locales?.get(FALLBACK_LOCALE)?.[key]
-      ?? key
-    if (!params) return template
-    return template.replace(/\{(\w+)\}/g, (match, name: string) =>
-      name in params ? String(params[name]) : match)
-  }
-}
-
-/** Required services (none; the loader passes the export surface as an object plugin). */
-export const inject: string[] = []
-
-/**
- * Client plugin body: provide the i18n service with base dictionaries.
- * @param ctx - client cordis context.
- */
-export function apply(ctx: Context): void {
-  const i18n = new I18nService()
-  i18n.register(COMMON_NS, 'zh', zh)
-  i18n.register(COMMON_NS, 'en', en)
-  ctx.provide('i18n', i18n)
-}
diff --git a/packages/client/i18n/tests/i18n.spec.ts b/packages/client/i18n/tests/i18n.spec.ts
deleted file mode 100644
index 12fef2c716..0000000000
--- a/packages/client/i18n/tests/i18n.spec.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { I18nService } from '@deepseek-ai/dsh-client-i18n/client'
-
-describe('I18nService', () => {
-  it('translates from the active locale with zh fallback then key passthrough', () => {
-    const i18n = new I18nService()
-    i18n.register('ns', 'zh', { hello: '你好', onlyZh: '仅中文' })
-    i18n.register('ns', 'en', { hello: 'Hello' })
-    const t = i18n.bind('ns')
-    expect(i18n.locale.getSnapshot()).toBe('zh')
-    expect(t('hello')).toBe('你好')
-    i18n.locale.set('en')
-    expect(t('hello')).toBe('Hello')
-    expect(t('onlyZh')).toBe('仅中文')
-    expect(t('missing.key')).toBe('missing.key')
-  })
-
-  it('interpolates {name} params and leaves unknown placeholders intact', () => {
-    const i18n = new I18nService()
-    i18n.register('ns', 'zh', { greet: '你好，{name}！第 {n} 次', partial: '{known} 与 {unknown}' })
-    const t = i18n.bind('ns')
-    expect(t('greet', { name: '世界', n: 2 })).toBe('你好，世界！第 2 次')
-    expect(t('partial', { known: 'A' })).toBe('A 与 {unknown}')
-    expect(t('greet')).toBe('你好，{name}！第 {n} 次')
-  })
-
-  it('bind returns a stable reference per namespace', () => {
-    const i18n = new I18nService()
-    expect(i18n.bind('a')).toBe(i18n.bind('a'))
-    expect(i18n.bind('a')).not.toBe(i18n.bind('b'))
-  })
-
-  it('duplicate (ns, locale) throws; disposer unregisters and is idempotent', () => {
-    const i18n = new I18nService()
-    const dispose = i18n.register('ns', 'zh', { k: 'v1' })
-    expect(() => i18n.register('ns', 'zh', { k: 'v2' })).toThrow('already has locale')
-    dispose()
-    dispose()
-    const t = i18n.bind('ns')
-    expect(t('k')).toBe('k')
-    i18n.register('ns', 'zh', { k: 'v2' })
-    expect(t('k')).toBe('v2')
-  })
-
-  it('locale store is subscribable (snapshot store contract)', () => {
-    const i18n = new I18nService()
-    let notified = 0
-    i18n.locale.subscribe(() => { notified += 1 })
-    i18n.locale.set('en')
-    expect(i18n.locale.getSnapshot()).toBe('en')
-    expect(notified).toBe(1)
-  })
-})
diff --git a/packages/client/i18n/tests/invariant.spec.ts b/packages/client/i18n/tests/invariant.spec.ts
deleted file mode 100644
index b992e50d52..0000000000
--- a/packages/client/i18n/tests/invariant.spec.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { Context } from 'cordis'
-import { apply as nodeApply } from '@deepseek-ai/dsh-client-i18n'
-import { apply as clientApply, COMMON_NS, I18nService, inject } from '@deepseek-ai/dsh-client-i18n/client'
-import * as I18nInvariant from '@deepseek-ai/dsh-client-i18n/invariant'
-import InvariantService from '@deepseek-ai/dsh-invariants'
-
-describe('invariant companion', () => {
-  it('registers under the package name with an empty installer', async () => {
-    const ctx = new Context()
-    await ctx.plugin(InvariantService, { enabled: true })
-    await expect(ctx.plugin(I18nInvariant).await()).resolves.toBeDefined()
-  })
-
-  it('node-half apply is a no-op host placeholder', () => {
-    nodeApply()
-    expect(true).toBe(true) // reaching here without throw is the contract
-  })
-
-  it('client apply provides ctx.i18n seeded with the zh/en common namespace', async () => {
-    expect(inject).toEqual([])
-    const ctx = new Context()
-    await ctx.plugin({ inject, apply: clientApply }).await()
-    const i18n = ctx.get('i18n')
-    expect(i18n).toBeInstanceOf(I18nService)
-    // Seeded dictionaries occupy the (ns, locale) seats even while empty.
-    expect(() => (i18n as I18nService).register(COMMON_NS, 'zh', {})).toThrow('already has locale')
-    expect(() => (i18n as I18nService).register(COMMON_NS, 'en', {})).toThrow('already has locale')
-  })
-})
diff --git a/packages/client/i18n/tsdown.config.ts b/packages/client/i18n/tsdown.config.ts
deleted file mode 100644
index 1c0802be49..0000000000
--- a/packages/client/i18n/tsdown.config.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { clientBundle } from '../tsdown.client.ts'
-
-export default clientBundle('@deepseek-ai/dsh-client-i18n', ['lib/types/index.js', 'lib/types/invariant.js'])
diff --git a/packages/client/locale/README.md b/packages/client/locale/README.md
new file mode 100644
index 0000000000..078967c2cc
--- /dev/null
+++ b/packages/client/locale/README.md
@@ -0,0 +1,16 @@
+# @deepseek-ai/dsh-client-locale
+
+Locale plugin: LocaleService — the browser locale preference (`zh`/`en`, persisted under `dsh.locale`, getter/setter with `locale/change` snapshots) plus the ns×locale dictionary registry (`bind(ns)`→t with a stable function identity; lookup chain active → zh → key).
+
+## Model Experience
+
+None, as the locale registry serves browser UI copy; nothing here reaches a model request.
+
+#### KV Cache effect
+
+None; this package neither assembles nor sends a provider request.
+
+## Known Limitations and Deferred Work
+
+- **Only the Settings surface is translated** — other pages keep inline copy; repo-wide extraction into dictionaries is deferred.
+- **Locale switching re-renders subscribed consumers only** — sections not wired to `locale/change` keep their rendered text until remount.
diff --git a/packages/client/i18n/package.json b/packages/client/locale/package.json
similarity index 78%
rename from packages/client/i18n/package.json
rename to packages/client/locale/package.json
index 3e617174bf..340efe042e 100644
--- a/packages/client/i18n/package.json
+++ b/packages/client/locale/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@deepseek-ai/dsh-client-i18n",
-  "description": "i18n plugin: I18nService (ns x locale dictionaries, bind(ns) -> t, locale store); zh/en skeleton",
+  "name": "@deepseek-ai/dsh-client-locale",
+  "description": "Locale plugin: LocaleService (zh/en preference with getter/setter/change event + persistence; ns x locale dictionaries, bind(ns) -> t)",
   "version": "0.0.1",
   "private": true,
   "type": "module",
@@ -28,9 +28,6 @@
     "immediately": true
   },
   "license": "BSD-3-Clause",
-  "dependencies": {
-    "@deepseek-ai/dsh-client-runtime": "workspace:^"
-  },
   "peerDependencies": {
     "@deepseek-ai/dsh-invariants": "^0.0.1",
     "cordis": "^4.0.0-rc.7"
@@ -46,5 +43,9 @@
     "lib/types/**/*.d.ts",
     "lib/types/**/*.d.ts.map",
     "src"
-  ]
+  ],
+  "scripts": {
+    "bundle": "tsdown",
+    "watch": "tsdown --watch"
+  }
 }
diff --git a/packages/client/locale/src/client/index.ts b/packages/client/locale/src/client/index.ts
new file mode 100644
index 0000000000..e01d69ea25
--- /dev/null
+++ b/packages/client/locale/src/client/index.ts
@@ -0,0 +1,195 @@
+/**
+ * Browser-side locale registry. Bound translation functions retain stable
+ * identity for injected consumers.
+ */
+import type { Context } from 'cordis'
+import { en } from '../locales/en.ts'
+import { zh } from '../locales/zh.ts'
+
+/** Translate a key with optional params. */
+export type Translate = (key: string, params?: Record<string, unknown>) => string
+
+/** Locale dictionary: flat key to template string ({name} placeholders). */
+export type LocaleDict = Record<string, string>
+
+/** Locale identifier: the two shipped locales. */
+export type LocaleId = 'zh' | 'en'
+
+/** One selectable locale: id plus its self-described display name. */
+export interface LocaleDefinition {
+  /** Locale id (persisted; the setLocale argument). */
+  id: LocaleId
+  /** Display name in its own language (中文 / English). */
+  label: string
+}
+
+/** Immutable locale state published on every change. */
+export interface LocaleSnapshot {
+  /** Active locale id. */
+  active: LocaleId
+  /** Selectable locales in display order. */
+  locales: readonly LocaleDefinition[]
+  /** Monotonic change counter (registry or active changes). */
+  revision: number
+}
+
+declare module 'cordis' {
+  interface Context {
+    locale: LocaleService
+  }
+  interface Events {
+    /**
+     * Locale state changed (active locale switched or registry updated).
+     * @param snapshot - Current immutable locale snapshot.
+     * @mode emit
+     */
+    'locale/change'(snapshot: LocaleSnapshot): void
+  }
+}
+
+/** Fallback locale consulted after the active locale misses (also the default). */
+export const FALLBACK_LOCALE: LocaleId = 'zh'
+
+/** Shared namespace for shell-level texts. */
+export const COMMON_NS = 'common'
+
+/** localStorage key holding the persisted locale id. */
+export const STORAGE_KEY = 'dsh.locale'
+
+/** The two shipped locales. */
+const LOCALES: readonly LocaleDefinition[] = Object.freeze([
+  { id: 'zh', label: '中文' },
+  { id: 'en', label: 'English' },
+])
+
+/**
+ * Dictionary registry plus locale preference. Lookup chain per key: active
+ * locale -> zh fallback -> the key itself (missing text stays visible, fail
+ * loud in the UI rather than blank). Reads go through {@link getLocale};
+ * writes only through {@link setLocale}; continuous sync only through the
+ * `locale/change` event.
+ */
+export class LocaleService {
+  private dicts = new Map<string, Map<string, LocaleDict>>()
+  private bound = new Map<string, Translate>()
+  private snapshot: LocaleSnapshot
+  private readonly ctx: Context
+
+  /**
+   * @param ctx - owning context (change events are emitted on it).
+   */
+  constructor(ctx: Context) {
+    this.ctx = ctx
+    this.snapshot = Object.freeze({ active: restorePreference(), locales: LOCALES, revision: 0 })
+  }
+
+  /**
+   * Read the current immutable locale snapshot.
+   * @returns the current snapshot (stable reference until the next change).
+   */
+  getLocale(): LocaleSnapshot {
+    return this.snapshot
+  }
+
+  /**
+   * Switch the active locale — the only preference write entry. Persists the
+   * id and emits `locale/change`.
+   * @param id - a registered locale id; unknown ids throw.
+   */
+  setLocale(id: string): void {
+    const match = this.snapshot.locales.find(l => l.id === id)
+    if (match === undefined) throw new Error(`locale "${id}" is not registered`)
+    if (this.snapshot.active === match.id) return
+    this.snapshot = Object.freeze({
+      active: match.id,
+      locales: this.snapshot.locales,
+      revision: this.snapshot.revision + 1,
+    })
+    persistPreference(match.id)
+    this.ctx.emit('locale/change', this.snapshot)
+  }
+
+  /**
+   * Register a dictionary for a namespace and locale. Duplicate (ns, locale)
+   * throws (single occupant; a namespace's texts have one owner).
+   * @param ns - namespace.
+   * @param locale - locale tag (zh/en to start).
+   * @param dict - dictionary.
+   * @returns disposer (idempotent).
+   */
+  register(ns: string, locale: string, dict: LocaleDict): () => void {
+    let locales = this.dicts.get(ns)
+    if (!locales) {
+      locales = new Map()
+      this.dicts.set(ns, locales)
+    }
+    if (locales.has(locale)) throw new Error(`locale namespace "${ns}" already has locale "${locale}"`)
+    locales.set(locale, dict)
+    return () => {
+      const owner = this.dicts.get(ns)
+      if (owner?.get(locale) === dict) owner.delete(locale)
+    }
+  }
+
+  /**
+   * Bind a namespace to a translate function. The returned reference is
+   * stable per namespace (repeat binds return the same function), so it can
+   * ride inject surfaces without breaking memoization.
+   * @param ns - namespace.
+   * @returns the translate function (reads the active locale at call time).
+   */
+  bind(ns: string): Translate {
+    let t = this.bound.get(ns)
+    if (!t) {
+      t = (key, params) => this.translate(ns, key, params)
+      this.bound.set(ns, t)
+      return t
+    }
+    return t
+  }
+
+  private translate(ns: string, key: string, params?: Record<string, unknown>): string {
+    const locales = this.dicts.get(ns)
+    const template = locales?.get(this.snapshot.active)?.[key]
+      ?? locales?.get(FALLBACK_LOCALE)?.[key]
+      ?? key
+    if (!params) return template
+    return template.replace(/\{(\w+)\}/g, (match, name: string) =>
+      name in params ? String(params[name]) : match)
+  }
+}
+
+/** Read the persisted locale id; unknown or unreadable values fall back to zh. */
+function restorePreference(): LocaleId {
+  try {
+    const stored = globalThis.localStorage?.getItem(STORAGE_KEY)
+    if (stored === 'zh' || stored === 'en') return stored
+  } catch {
+    // Storage access can throw (privacy mode); the default below covers it.
+  }
+  return FALLBACK_LOCALE
+}
+
+/** Persist the locale id; storage failures are non-fatal (preference resets next boot). */
+function persistPreference(id: LocaleId): void {
+  try {
+    globalThis.localStorage?.setItem(STORAGE_KEY, id)
+  } catch {
+    // Storage access can throw (privacy mode / quota); the preference simply
+    // does not survive the session.
+  }
+}
+
+/** Required services (none; the loader passes the export surface as an object plugin). */
+export const inject: string[] = []
+
+/**
+ * Client plugin body: provide the locale service with base dictionaries.
+ * @param ctx - client cordis context.
+ */
+export function apply(ctx: Context): void {
+  const locale = new LocaleService(ctx)
+  locale.register(COMMON_NS, 'zh', zh)
+  locale.register(COMMON_NS, 'en', en)
+  ctx.provide('locale', locale)
+}
diff --git a/packages/client/i18n/src/index.ts b/packages/client/locale/src/index.ts
similarity index 61%
rename from packages/client/i18n/src/index.ts
rename to packages/client/locale/src/index.ts
index e759f1edc1..c220373932 100644
--- a/packages/client/i18n/src/index.ts
+++ b/packages/client/locale/src/index.ts
@@ -1,4 +1,4 @@
 /** Host loader entry for the browser implementation exported from `./client`. */
 
-/** Host plugin body — no host-side behavior for the i18n plugin. */
+/** Host plugin body — no host-side behavior for the locale plugin. */
 export function apply(): void {}
diff --git a/packages/client/i18n/src/invariant.ts b/packages/client/locale/src/invariant.ts
similarity index 86%
rename from packages/client/i18n/src/invariant.ts
rename to packages/client/locale/src/invariant.ts
index b2c196e93b..96c94018f0 100644
--- a/packages/client/i18n/src/invariant.ts
+++ b/packages/client/locale/src/invariant.ts
@@ -1,16 +1,16 @@
 /**
- * Package-owned invariant companion for `@deepseek-ai/dsh-client-i18n`.
- * @module @deepseek-ai/dsh-client-i18n/invariant
+ * Package-owned invariant companion for `@deepseek-ai/dsh-client-locale`.
+ * @module @deepseek-ai/dsh-client-locale/invariant
  */
 
 /* jscpd:ignore-start */
 import type { Context } from 'cordis'
 import type { InvariantInstaller } from '@deepseek-ai/dsh-invariants'
 
-const PACKAGE_NAME = '@deepseek-ai/dsh-client-i18n'
+const PACKAGE_NAME = '@deepseek-ai/dsh-client-locale'
 
 /** Cordis companion plugin name. */
-export const name = 'client-i18n-invariant'
+export const name = 'client-locale-invariant'
 /** Service required before the companion can reserve package ownership. */
 export const inject = ['invariants']
 
diff --git a/packages/client/i18n/src/locales/en.ts b/packages/client/locale/src/locales/en.ts
similarity index 100%
rename from packages/client/i18n/src/locales/en.ts
rename to packages/client/locale/src/locales/en.ts
diff --git a/packages/client/i18n/src/locales/zh.ts b/packages/client/locale/src/locales/zh.ts
similarity index 100%
rename from packages/client/i18n/src/locales/zh.ts
rename to packages/client/locale/src/locales/zh.ts
diff --git a/packages/client/locale/tests/invariant.spec.ts b/packages/client/locale/tests/invariant.spec.ts
new file mode 100644
index 0000000000..e9f4fdee36
--- /dev/null
+++ b/packages/client/locale/tests/invariant.spec.ts
@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest'
+import { Context } from 'cordis'
+import { apply as nodeApply } from '@deepseek-ai/dsh-client-locale'
+import { apply as clientApply, COMMON_NS, LocaleService, inject } from '@deepseek-ai/dsh-client-locale/client'
+import * as LocaleInvariant from '@deepseek-ai/dsh-client-locale/invariant'
+import InvariantService from '@deepseek-ai/dsh-invariants'
+
+describe('invariant companion', () => {
+  it('registers under the package name with an empty installer', async () => {
+    const ctx = new Context()
+    await ctx.plugin(InvariantService, { enabled: true })
+    await expect(ctx.plugin(LocaleInvariant).await()).resolves.toBeDefined()
+  })
+
+  it('node-half apply is a no-op host placeholder', () => {
+    nodeApply()
+    expect(true).toBe(true) // reaching here without throw is the contract
+  })
+
+  it('client apply provides ctx.locale seeded with the zh/en common namespace', async () => {
+    expect(inject).toEqual([])
+    const ctx = new Context()
+    await ctx.plugin({ inject, apply: clientApply }).await()
+    const locale = ctx.get('locale')
+    expect(locale).toBeInstanceOf(LocaleService)
+    // Seeded dictionaries occupy the (ns, locale) seats even while empty.
+    expect(() => (locale as LocaleService).register(COMMON_NS, 'zh', {})).toThrow('already has locale')
+    expect(() => (locale as LocaleService).register(COMMON_NS, 'en', {})).toThrow('already has locale')
+  })
+})
diff --git a/packages/client/locale/tests/locale.spec.ts b/packages/client/locale/tests/locale.spec.ts
new file mode 100644
index 0000000000..750c2452e8
--- /dev/null
+++ b/packages/client/locale/tests/locale.spec.ts
@@ -0,0 +1,90 @@
+// @vitest-environment jsdom
+import { beforeEach, describe, expect, it } from 'vitest'
+import { Context } from 'cordis'
+import type { LocaleSnapshot } from '@deepseek-ai/dsh-client-locale/client'
+import { LocaleService, STORAGE_KEY } from '@deepseek-ai/dsh-client-locale/client'
+
+const make = (): { ctx: Context; svc: LocaleService; events: LocaleSnapshot[] } => {
+  const ctx = new Context()
+  const events: LocaleSnapshot[] = []
+  ctx.on('locale/change', (snapshot) => { events.push(snapshot) })
+  return { ctx, svc: new LocaleService(ctx), events }
+}
+
+describe('LocaleService', () => {
+  beforeEach(() => {
+    localStorage.clear()
+  })
+
+  it('translates through the active-locale -> zh -> key chain', () => {
+    const { svc } = make()
+    svc.register('ns', 'zh', { hello: '你好', onlyZh: '仅中文' })
+    svc.register('ns', 'en', { hello: 'Hello' })
+    const t = svc.bind('ns')
+    expect(svc.getLocale().active).toBe('zh')
+    expect(t('hello')).toBe('你好')
+    svc.setLocale('en')
+    expect(t('hello')).toBe('Hello')
+    expect(t('onlyZh')).toBe('仅中文')
+    expect(t('missing.key')).toBe('missing.key')
+  })
+
+  it('interpolates {name} params and leaves unknown placeholders intact', () => {
+    const { svc } = make()
+    svc.register('ns', 'zh', { greet: '你好，{name}！第 {n} 次', partial: '{known} 与 {unknown}' })
+    const t = svc.bind('ns')
+    expect(t('greet', { name: '世界', n: 2 })).toBe('你好，世界！第 2 次')
+    expect(t('partial', { known: 'A' })).toBe('A 与 {unknown}')
+  })
+
+  it('bind returns a stable per-namespace function identity', () => {
+    const { svc } = make()
+    expect(svc.bind('a')).toBe(svc.bind('a'))
+    expect(svc.bind('a')).not.toBe(svc.bind('b'))
+  })
+
+  it('rejects duplicate (ns, locale) and disposer only removes its own dict', () => {
+    const { svc } = make()
+    const dispose = svc.register('ns', 'zh', { k: 'v1' })
+    expect(() => svc.register('ns', 'zh', { k: 'v2' })).toThrow('already has locale')
+    dispose()
+    const t = svc.bind('ns')
+    expect(t('k')).toBe('k')
+    svc.register('ns', 'zh', { k: 'v2' })
+    expect(t('k')).toBe('v2')
+    dispose()
+    expect(t('k')).toBe('v2')
+  })
+
+  it('setLocale persists, republishes an immutable snapshot, and no-ops on same value', () => {
+    const { svc, events } = make()
+    svc.setLocale('en')
+    expect(svc.getLocale().active).toBe('en')
+    expect(localStorage.getItem(STORAGE_KEY)).toBe('en')
+    expect(events).toHaveLength(1)
+    expect(events[0]).toBe(svc.getLocale())
+    expect(events[0]!.revision).toBe(1)
+    svc.setLocale('en')
+    expect(events).toHaveLength(1)
+  })
+
+  it('throws on unknown locale ids', () => {
+    const { svc } = make()
+    expect(() => { svc.setLocale('fr') }).toThrow('not registered')
+  })
+
+  it('restores a persisted locale and falls back to zh on garbage', () => {
+    localStorage.setItem(STORAGE_KEY, 'en')
+    expect(make().svc.getLocale().active).toBe('en')
+    localStorage.setItem(STORAGE_KEY, 'fr')
+    expect(make().svc.getLocale().active).toBe('zh')
+  })
+
+  it('exposes the two shipped locales with self-described labels', () => {
+    const { svc } = make()
+    expect(svc.getLocale().locales).toEqual([
+      { id: 'zh', label: '中文' },
+      { id: 'en', label: 'English' },
+    ])
+  })
+})
diff --git a/packages/client/i18n/tsconfig.json b/packages/client/locale/tsconfig.json
similarity index 87%
rename from packages/client/i18n/tsconfig.json
rename to packages/client/locale/tsconfig.json
index 63eb9779ca..51f9171643 100644
--- a/packages/client/i18n/tsconfig.json
+++ b/packages/client/locale/tsconfig.json
@@ -11,9 +11,6 @@
     {
       "path": "../../../vendor/cordis"
     },
-    {
-      "path": "../runtime"
-    },
     {
       "path": "../../support/invariants"
     }
diff --git a/packages/client/locale/tsdown.config.ts b/packages/client/locale/tsdown.config.ts
new file mode 100644
index 0000000000..2141970e5d
--- /dev/null
+++ b/packages/client/locale/tsdown.config.ts
@@ -0,0 +1,3 @@
+import { clientBundle } from '../tsdown.client.ts'
+
+export default clientBundle('@deepseek-ai/dsh-client-locale', ['lib/types/index.js', 'lib/types/invariant.js'])
diff --git a/packages/client/tsdown.client.ts b/packages/client/tsdown.client.ts
index 56bdd29320..9b93feae8b 100644
--- a/packages/client/tsdown.client.ts
+++ b/packages/client/tsdown.client.ts
@@ -33,7 +33,7 @@ export const INLINE_SAFE = /^@deepseek-ai\/dsh-(host-apiproxy|session|llm|tools|
  * Documented TEMPORARY exemption, not a platform module (hence not in
  * platform.ts): the snapshot-store engine (createSnapshotStore/defineStore/
  * shallowEqual) lives in runtime pending its promotion-time rehoming, and
- * five importers (i18n, ui-layout, ui-conversation ×3) ride this single
+ * five importers (locale, ui-layout, ui-conversation ×3) ride this single
  * exemption. At runtime the lazy CJS table answers the require natively:
  * runtime is an immediately-tier row, its factory is registered before any
  * dependent bundle materializes. TODO(webload/store-rehome): remove with the
diff --git a/packages/client/ui-conversation/package.json b/packages/client/ui-conversation/package.json
index d7306a6810..95fde30b5a 100644
--- a/packages/client/ui-conversation/package.json
+++ b/packages/client/ui-conversation/package.json
@@ -24,7 +24,7 @@
   },
   "dshClient": {
     "inject": [
-      "@deepseek-ai/dsh-client-i18n",
+      "@deepseek-ai/dsh-client-locale",
       "@deepseek-ai/dsh-client-runtime",
       "@deepseek-ai/dsh-client-ui-layout"
     ],
diff --git a/packages/client/ui-conversation/tests/apply-inject.spec.tsx b/packages/client/ui-conversation/tests/apply-inject.spec.tsx
index 21fe70499e..b040e847e0 100644
--- a/packages/client/ui-conversation/tests/apply-inject.spec.tsx
+++ b/packages/client/ui-conversation/tests/apply-inject.spec.tsx
@@ -99,7 +99,7 @@ async function bench() {
   ctx.provide('workspaces', workspacesFake)
   const layoutFake = { openDetails: vi.fn(), closeDetails: vi.fn() }
   ctx.provide('layout', layoutFake)
-  ctx.provide('i18n', { bind: () => (key: string) => key })
+  ctx.provide('locale', { bind: () => (key: string) => key })
 
   // The AppFrame role: the three conversation-package slots must be declared
   // by a live entry before apply can contribute into them (the stand-in
diff --git a/packages/client/ui-conversation/tests/chat-apply.spec.tsx b/packages/client/ui-conversation/tests/chat-apply.spec.tsx
index dcfe2d7de7..31b251843a 100644
--- a/packages/client/ui-conversation/tests/chat-apply.spec.tsx
+++ b/packages/client/ui-conversation/tests/chat-apply.spec.tsx
@@ -48,7 +48,7 @@ async function bench() {
     sendSession: vi.fn(),
   })
   ctx.provide('layout', { openDetails: vi.fn(), closeDetails: vi.fn() })
-  ctx.provide('i18n', { bind: () => (key: string) => key })
+  ctx.provide('locale', { bind: () => (key: string) => key })
 
   // Declared by ui-layout's root entry in production; a stand-in root
   // occupant declares them here so the contributions land (it consumes
diff --git a/packages/client/ui-conversation/tests/chat-toolview-slot.spec.tsx b/packages/client/ui-conversation/tests/chat-toolview-slot.spec.tsx
index bfae743cff..959ee871d8 100644
--- a/packages/client/ui-conversation/tests/chat-toolview-slot.spec.tsx
+++ b/packages/client/ui-conversation/tests/chat-toolview-slot.spec.tsx
@@ -93,7 +93,7 @@ async function bench(nodes: ToolResultNode[]) {
     sendSession: vi.fn(),
   })
   ctx.provide('layout', layout)
-  ctx.provide('i18n', { bind: () => (key: string) => key })
+  ctx.provide('locale', { bind: () => (key: string) => key })
 
   slots.install(createSlotRenderer())
   slots.register({
@@ -212,7 +212,7 @@ describe('registrant load-order seam', () => {
       sendSession: vi.fn(),
     })
     ctx.provide('layout', { openDetails: vi.fn(), closeDetails: vi.fn() })
-    ctx.provide('i18n', { bind: () => (key: string) => key })
+    ctx.provide('locale', { bind: () => (key: string) => key })
     slots.register({
       name: 'root',
       children: {
diff --git a/packages/client/ui-conversation/tsconfig.json b/packages/client/ui-conversation/tsconfig.json
index 7755337093..902c1c7f9f 100644
--- a/packages/client/ui-conversation/tsconfig.json
+++ b/packages/client/ui-conversation/tsconfig.json
@@ -27,7 +27,7 @@
       "path": "../ui-layout"
     },
     {
-      "path": "../i18n"
+      "path": "../locale"
     },
     {
       "path": "../../support/invariants"
diff --git a/packages/client/ui-layout/README.md b/packages/client/ui-layout/README.md
index 4a9f5e9bd5..a8c3bc0bd6 100644
--- a/packages/client/ui-layout/README.md
+++ b/packages/client/ui-layout/README.md
@@ -1,6 +1,6 @@
 # @deepseek-ai/dsh-client-ui-layout
 
-Shell plugin: three-column AppFrame (drag handles and concession chain) plus the `ctx.layout` panel-geometry service; it registers into the runtime-owned `root` slot and declares `sidebar`, `conversation`, `details`, and `conversation.empty`. The sidebar is fixed-width (only details shrinks, then auto-closes); a closed sidebar retains a 56px control rail while details closes to zero width.
+Shell plugin: three-column AppFrame (drag handles and concession chain) plus the `ctx.layout` panel-geometry service; it registers into the runtime-owned `root` slot and declares `sidebar`, `conversation`, `details`, and `conversation.empty`. The sidebar is fixed-width (only details shrinks, then auto-closes); a closed sidebar retains a 56px control rail while details closes to zero width. The package also seats the theme presenter: it consumes resolved `ctx.theme` snapshots and projects them onto `document.body` (`data-ds-dark-theme` from the active color scheme plus the theme's alias tokens as inline variables).
 
 AppFrame reads the runtime Session projection: `baselinesReady` selects loading, a page-local `SessionListState.intent` selects the empty composer, and a connected Session renders through `SessionProvider`. The conversation and empty-state owner shares are empty; each registrant obtains business data from standard hooks and actions from its own inject face. The sidebar owner share contains only `collapsed` and `width`; navigation actions belong to sidebar's own injected service face.
 
diff --git a/packages/client/ui-layout/package.json b/packages/client/ui-layout/package.json
index fd3e691375..17459ee5d2 100644
--- a/packages/client/ui-layout/package.json
+++ b/packages/client/ui-layout/package.json
@@ -24,7 +24,8 @@
   },
   "dshClient": {
     "inject": [
-      "@deepseek-ai/dsh-client-runtime"
+      "@deepseek-ai/dsh-client-runtime",
+      "@deepseek-ai/dsh-client-ui-theme"
     ],
     "platform": "web"
   },
@@ -36,6 +37,7 @@
   "peerDependencies": {
     "@deepseek-ai/dsh-client-runtime": "^0.0.1",
     "@deepseek-ai/dsh-client-ui-slots": "^0.0.1",
+    "@deepseek-ai/dsh-client-ui-theme": "^0.0.1",
     "@deepseek-ai/dsh-invariants": "^0.0.1",
     "cordis": "^4.0.0-rc.7",
     "react": "^18.2.0"
@@ -43,6 +45,7 @@
   "devDependencies": {
     "@deepseek-ai/dsh-client-runtime": "workspace:^",
     "@deepseek-ai/dsh-client-ui-slots": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-theme": "workspace:^",
     "@deepseek-ai/dsh-invariants": "workspace:^",
     "@types/react": "~18.3.1",
     "cordis": "^4.0.0-rc.7",
diff --git a/packages/client/ui-layout/src/client/index.ts b/packages/client/ui-layout/src/client/index.ts
index 6ecb6f6b1d..39fee1fb52 100644
--- a/packages/client/ui-layout/src/client/index.ts
+++ b/packages/client/ui-layout/src/client/index.ts
@@ -4,13 +4,16 @@
  * four child slots (declaration = exclusive render authority), seats the
  * layout store (panel geometry), and wires the panel-action service face.
  * ctx.layout is the cross-plugin panel-action seam; navigation state lives
- * with the runtime sessions service.
+ * with the runtime sessions service. A second effect seats the theme
+ * presenter, which projects ctx.theme snapshots onto document.body.
  */
 import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
+import type {} from '@deepseek-ai/dsh-client-ui-theme/client'
 import type { PanelActions } from './service.ts'
 import { AppFrame } from './AppFrame.tsx'
 import { createLayoutStore } from './stores.ts'
 import { LayoutService } from './service.ts'
+import { ThemePresenter } from './theme-presenter.ts'
 
 // Contract surface only (export-convergence rule: cross-package consumers
 // keep a symbol exported; test-only/package-internal symbols live off /src).
@@ -62,7 +65,7 @@ export interface DetailsOwnerProps {}
 export interface EmptyOwnerProps { children?: never }
 
 /** Required services (cordis fiber inject — the loader passes the whole export surface as an object plugin). */
-export const inject = ['slots']
+export const inject = ['slots', 'theme']
 
 /**
  * Client plugin body: provide ctx.layout, then one register() call — AppFrame
@@ -98,4 +101,16 @@ export function apply(ctx: ClientContext): void {
       void disposeService()
     }
   }, 'ui-layout: service + root registration')
+
+  // Theme presentation: pure DOM writes from resolved snapshots — initial
+  // state through the getter once, then event-driven only; no React path.
+  ctx.effect(() => {
+    const presenter = new ThemePresenter()
+    presenter.apply(ctx.theme.getTheme())
+    const off = ctx.on('theme/change', snapshot => { presenter.apply(snapshot) })
+    return () => {
+      off()
+      presenter.dispose()
+    }
+  }, 'ui-layout: theme presenter')
 }
diff --git a/packages/client/ui-layout/src/client/theme-presenter.ts b/packages/client/ui-layout/src/client/theme-presenter.ts
new file mode 100644
index 0000000000..958f2fd93e
--- /dev/null
+++ b/packages/client/ui-layout/src/client/theme-presenter.ts
@@ -0,0 +1,43 @@
+/**
+ * Global theme DOM applier: projects the resolved ThemeSnapshot onto
+ * document.body — the `data-ds-dark-theme` palette switch plus the active
+ * theme's alias-token overrides as inline CSS variables. Pure DOM writes, no
+ * React involvement; the presenter only ever retracts what it wrote itself,
+ * so foreign body attributes and inline styles survive apply/dispose.
+ */
+import type { ThemeSnapshot } from '@deepseek-ai/dsh-client-ui-theme/client'
+
+/** Body attribute selecting the dark base palette in the token stylesheets. */
+export const DARK_ATTRIBUTE = 'data-ds-dark-theme'
+
+/** Applies theme snapshots to document.body; one instance per plugin fiber. */
+export class ThemePresenter {
+  /** Token names this presenter wrote in the last apply (its retraction set). */
+  private appliedTokens: string[] = []
+
+  /**
+   * Project a snapshot onto the body: switch the palette attribute from
+   * `active.colorScheme` (never the id — `system` is resolved upstream) and
+   * replace the previously applied token variables with `active.tokens`.
+   * @param snapshot - resolved theme snapshot from ctx.theme.
+   */
+  apply(snapshot: ThemeSnapshot): void {
+    const body = document.body
+    if (snapshot.active.colorScheme === 'dark') body.setAttribute(DARK_ATTRIBUTE, '')
+    else body.removeAttribute(DARK_ATTRIBUTE)
+    for (const name of this.appliedTokens) body.style.removeProperty(name)
+    this.appliedTokens = []
+    for (const [name, value] of Object.entries(snapshot.active.tokens)) {
+      body.style.setProperty(name, value)
+      this.appliedTokens.push(name)
+    }
+  }
+
+  /** Retract everything this presenter wrote: the palette attribute and all applied token variables. */
+  dispose(): void {
+    const body = document.body
+    body.removeAttribute(DARK_ATTRIBUTE)
+    for (const name of this.appliedTokens) body.style.removeProperty(name)
+    this.appliedTokens = []
+  }
+}
diff --git a/packages/client/ui-layout/tests/apply.spec.ts b/packages/client/ui-layout/tests/apply.spec.ts
index bed0987f62..29ad4b3058 100644
--- a/packages/client/ui-layout/tests/apply.spec.ts
+++ b/packages/client/ui-layout/tests/apply.spec.ts
@@ -9,6 +9,7 @@
 import { Context } from 'cordis'
 import { describe, expect, it, vi } from 'vitest'
 import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
+import { apply as themeApply, inject as themeInject, ThemeService } from '@deepseek-ai/dsh-client-ui-theme/client'
 import { apply, inject, LayoutService } from '@deepseek-ai/dsh-client-ui-layout/client'
 import { apply as nodeApply } from '@deepseek-ai/dsh-client-ui-layout'
 import * as invariant from '@deepseek-ai/dsh-client-ui-layout/invariant'
@@ -16,13 +17,14 @@ import * as invariant from '@deepseek-ai/dsh-client-ui-layout/invariant'
 async function bench() {
   const ctx = new Context()
   const slotsFiber = ctx.plugin(SlotsService)
+  await ctx.plugin({ inject: themeInject, apply: themeApply }).await()
   await slotsFiber.await()
   return { ctx, slots: ctx.get('slots') as SlotsService }
 }
 
 describe('ui-layout client apply', () => {
   it('declares its service dependencies', () => {
-    expect(inject).toEqual(['slots'])
+    expect(inject).toEqual(['slots', 'theme'])
   })
 
   it('provides ctx.layout and registers AppFrame into root with the four child declarations', async () => {
@@ -53,6 +55,23 @@ describe('ui-layout client apply', () => {
     expect(actions.toggleSidebar).toHaveBeenCalledOnce()
   })
 
+  it('theme presenter applies the initial snapshot, follows theme/change, and unwinds on dispose', async () => {
+    const { ctx } = await bench()
+    const fiber = ctx.plugin({ inject: [...inject], apply })
+    await fiber.await()
+    // Initial getter application: jsdom has no matchMedia, system resolves light.
+    expect(document.body.hasAttribute('data-ds-dark-theme')).toBe(false)
+    const theme = ctx.get('theme') as ThemeService
+    theme.setTheme('dark')
+    expect(document.body.hasAttribute('data-ds-dark-theme')).toBe(true)
+    await fiber.dispose()
+    expect(document.body.hasAttribute('data-ds-dark-theme')).toBe(false)
+    // Listener is off: further theme changes no longer reach the body.
+    theme.setTheme('light')
+    theme.setTheme('dark')
+    expect(document.body.hasAttribute('data-ds-dark-theme')).toBe(false)
+  })
+
   it('teardown unwinds the service, the root registration, and the child declarations', async () => {
     const { ctx, slots } = await bench()
     const fiber = ctx.plugin({ inject: [...inject], apply })
diff --git a/packages/client/ui-layout/tests/theme-presenter.spec.ts b/packages/client/ui-layout/tests/theme-presenter.spec.ts
new file mode 100644
index 0000000000..ced83a379e
--- /dev/null
+++ b/packages/client/ui-layout/tests/theme-presenter.spec.ts
@@ -0,0 +1,56 @@
+// @vitest-environment jsdom
+// ThemePresenter behavior account: the palette attribute follows
+// active.colorScheme only, token variables replace the previous apply's set,
+// and dispose retracts everything the presenter wrote.
+
+import { beforeEach, describe, expect, it } from 'vitest'
+import type { ThemeSnapshot } from '@deepseek-ai/dsh-client-ui-theme/client'
+import { DARK_ATTRIBUTE, ThemePresenter } from '@deepseek-ai/dsh-client-ui-layout/src/client/theme-presenter.ts'
+
+function snapshot(colorScheme: 'light' | 'dark', tokens: Record<string, string> = {}): ThemeSnapshot {
+  // The presenter must key off colorScheme, not the id — keep them distinct.
+  const active = { id: `${colorScheme}-test`, colorScheme, tokens }
+  return { preference: colorScheme, active, themes: [active], revision: 1 }
+}
+
+beforeEach(() => {
+  document.body.removeAttribute(DARK_ATTRIBUTE)
+  document.body.removeAttribute('style')
+})
+
+describe('ThemePresenter', () => {
+  it('light scheme leaves the dark attribute absent', () => {
+    const presenter = new ThemePresenter()
+    presenter.apply(snapshot('light'))
+    expect(document.body.hasAttribute(DARK_ATTRIBUTE)).toBe(false)
+  })
+
+  it('dark scheme sets the attribute; switching back to light removes it', () => {
+    const presenter = new ThemePresenter()
+    presenter.apply(snapshot('dark'))
+    expect(document.body.hasAttribute(DARK_ATTRIBUTE)).toBe(true)
+    presenter.apply(snapshot('light'))
+    expect(document.body.hasAttribute(DARK_ATTRIBUTE)).toBe(false)
+  })
+
+  it('applies tokens as inline variables and clears the previous set on theme change', () => {
+    const presenter = new ThemePresenter()
+    presenter.apply(snapshot('dark', { '--dsw-alias-bg': '#111', '--dsw-alias-fg': '#eee' }))
+    expect(document.body.style.getPropertyValue('--dsw-alias-bg')).toBe('#111')
+    expect(document.body.style.getPropertyValue('--dsw-alias-fg')).toBe('#eee')
+    presenter.apply(snapshot('light', { '--dsw-alias-bg': '#fff' }))
+    expect(document.body.style.getPropertyValue('--dsw-alias-bg')).toBe('#fff')
+    // The old theme's extra variable is gone, not merged.
+    expect(document.body.style.getPropertyValue('--dsw-alias-fg')).toBe('')
+  })
+
+  it('dispose removes the attribute and every applied variable, sparing foreign inline styles', () => {
+    document.body.style.setProperty('--foreign', 'kept')
+    const presenter = new ThemePresenter()
+    presenter.apply(snapshot('dark', { '--dsw-alias-bg': '#111' }))
+    presenter.dispose()
+    expect(document.body.hasAttribute(DARK_ATTRIBUTE)).toBe(false)
+    expect(document.body.style.getPropertyValue('--dsw-alias-bg')).toBe('')
+    expect(document.body.style.getPropertyValue('--foreign')).toBe('kept')
+  })
+})
diff --git a/packages/client/ui-layout/tsconfig.json b/packages/client/ui-layout/tsconfig.json
index c82482294b..4401e8e4db 100644
--- a/packages/client/ui-layout/tsconfig.json
+++ b/packages/client/ui-layout/tsconfig.json
@@ -14,6 +14,9 @@
     {
       "path": "../ui-slots"
     },
+    {
+      "path": "../ui-theme"
+    },
     {
       "path": "../ui-primitives"
     },
diff --git a/packages/client/ui-primitives/src/Menu.module.css b/packages/client/ui-primitives/src/Menu.module.css
index b55abe094d..3cabe258bc 100644
--- a/packages/client/ui-primitives/src/Menu.module.css
+++ b/packages/client/ui-primitives/src/Menu.module.css
@@ -30,11 +30,13 @@
 
 /* Portal mode: fixed in the viewport, coordinates supplied inline from the
  * anchor rect (side/align resolved in JS, the in-place offset rules above
- * don't apply). */
+ * don't apply). Portaled lists must layer above modal overlays (z 1000) —
+ * an anchor inside a dialog still expects its menu on top. */
 .portal {
   position: fixed;
   top: auto;
   left: auto;
+  z-index: 1100;
 }
 
 /* Open above the anchor (empty-state workspace chip: figma 122:9481). */
diff --git a/packages/client/ui-primitives/src/icons/index.tsx b/packages/client/ui-primitives/src/icons/index.tsx
index 80bb3848dd..4c2083bae1 100644
--- a/packages/client/ui-primitives/src/icons/index.tsx
+++ b/packages/client/ui-primitives/src/icons/index.tsx
@@ -583,3 +583,90 @@ export const IconTreeCorner8x10 = ({ size = 10, className }: IconProps) => (
     <path d="M0 0L-0.5 0L-0.5 7L0 7L0.5 7L0.5 0L0 0ZM3 10L3 10.5L8 10.5L8 10L8 9.5L3 9.5L3 10ZM0 7L-0.5 7C-0.5 8.933 1.067 10.5 3 10.5L3 10L3 9.5C1.61929 9.5 0.5 8.38071 0.5 7L0 7Z" fill="currentColor"/>
   </svg>
 )
+
+/** ic_ds_light_outline_16 */
+export const IconLightOutline16 = ({ size = 16, className }: IconProps) => (
+  <svg width={size} height={size} className={className} viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      d="M11.3496 8C11.3496 6.14985 9.85015 4.65039 8 4.65039C6.14985 4.65039 4.65039 6.14985 4.65039 8C4.65039 9.85015 6.14985 11.3496 8 11.3496C9.85015 11.3496 11.3496 9.85015 11.3496 8ZM12.6504 8C12.6504 10.5681 10.5681 12.6504 8 12.6504C5.43188 12.6504 3.34961 10.5681 3.34961 8C3.34961 5.43188 5.43188 3.34961 8 3.34961C10.5681 3.34961 12.6504 5.43188 12.6504 8Z"
+      fill="currentColor"
+    />
+    <path d="M8.65039 0.5V2.5H7.34961V0.5H8.65039Z" fill="currentColor" />
+    <path d="M8.65039 13.5V15.5H7.34961V13.5H8.65039Z" fill="currentColor" />
+    <path
+      d="M3.15808 2.24035L4.57229 3.65456L3.6525 4.57435L2.23829 3.16014L3.15808 2.24035Z"
+      fill="currentColor"
+    />
+    <path
+      d="M12.3505 11.4327L13.7647 12.8469L12.8449 13.7667L11.4307 12.3525L12.3505 11.4327Z"
+      fill="currentColor"
+    />
+    <path
+      d="M2.24537 12.8469L3.65958 11.4327L4.57937 12.3525L3.16516 13.7667L2.24537 12.8469Z"
+      fill="currentColor"
+    />
+    <path
+      d="M11.4377 3.65455L12.852 2.24033L13.7718 3.16012L12.3575 4.57434L11.4377 3.65455Z"
+      fill="currentColor"
+    />
+    <path d="M0.5 7.35461H2.5V8.6554H0.5L0.5 7.35461Z" fill="currentColor" />
+    <path d="M13.5 7.35461H15.5V8.6554H13.5V7.35461Z" fill="currentColor" />
+  </svg>
+)
+
+/** ic_ds_dark_outline_16 */
+export const IconDarkOutline16 = ({ size = 16, className }: IconProps) => (
+  <svg width={size} height={size} className={className} viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      d="M13.2764 9.52324C12.5607 9.97754 11.7177 10.242 10.7812 10.242C8.11386 10.2419 5.95042 8.07997 5.9502 5.41289C5.9502 4.48128 6.21453 3.61071 6.67188 2.87285C4.30332 3.4658 2.54992 5.60845 2.5498 8.16093C2.5498 11.1712 4.99103 13.6102 8 13.6102C10.5383 13.6102 12.6709 11.8724 13.2764 9.52324ZM7.05078 5.41289C7.051 7.47224 8.72116 9.1423 10.7812 9.14238C11.9248 9.14238 12.887 8.63397 13.5781 7.8084C13.7266 7.63106 13.9701 7.56547 14.1875 7.64433C14.4049 7.72329 14.5497 7.9297 14.5498 8.16093C14.5498 11.7766 11.6161 14.7098 8 14.7098C4.38402 14.7098 1.4502 11.7792 1.4502 8.16093C1.45033 4.54322 4.3812 1.61015 8 1.61015C8.23027 1.61015 8.43585 1.75352 8.51562 1.96953C8.59536 2.18554 8.53241 2.42829 8.35742 2.57793C7.55573 3.26311 7.05078 4.27876 7.05078 5.41289Z"
+      fill="currentColor"
+    />
+  </svg>
+)
+
+/** ic_ds_followsystem_outline_16 */
+export const IconFollowsystemOutline16 = ({ size = 16, className }: IconProps) => (
+  <svg width={size} height={size} className={className} viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12.1665 13.5811V14.7803H3.66651V13.5811H12.1665Z" fill="currentColor" />
+    <path
+      d="M13.4453 7.02379C13.4453 6.04702 13.4452 5.3616 13.3887 4.83434C13.3333 4.31828 13.2302 4.02378 13.0723 3.80309C12.9446 3.62475 12.7877 3.46883 12.6094 3.34117C12.3887 3.18328 12.0942 3.08007 11.5781 3.02477C11.0508 2.96829 10.3655 2.96715 9.38867 2.96715H6.61035C5.63359 2.96715 4.94816 2.96827 4.4209 3.02477C3.90486 3.0801 3.61034 3.18321 3.38965 3.34117C3.21143 3.46878 3.05534 3.62487 2.92774 3.80309C2.76977 4.02377 2.66667 4.3183 2.61133 4.83434C2.55483 5.3616 2.55371 6.04702 2.55371 7.02379C2.55371 8.0006 2.55485 8.68596 2.61133 9.21324C2.66663 9.72936 2.76983 10.0238 2.92774 10.2445C3.0554 10.4228 3.21131 10.5797 3.38965 10.7074C3.61034 10.8654 3.90484 10.9685 4.4209 11.0238C4.94816 11.0803 5.63359 11.0804 6.61035 11.0804H9.38867C10.3654 11.0804 11.0508 11.0803 11.5781 11.0238C12.0941 10.9685 12.3887 10.8652 12.6094 10.7074C12.7877 10.5797 12.9446 10.4229 13.0723 10.2445C13.2301 10.0238 13.3334 9.72927 13.3887 9.21324C13.4452 8.68596 13.4453 8.00058 13.4453 7.02379ZM14.6455 7.02379C14.6455 7.97428 14.646 8.73509 14.5811 9.34117C14.5149 9.95828 14.3756 10.4858 14.0479 10.9437C13.8436 11.229 13.5938 11.4788 13.3086 11.683C12.8507 12.0108 12.3232 12.15 11.7061 12.2162C11.1 12.2811 10.3391 12.2806 9.38867 12.2806H6.61035C5.66018 12.2806 4.89991 12.2811 4.29395 12.2162C3.67684 12.15 3.14935 12.0108 2.69141 11.683C2.40613 11.4788 2.15639 11.229 1.95215 10.9437C1.62436 10.4858 1.4841 9.95828 1.41797 9.34117C1.35305 8.73511 1.35449 7.97424 1.35449 7.02379C1.35449 6.07366 1.35308 5.31333 1.41797 4.70738C1.4841 4.09028 1.62436 3.56279 1.95215 3.10485C2.15638 2.81956 2.40613 2.56982 2.69141 2.36559C3.14935 2.03779 3.67684 1.89753 4.29395 1.83141C4.8999 1.76652 5.66022 1.76793 6.61035 1.76793H9.38867C10.3391 1.76793 11.1 1.76649 11.7061 1.83141C12.3232 1.89753 12.8507 2.03779 13.3086 2.36559C13.5939 2.56982 13.8436 2.81957 14.0479 3.10485C14.3756 3.56279 14.5149 4.09028 14.5811 4.70738C14.646 5.31335 14.6455 6.07362 14.6455 7.02379Z"
+      fill="currentColor"
+    />
+  </svg>
+)
+
+/** ic_ds_data_outline_16 */
+export const IconDataOutline16 = ({ size = 16, className }: IconProps) => (
+  <svg width={size} height={size} className={className} viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M12.0997 8.54554C12.2905 8.54989 12.3541 8.58056 12.4535 8.74614L12.8849 9.46387C12.9851 9.63071 13.0464 9.66013 13.2388 9.66447H14.1138C14.3417 9.66448 14.3512 9.66937 14.4686 9.86507L14.892 10.5717C14.9942 10.7422 14.9948 10.8247 14.892 10.9961L14.4756 11.6906C14.3741 11.8677 14.3694 11.9379 14.4756 12.115L14.892 12.8096C14.9942 12.9801 14.9947 13.0625 14.892 13.234L14.4686 13.9406C14.3643 14.1028 14.3063 14.1354 14.1138 14.1412H13.2388C13.0465 14.1456 12.985 14.1752 12.8849 14.3418L12.4535 15.0595C12.353 15.2195 12.2895 15.2558 12.0997 15.2601H11.2237C10.9962 15.2601 10.9871 15.2548 10.8699 15.0595L10.4384 14.3418C10.3383 14.175 10.2767 14.1456 10.0846 14.1412H9.2096C9.01854 14.1355 8.95761 14.1006 8.85477 13.9406L8.43139 13.234C8.32562 13.0576 8.33148 12.9862 8.43139 12.8096L8.84771 12.115C8.95165 11.9416 8.94659 11.863 8.84771 11.6906L8.43139 10.9961C8.32767 10.8232 8.33411 10.7437 8.43139 10.5717L8.85477 9.86507C8.95447 9.69891 9.01875 9.67017 9.2096 9.66447H10.0846C10.2741 9.66441 10.3414 9.62547 10.4384 9.46387L10.8699 8.74614C10.987 8.55106 10.9963 8.54554 11.2237 8.54554H12.0997ZM11.6612 10.232C11.3326 10.7798 10.8155 11.0948 10.1743 11.106C10.4443 11.61 10.4425 12.1976 10.1743 12.6987C10.803 12.7096 11.3391 13.0359 11.6612 13.5727C11.9855 13.0323 12.5131 12.7098 13.148 12.6987C12.879 12.196 12.8789 11.6086 13.148 11.106C12.5076 11.0948 11.9894 10.7794 11.6612 10.232Z"
+      fill="currentColor"
+    />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M7.51205 0.790627C9.19055 0.790649 10.7401 1.0691 11.892 1.54364C12.4664 1.78029 12.9719 2.07885 13.3436 2.4408C13.7171 2.80467 13.9916 3.27253 13.9918 3.82384V7.90442C13.6067 7.69532 13.1907 7.53597 12.7529 7.43366V5.66454C12.4928 5.82898 12.2028 5.97601 11.892 6.10405C10.74 6.57865 9.19071 6.85706 7.51205 6.85706C5.8337 6.85703 4.285 6.57852 3.13309 6.10405C2.82215 5.97593 2.53164 5.8291 2.27121 5.66454V7.4135C2.27134 7.75678 2.6066 8.27106 3.62502 8.73405C4.58641 9.17097 5.95762 9.45591 7.50499 9.45681C7.24582 9.83133 7.03684 10.2434 6.88706 10.6826C5.44388 10.6162 4.12516 10.3216 3.11192 9.86104C2.81708 9.72698 2.53185 9.56866 2.27121 9.38928V11.2542C2.27158 11.5974 2.60697 12.1109 3.62502 12.5737C4.41933 12.9347 5.4937 13.1898 6.71569 13.2693C6.80349 13.7128 6.9513 14.1345 7.14814 14.5273C5.60324 14.4862 4.18593 14.1889 3.11192 13.7007C2.01039 13.1998 1.03366 12.3814 1.03333 11.2542V3.82384C1.03352 3.27273 1.30721 2.80461 1.68049 2.4408C2.05211 2.07893 2.55887 1.78026 3.13309 1.54364C4.28492 1.06926 5.83393 0.790683 7.51205 0.790627ZM7.51205 2.02851C5.95492 2.02857 4.57354 2.29079 3.60486 2.68979C3.11958 2.88977 2.76667 3.11253 2.5454 3.32788C2.32671 3.54101 2.2714 3.7089 2.27121 3.82384C2.27121 3.93882 2.32624 4.10625 2.5454 4.3198C2.76667 4.53527 3.11927 4.75781 3.60486 4.9579C4.5736 5.35699 5.95467 5.61914 7.51205 5.61918C9.06942 5.61918 10.4505 5.35695 11.4192 4.9579C11.9051 4.75773 12.2584 4.53536 12.4797 4.3198C12.6988 4.10627 12.7529 3.93882 12.7529 3.82384C12.7527 3.70889 12.6984 3.54104 12.4797 3.32788C12.2584 3.11239 11.9049 2.88989 11.4192 2.68979C10.4505 2.29079 9.06925 2.02853 7.51205 2.02851Z"
+      fill="currentColor"
+    />
+  </svg>
+)
+
+/** ic_ds_List_Pen_outline_16 */
+export const IconListPenOutline16 = ({ size = 16, className }: IconProps) => (
+  <svg width={size} height={size} className={className} viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M10.8239 3.54733V4.78443H4.63437V3.54733H10.8239Z" fill="currentColor" />
+    <path d="M10.8239 6.12629V7.36338H4.63437V6.12629H10.8239Z" fill="currentColor" />
+    <path d="M9.073 8.70524V9.94234H4.63437V8.70524H9.073Z" fill="currentColor" />
+    <path
+      d="M9.13321 0.573526C10.0076 0.573525 10.7179 0.572522 11.285 0.63397C11.8645 0.696791 12.3743 0.831648 12.8193 1.1548C13.0776 1.34246 13.3056 1.57047 13.4933 1.82875C13.8164 2.2737 13.9513 2.7836 14.0141 3.36303C14.0755 3.93015 14.0745 4.64049 14.0745 5.51485V6.1757L12.7327 7.5629V5.51485C12.7327 4.61092 12.732 3.9862 12.6803 3.5081C12.6298 3.0427 12.5379 2.79497 12.4083 2.61654C12.3033 2.47211 12.176 2.34472 12.0315 2.23977C11.8531 2.11016 11.6054 2.01823 11.14 1.96777C10.6618 1.91601 10.0372 1.91539 9.13321 1.91539H6.32658C5.42262 1.91539 4.79796 1.91604 4.31983 1.96777C3.85451 2.01819 3.60672 2.11029 3.42827 2.23977C3.28392 2.34465 3.15643 2.47223 3.0515 2.61654C2.9219 2.79496 2.82997 3.04274 2.7795 3.5081C2.72774 3.9862 2.72712 4.61092 2.72712 5.51485V10.023C2.72712 10.9273 2.72773 11.5525 2.7795 12.0307C2.82992 12.4959 2.92205 12.7429 3.0515 12.9213C3.15645 13.0657 3.28384 13.1931 3.42827 13.2981C3.60676 13.4277 3.85408 13.5206 4.31983 13.5711C4.79797 13.6228 5.42259 13.6234 6.32658 13.6234H6.87057L5.57707 14.9593C5.03527 14.9556 4.57031 14.9467 4.17476 14.9039C3.59508 14.841 3.08558 14.7063 2.64048 14.383C2.38215 14.1953 2.15422 13.9684 1.96653 13.7101C1.64319 13.2649 1.50851 12.7546 1.4457 12.1748C1.38432 11.6076 1.38525 10.8974 1.38525 10.023V5.51485C1.38525 4.64049 1.38426 3.93015 1.4457 3.36303C1.50853 2.78363 1.64341 2.27368 1.96653 1.82875C2.15417 1.57059 2.38228 1.34239 2.64048 1.1548C3.08544 0.831805 3.59533 0.696762 4.17476 0.63397C4.74193 0.572552 5.45218 0.573525 6.32658 0.573526H9.13321Z"
+      fill="currentColor"
+    />
+    <path d="M14.2193 14.9553H10.0124L11.3744 13.6134H14.2193V14.9553Z" fill="currentColor" />
+    <path
+      d="M8.24493 13.3711L7.49015 14.8806C7.40148 15.058 7.58961 15.2461 7.76695 15.1574L9.27651 14.4027L14.6147 9.09934L13.5832 8.06775L8.24493 13.3711Z"
+      fill="currentColor"
+    />
+  </svg>
+)
diff --git a/packages/client/ui-primitives/tests/icons.spec.tsx b/packages/client/ui-primitives/tests/icons.spec.tsx
index 74bf5a9678..281124b8d5 100644
--- a/packages/client/ui-primitives/tests/icons.spec.tsx
+++ b/packages/client/ui-primitives/tests/icons.spec.tsx
@@ -14,8 +14,8 @@ const icons = Object.fromEntries(
 const iconNames = Object.keys(icons)
 
 describe('ic_ds_ icon set', () => {
-  it('exports the full P-I set (43 deepsuite + 7 figma extracts)', () => {
-    expect(iconNames.length).toBe(50)
+  it('exports the full P-I set (43 deepsuite + 12 figma extracts)', () => {
+    expect(iconNames.length).toBe(55)
   })
 
   it.each(iconNames)('%s renders an svg with currentColor fills and no hardcoded palette', name => {
diff --git a/packages/client/ui-settings-general/README.md b/packages/client/ui-settings-general/README.md
new file mode 100644
index 0000000000..435dd8c1b4
--- /dev/null
+++ b/packages/client/ui-settings-general/README.md
@@ -0,0 +1,15 @@
+# @deepseek-ai/dsh-client-ui-settings-general
+
+General settings section plugin: registers the `general` entry into `settings.section`. Language (中文/English) and Appearance (Light/Dark/System) are live preferences wired to `ctx.locale` / `ctx.theme`; Permission and Tool Call rows are visual skeletons with no write surface.
+
+## Model Experience
+
+None, as the section renders browser preference UI; nothing here reaches a model request.
+
+#### KV Cache effect
+
+None; this package neither assembles nor sends a provider request.
+
+## Known Limitations and Deferred Work
+
+- **Permission and Tool Call are display skeletons** — the backing host services and RPC methods do not exist yet; the controls are disabled and write nothing.
diff --git a/packages/client/ui-settings-general/package.json b/packages/client/ui-settings-general/package.json
new file mode 100644
index 0000000000..9b3d83e472
--- /dev/null
+++ b/packages/client/ui-settings-general/package.json
@@ -0,0 +1,70 @@
+{
+  "name": "@deepseek-ai/dsh-client-ui-settings-general",
+  "description": "General settings section plugin: Language and Appearance preferences (live), Permission and Tool Call skeleton rows",
+  "version": "0.0.1",
+  "private": true,
+  "type": "module",
+  "main": "lib/index.js",
+  "types": "lib/types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/types/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./invariant": {
+      "types": "./lib/types/invariant.d.ts",
+      "default": "./lib/invariant.js"
+    },
+    "./client": {
+      "types": "./lib/types/client/index.d.ts",
+      "default": "./lib/client.js"
+    },
+    "./src/*": "./src/*",
+    "./package.json": "./package.json"
+  },
+  "dshClient": {
+    "inject": [
+      "@deepseek-ai/dsh-client-runtime",
+      "@deepseek-ai/dsh-client-ui-settings",
+      "@deepseek-ai/dsh-client-locale",
+      "@deepseek-ai/dsh-client-ui-theme"
+    ],
+    "platform": "web"
+  },
+  "scripts": {
+    "bundle": "tsdown",
+    "watch": "tsdown --watch"
+  },
+  "license": "BSD-3-Clause",
+  "dependencies": {
+    "clsx": "^2.0.0"
+  },
+  "peerDependencies": {
+    "@deepseek-ai/dsh-client-runtime": "^0.0.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.0.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.0.1",
+    "@deepseek-ai/dsh-invariants": "^0.0.1",
+    "cordis": "^4.0.0-rc.7",
+    "react": "^18.2.0"
+  },
+  "devDependencies": {
+    "@deepseek-ai/dsh-client-locale": "workspace:^",
+    "@deepseek-ai/dsh-client-runtime": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-primitives": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-settings": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-slots": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-theme": "workspace:^",
+    "@deepseek-ai/dsh-invariants": "workspace:^",
+    "@types/react": "~18.3.1",
+    "cordis": "^4.0.0-rc.7",
+    "react": "^18.2.0"
+  },
+  "files": [
+    "lib/index.js",
+    "lib/invariant.js",
+    "lib/client.js",
+    "lib/types/**/*.d.ts",
+    "lib/types/**/*.d.ts.map",
+    "src"
+  ]
+}
diff --git a/packages/client/ui-settings-general/src/client/GeneralSection.module.css b/packages/client/ui-settings-general/src/client/GeneralSection.module.css
new file mode 100644
index 0000000000..dffafc419d
--- /dev/null
+++ b/packages/client/ui-settings-general/src/client/GeneralSection.module.css
@@ -0,0 +1,131 @@
+/* General section rows (figma 501:29983 'Options'): four groups, 16px
+ * vertical padding each, hairline separator under all but the last. The
+ * shell's content column owns the outer horizontal padding. */
+
+.section {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
+
+/* Title + trailing control row (figma 'Setting-Cell': gap 8, pad 16/0). */
+.row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 16px 0;
+  border-bottom: 1px solid var(--dsw-alias-border-l2);
+}
+
+/* Title + full-width body group (figma 'Frame 2117131229': column, gap 8). */
+.group {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 16px 0;
+  border-bottom: 1px solid var(--dsw-alias-border-l2);
+}
+
+.last {
+  border-bottom: none;
+}
+
+/* Leading text column (figma 'Frame 2036083120': gap 4, pad-right 48). */
+.rowText {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding-right: 48px;
+}
+
+.title {
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 22px;
+  color: var(--dsw-alias-label-primary);
+}
+
+.desc {
+  font-size: 12px;
+  font-weight: 400;
+  line-height: 18px;
+  color: var(--dsw-alias-label-tertiary);
+}
+
+/* Selector pill (figma 'Selector': h36 r18, fill #F5F6F7, pad 0/14, gap 12). */
+.selector {
+  display: inline-flex;
+  align-items: center;
+  gap: 12px;
+  height: 36px;
+  padding: 0 14px;
+  border: none;
+  border-radius: 18px;
+  background: var(--dsw-alias-bg-module-platform);
+  font: inherit;
+  font-size: 14px;
+  line-height: 22px;
+  color: var(--dsw-alias-label-primary);
+  cursor: pointer;
+}
+
+.selector:disabled {
+  cursor: default;
+}
+
+.chevron {
+  flex: none;
+}
+
+/* Cube rows share an 8px gap; cubes stretch to equal height. */
+.cubeRow {
+  display: flex;
+  align-items: stretch;
+  gap: 8px;
+}
+
+/* Tool Call mode cube (figma '.Selector Cube' 418w r16; horizontal inset =
+ * outer pad 4 + inner .Menu_cell pad 10, vertical = inner pad 8). */
+.modeCube {
+  box-sizing: border-box;
+  width: 418px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  gap: 2px;
+  padding: 8px 14px;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 16px;
+  background: transparent;
+  text-align: left;
+}
+
+/* Appearance cube (figma '.Selector Cube' 276x82 r16, pad 20/32, centered
+ * icon-over-label column, gap 4). */
+.themeCube {
+  box-sizing: border-box;
+  width: 276px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+  padding: 20px 32px;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 16px;
+  background: transparent;
+  font: inherit;
+  font-size: 14px;
+  line-height: 22px;
+  color: var(--dsw-alias-label-primary);
+  cursor: pointer;
+}
+
+/* Selected cube: #F5F6F7 fill + #ADB2B8 border (static token — the bluish-400
+ * step has no alias-layer name). */
+.selected {
+  background: var(--dsw-alias-bg-module-platform);
+  border-color: var(--dsw-static-neutral-bluish-400);
+}
diff --git a/packages/client/ui-settings-general/src/client/GeneralSection.tsx b/packages/client/ui-settings-general/src/client/GeneralSection.tsx
new file mode 100644
index 0000000000..d2947c0435
--- /dev/null
+++ b/packages/client/ui-settings-general/src/client/GeneralSection.tsx
@@ -0,0 +1,118 @@
+/**
+ * General settings section: Permission and Tool Call skeleton rows (visual
+ * only, no interaction), live Language and Appearance preference rows wired
+ * through the injected setLocale/setTheme callbacks and the snapshot-mirror
+ * store. Figma: Settings > Content > Options (501:29983).
+ */
+import { useState } from 'react'
+import clsx from 'clsx'
+import {
+  IconChevronDownOutline14, IconDarkOutline16, IconFollowsystemOutline16, IconLightOutline16,
+  Menu,
+} from '@deepseek-ai/dsh-client-ui-primitives'
+import type { GeneralSectionComponentProps, ThemePreferenceId } from './contract.ts'
+import css from './GeneralSection.module.css'
+
+/** Appearance cube order and icons (figma 501:30015-30017: Light, Dark, System). */
+const THEME_CUBES: readonly { id: ThemePreferenceId; labelKey: string; Icon: typeof IconLightOutline16 }[] = [
+  { id: 'light', labelKey: 'appearance.light', Icon: IconLightOutline16 },
+  { id: 'dark', labelKey: 'appearance.dark', Icon: IconDarkOutline16 },
+  { id: 'system', labelKey: 'appearance.system', Icon: IconFollowsystemOutline16 },
+]
+
+/**
+ * Render the General section content column.
+ * @param props - composed slot props (contract.ts).
+ * @returns the section element tree.
+ */
+export function GeneralSection(props: GeneralSectionComponentProps) {
+  const { t, setLocale, setTheme, useStore } = props
+  const localeActive = useStore(s => s.localeActive)
+  const localeOptions = useStore(s => s.localeOptions)
+  const themePreference = useStore(s => s.themePreference)
+  const [languageOpen, setLanguageOpen] = useState(false)
+
+  const activeLocaleLabel = localeOptions.find(l => l.id === localeActive)?.label ?? localeActive
+
+  return (
+    <div className={css.section}>
+      {/* Permission (skeleton): disabled selector pill. */}
+      <div className={css.row}>
+        <div className={css.rowText}>
+          <div className={css.title}>{t('permission.title')}</div>
+          <div className={css.desc}>{t('permission.desc')}</div>
+        </div>
+        <button type="button" className={css.selector} disabled>
+          {t('permission.value')}
+          <IconChevronDownOutline14 className={css.chevron} />
+        </button>
+      </div>
+
+      {/* Tool Call (skeleton): schema cube pinned selected, code cube unselected. */}
+      <div className={css.group}>
+        <div className={css.title}>{t('toolcall.title')}</div>
+        <div className={css.cubeRow}>
+          <div className={clsx(css.modeCube, css.selected)}>
+            <div className={css.title}>{t('toolcall.schema.title')}</div>
+            <div className={css.desc}>{t('toolcall.schema.desc')}</div>
+          </div>
+          <div className={css.modeCube}>
+            <div className={css.title}>{t('toolcall.code.title')}</div>
+            <div className={css.desc}>{t('toolcall.code.desc')}</div>
+          </div>
+        </div>
+      </div>
+
+      {/* Language: selector pill opens the locale menu. */}
+      <div className={css.row}>
+        <div className={css.rowText}>
+          <div className={css.title}>{t('language.title')}</div>
+        </div>
+        <Menu
+          open={languageOpen}
+          onClose={() => { setLanguageOpen(false) }}
+          items={localeOptions.map(l => ({ id: l.id, label: l.label }))}
+          selectedId={localeActive}
+          onSelect={(id) => {
+            setLocale(id)
+            setLanguageOpen(false)
+          }}
+          align="end"
+          portal
+          anchor={(
+            <button
+              type="button"
+              className={css.selector}
+              aria-haspopup="menu"
+              aria-expanded={languageOpen}
+              onClick={() => { setLanguageOpen(v => !v) }}
+            >
+              {activeLocaleLabel}
+              <IconChevronDownOutline14 className={css.chevron} />
+            </button>
+          )}
+        />
+      </div>
+
+      {/* Appearance: three preference cubes; selection follows the persisted
+        * preference, never the resolved active theme. */}
+      <div className={clsx(css.group, css.last)}>
+        <div className={css.title}>{t('appearance.title')}</div>
+        <div className={css.cubeRow}>
+          {THEME_CUBES.map(({ id, labelKey, Icon }) => (
+            <button
+              key={id}
+              type="button"
+              className={clsx(css.themeCube, themePreference === id && css.selected)}
+              aria-pressed={themePreference === id}
+              onClick={() => { setTheme(id) }}
+            >
+              <Icon />
+              {t(labelKey)}
+            </button>
+          ))}
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/packages/client/ui-settings-general/src/client/contract.ts b/packages/client/ui-settings-general/src/client/contract.ts
new file mode 100644
index 0000000000..912d925615
--- /dev/null
+++ b/packages/client/ui-settings-general/src/client/contract.ts
@@ -0,0 +1,66 @@
+/**
+ * General section component contract: the slot-store state shape, the
+ * injected business face, and the composed props type. The component imports
+ * only from here; service snapshot shapes are mirrored as plain rows so the
+ * presentation layer stays decoupled from the locale/theme packages.
+ */
+import type { PropsRuntime, PropsStore } from '@deepseek-ai/dsh-client-ui-slots'
+// Type-only: pulls the shell's SlotMap merge (the 'settings.section' entry).
+import type {} from '@deepseek-ai/dsh-client-ui-settings/client'
+import type { createGeneralSettingsStore } from './store.ts'
+
+/** One selectable locale row projected into the store (id + self-described label). */
+export interface LocaleOptionRow {
+  /** Locale id (the setLocale argument). */
+  id: string
+  /** Display name in its own language (中文 / English). */
+  label: string
+}
+
+/** Theme preference union mirrored from the theme service snapshot. */
+export type ThemePreferenceId = 'light' | 'dark' | 'system'
+
+/**
+ * Store state: mirrors of the locale/theme service snapshots, written only by
+ * the plugin's apply-world change listeners (components have no write path —
+ * preference writes go through the injected callbacks to the services, and
+ * the resulting change events flow back into this mirror).
+ */
+export interface GeneralSettingsState {
+  /** Active locale id. */
+  localeActive: string
+  /** Selectable locales in display order. */
+  localeOptions: LocaleOptionRow[]
+  /** Locale service revision (re-renders translated copy on dictionary/locale changes); -1 until first sync. */
+  localeRevision: number
+  /** Persisted theme preference (selection state reads this, never the resolved active theme). */
+  themePreference: ThemePreferenceId
+  /** Theme service revision; -1 until first sync. */
+  themeRevision: number
+}
+
+/**
+ * Registrant-private injected share of the General section (assembled in
+ * apply): the namespace-bound translate function (stable identity — re-render
+ * on locale change comes from the store revision, not from `t`) and the two
+ * preference write callbacks.
+ */
+export interface GeneralSectionInjected {
+  /** Translate a `settings.general` dictionary key to the active-locale text. */
+  t: (key: string) => string
+  /** Switch the active locale (a registered locale id). */
+  setLocale: (id: string) => void
+  /** Switch the theme preference. */
+  setTheme: (id: ThemePreferenceId) => void
+}
+
+/** Store handle type for the props share (type-only; the factory stays internal to apply and tests). */
+export type GeneralSettingsStoreHandle = ReturnType<typeof createGeneralSettingsStore>
+
+/**
+ * Full component props of the General section: the section owner share
+ * (empty marker) plus the store share and the injected face. No child slots
+ * are declared; menu open state is component-local viewing state.
+ */
+export type GeneralSectionComponentProps =
+  PropsRuntime<'settings.section'> & PropsStore<GeneralSettingsStoreHandle> & GeneralSectionInjected
diff --git a/packages/client/ui-settings-general/src/client/index.ts b/packages/client/ui-settings-general/src/client/index.ts
new file mode 100644
index 0000000000..0e59ce2116
--- /dev/null
+++ b/packages/client/ui-settings-general/src/client/index.ts
@@ -0,0 +1,111 @@
+/**
+ * General settings section plugin, browser half. Registers the `general`
+ * entry into the shell-declared `settings.section` list slot; Language and
+ * Appearance are live preferences projected from ctx.locale / ctx.theme
+ * through this entry's slot store. Export discipline: packages/client/AGENTS.md.
+ */
+import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
+import type { BoundActions } from '@deepseek-ai/dsh-client-ui-slots'
+// Type-only: pulls the shell's SlotMap merge (the 'settings.section' entry).
+import type {} from '@deepseek-ai/dsh-client-ui-settings/client'
+// Type-only: the locale/theme Context+Events merges and snapshot shapes.
+import type { LocaleSnapshot } from '@deepseek-ai/dsh-client-locale/client'
+import type { ThemeSnapshot } from '@deepseek-ai/dsh-client-ui-theme/client'
+import type { GeneralSectionInjected } from './contract.ts'
+import { createGeneralSettingsStore } from './store.ts'
+import { en, zh } from './locales.ts'
+import { GeneralSection } from './GeneralSection.tsx'
+
+export type {
+  GeneralSectionComponentProps, GeneralSectionInjected, GeneralSettingsState,
+  GeneralSettingsStoreHandle, LocaleOptionRow, ThemePreferenceId,
+} from './contract.ts'
+
+/** Dictionary namespace owned by this section (also the nav-label reference prefix). */
+const NS = 'settings.general'
+
+/**
+ * Required services (cordis fiber inject). The target slot is declared by
+ * ui-settings' apply, whose activation order relative to this one is NOT
+ * constrained; registration goes through declaration-aware deferral.
+ */
+export const inject = ['slots', 'locale', 'theme']
+
+/**
+ * Register the `settings.general` dictionaries and the General section entry
+ * once the `settings.section` declaration is on the ledger. The slot store
+ * mirrors the locale/theme snapshots: change listeners attach here in apply,
+ * write through the bound actions captured at inject time, and the inject
+ * factory re-syncs from the getters so no event is lost between registration
+ * and first render (the store's revision guard drops stale duplicates).
+ * @param ctx - client root context.
+ */
+export function apply(ctx: ClientContext): void {
+  ctx.effect(() => {
+    const disposeZh = ctx.locale.register(NS, 'zh', zh)
+    const disposeEn = ctx.locale.register(NS, 'en', en)
+    return () => {
+      disposeZh()
+      disposeEn()
+    }
+  }, 'ui-settings-general: dictionaries')
+
+  const store = createGeneralSettingsStore()
+  let bound: BoundActions<typeof store> | undefined
+
+  const syncLocale = (snapshot: LocaleSnapshot): void => {
+    bound?.syncLocale(
+      snapshot.active,
+      snapshot.locales.map(l => ({ id: l.id, label: l.label })),
+      snapshot.revision,
+    )
+  }
+  const syncTheme = (snapshot: ThemeSnapshot): void => {
+    bound?.syncTheme(snapshot.preference, snapshot.revision)
+  }
+  ctx.on('locale/change', syncLocale)
+  ctx.on('theme/change', syncTheme)
+
+  const injected = (actions: BoundActions<typeof store>): GeneralSectionInjected => {
+    bound = actions
+    syncLocale(ctx.locale.getLocale())
+    syncTheme(ctx.theme.getTheme())
+    return {
+      t: ctx.locale.bind(NS),
+      setLocale: (id) => { ctx.locale.setLocale(id) },
+      setTheme: (id) => { ctx.theme.setTheme(id) },
+    }
+  }
+
+  ctx.effect(() => {
+    let dispose: (() => void) | undefined
+    const register = (): void => {
+      dispose = ctx.slots.register({
+        name: 'settings.section',
+        id: 'general',
+        order: 0,
+        label: ctx.locale.bind(NS)('nav'),
+        store,
+        inject: injected,
+      }, GeneralSection)
+    }
+    const tryRegister = (): void => {
+      if (ctx.slots.spec('settings.section') === undefined || dispose !== undefined) return
+      register()
+    }
+    // Nav labels are registrant-localized: re-register on locale change so
+    // the ledger carries fresh text (the version bump re-renders the shell).
+    const offLocale = ctx.on('locale/change', () => {
+      if (dispose === undefined) return
+      dispose()
+      register()
+    })
+    const unsubscribe = ctx.slots.subscribe('settings.section', () => { tryRegister() })
+    tryRegister()
+    return () => {
+      offLocale()
+      unsubscribe()
+      dispose?.()
+    }
+  }, 'ui-settings-general: section registration')
+}
diff --git a/packages/client/ui-settings-general/src/client/locales.ts b/packages/client/ui-settings-general/src/client/locales.ts
new file mode 100644
index 0000000000..ff10ce5c37
--- /dev/null
+++ b/packages/client/ui-settings-general/src/client/locales.ts
@@ -0,0 +1,42 @@
+/**
+ * `settings.general` namespace dictionaries. Skeleton-row technical copy
+ * (Read only / Schema mode / Code mode and their descriptions) is shared
+ * verbatim across locales per the Figma design.
+ */
+import type { LocaleDict } from '@deepseek-ai/dsh-client-locale/client'
+
+const SHARED = {
+  'permission.value': 'Read only',
+  'toolcall.schema.title': 'Schema mode',
+  'toolcall.schema.desc': 'Traditional function calling — invoke tools one at a time',
+  'toolcall.code.title': 'Code mode',
+  'toolcall.code.desc': 'Chain multiple tools with code — multi-step orchestration',
+} satisfies LocaleDict
+
+/** Simplified Chinese dictionary. */
+export const zh: LocaleDict = {
+  ...SHARED,
+  'nav': '通用设置',
+  'permission.title': '权限',
+  'permission.desc': '选择默认权限模式',
+  'toolcall.title': '工具调用',
+  'language.title': '语言',
+  'appearance.title': '外观',
+  'appearance.light': '浅色',
+  'appearance.dark': '深色',
+  'appearance.system': '跟随系统',
+}
+
+/** English dictionary. */
+export const en: LocaleDict = {
+  ...SHARED,
+  'nav': 'General',
+  'permission.title': 'Permission',
+  'permission.desc': 'Choose default permission mode',
+  'toolcall.title': 'Tool Call',
+  'language.title': 'Language',
+  'appearance.title': 'Appearance',
+  'appearance.light': 'Light',
+  'appearance.dark': 'Dark',
+  'appearance.system': 'System',
+}
diff --git a/packages/client/ui-settings-general/src/client/store.ts b/packages/client/ui-settings-general/src/client/store.ts
new file mode 100644
index 0000000000..121e3f52a9
--- /dev/null
+++ b/packages/client/ui-settings-general/src/client/store.ts
@@ -0,0 +1,43 @@
+/**
+ * General section slot store: locale/theme snapshot mirrors. The plugin
+ * creates the handle at apply time (identity follows the fiber) and its
+ * change listeners are the only writers; components read via props.useStore.
+ */
+import { defineStore, type EngineStoreHandle } from '@deepseek-ai/dsh-client-runtime/client'
+import type { GeneralSettingsState, LocaleOptionRow, ThemePreferenceId } from './contract.ts'
+
+/** Declared action shape used to give the exported factory a stable return type. */
+type GeneralSettingsActions = {
+  syncLocale: (draft: GeneralSettingsState, active: string, options: LocaleOptionRow[], revision: number) => void
+  syncTheme: (draft: GeneralSettingsState, preference: ThemePreferenceId, revision: number) => void
+}
+
+/**
+ * Declares the General section state and write surface. Revisions start at -1
+ * so the apply-time initial sync (revision 0) always lands as a change.
+ * @returns the store handle.
+ */
+export function createGeneralSettingsStore(): EngineStoreHandle<GeneralSettingsState, GeneralSettingsActions> {
+  return defineStore({
+    init: (): GeneralSettingsState => ({
+      localeActive: '',
+      localeOptions: [],
+      localeRevision: -1,
+      themePreference: 'system',
+      themeRevision: -1,
+    }),
+    actions: {
+      syncLocale: (d, active: string, options: LocaleOptionRow[], revision: number) => {
+        if (revision <= d.localeRevision) return
+        d.localeActive = active
+        d.localeOptions = options
+        d.localeRevision = revision
+      },
+      syncTheme: (d, preference: ThemePreferenceId, revision: number) => {
+        if (revision <= d.themeRevision) return
+        d.themePreference = preference
+        d.themeRevision = revision
+      },
+    },
+  })
+}
diff --git a/packages/client/ui-settings-general/src/css-modules.d.ts b/packages/client/ui-settings-general/src/css-modules.d.ts
new file mode 100644
index 0000000000..bc5e482353
--- /dev/null
+++ b/packages/client/ui-settings-general/src/css-modules.d.ts
@@ -0,0 +1,6 @@
+declare module '*.module.css' {
+  const classes: Record<string, string>
+  export default classes
+}
+
+declare module '*.css'
diff --git a/packages/client/ui-settings-general/src/index.ts b/packages/client/ui-settings-general/src/index.ts
new file mode 100644
index 0000000000..94b9bdf674
--- /dev/null
+++ b/packages/client/ui-settings-general/src/index.ts
@@ -0,0 +1,4 @@
+/** Host loader entry for the browser implementation exported from `./client`. */
+
+/** Host plugin body — no host-side behavior for the general settings plugin. */
+export function apply(): void {}
diff --git a/packages/client/ui-settings-general/src/invariant.ts b/packages/client/ui-settings-general/src/invariant.ts
new file mode 100644
index 0000000000..a40cc3cc00
--- /dev/null
+++ b/packages/client/ui-settings-general/src/invariant.ts
@@ -0,0 +1,32 @@
+/**
+ * Package-owned invariant companion for `@deepseek-ai/dsh-client-ui-settings-general`.
+ * @module @deepseek-ai/dsh-client-ui-settings-general/invariant
+ */
+
+/* jscpd:ignore-start */
+import type { Context } from 'cordis'
+import type { InvariantInstaller } from '@deepseek-ai/dsh-invariants'
+
+const PACKAGE_NAME = '@deepseek-ai/dsh-client-ui-settings-general'
+
+/** Cordis companion plugin name. */
+export const name = 'client-ui-settings-general-invariant'
+/** Service required before the companion can reserve package ownership. */
+export const inject = ['invariants']
+
+/**
+ * No runtime invariant: a section plugin projecting two service change events
+ * into its own slot store — it emits no cordis events of its own and owns no
+ * cross-plugin mutable relation; snapshot/store agreement is asserted by this
+ * package's behavior specs.
+ */
+const install: InvariantInstaller = () => {}
+
+/**
+ * Register this package's invariant companion.
+ * @param ctx - Cordis context carrying the invariant service.
+ * @returns the installed registration's disposer after setup succeeds.
+ */
+export const apply = (ctx: Context): Promise<() => void> =>
+  Promise.resolve(ctx.invariants.register(PACKAGE_NAME, install))
+/* jscpd:ignore-end */
diff --git a/packages/client/ui-settings-general/tsconfig.json b/packages/client/ui-settings-general/tsconfig.json
new file mode 100644
index 0000000000..9b2cc5b838
--- /dev/null
+++ b/packages/client/ui-settings-general/tsconfig.json
@@ -0,0 +1,36 @@
+{
+  "extends": "../../../tsconfig.base.client.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "lib/types"
+  },
+  "include": [
+    "src"
+  ],
+  "references": [
+    {
+      "path": "../../../vendor/cordis"
+    },
+    {
+      "path": "../ui-slots"
+    },
+    {
+      "path": "../ui-primitives"
+    },
+    {
+      "path": "../runtime"
+    },
+    {
+      "path": "../ui-settings"
+    },
+    {
+      "path": "../locale"
+    },
+    {
+      "path": "../ui-theme"
+    },
+    {
+      "path": "../../support/invariants"
+    }
+  ]
+}
diff --git a/packages/client/ui-settings-general/tsdown.config.ts b/packages/client/ui-settings-general/tsdown.config.ts
new file mode 100644
index 0000000000..bf67c4f10f
--- /dev/null
+++ b/packages/client/ui-settings-general/tsdown.config.ts
@@ -0,0 +1,3 @@
+import { clientBundle } from '../tsdown.client.ts'
+
+export default clientBundle('@deepseek-ai/dsh-client-ui-settings-general', ['lib/types/index.js', 'lib/types/invariant.js'])
diff --git a/packages/client/ui-settings-models/README.md b/packages/client/ui-settings-models/README.md
new file mode 100644
index 0000000000..c96e2843e4
--- /dev/null
+++ b/packages/client/ui-settings-models/README.md
@@ -0,0 +1,15 @@
+# @deepseek-ai/dsh-client-ui-settings-models
+
+Models settings section plugin: registers the `models` nav entry into `settings.section` with an intentionally empty content column — model management lands in a later phase.
+
+## Model Experience
+
+None, as the section renders an empty browser UI column; nothing here reaches a model request.
+
+#### KV Cache effect
+
+None; this package neither assembles nor sends a provider request.
+
+## Known Limitations and Deferred Work
+
+- **Content column is empty by design** — provider list, editing form, and activation flow are deferred until the model-management service exists.
diff --git a/packages/client/ui-settings-models/package.json b/packages/client/ui-settings-models/package.json
new file mode 100644
index 0000000000..da8fa8c18d
--- /dev/null
+++ b/packages/client/ui-settings-models/package.json
@@ -0,0 +1,63 @@
+{
+  "name": "@deepseek-ai/dsh-client-ui-settings-models",
+  "description": "Models settings section plugin: nav entry with an empty content column (model management lands later)",
+  "version": "0.0.1",
+  "private": true,
+  "type": "module",
+  "main": "lib/index.js",
+  "types": "lib/types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/types/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./invariant": {
+      "types": "./lib/types/invariant.d.ts",
+      "default": "./lib/invariant.js"
+    },
+    "./client": {
+      "types": "./lib/types/client/index.d.ts",
+      "default": "./lib/client.js"
+    },
+    "./src/*": "./src/*",
+    "./package.json": "./package.json"
+  },
+  "dshClient": {
+    "inject": [
+      "@deepseek-ai/dsh-client-runtime",
+      "@deepseek-ai/dsh-client-ui-settings",
+      "@deepseek-ai/dsh-client-locale"
+    ],
+    "platform": "web"
+  },
+  "scripts": {
+    "bundle": "tsdown",
+    "watch": "tsdown --watch"
+  },
+  "license": "BSD-3-Clause",
+  "peerDependencies": {
+    "@deepseek-ai/dsh-client-runtime": "^0.0.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.0.1",
+    "@deepseek-ai/dsh-invariants": "^0.0.1",
+    "cordis": "^4.0.0-rc.7",
+    "react": "^18.2.0"
+  },
+  "devDependencies": {
+    "@deepseek-ai/dsh-client-locale": "workspace:^",
+    "@deepseek-ai/dsh-client-runtime": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-settings": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-slots": "workspace:^",
+    "@deepseek-ai/dsh-invariants": "workspace:^",
+    "@types/react": "~18.3.1",
+    "cordis": "^4.0.0-rc.7",
+    "react": "^18.2.0"
+  },
+  "files": [
+    "lib/index.js",
+    "lib/invariant.js",
+    "lib/client.js",
+    "lib/types/**/*.d.ts",
+    "lib/types/**/*.d.ts.map",
+    "src"
+  ]
+}
diff --git a/packages/client/ui-settings-models/src/client/ModelsSection.tsx b/packages/client/ui-settings-models/src/client/ModelsSection.tsx
new file mode 100644
index 0000000000..ee33b916cb
--- /dev/null
+++ b/packages/client/ui-settings-models/src/client/ModelsSection.tsx
@@ -0,0 +1,13 @@
+/**
+ * Models settings section: an intentionally empty content column — the nav
+ * entry exists so the section slot composition is visible; model management
+ * lands in a later phase.
+ */
+
+/**
+ * Render the (empty) Models section content column.
+ * @returns null — no content this phase.
+ */
+export function ModelsSection() {
+  return null
+}
diff --git a/packages/client/ui-settings-models/src/client/index.ts b/packages/client/ui-settings-models/src/client/index.ts
new file mode 100644
index 0000000000..8ad2ebb750
--- /dev/null
+++ b/packages/client/ui-settings-models/src/client/index.ts
@@ -0,0 +1,63 @@
+/**
+ * Models settings section plugin, browser half. Registers the `models` nav
+ * entry into the shell-declared `settings.section` list slot; the content
+ * column is intentionally empty until model management lands. Export
+ * discipline: packages/client/AGENTS.md.
+ */
+import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
+// Type-only: pulls the shell's SlotMap merge (the 'settings.section' entry).
+import type {} from '@deepseek-ai/dsh-client-ui-settings/client'
+// Type-only: pulls the locale plugin's Context merge (ctx.locale).
+import type {} from '@deepseek-ai/dsh-client-locale/client'
+import { ModelsSection } from './ModelsSection.tsx'
+
+/**
+ * Required services (cordis fiber inject). The target slot is declared by
+ * ui-settings' apply, whose activation order relative to this one is NOT
+ * constrained; registration goes through declaration-aware deferral.
+ */
+export const inject = ['slots', 'locale']
+
+/**
+ * Register the Models section once the `settings.section` declaration is on
+ * the ledger.
+ * @param ctx - client root context.
+ */
+export function apply(ctx: ClientContext): void {
+  ctx.effect(() => {
+    const disposers = [
+      ctx.locale.register('settings.models', 'zh', { nav: '模型' }),
+      ctx.locale.register('settings.models', 'en', { nav: 'Models' }),
+    ]
+    return () => { for (const dispose of disposers) dispose() }
+  }, 'ui-settings-models: nav copy dictionaries')
+  ctx.effect(() => {
+    let dispose: (() => void) | undefined
+    const register = (): void => {
+      dispose = ctx.slots.register({
+        name: 'settings.section',
+        id: 'models',
+        order: 10,
+        label: ctx.locale.bind('settings.models')('nav'),
+      }, ModelsSection)
+    }
+    const tryRegister = (): void => {
+      if (ctx.slots.spec('settings.section') === undefined || dispose !== undefined) return
+      register()
+    }
+    // Nav labels are registrant-localized: re-register on locale change so
+    // the ledger carries fresh text (the version bump re-renders the shell).
+    const offLocale = ctx.on('locale/change', () => {
+      if (dispose === undefined) return
+      dispose()
+      register()
+    })
+    const unsubscribe = ctx.slots.subscribe('settings.section', () => { tryRegister() })
+    tryRegister()
+    return () => {
+      offLocale()
+      unsubscribe()
+      dispose?.()
+    }
+  }, 'ui-settings-models: section registration')
+}
diff --git a/packages/client/ui-settings-models/src/css-modules.d.ts b/packages/client/ui-settings-models/src/css-modules.d.ts
new file mode 100644
index 0000000000..bc5e482353
--- /dev/null
+++ b/packages/client/ui-settings-models/src/css-modules.d.ts
@@ -0,0 +1,6 @@
+declare module '*.module.css' {
+  const classes: Record<string, string>
+  export default classes
+}
+
+declare module '*.css'
diff --git a/packages/client/ui-settings-models/src/index.ts b/packages/client/ui-settings-models/src/index.ts
new file mode 100644
index 0000000000..da3060fe59
--- /dev/null
+++ b/packages/client/ui-settings-models/src/index.ts
@@ -0,0 +1,4 @@
+/** Host loader entry for the browser implementation exported from `./client`. */
+
+/** Host plugin body — no host-side behavior for the models settings plugin. */
+export function apply(): void {}
diff --git a/packages/client/ui-settings-models/src/invariant.ts b/packages/client/ui-settings-models/src/invariant.ts
new file mode 100644
index 0000000000..9ffdc668d7
--- /dev/null
+++ b/packages/client/ui-settings-models/src/invariant.ts
@@ -0,0 +1,31 @@
+/**
+ * Package-owned invariant companion for `@deepseek-ai/dsh-client-ui-settings-models`.
+ * @module @deepseek-ai/dsh-client-ui-settings-models/invariant
+ */
+
+/* jscpd:ignore-start */
+import type { Context } from 'cordis'
+import type { InvariantInstaller } from '@deepseek-ai/dsh-invariants'
+
+const PACKAGE_NAME = '@deepseek-ai/dsh-client-ui-settings-models'
+
+/** Cordis companion plugin name. */
+export const name = 'client-ui-settings-models-invariant'
+/** Service required before the companion can reserve package ownership. */
+export const inject = ['invariants']
+
+/**
+ * No runtime invariant: a nav-entry-only section plugin rendering a fixed
+ * empty content column — it emits no cordis events and owns no cross-plugin
+ * mutable relation.
+ */
+const install: InvariantInstaller = () => {}
+
+/**
+ * Register this package's invariant companion.
+ * @param ctx - Cordis context carrying the invariant service.
+ * @returns the installed registration's disposer after setup succeeds.
+ */
+export const apply = (ctx: Context): Promise<() => void> =>
+  Promise.resolve(ctx.invariants.register(PACKAGE_NAME, install))
+/* jscpd:ignore-end */
diff --git a/packages/client/ui-settings-models/tsconfig.json b/packages/client/ui-settings-models/tsconfig.json
new file mode 100644
index 0000000000..dde94c20af
--- /dev/null
+++ b/packages/client/ui-settings-models/tsconfig.json
@@ -0,0 +1,30 @@
+{
+  "extends": "../../../tsconfig.base.client.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "lib/types"
+  },
+  "include": [
+    "src"
+  ],
+  "references": [
+    {
+      "path": "../../../vendor/cordis"
+    },
+    {
+      "path": "../ui-slots"
+    },
+    {
+      "path": "../runtime"
+    },
+    {
+      "path": "../ui-settings"
+    },
+    {
+      "path": "../locale"
+    },
+    {
+      "path": "../../support/invariants"
+    }
+  ]
+}
diff --git a/packages/client/ui-settings-models/tsdown.config.ts b/packages/client/ui-settings-models/tsdown.config.ts
new file mode 100644
index 0000000000..7a2688a097
--- /dev/null
+++ b/packages/client/ui-settings-models/tsdown.config.ts
@@ -0,0 +1,3 @@
+import { clientBundle } from '../tsdown.client.ts'
+
+export default clientBundle('@deepseek-ai/dsh-client-ui-settings-models', ['lib/types/index.js', 'lib/types/invariant.js'])
diff --git a/packages/client/ui-settings/README.md b/packages/client/ui-settings/README.md
new file mode 100644
index 0000000000..64250c7917
--- /dev/null
+++ b/packages/client/ui-settings/README.md
@@ -0,0 +1,15 @@
+# @deepseek-ai/dsh-client-ui-settings
+
+Settings shell plugin: the sidebar trigger row and the modal settings panel occupying `sidebar.settings`; declares the `settings.section` list slot that section plugins contribute pages into. The shell projects the section ledger into navigation and renders only the active section (`only` filtering).
+
+## Model Experience
+
+None, as the settings shell serves browser UI composition; nothing here reaches a model request.
+
+#### KV Cache effect
+
+None; this package neither assembles nor sends a provider request.
+
+## Known Limitations and Deferred Work
+
+- **Panel is browser-preference scope only** — host-side settings (permission mode, tool-call mode) render as skeletons in the General section; no RPC surface exists yet.
diff --git a/packages/client/ui-settings/package.json b/packages/client/ui-settings/package.json
new file mode 100644
index 0000000000..8f71d90c8b
--- /dev/null
+++ b/packages/client/ui-settings/package.json
@@ -0,0 +1,68 @@
+{
+  "name": "@deepseek-ai/dsh-client-ui-settings",
+  "description": "Settings shell plugin: sidebar trigger + modal panel occupying sidebar.settings; declares the settings.section list slot",
+  "version": "0.0.1",
+  "private": true,
+  "type": "module",
+  "main": "lib/index.js",
+  "types": "lib/types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/types/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./invariant": {
+      "types": "./lib/types/invariant.d.ts",
+      "default": "./lib/invariant.js"
+    },
+    "./client": {
+      "types": "./lib/types/client/index.d.ts",
+      "default": "./lib/client.js"
+    },
+    "./src/*": "./src/*",
+    "./package.json": "./package.json"
+  },
+  "dshClient": {
+    "inject": [
+      "@deepseek-ai/dsh-client-runtime",
+      "@deepseek-ai/dsh-client-ui-sidebar",
+      "@deepseek-ai/dsh-client-locale"
+    ],
+    "platform": "web"
+  },
+  "scripts": {
+    "bundle": "tsdown",
+    "watch": "tsdown --watch"
+  },
+  "license": "BSD-3-Clause",
+  "dependencies": {
+    "clsx": "^2.0.0"
+  },
+  "peerDependencies": {
+    "@deepseek-ai/dsh-client-runtime": "^0.0.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.0.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.0.1",
+    "@deepseek-ai/dsh-invariants": "^0.0.1",
+    "cordis": "^4.0.0-rc.7",
+    "react": "^18.2.0"
+  },
+  "devDependencies": {
+    "@deepseek-ai/dsh-client-locale": "workspace:^",
+    "@deepseek-ai/dsh-client-runtime": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-primitives": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-sidebar": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-slots": "workspace:^",
+    "@deepseek-ai/dsh-invariants": "workspace:^",
+    "@types/react": "~18.3.1",
+    "cordis": "^4.0.0-rc.7",
+    "react": "^18.2.0"
+  },
+  "files": [
+    "lib/index.js",
+    "lib/invariant.js",
+    "lib/client.js",
+    "lib/types/**/*.d.ts",
+    "lib/types/**/*.d.ts.map",
+    "src"
+  ]
+}
diff --git a/packages/client/ui-settings/src/client/SettingsRoot.module.css b/packages/client/ui-settings/src/client/SettingsRoot.module.css
new file mode 100644
index 0000000000..bf557c0a04
--- /dev/null
+++ b/packages/client/ui-settings/src/client/SettingsRoot.module.css
@@ -0,0 +1,192 @@
+/* Settings shell (figma 501:29904 mask context / 501:29947 panel): sidebar
+   foot trigger row + centered 1080x700 modal panel. The trigger reproduces
+   the former sidebar foot geometry (49px wide row / 36px rail circle); the
+   panel is a two-column layout — 188px nav rail + content column with a
+   54px header and the 24px-padded options area. */
+
+/* Trigger row (former sidebar foot, figma 133:7668): 49px hover pill. */
+.trigger {
+  flex: none;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  height: 49px;
+  margin: 8px 0 0;
+  padding: 0 2px 0 6px;
+  border: none;
+  border-radius: 12px;
+  background: transparent;
+  cursor: pointer;
+  overflow: hidden;
+  color: var(--dsw-alias-label-primary);
+  font-family: inherit;
+  font-size: 14px;
+}
+
+.trigger:hover {
+  background: var(--dsw-alias-interactive-bg-hover);
+}
+
+/* Rail trigger: the same 36x36 circle box as the other rail controls. */
+.trigger.rail {
+  width: 36px;
+  height: 36px;
+  margin: 18px 0 10px;
+  justify-content: center;
+  gap: 0;
+  padding: 0;
+  border-radius: 50%;
+}
+
+.triggerLabel {
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+/* Full-viewport layer (figma Mask 501:29946 #000@24%, no blur). */
+.overlay {
+  position: fixed;
+  inset: 0;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.mask {
+  position: absolute;
+  inset: 0;
+  background: var(--dsw-alias-bg-mask-1);
+}
+
+/* Panel (figma Settings 501:29947): 1080x700, r24, white, lv3 shadow
+   (figma effects match --dsw-shadow-lv3 exactly). */
+.panel {
+  position: relative;
+  z-index: 1;
+  display: flex;
+  width: 1080px;
+  height: 700px;
+  max-width: calc(100vw - 48px);
+  max-height: calc(100vh - 48px);
+  border-radius: 24px;
+  overflow: hidden;
+  background: var(--dsw-alias-bg-layer-1);
+  box-shadow: var(--dsw-shadow-lv3);
+}
+
+/* Nav rail (figma .Setting-nav 501:29958): 188 wide, pad (12,22,12,0),
+   gap 18, no own fill — the panel white shows through. */
+.nav {
+  flex: none;
+  display: flex;
+  flex-direction: column;
+  gap: 18px;
+  width: 188px;
+  padding: 22px 12px 0;
+  box-sizing: border-box;
+}
+
+/* Title row (figma 501:29959): 16/500 lh24, 12px side padding. */
+.navTitle {
+  padding: 0 12px;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 500;
+  color: var(--dsw-alias-label-primary);
+}
+
+/* Cell stack (figma 501:29961): gap 4. */
+.navList {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+/* Nav cell (figma .Setting-nav-cell 501:29962): 164x40, r12, pad
+   (12,9,16,9), gap 8; label 14/400 lh22; selected fill #EBEEF2. */
+.navCell {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  height: 40px;
+  padding: 9px 16px 9px 12px;
+  box-sizing: border-box;
+  border: none;
+  border-radius: 12px;
+  background: transparent;
+  cursor: pointer;
+  font-family: inherit;
+  font-size: 14px;
+  line-height: 22px;
+  font-weight: 400;
+  color: var(--dsw-alias-label-primary);
+  text-align: left;
+}
+
+.navCell:hover {
+  background: var(--dsw-specific-sidebar-nav-item-hover);
+}
+
+.navCell.active {
+  background: var(--dsw-specific-sidebar-nav-item-active);
+}
+
+.navIcon {
+  flex: none;
+}
+
+.navLabel {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+/* Content column (figma Content 501:29980): header + options. */
+.content {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+}
+
+/* Header (figma .Header 501:29981): h54, pad (10,20,14,8), close right. */
+.header {
+  flex: none;
+  display: flex;
+  align-items: flex-start;
+  justify-content: flex-end;
+  height: 54px;
+  padding: 20px 14px 8px 10px;
+  box-sizing: border-box;
+}
+
+/* Close button (figma .Icon_container 501:29982): 28x28, r28, 14px glyph. */
+.close {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  padding: 0;
+  border: none;
+  border-radius: 28px;
+  background: transparent;
+  cursor: pointer;
+  color: var(--dsw-alias-label-primary);
+}
+
+.close:hover {
+  background: var(--dsw-alias-interactive-bg-hover);
+}
+
+/* Options area (figma Options 501:29983): pad (24,0,24,8), scrolls. */
+.options {
+  flex: 1;
+  min-height: 0;
+  padding: 0 24px 8px;
+  overflow-y: auto;
+}
diff --git a/packages/client/ui-settings/src/client/SettingsRoot.tsx b/packages/client/ui-settings/src/client/SettingsRoot.tsx
new file mode 100644
index 0000000000..3a27acdf6c
--- /dev/null
+++ b/packages/client/ui-settings/src/client/SettingsRoot.tsx
@@ -0,0 +1,125 @@
+/**
+ * Settings shell root: the sidebar-foot trigger row plus the centered modal
+ * panel (figma 501:29947, 1080x700) with the section nav rail. Modal open
+ * state and the active section id are component-local viewing state; the
+ * section ledger arrives through the injected face (nav labels are
+ * registrant-localized — the shell owns no locale/theme subscription).
+ */
+import { useCallback, useEffect, useRef, useState } from 'react'
+import clsx from 'clsx'
+import {
+  IconCloseOutline16, IconDataOutline16, IconSettingsOutline14, IconSettingsOutline16,
+} from '@deepseek-ai/dsh-client-ui-primitives'
+import type { SettingsRootComponentProps } from './contract/slots.ts'
+import css from './SettingsRoot.module.css'
+
+/** Nav glyph by section id; unknown ids fall back to the settings gear. */
+function navIcon(id: string) {
+  if (id === 'models') return <IconDataOutline16 className={css.navIcon} size={16} />
+  return <IconSettingsOutline16 className={css.navIcon} size={16} />
+}
+
+type PanelProps = {
+  translate: SettingsRootComponentProps['translate']
+  rows: ReturnType<SettingsRootComponentProps['sections']>
+  renderSlot: SettingsRootComponentProps['renderSlot']
+  onClose: () => void
+}
+
+/**
+ * The modal layer: full-viewport mask + centered panel. Close paths: the
+ * header button, a mask click, and document-level Escape (mounted only while
+ * open, so the listener lifetime is the panel's).
+ */
+function SettingsPanel({ translate, rows, renderSlot, onClose }: PanelProps) {
+  // Local selection; entries can unmount underneath it, so the render-time
+  // projection falls back to the first row when the id is gone.
+  const [activeId, setActiveId] = useState<string | undefined>(undefined)
+  const active = rows.find((r) => r.id === activeId)?.id ?? rows[0]?.id
+
+  useEffect(() => {
+    const onKeyDown = (e: KeyboardEvent) => {
+      if (e.key === 'Escape') onClose()
+    }
+    document.addEventListener('keydown', onKeyDown)
+    return () => { document.removeEventListener('keydown', onKeyDown) }
+  }, [onClose])
+
+  // Baseline focus management: entering the dialog lands on the close button.
+  const closeButton = useRef<HTMLButtonElement | null>(null)
+  useEffect(() => { closeButton.current?.focus() }, [])
+
+  return (
+    <div className={css.overlay} role="presentation">
+      <div className={css.mask} aria-hidden="true" onClick={onClose} />
+      <div className={css.panel} role="dialog" aria-modal="true" aria-label={translate('settings:title')}>
+        <nav className={css.nav} aria-label={translate('settings:title')}>
+          <div className={css.navTitle}>{translate('settings:title')}</div>
+          <div className={css.navList}>
+            {rows.map((row) => (
+              <button
+                key={row.id}
+                type="button"
+                className={clsx(css.navCell, row.id === active && css.active)}
+                aria-current={row.id === active ? 'true' : undefined}
+                onClick={() => { setActiveId(row.id) }}
+              >
+                {navIcon(row.id)}
+                <span className={css.navLabel}>{row.label}</span>
+              </button>
+            ))}
+          </div>
+        </nav>
+        <div className={css.content}>
+          <div className={css.header}>
+            <button ref={closeButton} type="button" className={css.close} aria-label={translate('settings:close')} onClick={onClose}>
+              <IconCloseOutline16 size={14} />
+            </button>
+          </div>
+          <div className={css.options}>
+            {active !== undefined && renderSlot('settings.section', {}, { only: active })}
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+/**
+ * Render the settings trigger and panel.
+ * @param props - composed slot props (contract/slots.ts).
+ * @returns the settings shell element tree.
+ */
+export function SettingsRoot(props: SettingsRootComponentProps) {
+  const { wide, translate, subscribeSections, sectionsVersion, sections, renderSlot } = props
+  const [open, setOpen] = useState(false)
+  const close = useCallback(() => { setOpen(false) }, [])
+
+  // The ledger tick is the shell's only subscription: sections re-register
+  // with freshly localized labels on locale change, so the version bump also
+  // re-renders the shell's own translate()-read chrome copy.
+  // State = ledger version: same-version notifications dedupe to no render.
+  const [, setSectionsRev] = useState(() => sectionsVersion())
+  useEffect(
+    () => subscribeSections(() => { setSectionsRev(sectionsVersion()) }),
+    [subscribeSections, sectionsVersion],
+  )
+  const rows = sections()
+
+  return (
+    <>
+      <button
+        type="button"
+        className={clsx(css.trigger, !wide && css.rail)}
+        aria-label={translate('settings:trigger')}
+        aria-haspopup="dialog"
+        aria-expanded={open}
+        onClick={() => { setOpen(true) }}
+      >
+        <IconSettingsOutline14 size={wide ? 14 : 18} />
+        {wide && <span className={css.triggerLabel}>{translate('settings:trigger')}</span>}
+      </button>
+      {open && <SettingsPanel translate={translate} rows={rows} renderSlot={renderSlot} onClose={close} />}
+    </>
+  )
+}
diff --git a/packages/client/ui-settings/src/client/contract/slots.ts b/packages/client/ui-settings/src/client/contract/slots.ts
new file mode 100644
index 0000000000..10e4e0ecbe
--- /dev/null
+++ b/packages/client/ui-settings/src/client/contract/slots.ts
@@ -0,0 +1,62 @@
+/**
+ * Settings shell slot contract: the shell occupies the sidebar-owned
+ * `sidebar.settings` hole and declares the `settings.section` list slot that
+ * section plugins (General, Models, …) contribute pages into.
+ */
+import type { PropsRenderSlots, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
+// Type-only: pulls ui-sidebar's SlotMap merge (the 'sidebar.settings' entry)
+// into every program that sees this contract.
+import type {} from '@deepseek-ai/dsh-client-ui-sidebar/client'
+
+declare module '@deepseek-ai/dsh-client-ui-slots' {
+  interface SlotMap {
+    /**
+     * One settings page per list entry. Registrant options carry the nav
+     * identity: `id` (section key, drives `only` filtering), `order` (nav
+     * position), `label` (registrant-localized display text — the registrant
+     * re-registers with fresh text on locale change, so the shell never
+     * subscribes locale/theme state; the ledger bump doubles as the shell's
+     * re-render trigger). Sections render inside the panel content column.
+     */
+    'settings.section': { kind: 'list'; scope: 'root'; owner: SettingsSectionOwnerProps }
+  }
+}
+
+/**
+ * Owner share of a settings section entry. The shell owns modal visibility
+ * and navigation; sections receive nothing but the render site (their data
+ * arrives through their own inject faces and stores).
+ */
+export interface SettingsSectionOwnerProps {
+  /** Marker field: section owner props are intentionally empty for now. */
+  children?: never
+}
+
+/**
+ * Registrant-private injected share of the settings shell (assembled in
+ * apply): locale-resolved nav labels come through `translate`.
+ */
+export type SettingsRootInjected = {
+  /**
+   * Resolve a "<ns>:<key>" locale reference to the active-locale text —
+   * shell chrome copy only (trigger/title/close); nav labels arrive already
+   * localized. Read at render time; the locale-change re-render rides the
+   * section ledger bump, not a shell-owned subscription.
+   */
+  translate: (ref: string) => string
+  /** Read the settings.section ledger version (nav invalidation). */
+  sectionsVersion: () => number
+  /** Subscribe to settings.section ledger changes. */
+  subscribeSections: (listener: () => void) => () => void
+  /** Project the settings.section ledger into nav rows (id/order/label). */
+  sections: () => readonly { id: string; order: number; label: string }[]
+}
+
+/**
+ * Full component props of the settings shell root: the sidebar owner share
+ * (wide/rail state) plus the declared section render share and the injected
+ * face. No store is registered — modal open state and active section id are
+ * component-local viewing state.
+ */
+export type SettingsRootComponentProps =
+  PropsRuntime<'sidebar.settings'> & PropsRenderSlots<'settings.section'> & SettingsRootInjected
diff --git a/packages/client/ui-settings/src/client/index.ts b/packages/client/ui-settings/src/client/index.ts
new file mode 100644
index 0000000000..d5135f373c
--- /dev/null
+++ b/packages/client/ui-settings/src/client/index.ts
@@ -0,0 +1,66 @@
+/**
+ * Settings shell plugin, browser half. Occupies the sidebar-owned
+ * `sidebar.settings` hole with the trigger row + modal panel, declares the
+ * `settings.section` list slot, and projects that ledger into the panel
+ * navigation. Export discipline: packages/client/AGENTS.md.
+ */
+import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
+// Type-only: pulls the locale plugin's Context/Events merges (ctx.locale,
+// 'locale/change') into this program.
+import type {} from '@deepseek-ai/dsh-client-locale/client'
+import type { SettingsRootInjected } from './contract/slots.ts'
+import { SettingsRoot } from './SettingsRoot.tsx'
+
+export type { SettingsRootComponentProps, SettingsRootInjected, SettingsSectionOwnerProps } from './contract/slots.ts'
+
+/**
+ * Required services (cordis fiber inject). The target slot is declared by
+ * ui-sidebar's apply, whose activation order relative to this one is NOT
+ * constrained (dshClient.inject edges are informational); registration goes
+ * through declaration-aware deferral.
+ */
+export const inject = ['slots', 'locale']
+
+/**
+ * Register the settings shell into `sidebar.settings` once the declaration is
+ * on the ledger.
+ * @param ctx - client root context.
+ */
+export function apply(ctx: ClientContext): void {
+  ctx.effect(() => {
+    const disposers = [
+      ctx.locale.register('settings', 'zh', { trigger: '设置', title: '设置', close: '关闭' }),
+      ctx.locale.register('settings', 'en', { trigger: 'Settings', title: 'Settings', close: 'Close' }),
+    ]
+    return () => { for (const dispose of disposers) dispose() }
+  }, 'ui-settings: shell copy dictionaries')
+  const injected = (): SettingsRootInjected => ({
+    translate: (ref) => {
+      const colon = ref.indexOf(':')
+      if (colon === -1) return ref
+      return ctx.locale.bind(ref.slice(0, colon))(ref.slice(colon + 1))
+    },
+    sectionsVersion: () => ctx.slots.getVersion('settings.section'),
+    subscribeSections: (listener) => ctx.slots.subscribe('settings.section', listener),
+    sections: () => ctx.slots.entries('settings.section')
+      .map(e => ({ id: e.options.id ?? '', order: e.options.order ?? 0, label: e.options.label ?? '' }))
+      .sort((a, b) => a.order - b.order),
+  })
+  ctx.effect(() => {
+    let dispose: (() => void) | undefined
+    const tryRegister = (): void => {
+      if (ctx.slots.spec('sidebar.settings') === undefined || dispose !== undefined) return
+      dispose = ctx.slots.register({
+        name: 'sidebar.settings',
+        children: { 'settings.section': { kind: 'list', scope: 'root' } },
+        inject: injected,
+      }, SettingsRoot)
+    }
+    const unsubscribe = ctx.slots.subscribe('sidebar.settings', () => { tryRegister() })
+    tryRegister()
+    return () => {
+      unsubscribe()
+      dispose?.()
+    }
+  }, 'ui-settings: shell registration')
+}
diff --git a/packages/client/ui-settings/src/css-modules.d.ts b/packages/client/ui-settings/src/css-modules.d.ts
new file mode 100644
index 0000000000..bc5e482353
--- /dev/null
+++ b/packages/client/ui-settings/src/css-modules.d.ts
@@ -0,0 +1,6 @@
+declare module '*.module.css' {
+  const classes: Record<string, string>
+  export default classes
+}
+
+declare module '*.css'
diff --git a/packages/client/ui-settings/src/index.ts b/packages/client/ui-settings/src/index.ts
new file mode 100644
index 0000000000..52fe4c43e6
--- /dev/null
+++ b/packages/client/ui-settings/src/index.ts
@@ -0,0 +1,4 @@
+/** Host loader entry for the browser implementation exported from `./client`. */
+
+/** Host plugin body — no host-side behavior for the settings shell plugin. */
+export function apply(): void {}
diff --git a/packages/client/ui-settings/src/invariant.ts b/packages/client/ui-settings/src/invariant.ts
new file mode 100644
index 0000000000..53d7fb066a
--- /dev/null
+++ b/packages/client/ui-settings/src/invariant.ts
@@ -0,0 +1,32 @@
+/**
+ * Package-owned invariant companion for `@deepseek-ai/dsh-client-ui-settings`.
+ * @module @deepseek-ai/dsh-client-ui-settings/invariant
+ */
+
+/* jscpd:ignore-start */
+import type { Context } from 'cordis'
+import type { InvariantInstaller } from '@deepseek-ai/dsh-invariants'
+
+const PACKAGE_NAME = '@deepseek-ai/dsh-client-ui-settings'
+
+/** Cordis companion plugin name. */
+export const name = 'client-ui-settings-invariant'
+/** Service required before the companion can reserve package ownership. */
+export const inject = ['invariants']
+
+/**
+ * No runtime invariant: a presentation shell projecting the settings.section
+ * ledger into navigation — it emits no cordis events and owns no cross-plugin
+ * mutable relation; slot declaration/registration conflicts already fail loud
+ * in the slot core at load time.
+ */
+const install: InvariantInstaller = () => {}
+
+/**
+ * Register this package's invariant companion.
+ * @param ctx - Cordis context carrying the invariant service.
+ * @returns the installed registration's disposer after setup succeeds.
+ */
+export const apply = (ctx: Context): Promise<() => void> =>
+  Promise.resolve(ctx.invariants.register(PACKAGE_NAME, install))
+/* jscpd:ignore-end */
diff --git a/packages/client/ui-settings/tsconfig.json b/packages/client/ui-settings/tsconfig.json
new file mode 100644
index 0000000000..db90b908bf
--- /dev/null
+++ b/packages/client/ui-settings/tsconfig.json
@@ -0,0 +1,33 @@
+{
+  "extends": "../../../tsconfig.base.client.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "lib/types"
+  },
+  "include": [
+    "src"
+  ],
+  "references": [
+    {
+      "path": "../../../vendor/cordis"
+    },
+    {
+      "path": "../ui-slots"
+    },
+    {
+      "path": "../ui-primitives"
+    },
+    {
+      "path": "../runtime"
+    },
+    {
+      "path": "../ui-sidebar"
+    },
+    {
+      "path": "../locale"
+    },
+    {
+      "path": "../../support/invariants"
+    }
+  ]
+}
diff --git a/packages/client/ui-settings/tsdown.config.ts b/packages/client/ui-settings/tsdown.config.ts
new file mode 100644
index 0000000000..ba06fdc7c9
--- /dev/null
+++ b/packages/client/ui-settings/tsdown.config.ts
@@ -0,0 +1,3 @@
+import { clientBundle } from '../tsdown.client.ts'
+
+export default clientBundle('@deepseek-ai/dsh-client-ui-settings', ['lib/types/index.js', 'lib/types/invariant.js'])
diff --git a/packages/client/ui-sidebar/README.md b/packages/client/ui-sidebar/README.md
index d8c2f61ee0..e42b226904 100644
--- a/packages/client/ui-sidebar/README.md
+++ b/packages/client/ui-sidebar/README.md
@@ -4,7 +4,9 @@ Sidebar plugin: real Host Workspaces in stable Host order, each containing its `
 
 New Session starts the runtime's page-local frontend Session Intent; a real Workspace's "+" starts one targeted to that Workspace. The Workspace header "+" opens ui-workspace's shared picker, whose selection also targets a frontend Session. A Workspace Intent does not appear in the sidebar.
 
-`SidebarRootComponentProps` composes the layout owner share, the global `useSessions` and `useWorkspaces` hooks, the declared `sidebar.workspace` child slot, and injected `startSession`, `open`, and sidebar-toggle callbacks. There is no plugin store: `deriveGroups` consumes object-layer snapshots and component-local expansion/search state.
+`SidebarRootComponentProps` composes the layout owner share, the global `useSessions` and `useWorkspaces` hooks, the declared `sidebar.workspace` and `sidebar.settings` child slots, and injected `startSession`, `open`, and sidebar-toggle callbacks. There is no plugin store: `deriveGroups` consumes object-layer snapshots and component-local expansion/search state.
+
+The foot is the `sidebar.settings` seat: the sidebar renders only the bottom-pinned layout slot and shares its column state (`wide`); ui-settings registers the trigger row and settings panel there.
 
 The `/client` export surface is the plugin body (`apply`/`inject`) plus the contract types only — SidebarRoot, the row components, and the tree derivation are internal (the slot registration closes over them; tests import src paths directly).
 
diff --git a/packages/client/ui-sidebar/src/client/SidebarRoot.module.css b/packages/client/ui-sidebar/src/client/SidebarRoot.module.css
index 591aef2330..20431e9d15 100644
--- a/packages/client/ui-sidebar/src/client/SidebarRoot.module.css
+++ b/packages/client/ui-sidebar/src/client/SidebarRoot.module.css
@@ -49,7 +49,7 @@
 .railIn .iconButton,
 .railIn .newSession,
 .railIn .searchButton,
-.railIn .foot {
+.railIn .footArea {
   animation: rail-in 150ms var(--ds-ease-in-out) 100ms backwards;
 }
 
@@ -372,45 +372,11 @@
   font-size: 13px;
 }
 
-/* Foot: settings entry (figma 133:7668, 49 hug): the former 18/10 vertical
-   margins fold into the row so the hover pill spans the full 49px. */
-.foot {
+/* Foot seat: pure layout — the flex slot pinning the sidebar.settings slot
+   content to the column bottom. Row visuals belong to the slot occupant
+   (ui-settings). */
+.footArea {
   flex: none;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  height: 49px;
-  margin: 8px 0 0; /* + 49px row + root padBottom 6 keeps the old 57px band */
-  padding: 0 2px 0 6px;
-  border-radius: 12px;
-  cursor: pointer;
-  overflow: hidden;
-  color: var(--dsw-alias-label-primary);
-}
-
-.foot:hover {
-  background: var(--dsw-alias-interactive-bg-hover);
-}
-
-/* Rail settings: the same 36x36 circle box as the other rail controls. */
-.collapsed .foot {
-  width: 36px;
-  height: 36px;
-  margin: 18px 0 10px;
-  justify-content: center;
-  gap: 0;
-  padding: 0;
-  border-radius: 50%;
-}
-
-.footLabel {
-  max-width: 120px;
-  overflow: hidden;
-  white-space: nowrap;
-}
-
-.collapsed .footLabel {
-  max-width: 0;
 }
 
 @media (prefers-reduced-motion: reduce) {
@@ -419,7 +385,7 @@
   .railIn .iconButton,
   .railIn .newSession,
   .railIn .searchButton,
-  .railIn .foot {
+  .railIn .footArea {
     transition: none;
     animation: none;
   }
diff --git a/packages/client/ui-sidebar/src/client/SidebarRoot.tsx b/packages/client/ui-sidebar/src/client/SidebarRoot.tsx
index 931eb1ba17..490c3e7b8b 100644
--- a/packages/client/ui-sidebar/src/client/SidebarRoot.tsx
+++ b/packages/client/ui-sidebar/src/client/SidebarRoot.tsx
@@ -12,7 +12,7 @@ import clsx from 'clsx'
 import {
   BrandWordmark, FishLogo,
   IconCloseFill14, IconNewChatOutline16, IconPanelLeftOutline16, IconPersonalizationOutline16,
-  IconProjectAddOutline16, IconSearchOutline16, IconSettingsOutline14,
+  IconProjectAddOutline16, IconSearchOutline16,
   Menu, Tooltip,
 } from '@deepseek-ai/dsh-client-ui-primitives'
 import type { WorkspaceView } from '@deepseek-ai/dsh-client-runtime/client'
@@ -314,9 +314,10 @@ export function SidebarRoot({
         )}
       </div>
 
-      <div className={css.foot} role="button" tabIndex={0} aria-label="Settings">
-        <IconSettingsOutline14 size={wide ? 14 : 18} />
-        {wide && <span className={clsx(css.footLabel, css.wide)}>Settings</span>}
+      {/* Foot seat: the flex slot pinning the settings entry to the column
+          bottom; ui-settings occupies it with the trigger row + panel. */}
+      <div className={css.footArea}>
+        {renderSlot('sidebar.settings', { wide })}
       </div>
     </div>
   )
diff --git a/packages/client/ui-sidebar/src/client/contract/slots.ts b/packages/client/ui-sidebar/src/client/contract/slots.ts
index 0334ca88c9..bb7c0caf07 100644
--- a/packages/client/ui-sidebar/src/client/contract/slots.ts
+++ b/packages/client/ui-sidebar/src/client/contract/slots.ts
@@ -20,9 +20,24 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
      * is claiming); ui-workspace registers the picker.
      */
     'sidebar.workspace': { kind: 'single'; scope: 'root'; owner: SidebarWorkspaceOwnerProps }
+    /**
+     * The settings seat at the sidebar foot. Declared by this package's
+     * 'sidebar' entry; ui-settings registers its trigger row + modal panel.
+     * The sidebar passes only its column state — it holds no settings state.
+     */
+    'sidebar.settings': { kind: 'single'; scope: 'root'; owner: SidebarSettingsOwnerProps }
   }
 }
 
+/**
+ * Owner share of the sidebar settings seat: the column display state the
+ * occupant's trigger row must render against (wide row vs rail icon).
+ */
+export interface SidebarSettingsOwnerProps {
+  /** Whether the sidebar renders wide content (false = 56px rail). */
+  wide: boolean
+}
+
 /**
  * Owner share of the sidebar workspace hole: popover geometry plus the
  * sidebar's pick semantics. The picked Host Workspace is already real; the
@@ -62,8 +77,9 @@ export type SidebarRootInjected = {
 
 /**
  * Full component props: layout owner state/actions plus global useSessions
- * and useWorkspaces, the declared Workspace picker render share, and this
- * package's injected callback. No store is registered.
+ * and useWorkspaces, the declared child-slot render shares (Workspace picker
+ * and settings seat), and this package's injected callback. No store is
+ * registered.
  */
 export type SidebarRootComponentProps =
-  PropsRuntime<'sidebar'> & PropsRenderSlots<'sidebar.workspace'> & SidebarRootInjected
+  PropsRuntime<'sidebar'> & PropsRenderSlots<'sidebar.workspace' | 'sidebar.settings'> & SidebarRootInjected
diff --git a/packages/client/ui-sidebar/src/client/index.ts b/packages/client/ui-sidebar/src/client/index.ts
index 0a1c8ebb12..ad847bb5a5 100644
--- a/packages/client/ui-sidebar/src/client/index.ts
+++ b/packages/client/ui-sidebar/src/client/index.ts
@@ -3,7 +3,7 @@ import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
 import type { SidebarRootInjected } from './contract/slots.ts'
 import { SidebarRoot } from './SidebarRoot.tsx'
 
-export type { SidebarRootComponentProps, SidebarRootInjected, SidebarWorkspaceOwnerProps } from './contract/slots.ts'
+export type { SidebarRootComponentProps, SidebarRootInjected, SidebarSettingsOwnerProps, SidebarWorkspaceOwnerProps } from './contract/slots.ts'
 
 /** Services required by the sidebar plugin. */
 export const inject = ['slots', 'layout', 'sessions', 'workspaces']
@@ -20,9 +20,12 @@ export function apply(ctx: ClientContext): void {
   ctx.effect(
     () => ctx.slots.register({
       name: 'sidebar',
-      // SidebarRoot owns this picker site; ui-workspace registers the shared
-      // picker that selects a Host Workspace for a frontend Session Intent.
-      children: { 'sidebar.workspace': { kind: 'single', scope: 'root' } },
+      // SidebarRoot owns these sites; ui-workspace registers the shared
+      // picker, ui-settings registers the settings trigger + panel.
+      children: {
+        'sidebar.workspace': { kind: 'single', scope: 'root' },
+        'sidebar.settings': { kind: 'single', scope: 'root' },
+      },
       inject: injectProps,
     }, SidebarRoot),
     'ui-sidebar: slot registration',
diff --git a/packages/client/ui-sidebar/tests/sidebar-root.spec.tsx b/packages/client/ui-sidebar/tests/sidebar-root.spec.tsx
index 26adafd793..d4caa4e1be 100644
--- a/packages/client/ui-sidebar/tests/sidebar-root.spec.tsx
+++ b/packages/client/ui-sidebar/tests/sidebar-root.spec.tsx
@@ -32,16 +32,16 @@ const workspaces: WorkspaceListState = {
 function mount(sessionState: SessionListState = sessions) {
   const startSession = vi.fn()
   const open = vi.fn()
-  let pickerOwner: unknown
+  const owners: Record<string, unknown> = {}
   const view = render(
     <SidebarRoot
       collapsed={false} width={300}
       useSessions={hook(sessionState)} useWorkspaces={hook(workspaces)}
       startSession={startSession} open={open} toggleSidebar={vi.fn()}
-      renderSlot={((_key: string, owner: unknown) => { pickerOwner = owner; return null }) as SidebarRootComponentProps['renderSlot']}
+      renderSlot={((key: string, owner: unknown) => { owners[key] = owner; return null }) as SidebarRootComponentProps['renderSlot']}
     />,
   )
-  return { view, startSession, open, pickerOwner: () => pickerOwner }
+  return { view, startSession, open, pickerOwner: () => owners['sidebar.workspace'], settingsOwner: () => owners['sidebar.settings'] }
 }
 
 function mountSidebar({
@@ -58,14 +58,14 @@ function mountSidebar({
   const startSession = vi.fn()
   const open = vi.fn()
   const toggleSidebar = vi.fn()
-  let pickerOwner: unknown
+  const owners: Record<string, unknown> = {}
   let current = { sessionState, workspaceState, collapsed, width }
   const root = () => (
     <SidebarRoot
       collapsed={current.collapsed} width={current.width}
       useSessions={hook(current.sessionState)} useWorkspaces={hook(current.workspaceState)}
       startSession={startSession} open={open} toggleSidebar={toggleSidebar}
-      renderSlot={((_key: string, owner: unknown) => { pickerOwner = owner; return null }) as SidebarRootComponentProps['renderSlot']}
+      renderSlot={((key: string, owner: unknown) => { owners[key] = owner; return null }) as SidebarRootComponentProps['renderSlot']}
     />
   )
   const view = render(root())
@@ -73,7 +73,8 @@ function mountSidebar({
     startSession,
     open,
     toggleSidebar,
-    pickerOwner: () => pickerOwner,
+    pickerOwner: () => owners['sidebar.workspace'],
+    settingsOwner: () => owners['sidebar.settings'],
     rerender(next: Partial<typeof current>) {
       current = { ...current, ...next }
       view.rerender(root())
@@ -246,6 +247,7 @@ describe('SidebarRoot', () => {
   it('keeps wide content during live collapse, then settles to the rail', () => {
     vi.useFakeTimers()
     const b = mountSidebar({ width: 320 })
+    expect((b.settingsOwner() as { wide: boolean }).wide).toBe(true)
     fireEvent.click(screen.getByRole('button', { name: 'Collapse sidebar' }))
     expect(b.toggleSidebar).toHaveBeenCalledOnce()
     b.rerender({ collapsed: true, width: 56 })
@@ -253,6 +255,8 @@ describe('SidebarRoot', () => {
     act(() => { vi.advanceTimersByTime(150) })
     expect(screen.queryByPlaceholderText('Search name, keywords...')).toBeNull()
     expect(screen.getByRole('button', { name: 'Open sidebar' })).toBeTruthy()
+    // The settings seat share tracks the settled column state.
+    expect((b.settingsOwner() as { wide: boolean }).wide).toBe(false)
   })
 })
 
diff --git a/packages/client/ui-theme/README.md b/packages/client/ui-theme/README.md
index 2ce5d9b9e6..be0b83a0d8 100644
--- a/packages/client/ui-theme/README.md
+++ b/packages/client/ui-theme/README.md
@@ -1,10 +1,10 @@
 # @deepseek-ai/dsh-client-ui-theme
 
-Theme plugin: ThemeService over the --dsw-* token base stylesheets (static scale + alias semantic layers); apply(id) toggles the `body[data-ds-dark-theme]` attribute, so theme switches are pure CSS cascade. Contract: api-contracts v3 §8.
+Theme plugin: ThemeService over the --dsw-* token base stylesheets (static scale + alias semantic layers). The service owns the theme preference (`light`/`dark`/`system`, persisted under `dsh.theme`), resolves `system` through `prefers-color-scheme`, and publishes immutable `ThemeSnapshot`s on the `theme/change` event; it never touches the DOM — ui-layout's presenter applies the resolved snapshot (`body[data-ds-dark-theme]` + inline alias tokens). Contract: api-contracts v3 §8.
 
 ## Model Experience
 
-None, as the theme service toggles browser CSS; nothing here reaches a model request.
+None, as the theme service manages a browser preference; nothing here reaches a model request.
 
 #### KV Cache effect
 
@@ -12,6 +12,5 @@ None; this package neither assembles nor sends a provider request.
 
 ## Known Limitations and Deferred Work
 
-- **No theme-switch control ships in P-I** — the service surface (register/apply/current) is complete but no UI owner mounts a toggle; switching happens programmatically.
 - **Third-party themes are a surface, not a product** — registering one means overriding same-named alias variables; no validation exists that an override set is complete.
 - **The token sheets are the sole color authority** — values absent from cssdesign (for example the design's #4176E6 tab blue) are deliberately not appended; the nearest semantic token wins (arbitrated 2026-07-22).
diff --git a/packages/client/ui-theme/package.json b/packages/client/ui-theme/package.json
index 4e601914e3..4c6ad92cd4 100644
--- a/packages/client/ui-theme/package.json
+++ b/packages/client/ui-theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@deepseek-ai/dsh-client-ui-theme",
-  "description": "Theme plugin: ThemeService (apply = toggle body[data-ds-dark-theme]), --dsw-* token base stylesheets",
+  "description": "Theme plugin: ThemeService (light/dark/system preference, prefers-color-scheme resolution, theme/change snapshots; no DOM), --dsw-* token base stylesheets",
   "version": "0.0.1",
   "private": true,
   "type": "module",
@@ -44,5 +44,9 @@
     "lib/types/**/*.d.ts",
     "lib/types/**/*.d.ts.map",
     "src"
-  ]
+  ],
+  "scripts": {
+    "bundle": "tsdown",
+    "watch": "tsdown --watch"
+  }
 }
diff --git a/packages/client/ui-theme/src/client/index.ts b/packages/client/ui-theme/src/client/index.ts
index d9f5b70c3b..5ba5d40b35 100644
--- a/packages/client/ui-theme/src/client/index.ts
+++ b/packages/client/ui-theme/src/client/index.ts
@@ -1,71 +1,196 @@
 /**
- * Browser theme registry over the `--dsw-*` token stylesheets. Theme changes
- * update CSS variables and `body[data-ds-dark-theme]` without React renders.
+ * Browser theme registry over the `--dsw-*` token stylesheets. The service
+ * owns the theme preference (light/dark/system), resolves `system` through
+ * `prefers-color-scheme`, and publishes immutable snapshots; it never touches
+ * the DOM — ui-layout's presenter consumes the resolved snapshot.
  */
 import type { Context } from 'cordis'
 
 /** Theme token dictionary: --dsw-alias-* overrides keyed by variable name. */
 export type ThemeTokens = Record<string, string>
 
+/** Theme preference: a concrete theme id or follow-the-OS. */
+export type ThemePreference = 'light' | 'dark' | 'system'
+
+/** One selectable theme: id, dark/light semantics, and alias-token overrides. */
+export interface ThemeDefinition {
+  /** Theme id (the setTheme argument for concrete themes). */
+  id: string
+  /**
+   * Which base palette this theme builds on. The presenter switches
+   * `body[data-ds-dark-theme]` from this field — never from the id.
+   */
+  colorScheme: 'light' | 'dark'
+  /** Alias-layer overrides applied as inline CSS variables over the base palette. */
+  tokens: ThemeTokens
+}
+
+/** Immutable theme state published on every change. */
+export interface ThemeSnapshot {
+  /** The persisted preference (may be `system`). */
+  preference: ThemePreference
+  /** The resolved active theme (`system` resolved via prefers-color-scheme). */
+  active: ThemeDefinition
+  /** Registered themes in registration order. */
+  themes: readonly ThemeDefinition[]
+  /** Monotonic change counter (registry or active changes). */
+  revision: number
+}
+
 declare module 'cordis' {
   interface Context {
     theme: ThemeService
   }
+  interface Events {
+    /**
+     * Theme state changed (preference switched, registry updated, or the OS
+     * color scheme changed while the preference is `system`).
+     * @param snapshot - Current immutable theme snapshot.
+     * @mode emit
+     */
+    'theme/change'(snapshot: ThemeSnapshot): void
+  }
 }
 
+/** localStorage key holding the persisted theme preference. */
+export const STORAGE_KEY = 'dsh.theme'
+
+/** Default preference when nothing (or garbage) is persisted. */
+export const DEFAULT_PREFERENCE: ThemePreference = 'system'
+
+const BUILTIN_THEMES: readonly ThemeDefinition[] = Object.freeze([
+  Object.freeze({ id: 'light', colorScheme: 'light' as const, tokens: Object.freeze({}) }),
+  Object.freeze({ id: 'dark', colorScheme: 'dark' as const, tokens: Object.freeze({}) }),
+])
+
 /**
- * Theme registry and switcher. `light`/`dark` are built in (the base
- * stylesheets carry both palettes; the dark palette activates via the
- * body[data-ds-dark-theme] attribute). Third-party themes register alias-layer
- * overrides applied as inline CSS variables on body, cascading over whichever
- * base palette the attribute selects.
+ * Theme registry and preference owner. `light`/`dark` are built in (the base
+ * stylesheets carry both palettes); third-party themes register alias-layer
+ * overrides. Reads go through {@link getTheme}; writes only through
+ * {@link setTheme}; continuous sync only through the `theme/change` event.
+ * The service holds the `prefers-color-scheme` media query (environment
+ * sensing, not presentation) and re-emits when the OS scheme flips while the
+ * preference is `system`.
  */
 export class ThemeService {
-  private themes = new Map<string, ThemeTokens>([['light', {}], ['dark', {}]])
-  private appliedTokens: ThemeTokens = {}
-  private active = 'light'
+  private readonly ctx: Context
+  private themes: ThemeDefinition[] = [...BUILTIN_THEMES]
+  private preference: ThemePreference
+  private revision = 0
+  private snapshot: ThemeSnapshot
+  private readonly media: MediaQueryList | undefined
 
   /**
-   * Register a theme. Duplicate id throws (single occupant per id; the
-   * built-in pair counts).
-   * @param id - theme id.
-   * @param tokens - alias-layer overrides (variable name to value).
-   * @returns disposer. Disposing the active theme reverts to `light` so the
-   * UI never keeps tokens of an unregistered theme.
+   * @param ctx - owning context (change events are emitted on it; the
+   * media-query listener is released through ctx.effect on dispose).
    */
-  register(id: string, tokens: ThemeTokens): () => void {
-    if (this.themes.has(id)) throw new Error(`theme "${id}" is already registered`)
-    this.themes.set(id, tokens)
-    return () => {
-      if (!this.themes.delete(id)) return
-      if (this.active === id) this.apply('light')
+  constructor(ctx: Context) {
+    this.ctx = ctx
+    this.preference = restorePreference()
+    this.media = globalThis.matchMedia?.('(prefers-color-scheme: dark)')
+    this.snapshot = this.buildSnapshot()
+    if (this.media !== undefined) {
+      const media = this.media
+      const onChange = (): void => {
+        if (this.preference !== 'system') return
+        this.publish()
+      }
+      ctx.effect(() => {
+        media.addEventListener('change', onChange)
+        return () => { media.removeEventListener('change', onChange) }
+      }, 'ui-theme: prefers-color-scheme listener')
     }
   }
 
   /**
-   * Activate a theme: toggle body[data-ds-dark-theme] (set only for `dark`)
-   * and swap the previous theme's inline token overrides for this one's.
-   * Unregistered id throws.
-   * @param id - registered theme id.
+   * Read the current immutable theme snapshot.
+   * @returns the current snapshot (stable reference until the next change).
    */
-  apply(id: string): void {
-    const tokens = this.themes.get(id)
-    if (!tokens) throw new Error(`theme "${id}" is not registered`)
-    const body = document.body
-    for (const name of Object.keys(this.appliedTokens)) body.style.removeProperty(name)
-    if (id === 'dark') body.setAttribute('data-ds-dark-theme', '')
-    else body.removeAttribute('data-ds-dark-theme')
-    for (const [name, value] of Object.entries(tokens)) body.style.setProperty(name, value)
-    this.appliedTokens = tokens
-    this.active = id
+  getTheme(): ThemeSnapshot {
+    return this.snapshot
   }
 
   /**
-   * Report the active theme id (initially `light`).
-   * @returns the active theme id.
+   * Switch the theme preference — the only preference write entry. Persists
+   * the preference and emits `theme/change`.
+   * @param id - a registered theme id or `system`; unknown ids throw.
    */
-  current(): string {
-    return this.active
+  setTheme(id: string): void {
+    if (id !== 'system' && !this.themes.some(t => t.id === id)) {
+      throw new Error(`theme "${id}" is not registered`)
+    }
+    if (this.preference === id) return
+    this.preference = id as ThemePreference
+    persistPreference(this.preference)
+    this.publish()
+  }
+
+  /**
+   * Register a theme. Duplicate id throws (single occupant per id; the
+   * built-in pair counts; `system` is a preference, not a registrable id).
+   * @param definition - theme id, colorScheme, and alias-token overrides.
+   * @returns disposer. Disposing the theme backing the active preference
+   * resets the preference to the default so the UI never keeps tokens of an
+   * unregistered theme.
+   */
+  register(definition: ThemeDefinition): () => void {
+    if (definition.id === 'system') throw new Error('"system" is a preference, not a registrable theme id')
+    if (this.themes.some(t => t.id === definition.id)) {
+      throw new Error(`theme "${definition.id}" is already registered`)
+    }
+    this.themes = [...this.themes, definition]
+    this.publish()
+    return () => {
+      if (!this.themes.some(t => t.id === definition.id)) return
+      this.themes = this.themes.filter(t => t.id !== definition.id)
+      if (this.preference === definition.id) {
+        this.preference = DEFAULT_PREFERENCE
+        persistPreference(this.preference)
+      }
+      this.publish()
+    }
+  }
+
+  private buildSnapshot(): ThemeSnapshot {
+    const resolvedId = this.preference === 'system'
+      ? (this.media?.matches === true ? 'dark' : 'light')
+      : this.preference
+    // Both built-ins always exist; a registered preference id resolves or has
+    // been reset by its disposer, so the lookup cannot miss.
+    const active = this.themes.find(t => t.id === resolvedId) ?? this.themes[0]!
+    return Object.freeze({
+      preference: this.preference,
+      active,
+      themes: Object.freeze([...this.themes]),
+      revision: this.revision,
+    })
+  }
+
+  private publish(): void {
+    this.revision += 1
+    this.snapshot = this.buildSnapshot()
+    this.ctx.emit('theme/change', this.snapshot)
+  }
+}
+
+/** Read the persisted preference; unknown or unreadable values fall back to the default. */
+function restorePreference(): ThemePreference {
+  try {
+    const stored = globalThis.localStorage?.getItem(STORAGE_KEY)
+    if (stored === 'light' || stored === 'dark' || stored === 'system') return stored
+  } catch {
+    // Storage access can throw (privacy mode); the default below covers it.
+  }
+  return DEFAULT_PREFERENCE
+}
+
+/** Persist the preference; storage failures are non-fatal (preference resets next boot). */
+function persistPreference(preference: ThemePreference): void {
+  try {
+    globalThis.localStorage?.setItem(STORAGE_KEY, preference)
+  } catch {
+    // Storage access can throw (privacy mode / quota); the preference simply
+    // does not survive the session.
   }
 }
 
@@ -77,5 +202,5 @@ export const inject: string[] = []
  * @param ctx - client cordis context.
  */
 export function apply(ctx: Context): void {
-  ctx.provide('theme', new ThemeService())
+  ctx.provide('theme', new ThemeService(ctx))
 }
diff --git a/packages/client/ui-theme/src/invariant.ts b/packages/client/ui-theme/src/invariant.ts
index 292304cbaf..4ec3296cd6 100644
--- a/packages/client/ui-theme/src/invariant.ts
+++ b/packages/client/ui-theme/src/invariant.ts
@@ -15,9 +15,10 @@ export const name = 'client-ui-theme-invariant'
 export const inject = ['invariants']
 
 /**
- * No runtime invariant: a token-sheet registry whose apply() flips one body
- * attribute — it emits no cordis events; registration/apply/current behavior
- * is asserted directly by this package's behavior specs.
+ * No runtime invariant: the theme registry publishes immutable snapshots on
+ * its own `theme/change` event synchronously with the setter/registry
+ * mutation in the same service — snapshot/event agreement is asserted
+ * directly by this package's behavior specs.
  */
 const install: InvariantInstaller = () => {}
 
diff --git a/packages/client/ui-theme/tests/theme.spec.ts b/packages/client/ui-theme/tests/theme.spec.ts
index 126957c5eb..9ab0ab8f0f 100644
--- a/packages/client/ui-theme/tests/theme.spec.ts
+++ b/packages/client/ui-theme/tests/theme.spec.ts
@@ -1,61 +1,90 @@
 // @vitest-environment jsdom
 import { beforeEach, describe, expect, it } from 'vitest'
-import { ThemeService } from '@deepseek-ai/dsh-client-ui-theme/client'
+import { Context } from 'cordis'
+import type { ThemeSnapshot } from '@deepseek-ai/dsh-client-ui-theme/client'
+import { STORAGE_KEY, ThemeService } from '@deepseek-ai/dsh-client-ui-theme/client'
+
+const make = (): { ctx: Context; theme: ThemeService; events: ThemeSnapshot[] } => {
+  const ctx = new Context()
+  const events: ThemeSnapshot[] = []
+  ctx.on('theme/change', (snapshot) => { events.push(snapshot) })
+  return { ctx, theme: new ThemeService(ctx), events }
+}
 
 describe('ThemeService', () => {
   beforeEach(() => {
-    document.body.removeAttribute('data-ds-dark-theme')
-    document.body.removeAttribute('style')
+    localStorage.clear()
   })
 
-  it('starts on light; apply toggles the dark body attribute both ways', () => {
-    const theme = new ThemeService()
-    expect(theme.current()).toBe('light')
-    theme.apply('dark')
-    expect(document.body.hasAttribute('data-ds-dark-theme')).toBe(true)
-    expect(theme.current()).toBe('dark')
-    theme.apply('light')
+  it('defaults to the system preference resolved against prefers-color-scheme', () => {
+    const { theme } = make()
+    const snapshot = theme.getTheme()
+    expect(snapshot.preference).toBe('system')
+    // jsdom matchMedia is absent; system resolves to light.
+    expect(snapshot.active.id).toBe('light')
+    expect(snapshot.active.colorScheme).toBe('light')
+    expect(snapshot.themes.map(t => t.id)).toEqual(['light', 'dark'])
+  })
+
+  it('setTheme switches, persists, republishes, and keeps DOM untouched', () => {
+    const { theme, events } = make()
+    theme.setTheme('dark')
+    expect(theme.getTheme().preference).toBe('dark')
+    expect(theme.getTheme().active.colorScheme).toBe('dark')
+    expect(localStorage.getItem(STORAGE_KEY)).toBe('dark')
+    expect(events).toHaveLength(1)
+    expect(events[0]).toBe(theme.getTheme())
+    // The service never touches presentation state.
     expect(document.body.hasAttribute('data-ds-dark-theme')).toBe(false)
-    expect(theme.current()).toBe('light')
+    // Same-value set is a no-op (no extra event).
+    theme.setTheme('dark')
+    expect(events).toHaveLength(1)
   })
 
-  it('throws on unregistered apply and duplicate register (built-ins included)', () => {
-    const theme = new ThemeService()
-    expect(() => { theme.apply('sepia') }).toThrow('not registered')
-    expect(() => theme.register('light', {})).toThrow('already registered')
-    theme.register('sepia', {})
-    expect(() => theme.register('sepia', {})).toThrow('already registered')
+  it('restores a persisted preference and falls back on garbage', () => {
+    localStorage.setItem(STORAGE_KEY, 'dark')
+    expect(make().theme.getTheme().preference).toBe('dark')
+    localStorage.setItem(STORAGE_KEY, 'sepia')
+    expect(make().theme.getTheme().preference).toBe('system')
   })
 
-  it('applies third-party token overrides as body inline vars and swaps them on switch', () => {
-    const theme = new ThemeService()
-    theme.register('sepia', { '--dsw-alias-bg-base': 'rgb(1, 2, 3)' })
-    theme.apply('sepia')
-    expect(document.body.style.getPropertyValue('--dsw-alias-bg-base')).toBe('rgb(1, 2, 3)')
-    expect(document.body.hasAttribute('data-ds-dark-theme')).toBe(false)
-    theme.apply('dark')
-    expect(document.body.style.getPropertyValue('--dsw-alias-bg-base')).toBe('')
-    expect(document.body.hasAttribute('data-ds-dark-theme')).toBe(true)
+  it('throws on unknown setTheme ids, duplicate registration, and the system id', () => {
+    const { theme } = make()
+    expect(() => { theme.setTheme('sepia') }).toThrow('not registered')
+    expect(() => theme.register({ id: 'light', colorScheme: 'light', tokens: {} })).toThrow('already registered')
+    expect(() => theme.register({ id: 'system', colorScheme: 'light', tokens: {} })).toThrow('preference')
   })
 
-  it('disposing the active theme reverts to light; disposer is idempotent', () => {
-    const theme = new ThemeService()
-    const dispose = theme.register('sepia', { '--dsw-alias-bg-base': 'red' })
-    theme.apply('sepia')
+  it('registered themes join the snapshot; disposing the active one resets to default', () => {
+    const { theme, events } = make()
+    const dispose = theme.register({ id: 'sepia', colorScheme: 'light', tokens: { '--dsw-alias-bg-base': 'red' } })
+    expect(theme.getTheme().themes.map(t => t.id)).toEqual(['light', 'dark', 'sepia'])
+    theme.setTheme('sepia')
+    expect(theme.getTheme().active.tokens['--dsw-alias-bg-base']).toBe('red')
     dispose()
-    expect(theme.current()).toBe('light')
-    expect(document.body.style.getPropertyValue('--dsw-alias-bg-base')).toBe('')
-    expect(() => { theme.apply('sepia') }).toThrow('not registered')
+    expect(theme.getTheme().preference).toBe('system')
+    expect(theme.getTheme().themes.map(t => t.id)).toEqual(['light', 'dark'])
+    expect(localStorage.getItem(STORAGE_KEY)).toBe('system')
+    // register + set + dispose = three publishes; disposer is idempotent.
+    expect(events.length).toBe(3)
     dispose()
-    expect(theme.current()).toBe('light')
+    expect(events.length).toBe(3)
   })
 
-  it('disposing an inactive theme leaves the active selection untouched', () => {
-    const theme = new ThemeService()
-    const dispose = theme.register('sepia', {})
-    theme.apply('dark')
+  it('disposing an inactive theme keeps the active preference', () => {
+    const { theme } = make()
+    const dispose = theme.register({ id: 'sepia', colorScheme: 'light', tokens: {} })
+    theme.setTheme('dark')
     dispose()
-    expect(theme.current()).toBe('dark')
-    expect(document.body.hasAttribute('data-ds-dark-theme')).toBe(true)
+    expect(theme.getTheme().preference).toBe('dark')
+  })
+
+  it('revision increases monotonically across every publish', () => {
+    const { theme, events } = make()
+    theme.setTheme('dark')
+    theme.setTheme('light')
+    const dispose = theme.register({ id: 'sepia', colorScheme: 'dark', tokens: {} })
+    dispose()
+    expect(events.map(e => e.revision)).toEqual([1, 2, 3, 4])
   })
 })
diff --git a/packages/client/web/src/boot.tsx b/packages/client/web/src/boot.tsx
index bd755a5fc1..61dbbd850e 100644
--- a/packages/client/web/src/boot.tsx
+++ b/packages/client/web/src/boot.tsx
@@ -21,7 +21,7 @@
  * switches to the real UI in one pass.
  *
  * Entry creation waits for the whole immediately tier: materialization runs
- * synchronous cross-package require edges (e.g. i18n → runtime/client) that
+ * synchronous cross-package require edges (e.g. locale → runtime/client) that
  * fiber inject waiting cannot protect — a bundle's factory must be
  * registered before any dependent entry materializes. Per-row prefetch
  * failures still resolve silently (the create-side import refetches and
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7f19dcce27..2410252eb0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,9 +125,9 @@ importers:
       '@deepseek-ai/dsh-client-hmr':
         specifier: workspace:^
         version: link:../../packages/client/hmr
-      '@deepseek-ai/dsh-client-i18n':
+      '@deepseek-ai/dsh-client-locale':
         specifier: workspace:^
-        version: link:../../packages/client/i18n
+        version: link:../../packages/client/locale
       '@deepseek-ai/dsh-client-modules':
         specifier: workspace:^
         version: link:../../packages/client/modules
@@ -143,6 +143,15 @@ importers:
       '@deepseek-ai/dsh-client-ui-question':
         specifier: workspace:^
         version: link:../../packages/client/ui-question
+      '@deepseek-ai/dsh-client-ui-settings':
+        specifier: workspace:^
+        version: link:../../packages/client/ui-settings
+      '@deepseek-ai/dsh-client-ui-settings-general':
+        specifier: workspace:^
+        version: link:../../packages/client/ui-settings-general
+      '@deepseek-ai/dsh-client-ui-settings-models':
+        specifier: workspace:^
+        version: link:../../packages/client/ui-settings-models
       '@deepseek-ai/dsh-client-ui-sidebar':
         specifier: workspace:^
         version: link:../../packages/client/ui-sidebar
@@ -740,11 +749,7 @@ importers:
         specifier: ^4.0.0-rc.7
         version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@vendor+loader)
 
-  packages/client/i18n:
-    dependencies:
-      '@deepseek-ai/dsh-client-runtime':
-        specifier: workspace:^
-        version: link:../runtime
+  packages/client/locale:
     devDependencies:
       '@deepseek-ai/dsh-invariants':
         specifier: workspace:^
@@ -844,6 +849,9 @@ importers:
       '@deepseek-ai/dsh-client-ui-slots':
         specifier: workspace:^
         version: link:../ui-slots
+      '@deepseek-ai/dsh-client-ui-theme':
+        specifier: workspace:^
+        version: link:../ui-theme
       '@deepseek-ai/dsh-invariants':
         specifier: workspace:^
         version: link:../../support/invariants
@@ -937,6 +945,104 @@ importers:
         specifier: ^4.0.0-rc.7
         version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)
 
+  packages/client/ui-settings:
+    dependencies:
+      clsx:
+        specifier: ^2.0.0
+        version: 2.1.1
+    devDependencies:
+      '@deepseek-ai/dsh-client-locale':
+        specifier: workspace:^
+        version: link:../locale
+      '@deepseek-ai/dsh-client-runtime':
+        specifier: workspace:^
+        version: link:../runtime
+      '@deepseek-ai/dsh-client-ui-primitives':
+        specifier: workspace:^
+        version: link:../ui-primitives
+      '@deepseek-ai/dsh-client-ui-sidebar':
+        specifier: workspace:^
+        version: link:../ui-sidebar
+      '@deepseek-ai/dsh-client-ui-slots':
+        specifier: workspace:^
+        version: link:../ui-slots
+      '@deepseek-ai/dsh-invariants':
+        specifier: workspace:^
+        version: link:../../support/invariants
+      '@types/react':
+        specifier: ~18.3.1
+        version: 18.3.31
+      cordis:
+        specifier: ^4.0.0-rc.7
+        version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)
+      react:
+        specifier: ^18.2.0
+        version: 18.3.1
+
+  packages/client/ui-settings-general:
+    dependencies:
+      clsx:
+        specifier: ^2.0.0
+        version: 2.1.1
+    devDependencies:
+      '@deepseek-ai/dsh-client-locale':
+        specifier: workspace:^
+        version: link:../locale
+      '@deepseek-ai/dsh-client-runtime':
+        specifier: workspace:^
+        version: link:../runtime
+      '@deepseek-ai/dsh-client-ui-primitives':
+        specifier: workspace:^
+        version: link:../ui-primitives
+      '@deepseek-ai/dsh-client-ui-settings':
+        specifier: workspace:^
+        version: link:../ui-settings
+      '@deepseek-ai/dsh-client-ui-slots':
+        specifier: workspace:^
+        version: link:../ui-slots
+      '@deepseek-ai/dsh-client-ui-theme':
+        specifier: workspace:^
+        version: link:../ui-theme
+      '@deepseek-ai/dsh-invariants':
+        specifier: workspace:^
+        version: link:../../support/invariants
+      '@types/react':
+        specifier: ~18.3.1
+        version: 18.3.31
+      cordis:
+        specifier: ^4.0.0-rc.7
+        version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)
+      react:
+        specifier: ^18.2.0
+        version: 18.3.1
+
+  packages/client/ui-settings-models:
+    devDependencies:
+      '@deepseek-ai/dsh-client-locale':
+        specifier: workspace:^
+        version: link:../locale
+      '@deepseek-ai/dsh-client-runtime':
+        specifier: workspace:^
+        version: link:../runtime
+      '@deepseek-ai/dsh-client-ui-settings':
+        specifier: workspace:^
+        version: link:../ui-settings
+      '@deepseek-ai/dsh-client-ui-slots':
+        specifier: workspace:^
+        version: link:../ui-slots
+      '@deepseek-ai/dsh-invariants':
+        specifier: workspace:^
+        version: link:../../support/invariants
+      '@types/react':
+        specifier: ~18.3.1
+        version: 18.3.31
+      cordis:
+        specifier: ^4.0.0-rc.7
+        version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)
+      react:
+        specifier: ^18.2.0
+        version: 18.3.1
+
   packages/client/ui-sidebar:
     dependencies:
       clsx:
diff --git a/scripts/verify-package-readme-model-experience.ts b/scripts/verify-package-readme-model-experience.ts
index 20d4195737..da5fe34dc4 100644
--- a/scripts/verify-package-readme-model-experience.ts
+++ b/scripts/verify-package-readme-model-experience.ts
@@ -59,7 +59,7 @@ const SENTENCE_MODEL_EXPERIENCE: Readonly<Record<string, SentenceContract>> = {
   'packages/client/ui-trajectory': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/ui-workspace': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/ui-theme': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
-  'packages/client/i18n': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
+  'packages/client/locale': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/web': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/examples/agent-spine-demo': { kind: 'indirect', reason: 'The bundle only mounts model-facing child plugins.' },
   'packages/fs/fs': { kind: 'indirect', reason: 'The service interface delegates model rendering to dsh-tool-fs.' },
diff --git a/tsconfig.base.json b/tsconfig.base.json
index a449a34c4e..81e0fc989c 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -115,7 +115,10 @@
       "@deepseek-ai/dsh-client-ui-trajectory": ["./packages/client/ui-trajectory/src"],
       "@deepseek-ai/dsh-client-ui-workspace": ["./packages/client/ui-workspace/src"],
       "@deepseek-ai/dsh-client-ui-theme": ["./packages/client/ui-theme/src"],
-      "@deepseek-ai/dsh-client-i18n": ["./packages/client/i18n/src"],
+      "@deepseek-ai/dsh-client-ui-settings": ["./packages/client/ui-settings/src"],
+      "@deepseek-ai/dsh-client-ui-settings-general": ["./packages/client/ui-settings-general/src"],
+      "@deepseek-ai/dsh-client-ui-settings-models": ["./packages/client/ui-settings-models/src"],
+      "@deepseek-ai/dsh-client-locale": ["./packages/client/locale/src"],
       "@deepseek-ai/dsh-client-web": ["./packages/client/web/src"],
       "@deepseek-ai/dsh-*": [
         "./packages/core/*/src",
diff --git a/tsconfig.client.json b/tsconfig.client.json
index 17f34b601f..abe80b8b12 100644
--- a/tsconfig.client.json
+++ b/tsconfig.client.json
@@ -38,7 +38,10 @@
     { "path": "./packages/client/ui-question" },
     { "path": "./packages/client/ui-trajectory" },
     { "path": "./packages/client/ui-theme" },
-    { "path": "./packages/client/i18n" },
+    { "path": "./packages/client/ui-settings" },
+    { "path": "./packages/client/ui-settings-general" },
+    { "path": "./packages/client/ui-settings-models" },
+    { "path": "./packages/client/locale" },
     { "path": "./packages/client/web" },
     { "path": "./apps/web" }
   ]

From b1b180e098aef9e39e3c2e889dca7dcd48fea6c1 Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 00:57:21 +0800
Subject: [PATCH 02/15] =?UTF-8?q?fix(gui):=20CI=20gate=20repairs=20?=
 =?UTF-8?q?=E2=80=94=20docs,=20coverage,=20HMR=20re-registration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Regenerate the module-graph/config-catalog/event-graph docs for the
locale rename and new packages; allowlist the three settings READMEs;
complete the RFC code block and add its English pair. Cover the
ThemeService media-query paths (stubbed matchMedia) and mark the
unreachable registry fallback. General section re-registration now
judges presence on the slot ledger instead of a local disposer, which
went stale when an HMR collapse removed the entry.
---
 ...-25-client-settings-locale-theme.i18n.yaml |   6 +
 ...2026-07-25-client-settings-locale-theme.md | 112 ++++++++++++++++++
 ...6-07-25-client-settings-locale-theme.zh.md |  13 ++
 docs/config-catalog.md                        |   5 +-
 docs/event-producer-consumer.md               |   2 +
 docs/module-graph.md                          |  26 +++-
 .../ui-settings-general/src/client/index.ts   |  20 ++--
 packages/client/ui-theme/src/client/index.ts  |   1 +
 packages/client/ui-theme/tests/theme.spec.ts  |  51 +++++++-
 .../verify-package-readme-model-experience.ts |   3 +
 10 files changed, 225 insertions(+), 14 deletions(-)
 create mode 100644 .agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
 create mode 100644 .agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md

diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
new file mode 100644
index 0000000000..54fb6ee9ee
--- /dev/null
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
@@ -0,0 +1,6 @@
+# Bilingual-pair consistency record (docs/i18n/README.md): the git blob hash of each
+# side as of the last confirmed-consistent state. Both languages carry equal authority;
+# after editing either side, bring the other along and re-record with:
+#   pnpm run verify-translation-pairing --write
+2026-07-25-client-settings-locale-theme.md: 25e22c728ea509613c4d7f6cdfcd09faf4685760
+2026-07-25-client-settings-locale-theme.zh.md: 9c2457b254aa826291d4c5a4e115e9ba2d391974
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
new file mode 100644
index 0000000000..25e22c728e
--- /dev/null
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
@@ -0,0 +1,112 @@
+# Agent Note: Client Settings, Locale, and Theme layering
+
+Status: proposed
+
+English | [中文](2026-07-25-client-settings-locale-theme.zh.md)
+
+## Problem
+
+The browser client's existing Settings is written directly inside the Sidebar, and language and theme are applied by component-local state mutating the DOM directly. As a result Settings cannot be extended by independent plugins, preference state has no stable cross-plugin service contract, and the theme registry carries both state and presentation responsibilities.
+
+## Proposal
+
+The Sidebar declares the `sidebar.settings` single slot; `ui-settings` occupies it and declares the `settings.section` list slot. Each section is contributed by an independent plugin; the Settings shell only reads entry metadata from the slot ledger to build the navigation, rendering the current section via `only`.
+
+The Settings entry is the Settings row in the sidebar Foot; clicking it directly opens a 1080×700 centered overlay (black 24% mask); the close button, a mask click, and ESC all close it. There is no intermediate menu form of any kind.
+
+`@deepseek-ai/dsh-client-locale` provides `ctx.locale`; `ui-theme` provides `ctx.theme`. Both services read through a getter, write through a setter, and publish immutable snapshots via typed Cordis change events; each service persists its own preference (storing only the id, with bad values falling back to the default).
+
+General's apply layer subscribes to `locale/change` and `theme/change` and projects the snapshots into the Zustand store declared by that section. React components only read `useStore` and write through the injected setter callbacks, never reading ctx or the services.
+
+The theme preference has three states — `light`, `dark`, `system` — defaulting to `system` (when no persisted preference exists or the value is bad). Resolving system belongs to the theme domain: ThemeService holds the `prefers-color-scheme` matchMedia listener (environment sensing, not DOM presentation) and re-emits the snapshot when the preference is system and the system color scheme changes; the snapshot carries both `preference` and the resolved `active` definition.
+
+The theme service never touches the DOM. `ui-layout` reads the Theme getter initially and then subscribes to `theme/change`; the presenter owned by Layout updates `body[data-ds-dark-theme]` and the theme tokens according to `active`. The presenter has no notion of system — it consumes only resolved results.
+
+### First-phase section scope
+
+| section | Plugin | First-phase content |
+|---|---|---|
+| General | `ui-settings-general` | Language (Selector dropdown) and Appearance (Light/Dark/System three cubes) genuinely switch; Permission and Tool Call are visual skeletons only, with no write operations |
+| Models | `ui-settings-models` | Navigation item only; the content area is empty |
+| Plugin | no package | Not built this phase, and the navigation does not show the item (an external-link entry with no target never renders; once a later plugin registers the section it appears automatically) |
+
+The first phase localizes only the copy inside the Settings overlay (the General rows plus the navigation); copy on other pages is untouched.
+
+### Slot topology
+
+```text
+root
+└─ sidebar
+   └─ sidebar.settings                 single/root
+      └─ ui-settings
+         └─ settings.section           list/root
+            ├─ general                 ui-settings-general
+            └─ models                  ui-settings-models
+```
+
+Section contributions use declaration-aware deferral and do not depend on the client manifest's apply order.
+
+### Service contracts
+
+```ts
+type ThemePreference = 'light' | 'dark' | 'system'
+
+interface ThemeDefinition {
+  id: string
+  colorScheme: 'light' | 'dark'
+  tokens: Record<string, string>
+}
+
+interface ThemeSnapshot {
+  preference: ThemePreference
+  active: ThemeDefinition            // system 已解析为具体 light/dark 定义
+  themes: readonly ThemeDefinition[]
+  revision: number
+}
+
+interface LocaleDefinition {
+  id: 'zh' | 'en'
+  label: string
+}
+
+interface LocaleSnapshot {
+  active: 'zh' | 'en'
+  locales: readonly LocaleDefinition[]
+  revision: number
+}
+
+interface Events {
+  /** @param snapshot - Current locale registry snapshot. @mode emit */
+  'locale/change'(snapshot: LocaleSnapshot): void
+  /** @param snapshot - Current theme registry snapshot. @mode emit */
+  'theme/change'(snapshot: ThemeSnapshot): void
+}
+```
+
+Locale ships with 中文 and English built in; `setLocale`/`setTheme` are the only write entry points, and an unknown id fails.
+
+## Alternatives considered
+
+**Having the app shell subscribe to preferences centrally and re-render the root slot tree.** A language or theme change only needs to update the actual consumers; a whole-tree refresh amplifies the blast radius and wires business preferences into the shell.
+
+**The theme service mutating the DOM directly.** The registry service would then depend on the presentation environment, with unclear lifecycle and global-style ownership; Layout already owns the page-root presentation boundary.
+
+**Resolving system in the Layout presenter.** The presenter would need its own matchMedia subscription and would pick the concrete definition out of the themes list, forcing the presentation layer to understand preference semantics; resolving on the service side gives every consumer the same resolved snapshot.
+
+**Settings importing and enumerating the sections.** Adding a page would require modifying the shell plugin, breaking the composition model where each feature occupies a slot from its own plugin.
+
+**Injecting the Locale/Theme snapshots into React directly.** Inject results are cached by entry identity, so volatile values go stale; hand-rolling a React hook per service also bypasses the slot store's unified binding.
+
+## Acceptance criteria
+
+- The Settings shell depends only on the slot ledger, never on any section implementation.
+- Locale and Theme writes go only through the setters; ongoing synchronization goes only through the change events.
+- The General store initializes from the getters and is thereafter updated by the two events with local re-renders.
+- Layout applies the theme snapshot on its own and the theme service never accesses the DOM; no system branch appears in the presenter.
+- 中文/English and Light/Dark/System switch and are restored after a refresh; with the preference on system, a system color-scheme change takes effect immediately.
+- Models has only a navigation item and an empty content area; the Permission and Tool Call skeletons perform no writes.
+- The overlay closes via the close button, a mask click, and ESC.
+
+## Risks
+
+The apply order of slot declarations and contributions is not fixed, so every new section must keep declaration-aware registration and idempotence guards. Service events may fire before a section's first render, so both the General store's init and the controller attach must align to the current snapshot from the getters. Layout must clean up the global attributes it set on unmount, and ThemeService must remove its matchMedia listener on dispose, so nothing lingers after HMR.
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
index d3c61794b9..9c2457b254 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
@@ -2,6 +2,8 @@
 
 Status: proposed
 
+[English](2026-07-25-client-settings-locale-theme.md) | 中文
+
 ## Problem
 
 浏览器端已有的 Settings 直接写在 Sidebar 内，语言和主题也由组件本地状态直接改 DOM。这使 Settings 无法由独立插件扩展，偏好状态没有稳定的跨插件服务契约，主题 registry 同时承担状态与呈现职责。
@@ -49,6 +51,12 @@ section contribution 使用 declaration-aware deferral，不依赖 client manife
 ```ts
 type ThemePreference = 'light' | 'dark' | 'system'
 
+interface ThemeDefinition {
+  id: string
+  colorScheme: 'light' | 'dark'
+  tokens: Record<string, string>
+}
+
 interface ThemeSnapshot {
   preference: ThemePreference
   active: ThemeDefinition            // system 已解析为具体 light/dark 定义
@@ -56,6 +64,11 @@ interface ThemeSnapshot {
   revision: number
 }
 
+interface LocaleDefinition {
+  id: 'zh' | 'en'
+  label: string
+}
+
 interface LocaleSnapshot {
   active: 'zh' | 'en'
   locales: readonly LocaleDefinition[]
diff --git a/docs/config-catalog.md b/docs/config-catalog.md
index 6c7627aca4..ede904e1a5 100644
--- a/docs/config-catalog.md
+++ b/docs/config-catalog.md
@@ -2017,12 +2017,15 @@ These load from a `cordis.yml` entry with no `config:` block; they declare no co
 
 - `@deepseek-ai/dsh-agent` ([`packages/core/agent/src/index.ts`](../packages/core/agent/src/index.ts))
 - `@deepseek-ai/dsh-client-connection` — requires `httpServer` · `apiProxy` ([`packages/client/connection/src/index.ts`](../packages/client/connection/src/index.ts))
-- `@deepseek-ai/dsh-client-i18n` ([`packages/client/i18n/src/index.ts`](../packages/client/i18n/src/index.ts))
+- `@deepseek-ai/dsh-client-locale` ([`packages/client/locale/src/index.ts`](../packages/client/locale/src/index.ts))
 - `@deepseek-ai/dsh-client-modules` — requires `httpServer` · `loader` ([`packages/client/modules/src/index.ts`](../packages/client/modules/src/index.ts))
 - `@deepseek-ai/dsh-client-runtime` ([`packages/client/runtime/src/index.ts`](../packages/client/runtime/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-conversation` ([`packages/client/ui-conversation/src/index.ts`](../packages/client/ui-conversation/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-layout` ([`packages/client/ui-layout/src/index.ts`](../packages/client/ui-layout/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-question` — requires `tools` · `userInteraction` ([`packages/client/ui-question/src/index.ts`](../packages/client/ui-question/src/index.ts))
+- `@deepseek-ai/dsh-client-ui-settings` ([`packages/client/ui-settings/src/index.ts`](../packages/client/ui-settings/src/index.ts))
+- `@deepseek-ai/dsh-client-ui-settings-general` ([`packages/client/ui-settings-general/src/index.ts`](../packages/client/ui-settings-general/src/index.ts))
+- `@deepseek-ai/dsh-client-ui-settings-models` ([`packages/client/ui-settings-models/src/index.ts`](../packages/client/ui-settings-models/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-sidebar` ([`packages/client/ui-sidebar/src/index.ts`](../packages/client/ui-sidebar/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-theme` ([`packages/client/ui-theme/src/index.ts`](../packages/client/ui-theme/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-trajectory` ([`packages/client/ui-trajectory/src/index.ts`](../packages/client/ui-trajectory/src/index.ts))
diff --git a/docs/event-producer-consumer.md b/docs/event-producer-consumer.md
index d9521f7d67..2c1e85fb3c 100644
--- a/docs/event-producer-consumer.md
+++ b/docs/event-producer-consumer.md
@@ -63,6 +63,8 @@ This matrix shows which packages dispatch each harness-owned event and which pac
 | `internal/dispatch` | - | [`compact`](../packages/compact/compact), [`fs`](../packages/fs/fs), [`goal`](../packages/goal/goal), [`goal-session`](../packages/goal/goal-session), [`hook-protocol`](../packages/hooks/hook-protocol), [`llm-retry`](../packages/llm/llm-retry), [`permission`](../packages/ui/permission), [`plan-mode`](../packages/plan/plan-mode), [`pty-local`](../packages/pty/pty-local), `runtime`, [`sandbox-policy`](../packages/sandbox/sandbox-policy), [`scope`](../packages/core/scope), [`session`](../packages/core/session), [`subagent`](../packages/subagent/subagent), [`time-context`](../packages/context/time-context), [`tool-todo`](../packages/todo/tool-todo), [`tools`](../packages/core/tools), [`user-approval`](../packages/ui/user-approval), [`workflow`](../packages/workflow/workflow) |
 | `internal/plugin` | - | `hmr`, `modules`, `webserver` |
 | `internal/status` | - | [`agent`](../packages/core/agent) |
+| `locale/change` | `locale` (`emit`) | `ui-settings-general`, `ui-settings-models` |
 | `slots/changed` | `runtime` (`emit`) | - |
+| `theme/change` | `ui-theme` (`emit`) | `ui-layout`, `ui-settings-general` |
 
 Maintenance mode: generated: Cordis event declarations and producer/listener edges are resolved from the repository TypeScript Program.
diff --git a/docs/module-graph.md b/docs/module-graph.md
index 9e8b3adf8a..c47bd92d83 100644
--- a/docs/module-graph.md
+++ b/docs/module-graph.md
@@ -136,13 +136,16 @@ flowchart TD
   subgraph group_client["packages/client"]
     pkg_client_connection["client-connection"]
     pkg_client_hmr["client-hmr"]
-    pkg_client_i18n["client-i18n"]
+    pkg_client_locale["client-locale"]
     pkg_client_modules["client-modules"]
     pkg_client_runtime["client-runtime"]
     pkg_client_ui_conversation["client-ui-conversation"]
     pkg_client_ui_layout["client-ui-layout"]
     pkg_client_ui_primitives["client-ui-primitives"]
     pkg_client_ui_question["client-ui-question"]
+    pkg_client_ui_settings["client-ui-settings"]
+    pkg_client_ui_settings_general["client-ui-settings-general"]
+    pkg_client_ui_settings_models["client-ui-settings-models"]
     pkg_client_ui_sidebar["client-ui-sidebar"]
     pkg_client_ui_slots["client-ui-slots"]
     pkg_client_ui_theme["client-ui-theme"]
@@ -225,7 +228,7 @@ flowchart TD
   pkg_subagent_subprocess --> pkg_invariants
   pkg_acp_snapshot --> pkg_invariants
   pkg_loader_smoke --> pkg_invariants
-  pkg_client_i18n --> pkg_invariants
+  pkg_client_locale --> pkg_invariants
   pkg_client_modules --> pkg_invariants
   pkg_client_runtime --> pkg_invariants
   pkg_client_ui_primitives --> pkg_invariants
@@ -253,7 +256,19 @@ flowchart TD
   pkg_client_ui_conversation --> pkg_invariants
   pkg_client_ui_layout --> pkg_client_runtime
   pkg_client_ui_layout --> pkg_client_ui_slots
+  pkg_client_ui_layout --> pkg_client_ui_theme
   pkg_client_ui_layout --> pkg_invariants
+  pkg_client_ui_settings --> pkg_client_runtime
+  pkg_client_ui_settings --> pkg_client_ui_primitives
+  pkg_client_ui_settings --> pkg_client_ui_slots
+  pkg_client_ui_settings --> pkg_invariants
+  pkg_client_ui_settings_general --> pkg_client_runtime
+  pkg_client_ui_settings_general --> pkg_client_ui_primitives
+  pkg_client_ui_settings_general --> pkg_client_ui_slots
+  pkg_client_ui_settings_general --> pkg_invariants
+  pkg_client_ui_settings_models --> pkg_client_runtime
+  pkg_client_ui_settings_models --> pkg_client_ui_slots
+  pkg_client_ui_settings_models --> pkg_invariants
   pkg_client_ui_sidebar --> pkg_client_runtime
   pkg_client_ui_sidebar --> pkg_client_ui_primitives
   pkg_client_ui_sidebar --> pkg_client_ui_slots
@@ -798,7 +813,7 @@ flowchart TD
 | [`subagent-subprocess`](../packages/subagent/subagent-subprocess) | `subagent` | [`invariants`](../packages/support/invariants) |
 | [`acp-snapshot`](../packages/support/acp-snapshot) | `support` | [`invariants`](../packages/support/invariants) |
 | [`loader-smoke`](../packages/support/loader-smoke) | `support` | [`invariants`](../packages/support/invariants) |
-| [`client-i18n`](../packages/client/i18n) | `client` | [`invariants`](../packages/support/invariants) |
+| [`client-locale`](../packages/client/locale) | `client` | [`invariants`](../packages/support/invariants) |
 | [`client-modules`](../packages/client/modules) | `client` | [`invariants`](../packages/support/invariants) |
 | [`client-runtime`](../packages/client/runtime) | `client` | [`invariants`](../packages/support/invariants) |
 | [`client-ui-primitives`](../packages/client/ui-primitives) | `client` | [`invariants`](../packages/support/invariants) |
@@ -817,7 +832,10 @@ flowchart TD
 | [`client-connection`](../packages/client/connection) | `client` | [`host-webserver`](../packages/host/webserver), [`invariants`](../packages/support/invariants) |
 | [`client-hmr`](../packages/client/hmr) | `client` | [`client-modules`](../packages/client/modules), [`host-webserver`](../packages/host/webserver), [`invariants`](../packages/support/invariants) |
 | [`client-ui-conversation`](../packages/client/ui-conversation) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
-| [`client-ui-layout`](../packages/client/ui-layout) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
+| [`client-ui-layout`](../packages/client/ui-layout) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-slots`](../packages/client/ui-slots), [`client-ui-theme`](../packages/client/ui-theme), [`invariants`](../packages/support/invariants) |
+| [`client-ui-settings`](../packages/client/ui-settings) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
+| [`client-ui-settings-general`](../packages/client/ui-settings-general) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
+| [`client-ui-settings-models`](../packages/client/ui-settings-models) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
 | [`client-ui-sidebar`](../packages/client/ui-sidebar) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
 | [`client-ui-workspace`](../packages/client/ui-workspace) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
 | [`helper`](../packages/sdk/helper) | `sdk` | [`brand`](../packages/util/brand), [`invariants`](../packages/support/invariants) |
diff --git a/packages/client/ui-settings-general/src/client/index.ts b/packages/client/ui-settings-general/src/client/index.ts
index 0e59ce2116..f8f8a73304 100644
--- a/packages/client/ui-settings-general/src/client/index.ts
+++ b/packages/client/ui-settings-general/src/client/index.ts
@@ -79,7 +79,14 @@ export function apply(ctx: ClientContext): void {
 
   ctx.effect(() => {
     let dispose: (() => void) | undefined
-    const register = (): void => {
+    // Presence is judged on the ledger, not on the local disposer: an HMR
+    // collapse of the declaring entry removes this entry from the slot core
+    // while `dispose` stays set (the stale disposer is a no-op), so a local
+    // guard would block the re-registration when the declaration returns.
+    const registered = (): boolean =>
+      ctx.slots.entries('settings.section').some(e => e.component === GeneralSection)
+    const tryRegister = (): void => {
+      if (ctx.slots.spec('settings.section') === undefined || registered()) return
       dispose = ctx.slots.register({
         name: 'settings.section',
         id: 'general',
@@ -89,16 +96,13 @@ export function apply(ctx: ClientContext): void {
         inject: injected,
       }, GeneralSection)
     }
-    const tryRegister = (): void => {
-      if (ctx.slots.spec('settings.section') === undefined || dispose !== undefined) return
-      register()
-    }
     // Nav labels are registrant-localized: re-register on locale change so
     // the ledger carries fresh text (the version bump re-renders the shell).
     const offLocale = ctx.on('locale/change', () => {
-      if (dispose === undefined) return
-      dispose()
-      register()
+      if (!registered()) return
+      dispose?.()
+      dispose = undefined
+      tryRegister()
     })
     const unsubscribe = ctx.slots.subscribe('settings.section', () => { tryRegister() })
     tryRegister()
diff --git a/packages/client/ui-theme/src/client/index.ts b/packages/client/ui-theme/src/client/index.ts
index 5ba5d40b35..b8a75c4bed 100644
--- a/packages/client/ui-theme/src/client/index.ts
+++ b/packages/client/ui-theme/src/client/index.ts
@@ -157,6 +157,7 @@ export class ThemeService {
       : this.preference
     // Both built-ins always exist; a registered preference id resolves or has
     // been reset by its disposer, so the lookup cannot miss.
+    /* v8 ignore next -- the ?? arm needs a registry without light/dark, which register()/dispose() cannot produce */
     const active = this.themes.find(t => t.id === resolvedId) ?? this.themes[0]!
     return Object.freeze({
       preference: this.preference,
diff --git a/packages/client/ui-theme/tests/theme.spec.ts b/packages/client/ui-theme/tests/theme.spec.ts
index 9ab0ab8f0f..fdac111e73 100644
--- a/packages/client/ui-theme/tests/theme.spec.ts
+++ b/packages/client/ui-theme/tests/theme.spec.ts
@@ -1,5 +1,5 @@
 // @vitest-environment jsdom
-import { beforeEach, describe, expect, it } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { Context } from 'cordis'
 import type { ThemeSnapshot } from '@deepseek-ai/dsh-client-ui-theme/client'
 import { STORAGE_KEY, ThemeService } from '@deepseek-ai/dsh-client-ui-theme/client'
@@ -87,4 +87,53 @@ describe('ThemeService', () => {
     dispose()
     expect(events.map(e => e.revision)).toEqual([1, 2, 3, 4])
   })
+
+  describe('prefers-color-scheme resolution (stubbed matchMedia)', () => {
+    type Listener = () => void
+    const stubMedia = (initialMatches: boolean) => {
+      const listeners = new Set<Listener>()
+      const media = {
+        matches: initialMatches,
+        addEventListener: (_: 'change', fn: Listener) => { listeners.add(fn) },
+        removeEventListener: (_: 'change', fn: Listener) => { listeners.delete(fn) },
+        flip() {
+          this.matches = !this.matches
+          for (const fn of listeners) fn()
+        },
+        listenerCount: () => listeners.size,
+      }
+      vi.stubGlobal('matchMedia', () => media)
+      return media
+    }
+
+    afterEach(() => { vi.unstubAllGlobals() })
+
+    it('system resolves against the media query and follows OS flips', () => {
+      const media = stubMedia(true)
+      const { theme, events } = make()
+      expect(theme.getTheme().preference).toBe('system')
+      expect(theme.getTheme().active.id).toBe('dark')
+      media.flip()
+      expect(theme.getTheme().active.id).toBe('light')
+      expect(events).toHaveLength(1)
+    })
+
+    it('OS flips do not republish while a concrete preference is set', () => {
+      const media = stubMedia(false)
+      const { theme, events } = make()
+      theme.setTheme('light')
+      expect(events).toHaveLength(1)
+      media.flip()
+      expect(events).toHaveLength(1)
+      expect(theme.getTheme().active.id).toBe('light')
+    })
+
+    it('context dispose releases the media listener', async () => {
+      const media = stubMedia(false)
+      const { ctx } = make()
+      expect(media.listenerCount()).toBe(1)
+      await ctx.fiber.dispose()
+      expect(media.listenerCount()).toBe(0)
+    })
+  })
 })
diff --git a/scripts/verify-package-readme-model-experience.ts b/scripts/verify-package-readme-model-experience.ts
index da5fe34dc4..cb8ebb6a48 100644
--- a/scripts/verify-package-readme-model-experience.ts
+++ b/scripts/verify-package-readme-model-experience.ts
@@ -59,6 +59,9 @@ const SENTENCE_MODEL_EXPERIENCE: Readonly<Record<string, SentenceContract>> = {
   'packages/client/ui-trajectory': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/ui-workspace': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/ui-theme': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
+  'packages/client/ui-settings': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
+  'packages/client/ui-settings-general': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
+  'packages/client/ui-settings-models': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/locale': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/web': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/examples/agent-spine-demo': { kind: 'indirect', reason: 'The bundle only mounts model-facing child plugins.' },

From c5cc348816bb27536ca1ba34928c33d771b3c8dc Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 01:10:23 +0800
Subject: [PATCH 03/15] test(gui): settings package suites; ledger-judged
 re-registration

Full per-file coverage for the three settings packages: invariant
companions, store mirroring with revision guards, behavior-shaped
section/shell specs (props-fed, real store engine), and apply-level
suites on a real Context + SlotCore covering declaration-aware deferral
and HMR collapse recovery. All three registrants now judge presence on
the slot ledger instead of a local disposer, which went stale when a
parent redeclaration cascade removed the entry (ds-review-bot finding);
the locale re-register path keeps the same idempotence.
---
 .../ui-settings-general/src/client/index.ts   |   6 +-
 .../ui-settings-general/tests/apply.spec.ts   | 139 ++++++++++++++++
 .../tests/general-section.spec.tsx            | 112 +++++++++++++
 .../tests/invariant.spec.ts                   |  18 ++
 .../ui-settings-general/tests/store.spec.ts   |  56 +++++++
 .../ui-settings-models/src/client/index.ts    |  20 ++-
 .../ui-settings-models/tests/apply.spec.ts    |  95 +++++++++++
 .../tests/invariant.spec.ts                   |  23 +++
 .../client/ui-settings/src/client/index.ts    |  14 +-
 .../client/ui-settings/tests/apply.spec.ts    | 120 ++++++++++++++
 .../ui-settings/tests/invariant.spec.ts       |  18 ++
 .../ui-settings/tests/settings-root.spec.tsx  | 155 ++++++++++++++++++
 12 files changed, 764 insertions(+), 12 deletions(-)
 create mode 100644 packages/client/ui-settings-general/tests/apply.spec.ts
 create mode 100644 packages/client/ui-settings-general/tests/general-section.spec.tsx
 create mode 100644 packages/client/ui-settings-general/tests/invariant.spec.ts
 create mode 100644 packages/client/ui-settings-general/tests/store.spec.ts
 create mode 100644 packages/client/ui-settings-models/tests/apply.spec.ts
 create mode 100644 packages/client/ui-settings-models/tests/invariant.spec.ts
 create mode 100644 packages/client/ui-settings/tests/apply.spec.ts
 create mode 100644 packages/client/ui-settings/tests/invariant.spec.ts
 create mode 100644 packages/client/ui-settings/tests/settings-root.spec.tsx

diff --git a/packages/client/ui-settings-general/src/client/index.ts b/packages/client/ui-settings-general/src/client/index.ts
index f8f8a73304..52655be7fa 100644
--- a/packages/client/ui-settings-general/src/client/index.ts
+++ b/packages/client/ui-settings-general/src/client/index.ts
@@ -98,9 +98,11 @@ export function apply(ctx: ClientContext): void {
     }
     // Nav labels are registrant-localized: re-register on locale change so
     // the ledger carries fresh text (the version bump re-renders the shell).
+    // The ledger check mirrors tryRegister: after an HMR collapse `dispose`
+    // stays set while the entry is gone — relabeling then must stay quiet.
     const offLocale = ctx.on('locale/change', () => {
-      if (!registered()) return
-      dispose?.()
+      if (dispose === undefined || !registered()) return
+      dispose()
       dispose = undefined
       tryRegister()
     })
diff --git a/packages/client/ui-settings-general/tests/apply.spec.ts b/packages/client/ui-settings-general/tests/apply.spec.ts
new file mode 100644
index 0000000000..8654275831
--- /dev/null
+++ b/packages/client/ui-settings-general/tests/apply.spec.ts
@@ -0,0 +1,139 @@
+/** apply wiring: dictionary registration, declaration-aware section entry,
+ * snapshot projection into the slot store, locale-driven relabeling, and
+ * recovery after an HMR collapse of the declaring entry. */
+import { Context } from 'cordis'
+import { describe, expect, it } from 'vitest'
+import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
+import { LocaleService } from '@deepseek-ai/dsh-client-locale/client'
+import { ThemeService } from '@deepseek-ai/dsh-client-ui-theme/client'
+import { apply, inject } from '@deepseek-ai/dsh-client-ui-settings-general/client'
+import type { GeneralSectionInjected } from '@deepseek-ai/dsh-client-ui-settings-general/client'
+import { GeneralSection } from '../src/client/GeneralSection.tsx'
+import type { createGeneralSettingsStore } from '../src/client/store.ts'
+
+const NS = 'settings.general'
+
+async function bench() {
+  const ctx = new Context()
+  await ctx.plugin(SlotsService).await()
+  const locale = new LocaleService(ctx)
+  const theme = new ThemeService(ctx)
+  ctx.provide('locale', locale)
+  ctx.provide('theme', theme)
+  return { ctx, slots: ctx.get('slots') as SlotsService, locale, theme }
+}
+
+/** Stand in for the settings shell: declare the section list slot from root. */
+function declareSection(slots: SlotsService): () => void {
+  return slots.register(
+    { name: 'root', children: { 'settings.section': { kind: 'list', scope: 'root' } } } as never,
+    () => null,
+  )
+}
+
+/** Mirror the framework's inject choreography: bake a real instance from the
+ * declared handle and hand its actions to the entry's inject factory. */
+function faceOf(slots: SlotsService) {
+  const entry = slots.entries('settings.section')[0]!
+  const handle = entry.store as ReturnType<typeof createGeneralSettingsStore>
+  const instance = handle.create()
+  const face = (entry.inject as unknown as (a: typeof instance.actions) => GeneralSectionInjected)(instance.actions)
+  return { entry, instance, face }
+}
+
+describe('ui-settings-general apply', () => {
+  it('declares the slot, locale, and theme services', () => {
+    expect(inject).toEqual(['slots', 'locale', 'theme'])
+  })
+
+  it('registers dictionaries and the section entry for declarations before or after apply', async () => {
+    const before = await bench()
+    declareSection(before.slots)
+    await before.ctx.plugin({ inject: [...inject], apply }).await()
+    const entry = before.slots.entries('settings.section')[0]!
+    expect(entry.component).toBe(GeneralSection)
+    expect(entry.options).toMatchObject({ id: 'general', order: 0, label: '通用设置' })
+    expect(before.locale.bind(NS)('nav')).toBe('通用设置')
+
+    const after = await bench()
+    const fiber = after.ctx.plugin({ inject: [...inject], apply })
+    await fiber.await()
+    expect(after.slots.entries('settings.section')).toHaveLength(0)
+    declareSection(after.slots)
+    await Promise.resolve()
+    expect(after.slots.entries('settings.section')[0]!.component).toBe(GeneralSection)
+    // Teardown without a live registration exercises the undefined-disposer arm.
+    await fiber.dispose()
+    expect(after.slots.entries('settings.section')).toHaveLength(0)
+  })
+
+  it('projects service snapshots into the store and routes face writes back', async () => {
+    const b = await bench()
+    declareSection(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    // Events ahead of any inject hit the unbound-actions arm without a store.
+    b.theme.setTheme('dark')
+
+    const { instance, face } = faceOf(b.slots)
+    // The inject-time re-sync sealed the init window: both mirrors are current.
+    expect(instance.getSnapshot().localeActive).toBe('zh')
+    expect(instance.getSnapshot().localeOptions.map(l => l.id)).toEqual(['zh', 'en'])
+    expect(instance.getSnapshot().themePreference).toBe('dark')
+    expect(face.t('nav')).toBe('通用设置')
+
+    face.setLocale('en')
+    expect(b.locale.getLocale().active).toBe('en')
+    expect(instance.getSnapshot().localeActive).toBe('en')
+    expect(face.t('nav')).toBe('General')
+
+    face.setTheme('system')
+    expect(b.theme.getTheme().preference).toBe('system')
+    expect(instance.getSnapshot().themePreference).toBe('system')
+  })
+
+  it('re-registers with a fresh ledger label when the locale changes', async () => {
+    const b = await bench()
+    declareSection(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    expect(b.slots.entries('settings.section')[0]!.options.label).toBe('通用设置')
+    b.locale.setLocale('en')
+    const entry = b.slots.entries('settings.section')[0]!
+    expect(entry.options.label).toBe('General')
+    expect(entry.component).toBe(GeneralSection)
+  })
+
+  it('recovers after an HMR collapse of the declaring entry (stale disposer must not block)', async () => {
+    const b = await bench()
+    const host = declareSection(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    expect(b.slots.entries('settings.section')).toHaveLength(1)
+
+    // Collapse: the declarer dies, the cascade removes our entry while the
+    // apply closure still holds its (now stale) disposer.
+    host()
+    expect(b.slots.entries('settings.section')).toHaveLength(0)
+
+    // A locale change inside the collapsed window must stay quiet.
+    b.locale.setLocale('en')
+    expect(b.slots.entries('settings.section')).toHaveLength(0)
+
+    // Redeclaration restores the entry — with the current locale's label.
+    declareSection(b.slots)
+    await Promise.resolve()
+    const entry = b.slots.entries('settings.section')[0]!
+    expect(entry.component).toBe(GeneralSection)
+    expect(entry.options.label).toBe('General')
+  })
+
+  it('removes the entry and the dictionaries on teardown', async () => {
+    const b = await bench()
+    declareSection(b.slots)
+    const fiber = b.ctx.plugin({ inject: [...inject], apply })
+    await fiber.await()
+    expect(b.slots.entries('settings.section')).toHaveLength(1)
+    await fiber.dispose()
+    expect(b.slots.entries('settings.section')).toHaveLength(0)
+    // Dictionary disposal: translation falls back to the bare key.
+    expect(b.locale.bind(NS)('nav')).toBe('nav')
+  })
+})
diff --git a/packages/client/ui-settings-general/tests/general-section.spec.tsx b/packages/client/ui-settings-general/tests/general-section.spec.tsx
new file mode 100644
index 0000000000..e82ed0b1fc
--- /dev/null
+++ b/packages/client/ui-settings-general/tests/general-section.spec.tsx
@@ -0,0 +1,112 @@
+// @vitest-environment jsdom
+/** GeneralSection behavior: skeleton rows stay inert, Language menu drives
+ * setLocale, Appearance cubes follow the preference and drive setTheme. */
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { createSnapshotStore, type SessionListState, type WorkspaceListState } from '@deepseek-ai/dsh-client-runtime/client'
+import { bindSnapshotSelector } from '@deepseek-ai/dsh-client-web-react'
+import { GeneralSection } from '../src/client/GeneralSection.tsx'
+import { createGeneralSettingsStore } from '../src/client/store.ts'
+import { en } from '../src/client/locales.ts'
+import type { GeneralSectionComponentProps } from '../src/client/contract.ts'
+
+afterEach(cleanup)
+
+const LOCALES = [{ id: 'zh', label: '中文' }, { id: 'en', label: 'English' }]
+
+/** Empty global standard-kit hooks (the section reads neither). */
+function emptySessions() {
+  const store = createSnapshotStore<SessionListState>(
+    { ids: [], byId: {}, current: undefined, intent: undefined, phase: 'ready' })
+  return bindSnapshotSelector(store)
+}
+function emptyWorkspaces() {
+  const store = createSnapshotStore<WorkspaceListState>({
+    items: [], intent: undefined, state: 'idle', phase: 'ready', error: null,
+    baselinesReady: true, recentWorkspaceId: undefined,
+  })
+  return bindSnapshotSelector(store)
+}
+
+function mount(init?: { active?: string; preference?: 'light' | 'dark' | 'system' }) {
+  // Real store instance — the sanctioned zero-machinery path for tests.
+  const store = createGeneralSettingsStore().create()
+  store.actions.syncLocale(init?.active ?? 'en', LOCALES, 0)
+  store.actions.syncTheme(init?.preference ?? 'system', 0)
+  const setLocale = vi.fn()
+  const setTheme = vi.fn()
+  const props: GeneralSectionComponentProps = {
+    useSessions: emptySessions(),
+    useWorkspaces: emptyWorkspaces(),
+    useStore: bindSnapshotSelector(store),
+    actions: store.actions,
+    t: (key: string) => en[key] ?? key,
+    setLocale,
+    setTheme,
+  }
+  render(<GeneralSection {...props} />)
+  return { store, setLocale, setTheme }
+}
+
+const pressed = (name: RegExp): string | null =>
+  screen.getByRole('button', { name }).getAttribute('aria-pressed')
+
+describe('GeneralSection', () => {
+  it('renders the four groups with skeleton rows inert', () => {
+    const b = mount()
+    // Permission: disabled selector showing the fixed value.
+    const permission = screen.getByRole('button', { name: /Read only/ }) as HTMLButtonElement
+    expect(permission.disabled).toBe(true)
+    fireEvent.click(permission)
+    // Tool Call: both mode cubes render as plain text, no buttons.
+    expect(screen.getByText('Schema mode')).toBeDefined()
+    expect(screen.getByText('Code mode')).toBeDefined()
+    expect(screen.queryByRole('button', { name: /Schema mode/ })).toBeNull()
+    expect(b.setLocale).not.toHaveBeenCalled()
+    expect(b.setTheme).not.toHaveBeenCalled()
+  })
+
+  it('opens the language menu, selects a locale, and closes', () => {
+    const b = mount({ active: 'en' })
+    const trigger = screen.getByRole('button', { name: /English/ })
+    expect(trigger.getAttribute('aria-expanded')).toBe('false')
+    fireEvent.click(trigger)
+    expect(trigger.getAttribute('aria-expanded')).toBe('true')
+    fireEvent.click(screen.getByRole('menuitem', { name: '中文' }))
+    expect(b.setLocale).toHaveBeenCalledWith('zh')
+    expect(trigger.getAttribute('aria-expanded')).toBe('false')
+    expect(screen.queryByRole('menuitem', { name: '中文' })).toBeNull()
+  })
+
+  it('closes the language menu on outside pointerdown without selecting', () => {
+    const b = mount({ active: 'en' })
+    const trigger = screen.getByRole('button', { name: /English/ })
+    fireEvent.click(trigger)
+    expect(screen.getByRole('menuitem', { name: '中文' })).toBeDefined()
+    fireEvent.pointerDown(document.body)
+    expect(trigger.getAttribute('aria-expanded')).toBe('false')
+    expect(screen.queryByRole('menuitem', { name: '中文' })).toBeNull()
+    expect(b.setLocale).not.toHaveBeenCalled()
+  })
+
+  it('reflects a store locale change in the trigger label (unknown id falls back to the id)', () => {
+    const b = mount({ active: 'en' })
+    act(() => { b.store.actions.syncLocale('zh', LOCALES, 1) })
+    expect(screen.getByRole('button', { name: /中文/ })).toBeDefined()
+    act(() => { b.store.actions.syncLocale('fr', LOCALES, 2) })
+    expect(screen.getByRole('button', { name: /fr/ })).toBeDefined()
+  })
+
+  it('marks the appearance cube matching the preference and switches on click', () => {
+    const b = mount({ preference: 'dark' })
+    expect(pressed(/Dark/)).toBe('true')
+    expect(pressed(/Light/)).toBe('false')
+    expect(pressed(/System/)).toBe('false')
+    fireEvent.click(screen.getByRole('button', { name: /Light/ }))
+    expect(b.setTheme).toHaveBeenCalledWith('light')
+    // Selection follows the store mirror, not the click echo.
+    act(() => { b.store.actions.syncTheme('light', 1) })
+    expect(pressed(/Light/)).toBe('true')
+    expect(pressed(/Dark/)).toBe('false')
+  })
+})
diff --git a/packages/client/ui-settings-general/tests/invariant.spec.ts b/packages/client/ui-settings-general/tests/invariant.spec.ts
new file mode 100644
index 0000000000..7b0527c0ff
--- /dev/null
+++ b/packages/client/ui-settings-general/tests/invariant.spec.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest'
+import { Context } from 'cordis'
+import * as GeneralInvariant from '@deepseek-ai/dsh-client-ui-settings-general/invariant'
+import InvariantService from '@deepseek-ai/dsh-invariants'
+
+describe('invariant companion', () => {
+  it('registers under the package name with an empty installer', async () => {
+    const ctx = new Context()
+    await ctx.plugin(InvariantService, { enabled: true })
+    await expect(ctx.plugin(GeneralInvariant).await()).resolves.toBeDefined()
+  })
+
+  it('node-half apply is a no-op host placeholder', async () => {
+    const { apply } = await import('@deepseek-ai/dsh-client-ui-settings-general')
+    apply()
+    expect(true).toBe(true) // reaching here without throw is the contract
+  })
+})
diff --git a/packages/client/ui-settings-general/tests/store.spec.ts b/packages/client/ui-settings-general/tests/store.spec.ts
new file mode 100644
index 0000000000..b291418471
--- /dev/null
+++ b/packages/client/ui-settings-general/tests/store.spec.ts
@@ -0,0 +1,56 @@
+/** General settings store: snapshot-mirror actions and the revision guard. */
+import { describe, expect, it } from 'vitest'
+import { createGeneralSettingsStore } from '../src/client/store.ts'
+
+const LOCALES = [{ id: 'zh', label: '中文' }, { id: 'en', label: 'English' }]
+
+describe('createGeneralSettingsStore', () => {
+  it('init shape: empty mirrors with revisions at -1', () => {
+    const store = createGeneralSettingsStore().create()
+    expect(store.getSnapshot()).toEqual({
+      localeActive: '',
+      localeOptions: [],
+      localeRevision: -1,
+      themePreference: 'system',
+      themeRevision: -1,
+    })
+  })
+
+  it('syncLocale mirrors the snapshot and advances the revision', () => {
+    const store = createGeneralSettingsStore().create()
+    store.actions.syncLocale('zh', LOCALES, 0)
+    expect(store.getSnapshot().localeActive).toBe('zh')
+    expect(store.getSnapshot().localeOptions).toEqual(LOCALES)
+    expect(store.getSnapshot().localeRevision).toBe(0)
+
+    store.actions.syncLocale('en', LOCALES, 1)
+    expect(store.getSnapshot().localeActive).toBe('en')
+    expect(store.getSnapshot().localeRevision).toBe(1)
+  })
+
+  it('syncLocale revision guard drops stale and duplicate writes', () => {
+    const store = createGeneralSettingsStore().create()
+    store.actions.syncLocale('en', LOCALES, 5)
+    // Stale (lower) and duplicate (equal) revisions leave the mirror intact.
+    store.actions.syncLocale('zh', LOCALES, 4)
+    store.actions.syncLocale('zh', LOCALES, 5)
+    expect(store.getSnapshot().localeActive).toBe('en')
+    expect(store.getSnapshot().localeRevision).toBe(5)
+  })
+
+  it('syncTheme mirrors the preference and guards its revision independently', () => {
+    const store = createGeneralSettingsStore().create()
+    store.actions.syncTheme('dark', 0)
+    expect(store.getSnapshot().themePreference).toBe('dark')
+    expect(store.getSnapshot().themeRevision).toBe(0)
+
+    store.actions.syncTheme('light', 2)
+    expect(store.getSnapshot().themePreference).toBe('light')
+
+    // Stale theme write is dropped; the locale revision axis is untouched.
+    store.actions.syncTheme('system', 1)
+    expect(store.getSnapshot().themePreference).toBe('light')
+    expect(store.getSnapshot().themeRevision).toBe(2)
+    expect(store.getSnapshot().localeRevision).toBe(-1)
+  })
+})
diff --git a/packages/client/ui-settings-models/src/client/index.ts b/packages/client/ui-settings-models/src/client/index.ts
index 8ad2ebb750..c35946fcc8 100644
--- a/packages/client/ui-settings-models/src/client/index.ts
+++ b/packages/client/ui-settings-models/src/client/index.ts
@@ -31,9 +31,15 @@ export function apply(ctx: ClientContext): void {
     ]
     return () => { for (const dispose of disposers) dispose() }
   }, 'ui-settings-models: nav copy dictionaries')
+  // Declaration-aware registration; the LEDGER is the has-registered judge
+  // (not a local flag): after an HMR collapse re-declares the slot, the
+  // cascade already removed our entry, and a stale disposer must not block
+  // the re-registration.
   ctx.effect(() => {
     let dispose: (() => void) | undefined
-    const register = (): void => {
+    const tryRegister = (): void => {
+      if (ctx.slots.spec('settings.section') === undefined) return
+      if (ctx.slots.entries('settings.section').some(e => e.component === ModelsSection)) return
       dispose = ctx.slots.register({
         name: 'settings.section',
         id: 'models',
@@ -41,16 +47,14 @@ export function apply(ctx: ClientContext): void {
         label: ctx.locale.bind('settings.models')('nav'),
       }, ModelsSection)
     }
-    const tryRegister = (): void => {
-      if (ctx.slots.spec('settings.section') === undefined || dispose !== undefined) return
-      register()
-    }
     // Nav labels are registrant-localized: re-register on locale change so
     // the ledger carries fresh text (the version bump re-renders the shell).
+    // Dispose-then-requery: after an HMR collapse the disposer is stale and
+    // the ledger/spec re-check keeps this path an idempotent no-op.
     const offLocale = ctx.on('locale/change', () => {
-      if (dispose === undefined) return
-      dispose()
-      register()
+      dispose?.()
+      dispose = undefined
+      tryRegister()
     })
     const unsubscribe = ctx.slots.subscribe('settings.section', () => { tryRegister() })
     tryRegister()
diff --git a/packages/client/ui-settings-models/tests/apply.spec.ts b/packages/client/ui-settings-models/tests/apply.spec.ts
new file mode 100644
index 0000000000..b7aa3cf2ab
--- /dev/null
+++ b/packages/client/ui-settings-models/tests/apply.spec.ts
@@ -0,0 +1,95 @@
+/** Models section registration: declaration-aware deferral, locale re-registration, and HMR recovery. */
+import { Context } from 'cordis'
+import { describe, expect, it } from 'vitest'
+import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
+import { LocaleService } from '@deepseek-ai/dsh-client-locale/client'
+import { apply, inject } from '@deepseek-ai/dsh-client-ui-settings-models/client'
+import { ModelsSection } from '../src/client/ModelsSection.tsx'
+
+async function bench() {
+  const ctx = new Context()
+  await ctx.plugin(SlotsService).await()
+  const locale = new LocaleService(ctx)
+  ctx.provide('locale', locale)
+  return { ctx, slots: ctx.get('slots') as SlotsService, locale }
+}
+
+function declare(slots: SlotsService): () => void {
+  return slots.register(
+    { name: 'root', children: { 'settings.section': { kind: 'list', scope: 'root' } } } as never,
+    () => null,
+  )
+}
+
+describe('ui-settings-models apply', () => {
+  it('declares the services it uses', () => {
+    expect(inject).toEqual(['slots', 'locale'])
+  })
+
+  it('registers the models nav entry for declarations before or after apply', async () => {
+    const before = await bench()
+    declare(before.slots)
+    await before.ctx.plugin({ inject: [...inject], apply }).await()
+    const entry = before.slots.entries('settings.section')[0]!
+    expect(entry.component).toBe(ModelsSection)
+    expect(entry.options).toEqual({ id: 'models', order: 10, label: '模型' })
+
+    const after = await bench()
+    await after.ctx.plugin({ inject: [...inject], apply }).await()
+    expect(after.slots.entries('settings.section')).toHaveLength(0)
+    declare(after.slots)
+    await Promise.resolve()
+    expect(after.slots.entries('settings.section')[0]!.component).toBe(ModelsSection)
+    // The self-inflicted ledger notifications hit the duplicate guard.
+    expect(after.slots.entries('settings.section')).toHaveLength(1)
+  })
+
+  it('re-registers with fresh label text on locale change', async () => {
+    const b = await bench()
+    declare(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    b.locale.setLocale('en')
+    expect(b.slots.entries('settings.section')[0]!.options.label).toBe('Models')
+    b.locale.setLocale('zh')
+    expect(b.slots.entries('settings.section')[0]!.options.label).toBe('模型')
+  })
+
+  it('locale change while the slot is undeclared stays a no-op', async () => {
+    const b = await bench()
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    b.locale.setLocale('en')
+    expect(b.slots.entries('settings.section')).toHaveLength(0)
+    b.locale.setLocale('zh')
+  })
+
+  it('re-registers after an HMR collapse re-declares the slot (stale disposer must not block)', async () => {
+    const b = await bench()
+    const redeclare = declare(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    expect(b.slots.entries('settings.section')).toHaveLength(1)
+    // Declarer unload: the cascade removes our entry while our local
+    // disposer variable goes stale.
+    redeclare()
+    expect(b.slots.entries('settings.section')).toHaveLength(0)
+    declare(b.slots)
+    await Promise.resolve()
+    expect(b.slots.entries('settings.section')[0]!.component).toBe(ModelsSection)
+    // The locale path also recovers through the same ledger re-check.
+    b.locale.setLocale('en')
+    expect(b.slots.entries('settings.section')[0]!.options.label).toBe('Models')
+    b.locale.setLocale('zh')
+  })
+
+  it('registers the zh/en nav dictionaries and disposes everything with the fiber', async () => {
+    const b = await bench()
+    declare(b.slots)
+    const fiber = b.ctx.plugin({ inject: [...inject], apply })
+    await fiber.await()
+    expect(b.locale.bind('settings.models')('nav')).toBe('模型')
+    await fiber.dispose()
+    expect(b.slots.entries('settings.section')).toHaveLength(0)
+    // The (ns, locale) seats are free again — the dictionary disposers ran.
+    expect(() => b.locale.register('settings.models', 'zh', {})).not.toThrow()
+    expect(() => b.locale.register('settings.models', 'en', {})).not.toThrow()
+  })
+})
diff --git a/packages/client/ui-settings-models/tests/invariant.spec.ts b/packages/client/ui-settings-models/tests/invariant.spec.ts
new file mode 100644
index 0000000000..65c7c1094a
--- /dev/null
+++ b/packages/client/ui-settings-models/tests/invariant.spec.ts
@@ -0,0 +1,23 @@
+import { describe, expect, it } from 'vitest'
+import { Context } from 'cordis'
+import * as ModelsInvariant from '@deepseek-ai/dsh-client-ui-settings-models/invariant'
+import InvariantService from '@deepseek-ai/dsh-invariants'
+import { ModelsSection } from '../src/client/ModelsSection.tsx'
+
+describe('invariant companion', () => {
+  it('registers under the package name with an empty installer', async () => {
+    const ctx = new Context()
+    await ctx.plugin(InvariantService, { enabled: true })
+    await expect(ctx.plugin(ModelsInvariant).await()).resolves.toBeDefined()
+  })
+
+  it('node-half apply is a no-op host placeholder', async () => {
+    const { apply } = await import('@deepseek-ai/dsh-client-ui-settings-models')
+    apply()
+    expect(true).toBe(true) // reaching here without throw is the contract
+  })
+
+  it('the section content column is intentionally empty this phase', () => {
+    expect(ModelsSection()).toBeNull()
+  })
+})
diff --git a/packages/client/ui-settings/src/client/index.ts b/packages/client/ui-settings/src/client/index.ts
index d5135f373c..688436c25b 100644
--- a/packages/client/ui-settings/src/client/index.ts
+++ b/packages/client/ui-settings/src/client/index.ts
@@ -43,13 +43,23 @@ export function apply(ctx: ClientContext): void {
     sectionsVersion: () => ctx.slots.getVersion('settings.section'),
     subscribeSections: (listener) => ctx.slots.subscribe('settings.section', listener),
     sections: () => ctx.slots.entries('settings.section')
-      .map(e => ({ id: e.options.id ?? '', order: e.options.order ?? 0, label: e.options.label ?? '' }))
+      .map(e => ({
+        /* v8 ignore next -- list-slot registration requires id (SlotCore rejects an entry without one) */
+        id: e.options.id ?? '',
+        order: e.options.order ?? 0,
+        label: e.options.label ?? '',
+      }))
       .sort((a, b) => a.order - b.order),
   })
+  // Declaration-aware registration; the LEDGER is the has-registered judge
+  // (not a local flag): after an HMR collapse re-declares the slot, the
+  // cascade already removed our entry, and a stale disposer must not block
+  // the re-registration.
   ctx.effect(() => {
     let dispose: (() => void) | undefined
     const tryRegister = (): void => {
-      if (ctx.slots.spec('sidebar.settings') === undefined || dispose !== undefined) return
+      if (ctx.slots.spec('sidebar.settings') === undefined) return
+      if (ctx.slots.entries('sidebar.settings').some(e => e.component === SettingsRoot)) return
       dispose = ctx.slots.register({
         name: 'sidebar.settings',
         children: { 'settings.section': { kind: 'list', scope: 'root' } },
diff --git a/packages/client/ui-settings/tests/apply.spec.ts b/packages/client/ui-settings/tests/apply.spec.ts
new file mode 100644
index 0000000000..a94406e4ce
--- /dev/null
+++ b/packages/client/ui-settings/tests/apply.spec.ts
@@ -0,0 +1,120 @@
+/** Settings shell registration: declaration-aware deferral, the injected face, and HMR recovery. */
+import { Context } from 'cordis'
+import { describe, expect, it, vi } from 'vitest'
+import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
+import { LocaleService } from '@deepseek-ai/dsh-client-locale/client'
+import { apply, inject } from '@deepseek-ai/dsh-client-ui-settings/client'
+import type { SettingsRootInjected } from '@deepseek-ai/dsh-client-ui-settings/client'
+import { SettingsRoot } from '../src/client/SettingsRoot.tsx'
+
+async function bench() {
+  const ctx = new Context()
+  await ctx.plugin(SlotsService).await()
+  const locale = new LocaleService(ctx)
+  ctx.provide('locale', locale)
+  return { ctx, slots: ctx.get('slots') as SlotsService, locale }
+}
+
+function declare(slots: SlotsService): () => void {
+  return slots.register(
+    { name: 'root', children: { 'sidebar.settings': { kind: 'single', scope: 'root' } } } as never,
+    () => null,
+  )
+}
+
+function injectedOf(slots: SlotsService): SettingsRootInjected {
+  const entry = slots.entries('sidebar.settings')[0]!
+  return (entry.inject as () => SettingsRootInjected)()
+}
+
+describe('ui-settings apply', () => {
+  it('declares the services it uses', () => {
+    expect(inject).toEqual(['slots', 'locale'])
+  })
+
+  it('registers the shell for declarations that arrive before or after apply', async () => {
+    const before = await bench()
+    declare(before.slots)
+    await before.ctx.plugin({ inject: [...inject], apply }).await()
+    expect(before.slots.entries('sidebar.settings')[0]!.component).toBe(SettingsRoot)
+    expect(before.slots.spec('settings.section')).toEqual({ kind: 'list', scope: 'root' })
+
+    const after = await bench()
+    await after.ctx.plugin({ inject: [...inject], apply }).await()
+    expect(after.slots.entries('sidebar.settings')).toHaveLength(0)
+    declare(after.slots)
+    await Promise.resolve()
+    expect(after.slots.entries('sidebar.settings')[0]!.component).toBe(SettingsRoot)
+    // The self-inflicted ledger notifications hit the duplicate guard.
+    expect(after.slots.entries('sidebar.settings')).toHaveLength(1)
+  })
+
+  it('registers the zh/en shell dictionaries and disposes them with the fiber', async () => {
+    const b = await bench()
+    declare(b.slots)
+    const fiber = b.ctx.plugin({ inject: [...inject], apply })
+    await fiber.await()
+    expect(b.locale.bind('settings')('title')).toBe('设置')
+    b.locale.setLocale('en')
+    expect(b.locale.bind('settings')('close')).toBe('Close')
+    await fiber.dispose()
+    // The (ns, locale) seats are free again — the dictionary disposers ran.
+    expect(() => b.locale.register('settings', 'zh', {})).not.toThrow()
+    expect(() => b.locale.register('settings', 'en', {})).not.toThrow()
+  })
+
+  it('exposes translate over "<ns>:<key>" refs with literal echo for plain text', async () => {
+    const b = await bench()
+    declare(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    const injected = injectedOf(b.slots)
+    expect(injected.translate('settings:title')).toBe('设置')
+    expect(injected.translate('no colon ref')).toBe('no colon ref')
+  })
+
+  it('projects the section ledger into ordered nav rows with option defaults', async () => {
+    const b = await bench()
+    declare(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    const injected = injectedOf(b.slots)
+    expect(injected.sections()).toEqual([])
+    b.slots.register({ name: 'settings.section', id: 'z', order: 20, label: 'Z' } as never, () => null)
+    b.slots.register({ name: 'settings.section', id: 'a' } as never, () => null)
+    expect(injected.sections()).toEqual([
+      { id: 'a', order: 0, label: '' },
+      { id: 'z', order: 20, label: 'Z' },
+    ])
+    expect(injected.sectionsVersion()).toBe(b.slots.getVersion('settings.section'))
+    const listener = vi.fn()
+    const off = injected.subscribeSections(listener)
+    b.slots.register({ name: 'settings.section', id: 'b', order: 1, label: 'B' } as never, () => null)
+    await Promise.resolve()
+    expect(listener).toHaveBeenCalled()
+    off()
+  })
+
+  it('re-registers after an HMR collapse re-declares the slot (stale disposer must not block)', async () => {
+    const b = await bench()
+    const redeclare = declare(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    expect(b.slots.entries('sidebar.settings')).toHaveLength(1)
+    // Declarer unload: the cascade removes our entry and the slot spec while
+    // our local disposer variable goes stale.
+    redeclare()
+    expect(b.slots.entries('sidebar.settings')).toHaveLength(0)
+    declare(b.slots)
+    await Promise.resolve()
+    expect(b.slots.entries('sidebar.settings')[0]!.component).toBe(SettingsRoot)
+    expect(b.slots.spec('settings.section')).toEqual({ kind: 'list', scope: 'root' })
+  })
+
+  it('unregisters the shell and collapses settings.section on teardown', async () => {
+    const b = await bench()
+    declare(b.slots)
+    const fiber = b.ctx.plugin({ inject: [...inject], apply })
+    await fiber.await()
+    await fiber.dispose()
+    expect(b.slots.entries('sidebar.settings')).toHaveLength(0)
+    expect(b.slots.spec('settings.section')).toBeUndefined()
+  })
+})
diff --git a/packages/client/ui-settings/tests/invariant.spec.ts b/packages/client/ui-settings/tests/invariant.spec.ts
new file mode 100644
index 0000000000..c3474d5bdd
--- /dev/null
+++ b/packages/client/ui-settings/tests/invariant.spec.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest'
+import { Context } from 'cordis'
+import * as SettingsInvariant from '@deepseek-ai/dsh-client-ui-settings/invariant'
+import InvariantService from '@deepseek-ai/dsh-invariants'
+
+describe('invariant companion', () => {
+  it('registers under the package name with an empty installer', async () => {
+    const ctx = new Context()
+    await ctx.plugin(InvariantService, { enabled: true })
+    await expect(ctx.plugin(SettingsInvariant).await()).resolves.toBeDefined()
+  })
+
+  it('node-half apply is a no-op host placeholder', async () => {
+    const { apply } = await import('@deepseek-ai/dsh-client-ui-settings')
+    apply()
+    expect(true).toBe(true) // reaching here without throw is the contract
+  })
+})
diff --git a/packages/client/ui-settings/tests/settings-root.spec.tsx b/packages/client/ui-settings/tests/settings-root.spec.tsx
new file mode 100644
index 0000000000..ab56365075
--- /dev/null
+++ b/packages/client/ui-settings/tests/settings-root.spec.tsx
@@ -0,0 +1,155 @@
+// @vitest-environment jsdom
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import type { SettingsRootComponentProps } from '../src/client/contract/slots.ts'
+import { SettingsRoot } from '../src/client/SettingsRoot.tsx'
+
+afterEach(cleanup)
+
+const DICT: Record<string, string> = {
+  'settings:trigger': 'Settings',
+  'settings:title': 'Settings',
+  'settings:close': 'Close',
+}
+
+type Row = { id: string; order: number; label: string }
+
+function mount({
+  wide = true,
+  rows = [
+    { id: 'general', order: 0, label: 'General' },
+    { id: 'models', order: 10, label: 'Models' },
+  ],
+}: { wide?: boolean; rows?: Row[] } = {}) {
+  // Mutable row store standing in for the ledger; bump() plays a change.
+  let current = rows
+  let version = 0
+  const listeners = new Set<() => void>()
+  const renderSlot = vi.fn(
+    ((_key: string, _owner: unknown, opts?: { only?: string }) =>
+      <div data-testid={`section-${opts?.only ?? 'all'}`} />) as SettingsRootComponentProps['renderSlot'],
+  )
+  // Global standard kit stubs: the shell consumes neither hook.
+  const unusedHook = (() => { throw new Error('unused by SettingsRoot') }) as never
+  const props: SettingsRootComponentProps = {
+    useSessions: unusedHook,
+    useWorkspaces: unusedHook,
+    wide,
+    translate: (ref) => DICT[ref] ?? ref,
+    sectionsVersion: () => version,
+    subscribeSections: (listener) => {
+      listeners.add(listener)
+      return () => { listeners.delete(listener) }
+    },
+    sections: () => current,
+    renderSlot,
+  }
+  const view = render(<SettingsRoot {...props} />)
+  const bump = (next: Row[]) => {
+    act(() => {
+      current = next
+      version += 1
+      for (const fn of [...listeners]) fn()
+    })
+  }
+  return { view, renderSlot, bump, listeners }
+}
+
+function openPanel() {
+  fireEvent.click(screen.getByRole('button', { name: 'Settings' }))
+}
+
+describe('SettingsRoot trigger', () => {
+  it('renders the wide row with the label and opens the dialog', () => {
+    mount()
+    const trigger = screen.getByRole('button', { name: 'Settings' })
+    expect(trigger.textContent).toContain('Settings')
+    expect(trigger.getAttribute('aria-expanded')).toBe('false')
+    fireEvent.click(trigger)
+    expect(screen.getByRole('dialog')).toBeTruthy()
+    expect(screen.getByRole('button', { name: 'Settings', expanded: true })).toBeTruthy()
+  })
+
+  it('drops the label in the rail state', () => {
+    mount({ wide: false })
+    expect(screen.getByRole('button', { name: 'Settings' }).textContent).toBe('')
+  })
+})
+
+describe('SettingsPanel close paths', () => {
+  it('closes via the header button', () => {
+    mount()
+    openPanel()
+    fireEvent.click(screen.getByRole('button', { name: 'Close' }))
+    expect(screen.queryByRole('dialog')).toBeNull()
+  })
+
+  it('closes via a mask click', () => {
+    mount()
+    openPanel()
+    const dialog = screen.getByRole('dialog')
+    fireEvent.click(dialog.parentElement!.firstElementChild!)
+    expect(screen.queryByRole('dialog')).toBeNull()
+  })
+
+  it('closes via document-level Escape and unhooks the listener with the panel', () => {
+    mount()
+    openPanel()
+    fireEvent.keyDown(document, { key: 'Escape' })
+    expect(screen.queryByRole('dialog')).toBeNull()
+    // Ignored while closed (listener removed with the panel) and non-Escape
+    // keys are ignored while open.
+    fireEvent.keyDown(document, { key: 'Escape' })
+    openPanel()
+    fireEvent.keyDown(document, { key: 'Enter' })
+    expect(screen.getByRole('dialog')).toBeTruthy()
+  })
+
+  it('lands focus on the close button when the dialog opens', () => {
+    mount()
+    openPanel()
+    expect(document.activeElement).toBe(screen.getByRole('button', { name: 'Close' }))
+  })
+})
+
+describe('SettingsPanel navigation', () => {
+  it('projects rows, marks the first active, and renders only that section', () => {
+    mount()
+    openPanel()
+    expect(screen.getByRole('button', { name: 'General' }).getAttribute('aria-current')).toBe('true')
+    expect(screen.getByRole('button', { name: 'Models' }).getAttribute('aria-current')).toBeNull()
+    expect(screen.getByTestId('section-general')).toBeTruthy()
+  })
+
+  it('switches the rendered section on nav click', () => {
+    mount()
+    openPanel()
+    fireEvent.click(screen.getByRole('button', { name: 'Models' }))
+    expect(screen.getByRole('button', { name: 'Models' }).getAttribute('aria-current')).toBe('true')
+    expect(screen.getByTestId('section-models')).toBeTruthy()
+    expect(screen.queryByTestId('section-general')).toBeNull()
+  })
+
+  it('falls back to the first row when the active entry unregisters', () => {
+    const { bump } = mount()
+    openPanel()
+    fireEvent.click(screen.getByRole('button', { name: 'Models' }))
+    bump([{ id: 'general', order: 0, label: 'General' }])
+    expect(screen.queryByRole('button', { name: 'Models' })).toBeNull()
+    expect(screen.getByTestId('section-general')).toBeTruthy()
+  })
+
+  it('renders an empty content column when the ledger is empty', () => {
+    const { renderSlot } = mount({ rows: [] })
+    openPanel()
+    expect(screen.getByRole('dialog')).toBeTruthy()
+    expect(renderSlot).not.toHaveBeenCalled()
+  })
+
+  it('drops the ledger subscription on unmount', () => {
+    const { view, listeners } = mount()
+    expect(listeners.size).toBe(1)
+    view.unmount()
+    expect(listeners.size).toBe(0)
+  })
+})

From 8cc46e602504fc562427b1614545d5dcf27c290c Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 01:16:39 +0800
Subject: [PATCH 04/15] docs(notes): export settings note contract types

Both sides of the bilingual pair compile in one doc-typecheck program;
module-scoped (exported) declarations keep the shared identifiers from
colliding across the pair.
---
 ...2026-07-25-client-settings-locale-theme.i18n.yaml |  4 ++--
 .../2026-07-25-client-settings-locale-theme.md       | 12 ++++++------
 .../2026-07-25-client-settings-locale-theme.zh.md    | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
index 54fb6ee9ee..8583642403 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   pnpm run verify-translation-pairing --write
-2026-07-25-client-settings-locale-theme.md: 25e22c728ea509613c4d7f6cdfcd09faf4685760
-2026-07-25-client-settings-locale-theme.zh.md: 9c2457b254aa826291d4c5a4e115e9ba2d391974
+2026-07-25-client-settings-locale-theme.md: e1245a9e1fac82fb0feb84af7a59945b17fa1daf
+2026-07-25-client-settings-locale-theme.zh.md: 195b2e5ffa3556dd1b8bf2dd6ec8ae84115fbdb2
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
index 25e22c728e..e1245a9e1f 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
@@ -49,33 +49,33 @@ Section contributions use declaration-aware deferral and do not depend on the cl
 ### Service contracts
 
 ```ts
-type ThemePreference = 'light' | 'dark' | 'system'
+export type ThemePreference = 'light' | 'dark' | 'system'
 
-interface ThemeDefinition {
+export interface ThemeDefinition {
   id: string
   colorScheme: 'light' | 'dark'
   tokens: Record<string, string>
 }
 
-interface ThemeSnapshot {
+export interface ThemeSnapshot {
   preference: ThemePreference
   active: ThemeDefinition            // system 已解析为具体 light/dark 定义
   themes: readonly ThemeDefinition[]
   revision: number
 }
 
-interface LocaleDefinition {
+export interface LocaleDefinition {
   id: 'zh' | 'en'
   label: string
 }
 
-interface LocaleSnapshot {
+export interface LocaleSnapshot {
   active: 'zh' | 'en'
   locales: readonly LocaleDefinition[]
   revision: number
 }
 
-interface Events {
+export interface Events {
   /** @param snapshot - Current locale registry snapshot. @mode emit */
   'locale/change'(snapshot: LocaleSnapshot): void
   /** @param snapshot - Current theme registry snapshot. @mode emit */
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
index 9c2457b254..195b2e5ffa 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
@@ -49,33 +49,33 @@ section contribution 使用 declaration-aware deferral，不依赖 client manife
 ### Service contracts
 
 ```ts
-type ThemePreference = 'light' | 'dark' | 'system'
+export type ThemePreference = 'light' | 'dark' | 'system'
 
-interface ThemeDefinition {
+export interface ThemeDefinition {
   id: string
   colorScheme: 'light' | 'dark'
   tokens: Record<string, string>
 }
 
-interface ThemeSnapshot {
+export interface ThemeSnapshot {
   preference: ThemePreference
   active: ThemeDefinition            // system 已解析为具体 light/dark 定义
   themes: readonly ThemeDefinition[]
   revision: number
 }
 
-interface LocaleDefinition {
+export interface LocaleDefinition {
   id: 'zh' | 'en'
   label: string
 }
 
-interface LocaleSnapshot {
+export interface LocaleSnapshot {
   active: 'zh' | 'en'
   locales: readonly LocaleDefinition[]
   revision: number
 }
 
-interface Events {
+export interface Events {
   /** @param snapshot - Current locale registry snapshot. @mode emit */
   'locale/change'(snapshot: LocaleSnapshot): void
   /** @param snapshot - Current theme registry snapshot. @mode emit */

From 2ee4cda0667d990525938dd559c90fcd52e35f3d Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 01:30:46 +0800
Subject: [PATCH 05/15] fix(client): lint conformance for the preference
 services

Replace optional chains on always-present globals with the repo's
typeof guards (store.ts precedent), drop the non-null assertion by
failing loud on an impossible registry miss, and fix two arrow-parens
slips; cover the no-localStorage boot path in both service suites.
---
 packages/client/locale/src/client/index.ts      |  7 +++++--
 packages/client/locale/tests/locale.spec.ts     | 14 +++++++++++++-
 packages/client/ui-layout/src/client/index.ts   |  2 +-
 packages/client/ui-settings/src/client/index.ts |  2 +-
 packages/client/ui-theme/src/client/index.ts    | 15 ++++++++++-----
 packages/client/ui-theme/tests/theme.spec.ts    | 12 ++++++++++++
 6 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/packages/client/locale/src/client/index.ts b/packages/client/locale/src/client/index.ts
index e01d69ea25..35f29a0e52 100644
--- a/packages/client/locale/src/client/index.ts
+++ b/packages/client/locale/src/client/index.ts
@@ -161,8 +161,10 @@ export class LocaleService {
 
 /** Read the persisted locale id; unknown or unreadable values fall back to zh. */
 function restorePreference(): LocaleId {
+  // Non-browser runs (node e2e booting the client tree) have no localStorage.
+  if (typeof localStorage === 'undefined') return FALLBACK_LOCALE
   try {
-    const stored = globalThis.localStorage?.getItem(STORAGE_KEY)
+    const stored = localStorage.getItem(STORAGE_KEY)
     if (stored === 'zh' || stored === 'en') return stored
   } catch {
     // Storage access can throw (privacy mode); the default below covers it.
@@ -172,8 +174,9 @@ function restorePreference(): LocaleId {
 
 /** Persist the locale id; storage failures are non-fatal (preference resets next boot). */
 function persistPreference(id: LocaleId): void {
+  if (typeof localStorage === 'undefined') return
   try {
-    globalThis.localStorage?.setItem(STORAGE_KEY, id)
+    localStorage.setItem(STORAGE_KEY, id)
   } catch {
     // Storage access can throw (privacy mode / quota); the preference simply
     // does not survive the session.
diff --git a/packages/client/locale/tests/locale.spec.ts b/packages/client/locale/tests/locale.spec.ts
index 750c2452e8..3f9efaed19 100644
--- a/packages/client/locale/tests/locale.spec.ts
+++ b/packages/client/locale/tests/locale.spec.ts
@@ -1,5 +1,5 @@
 // @vitest-environment jsdom
-import { beforeEach, describe, expect, it } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { Context } from 'cordis'
 import type { LocaleSnapshot } from '@deepseek-ai/dsh-client-locale/client'
 import { LocaleService, STORAGE_KEY } from '@deepseek-ai/dsh-client-locale/client'
@@ -80,6 +80,18 @@ describe('LocaleService', () => {
     expect(make().svc.getLocale().active).toBe('zh')
   })
 
+  it('runs without localStorage (node boots): defaults on read, no-op on write', () => {
+    vi.stubGlobal('localStorage', undefined)
+    try {
+      const { svc } = make()
+      expect(svc.getLocale().active).toBe('zh')
+      svc.setLocale('en')
+      expect(svc.getLocale().active).toBe('en')
+    } finally {
+      vi.unstubAllGlobals()
+    }
+  })
+
   it('exposes the two shipped locales with self-described labels', () => {
     const { svc } = make()
     expect(svc.getLocale().locales).toEqual([
diff --git a/packages/client/ui-layout/src/client/index.ts b/packages/client/ui-layout/src/client/index.ts
index 39fee1fb52..7474cd69c3 100644
--- a/packages/client/ui-layout/src/client/index.ts
+++ b/packages/client/ui-layout/src/client/index.ts
@@ -107,7 +107,7 @@ export function apply(ctx: ClientContext): void {
   ctx.effect(() => {
     const presenter = new ThemePresenter()
     presenter.apply(ctx.theme.getTheme())
-    const off = ctx.on('theme/change', snapshot => { presenter.apply(snapshot) })
+    const off = ctx.on('theme/change', (snapshot) => { presenter.apply(snapshot) })
     return () => {
       off()
       presenter.dispose()
diff --git a/packages/client/ui-settings/src/client/index.ts b/packages/client/ui-settings/src/client/index.ts
index 688436c25b..3613476ede 100644
--- a/packages/client/ui-settings/src/client/index.ts
+++ b/packages/client/ui-settings/src/client/index.ts
@@ -41,7 +41,7 @@ export function apply(ctx: ClientContext): void {
       return ctx.locale.bind(ref.slice(0, colon))(ref.slice(colon + 1))
     },
     sectionsVersion: () => ctx.slots.getVersion('settings.section'),
-    subscribeSections: (listener) => ctx.slots.subscribe('settings.section', listener),
+    subscribeSections: listener => ctx.slots.subscribe('settings.section', listener),
     sections: () => ctx.slots.entries('settings.section')
       .map(e => ({
         /* v8 ignore next -- list-slot registration requires id (SlotCore rejects an entry without one) */
diff --git a/packages/client/ui-theme/src/client/index.ts b/packages/client/ui-theme/src/client/index.ts
index b8a75c4bed..5c7ca3fe12 100644
--- a/packages/client/ui-theme/src/client/index.ts
+++ b/packages/client/ui-theme/src/client/index.ts
@@ -87,7 +87,8 @@ export class ThemeService {
   constructor(ctx: Context) {
     this.ctx = ctx
     this.preference = restorePreference()
-    this.media = globalThis.matchMedia?.('(prefers-color-scheme: dark)')
+    // Non-browser runs (node e2e booting the client tree) have no matchMedia.
+    this.media = typeof matchMedia === 'undefined' ? undefined : matchMedia('(prefers-color-scheme: dark)')
     this.snapshot = this.buildSnapshot()
     if (this.media !== undefined) {
       const media = this.media
@@ -157,8 +158,9 @@ export class ThemeService {
       : this.preference
     // Both built-ins always exist; a registered preference id resolves or has
     // been reset by its disposer, so the lookup cannot miss.
-    /* v8 ignore next -- the ?? arm needs a registry without light/dark, which register()/dispose() cannot produce */
-    const active = this.themes.find(t => t.id === resolvedId) ?? this.themes[0]!
+    const active = this.themes.find(t => t.id === resolvedId)
+    /* v8 ignore next 2 -- needs a registry without light/dark, which register()/dispose() cannot produce */
+    if (active === undefined) throw new Error(`theme registry lost "${resolvedId}"`)
     return Object.freeze({
       preference: this.preference,
       active,
@@ -176,8 +178,10 @@ export class ThemeService {
 
 /** Read the persisted preference; unknown or unreadable values fall back to the default. */
 function restorePreference(): ThemePreference {
+  // Non-browser runs (node e2e booting the client tree) have no localStorage.
+  if (typeof localStorage === 'undefined') return DEFAULT_PREFERENCE
   try {
-    const stored = globalThis.localStorage?.getItem(STORAGE_KEY)
+    const stored = localStorage.getItem(STORAGE_KEY)
     if (stored === 'light' || stored === 'dark' || stored === 'system') return stored
   } catch {
     // Storage access can throw (privacy mode); the default below covers it.
@@ -187,8 +191,9 @@ function restorePreference(): ThemePreference {
 
 /** Persist the preference; storage failures are non-fatal (preference resets next boot). */
 function persistPreference(preference: ThemePreference): void {
+  if (typeof localStorage === 'undefined') return
   try {
-    globalThis.localStorage?.setItem(STORAGE_KEY, preference)
+    localStorage.setItem(STORAGE_KEY, preference)
   } catch {
     // Storage access can throw (privacy mode / quota); the preference simply
     // does not survive the session.
diff --git a/packages/client/ui-theme/tests/theme.spec.ts b/packages/client/ui-theme/tests/theme.spec.ts
index fdac111e73..c853c9fd67 100644
--- a/packages/client/ui-theme/tests/theme.spec.ts
+++ b/packages/client/ui-theme/tests/theme.spec.ts
@@ -88,6 +88,18 @@ describe('ThemeService', () => {
     expect(events.map(e => e.revision)).toEqual([1, 2, 3, 4])
   })
 
+  it('runs without localStorage (node boots): defaults on read, no-op on write', () => {
+    vi.stubGlobal('localStorage', undefined)
+    try {
+      const { theme } = make()
+      expect(theme.getTheme().preference).toBe('system')
+      theme.setTheme('dark')
+      expect(theme.getTheme().preference).toBe('dark')
+    } finally {
+      vi.unstubAllGlobals()
+    }
+  })
+
   describe('prefers-color-scheme resolution (stubbed matchMedia)', () => {
     type Listener = () => void
     const stubMedia = (initialMatches: boolean) => {

From 23a60ade67215b2ad6da00e24921fba8dafda4b9 Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 02:51:36 +0800
Subject: [PATCH 06/15] refactor(gui): features register their own settings
 surfaces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Settings collaboration direction (recorded in the note): the shell only
provides composition faces — feature plugins register themselves. The
General section moves into the ui-settings shell (order 0, skeleton
rows) and declares the settings.general.item list slot; locale registers
the Language row and ui-theme the Appearance row (each with its own
store mirror, dictionaries, and ledger-judged deferral); the
ui-settings-general package is gone. ui-settings-models becomes
ui-models — a feature package that contributes its Settings section
rather than a settings-owned satellite. The item-slot SlotMap entry is
authored in the ui-settings contract and repeated verbatim in
locale/ui-theme (reference-cycle avoidance; declaration merging keeps
the copies identical).
---
 ...2026-07-25-client-settings-locale-theme.md |  42 ++++--
 ...6-07-25-client-settings-locale-theme.zh.md |  44 +++---
 apps/cli/cordis.yml                           |   7 +-
 apps/cli/package.json                         |   3 +-
 apps/cli/tsconfig.json                        |   5 +-
 apps/web/tests/session-title.snapshot.ts      |   3 +-
 apps/web/tests/workspace-flow.snapshot.ts     |   3 +-
 packages/client/locale/package.json           |  22 ++-
 .../locale/src/client/LanguageRow.module.css  |  47 ++++++
 .../client/locale/src/client/LanguageRow.tsx  |  68 +++++++++
 packages/client/locale/src/client/index.ts    |  72 ++++++++-
 .../locale/src/client/settings-contract.ts    |  18 +++
 .../locale/src/client/settings-store.ts       |  47 ++++++
 .../src/css-modules.d.ts                      |   0
 .../client/locale/tests/invariant.spec.ts     |   6 +-
 packages/client/locale/tsconfig.json          |   9 ++
 .../README.md                                 |   2 +-
 .../package.json                              |   4 +-
 .../src/client/ModelsSection.tsx              |   0
 .../src/client/index.ts                       |   4 +-
 .../src/css-modules.d.ts                      |   0
 .../src/index.ts                              |   0
 .../src/invariant.ts                          |   8 +-
 .../tests/apply.spec.ts                       |   4 +-
 .../tests/invariant.spec.ts                   |   4 +-
 .../tsconfig.json                             |   0
 packages/client/ui-models/tsdown.config.ts    |   3 +
 packages/client/ui-settings-general/README.md |  15 --
 .../client/ui-settings-general/package.json   |  70 ---------
 .../src/client/GeneralSection.tsx             | 118 ---------------
 .../src/client/contract.ts                    |  66 --------
 .../ui-settings-general/src/client/index.ts   | 117 ---------------
 .../ui-settings-general/src/client/store.ts   |  43 ------
 .../client/ui-settings-general/src/index.ts   |   4 -
 .../ui-settings-general/src/invariant.ts      |  32 ----
 .../ui-settings-general/tests/apply.spec.ts   | 139 -----------------
 .../tests/general-section.spec.tsx            | 112 --------------
 .../tests/invariant.spec.ts                   |  18 ---
 .../ui-settings-general/tests/store.spec.ts   |  56 -------
 .../client/ui-settings-general/tsconfig.json  |  36 -----
 .../ui-settings-general/tsdown.config.ts      |   3 -
 .../ui-settings-models/tsdown.config.ts       |   3 -
 .../src/client/GeneralSection.module.css      |  38 ++---
 .../ui-settings/src/client/GeneralSection.tsx |  51 +++++++
 .../ui-settings/src/client/contract/slots.ts  |  38 ++++-
 .../client/ui-settings/src/client/index.ts    |  59 +++++++-
 .../src/client/locales.ts                     |  26 ++--
 .../client/ui-settings/tests/apply.spec.ts    |  81 +++++++++-
 .../tests/general-section.spec.tsx            |  47 ++++++
 packages/client/ui-theme/package.json         |  25 +++-
 .../src/client/AppearanceRow.module.css       |  51 +++++++
 .../ui-theme/src/client/AppearanceRow.tsx     |  63 ++++++++
 packages/client/ui-theme/src/client/index.ts  |  89 ++++++++++-
 .../ui-theme/src/client/settings-contract.ts  |  17 +++
 .../ui-theme/src/client/settings-store.ts     |  37 +++++
 packages/client/ui-theme/src/css-modules.d.ts |   6 +
 .../client/ui-theme/tests/invariant.spec.ts   |  10 +-
 packages/client/ui-theme/tsconfig.json        |  12 ++
 pnpm-lock.yaml                                | 141 +++++++++---------
 .../verify-package-readme-model-experience.ts |   3 +-
 tsconfig.base.json                            |   3 +-
 tsconfig.client.json                          |   3 +-
 62 files changed, 1008 insertions(+), 1049 deletions(-)
 create mode 100644 packages/client/locale/src/client/LanguageRow.module.css
 create mode 100644 packages/client/locale/src/client/LanguageRow.tsx
 create mode 100644 packages/client/locale/src/client/settings-contract.ts
 create mode 100644 packages/client/locale/src/client/settings-store.ts
 rename packages/client/{ui-settings-general => locale}/src/css-modules.d.ts (100%)
 rename packages/client/{ui-settings-models => ui-models}/README.md (92%)
 rename packages/client/{ui-settings-models => ui-models}/package.json (89%)
 rename packages/client/{ui-settings-models => ui-models}/src/client/ModelsSection.tsx (100%)
 rename packages/client/{ui-settings-models => ui-models}/src/client/index.ts (96%)
 rename packages/client/{ui-settings-models => ui-models}/src/css-modules.d.ts (100%)
 rename packages/client/{ui-settings-models => ui-models}/src/index.ts (100%)
 rename packages/client/{ui-settings-models => ui-models}/src/invariant.ts (81%)
 rename packages/client/{ui-settings-models => ui-models}/tests/apply.spec.ts (96%)
 rename packages/client/{ui-settings-models => ui-models}/tests/invariant.spec.ts (82%)
 rename packages/client/{ui-settings-models => ui-models}/tsconfig.json (100%)
 create mode 100644 packages/client/ui-models/tsdown.config.ts
 delete mode 100644 packages/client/ui-settings-general/README.md
 delete mode 100644 packages/client/ui-settings-general/package.json
 delete mode 100644 packages/client/ui-settings-general/src/client/GeneralSection.tsx
 delete mode 100644 packages/client/ui-settings-general/src/client/contract.ts
 delete mode 100644 packages/client/ui-settings-general/src/client/index.ts
 delete mode 100644 packages/client/ui-settings-general/src/client/store.ts
 delete mode 100644 packages/client/ui-settings-general/src/index.ts
 delete mode 100644 packages/client/ui-settings-general/src/invariant.ts
 delete mode 100644 packages/client/ui-settings-general/tests/apply.spec.ts
 delete mode 100644 packages/client/ui-settings-general/tests/general-section.spec.tsx
 delete mode 100644 packages/client/ui-settings-general/tests/invariant.spec.ts
 delete mode 100644 packages/client/ui-settings-general/tests/store.spec.ts
 delete mode 100644 packages/client/ui-settings-general/tsconfig.json
 delete mode 100644 packages/client/ui-settings-general/tsdown.config.ts
 delete mode 100644 packages/client/ui-settings-models/tsdown.config.ts
 rename packages/client/{ui-settings-general => ui-settings}/src/client/GeneralSection.module.css (75%)
 create mode 100644 packages/client/ui-settings/src/client/GeneralSection.tsx
 rename packages/client/{ui-settings-general => ui-settings}/src/client/locales.ts (64%)
 create mode 100644 packages/client/ui-settings/tests/general-section.spec.tsx
 create mode 100644 packages/client/ui-theme/src/client/AppearanceRow.module.css
 create mode 100644 packages/client/ui-theme/src/client/AppearanceRow.tsx
 create mode 100644 packages/client/ui-theme/src/client/settings-contract.ts
 create mode 100644 packages/client/ui-theme/src/client/settings-store.ts
 create mode 100644 packages/client/ui-theme/src/css-modules.d.ts

diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
index e1245a9e1f..0dfcb4ea90 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
@@ -10,41 +10,48 @@ The browser client's existing Settings is written directly inside the Sidebar, a
 
 ## Proposal
 
-The Sidebar declares the `sidebar.settings` single slot; `ui-settings` occupies it and declares the `settings.section` list slot. Each section is contributed by an independent plugin; the Settings shell only reads entry metadata from the slot ledger to build the navigation, rendering the current section via `only`.
+**Collaboration doctrine (how every later module joins Settings): feature owners self-register.** The Settings shell provides only the composition surface (the top-level section list plus the item list inside General) and neither imports nor enumerates any feature; for a feature to appear in Settings, its own plugin registers into the corresponding slot — locale registers the Language row, ui-theme registers the Appearance row, ui-models registers the Models top-level panel. No separate `ui-settings-*` package is created for "a feature's settings page": the settings surface belongs to the feature package itself (shipping the Theme feature means Theme's settings choices ship with ui-theme). The only content the shell carries itself is the first top-level directory, General (skeleton rows plus the item slot declaration), because it belongs to no single feature.
+
+The Sidebar declares the `sidebar.settings` single slot; `ui-settings` occupies it and declares the `settings.section` list slot. Each section is contributed by a feature plugin; the Settings shell only reads entry metadata from the slot ledger to build the navigation, rendering the current section via `only`. General is registered by the shell itself (order 0) and declares the `settings.general.item` list slot, into which the feature plugins' preference rows slot by order.
 
 The Settings entry is the Settings row in the sidebar Foot; clicking it directly opens a 1080×700 centered overlay (black 24% mask); the close button, a mask click, and ESC all close it. There is no intermediate menu form of any kind.
 
 `@deepseek-ai/dsh-client-locale` provides `ctx.locale`; `ui-theme` provides `ctx.theme`. Both services read through a getter, write through a setter, and publish immutable snapshots via typed Cordis change events; each service persists its own preference (storing only the id, with bad values falling back to the default).
 
-General's apply layer subscribes to `locale/change` and `theme/change` and projects the snapshots into the Zustand store declared by that section. React components only read `useStore` and write through the injected setter callbacks, never reading ctx or the services.
+Each feature row's apply layer subscribes to its own change event (locale to `locale/change`, ui-theme to `theme/change`) and projects the snapshot into the slot store declared when that row registered. React components only read `useStore` and write through the injected setter callbacks, never reading ctx or the services.
 
 The theme preference has three states — `light`, `dark`, `system` — defaulting to `system` (when no persisted preference exists or the value is bad). Resolving system belongs to the theme domain: ThemeService holds the `prefers-color-scheme` matchMedia listener (environment sensing, not DOM presentation) and re-emits the snapshot when the preference is system and the system color scheme changes; the snapshot carries both `preference` and the resolved `active` definition.
 
 The theme service never touches the DOM. `ui-layout` reads the Theme getter initially and then subscribes to `theme/change`; the presenter owned by Layout updates `body[data-ds-dark-theme]` and the theme tokens according to `active`. The presenter has no notion of system — it consumes only resolved results.
 
-### First-phase section scope
+### First-phase registration surfaces
 
-| section | Plugin | First-phase content |
+| Registration surface | Owning plugin | First-phase content |
 |---|---|---|
-| General | `ui-settings-general` | Language (Selector dropdown) and Appearance (Light/Dark/System three cubes) genuinely switch; Permission and Tool Call are visual skeletons only, with no write operations |
-| Models | `ui-settings-models` | Navigation item only; the content area is empty |
-| Plugin | no package | Not built this phase, and the navigation does not show the item (an external-link entry with no target never renders; once a later plugin registers the section it appears automatically) |
+| General section (order 0) | built into the `ui-settings` shell | Permission and Tool Call visual skeletons (no write operations) plus the `settings.general.item` slot declaration |
+| Language row (item order 0) | `locale` | Selector dropdown; 中文/English genuinely switch |
+| Appearance row (item order 10) | `ui-theme` | Light/Dark/System three cubes genuinely switch (the selected state reflects preference) |
+| Models section (order 10) | `ui-models` | Navigation item only, with an empty content area; later model-management features land in that package |
+| Plugin | none | Not built this phase, and the navigation does not show the item (once a later plugin feature package registers the section it appears automatically) |
 
-The first phase localizes only the copy inside the Settings overlay (the General rows plus the navigation); copy on other pages is untouched.
+The first phase localizes only the copy inside the Settings overlay; dictionaries stay close to their owners — shell copy (the chrome plus the General skeletons) lives in the `settings` namespace, and feature-row copy lives in each feature package (`settings.locale`, `settings.theme`, `settings.models`).
 
 ### Slot topology
 
 ```text
 root
 └─ sidebar
-   └─ sidebar.settings                 single/root
-      └─ ui-settings
-         └─ settings.section           list/root
-            ├─ general                 ui-settings-general
-            └─ models                  ui-settings-models
+   └─ sidebar.settings                   single/root
+      └─ ui-settings（壳）
+         └─ settings.section             list/root
+            ├─ general (order 0)         ui-settings 壳自带
+            │  └─ settings.general.item  list/root
+            │     ├─ language (0)        locale 注册
+            │     └─ appearance (10)     ui-theme 注册
+            └─ models (order 10)         ui-models 注册
 ```
 
-Section contributions use declaration-aware deferral and do not depend on the client manifest's apply order.
+Section and item contributions both use declaration-aware deferral and do not depend on the client manifest's apply order. The `settings.general.item` SlotMap entry's canonical home is the ui-settings contract; locale/ui-theme, because of the reference cycle (the shell consumes ctx.locale), consume that entry as verbatim duplicated merges, with declaration merging guaranteeing the copies agree.
 
 ### Service contracts
 
@@ -95,13 +102,16 @@ Locale ships with 中文 and English built in; `setLocale`/`setTheme` are the on
 
 **Settings importing and enumerating the sections.** Adding a page would require modifying the shell plugin, breaking the composition model where each feature occupies a slot from its own plugin.
 
+**One `ui-settings-*` package per section (the first-cut implementation).** It divorces the settings surface from the feature itself: changing Theme behavior touches two packages, the package count grows linearly with settings items, and settings-general depending back on the locale/theme services forms an intermediate layer that exists purely for the package split. After converging on feature-owner self-registration, General belongs to the shell (it belongs to no single feature) and preference rows ship with their feature packages.
+
 **Injecting the Locale/Theme snapshots into React directly.** Inject results are cached by entry identity, so volatile values go stale; hand-rolling a React hook per service also bypasses the slot store's unified binding.
 
 ## Acceptance criteria
 
-- The Settings shell depends only on the slot ledger, never on any section implementation.
+- The Settings shell depends only on the slot ledger, never on any feature implementation; General's item list likewise depends only on the ledger.
+- Adding a settings item = the feature package registering it itself (a section or a general item), with zero shell changes.
 - Locale and Theme writes go only through the setters; ongoing synchronization goes only through the change events.
-- The General store initializes from the getters and is thereafter updated by the two events with local re-renders.
+- Each feature row's store initializes from the getter and is thereafter updated by its own change event with local re-renders.
 - Layout applies the theme snapshot on its own and the theme service never accesses the DOM; no system branch appears in the presenter.
 - 中文/English and Light/Dark/System switch and are restored after a refresh; with the preference on system, a system color-scheme change takes effect immediately.
 - Models has only a navigation item and an empty content area; the Permission and Tool Call skeletons perform no writes.
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
index 195b2e5ffa..dfe93a0ca1 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
@@ -10,41 +10,48 @@ Status: proposed
 
 ## Proposal
 
-Sidebar 声明 `sidebar.settings` 单坑位，`ui-settings` 占用它并声明 `settings.section` list 坑位。每个 section 由独立插件贡献；Settings 壳只从 slot ledger 读取 entry metadata 生成导航，通过 `only` 渲染当前 section。
+**协作导向（后续所有模块接入 Settings 的方式）：功能属主自注册。** Settings 壳只提供组合面（一级 section 列表 + General 内的 item 列表），不 import 也不枚举任何功能；一个功能要出现在 Settings 里，由它自己的插件向对应坑位注册——locale 注册 Language 行，ui-theme 注册 Appearance 行，ui-models 注册 Models 一级面板。不为「某功能的设置页」单开 `ui-settings-*` 包：设置面属于功能包本身（做 Theme 功能，Theme 的设置选择就随 ui-theme 一起交付）。壳自带的唯一内容是第一个一级目录 General（骨架行 + item 坑位声明），因为它不属于任何单一功能。
+
+Sidebar 声明 `sidebar.settings` 单坑位，`ui-settings` 占用它并声明 `settings.section` list 坑位。每个 section 由功能插件贡献；Settings 壳只从 slot ledger 读取 entry metadata 生成导航，通过 `only` 渲染当前 section。General 由壳自己注册（order 0）并声明 `settings.general.item` list 坑位，功能插件的偏好行按 order 排入。
 
 Settings 入口是 sidebar Foot 的 Settings 行，点击直接打开 1080×700 居中浮层（黑 24% 遮罩）；close 按钮、点击遮罩、ESC 均关闭。无任何中间菜单形态。
 
 `@deepseek-ai/dsh-client-locale` 提供 `ctx.locale`，`ui-theme` 提供 `ctx.theme`。两个 service 都以 getter 读取、setter 写入并用 typed Cordis change event 发布 immutable snapshot；service 自己持久化偏好（只存 id，坏值回退默认）。
 
-General 的 apply 层订阅 `locale/change` 和 `theme/change`，把 snapshot 投影到该 section 声明的 Zustand store。React 组件只读 `useStore`、写注入的 setter callback，不读取 ctx 或 service。
+功能行的 apply 层各自订阅自家 change event（locale 订 `locale/change`，ui-theme 订 `theme/change`），把 snapshot 投影到该行注册时声明的 slot store。React 组件只读 `useStore`、写注入的 setter callback，不读取 ctx 或 service。
 
 Theme 偏好三态：`light`、`dark`、`system`，默认 `system`（无持久化偏好或坏值时）。system 的解析属主题领域：ThemeService 持有 `prefers-color-scheme` matchMedia 监听（环境感知，非 DOM 呈现），偏好为 system 且系统配色变化时重发 snapshot；snapshot 同时携带 `preference` 与解析后的 `active` 定义。
 
 Theme service 不操作 DOM。`ui-layout` 初始读取 Theme getter，随后订阅 `theme/change`，由 Layout 持有的 presenter 按 `active` 更新 `body[data-ds-dark-theme]` 和主题 token；presenter 不感知 system，只消费已解析结果。
 
-### 首期 section 范围
+### 首期注册面
 
-| section | 插件 | 首期内容 |
+| 注册面 | 属主插件 | 首期内容 |
 |---|---|---|
-| General | `ui-settings-general` | Language（Selector 下拉）与 Appearance（Light/Dark/System 三 cube）真实可切；Permission、Tool Call 仅视觉骨架，无写操作 |
-| Models | `ui-settings-models` | 仅导航项，内容区为空 |
-| Plugin | 不建包 | 首期不做，导航不出现该项（无目标的外链入口不上屏；后续插件注册 section 即自动出现） |
+| General section（order 0）| `ui-settings` 壳自带 | Permission、Tool Call 视觉骨架（无写操作）+ `settings.general.item` 坑位声明 |
+| Language 行（item order 0）| `locale` | Selector 下拉，中文/English 真实可切 |
+| Appearance 行（item order 10）| `ui-theme` | Light/Dark/System 三 cube 真实可切（选中态看 preference） |
+| Models section（order 10）| `ui-models` | 仅导航项，内容区为空；后续模型管理功能落在该包 |
+| Plugin | 无 | 首期不做，导航不出现该项（后续插件功能包注册 section 即自动出现） |
 
-首期只翻译 Settings 浮层内文案（General 各行 + 导航）；其他页面文案不动。
+首期只翻译 Settings 浮层内文案；字典就近——壳文案（chrome + General 骨架）归 `settings` namespace，功能行文案归各功能包（`settings.locale`、`settings.theme`、`settings.models`）。
 
 ### Slot topology
 
 ```text
 root
 └─ sidebar
-   └─ sidebar.settings                 single/root
-      └─ ui-settings
-         └─ settings.section           list/root
-            ├─ general                 ui-settings-general
-            └─ models                  ui-settings-models
+   └─ sidebar.settings                   single/root
+      └─ ui-settings（壳）
+         └─ settings.section             list/root
+            ├─ general (order 0)         ui-settings 壳自带
+            │  └─ settings.general.item  list/root
+            │     ├─ language (0)        locale 注册
+            │     └─ appearance (10)     ui-theme 注册
+            └─ models (order 10)         ui-models 注册
 ```
 
-section contribution 使用 declaration-aware deferral，不依赖 client manifest 的 apply 顺序。
+section/item contribution 均使用 declaration-aware deferral，不依赖 client manifest 的 apply 顺序。`settings.general.item` 的 SlotMap 条目正家在 ui-settings contract；locale/ui-theme 因引用环（壳消费 ctx.locale）以逐字重复合并的方式消费该条目，declaration merging 保证副本一致。
 
 ### Service contracts
 
@@ -95,13 +102,16 @@ Locale 内置中文和 English；`setLocale`/`setTheme` 是唯一写入口，未
 
 **Settings import 并枚举各 section。** 新增页面必须修改壳插件，破坏「每个功能由自己的插件占坑」的组合模型。
 
+**每个 section 单开 `ui-settings-*` 包（首版实现）。** 设置面与功能本体分家：改 Theme 行为要动两个包，包数随设置项线性膨胀，且 settings-general 反向依赖 locale/theme 服务形成纯粹为拆包而生的中间层。收敛为功能属主自注册后，General 归壳（不属任何单一功能），preference 行随功能包交付。
+
 **把 Locale/Theme snapshot 直接注入 React。** inject 结果按 entry identity 缓存，易变值会陈旧；为每个 service 自造 React hook 也绕开 slot store 的统一绑定。
 
 ## Acceptance criteria
 
-- Settings 壳只依赖 slot ledger，不依赖任一 section 实现。
+- Settings 壳只依赖 slot ledger，不依赖任一功能实现；General 的 item 列表同样只依赖 ledger。
+- 新增一个设置项 = 功能包自己注册（section 或 general item），零壳改动。
 - Locale 与 Theme 的写入只走 setter，持续同步只走 change event。
-- General store 初始化走 getter，后续由两个 event 更新并局部重渲染。
+- 功能行 store 初始化走 getter，后续由自家 change event 更新并局部重渲染。
 - Layout 独立应用 Theme snapshot，Theme service 不访问 DOM；presenter 不出现 system 分支。
 - 中文/English 与 Light/Dark/System 能切换并刷新后恢复；偏好为 system 时系统配色变化即时生效。
 - Models 只有导航项与空内容区；Permission、Tool Call 骨架无写操作。
@@ -109,4 +119,4 @@ Locale 内置中文和 English；`setLocale`/`setTheme` 是唯一写入口，未
 
 ## Risks
 
-slot 声明与 contribution 的 apply 顺序不固定，所有新 section 必须保留 declaration-aware registration 和幂等防护。service event 可能早于 section 首次渲染，General store 的 init 与 controller attach 都必须从 getter 对齐当前 snapshot。Layout 卸载时必须清理自己设置的全局属性，ThemeService dispose 时必须移除 matchMedia 监听，避免 HMR 后残留。
+slot 声明与 contribution 的 apply 顺序不固定，所有 section/item 注册方必须保留 declaration-aware registration，并以 ledger（而非本地 disposer）判定在位。service event 可能早于行首次渲染，功能行 store 的 init 与 inject attach 都必须从 getter 对齐当前 snapshot。`settings.general.item` 的重复合并副本（locale、ui-theme）与 ui-settings 正家必须逐字一致，漂移即三处一起改。Layout 卸载时必须清理自己设置的全局属性，ThemeService dispose 时必须移除 matchMedia 监听，避免 HMR 后残留。
diff --git a/apps/cli/cordis.yml b/apps/cli/cordis.yml
index 8412a313b4..39803aa603 100644
--- a/apps/cli/cordis.yml
+++ b/apps/cli/cordis.yml
@@ -233,11 +233,8 @@
 - id: ui-settings
   name: '@deepseek-ai/dsh-client-ui-settings'
 
-- id: ui-settings-general
-  name: '@deepseek-ai/dsh-client-ui-settings-general'
-
-- id: ui-settings-models
-  name: '@deepseek-ai/dsh-client-ui-settings-models'
+- id: ui-models
+  name: '@deepseek-ai/dsh-client-ui-models'
 
 - id: ui-conversation
   name: '@deepseek-ai/dsh-client-ui-conversation'
diff --git a/apps/cli/package.json b/apps/cli/package.json
index 74a6e417e1..ddf8a08a87 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -31,8 +31,7 @@
     "@deepseek-ai/dsh-client-ui-question": "workspace:^",
     "@deepseek-ai/dsh-client-ui-sidebar": "workspace:^",
     "@deepseek-ai/dsh-client-ui-settings": "workspace:^",
-    "@deepseek-ai/dsh-client-ui-settings-general": "workspace:^",
-    "@deepseek-ai/dsh-client-ui-settings-models": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-models": "workspace:^",
     "@deepseek-ai/dsh-client-ui-theme": "workspace:^",
     "@deepseek-ai/dsh-client-ui-trajectory": "workspace:^",
     "@deepseek-ai/dsh-client-ui-workspace": "workspace:^",
diff --git a/apps/cli/tsconfig.json b/apps/cli/tsconfig.json
index 7614ae2e31..3000fd1f8d 100644
--- a/apps/cli/tsconfig.json
+++ b/apps/cli/tsconfig.json
@@ -45,10 +45,7 @@
       "path": "../../packages/client/ui-settings"
     },
     {
-      "path": "../../packages/client/ui-settings-general"
-    },
-    {
-      "path": "../../packages/client/ui-settings-models"
+      "path": "../../packages/client/ui-models"
     },
     {
       "path": "../../packages/client/locale"
diff --git a/apps/web/tests/session-title.snapshot.ts b/apps/web/tests/session-title.snapshot.ts
index b8ee3408a3..35356fa0b3 100644
--- a/apps/web/tests/session-title.snapshot.ts
+++ b/apps/web/tests/session-title.snapshot.ts
@@ -14,8 +14,7 @@ const PLUGINS: readonly (WebBootEntry & { dir: string })[] = [
   { id: '@deepseek-ai/dsh-client-ui-layout', dir: 'ui-layout', url: '/plugins/ui-layout.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-runtime'] },
   { id: '@deepseek-ai/dsh-client-ui-sidebar', dir: 'ui-sidebar', url: '/plugins/ui-sidebar.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] },
   { id: '@deepseek-ai/dsh-client-ui-settings', dir: 'ui-settings', url: '/plugins/ui-settings.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-sidebar', '@deepseek-ai/dsh-client-locale'] },
-  { id: '@deepseek-ai/dsh-client-ui-settings-general', dir: 'ui-settings-general', url: '/plugins/ui-settings-general.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings'] },
-  { id: '@deepseek-ai/dsh-client-ui-settings-models', dir: 'ui-settings-models', url: '/plugins/ui-settings-models.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings'] },
+  { id: '@deepseek-ai/dsh-client-ui-models', dir: 'ui-models', url: '/plugins/ui-models.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings'] },
   { id: '@deepseek-ai/dsh-client-ui-conversation', dir: 'ui-conversation', url: '/plugins/ui-conversation.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] },
   { id: '@deepseek-ai/dsh-client-ui-workspace', dir: 'ui-workspace', url: '/plugins/ui-workspace.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-runtime', '@deepseek-ai/dsh-client-ui-conversation', '@deepseek-ai/dsh-client-ui-sidebar'] },
   { id: '@deepseek-ai/dsh-client-ui-trajectory', dir: 'ui-trajectory', url: '/plugins/ui-trajectory.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-conversation'] },
diff --git a/apps/web/tests/workspace-flow.snapshot.ts b/apps/web/tests/workspace-flow.snapshot.ts
index e232d8e123..738357a551 100644
--- a/apps/web/tests/workspace-flow.snapshot.ts
+++ b/apps/web/tests/workspace-flow.snapshot.ts
@@ -14,8 +14,7 @@ const PLUGINS: readonly (WebBootEntry & { dir: string })[] = [
   { id: '@deepseek-ai/dsh-client-ui-layout', dir: 'ui-layout', url: '/plugins/ui-layout.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-runtime'] },
   { id: '@deepseek-ai/dsh-client-ui-sidebar', dir: 'ui-sidebar', url: '/plugins/ui-sidebar.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] },
   { id: '@deepseek-ai/dsh-client-ui-settings', dir: 'ui-settings', url: '/plugins/ui-settings.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-sidebar', '@deepseek-ai/dsh-client-locale'] },
-  { id: '@deepseek-ai/dsh-client-ui-settings-general', dir: 'ui-settings-general', url: '/plugins/ui-settings-general.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings'] },
-  { id: '@deepseek-ai/dsh-client-ui-settings-models', dir: 'ui-settings-models', url: '/plugins/ui-settings-models.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings'] },
+  { id: '@deepseek-ai/dsh-client-ui-models', dir: 'ui-models', url: '/plugins/ui-models.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings'] },
   { id: '@deepseek-ai/dsh-client-ui-conversation', dir: 'ui-conversation', url: '/plugins/ui-conversation.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] },
   {
     id: '@deepseek-ai/dsh-client-ui-workspace',
diff --git a/packages/client/locale/package.json b/packages/client/locale/package.json
index 340efe042e..d53d2e4269 100644
--- a/packages/client/locale/package.json
+++ b/packages/client/locale/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@deepseek-ai/dsh-client-locale",
-  "description": "Locale plugin: LocaleService (zh/en preference with getter/setter/change event + persistence; ns x locale dictionaries, bind(ns) -> t)",
+  "description": "Locale plugin: LocaleService (zh/en preference with getter/setter/change event + persistence; ns x locale dictionaries, bind(ns) -> t); registers the Language settings row",
   "version": "0.0.1",
   "private": true,
   "type": "module",
@@ -23,18 +23,29 @@
     "./package.json": "./package.json"
   },
   "dshClient": {
-    "inject": [],
+    "inject": [
+      "@deepseek-ai/dsh-client-runtime"
+    ],
     "platform": "web",
     "immediately": true
   },
   "license": "BSD-3-Clause",
   "peerDependencies": {
+    "@deepseek-ai/dsh-client-runtime": "^0.0.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.0.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.0.1",
     "@deepseek-ai/dsh-invariants": "^0.0.1",
-    "cordis": "^4.0.0-rc.7"
+    "cordis": "^4.0.0-rc.7",
+    "react": "^18.2.0"
   },
   "devDependencies": {
+    "@deepseek-ai/dsh-client-runtime": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-primitives": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-slots": "workspace:^",
     "@deepseek-ai/dsh-invariants": "workspace:^",
-    "cordis": "^4.0.0-rc.7"
+    "@types/react": "~18.3.1",
+    "cordis": "^4.0.0-rc.7",
+    "react": "^18.2.0"
   },
   "files": [
     "lib/index.js",
@@ -47,5 +58,8 @@
   "scripts": {
     "bundle": "tsdown",
     "watch": "tsdown --watch"
+  },
+  "dependencies": {
+    "clsx": "^2.0.0"
   }
 }
diff --git a/packages/client/locale/src/client/LanguageRow.module.css b/packages/client/locale/src/client/LanguageRow.module.css
new file mode 100644
index 0000000000..f17a67d279
--- /dev/null
+++ b/packages/client/locale/src/client/LanguageRow.module.css
@@ -0,0 +1,47 @@
+/* Language row (figma 'Setting-Cell': gap 8, pad 16/0, hairline separator;
+ * the section column removes the separator on its last child). */
+
+.row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 16px 0;
+  border-bottom: 1px solid var(--dsw-alias-border-l2);
+}
+
+.rowText {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding-right: 48px;
+}
+
+.title {
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 22px;
+  color: var(--dsw-alias-label-primary);
+}
+
+/* Selector pill (figma 'Selector': h36 r18, fill #F5F6F7, pad 0/14, gap 12). */
+.selector {
+  display: inline-flex;
+  align-items: center;
+  gap: 12px;
+  height: 36px;
+  padding: 0 14px;
+  border: none;
+  border-radius: 18px;
+  background: var(--dsw-alias-bg-module-platform);
+  font: inherit;
+  font-size: 14px;
+  line-height: 22px;
+  color: var(--dsw-alias-label-primary);
+  cursor: pointer;
+}
+
+.chevron {
+  flex: none;
+}
diff --git a/packages/client/locale/src/client/LanguageRow.tsx b/packages/client/locale/src/client/LanguageRow.tsx
new file mode 100644
index 0000000000..a824bc6752
--- /dev/null
+++ b/packages/client/locale/src/client/LanguageRow.tsx
@@ -0,0 +1,68 @@
+/**
+ * Language preference row registered into the General section item slot
+ * (figma 501:30011 'Setting-Cell'): title + selector pill opening the locale
+ * menu. Registered by this package — the locale feature owns its own
+ * settings surface.
+ */
+import { useState } from 'react'
+import type { PropsRuntime, PropsStore } from '@deepseek-ai/dsh-client-ui-slots'
+import { IconChevronDownOutline14, Menu } from '@deepseek-ai/dsh-client-ui-primitives'
+import type {} from './settings-contract.ts'
+import type { createLanguageRowStore } from './settings-store.ts'
+import css from './LanguageRow.module.css'
+
+/** Injected business face: namespace-bound translate + the preference write. */
+export interface LanguageRowInjected {
+  /** Translate a `settings.locale` dictionary key to the active-locale text. */
+  t: (key: string) => string
+  /** Switch the active locale (a registered locale id). */
+  setLocale: (id: string) => void
+}
+
+/** Full component props: runtime share + store share + injected face. */
+export type LanguageRowComponentProps =
+  PropsRuntime<'settings.general.item'> & PropsStore<ReturnType<typeof createLanguageRowStore>> & LanguageRowInjected
+
+/**
+ * Render the Language row.
+ * @param props - composed slot props.
+ * @returns the row element tree.
+ */
+export function LanguageRow({ t, setLocale, useStore }: LanguageRowComponentProps) {
+  const active = useStore(s => s.active)
+  const options = useStore(s => s.options)
+  const [open, setOpen] = useState(false)
+  const activeLabel = options.find(o => o.id === active)?.label ?? active
+
+  return (
+    <div className={css.row}>
+      <div className={css.rowText}>
+        <div className={css.title}>{t('language.title')}</div>
+      </div>
+      <Menu
+        open={open}
+        onClose={() => { setOpen(false) }}
+        items={options.map(o => ({ id: o.id, label: o.label }))}
+        selectedId={active}
+        onSelect={(id) => {
+          setLocale(id)
+          setOpen(false)
+        }}
+        align="end"
+        portal
+        anchor={(
+          <button
+            type="button"
+            className={css.selector}
+            aria-haspopup="menu"
+            aria-expanded={open}
+            onClick={() => { setOpen(v => !v) }}
+          >
+            {activeLabel}
+            <IconChevronDownOutline14 className={css.chevron} />
+          </button>
+        )}
+      />
+    </div>
+  )
+}
diff --git a/packages/client/locale/src/client/index.ts b/packages/client/locale/src/client/index.ts
index 35f29a0e52..444594f9b8 100644
--- a/packages/client/locale/src/client/index.ts
+++ b/packages/client/locale/src/client/index.ts
@@ -1,10 +1,20 @@
 /**
  * Browser-side locale registry. Bound translation functions retain stable
- * identity for injected consumers.
+ * identity for injected consumers. The plugin also registers the Language
+ * preference row into the settings General section — the locale feature owns
+ * its own settings surface.
  */
 import type { Context } from 'cordis'
+import type { BoundActions } from '@deepseek-ai/dsh-client-ui-slots'
+import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
 import { en } from '../locales/en.ts'
 import { zh } from '../locales/zh.ts'
+import type { LanguageRowInjected } from './LanguageRow.tsx'
+import { LanguageRow } from './LanguageRow.tsx'
+import { createLanguageRowStore } from './settings-store.ts'
+
+export type { LanguageRowComponentProps, LanguageRowInjected } from './LanguageRow.tsx'
+export type { LanguageOptionRow, LanguageRowState } from './settings-store.ts'
 
 /** Translate a key with optional params. */
 export type Translate = (key: string, params?: Record<string, unknown>) => string
@@ -53,6 +63,9 @@ export const FALLBACK_LOCALE: LocaleId = 'zh'
 /** Shared namespace for shell-level texts. */
 export const COMMON_NS = 'common'
 
+/** Namespace owning this feature's settings-row copy. */
+export const SETTINGS_NS = 'settings.locale'
+
 /** localStorage key holding the persisted locale id. */
 export const STORAGE_KEY = 'dsh.locale'
 
@@ -183,16 +196,65 @@ function persistPreference(id: LocaleId): void {
   }
 }
 
-/** Required services (none; the loader passes the export surface as an object plugin). */
-export const inject: string[] = []
+/** Required services: the slot registry (the feature registers its own settings row). */
+export const inject = ['slots']
 
 /**
- * Client plugin body: provide the locale service with base dictionaries.
+ * Client plugin body: provide the locale service with base dictionaries and
+ * register the feature-owned Language preference row into the General
+ * section's item slot (a feature owns its settings surface).
  * @param ctx - client cordis context.
  */
-export function apply(ctx: Context): void {
+export function apply(ctx: ClientContext): void {
   const locale = new LocaleService(ctx)
   locale.register(COMMON_NS, 'zh', zh)
   locale.register(COMMON_NS, 'en', en)
+  locale.register(SETTINGS_NS, 'zh', { 'language.title': '语言' })
+  locale.register(SETTINGS_NS, 'en', { 'language.title': 'Language' })
   ctx.provide('locale', locale)
+
+  const store = createLanguageRowStore()
+  let bound: BoundActions<typeof store> | undefined
+  const sync = (snapshot: LocaleSnapshot): void => {
+    bound?.sync(
+      snapshot.active,
+      snapshot.locales.map(l => ({ id: l.id, label: l.label })),
+      snapshot.revision,
+    )
+  }
+  ctx.on('locale/change', sync)
+  const injected = (actions: BoundActions<typeof store>): LanguageRowInjected => {
+    bound = actions
+    // Re-sync from the getter so no event is lost between registration and
+    // first render (the store's revision guard drops stale duplicates).
+    sync(locale.getLocale())
+    return {
+      t: locale.bind(SETTINGS_NS),
+      setLocale: (id) => { locale.setLocale(id) },
+    }
+  }
+  // Declaration-aware registration; the LEDGER is the has-registered judge
+  // (not a local flag): after an HMR collapse re-declares the slot, the
+  // cascade already removed our entry, and a stale disposer must not block
+  // the re-registration.
+  ctx.effect(() => {
+    let dispose: (() => void) | undefined
+    const tryRegister = (): void => {
+      if (ctx.slots.spec('settings.general.item') === undefined) return
+      if (ctx.slots.entries('settings.general.item').some(e => e.component === LanguageRow)) return
+      dispose = ctx.slots.register({
+        name: 'settings.general.item',
+        id: 'language',
+        order: 0,
+        store,
+        inject: injected,
+      }, LanguageRow)
+    }
+    const unsubscribe = ctx.slots.subscribe('settings.general.item', () => { tryRegister() })
+    tryRegister()
+    return () => {
+      unsubscribe()
+      dispose?.()
+    }
+  }, 'locale: language settings row registration')
 }
diff --git a/packages/client/locale/src/client/settings-contract.ts b/packages/client/locale/src/client/settings-contract.ts
new file mode 100644
index 0000000000..add314122c
--- /dev/null
+++ b/packages/client/locale/src/client/settings-contract.ts
@@ -0,0 +1,18 @@
+/**
+ * Settings-surface slot merge consumed by this package's Language row. The
+ * AUTHORITATIVE home for 'settings.general.item' is the ui-settings contract
+ * (declaring is claiming: the shell's General entry declares the slot); this
+ * file repeats the entry verbatim because the shell consumes ctx.locale
+ * (project reference ui-settings -> locale), so importing the shell's types
+ * from here would close a reference cycle. TypeScript declaration merging
+ * rejects diverging duplicates, so every program that sees both copies (the
+ * shell's own build, the client aggregate) enforces identity.
+ */
+declare module '@deepseek-ai/dsh-client-ui-slots' {
+  interface SlotMap {
+    /** One preference row inside the General section (duplicate-identical merge; authority: ui-settings contract). */
+    'settings.general.item': { kind: 'list'; scope: 'root'; owner: { children?: never } }
+  }
+}
+
+export {}
diff --git a/packages/client/locale/src/client/settings-store.ts b/packages/client/locale/src/client/settings-store.ts
new file mode 100644
index 0000000000..485fd409f0
--- /dev/null
+++ b/packages/client/locale/src/client/settings-store.ts
@@ -0,0 +1,47 @@
+/**
+ * Language row slot store: a mirror of the locale service snapshot. The
+ * plugin's apply-world change listener is the only writer; the row component
+ * reads via props.useStore.
+ */
+import { defineStore, type EngineStoreHandle } from '@deepseek-ai/dsh-client-runtime/client'
+
+/** One selectable locale row (id + self-described label). */
+export interface LanguageOptionRow {
+  /** Locale id (the setLocale argument). */
+  id: string
+  /** Display name in its own language (中文 / English). */
+  label: string
+}
+
+/** Store state mirrored from the locale snapshot. */
+export interface LanguageRowState {
+  /** Active locale id. */
+  active: string
+  /** Selectable locales in display order. */
+  options: LanguageOptionRow[]
+  /** Service revision; -1 until first sync so revision 0 lands as a change. */
+  revision: number
+}
+
+/** Declared action shape giving the exported factory a stable return type. */
+type LanguageRowActions = {
+  sync: (draft: LanguageRowState, active: string, options: LanguageOptionRow[], revision: number) => void
+}
+
+/**
+ * Declares the Language row state and write surface.
+ * @returns the store handle.
+ */
+export function createLanguageRowStore(): EngineStoreHandle<LanguageRowState, LanguageRowActions> {
+  return defineStore({
+    init: (): LanguageRowState => ({ active: '', options: [], revision: -1 }),
+    actions: {
+      sync: (d, active: string, options: LanguageOptionRow[], revision: number) => {
+        if (revision <= d.revision) return
+        d.active = active
+        d.options = options
+        d.revision = revision
+      },
+    },
+  })
+}
diff --git a/packages/client/ui-settings-general/src/css-modules.d.ts b/packages/client/locale/src/css-modules.d.ts
similarity index 100%
rename from packages/client/ui-settings-general/src/css-modules.d.ts
rename to packages/client/locale/src/css-modules.d.ts
diff --git a/packages/client/locale/tests/invariant.spec.ts b/packages/client/locale/tests/invariant.spec.ts
index e9f4fdee36..fa62ca79f6 100644
--- a/packages/client/locale/tests/invariant.spec.ts
+++ b/packages/client/locale/tests/invariant.spec.ts
@@ -1,8 +1,10 @@
+// @vitest-environment jsdom
 import { describe, expect, it } from 'vitest'
 import { Context } from 'cordis'
 import { apply as nodeApply } from '@deepseek-ai/dsh-client-locale'
 import { apply as clientApply, COMMON_NS, LocaleService, inject } from '@deepseek-ai/dsh-client-locale/client'
 import * as LocaleInvariant from '@deepseek-ai/dsh-client-locale/invariant'
+import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
 import InvariantService from '@deepseek-ai/dsh-invariants'
 
 describe('invariant companion', () => {
@@ -18,8 +20,10 @@ describe('invariant companion', () => {
   })
 
   it('client apply provides ctx.locale seeded with the zh/en common namespace', async () => {
-    expect(inject).toEqual([])
+    // The feature registers its own Language settings row, hence the slots edge.
+    expect(inject).toEqual(['slots'])
     const ctx = new Context()
+    new SlotsService(ctx)
     await ctx.plugin({ inject, apply: clientApply }).await()
     const locale = ctx.get('locale')
     expect(locale).toBeInstanceOf(LocaleService)
diff --git a/packages/client/locale/tsconfig.json b/packages/client/locale/tsconfig.json
index 51f9171643..8585ba74ca 100644
--- a/packages/client/locale/tsconfig.json
+++ b/packages/client/locale/tsconfig.json
@@ -8,6 +8,15 @@
     "src"
   ],
   "references": [
+    {
+      "path": "../runtime"
+    },
+    {
+      "path": "../ui-primitives"
+    },
+    {
+      "path": "../ui-slots"
+    },
     {
       "path": "../../../vendor/cordis"
     },
diff --git a/packages/client/ui-settings-models/README.md b/packages/client/ui-models/README.md
similarity index 92%
rename from packages/client/ui-settings-models/README.md
rename to packages/client/ui-models/README.md
index c96e2843e4..b5f6c9bea9 100644
--- a/packages/client/ui-settings-models/README.md
+++ b/packages/client/ui-models/README.md
@@ -1,4 +1,4 @@
-# @deepseek-ai/dsh-client-ui-settings-models
+# @deepseek-ai/dsh-client-ui-models
 
 Models settings section plugin: registers the `models` nav entry into `settings.section` with an intentionally empty content column — model management lands in a later phase.
 
diff --git a/packages/client/ui-settings-models/package.json b/packages/client/ui-models/package.json
similarity index 89%
rename from packages/client/ui-settings-models/package.json
rename to packages/client/ui-models/package.json
index da8fa8c18d..df8cba7c8b 100644
--- a/packages/client/ui-settings-models/package.json
+++ b/packages/client/ui-models/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@deepseek-ai/dsh-client-ui-settings-models",
-  "description": "Models settings section plugin: nav entry with an empty content column (model management lands later)",
+  "name": "@deepseek-ai/dsh-client-ui-models",
+  "description": "Models feature plugin: registers its Settings section (nav entry, empty content column; model management lands later)",
   "version": "0.0.1",
   "private": true,
   "type": "module",
diff --git a/packages/client/ui-settings-models/src/client/ModelsSection.tsx b/packages/client/ui-models/src/client/ModelsSection.tsx
similarity index 100%
rename from packages/client/ui-settings-models/src/client/ModelsSection.tsx
rename to packages/client/ui-models/src/client/ModelsSection.tsx
diff --git a/packages/client/ui-settings-models/src/client/index.ts b/packages/client/ui-models/src/client/index.ts
similarity index 96%
rename from packages/client/ui-settings-models/src/client/index.ts
rename to packages/client/ui-models/src/client/index.ts
index c35946fcc8..4f080ec928 100644
--- a/packages/client/ui-settings-models/src/client/index.ts
+++ b/packages/client/ui-models/src/client/index.ts
@@ -30,7 +30,7 @@ export function apply(ctx: ClientContext): void {
       ctx.locale.register('settings.models', 'en', { nav: 'Models' }),
     ]
     return () => { for (const dispose of disposers) dispose() }
-  }, 'ui-settings-models: nav copy dictionaries')
+  }, 'ui-models: nav copy dictionaries')
   // Declaration-aware registration; the LEDGER is the has-registered judge
   // (not a local flag): after an HMR collapse re-declares the slot, the
   // cascade already removed our entry, and a stale disposer must not block
@@ -63,5 +63,5 @@ export function apply(ctx: ClientContext): void {
       unsubscribe()
       dispose?.()
     }
-  }, 'ui-settings-models: section registration')
+  }, 'ui-models: settings section registration')
 }
diff --git a/packages/client/ui-settings-models/src/css-modules.d.ts b/packages/client/ui-models/src/css-modules.d.ts
similarity index 100%
rename from packages/client/ui-settings-models/src/css-modules.d.ts
rename to packages/client/ui-models/src/css-modules.d.ts
diff --git a/packages/client/ui-settings-models/src/index.ts b/packages/client/ui-models/src/index.ts
similarity index 100%
rename from packages/client/ui-settings-models/src/index.ts
rename to packages/client/ui-models/src/index.ts
diff --git a/packages/client/ui-settings-models/src/invariant.ts b/packages/client/ui-models/src/invariant.ts
similarity index 81%
rename from packages/client/ui-settings-models/src/invariant.ts
rename to packages/client/ui-models/src/invariant.ts
index 9ffdc668d7..c7c4996748 100644
--- a/packages/client/ui-settings-models/src/invariant.ts
+++ b/packages/client/ui-models/src/invariant.ts
@@ -1,16 +1,16 @@
 /**
- * Package-owned invariant companion for `@deepseek-ai/dsh-client-ui-settings-models`.
- * @module @deepseek-ai/dsh-client-ui-settings-models/invariant
+ * Package-owned invariant companion for `@deepseek-ai/dsh-client-ui-models`.
+ * @module @deepseek-ai/dsh-client-ui-models/invariant
  */
 
 /* jscpd:ignore-start */
 import type { Context } from 'cordis'
 import type { InvariantInstaller } from '@deepseek-ai/dsh-invariants'
 
-const PACKAGE_NAME = '@deepseek-ai/dsh-client-ui-settings-models'
+const PACKAGE_NAME = '@deepseek-ai/dsh-client-ui-models'
 
 /** Cordis companion plugin name. */
-export const name = 'client-ui-settings-models-invariant'
+export const name = 'client-ui-models-invariant'
 /** Service required before the companion can reserve package ownership. */
 export const inject = ['invariants']
 
diff --git a/packages/client/ui-settings-models/tests/apply.spec.ts b/packages/client/ui-models/tests/apply.spec.ts
similarity index 96%
rename from packages/client/ui-settings-models/tests/apply.spec.ts
rename to packages/client/ui-models/tests/apply.spec.ts
index b7aa3cf2ab..1842000675 100644
--- a/packages/client/ui-settings-models/tests/apply.spec.ts
+++ b/packages/client/ui-models/tests/apply.spec.ts
@@ -3,7 +3,7 @@ import { Context } from 'cordis'
 import { describe, expect, it } from 'vitest'
 import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
 import { LocaleService } from '@deepseek-ai/dsh-client-locale/client'
-import { apply, inject } from '@deepseek-ai/dsh-client-ui-settings-models/client'
+import { apply, inject } from '@deepseek-ai/dsh-client-ui-models/client'
 import { ModelsSection } from '../src/client/ModelsSection.tsx'
 
 async function bench() {
@@ -21,7 +21,7 @@ function declare(slots: SlotsService): () => void {
   )
 }
 
-describe('ui-settings-models apply', () => {
+describe('ui-models apply', () => {
   it('declares the services it uses', () => {
     expect(inject).toEqual(['slots', 'locale'])
   })
diff --git a/packages/client/ui-settings-models/tests/invariant.spec.ts b/packages/client/ui-models/tests/invariant.spec.ts
similarity index 82%
rename from packages/client/ui-settings-models/tests/invariant.spec.ts
rename to packages/client/ui-models/tests/invariant.spec.ts
index 65c7c1094a..05fb52ee1b 100644
--- a/packages/client/ui-settings-models/tests/invariant.spec.ts
+++ b/packages/client/ui-models/tests/invariant.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { Context } from 'cordis'
-import * as ModelsInvariant from '@deepseek-ai/dsh-client-ui-settings-models/invariant'
+import * as ModelsInvariant from '@deepseek-ai/dsh-client-ui-models/invariant'
 import InvariantService from '@deepseek-ai/dsh-invariants'
 import { ModelsSection } from '../src/client/ModelsSection.tsx'
 
@@ -12,7 +12,7 @@ describe('invariant companion', () => {
   })
 
   it('node-half apply is a no-op host placeholder', async () => {
-    const { apply } = await import('@deepseek-ai/dsh-client-ui-settings-models')
+    const { apply } = await import('@deepseek-ai/dsh-client-ui-models')
     apply()
     expect(true).toBe(true) // reaching here without throw is the contract
   })
diff --git a/packages/client/ui-settings-models/tsconfig.json b/packages/client/ui-models/tsconfig.json
similarity index 100%
rename from packages/client/ui-settings-models/tsconfig.json
rename to packages/client/ui-models/tsconfig.json
diff --git a/packages/client/ui-models/tsdown.config.ts b/packages/client/ui-models/tsdown.config.ts
new file mode 100644
index 0000000000..fc044b07d6
--- /dev/null
+++ b/packages/client/ui-models/tsdown.config.ts
@@ -0,0 +1,3 @@
+import { clientBundle } from '../tsdown.client.ts'
+
+export default clientBundle('@deepseek-ai/dsh-client-ui-models', ['lib/types/index.js', 'lib/types/invariant.js'])
diff --git a/packages/client/ui-settings-general/README.md b/packages/client/ui-settings-general/README.md
deleted file mode 100644
index 435dd8c1b4..0000000000
--- a/packages/client/ui-settings-general/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# @deepseek-ai/dsh-client-ui-settings-general
-
-General settings section plugin: registers the `general` entry into `settings.section`. Language (中文/English) and Appearance (Light/Dark/System) are live preferences wired to `ctx.locale` / `ctx.theme`; Permission and Tool Call rows are visual skeletons with no write surface.
-
-## Model Experience
-
-None, as the section renders browser preference UI; nothing here reaches a model request.
-
-#### KV Cache effect
-
-None; this package neither assembles nor sends a provider request.
-
-## Known Limitations and Deferred Work
-
-- **Permission and Tool Call are display skeletons** — the backing host services and RPC methods do not exist yet; the controls are disabled and write nothing.
diff --git a/packages/client/ui-settings-general/package.json b/packages/client/ui-settings-general/package.json
deleted file mode 100644
index 9b3d83e472..0000000000
--- a/packages/client/ui-settings-general/package.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "name": "@deepseek-ai/dsh-client-ui-settings-general",
-  "description": "General settings section plugin: Language and Appearance preferences (live), Permission and Tool Call skeleton rows",
-  "version": "0.0.1",
-  "private": true,
-  "type": "module",
-  "main": "lib/index.js",
-  "types": "lib/types/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./lib/types/index.d.ts",
-      "default": "./lib/index.js"
-    },
-    "./invariant": {
-      "types": "./lib/types/invariant.d.ts",
-      "default": "./lib/invariant.js"
-    },
-    "./client": {
-      "types": "./lib/types/client/index.d.ts",
-      "default": "./lib/client.js"
-    },
-    "./src/*": "./src/*",
-    "./package.json": "./package.json"
-  },
-  "dshClient": {
-    "inject": [
-      "@deepseek-ai/dsh-client-runtime",
-      "@deepseek-ai/dsh-client-ui-settings",
-      "@deepseek-ai/dsh-client-locale",
-      "@deepseek-ai/dsh-client-ui-theme"
-    ],
-    "platform": "web"
-  },
-  "scripts": {
-    "bundle": "tsdown",
-    "watch": "tsdown --watch"
-  },
-  "license": "BSD-3-Clause",
-  "dependencies": {
-    "clsx": "^2.0.0"
-  },
-  "peerDependencies": {
-    "@deepseek-ai/dsh-client-runtime": "^0.0.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.0.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.0.1",
-    "@deepseek-ai/dsh-invariants": "^0.0.1",
-    "cordis": "^4.0.0-rc.7",
-    "react": "^18.2.0"
-  },
-  "devDependencies": {
-    "@deepseek-ai/dsh-client-locale": "workspace:^",
-    "@deepseek-ai/dsh-client-runtime": "workspace:^",
-    "@deepseek-ai/dsh-client-ui-primitives": "workspace:^",
-    "@deepseek-ai/dsh-client-ui-settings": "workspace:^",
-    "@deepseek-ai/dsh-client-ui-slots": "workspace:^",
-    "@deepseek-ai/dsh-client-ui-theme": "workspace:^",
-    "@deepseek-ai/dsh-invariants": "workspace:^",
-    "@types/react": "~18.3.1",
-    "cordis": "^4.0.0-rc.7",
-    "react": "^18.2.0"
-  },
-  "files": [
-    "lib/index.js",
-    "lib/invariant.js",
-    "lib/client.js",
-    "lib/types/**/*.d.ts",
-    "lib/types/**/*.d.ts.map",
-    "src"
-  ]
-}
diff --git a/packages/client/ui-settings-general/src/client/GeneralSection.tsx b/packages/client/ui-settings-general/src/client/GeneralSection.tsx
deleted file mode 100644
index d2947c0435..0000000000
--- a/packages/client/ui-settings-general/src/client/GeneralSection.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * General settings section: Permission and Tool Call skeleton rows (visual
- * only, no interaction), live Language and Appearance preference rows wired
- * through the injected setLocale/setTheme callbacks and the snapshot-mirror
- * store. Figma: Settings > Content > Options (501:29983).
- */
-import { useState } from 'react'
-import clsx from 'clsx'
-import {
-  IconChevronDownOutline14, IconDarkOutline16, IconFollowsystemOutline16, IconLightOutline16,
-  Menu,
-} from '@deepseek-ai/dsh-client-ui-primitives'
-import type { GeneralSectionComponentProps, ThemePreferenceId } from './contract.ts'
-import css from './GeneralSection.module.css'
-
-/** Appearance cube order and icons (figma 501:30015-30017: Light, Dark, System). */
-const THEME_CUBES: readonly { id: ThemePreferenceId; labelKey: string; Icon: typeof IconLightOutline16 }[] = [
-  { id: 'light', labelKey: 'appearance.light', Icon: IconLightOutline16 },
-  { id: 'dark', labelKey: 'appearance.dark', Icon: IconDarkOutline16 },
-  { id: 'system', labelKey: 'appearance.system', Icon: IconFollowsystemOutline16 },
-]
-
-/**
- * Render the General section content column.
- * @param props - composed slot props (contract.ts).
- * @returns the section element tree.
- */
-export function GeneralSection(props: GeneralSectionComponentProps) {
-  const { t, setLocale, setTheme, useStore } = props
-  const localeActive = useStore(s => s.localeActive)
-  const localeOptions = useStore(s => s.localeOptions)
-  const themePreference = useStore(s => s.themePreference)
-  const [languageOpen, setLanguageOpen] = useState(false)
-
-  const activeLocaleLabel = localeOptions.find(l => l.id === localeActive)?.label ?? localeActive
-
-  return (
-    <div className={css.section}>
-      {/* Permission (skeleton): disabled selector pill. */}
-      <div className={css.row}>
-        <div className={css.rowText}>
-          <div className={css.title}>{t('permission.title')}</div>
-          <div className={css.desc}>{t('permission.desc')}</div>
-        </div>
-        <button type="button" className={css.selector} disabled>
-          {t('permission.value')}
-          <IconChevronDownOutline14 className={css.chevron} />
-        </button>
-      </div>
-
-      {/* Tool Call (skeleton): schema cube pinned selected, code cube unselected. */}
-      <div className={css.group}>
-        <div className={css.title}>{t('toolcall.title')}</div>
-        <div className={css.cubeRow}>
-          <div className={clsx(css.modeCube, css.selected)}>
-            <div className={css.title}>{t('toolcall.schema.title')}</div>
-            <div className={css.desc}>{t('toolcall.schema.desc')}</div>
-          </div>
-          <div className={css.modeCube}>
-            <div className={css.title}>{t('toolcall.code.title')}</div>
-            <div className={css.desc}>{t('toolcall.code.desc')}</div>
-          </div>
-        </div>
-      </div>
-
-      {/* Language: selector pill opens the locale menu. */}
-      <div className={css.row}>
-        <div className={css.rowText}>
-          <div className={css.title}>{t('language.title')}</div>
-        </div>
-        <Menu
-          open={languageOpen}
-          onClose={() => { setLanguageOpen(false) }}
-          items={localeOptions.map(l => ({ id: l.id, label: l.label }))}
-          selectedId={localeActive}
-          onSelect={(id) => {
-            setLocale(id)
-            setLanguageOpen(false)
-          }}
-          align="end"
-          portal
-          anchor={(
-            <button
-              type="button"
-              className={css.selector}
-              aria-haspopup="menu"
-              aria-expanded={languageOpen}
-              onClick={() => { setLanguageOpen(v => !v) }}
-            >
-              {activeLocaleLabel}
-              <IconChevronDownOutline14 className={css.chevron} />
-            </button>
-          )}
-        />
-      </div>
-
-      {/* Appearance: three preference cubes; selection follows the persisted
-        * preference, never the resolved active theme. */}
-      <div className={clsx(css.group, css.last)}>
-        <div className={css.title}>{t('appearance.title')}</div>
-        <div className={css.cubeRow}>
-          {THEME_CUBES.map(({ id, labelKey, Icon }) => (
-            <button
-              key={id}
-              type="button"
-              className={clsx(css.themeCube, themePreference === id && css.selected)}
-              aria-pressed={themePreference === id}
-              onClick={() => { setTheme(id) }}
-            >
-              <Icon />
-              {t(labelKey)}
-            </button>
-          ))}
-        </div>
-      </div>
-    </div>
-  )
-}
diff --git a/packages/client/ui-settings-general/src/client/contract.ts b/packages/client/ui-settings-general/src/client/contract.ts
deleted file mode 100644
index 912d925615..0000000000
--- a/packages/client/ui-settings-general/src/client/contract.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * General section component contract: the slot-store state shape, the
- * injected business face, and the composed props type. The component imports
- * only from here; service snapshot shapes are mirrored as plain rows so the
- * presentation layer stays decoupled from the locale/theme packages.
- */
-import type { PropsRuntime, PropsStore } from '@deepseek-ai/dsh-client-ui-slots'
-// Type-only: pulls the shell's SlotMap merge (the 'settings.section' entry).
-import type {} from '@deepseek-ai/dsh-client-ui-settings/client'
-import type { createGeneralSettingsStore } from './store.ts'
-
-/** One selectable locale row projected into the store (id + self-described label). */
-export interface LocaleOptionRow {
-  /** Locale id (the setLocale argument). */
-  id: string
-  /** Display name in its own language (中文 / English). */
-  label: string
-}
-
-/** Theme preference union mirrored from the theme service snapshot. */
-export type ThemePreferenceId = 'light' | 'dark' | 'system'
-
-/**
- * Store state: mirrors of the locale/theme service snapshots, written only by
- * the plugin's apply-world change listeners (components have no write path —
- * preference writes go through the injected callbacks to the services, and
- * the resulting change events flow back into this mirror).
- */
-export interface GeneralSettingsState {
-  /** Active locale id. */
-  localeActive: string
-  /** Selectable locales in display order. */
-  localeOptions: LocaleOptionRow[]
-  /** Locale service revision (re-renders translated copy on dictionary/locale changes); -1 until first sync. */
-  localeRevision: number
-  /** Persisted theme preference (selection state reads this, never the resolved active theme). */
-  themePreference: ThemePreferenceId
-  /** Theme service revision; -1 until first sync. */
-  themeRevision: number
-}
-
-/**
- * Registrant-private injected share of the General section (assembled in
- * apply): the namespace-bound translate function (stable identity — re-render
- * on locale change comes from the store revision, not from `t`) and the two
- * preference write callbacks.
- */
-export interface GeneralSectionInjected {
-  /** Translate a `settings.general` dictionary key to the active-locale text. */
-  t: (key: string) => string
-  /** Switch the active locale (a registered locale id). */
-  setLocale: (id: string) => void
-  /** Switch the theme preference. */
-  setTheme: (id: ThemePreferenceId) => void
-}
-
-/** Store handle type for the props share (type-only; the factory stays internal to apply and tests). */
-export type GeneralSettingsStoreHandle = ReturnType<typeof createGeneralSettingsStore>
-
-/**
- * Full component props of the General section: the section owner share
- * (empty marker) plus the store share and the injected face. No child slots
- * are declared; menu open state is component-local viewing state.
- */
-export type GeneralSectionComponentProps =
-  PropsRuntime<'settings.section'> & PropsStore<GeneralSettingsStoreHandle> & GeneralSectionInjected
diff --git a/packages/client/ui-settings-general/src/client/index.ts b/packages/client/ui-settings-general/src/client/index.ts
deleted file mode 100644
index 52655be7fa..0000000000
--- a/packages/client/ui-settings-general/src/client/index.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * General settings section plugin, browser half. Registers the `general`
- * entry into the shell-declared `settings.section` list slot; Language and
- * Appearance are live preferences projected from ctx.locale / ctx.theme
- * through this entry's slot store. Export discipline: packages/client/AGENTS.md.
- */
-import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
-import type { BoundActions } from '@deepseek-ai/dsh-client-ui-slots'
-// Type-only: pulls the shell's SlotMap merge (the 'settings.section' entry).
-import type {} from '@deepseek-ai/dsh-client-ui-settings/client'
-// Type-only: the locale/theme Context+Events merges and snapshot shapes.
-import type { LocaleSnapshot } from '@deepseek-ai/dsh-client-locale/client'
-import type { ThemeSnapshot } from '@deepseek-ai/dsh-client-ui-theme/client'
-import type { GeneralSectionInjected } from './contract.ts'
-import { createGeneralSettingsStore } from './store.ts'
-import { en, zh } from './locales.ts'
-import { GeneralSection } from './GeneralSection.tsx'
-
-export type {
-  GeneralSectionComponentProps, GeneralSectionInjected, GeneralSettingsState,
-  GeneralSettingsStoreHandle, LocaleOptionRow, ThemePreferenceId,
-} from './contract.ts'
-
-/** Dictionary namespace owned by this section (also the nav-label reference prefix). */
-const NS = 'settings.general'
-
-/**
- * Required services (cordis fiber inject). The target slot is declared by
- * ui-settings' apply, whose activation order relative to this one is NOT
- * constrained; registration goes through declaration-aware deferral.
- */
-export const inject = ['slots', 'locale', 'theme']
-
-/**
- * Register the `settings.general` dictionaries and the General section entry
- * once the `settings.section` declaration is on the ledger. The slot store
- * mirrors the locale/theme snapshots: change listeners attach here in apply,
- * write through the bound actions captured at inject time, and the inject
- * factory re-syncs from the getters so no event is lost between registration
- * and first render (the store's revision guard drops stale duplicates).
- * @param ctx - client root context.
- */
-export function apply(ctx: ClientContext): void {
-  ctx.effect(() => {
-    const disposeZh = ctx.locale.register(NS, 'zh', zh)
-    const disposeEn = ctx.locale.register(NS, 'en', en)
-    return () => {
-      disposeZh()
-      disposeEn()
-    }
-  }, 'ui-settings-general: dictionaries')
-
-  const store = createGeneralSettingsStore()
-  let bound: BoundActions<typeof store> | undefined
-
-  const syncLocale = (snapshot: LocaleSnapshot): void => {
-    bound?.syncLocale(
-      snapshot.active,
-      snapshot.locales.map(l => ({ id: l.id, label: l.label })),
-      snapshot.revision,
-    )
-  }
-  const syncTheme = (snapshot: ThemeSnapshot): void => {
-    bound?.syncTheme(snapshot.preference, snapshot.revision)
-  }
-  ctx.on('locale/change', syncLocale)
-  ctx.on('theme/change', syncTheme)
-
-  const injected = (actions: BoundActions<typeof store>): GeneralSectionInjected => {
-    bound = actions
-    syncLocale(ctx.locale.getLocale())
-    syncTheme(ctx.theme.getTheme())
-    return {
-      t: ctx.locale.bind(NS),
-      setLocale: (id) => { ctx.locale.setLocale(id) },
-      setTheme: (id) => { ctx.theme.setTheme(id) },
-    }
-  }
-
-  ctx.effect(() => {
-    let dispose: (() => void) | undefined
-    // Presence is judged on the ledger, not on the local disposer: an HMR
-    // collapse of the declaring entry removes this entry from the slot core
-    // while `dispose` stays set (the stale disposer is a no-op), so a local
-    // guard would block the re-registration when the declaration returns.
-    const registered = (): boolean =>
-      ctx.slots.entries('settings.section').some(e => e.component === GeneralSection)
-    const tryRegister = (): void => {
-      if (ctx.slots.spec('settings.section') === undefined || registered()) return
-      dispose = ctx.slots.register({
-        name: 'settings.section',
-        id: 'general',
-        order: 0,
-        label: ctx.locale.bind(NS)('nav'),
-        store,
-        inject: injected,
-      }, GeneralSection)
-    }
-    // Nav labels are registrant-localized: re-register on locale change so
-    // the ledger carries fresh text (the version bump re-renders the shell).
-    // The ledger check mirrors tryRegister: after an HMR collapse `dispose`
-    // stays set while the entry is gone — relabeling then must stay quiet.
-    const offLocale = ctx.on('locale/change', () => {
-      if (dispose === undefined || !registered()) return
-      dispose()
-      dispose = undefined
-      tryRegister()
-    })
-    const unsubscribe = ctx.slots.subscribe('settings.section', () => { tryRegister() })
-    tryRegister()
-    return () => {
-      offLocale()
-      unsubscribe()
-      dispose?.()
-    }
-  }, 'ui-settings-general: section registration')
-}
diff --git a/packages/client/ui-settings-general/src/client/store.ts b/packages/client/ui-settings-general/src/client/store.ts
deleted file mode 100644
index 121e3f52a9..0000000000
--- a/packages/client/ui-settings-general/src/client/store.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * General section slot store: locale/theme snapshot mirrors. The plugin
- * creates the handle at apply time (identity follows the fiber) and its
- * change listeners are the only writers; components read via props.useStore.
- */
-import { defineStore, type EngineStoreHandle } from '@deepseek-ai/dsh-client-runtime/client'
-import type { GeneralSettingsState, LocaleOptionRow, ThemePreferenceId } from './contract.ts'
-
-/** Declared action shape used to give the exported factory a stable return type. */
-type GeneralSettingsActions = {
-  syncLocale: (draft: GeneralSettingsState, active: string, options: LocaleOptionRow[], revision: number) => void
-  syncTheme: (draft: GeneralSettingsState, preference: ThemePreferenceId, revision: number) => void
-}
-
-/**
- * Declares the General section state and write surface. Revisions start at -1
- * so the apply-time initial sync (revision 0) always lands as a change.
- * @returns the store handle.
- */
-export function createGeneralSettingsStore(): EngineStoreHandle<GeneralSettingsState, GeneralSettingsActions> {
-  return defineStore({
-    init: (): GeneralSettingsState => ({
-      localeActive: '',
-      localeOptions: [],
-      localeRevision: -1,
-      themePreference: 'system',
-      themeRevision: -1,
-    }),
-    actions: {
-      syncLocale: (d, active: string, options: LocaleOptionRow[], revision: number) => {
-        if (revision <= d.localeRevision) return
-        d.localeActive = active
-        d.localeOptions = options
-        d.localeRevision = revision
-      },
-      syncTheme: (d, preference: ThemePreferenceId, revision: number) => {
-        if (revision <= d.themeRevision) return
-        d.themePreference = preference
-        d.themeRevision = revision
-      },
-    },
-  })
-}
diff --git a/packages/client/ui-settings-general/src/index.ts b/packages/client/ui-settings-general/src/index.ts
deleted file mode 100644
index 94b9bdf674..0000000000
--- a/packages/client/ui-settings-general/src/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-/** Host loader entry for the browser implementation exported from `./client`. */
-
-/** Host plugin body — no host-side behavior for the general settings plugin. */
-export function apply(): void {}
diff --git a/packages/client/ui-settings-general/src/invariant.ts b/packages/client/ui-settings-general/src/invariant.ts
deleted file mode 100644
index a40cc3cc00..0000000000
--- a/packages/client/ui-settings-general/src/invariant.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Package-owned invariant companion for `@deepseek-ai/dsh-client-ui-settings-general`.
- * @module @deepseek-ai/dsh-client-ui-settings-general/invariant
- */
-
-/* jscpd:ignore-start */
-import type { Context } from 'cordis'
-import type { InvariantInstaller } from '@deepseek-ai/dsh-invariants'
-
-const PACKAGE_NAME = '@deepseek-ai/dsh-client-ui-settings-general'
-
-/** Cordis companion plugin name. */
-export const name = 'client-ui-settings-general-invariant'
-/** Service required before the companion can reserve package ownership. */
-export const inject = ['invariants']
-
-/**
- * No runtime invariant: a section plugin projecting two service change events
- * into its own slot store — it emits no cordis events of its own and owns no
- * cross-plugin mutable relation; snapshot/store agreement is asserted by this
- * package's behavior specs.
- */
-const install: InvariantInstaller = () => {}
-
-/**
- * Register this package's invariant companion.
- * @param ctx - Cordis context carrying the invariant service.
- * @returns the installed registration's disposer after setup succeeds.
- */
-export const apply = (ctx: Context): Promise<() => void> =>
-  Promise.resolve(ctx.invariants.register(PACKAGE_NAME, install))
-/* jscpd:ignore-end */
diff --git a/packages/client/ui-settings-general/tests/apply.spec.ts b/packages/client/ui-settings-general/tests/apply.spec.ts
deleted file mode 100644
index 8654275831..0000000000
--- a/packages/client/ui-settings-general/tests/apply.spec.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-/** apply wiring: dictionary registration, declaration-aware section entry,
- * snapshot projection into the slot store, locale-driven relabeling, and
- * recovery after an HMR collapse of the declaring entry. */
-import { Context } from 'cordis'
-import { describe, expect, it } from 'vitest'
-import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
-import { LocaleService } from '@deepseek-ai/dsh-client-locale/client'
-import { ThemeService } from '@deepseek-ai/dsh-client-ui-theme/client'
-import { apply, inject } from '@deepseek-ai/dsh-client-ui-settings-general/client'
-import type { GeneralSectionInjected } from '@deepseek-ai/dsh-client-ui-settings-general/client'
-import { GeneralSection } from '../src/client/GeneralSection.tsx'
-import type { createGeneralSettingsStore } from '../src/client/store.ts'
-
-const NS = 'settings.general'
-
-async function bench() {
-  const ctx = new Context()
-  await ctx.plugin(SlotsService).await()
-  const locale = new LocaleService(ctx)
-  const theme = new ThemeService(ctx)
-  ctx.provide('locale', locale)
-  ctx.provide('theme', theme)
-  return { ctx, slots: ctx.get('slots') as SlotsService, locale, theme }
-}
-
-/** Stand in for the settings shell: declare the section list slot from root. */
-function declareSection(slots: SlotsService): () => void {
-  return slots.register(
-    { name: 'root', children: { 'settings.section': { kind: 'list', scope: 'root' } } } as never,
-    () => null,
-  )
-}
-
-/** Mirror the framework's inject choreography: bake a real instance from the
- * declared handle and hand its actions to the entry's inject factory. */
-function faceOf(slots: SlotsService) {
-  const entry = slots.entries('settings.section')[0]!
-  const handle = entry.store as ReturnType<typeof createGeneralSettingsStore>
-  const instance = handle.create()
-  const face = (entry.inject as unknown as (a: typeof instance.actions) => GeneralSectionInjected)(instance.actions)
-  return { entry, instance, face }
-}
-
-describe('ui-settings-general apply', () => {
-  it('declares the slot, locale, and theme services', () => {
-    expect(inject).toEqual(['slots', 'locale', 'theme'])
-  })
-
-  it('registers dictionaries and the section entry for declarations before or after apply', async () => {
-    const before = await bench()
-    declareSection(before.slots)
-    await before.ctx.plugin({ inject: [...inject], apply }).await()
-    const entry = before.slots.entries('settings.section')[0]!
-    expect(entry.component).toBe(GeneralSection)
-    expect(entry.options).toMatchObject({ id: 'general', order: 0, label: '通用设置' })
-    expect(before.locale.bind(NS)('nav')).toBe('通用设置')
-
-    const after = await bench()
-    const fiber = after.ctx.plugin({ inject: [...inject], apply })
-    await fiber.await()
-    expect(after.slots.entries('settings.section')).toHaveLength(0)
-    declareSection(after.slots)
-    await Promise.resolve()
-    expect(after.slots.entries('settings.section')[0]!.component).toBe(GeneralSection)
-    // Teardown without a live registration exercises the undefined-disposer arm.
-    await fiber.dispose()
-    expect(after.slots.entries('settings.section')).toHaveLength(0)
-  })
-
-  it('projects service snapshots into the store and routes face writes back', async () => {
-    const b = await bench()
-    declareSection(b.slots)
-    await b.ctx.plugin({ inject: [...inject], apply }).await()
-    // Events ahead of any inject hit the unbound-actions arm without a store.
-    b.theme.setTheme('dark')
-
-    const { instance, face } = faceOf(b.slots)
-    // The inject-time re-sync sealed the init window: both mirrors are current.
-    expect(instance.getSnapshot().localeActive).toBe('zh')
-    expect(instance.getSnapshot().localeOptions.map(l => l.id)).toEqual(['zh', 'en'])
-    expect(instance.getSnapshot().themePreference).toBe('dark')
-    expect(face.t('nav')).toBe('通用设置')
-
-    face.setLocale('en')
-    expect(b.locale.getLocale().active).toBe('en')
-    expect(instance.getSnapshot().localeActive).toBe('en')
-    expect(face.t('nav')).toBe('General')
-
-    face.setTheme('system')
-    expect(b.theme.getTheme().preference).toBe('system')
-    expect(instance.getSnapshot().themePreference).toBe('system')
-  })
-
-  it('re-registers with a fresh ledger label when the locale changes', async () => {
-    const b = await bench()
-    declareSection(b.slots)
-    await b.ctx.plugin({ inject: [...inject], apply }).await()
-    expect(b.slots.entries('settings.section')[0]!.options.label).toBe('通用设置')
-    b.locale.setLocale('en')
-    const entry = b.slots.entries('settings.section')[0]!
-    expect(entry.options.label).toBe('General')
-    expect(entry.component).toBe(GeneralSection)
-  })
-
-  it('recovers after an HMR collapse of the declaring entry (stale disposer must not block)', async () => {
-    const b = await bench()
-    const host = declareSection(b.slots)
-    await b.ctx.plugin({ inject: [...inject], apply }).await()
-    expect(b.slots.entries('settings.section')).toHaveLength(1)
-
-    // Collapse: the declarer dies, the cascade removes our entry while the
-    // apply closure still holds its (now stale) disposer.
-    host()
-    expect(b.slots.entries('settings.section')).toHaveLength(0)
-
-    // A locale change inside the collapsed window must stay quiet.
-    b.locale.setLocale('en')
-    expect(b.slots.entries('settings.section')).toHaveLength(0)
-
-    // Redeclaration restores the entry — with the current locale's label.
-    declareSection(b.slots)
-    await Promise.resolve()
-    const entry = b.slots.entries('settings.section')[0]!
-    expect(entry.component).toBe(GeneralSection)
-    expect(entry.options.label).toBe('General')
-  })
-
-  it('removes the entry and the dictionaries on teardown', async () => {
-    const b = await bench()
-    declareSection(b.slots)
-    const fiber = b.ctx.plugin({ inject: [...inject], apply })
-    await fiber.await()
-    expect(b.slots.entries('settings.section')).toHaveLength(1)
-    await fiber.dispose()
-    expect(b.slots.entries('settings.section')).toHaveLength(0)
-    // Dictionary disposal: translation falls back to the bare key.
-    expect(b.locale.bind(NS)('nav')).toBe('nav')
-  })
-})
diff --git a/packages/client/ui-settings-general/tests/general-section.spec.tsx b/packages/client/ui-settings-general/tests/general-section.spec.tsx
deleted file mode 100644
index e82ed0b1fc..0000000000
--- a/packages/client/ui-settings-general/tests/general-section.spec.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-// @vitest-environment jsdom
-/** GeneralSection behavior: skeleton rows stay inert, Language menu drives
- * setLocale, Appearance cubes follow the preference and drive setTheme. */
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
-import { createSnapshotStore, type SessionListState, type WorkspaceListState } from '@deepseek-ai/dsh-client-runtime/client'
-import { bindSnapshotSelector } from '@deepseek-ai/dsh-client-web-react'
-import { GeneralSection } from '../src/client/GeneralSection.tsx'
-import { createGeneralSettingsStore } from '../src/client/store.ts'
-import { en } from '../src/client/locales.ts'
-import type { GeneralSectionComponentProps } from '../src/client/contract.ts'
-
-afterEach(cleanup)
-
-const LOCALES = [{ id: 'zh', label: '中文' }, { id: 'en', label: 'English' }]
-
-/** Empty global standard-kit hooks (the section reads neither). */
-function emptySessions() {
-  const store = createSnapshotStore<SessionListState>(
-    { ids: [], byId: {}, current: undefined, intent: undefined, phase: 'ready' })
-  return bindSnapshotSelector(store)
-}
-function emptyWorkspaces() {
-  const store = createSnapshotStore<WorkspaceListState>({
-    items: [], intent: undefined, state: 'idle', phase: 'ready', error: null,
-    baselinesReady: true, recentWorkspaceId: undefined,
-  })
-  return bindSnapshotSelector(store)
-}
-
-function mount(init?: { active?: string; preference?: 'light' | 'dark' | 'system' }) {
-  // Real store instance — the sanctioned zero-machinery path for tests.
-  const store = createGeneralSettingsStore().create()
-  store.actions.syncLocale(init?.active ?? 'en', LOCALES, 0)
-  store.actions.syncTheme(init?.preference ?? 'system', 0)
-  const setLocale = vi.fn()
-  const setTheme = vi.fn()
-  const props: GeneralSectionComponentProps = {
-    useSessions: emptySessions(),
-    useWorkspaces: emptyWorkspaces(),
-    useStore: bindSnapshotSelector(store),
-    actions: store.actions,
-    t: (key: string) => en[key] ?? key,
-    setLocale,
-    setTheme,
-  }
-  render(<GeneralSection {...props} />)
-  return { store, setLocale, setTheme }
-}
-
-const pressed = (name: RegExp): string | null =>
-  screen.getByRole('button', { name }).getAttribute('aria-pressed')
-
-describe('GeneralSection', () => {
-  it('renders the four groups with skeleton rows inert', () => {
-    const b = mount()
-    // Permission: disabled selector showing the fixed value.
-    const permission = screen.getByRole('button', { name: /Read only/ }) as HTMLButtonElement
-    expect(permission.disabled).toBe(true)
-    fireEvent.click(permission)
-    // Tool Call: both mode cubes render as plain text, no buttons.
-    expect(screen.getByText('Schema mode')).toBeDefined()
-    expect(screen.getByText('Code mode')).toBeDefined()
-    expect(screen.queryByRole('button', { name: /Schema mode/ })).toBeNull()
-    expect(b.setLocale).not.toHaveBeenCalled()
-    expect(b.setTheme).not.toHaveBeenCalled()
-  })
-
-  it('opens the language menu, selects a locale, and closes', () => {
-    const b = mount({ active: 'en' })
-    const trigger = screen.getByRole('button', { name: /English/ })
-    expect(trigger.getAttribute('aria-expanded')).toBe('false')
-    fireEvent.click(trigger)
-    expect(trigger.getAttribute('aria-expanded')).toBe('true')
-    fireEvent.click(screen.getByRole('menuitem', { name: '中文' }))
-    expect(b.setLocale).toHaveBeenCalledWith('zh')
-    expect(trigger.getAttribute('aria-expanded')).toBe('false')
-    expect(screen.queryByRole('menuitem', { name: '中文' })).toBeNull()
-  })
-
-  it('closes the language menu on outside pointerdown without selecting', () => {
-    const b = mount({ active: 'en' })
-    const trigger = screen.getByRole('button', { name: /English/ })
-    fireEvent.click(trigger)
-    expect(screen.getByRole('menuitem', { name: '中文' })).toBeDefined()
-    fireEvent.pointerDown(document.body)
-    expect(trigger.getAttribute('aria-expanded')).toBe('false')
-    expect(screen.queryByRole('menuitem', { name: '中文' })).toBeNull()
-    expect(b.setLocale).not.toHaveBeenCalled()
-  })
-
-  it('reflects a store locale change in the trigger label (unknown id falls back to the id)', () => {
-    const b = mount({ active: 'en' })
-    act(() => { b.store.actions.syncLocale('zh', LOCALES, 1) })
-    expect(screen.getByRole('button', { name: /中文/ })).toBeDefined()
-    act(() => { b.store.actions.syncLocale('fr', LOCALES, 2) })
-    expect(screen.getByRole('button', { name: /fr/ })).toBeDefined()
-  })
-
-  it('marks the appearance cube matching the preference and switches on click', () => {
-    const b = mount({ preference: 'dark' })
-    expect(pressed(/Dark/)).toBe('true')
-    expect(pressed(/Light/)).toBe('false')
-    expect(pressed(/System/)).toBe('false')
-    fireEvent.click(screen.getByRole('button', { name: /Light/ }))
-    expect(b.setTheme).toHaveBeenCalledWith('light')
-    // Selection follows the store mirror, not the click echo.
-    act(() => { b.store.actions.syncTheme('light', 1) })
-    expect(pressed(/Light/)).toBe('true')
-    expect(pressed(/Dark/)).toBe('false')
-  })
-})
diff --git a/packages/client/ui-settings-general/tests/invariant.spec.ts b/packages/client/ui-settings-general/tests/invariant.spec.ts
deleted file mode 100644
index 7b0527c0ff..0000000000
--- a/packages/client/ui-settings-general/tests/invariant.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { Context } from 'cordis'
-import * as GeneralInvariant from '@deepseek-ai/dsh-client-ui-settings-general/invariant'
-import InvariantService from '@deepseek-ai/dsh-invariants'
-
-describe('invariant companion', () => {
-  it('registers under the package name with an empty installer', async () => {
-    const ctx = new Context()
-    await ctx.plugin(InvariantService, { enabled: true })
-    await expect(ctx.plugin(GeneralInvariant).await()).resolves.toBeDefined()
-  })
-
-  it('node-half apply is a no-op host placeholder', async () => {
-    const { apply } = await import('@deepseek-ai/dsh-client-ui-settings-general')
-    apply()
-    expect(true).toBe(true) // reaching here without throw is the contract
-  })
-})
diff --git a/packages/client/ui-settings-general/tests/store.spec.ts b/packages/client/ui-settings-general/tests/store.spec.ts
deleted file mode 100644
index b291418471..0000000000
--- a/packages/client/ui-settings-general/tests/store.spec.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/** General settings store: snapshot-mirror actions and the revision guard. */
-import { describe, expect, it } from 'vitest'
-import { createGeneralSettingsStore } from '../src/client/store.ts'
-
-const LOCALES = [{ id: 'zh', label: '中文' }, { id: 'en', label: 'English' }]
-
-describe('createGeneralSettingsStore', () => {
-  it('init shape: empty mirrors with revisions at -1', () => {
-    const store = createGeneralSettingsStore().create()
-    expect(store.getSnapshot()).toEqual({
-      localeActive: '',
-      localeOptions: [],
-      localeRevision: -1,
-      themePreference: 'system',
-      themeRevision: -1,
-    })
-  })
-
-  it('syncLocale mirrors the snapshot and advances the revision', () => {
-    const store = createGeneralSettingsStore().create()
-    store.actions.syncLocale('zh', LOCALES, 0)
-    expect(store.getSnapshot().localeActive).toBe('zh')
-    expect(store.getSnapshot().localeOptions).toEqual(LOCALES)
-    expect(store.getSnapshot().localeRevision).toBe(0)
-
-    store.actions.syncLocale('en', LOCALES, 1)
-    expect(store.getSnapshot().localeActive).toBe('en')
-    expect(store.getSnapshot().localeRevision).toBe(1)
-  })
-
-  it('syncLocale revision guard drops stale and duplicate writes', () => {
-    const store = createGeneralSettingsStore().create()
-    store.actions.syncLocale('en', LOCALES, 5)
-    // Stale (lower) and duplicate (equal) revisions leave the mirror intact.
-    store.actions.syncLocale('zh', LOCALES, 4)
-    store.actions.syncLocale('zh', LOCALES, 5)
-    expect(store.getSnapshot().localeActive).toBe('en')
-    expect(store.getSnapshot().localeRevision).toBe(5)
-  })
-
-  it('syncTheme mirrors the preference and guards its revision independently', () => {
-    const store = createGeneralSettingsStore().create()
-    store.actions.syncTheme('dark', 0)
-    expect(store.getSnapshot().themePreference).toBe('dark')
-    expect(store.getSnapshot().themeRevision).toBe(0)
-
-    store.actions.syncTheme('light', 2)
-    expect(store.getSnapshot().themePreference).toBe('light')
-
-    // Stale theme write is dropped; the locale revision axis is untouched.
-    store.actions.syncTheme('system', 1)
-    expect(store.getSnapshot().themePreference).toBe('light')
-    expect(store.getSnapshot().themeRevision).toBe(2)
-    expect(store.getSnapshot().localeRevision).toBe(-1)
-  })
-})
diff --git a/packages/client/ui-settings-general/tsconfig.json b/packages/client/ui-settings-general/tsconfig.json
deleted file mode 100644
index 9b2cc5b838..0000000000
--- a/packages/client/ui-settings-general/tsconfig.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.client.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "lib/types"
-  },
-  "include": [
-    "src"
-  ],
-  "references": [
-    {
-      "path": "../../../vendor/cordis"
-    },
-    {
-      "path": "../ui-slots"
-    },
-    {
-      "path": "../ui-primitives"
-    },
-    {
-      "path": "../runtime"
-    },
-    {
-      "path": "../ui-settings"
-    },
-    {
-      "path": "../locale"
-    },
-    {
-      "path": "../ui-theme"
-    },
-    {
-      "path": "../../support/invariants"
-    }
-  ]
-}
diff --git a/packages/client/ui-settings-general/tsdown.config.ts b/packages/client/ui-settings-general/tsdown.config.ts
deleted file mode 100644
index bf67c4f10f..0000000000
--- a/packages/client/ui-settings-general/tsdown.config.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { clientBundle } from '../tsdown.client.ts'
-
-export default clientBundle('@deepseek-ai/dsh-client-ui-settings-general', ['lib/types/index.js', 'lib/types/invariant.js'])
diff --git a/packages/client/ui-settings-models/tsdown.config.ts b/packages/client/ui-settings-models/tsdown.config.ts
deleted file mode 100644
index 7a2688a097..0000000000
--- a/packages/client/ui-settings-models/tsdown.config.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { clientBundle } from '../tsdown.client.ts'
-
-export default clientBundle('@deepseek-ai/dsh-client-ui-settings-models', ['lib/types/index.js', 'lib/types/invariant.js'])
diff --git a/packages/client/ui-settings-general/src/client/GeneralSection.module.css b/packages/client/ui-settings/src/client/GeneralSection.module.css
similarity index 75%
rename from packages/client/ui-settings-general/src/client/GeneralSection.module.css
rename to packages/client/ui-settings/src/client/GeneralSection.module.css
index dffafc419d..5e053a49c5 100644
--- a/packages/client/ui-settings-general/src/client/GeneralSection.module.css
+++ b/packages/client/ui-settings/src/client/GeneralSection.module.css
@@ -1,6 +1,7 @@
-/* General section rows (figma 501:29983 'Options'): four groups, 16px
- * vertical padding each, hairline separator under all but the last. The
- * shell's content column owns the outer horizontal padding. */
+/* General section rows (figma 501:29983 'Options'): stacked groups, 16px
+ * vertical padding each, hairline separator under all but the last child
+ * (feature-contributed rows carry their own row chrome and separators; the
+ * :last-child rule strips the trailing one wherever the column ends). */
 
 .section {
   display: flex;
@@ -8,6 +9,10 @@
   width: 100%;
 }
 
+.section > :last-child {
+  border-bottom: none;
+}
+
 /* Title + trailing control row (figma 'Setting-Cell': gap 8, pad 16/0). */
 .row {
   display: flex;
@@ -26,10 +31,6 @@
   border-bottom: 1px solid var(--dsw-alias-border-l2);
 }
 
-.last {
-  border-bottom: none;
-}
-
 /* Leading text column (figma 'Frame 2036083120': gap 4, pad-right 48). */
 .rowText {
   flex: 1;
@@ -79,7 +80,7 @@
   flex: none;
 }
 
-/* Cube rows share an 8px gap; cubes stretch to equal height. */
+/* Tool Call mode cubes share an 8px gap. */
 .cubeRow {
   display: flex;
   align-items: stretch;
@@ -102,27 +103,6 @@
   text-align: left;
 }
 
-/* Appearance cube (figma '.Selector Cube' 276x82 r16, pad 20/32, centered
- * icon-over-label column, gap 4). */
-.themeCube {
-  box-sizing: border-box;
-  width: 276px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  gap: 4px;
-  padding: 20px 32px;
-  border: 1px solid var(--dsw-alias-border-l2);
-  border-radius: 16px;
-  background: transparent;
-  font: inherit;
-  font-size: 14px;
-  line-height: 22px;
-  color: var(--dsw-alias-label-primary);
-  cursor: pointer;
-}
-
 /* Selected cube: #F5F6F7 fill + #ADB2B8 border (static token — the bluish-400
  * step has no alias-layer name). */
 .selected {
diff --git a/packages/client/ui-settings/src/client/GeneralSection.tsx b/packages/client/ui-settings/src/client/GeneralSection.tsx
new file mode 100644
index 0000000000..31714a9238
--- /dev/null
+++ b/packages/client/ui-settings/src/client/GeneralSection.tsx
@@ -0,0 +1,51 @@
+/**
+ * Shell-owned General section (figma 501:29983 'Options'): Permission and
+ * Tool Call skeleton rows, then the feature-contributed preference rows from
+ * the `settings.general.item` slot (locale → Language, ui-theme →
+ * Appearance). The section column stacks rows; each row draws its own
+ * internals and separator.
+ */
+import { IconChevronDownOutline14 } from '@deepseek-ai/dsh-client-ui-primitives'
+import type { GeneralSectionComponentProps } from './contract/slots.ts'
+import css from './GeneralSection.module.css'
+
+/**
+ * Render the General section content column.
+ * @param props - composed slot props (contract/slots.ts).
+ * @returns the section element tree.
+ */
+export function GeneralSection({ t, renderSlot }: GeneralSectionComponentProps) {
+  return (
+    <div className={css.section}>
+      {/* Permission (skeleton): disabled selector pill. */}
+      <div className={css.row}>
+        <div className={css.rowText}>
+          <div className={css.title}>{t('permission.title')}</div>
+          <div className={css.desc}>{t('permission.desc')}</div>
+        </div>
+        <button type="button" className={css.selector} disabled>
+          {t('permission.value')}
+          <IconChevronDownOutline14 className={css.chevron} />
+        </button>
+      </div>
+
+      {/* Tool Call (skeleton): schema cube pinned selected, code cube unselected. */}
+      <div className={css.group}>
+        <div className={css.title}>{t('toolcall.title')}</div>
+        <div className={css.cubeRow}>
+          <div className={`${css.modeCube} ${css.selected}`}>
+            <div className={css.title}>{t('toolcall.schema.title')}</div>
+            <div className={css.desc}>{t('toolcall.schema.desc')}</div>
+          </div>
+          <div className={css.modeCube}>
+            <div className={css.title}>{t('toolcall.code.title')}</div>
+            <div className={css.desc}>{t('toolcall.code.desc')}</div>
+          </div>
+        </div>
+      </div>
+
+      {/* Feature-owned preference rows (Language, Appearance, …). */}
+      {renderSlot('settings.general.item', {})}
+    </div>
+  )
+}
diff --git a/packages/client/ui-settings/src/client/contract/slots.ts b/packages/client/ui-settings/src/client/contract/slots.ts
index 10e4e0ecbe..87db2f8999 100644
--- a/packages/client/ui-settings/src/client/contract/slots.ts
+++ b/packages/client/ui-settings/src/client/contract/slots.ts
@@ -1,7 +1,11 @@
 /**
- * Settings shell slot contract: the shell occupies the sidebar-owned
- * `sidebar.settings` hole and declares the `settings.section` list slot that
- * section plugins (General, Models, …) contribute pages into.
+ * Settings shell slot contract. The shell occupies the sidebar-owned
+ * `sidebar.settings` hole, declares the `settings.section` list slot that
+ * feature plugins contribute top-level pages into, and ships the first
+ * section itself: General, whose `settings.general.item` list slot receives
+ * preference rows from the features that own them (locale → Language,
+ * ui-theme → Appearance). A feature owns its settings surface — adding a
+ * setting never means editing the shell.
  */
 import type { PropsRenderSlots, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
 // Type-only: pulls ui-sidebar's SlotMap merge (the 'sidebar.settings' entry)
@@ -19,6 +23,16 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
      * re-render trigger). Sections render inside the panel content column.
      */
     'settings.section': { kind: 'list'; scope: 'root'; owner: SettingsSectionOwnerProps }
+    /**
+     * One preference row inside the General section, contributed by the
+     * feature plugin that owns the preference (locale → Language, ui-theme →
+     * Appearance). Options: `id` (row key), `order` (row position). Rows
+     * draw their own internals (row layout, separators via CSS); the section
+     * column only stacks them. NOTE: packages/client/locale and ui-theme
+     * repeat this entry verbatim (reference-cycle avoidance) — declaration
+     * merging enforces the copies stay identical; edit all three together.
+     */
+    'settings.general.item': { kind: 'list'; scope: 'root'; owner: { children?: never } }
   }
 }
 
@@ -60,3 +74,21 @@ export type SettingsRootInjected = {
  */
 export type SettingsRootComponentProps =
   PropsRuntime<'sidebar.settings'> & PropsRenderSlots<'settings.section'> & SettingsRootInjected
+
+/**
+ * Injected share of the shell-owned General section: the shell's own
+ * `settings` namespace translate function for the skeleton rows (Permission,
+ * Tool Call). Live preference rows arrive through the item slot with their
+ * own faces.
+ */
+export type GeneralSectionInjected = {
+  /** Translate a `settings` dictionary key to the active-locale text. */
+  t: (key: string) => string
+}
+
+/**
+ * Full component props of the shell-owned General section: the section owner
+ * share, the declared item render share, and the injected face.
+ */
+export type GeneralSectionComponentProps =
+  PropsRuntime<'settings.section'> & PropsRenderSlots<'settings.general.item'> & GeneralSectionInjected
diff --git a/packages/client/ui-settings/src/client/index.ts b/packages/client/ui-settings/src/client/index.ts
index 3613476ede..c360a84201 100644
--- a/packages/client/ui-settings/src/client/index.ts
+++ b/packages/client/ui-settings/src/client/index.ts
@@ -1,17 +1,24 @@
 /**
  * Settings shell plugin, browser half. Occupies the sidebar-owned
  * `sidebar.settings` hole with the trigger row + modal panel, declares the
- * `settings.section` list slot, and projects that ledger into the panel
- * navigation. Export discipline: packages/client/AGENTS.md.
+ * `settings.section` list slot, projects that ledger into the panel
+ * navigation, and ships the first section itself: General, which declares
+ * the `settings.general.item` slot that feature plugins contribute
+ * preference rows into. Export discipline: packages/client/AGENTS.md.
  */
 import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
 // Type-only: pulls the locale plugin's Context/Events merges (ctx.locale,
 // 'locale/change') into this program.
 import type {} from '@deepseek-ai/dsh-client-locale/client'
-import type { SettingsRootInjected } from './contract/slots.ts'
+import type { GeneralSectionInjected, SettingsRootInjected } from './contract/slots.ts'
 import { SettingsRoot } from './SettingsRoot.tsx'
+import { GeneralSection } from './GeneralSection.tsx'
+import { en, zh } from './locales.ts'
 
-export type { SettingsRootComponentProps, SettingsRootInjected, SettingsSectionOwnerProps } from './contract/slots.ts'
+export type {
+  GeneralSectionComponentProps, GeneralSectionInjected,
+  SettingsRootComponentProps, SettingsRootInjected, SettingsSectionOwnerProps,
+} from './contract/slots.ts'
 
 /**
  * Required services (cordis fiber inject). The target slot is declared by
@@ -22,18 +29,20 @@ export type { SettingsRootComponentProps, SettingsRootInjected, SettingsSectionO
 export const inject = ['slots', 'locale']
 
 /**
- * Register the settings shell into `sidebar.settings` once the declaration is
- * on the ledger.
+ * Register the settings shell into `sidebar.settings` and the shell-owned
+ * General section into `settings.section`, each once its declaration is on
+ * the ledger.
  * @param ctx - client root context.
  */
 export function apply(ctx: ClientContext): void {
   ctx.effect(() => {
     const disposers = [
-      ctx.locale.register('settings', 'zh', { trigger: '设置', title: '设置', close: '关闭' }),
-      ctx.locale.register('settings', 'en', { trigger: 'Settings', title: 'Settings', close: 'Close' }),
+      ctx.locale.register('settings', 'zh', zh),
+      ctx.locale.register('settings', 'en', en),
     ]
     return () => { for (const dispose of disposers) dispose() }
   }, 'ui-settings: shell copy dictionaries')
+
   const injected = (): SettingsRootInjected => ({
     translate: (ref) => {
       const colon = ref.indexOf(':')
@@ -73,4 +82,38 @@ export function apply(ctx: ClientContext): void {
       dispose?.()
     }
   }, 'ui-settings: shell registration')
+
+  // The shell's own General section: first page, declares the item slot the
+  // feature plugins (locale, ui-theme, …) contribute preference rows into.
+  // Same ledger-judged deferral; label re-registers on locale change.
+  const generalInjected = (): GeneralSectionInjected => ({
+    t: ctx.locale.bind('settings'),
+  })
+  ctx.effect(() => {
+    let dispose: (() => void) | undefined
+    const tryRegister = (): void => {
+      if (ctx.slots.spec('settings.section') === undefined) return
+      if (ctx.slots.entries('settings.section').some(e => e.component === GeneralSection)) return
+      dispose = ctx.slots.register({
+        name: 'settings.section',
+        id: 'general',
+        order: 0,
+        label: ctx.locale.bind('settings')('general.nav'),
+        children: { 'settings.general.item': { kind: 'list', scope: 'root' } },
+        inject: generalInjected,
+      }, GeneralSection)
+    }
+    const offLocale = ctx.on('locale/change', () => {
+      dispose?.()
+      dispose = undefined
+      tryRegister()
+    })
+    const unsubscribe = ctx.slots.subscribe('settings.section', () => { tryRegister() })
+    tryRegister()
+    return () => {
+      offLocale()
+      unsubscribe()
+      dispose?.()
+    }
+  }, 'ui-settings: general section registration')
 }
diff --git a/packages/client/ui-settings-general/src/client/locales.ts b/packages/client/ui-settings/src/client/locales.ts
similarity index 64%
rename from packages/client/ui-settings-general/src/client/locales.ts
rename to packages/client/ui-settings/src/client/locales.ts
index ff10ce5c37..6fc3295561 100644
--- a/packages/client/ui-settings-general/src/client/locales.ts
+++ b/packages/client/ui-settings/src/client/locales.ts
@@ -1,7 +1,9 @@
 /**
- * `settings.general` namespace dictionaries. Skeleton-row technical copy
+ * `settings` namespace dictionaries: shell chrome plus the shell-owned
+ * General section (nav label, skeleton rows). Skeleton-row technical copy
  * (Read only / Schema mode / Code mode and their descriptions) is shared
- * verbatim across locales per the Figma design.
+ * verbatim across locales per the Figma design. Feature-owned rows
+ * (Language, Appearance) ship their copy in their own packages.
  */
 import type { LocaleDict } from '@deepseek-ai/dsh-client-locale/client'
 
@@ -16,27 +18,23 @@ const SHARED = {
 /** Simplified Chinese dictionary. */
 export const zh: LocaleDict = {
   ...SHARED,
-  'nav': '通用设置',
+  'trigger': '设置',
+  'title': '设置',
+  'close': '关闭',
+  'general.nav': '通用设置',
   'permission.title': '权限',
   'permission.desc': '选择默认权限模式',
   'toolcall.title': '工具调用',
-  'language.title': '语言',
-  'appearance.title': '外观',
-  'appearance.light': '浅色',
-  'appearance.dark': '深色',
-  'appearance.system': '跟随系统',
 }
 
 /** English dictionary. */
 export const en: LocaleDict = {
   ...SHARED,
-  'nav': 'General',
+  'trigger': 'Settings',
+  'title': 'Settings',
+  'close': 'Close',
+  'general.nav': 'General',
   'permission.title': 'Permission',
   'permission.desc': 'Choose default permission mode',
   'toolcall.title': 'Tool Call',
-  'language.title': 'Language',
-  'appearance.title': 'Appearance',
-  'appearance.light': 'Light',
-  'appearance.dark': 'Dark',
-  'appearance.system': 'System',
 }
diff --git a/packages/client/ui-settings/tests/apply.spec.ts b/packages/client/ui-settings/tests/apply.spec.ts
index a94406e4ce..95684404a1 100644
--- a/packages/client/ui-settings/tests/apply.spec.ts
+++ b/packages/client/ui-settings/tests/apply.spec.ts
@@ -4,8 +4,9 @@ import { describe, expect, it, vi } from 'vitest'
 import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
 import { LocaleService } from '@deepseek-ai/dsh-client-locale/client'
 import { apply, inject } from '@deepseek-ai/dsh-client-ui-settings/client'
-import type { SettingsRootInjected } from '@deepseek-ai/dsh-client-ui-settings/client'
+import type { GeneralSectionInjected, SettingsRootInjected } from '@deepseek-ai/dsh-client-ui-settings/client'
 import { SettingsRoot } from '../src/client/SettingsRoot.tsx'
+import { GeneralSection } from '../src/client/GeneralSection.tsx'
 
 async function bench() {
   const ctx = new Context()
@@ -77,11 +78,14 @@ describe('ui-settings apply', () => {
     declare(b.slots)
     await b.ctx.plugin({ inject: [...inject], apply }).await()
     const injected = injectedOf(b.slots)
-    expect(injected.sections()).toEqual([])
+    // The shell ships its own General section (order 0) — the ledger is never
+    // empty once apply settles.
+    expect(injected.sections()).toEqual([{ id: 'general', order: 0, label: '通用设置' }])
     b.slots.register({ name: 'settings.section', id: 'z', order: 20, label: 'Z' } as never, () => null)
-    b.slots.register({ name: 'settings.section', id: 'a' } as never, () => null)
+    b.slots.register({ name: 'settings.section', id: 'a', order: 5 } as never, () => null)
     expect(injected.sections()).toEqual([
-      { id: 'a', order: 0, label: '' },
+      { id: 'general', order: 0, label: '通用设置' },
+      { id: 'a', order: 5, label: '' },
       { id: 'z', order: 20, label: 'Z' },
     ])
     expect(injected.sectionsVersion()).toBe(b.slots.getVersion('settings.section'))
@@ -118,3 +122,72 @@ describe('ui-settings apply', () => {
     expect(b.slots.spec('settings.section')).toBeUndefined()
   })
 })
+
+describe('ui-settings general section', () => {
+  it('registers the shell-owned General entry and declares the item slot', async () => {
+    const b = await bench()
+    declare(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    const entry = b.slots.entries('settings.section')[0]!
+    expect(entry.component).toBe(GeneralSection)
+    expect(entry.options).toEqual({ id: 'general', order: 0, label: '通用设置' })
+    expect(b.slots.spec('settings.general.item')).toEqual({ kind: 'list', scope: 'root' })
+    const injected = (entry.inject as () => GeneralSectionInjected)()
+    expect(injected.t('permission.title')).toBe('权限')
+  })
+
+  it('re-registers with fresh label text on locale change', async () => {
+    const b = await bench()
+    declare(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    b.locale.setLocale('en')
+    expect(b.slots.entries('settings.section')[0]!.options.label).toBe('General')
+    b.locale.setLocale('zh')
+    expect(b.slots.entries('settings.section')[0]!.options.label).toBe('通用设置')
+  })
+
+  it('locale change while settings.section is undeclared stays a no-op', async () => {
+    const b = await bench()
+    // No sidebar.settings declaration: the shell never registers, so
+    // settings.section is never declared either.
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    b.locale.setLocale('en')
+    expect(b.slots.entries('settings.section')).toHaveLength(0)
+    b.locale.setLocale('zh')
+  })
+
+  it('re-registers after an HMR collapse of the whole chain (stale disposer must not block)', async () => {
+    const b = await bench()
+    const redeclare = declare(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    expect(b.slots.entries('settings.section')).toHaveLength(1)
+    // Root declarer unload: the cascade removes the shell entry, the
+    // settings.section declaration, and the General entry below it.
+    redeclare()
+    expect(b.slots.entries('settings.section')).toHaveLength(0)
+    expect(b.slots.spec('settings.general.item')).toBeUndefined()
+    declare(b.slots)
+    // Two deferral hops: the shell re-registers (re-declaring
+    // settings.section), then General re-registers into it.
+    await Promise.resolve()
+    await Promise.resolve()
+    const entry = b.slots.entries('settings.section')[0]!
+    expect(entry.component).toBe(GeneralSection)
+    expect(b.slots.spec('settings.general.item')).toEqual({ kind: 'list', scope: 'root' })
+    // The recovered registration still rides the locale path.
+    b.locale.setLocale('en')
+    expect(b.slots.entries('settings.section')[0]!.options.label).toBe('General')
+    b.locale.setLocale('zh')
+  })
+
+  it('removes the General entry and its item declaration on teardown', async () => {
+    const b = await bench()
+    declare(b.slots)
+    const fiber = b.ctx.plugin({ inject: [...inject], apply })
+    await fiber.await()
+    expect(b.slots.spec('settings.general.item')).toBeDefined()
+    await fiber.dispose()
+    expect(b.slots.entries('settings.section')).toHaveLength(0)
+    expect(b.slots.spec('settings.general.item')).toBeUndefined()
+  })
+})
diff --git a/packages/client/ui-settings/tests/general-section.spec.tsx b/packages/client/ui-settings/tests/general-section.spec.tsx
new file mode 100644
index 0000000000..a944dd8b15
--- /dev/null
+++ b/packages/client/ui-settings/tests/general-section.spec.tsx
@@ -0,0 +1,47 @@
+// @vitest-environment jsdom
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { cleanup, render, screen } from '@testing-library/react'
+import type { GeneralSectionComponentProps } from '../src/client/contract/slots.ts'
+import { GeneralSection } from '../src/client/GeneralSection.tsx'
+import { en } from '../src/client/locales.ts'
+
+afterEach(cleanup)
+
+function mount() {
+  const renderSlot = vi.fn(
+    ((key: string) => <div data-testid={`slot-${key}`} />) as GeneralSectionComponentProps['renderSlot'],
+  )
+  const props: GeneralSectionComponentProps = {
+    t: (key) => en[key] ?? key,
+    renderSlot,
+  }
+  const view = render(<GeneralSection {...props} />)
+  return { view, renderSlot }
+}
+
+describe('GeneralSection', () => {
+  it('renders the Permission skeleton row with the disabled selector', () => {
+    mount()
+    expect(screen.getByText('Permission')).toBeTruthy()
+    expect(screen.getByText('Choose default permission mode')).toBeTruthy()
+    const selector = screen.getByRole('button', { name: /Read only/ }) as HTMLButtonElement
+    expect(selector.disabled).toBe(true)
+  })
+
+  it('renders the Tool Call skeleton cubes with schema pinned selected', () => {
+    mount()
+    expect(screen.getByText('Tool Call')).toBeTruthy()
+    const schema = screen.getByText('Schema mode')
+    const code = screen.getByText('Code mode')
+    expect(schema.parentElement!.className).toContain('selected')
+    expect(code.parentElement!.className).not.toContain('selected')
+    expect(screen.getByText('Traditional function calling — invoke tools one at a time')).toBeTruthy()
+    expect(screen.getByText('Chain multiple tools with code — multi-step orchestration')).toBeTruthy()
+  })
+
+  it('renders the feature-contributed item slot after the skeleton rows', () => {
+    const { renderSlot } = mount()
+    expect(renderSlot).toHaveBeenCalledWith('settings.general.item', {})
+    expect(screen.getByTestId('slot-settings.general.item')).toBeTruthy()
+  })
+})
diff --git a/packages/client/ui-theme/package.json b/packages/client/ui-theme/package.json
index 4c6ad92cd4..e60289b52d 100644
--- a/packages/client/ui-theme/package.json
+++ b/packages/client/ui-theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@deepseek-ai/dsh-client-ui-theme",
-  "description": "Theme plugin: ThemeService (light/dark/system preference, prefers-color-scheme resolution, theme/change snapshots; no DOM), --dsw-* token base stylesheets",
+  "description": "Theme plugin: ThemeService (light/dark/system preference, prefers-color-scheme resolution, theme/change snapshots; no DOM), --dsw-* token base stylesheets; registers the Appearance settings row",
   "version": "0.0.1",
   "private": true,
   "type": "module",
@@ -24,18 +24,32 @@
     "./package.json": "./package.json"
   },
   "dshClient": {
-    "inject": [],
+    "inject": [
+      "@deepseek-ai/dsh-client-runtime",
+      "@deepseek-ai/dsh-client-locale"
+    ],
     "platform": "web",
     "immediately": true
   },
   "license": "BSD-3-Clause",
   "peerDependencies": {
+    "@deepseek-ai/dsh-client-locale": "^0.0.1",
+    "@deepseek-ai/dsh-client-runtime": "^0.0.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.0.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.0.1",
     "@deepseek-ai/dsh-invariants": "^0.0.1",
-    "cordis": "^4.0.0-rc.7"
+    "cordis": "^4.0.0-rc.7",
+    "react": "^18.2.0"
   },
   "devDependencies": {
+    "@deepseek-ai/dsh-client-locale": "workspace:^",
+    "@deepseek-ai/dsh-client-runtime": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-primitives": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-slots": "workspace:^",
     "@deepseek-ai/dsh-invariants": "workspace:^",
-    "cordis": "^4.0.0-rc.7"
+    "@types/react": "~18.3.1",
+    "cordis": "^4.0.0-rc.7",
+    "react": "^18.2.0"
   },
   "files": [
     "lib/index.js",
@@ -48,5 +62,8 @@
   "scripts": {
     "bundle": "tsdown",
     "watch": "tsdown --watch"
+  },
+  "dependencies": {
+    "clsx": "^2.0.0"
   }
 }
diff --git a/packages/client/ui-theme/src/client/AppearanceRow.module.css b/packages/client/ui-theme/src/client/AppearanceRow.module.css
new file mode 100644
index 0000000000..9619caa823
--- /dev/null
+++ b/packages/client/ui-theme/src/client/AppearanceRow.module.css
@@ -0,0 +1,51 @@
+/* Appearance row (figma 'Frame 2117131228': title + cube row, column gap 8,
+ * pad 16/0, hairline separator; the section column strips it when last). */
+
+.group {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 16px 0;
+  border-bottom: 1px solid var(--dsw-alias-border-l2);
+}
+
+.title {
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 22px;
+  color: var(--dsw-alias-label-primary);
+}
+
+.cubeRow {
+  display: flex;
+  align-items: stretch;
+  gap: 8px;
+}
+
+/* Appearance cube (figma '.Selector Cube' 276x82 r16, pad 20/32, centered
+ * icon-over-label column, gap 4). */
+.themeCube {
+  box-sizing: border-box;
+  width: 276px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+  padding: 20px 32px;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 16px;
+  background: transparent;
+  font: inherit;
+  font-size: 14px;
+  line-height: 22px;
+  color: var(--dsw-alias-label-primary);
+  cursor: pointer;
+}
+
+/* Selected cube: #F5F6F7 fill + #ADB2B8 border (static token — the bluish-400
+ * step has no alias-layer name). */
+.selected {
+  background: var(--dsw-alias-bg-module-platform);
+  border-color: var(--dsw-static-neutral-bluish-400);
+}
diff --git a/packages/client/ui-theme/src/client/AppearanceRow.tsx b/packages/client/ui-theme/src/client/AppearanceRow.tsx
new file mode 100644
index 0000000000..b4aad1725d
--- /dev/null
+++ b/packages/client/ui-theme/src/client/AppearanceRow.tsx
@@ -0,0 +1,63 @@
+/**
+ * Appearance preference row registered into the General section item slot
+ * (figma 501:30012 'Frame 2117131228'): title + three preference cubes.
+ * Registered by this package — the theme feature owns its own settings
+ * surface. Selection follows the persisted preference, never the resolved
+ * active theme.
+ */
+import clsx from 'clsx'
+import {
+  IconDarkOutline16, IconFollowsystemOutline16, IconLightOutline16,
+} from '@deepseek-ai/dsh-client-ui-primitives'
+import type { PropsRuntime, PropsStore } from '@deepseek-ai/dsh-client-ui-slots'
+import type { ThemePreference } from './index.ts'
+import type {} from './settings-contract.ts'
+import type { createAppearanceRowStore } from './settings-store.ts'
+import css from './AppearanceRow.module.css'
+
+/** Injected business face: namespace-bound translate + the preference write. */
+export interface AppearanceRowInjected {
+  /** Translate a `settings.theme` dictionary key to the active-locale text. */
+  t: (key: string) => string
+  /** Switch the theme preference. */
+  setTheme: (id: ThemePreference) => void
+}
+
+/** Full component props: runtime share + store share + injected face. */
+export type AppearanceRowComponentProps =
+  PropsRuntime<'settings.general.item'> & PropsStore<ReturnType<typeof createAppearanceRowStore>> & AppearanceRowInjected
+
+/** Cube order and icons (figma 501:30015-30017: Light, Dark, System). */
+const CUBES: readonly { id: ThemePreference; labelKey: string; Icon: typeof IconLightOutline16 }[] = [
+  { id: 'light', labelKey: 'appearance.light', Icon: IconLightOutline16 },
+  { id: 'dark', labelKey: 'appearance.dark', Icon: IconDarkOutline16 },
+  { id: 'system', labelKey: 'appearance.system', Icon: IconFollowsystemOutline16 },
+]
+
+/**
+ * Render the Appearance row.
+ * @param props - composed slot props.
+ * @returns the row element tree.
+ */
+export function AppearanceRow({ t, setTheme, useStore }: AppearanceRowComponentProps) {
+  const preference = useStore(s => s.preference)
+  return (
+    <div className={css.group}>
+      <div className={css.title}>{t('appearance.title')}</div>
+      <div className={css.cubeRow}>
+        {CUBES.map(({ id, labelKey, Icon }) => (
+          <button
+            key={id}
+            type="button"
+            className={clsx(css.themeCube, preference === id && css.selected)}
+            aria-pressed={preference === id}
+            onClick={() => { setTheme(id) }}
+          >
+            <Icon />
+            {t(labelKey)}
+          </button>
+        ))}
+      </div>
+    </div>
+  )
+}
diff --git a/packages/client/ui-theme/src/client/index.ts b/packages/client/ui-theme/src/client/index.ts
index 5c7ca3fe12..ac79913062 100644
--- a/packages/client/ui-theme/src/client/index.ts
+++ b/packages/client/ui-theme/src/client/index.ts
@@ -2,9 +2,24 @@
  * Browser theme registry over the `--dsw-*` token stylesheets. The service
  * owns the theme preference (light/dark/system), resolves `system` through
  * `prefers-color-scheme`, and publishes immutable snapshots; it never touches
- * the DOM — ui-layout's presenter consumes the resolved snapshot.
+ * the DOM — ui-layout's presenter consumes the resolved snapshot. The plugin
+ * also registers the Appearance preference row into the settings General
+ * section — the theme feature owns its own settings surface.
  */
 import type { Context } from 'cordis'
+import type { BoundActions } from '@deepseek-ai/dsh-client-ui-slots'
+import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
+// Type-only: pulls the locale plugin's Context merge (ctx.locale).
+import type {} from '@deepseek-ai/dsh-client-locale/client'
+import type { AppearanceRowInjected } from './AppearanceRow.tsx'
+import { AppearanceRow } from './AppearanceRow.tsx'
+import { createAppearanceRowStore } from './settings-store.ts'
+
+export type { AppearanceRowComponentProps, AppearanceRowInjected } from './AppearanceRow.tsx'
+export type { AppearanceRowState } from './settings-store.ts'
+
+/** Namespace owning this feature's settings-row copy. */
+export const SETTINGS_NS = 'settings.theme'
 
 /** Theme token dictionary: --dsw-alias-* overrides keyed by variable name. */
 export type ThemeTokens = Record<string, string>
@@ -200,13 +215,75 @@ function persistPreference(preference: ThemePreference): void {
   }
 }
 
-/** Required services (none; the loader passes the export surface as an object plugin). */
-export const inject: string[] = []
+/** Required services: slots + locale (the feature registers its own settings row with localized copy). */
+export const inject = ['slots', 'locale']
 
 /**
- * Client plugin body: provide the theme service.
+ * Client plugin body: provide the theme service and register the
+ * feature-owned Appearance preference row into the General section's item
+ * slot (a feature owns its settings surface).
  * @param ctx - client cordis context.
  */
-export function apply(ctx: Context): void {
-  ctx.provide('theme', new ThemeService(ctx))
+export function apply(ctx: ClientContext): void {
+  const theme = new ThemeService(ctx)
+  ctx.provide('theme', theme)
+
+  ctx.effect(() => {
+    const disposers = [
+      ctx.locale.register(SETTINGS_NS, 'zh', {
+        'appearance.title': '外观',
+        'appearance.light': '浅色',
+        'appearance.dark': '深色',
+        'appearance.system': '跟随系统',
+      }),
+      ctx.locale.register(SETTINGS_NS, 'en', {
+        'appearance.title': 'Appearance',
+        'appearance.light': 'Light',
+        'appearance.dark': 'Dark',
+        'appearance.system': 'System',
+      }),
+    ]
+    return () => { for (const dispose of disposers) dispose() }
+  }, 'ui-theme: settings row dictionaries')
+
+  const store = createAppearanceRowStore()
+  let bound: BoundActions<typeof store> | undefined
+  const sync = (snapshot: ThemeSnapshot): void => {
+    bound?.sync(snapshot.preference, snapshot.revision)
+  }
+  ctx.on('theme/change', sync)
+  const injected = (actions: BoundActions<typeof store>): AppearanceRowInjected => {
+    bound = actions
+    // Re-sync from the getter so no event is lost between registration and
+    // first render (the store's revision guard drops stale duplicates).
+    sync(theme.getTheme())
+    return {
+      t: ctx.locale.bind(SETTINGS_NS),
+      setTheme: (id) => { theme.setTheme(id) },
+    }
+  }
+  // Declaration-aware registration; the LEDGER is the has-registered judge
+  // (not a local flag): after an HMR collapse re-declares the slot, the
+  // cascade already removed our entry, and a stale disposer must not block
+  // the re-registration.
+  ctx.effect(() => {
+    let dispose: (() => void) | undefined
+    const tryRegister = (): void => {
+      if (ctx.slots.spec('settings.general.item') === undefined) return
+      if (ctx.slots.entries('settings.general.item').some(e => e.component === AppearanceRow)) return
+      dispose = ctx.slots.register({
+        name: 'settings.general.item',
+        id: 'appearance',
+        order: 10,
+        store,
+        inject: injected,
+      }, AppearanceRow)
+    }
+    const unsubscribe = ctx.slots.subscribe('settings.general.item', () => { tryRegister() })
+    tryRegister()
+    return () => {
+      unsubscribe()
+      dispose?.()
+    }
+  }, 'ui-theme: appearance settings row registration')
 }
diff --git a/packages/client/ui-theme/src/client/settings-contract.ts b/packages/client/ui-theme/src/client/settings-contract.ts
new file mode 100644
index 0000000000..4354ca8728
--- /dev/null
+++ b/packages/client/ui-theme/src/client/settings-contract.ts
@@ -0,0 +1,17 @@
+/**
+ * Settings-surface slot merge consumed by this package's Appearance row. The
+ * AUTHORITATIVE home for 'settings.general.item' is the ui-settings contract
+ * (declaring is claiming: the shell's General entry declares the slot); this
+ * file repeats the entry verbatim because the settings shell sits above the
+ * feature layer, so importing its types from here would invert the layering.
+ * TypeScript declaration merging rejects diverging duplicates, so every
+ * program that sees both copies enforces identity.
+ */
+declare module '@deepseek-ai/dsh-client-ui-slots' {
+  interface SlotMap {
+    /** One preference row inside the General section (duplicate-identical merge; authority: ui-settings contract). */
+    'settings.general.item': { kind: 'list'; scope: 'root'; owner: { children?: never } }
+  }
+}
+
+export {}
diff --git a/packages/client/ui-theme/src/client/settings-store.ts b/packages/client/ui-theme/src/client/settings-store.ts
new file mode 100644
index 0000000000..256b04a299
--- /dev/null
+++ b/packages/client/ui-theme/src/client/settings-store.ts
@@ -0,0 +1,37 @@
+/**
+ * Appearance row slot store: a mirror of the theme service snapshot. The
+ * plugin's apply-world change listener is the only writer; the row component
+ * reads via props.useStore.
+ */
+import { defineStore, type EngineStoreHandle } from '@deepseek-ai/dsh-client-runtime/client'
+import type { ThemePreference } from './index.ts'
+
+/** Store state mirrored from the theme snapshot. */
+export interface AppearanceRowState {
+  /** Persisted preference (selection state reads this, never the resolved active theme). */
+  preference: ThemePreference
+  /** Service revision; -1 until first sync so revision 0 lands as a change. */
+  revision: number
+}
+
+/** Declared action shape giving the exported factory a stable return type. */
+type AppearanceRowActions = {
+  sync: (draft: AppearanceRowState, preference: ThemePreference, revision: number) => void
+}
+
+/**
+ * Declares the Appearance row state and write surface.
+ * @returns the store handle.
+ */
+export function createAppearanceRowStore(): EngineStoreHandle<AppearanceRowState, AppearanceRowActions> {
+  return defineStore({
+    init: (): AppearanceRowState => ({ preference: 'system', revision: -1 }),
+    actions: {
+      sync: (d, preference: ThemePreference, revision: number) => {
+        if (revision <= d.revision) return
+        d.preference = preference
+        d.revision = revision
+      },
+    },
+  })
+}
diff --git a/packages/client/ui-theme/src/css-modules.d.ts b/packages/client/ui-theme/src/css-modules.d.ts
new file mode 100644
index 0000000000..bc5e482353
--- /dev/null
+++ b/packages/client/ui-theme/src/css-modules.d.ts
@@ -0,0 +1,6 @@
+declare module '*.module.css' {
+  const classes: Record<string, string>
+  export default classes
+}
+
+declare module '*.css'
diff --git a/packages/client/ui-theme/tests/invariant.spec.ts b/packages/client/ui-theme/tests/invariant.spec.ts
index 6f4e867c4d..640599ea43 100644
--- a/packages/client/ui-theme/tests/invariant.spec.ts
+++ b/packages/client/ui-theme/tests/invariant.spec.ts
@@ -4,6 +4,8 @@ import { Context } from 'cordis'
 import { apply as nodeApply } from '@deepseek-ai/dsh-client-ui-theme'
 import { apply as clientApply, inject, ThemeService } from '@deepseek-ai/dsh-client-ui-theme/client'
 import * as ThemeInvariant from '@deepseek-ai/dsh-client-ui-theme/invariant'
+import { apply as localeApply } from '@deepseek-ai/dsh-client-locale/client'
+import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
 import InvariantService from '@deepseek-ai/dsh-invariants'
 
 describe('invariant companion', () => {
@@ -18,9 +20,13 @@ describe('invariant companion', () => {
     expect(true).toBe(true) // reaching here without throw is the contract
   })
 
-  it('client apply provides ctx.theme with no service prerequisites', async () => {
-    expect(inject).toEqual([])
+  it('client apply provides ctx.theme over the slots/locale edges', async () => {
+    // The feature registers its own Appearance settings row with localized
+    // copy, hence the slots + locale edges.
+    expect(inject).toEqual(['slots', 'locale'])
     const ctx = new Context()
+    new SlotsService(ctx)
+    await ctx.plugin({ inject: ['slots'], apply: localeApply }).await()
     await ctx.plugin({ inject, apply: clientApply }).await()
     expect(ctx.get('theme')).toBeInstanceOf(ThemeService)
   })
diff --git a/packages/client/ui-theme/tsconfig.json b/packages/client/ui-theme/tsconfig.json
index 51f9171643..7d5cc6f235 100644
--- a/packages/client/ui-theme/tsconfig.json
+++ b/packages/client/ui-theme/tsconfig.json
@@ -8,6 +8,18 @@
     "src"
   ],
   "references": [
+    {
+      "path": "../locale"
+    },
+    {
+      "path": "../runtime"
+    },
+    {
+      "path": "../ui-primitives"
+    },
+    {
+      "path": "../ui-slots"
+    },
     {
       "path": "../../../vendor/cordis"
     },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2410252eb0..40fee92c16 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -140,18 +140,15 @@ importers:
       '@deepseek-ai/dsh-client-ui-layout':
         specifier: workspace:^
         version: link:../../packages/client/ui-layout
+      '@deepseek-ai/dsh-client-ui-models':
+        specifier: workspace:^
+        version: link:../../packages/client/ui-models
       '@deepseek-ai/dsh-client-ui-question':
         specifier: workspace:^
         version: link:../../packages/client/ui-question
       '@deepseek-ai/dsh-client-ui-settings':
         specifier: workspace:^
         version: link:../../packages/client/ui-settings
-      '@deepseek-ai/dsh-client-ui-settings-general':
-        specifier: workspace:^
-        version: link:../../packages/client/ui-settings-general
-      '@deepseek-ai/dsh-client-ui-settings-models':
-        specifier: workspace:^
-        version: link:../../packages/client/ui-settings-models
       '@deepseek-ai/dsh-client-ui-sidebar':
         specifier: workspace:^
         version: link:../../packages/client/ui-sidebar
@@ -750,13 +747,32 @@ importers:
         version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@vendor+loader)
 
   packages/client/locale:
+    dependencies:
+      clsx:
+        specifier: ^2.0.0
+        version: 2.1.1
     devDependencies:
+      '@deepseek-ai/dsh-client-runtime':
+        specifier: workspace:^
+        version: link:../runtime
+      '@deepseek-ai/dsh-client-ui-primitives':
+        specifier: workspace:^
+        version: link:../ui-primitives
+      '@deepseek-ai/dsh-client-ui-slots':
+        specifier: workspace:^
+        version: link:../ui-slots
       '@deepseek-ai/dsh-invariants':
         specifier: workspace:^
         version: link:../../support/invariants
+      '@types/react':
+        specifier: ~18.3.1
+        version: 18.3.31
       cordis:
         specifier: ^4.0.0-rc.7
         version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)
+      react:
+        specifier: ^18.2.0
+        version: 18.3.1
 
   packages/client/modules:
     devDependencies:
@@ -865,6 +881,33 @@ importers:
         specifier: ^18.2.0
         version: 18.3.1
 
+  packages/client/ui-models:
+    devDependencies:
+      '@deepseek-ai/dsh-client-locale':
+        specifier: workspace:^
+        version: link:../locale
+      '@deepseek-ai/dsh-client-runtime':
+        specifier: workspace:^
+        version: link:../runtime
+      '@deepseek-ai/dsh-client-ui-settings':
+        specifier: workspace:^
+        version: link:../ui-settings
+      '@deepseek-ai/dsh-client-ui-slots':
+        specifier: workspace:^
+        version: link:../ui-slots
+      '@deepseek-ai/dsh-invariants':
+        specifier: workspace:^
+        version: link:../../support/invariants
+      '@types/react':
+        specifier: ~18.3.1
+        version: 18.3.31
+      cordis:
+        specifier: ^4.0.0-rc.7
+        version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)
+      react:
+        specifier: ^18.2.0
+        version: 18.3.1
+
   packages/client/ui-primitives:
     dependencies:
       clsx:
@@ -979,70 +1022,6 @@ importers:
         specifier: ^18.2.0
         version: 18.3.1
 
-  packages/client/ui-settings-general:
-    dependencies:
-      clsx:
-        specifier: ^2.0.0
-        version: 2.1.1
-    devDependencies:
-      '@deepseek-ai/dsh-client-locale':
-        specifier: workspace:^
-        version: link:../locale
-      '@deepseek-ai/dsh-client-runtime':
-        specifier: workspace:^
-        version: link:../runtime
-      '@deepseek-ai/dsh-client-ui-primitives':
-        specifier: workspace:^
-        version: link:../ui-primitives
-      '@deepseek-ai/dsh-client-ui-settings':
-        specifier: workspace:^
-        version: link:../ui-settings
-      '@deepseek-ai/dsh-client-ui-slots':
-        specifier: workspace:^
-        version: link:../ui-slots
-      '@deepseek-ai/dsh-client-ui-theme':
-        specifier: workspace:^
-        version: link:../ui-theme
-      '@deepseek-ai/dsh-invariants':
-        specifier: workspace:^
-        version: link:../../support/invariants
-      '@types/react':
-        specifier: ~18.3.1
-        version: 18.3.31
-      cordis:
-        specifier: ^4.0.0-rc.7
-        version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)
-      react:
-        specifier: ^18.2.0
-        version: 18.3.1
-
-  packages/client/ui-settings-models:
-    devDependencies:
-      '@deepseek-ai/dsh-client-locale':
-        specifier: workspace:^
-        version: link:../locale
-      '@deepseek-ai/dsh-client-runtime':
-        specifier: workspace:^
-        version: link:../runtime
-      '@deepseek-ai/dsh-client-ui-settings':
-        specifier: workspace:^
-        version: link:../ui-settings
-      '@deepseek-ai/dsh-client-ui-slots':
-        specifier: workspace:^
-        version: link:../ui-slots
-      '@deepseek-ai/dsh-invariants':
-        specifier: workspace:^
-        version: link:../../support/invariants
-      '@types/react':
-        specifier: ~18.3.1
-        version: 18.3.31
-      cordis:
-        specifier: ^4.0.0-rc.7
-        version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)
-      react:
-        specifier: ^18.2.0
-        version: 18.3.1
-
   packages/client/ui-sidebar:
     dependencies:
       clsx:
@@ -1087,13 +1066,35 @@ importers:
         version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)
 
   packages/client/ui-theme:
+    dependencies:
+      clsx:
+        specifier: ^2.0.0
+        version: 2.1.1
     devDependencies:
+      '@deepseek-ai/dsh-client-locale':
+        specifier: workspace:^
+        version: link:../locale
+      '@deepseek-ai/dsh-client-runtime':
+        specifier: workspace:^
+        version: link:../runtime
+      '@deepseek-ai/dsh-client-ui-primitives':
+        specifier: workspace:^
+        version: link:../ui-primitives
+      '@deepseek-ai/dsh-client-ui-slots':
+        specifier: workspace:^
+        version: link:../ui-slots
       '@deepseek-ai/dsh-invariants':
         specifier: workspace:^
         version: link:../../support/invariants
+      '@types/react':
+        specifier: ~18.3.1
+        version: 18.3.31
       cordis:
         specifier: ^4.0.0-rc.7
         version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)
+      react:
+        specifier: ^18.2.0
+        version: 18.3.1
 
   packages/client/ui-trajectory:
     devDependencies:
diff --git a/scripts/verify-package-readme-model-experience.ts b/scripts/verify-package-readme-model-experience.ts
index cb8ebb6a48..91554c5c5c 100644
--- a/scripts/verify-package-readme-model-experience.ts
+++ b/scripts/verify-package-readme-model-experience.ts
@@ -60,8 +60,7 @@ const SENTENCE_MODEL_EXPERIENCE: Readonly<Record<string, SentenceContract>> = {
   'packages/client/ui-workspace': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/ui-theme': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/ui-settings': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
-  'packages/client/ui-settings-general': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
-  'packages/client/ui-settings-models': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
+  'packages/client/ui-models': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/locale': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/web': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/examples/agent-spine-demo': { kind: 'indirect', reason: 'The bundle only mounts model-facing child plugins.' },
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 81e0fc989c..49a502571e 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -116,8 +116,7 @@
       "@deepseek-ai/dsh-client-ui-workspace": ["./packages/client/ui-workspace/src"],
       "@deepseek-ai/dsh-client-ui-theme": ["./packages/client/ui-theme/src"],
       "@deepseek-ai/dsh-client-ui-settings": ["./packages/client/ui-settings/src"],
-      "@deepseek-ai/dsh-client-ui-settings-general": ["./packages/client/ui-settings-general/src"],
-      "@deepseek-ai/dsh-client-ui-settings-models": ["./packages/client/ui-settings-models/src"],
+      "@deepseek-ai/dsh-client-ui-models": ["./packages/client/ui-models/src"],
       "@deepseek-ai/dsh-client-locale": ["./packages/client/locale/src"],
       "@deepseek-ai/dsh-client-web": ["./packages/client/web/src"],
       "@deepseek-ai/dsh-*": [
diff --git a/tsconfig.client.json b/tsconfig.client.json
index abe80b8b12..55ff2d9a8c 100644
--- a/tsconfig.client.json
+++ b/tsconfig.client.json
@@ -39,8 +39,7 @@
     { "path": "./packages/client/ui-trajectory" },
     { "path": "./packages/client/ui-theme" },
     { "path": "./packages/client/ui-settings" },
-    { "path": "./packages/client/ui-settings-general" },
-    { "path": "./packages/client/ui-settings-models" },
+    { "path": "./packages/client/ui-models" },
     { "path": "./packages/client/locale" },
     { "path": "./packages/client/web" },
     { "path": "./apps/web" }

From a3ee5dd8a0c2ba5ddc850b485eb07f88cb11fff1 Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 02:54:29 +0800
Subject: [PATCH 07/15] docs(gui): regenerate graphs and sync the note's
 English pair

Generated docs follow the ui-models rename and the removed
ui-settings-general package; the English note side picks up the
feature-owner self-registration doctrine.
---
 ...-25-client-settings-locale-theme.i18n.yaml |  4 +-
 ...2026-07-25-client-settings-locale-theme.md |  2 +-
 docs/config-catalog.md                        |  3 +-
 docs/event-producer-consumer.md               |  4 +-
 docs/module-graph.md                          | 41 +++++-----
 .../client/locale/tests/language-row.spec.tsx | 82 +++++++++++++++++++
 .../locale/tests/settings-store.spec.ts       | 30 +++++++
 .../client/ui-settings/tests/apply.spec.ts    |  6 +-
 .../tests/general-section.spec.tsx            |  4 +
 .../ui-theme/tests/appearance-row.spec.tsx    | 75 +++++++++++++++++
 .../ui-theme/tests/settings-store.spec.ts     | 28 +++++++
 11 files changed, 250 insertions(+), 29 deletions(-)
 create mode 100644 packages/client/locale/tests/language-row.spec.tsx
 create mode 100644 packages/client/locale/tests/settings-store.spec.ts
 create mode 100644 packages/client/ui-theme/tests/appearance-row.spec.tsx
 create mode 100644 packages/client/ui-theme/tests/settings-store.spec.ts

diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
index 8583642403..39d7377c54 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   pnpm run verify-translation-pairing --write
-2026-07-25-client-settings-locale-theme.md: e1245a9e1fac82fb0feb84af7a59945b17fa1daf
-2026-07-25-client-settings-locale-theme.zh.md: 195b2e5ffa3556dd1b8bf2dd6ec8ae84115fbdb2
+2026-07-25-client-settings-locale-theme.md: 658e6bd3c2da39a98e476c60f10f3f51ad82e5ea
+2026-07-25-client-settings-locale-theme.zh.md: dfe93a0ca1f53380c653886c73fe0c32b08d8443
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
index 0dfcb4ea90..658e6bd3c2 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
@@ -119,4 +119,4 @@ Locale ships with 中文 and English built in; `setLocale`/`setTheme` are the on
 
 ## Risks
 
-The apply order of slot declarations and contributions is not fixed, so every new section must keep declaration-aware registration and idempotence guards. Service events may fire before a section's first render, so both the General store's init and the controller attach must align to the current snapshot from the getters. Layout must clean up the global attributes it set on unmount, and ThemeService must remove its matchMedia listener on dispose, so nothing lingers after HMR.
+The apply order of slot declarations and contributions is not fixed, so every section/item registrant must keep declaration-aware registration and judge presence by the ledger, not by a local disposer. Service events may fire before a row's first render, so both a feature row store's init and the inject attach must align to the current snapshot from the getter. The duplicated merge copies of `settings.general.item` (locale, ui-theme) must stay verbatim-identical to the ui-settings canonical home — any drift means changing all three together. Layout must clean up the global attributes it set on unmount, and ThemeService must remove its matchMedia listener on dispose, so nothing lingers after HMR.
diff --git a/docs/config-catalog.md b/docs/config-catalog.md
index ede904e1a5..1940811d35 100644
--- a/docs/config-catalog.md
+++ b/docs/config-catalog.md
@@ -2022,10 +2022,9 @@ These load from a `cordis.yml` entry with no `config:` block; they declare no co
 - `@deepseek-ai/dsh-client-runtime` ([`packages/client/runtime/src/index.ts`](../packages/client/runtime/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-conversation` ([`packages/client/ui-conversation/src/index.ts`](../packages/client/ui-conversation/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-layout` ([`packages/client/ui-layout/src/index.ts`](../packages/client/ui-layout/src/index.ts))
+- `@deepseek-ai/dsh-client-ui-models` ([`packages/client/ui-models/src/index.ts`](../packages/client/ui-models/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-question` — requires `tools` · `userInteraction` ([`packages/client/ui-question/src/index.ts`](../packages/client/ui-question/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-settings` ([`packages/client/ui-settings/src/index.ts`](../packages/client/ui-settings/src/index.ts))
-- `@deepseek-ai/dsh-client-ui-settings-general` ([`packages/client/ui-settings-general/src/index.ts`](../packages/client/ui-settings-general/src/index.ts))
-- `@deepseek-ai/dsh-client-ui-settings-models` ([`packages/client/ui-settings-models/src/index.ts`](../packages/client/ui-settings-models/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-sidebar` ([`packages/client/ui-sidebar/src/index.ts`](../packages/client/ui-sidebar/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-theme` ([`packages/client/ui-theme/src/index.ts`](../packages/client/ui-theme/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-trajectory` ([`packages/client/ui-trajectory/src/index.ts`](../packages/client/ui-trajectory/src/index.ts))
diff --git a/docs/event-producer-consumer.md b/docs/event-producer-consumer.md
index 2c1e85fb3c..53cd56f4cf 100644
--- a/docs/event-producer-consumer.md
+++ b/docs/event-producer-consumer.md
@@ -63,8 +63,8 @@ This matrix shows which packages dispatch each harness-owned event and which pac
 | `internal/dispatch` | - | [`compact`](../packages/compact/compact), [`fs`](../packages/fs/fs), [`goal`](../packages/goal/goal), [`goal-session`](../packages/goal/goal-session), [`hook-protocol`](../packages/hooks/hook-protocol), [`llm-retry`](../packages/llm/llm-retry), [`permission`](../packages/ui/permission), [`plan-mode`](../packages/plan/plan-mode), [`pty-local`](../packages/pty/pty-local), `runtime`, [`sandbox-policy`](../packages/sandbox/sandbox-policy), [`scope`](../packages/core/scope), [`session`](../packages/core/session), [`subagent`](../packages/subagent/subagent), [`time-context`](../packages/context/time-context), [`tool-todo`](../packages/todo/tool-todo), [`tools`](../packages/core/tools), [`user-approval`](../packages/ui/user-approval), [`workflow`](../packages/workflow/workflow) |
 | `internal/plugin` | - | `hmr`, `modules`, `webserver` |
 | `internal/status` | - | [`agent`](../packages/core/agent) |
-| `locale/change` | `locale` (`emit`) | `ui-settings-general`, `ui-settings-models` |
+| `locale/change` | `locale` (`emit`) | `locale`, `ui-models`, `ui-settings` |
 | `slots/changed` | `runtime` (`emit`) | - |
-| `theme/change` | `ui-theme` (`emit`) | `ui-layout`, `ui-settings-general` |
+| `theme/change` | `ui-theme` (`emit`) | `ui-layout`, `ui-theme` |
 
 Maintenance mode: generated: Cordis event declarations and producer/listener edges are resolved from the repository TypeScript Program.
diff --git a/docs/module-graph.md b/docs/module-graph.md
index c47bd92d83..4903e432cd 100644
--- a/docs/module-graph.md
+++ b/docs/module-graph.md
@@ -141,11 +141,10 @@ flowchart TD
     pkg_client_runtime["client-runtime"]
     pkg_client_ui_conversation["client-ui-conversation"]
     pkg_client_ui_layout["client-ui-layout"]
+    pkg_client_ui_models["client-ui-models"]
     pkg_client_ui_primitives["client-ui-primitives"]
     pkg_client_ui_question["client-ui-question"]
     pkg_client_ui_settings["client-ui-settings"]
-    pkg_client_ui_settings_general["client-ui-settings-general"]
-    pkg_client_ui_settings_models["client-ui-settings-models"]
     pkg_client_ui_sidebar["client-ui-sidebar"]
     pkg_client_ui_slots["client-ui-slots"]
     pkg_client_ui_theme["client-ui-theme"]
@@ -228,13 +227,11 @@ flowchart TD
   pkg_subagent_subprocess --> pkg_invariants
   pkg_acp_snapshot --> pkg_invariants
   pkg_loader_smoke --> pkg_invariants
-  pkg_client_locale --> pkg_invariants
   pkg_client_modules --> pkg_invariants
   pkg_client_runtime --> pkg_invariants
   pkg_client_ui_primitives --> pkg_invariants
   pkg_client_ui_question --> pkg_invariants
   pkg_client_ui_slots --> pkg_invariants
-  pkg_client_ui_theme --> pkg_invariants
   pkg_client_ui_trajectory --> pkg_invariants
   pkg_client_web --> pkg_invariants
   pkg_client_web_react --> pkg_invariants
@@ -250,25 +247,21 @@ flowchart TD
   pkg_client_hmr --> pkg_client_modules
   pkg_client_hmr --> pkg_host_webserver
   pkg_client_hmr --> pkg_invariants
+  pkg_client_locale --> pkg_client_runtime
+  pkg_client_locale --> pkg_client_ui_primitives
+  pkg_client_locale --> pkg_client_ui_slots
+  pkg_client_locale --> pkg_invariants
   pkg_client_ui_conversation --> pkg_client_runtime
   pkg_client_ui_conversation --> pkg_client_ui_primitives
   pkg_client_ui_conversation --> pkg_client_ui_slots
   pkg_client_ui_conversation --> pkg_invariants
-  pkg_client_ui_layout --> pkg_client_runtime
-  pkg_client_ui_layout --> pkg_client_ui_slots
-  pkg_client_ui_layout --> pkg_client_ui_theme
-  pkg_client_ui_layout --> pkg_invariants
+  pkg_client_ui_models --> pkg_client_runtime
+  pkg_client_ui_models --> pkg_client_ui_slots
+  pkg_client_ui_models --> pkg_invariants
   pkg_client_ui_settings --> pkg_client_runtime
   pkg_client_ui_settings --> pkg_client_ui_primitives
   pkg_client_ui_settings --> pkg_client_ui_slots
   pkg_client_ui_settings --> pkg_invariants
-  pkg_client_ui_settings_general --> pkg_client_runtime
-  pkg_client_ui_settings_general --> pkg_client_ui_primitives
-  pkg_client_ui_settings_general --> pkg_client_ui_slots
-  pkg_client_ui_settings_general --> pkg_invariants
-  pkg_client_ui_settings_models --> pkg_client_runtime
-  pkg_client_ui_settings_models --> pkg_client_ui_slots
-  pkg_client_ui_settings_models --> pkg_invariants
   pkg_client_ui_sidebar --> pkg_client_runtime
   pkg_client_ui_sidebar --> pkg_client_ui_primitives
   pkg_client_ui_sidebar --> pkg_client_ui_slots
@@ -303,6 +296,11 @@ flowchart TD
   pkg_system_prompt --> pkg_scope
   pkg_web --> pkg_invariants
   pkg_web --> pkg_llm
+  pkg_client_ui_theme --> pkg_client_locale
+  pkg_client_ui_theme --> pkg_client_runtime
+  pkg_client_ui_theme --> pkg_client_ui_primitives
+  pkg_client_ui_theme --> pkg_client_ui_slots
+  pkg_client_ui_theme --> pkg_invariants
   pkg_lsp --> pkg_brand
   pkg_lsp --> pkg_invariants
   pkg_lsp --> pkg_llm
@@ -355,6 +353,10 @@ flowchart TD
   pkg_app_boot --> pkg_invariants
   pkg_app_boot --> pkg_paths
   pkg_app_boot --> pkg_system_prompt
+  pkg_client_ui_layout --> pkg_client_runtime
+  pkg_client_ui_layout --> pkg_client_ui_slots
+  pkg_client_ui_layout --> pkg_client_ui_theme
+  pkg_client_ui_layout --> pkg_invariants
   pkg_code_runtime_worker --> pkg_code_runtime
   pkg_code_runtime_worker --> pkg_invariants
   pkg_code_runtime_worker --> pkg_session
@@ -813,13 +815,11 @@ flowchart TD
 | [`subagent-subprocess`](../packages/subagent/subagent-subprocess) | `subagent` | [`invariants`](../packages/support/invariants) |
 | [`acp-snapshot`](../packages/support/acp-snapshot) | `support` | [`invariants`](../packages/support/invariants) |
 | [`loader-smoke`](../packages/support/loader-smoke) | `support` | [`invariants`](../packages/support/invariants) |
-| [`client-locale`](../packages/client/locale) | `client` | [`invariants`](../packages/support/invariants) |
 | [`client-modules`](../packages/client/modules) | `client` | [`invariants`](../packages/support/invariants) |
 | [`client-runtime`](../packages/client/runtime) | `client` | [`invariants`](../packages/support/invariants) |
 | [`client-ui-primitives`](../packages/client/ui-primitives) | `client` | [`invariants`](../packages/support/invariants) |
 | [`client-ui-question`](../packages/client/ui-question) | `client` | [`invariants`](../packages/support/invariants) |
 | [`client-ui-slots`](../packages/client/ui-slots) | `client` | [`invariants`](../packages/support/invariants) |
-| [`client-ui-theme`](../packages/client/ui-theme) | `client` | [`invariants`](../packages/support/invariants) |
 | [`client-ui-trajectory`](../packages/client/ui-trajectory) | `client` | [`invariants`](../packages/support/invariants) |
 | [`client-web`](../packages/client/web) | `client` | [`invariants`](../packages/support/invariants) |
 | [`client-web-react`](../packages/client/web-react) | `client` | [`invariants`](../packages/support/invariants) |
@@ -831,11 +831,10 @@ flowchart TD
 | [`llm`](../packages/llm/llm) | `llm` | [`brand`](../packages/util/brand), [`invariants`](../packages/support/invariants) |
 | [`client-connection`](../packages/client/connection) | `client` | [`host-webserver`](../packages/host/webserver), [`invariants`](../packages/support/invariants) |
 | [`client-hmr`](../packages/client/hmr) | `client` | [`client-modules`](../packages/client/modules), [`host-webserver`](../packages/host/webserver), [`invariants`](../packages/support/invariants) |
+| [`client-locale`](../packages/client/locale) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
 | [`client-ui-conversation`](../packages/client/ui-conversation) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
-| [`client-ui-layout`](../packages/client/ui-layout) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-slots`](../packages/client/ui-slots), [`client-ui-theme`](../packages/client/ui-theme), [`invariants`](../packages/support/invariants) |
+| [`client-ui-models`](../packages/client/ui-models) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
 | [`client-ui-settings`](../packages/client/ui-settings) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
-| [`client-ui-settings-general`](../packages/client/ui-settings-general) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
-| [`client-ui-settings-models`](../packages/client/ui-settings-models) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
 | [`client-ui-sidebar`](../packages/client/ui-sidebar) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
 | [`client-ui-workspace`](../packages/client/ui-workspace) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
 | [`helper`](../packages/sdk/helper) | `sdk` | [`brand`](../packages/util/brand), [`invariants`](../packages/support/invariants) |
@@ -848,6 +847,7 @@ flowchart TD
 | [`session`](../packages/core/session) | `core` | [`brand`](../packages/util/brand), [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm), [`scope`](../packages/core/scope) |
 | [`system-prompt`](../packages/core/system-prompt) | `core` | [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm), [`scope`](../packages/core/scope) |
 | [`web`](../packages/web/web) | `web` | [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm) |
+| [`client-ui-theme`](../packages/client/ui-theme) | `client` | [`client-locale`](../packages/client/locale), [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
 | [`lsp`](../packages/lsp/lsp) | `lsp` | [`brand`](../packages/util/brand), [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm) |
 | [`sandbox`](../packages/sandbox/sandbox) | `sandbox` | [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm) |
 | [`token-meter`](../packages/llm/token-meter) | `llm` | [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm), [`session`](../packages/core/session) |
@@ -865,6 +865,7 @@ flowchart TD
 | [`session-title`](../packages/session-title/session-title) | `session-title` | [`brand`](../packages/util/brand), [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm), [`session`](../packages/core/session) |
 | [`llm-replay`](../packages/support/llm-replay) | `support` | [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm), [`session`](../packages/core/session) |
 | [`app-boot`](../packages/ui/app-boot) | `ui` | [`invariants`](../packages/support/invariants), [`paths`](../packages/util/paths), [`system-prompt`](../packages/core/system-prompt) |
+| [`client-ui-layout`](../packages/client/ui-layout) | `client` | [`client-runtime`](../packages/client/runtime), [`client-ui-slots`](../packages/client/ui-slots), [`client-ui-theme`](../packages/client/ui-theme), [`invariants`](../packages/support/invariants) |
 | [`code-runtime-worker`](../packages/code-runtime/code-runtime-worker) | `code-runtime` | [`code-runtime`](../packages/code-runtime/code-runtime), [`invariants`](../packages/support/invariants), [`session`](../packages/core/session) |
 | [`lsp-local`](../packages/lsp/lsp-local) | `lsp` | [`brand`](../packages/util/brand), [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm), [`lsp`](../packages/lsp/lsp), [`timeout`](../packages/util/timeout) |
 | [`sandbox-local`](../packages/sandbox/sandbox-local) | `sandbox` | [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm), [`sandbox`](../packages/sandbox/sandbox) |
diff --git a/packages/client/locale/tests/language-row.spec.tsx b/packages/client/locale/tests/language-row.spec.tsx
new file mode 100644
index 0000000000..af33038970
--- /dev/null
+++ b/packages/client/locale/tests/language-row.spec.tsx
@@ -0,0 +1,82 @@
+// @vitest-environment jsdom
+/** LanguageRow behavior: selector pill shows the active locale, the menu
+ * opens/closes, and selection drives setLocale. */
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { createSnapshotStore, type SessionListState, type WorkspaceListState } from '@deepseek-ai/dsh-client-runtime/client'
+import { bindSnapshotSelector } from '@deepseek-ai/dsh-client-web-react'
+import { LanguageRow } from '../src/client/LanguageRow.tsx'
+import type { LanguageRowComponentProps } from '../src/client/LanguageRow.tsx'
+import { createLanguageRowStore } from '../src/client/settings-store.ts'
+
+afterEach(cleanup)
+
+const OPTIONS = [{ id: 'zh', label: '中文' }, { id: 'en', label: 'English' }]
+
+/** Empty global standard-kit hooks (the row reads neither). */
+function emptySessions() {
+  const store = createSnapshotStore<SessionListState>(
+    { ids: [], byId: {}, current: undefined, intent: undefined, phase: 'ready' })
+  return bindSnapshotSelector(store)
+}
+function emptyWorkspaces() {
+  const store = createSnapshotStore<WorkspaceListState>({
+    items: [], intent: undefined, state: 'idle', phase: 'ready', error: null,
+    baselinesReady: true, recentWorkspaceId: undefined,
+  })
+  return bindSnapshotSelector(store)
+}
+
+function mount(active = 'en') {
+  // Real store instance — the sanctioned zero-machinery path for tests.
+  const store = createLanguageRowStore().create()
+  store.actions.sync(active, OPTIONS, 0)
+  const setLocale = vi.fn()
+  const props: LanguageRowComponentProps = {
+    useSessions: emptySessions(),
+    useWorkspaces: emptyWorkspaces(),
+    useStore: bindSnapshotSelector(store),
+    actions: store.actions,
+    t: (key: string) => key === 'language.title' ? 'Language' : key,
+    setLocale,
+  }
+  render(<LanguageRow {...props} />)
+  return { store, setLocale }
+}
+
+describe('LanguageRow', () => {
+  it('shows the title and the active locale label on the selector pill', () => {
+    mount('en')
+    expect(screen.getByText('Language')).toBeDefined()
+    const trigger = screen.getByRole('button', { name: /English/ })
+    expect(trigger.getAttribute('aria-expanded')).toBe('false')
+  })
+
+  it('opens the menu, selects a locale, and closes', () => {
+    const b = mount('en')
+    const trigger = screen.getByRole('button', { name: /English/ })
+    fireEvent.click(trigger)
+    expect(trigger.getAttribute('aria-expanded')).toBe('true')
+    fireEvent.click(screen.getByRole('menuitem', { name: '中文' }))
+    expect(b.setLocale).toHaveBeenCalledWith('zh')
+    expect(trigger.getAttribute('aria-expanded')).toBe('false')
+    expect(screen.queryByRole('menuitem', { name: '中文' })).toBeNull()
+  })
+
+  it('closes on outside pointerdown without selecting', () => {
+    const b = mount('en')
+    fireEvent.click(screen.getByRole('button', { name: /English/ }))
+    expect(screen.getByRole('menuitem', { name: '中文' })).toBeDefined()
+    fireEvent.pointerDown(document.body)
+    expect(screen.queryByRole('menuitem', { name: '中文' })).toBeNull()
+    expect(b.setLocale).not.toHaveBeenCalled()
+  })
+
+  it('follows store changes; an unknown active id falls back to the id itself', () => {
+    const b = mount('en')
+    act(() => { b.store.actions.sync('zh', OPTIONS, 1) })
+    expect(screen.getByRole('button', { name: /中文/ })).toBeDefined()
+    act(() => { b.store.actions.sync('fr', OPTIONS, 2) })
+    expect(screen.getByRole('button', { name: /fr/ })).toBeDefined()
+  })
+})
diff --git a/packages/client/locale/tests/settings-store.spec.ts b/packages/client/locale/tests/settings-store.spec.ts
new file mode 100644
index 0000000000..90e9487a96
--- /dev/null
+++ b/packages/client/locale/tests/settings-store.spec.ts
@@ -0,0 +1,30 @@
+/** Language row store: snapshot-mirror action and the revision guard. */
+import { describe, expect, it } from 'vitest'
+import { createLanguageRowStore } from '../src/client/settings-store.ts'
+
+const OPTIONS = [{ id: 'zh', label: '中文' }, { id: 'en', label: 'English' }]
+
+describe('createLanguageRowStore', () => {
+  it('init shape: empty mirror with revision at -1', () => {
+    const store = createLanguageRowStore().create()
+    expect(store.getSnapshot()).toEqual({ active: '', options: [], revision: -1 })
+  })
+
+  it('sync mirrors the snapshot and advances the revision', () => {
+    const store = createLanguageRowStore().create()
+    store.actions.sync('zh', OPTIONS, 0)
+    expect(store.getSnapshot()).toEqual({ active: 'zh', options: OPTIONS, revision: 0 })
+    store.actions.sync('en', OPTIONS, 1)
+    expect(store.getSnapshot().active).toBe('en')
+    expect(store.getSnapshot().revision).toBe(1)
+  })
+
+  it('revision guard drops stale and duplicate writes', () => {
+    const store = createLanguageRowStore().create()
+    store.actions.sync('en', OPTIONS, 5)
+    store.actions.sync('zh', OPTIONS, 4)
+    store.actions.sync('zh', OPTIONS, 5)
+    expect(store.getSnapshot().active).toBe('en')
+    expect(store.getSnapshot().revision).toBe(5)
+  })
+})
diff --git a/packages/client/ui-settings/tests/apply.spec.ts b/packages/client/ui-settings/tests/apply.spec.ts
index 95684404a1..2346012553 100644
--- a/packages/client/ui-settings/tests/apply.spec.ts
+++ b/packages/client/ui-settings/tests/apply.spec.ts
@@ -82,10 +82,12 @@ describe('ui-settings apply', () => {
     // empty once apply settles.
     expect(injected.sections()).toEqual([{ id: 'general', order: 0, label: '通用设置' }])
     b.slots.register({ name: 'settings.section', id: 'z', order: 20, label: 'Z' } as never, () => null)
-    b.slots.register({ name: 'settings.section', id: 'a', order: 5 } as never, () => null)
+    // No order and no label: both projection defaults apply (order 0 ties
+    // keep registration sequence, so 'a' lands after the General entry).
+    b.slots.register({ name: 'settings.section', id: 'a' } as never, () => null)
     expect(injected.sections()).toEqual([
       { id: 'general', order: 0, label: '通用设置' },
-      { id: 'a', order: 5, label: '' },
+      { id: 'a', order: 0, label: '' },
       { id: 'z', order: 20, label: 'Z' },
     ])
     expect(injected.sectionsVersion()).toBe(b.slots.getVersion('settings.section'))
diff --git a/packages/client/ui-settings/tests/general-section.spec.tsx b/packages/client/ui-settings/tests/general-section.spec.tsx
index a944dd8b15..ce09aabf93 100644
--- a/packages/client/ui-settings/tests/general-section.spec.tsx
+++ b/packages/client/ui-settings/tests/general-section.spec.tsx
@@ -11,7 +11,11 @@ function mount() {
   const renderSlot = vi.fn(
     ((key: string) => <div data-testid={`slot-${key}`} />) as GeneralSectionComponentProps['renderSlot'],
   )
+  // Global standard kit stubs: the section consumes neither hook.
+  const unusedHook = (() => { throw new Error('unused by GeneralSection') }) as never
   const props: GeneralSectionComponentProps = {
+    useSessions: unusedHook,
+    useWorkspaces: unusedHook,
     t: (key) => en[key] ?? key,
     renderSlot,
   }
diff --git a/packages/client/ui-theme/tests/appearance-row.spec.tsx b/packages/client/ui-theme/tests/appearance-row.spec.tsx
new file mode 100644
index 0000000000..4782b674a8
--- /dev/null
+++ b/packages/client/ui-theme/tests/appearance-row.spec.tsx
@@ -0,0 +1,75 @@
+// @vitest-environment jsdom
+/** AppearanceRow behavior: three cubes, selection follows the persisted
+ * preference, clicks drive setTheme. */
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { createSnapshotStore, type SessionListState, type WorkspaceListState } from '@deepseek-ai/dsh-client-runtime/client'
+import { bindSnapshotSelector } from '@deepseek-ai/dsh-client-web-react'
+import { AppearanceRow } from '../src/client/AppearanceRow.tsx'
+import type { AppearanceRowComponentProps } from '../src/client/AppearanceRow.tsx'
+import { createAppearanceRowStore } from '../src/client/settings-store.ts'
+import type { ThemePreference } from '../src/client/index.ts'
+
+afterEach(cleanup)
+
+const COPY: Record<string, string> = {
+  'appearance.title': 'Appearance',
+  'appearance.light': 'Light',
+  'appearance.dark': 'Dark',
+  'appearance.system': 'System',
+}
+
+/** Empty global standard-kit hooks (the row reads neither). */
+function emptySessions() {
+  const store = createSnapshotStore<SessionListState>(
+    { ids: [], byId: {}, current: undefined, intent: undefined, phase: 'ready' })
+  return bindSnapshotSelector(store)
+}
+function emptyWorkspaces() {
+  const store = createSnapshotStore<WorkspaceListState>({
+    items: [], intent: undefined, state: 'idle', phase: 'ready', error: null,
+    baselinesReady: true, recentWorkspaceId: undefined,
+  })
+  return bindSnapshotSelector(store)
+}
+
+function mount(preference: ThemePreference = 'system') {
+  // Real store instance — the sanctioned zero-machinery path for tests.
+  const store = createAppearanceRowStore().create()
+  store.actions.sync(preference, 0)
+  const setTheme = vi.fn()
+  const props: AppearanceRowComponentProps = {
+    useSessions: emptySessions(),
+    useWorkspaces: emptyWorkspaces(),
+    useStore: bindSnapshotSelector(store),
+    actions: store.actions,
+    t: (key: string) => COPY[key] ?? key,
+    setTheme,
+  }
+  render(<AppearanceRow {...props} />)
+  return { store, setTheme }
+}
+
+const pressed = (name: RegExp): string | null =>
+  screen.getByRole('button', { name }).getAttribute('aria-pressed')
+
+describe('AppearanceRow', () => {
+  it('renders the title and three cubes with the preference cube selected', () => {
+    mount('dark')
+    expect(screen.getByText('Appearance')).toBeDefined()
+    expect(pressed(/Dark/)).toBe('true')
+    expect(pressed(/Light/)).toBe('false')
+    expect(pressed(/System/)).toBe('false')
+  })
+
+  it('click drives setTheme; selection follows the store mirror, not the click echo', () => {
+    const b = mount('dark')
+    fireEvent.click(screen.getByRole('button', { name: /Light/ }))
+    expect(b.setTheme).toHaveBeenCalledWith('light')
+    // No store write yet: selection is unchanged.
+    expect(pressed(/Dark/)).toBe('true')
+    act(() => { b.store.actions.sync('light', 1) })
+    expect(pressed(/Light/)).toBe('true')
+    expect(pressed(/Dark/)).toBe('false')
+  })
+})
diff --git a/packages/client/ui-theme/tests/settings-store.spec.ts b/packages/client/ui-theme/tests/settings-store.spec.ts
new file mode 100644
index 0000000000..540d0f5b3b
--- /dev/null
+++ b/packages/client/ui-theme/tests/settings-store.spec.ts
@@ -0,0 +1,28 @@
+/** Appearance row store: snapshot-mirror action and the revision guard. */
+import { describe, expect, it } from 'vitest'
+import { createAppearanceRowStore } from '../src/client/settings-store.ts'
+
+describe('createAppearanceRowStore', () => {
+  it('init shape: system preference with revision at -1', () => {
+    const store = createAppearanceRowStore().create()
+    expect(store.getSnapshot()).toEqual({ preference: 'system', revision: -1 })
+  })
+
+  it('sync mirrors the preference and advances the revision', () => {
+    const store = createAppearanceRowStore().create()
+    store.actions.sync('dark', 0)
+    expect(store.getSnapshot()).toEqual({ preference: 'dark', revision: 0 })
+    store.actions.sync('light', 2)
+    expect(store.getSnapshot().preference).toBe('light')
+    expect(store.getSnapshot().revision).toBe(2)
+  })
+
+  it('revision guard drops stale and duplicate writes', () => {
+    const store = createAppearanceRowStore().create()
+    store.actions.sync('dark', 3)
+    store.actions.sync('system', 2)
+    store.actions.sync('system', 3)
+    expect(store.getSnapshot().preference).toBe('dark')
+    expect(store.getSnapshot().revision).toBe(3)
+  })
+})

From 0c9f310008160bf8db955b496afa0941e53d3c70 Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 02:57:54 +0800
Subject: [PATCH 08/15] test(gui): apply-level suites for the feature-owned
 settings rows

Locale and ui-theme apply coverage on a real Context + SlotCore:
dictionary assembly, declaration-aware registration both ways,
inject-time getter re-sync, service write-back through the event flow,
HMR collapse recovery, and teardown reclamation. Four settings-surface
packages sit at full per-file coverage.
---
 packages/client/locale/tests/apply.spec.ts   | 116 ++++++++++++++++++
 packages/client/ui-theme/tests/apply.spec.ts | 117 +++++++++++++++++++
 2 files changed, 233 insertions(+)
 create mode 100644 packages/client/locale/tests/apply.spec.ts
 create mode 100644 packages/client/ui-theme/tests/apply.spec.ts

diff --git a/packages/client/locale/tests/apply.spec.ts b/packages/client/locale/tests/apply.spec.ts
new file mode 100644
index 0000000000..25dbdfe239
--- /dev/null
+++ b/packages/client/locale/tests/apply.spec.ts
@@ -0,0 +1,116 @@
+/** locale apply wiring: service + dictionaries provision, declaration-aware
+ * Language row registration, snapshot projection into the row store, and
+ * recovery after an HMR collapse of the declaring entry. */
+import { Context } from 'cordis'
+import { describe, expect, it } from 'vitest'
+import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
+import { apply, inject, SETTINGS_NS } from '@deepseek-ai/dsh-client-locale/client'
+import type { LanguageRowInjected, LocaleService } from '@deepseek-ai/dsh-client-locale/client'
+import { LanguageRow } from '../src/client/LanguageRow.tsx'
+import type { createLanguageRowStore } from '../src/client/settings-store.ts'
+
+const SLOT = 'settings.general.item'
+
+async function bench() {
+  const ctx = new Context()
+  await ctx.plugin(SlotsService).await()
+  return { ctx, slots: ctx.get('slots') as SlotsService }
+}
+
+/** Stand in for the settings shell: declare the General item slot from root. */
+function declareItems(slots: SlotsService): () => void {
+  return slots.register(
+    { name: 'root', children: { [SLOT]: { kind: 'list', scope: 'root' } } } as never,
+    () => null,
+  )
+}
+
+/** Mirror the framework's inject choreography: bake a real instance from the
+ * declared handle and hand its actions to the entry's inject factory. */
+function faceOf(slots: SlotsService) {
+  const entry = slots.entries(SLOT).find(e => e.component === LanguageRow)!
+  const handle = entry.store as ReturnType<typeof createLanguageRowStore>
+  const instance = handle.create()
+  const face = (entry.inject as unknown as (a: typeof instance.actions) => LanguageRowInjected)(instance.actions)
+  return { entry, instance, face }
+}
+
+describe('locale apply', () => {
+  it('declares the slot service', () => {
+    expect(inject).toEqual(['slots'])
+  })
+
+  it('provides the service with base + settings dictionaries and registers the row (declaration before or after apply)', async () => {
+    const before = await bench()
+    declareItems(before.slots)
+    await before.ctx.plugin({ inject: [...inject], apply }).await()
+    const locale = before.ctx.get('locale') as LocaleService
+    // Base dictionaries are registered: the (ns, locale) seats are occupied.
+    expect(() => locale.register('common', 'zh', {})).toThrow('already has locale')
+    expect(() => locale.register('common', 'en', {})).toThrow('already has locale')
+    expect(locale.bind(SETTINGS_NS)('language.title')).toBe('语言')
+    const entry = before.slots.entries(SLOT).find(e => e.component === LanguageRow)!
+    expect(entry.options).toMatchObject({ id: 'language', order: 0 })
+
+    const after = await bench()
+    const fiber = after.ctx.plugin({ inject: [...inject], apply })
+    await fiber.await()
+    expect(after.slots.entries(SLOT)).toHaveLength(0)
+    declareItems(after.slots)
+    await Promise.resolve()
+    expect(after.slots.entries(SLOT).some(e => e.component === LanguageRow)).toBe(true)
+  })
+
+  it('projects service snapshots into the row store and routes face writes back', async () => {
+    const b = await bench()
+    declareItems(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    const locale = b.ctx.get('locale') as LocaleService
+    // An event ahead of any inject hits the unbound-actions arm.
+    locale.setLocale('en')
+
+    const { instance, face } = faceOf(b.slots)
+    // The inject-time re-sync sealed the init window: the mirror is current.
+    expect(instance.getSnapshot().active).toBe('en')
+    expect(instance.getSnapshot().options.map(o => o.id)).toEqual(['zh', 'en'])
+    expect(face.t('language.title')).toBe('Language')
+
+    face.setLocale('zh')
+    expect(locale.getLocale().active).toBe('zh')
+    expect(instance.getSnapshot().active).toBe('zh')
+    expect(face.t('language.title')).toBe('语言')
+  })
+
+  it('recovers after an HMR collapse of the declaring entry (stale disposer must not block)', async () => {
+    const b = await bench()
+    const host = declareItems(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    expect(b.slots.entries(SLOT)).toHaveLength(1)
+
+    // Collapse: the declarer dies, the cascade removes our entry while the
+    // apply closure still holds its (now stale) disposer.
+    host()
+    expect(b.slots.entries(SLOT)).toHaveLength(0)
+
+    declareItems(b.slots)
+    await Promise.resolve()
+    expect(b.slots.entries(SLOT).some(e => e.component === LanguageRow)).toBe(true)
+  })
+
+  it('teardown removes the row; teardown without a declaration is quiet', async () => {
+    const b = await bench()
+    declareItems(b.slots)
+    const fiber = b.ctx.plugin({ inject: [...inject], apply })
+    await fiber.await()
+    expect(b.slots.entries(SLOT)).toHaveLength(1)
+    await fiber.dispose()
+    expect(b.slots.entries(SLOT)).toHaveLength(0)
+
+    // Never-declared bench: the effect disposer's dispose arm stays undefined.
+    const quiet = await bench()
+    const f2 = quiet.ctx.plugin({ inject: [...inject], apply })
+    await f2.await()
+    await f2.dispose()
+    expect(quiet.slots.entries(SLOT)).toHaveLength(0)
+  })
+})
diff --git a/packages/client/ui-theme/tests/apply.spec.ts b/packages/client/ui-theme/tests/apply.spec.ts
new file mode 100644
index 0000000000..9852b93e66
--- /dev/null
+++ b/packages/client/ui-theme/tests/apply.spec.ts
@@ -0,0 +1,117 @@
+/** ui-theme apply wiring: service provision, settings dictionaries riding the
+ * locale service, declaration-aware Appearance row registration, snapshot
+ * projection into the row store, and HMR collapse recovery. */
+import { Context } from 'cordis'
+import { describe, expect, it } from 'vitest'
+import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
+import { LocaleService } from '@deepseek-ai/dsh-client-locale/client'
+import { apply, inject, SETTINGS_NS } from '@deepseek-ai/dsh-client-ui-theme/client'
+import type { AppearanceRowInjected, ThemeService } from '@deepseek-ai/dsh-client-ui-theme/client'
+import { AppearanceRow } from '../src/client/AppearanceRow.tsx'
+import type { createAppearanceRowStore } from '../src/client/settings-store.ts'
+
+const SLOT = 'settings.general.item'
+
+async function bench() {
+  const ctx = new Context()
+  await ctx.plugin(SlotsService).await()
+  const locale = new LocaleService(ctx)
+  ctx.provide('locale', locale)
+  return { ctx, slots: ctx.get('slots') as SlotsService, locale }
+}
+
+/** Stand in for the settings shell: declare the General item slot from root. */
+function declareItems(slots: SlotsService): () => void {
+  return slots.register(
+    { name: 'root', children: { [SLOT]: { kind: 'list', scope: 'root' } } } as never,
+    () => null,
+  )
+}
+
+/** Mirror the framework's inject choreography: bake a real instance from the
+ * declared handle and hand its actions to the entry's inject factory. */
+function faceOf(slots: SlotsService) {
+  const entry = slots.entries(SLOT).find(e => e.component === AppearanceRow)!
+  const handle = entry.store as ReturnType<typeof createAppearanceRowStore>
+  const instance = handle.create()
+  const face = (entry.inject as unknown as (a: typeof instance.actions) => AppearanceRowInjected)(instance.actions)
+  return { entry, instance, face }
+}
+
+describe('ui-theme apply', () => {
+  it('declares the slot and locale services', () => {
+    expect(inject).toEqual(['slots', 'locale'])
+  })
+
+  it('provides the service, registers localized copy, and registers the row (declaration before or after apply)', async () => {
+    const before = await bench()
+    declareItems(before.slots)
+    await before.ctx.plugin({ inject: [...inject], apply }).await()
+    expect(before.locale.bind(SETTINGS_NS)('appearance.title')).toBe('外观')
+    before.locale.setLocale('en')
+    expect(before.locale.bind(SETTINGS_NS)('appearance.title')).toBe('Appearance')
+    const entry = before.slots.entries(SLOT).find(e => e.component === AppearanceRow)!
+    expect(entry.options).toMatchObject({ id: 'appearance', order: 10 })
+
+    const after = await bench()
+    const fiber = after.ctx.plugin({ inject: [...inject], apply })
+    await fiber.await()
+    expect(after.slots.entries(SLOT)).toHaveLength(0)
+    declareItems(after.slots)
+    await Promise.resolve()
+    expect(after.slots.entries(SLOT).some(e => e.component === AppearanceRow)).toBe(true)
+  })
+
+  it('projects service snapshots into the row store and routes face writes back', async () => {
+    const b = await bench()
+    declareItems(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    const theme = b.ctx.get('theme') as ThemeService
+    // An event ahead of any inject hits the unbound-actions arm.
+    theme.setTheme('dark')
+
+    const { instance, face } = faceOf(b.slots)
+    // The inject-time re-sync sealed the init window: the mirror is current.
+    expect(instance.getSnapshot().preference).toBe('dark')
+    expect(face.t('appearance.dark')).toBe('深色')
+
+    face.setTheme('system')
+    expect(theme.getTheme().preference).toBe('system')
+    expect(instance.getSnapshot().preference).toBe('system')
+  })
+
+  it('recovers after an HMR collapse of the declaring entry (stale disposer must not block)', async () => {
+    const b = await bench()
+    const host = declareItems(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    expect(b.slots.entries(SLOT)).toHaveLength(1)
+
+    // Collapse: the declarer dies, the cascade removes our entry while the
+    // apply closure still holds its (now stale) disposer.
+    host()
+    expect(b.slots.entries(SLOT)).toHaveLength(0)
+
+    declareItems(b.slots)
+    await Promise.resolve()
+    expect(b.slots.entries(SLOT).some(e => e.component === AppearanceRow)).toBe(true)
+  })
+
+  it('teardown removes the row and the dictionaries; teardown without a declaration is quiet', async () => {
+    const b = await bench()
+    declareItems(b.slots)
+    const fiber = b.ctx.plugin({ inject: [...inject], apply })
+    await fiber.await()
+    expect(b.slots.entries(SLOT)).toHaveLength(1)
+    await fiber.dispose()
+    expect(b.slots.entries(SLOT)).toHaveLength(0)
+    // Dictionary disposal: translation falls back to the bare key.
+    expect(b.locale.bind(SETTINGS_NS)('appearance.title')).toBe('appearance.title')
+
+    // Never-declared bench: the effect disposer's dispose arm stays undefined.
+    const quiet = await bench()
+    const f2 = quiet.ctx.plugin({ inject: [...inject], apply })
+    await f2.await()
+    await f2.dispose()
+    expect(quiet.slots.entries(SLOT)).toHaveLength(0)
+  })
+})

From c5d323e8e599e63dc0c3eeff4f8c46209e9fc953 Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 03:22:35 +0800
Subject: [PATCH 09/15] fix(gui): follow-ups for the feature-owned settings
 surfaces

The ui-layout apply bench provides a real LocaleService before the
theme plugin boots (ui-theme now injects slots/locale to register its
Appearance row); drop locale's unused clsx dependency.
---
 packages/client/locale/package.json           | 3 ---
 packages/client/ui-layout/package.json        | 1 +
 packages/client/ui-layout/tests/apply.spec.ts | 4 ++++
 packages/client/ui-layout/tsconfig.json       | 3 +++
 pnpm-lock.yaml                                | 7 +++----
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/client/locale/package.json b/packages/client/locale/package.json
index d53d2e4269..4d75496dc8 100644
--- a/packages/client/locale/package.json
+++ b/packages/client/locale/package.json
@@ -58,8 +58,5 @@
   "scripts": {
     "bundle": "tsdown",
     "watch": "tsdown --watch"
-  },
-  "dependencies": {
-    "clsx": "^2.0.0"
   }
 }
diff --git a/packages/client/ui-layout/package.json b/packages/client/ui-layout/package.json
index 17459ee5d2..b816533474 100644
--- a/packages/client/ui-layout/package.json
+++ b/packages/client/ui-layout/package.json
@@ -43,6 +43,7 @@
     "react": "^18.2.0"
   },
   "devDependencies": {
+    "@deepseek-ai/dsh-client-locale": "workspace:^",
     "@deepseek-ai/dsh-client-runtime": "workspace:^",
     "@deepseek-ai/dsh-client-ui-slots": "workspace:^",
     "@deepseek-ai/dsh-client-ui-theme": "workspace:^",
diff --git a/packages/client/ui-layout/tests/apply.spec.ts b/packages/client/ui-layout/tests/apply.spec.ts
index 29ad4b3058..910b5a3132 100644
--- a/packages/client/ui-layout/tests/apply.spec.ts
+++ b/packages/client/ui-layout/tests/apply.spec.ts
@@ -9,6 +9,7 @@
 import { Context } from 'cordis'
 import { describe, expect, it, vi } from 'vitest'
 import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
+import { LocaleService } from '@deepseek-ai/dsh-client-locale/client'
 import { apply as themeApply, inject as themeInject, ThemeService } from '@deepseek-ai/dsh-client-ui-theme/client'
 import { apply, inject, LayoutService } from '@deepseek-ai/dsh-client-ui-layout/client'
 import { apply as nodeApply } from '@deepseek-ai/dsh-client-ui-layout'
@@ -17,6 +18,9 @@ import * as invariant from '@deepseek-ai/dsh-client-ui-layout/invariant'
 async function bench() {
   const ctx = new Context()
   const slotsFiber = ctx.plugin(SlotsService)
+  // Theme now injects ['slots', 'locale'] (it registers its Appearance
+  // settings row); seat a real locale service so the theme fiber activates.
+  ctx.provide('locale', new LocaleService(ctx))
   await ctx.plugin({ inject: themeInject, apply: themeApply }).await()
   await slotsFiber.await()
   return { ctx, slots: ctx.get('slots') as SlotsService }
diff --git a/packages/client/ui-layout/tsconfig.json b/packages/client/ui-layout/tsconfig.json
index 4401e8e4db..731eec8012 100644
--- a/packages/client/ui-layout/tsconfig.json
+++ b/packages/client/ui-layout/tsconfig.json
@@ -11,6 +11,9 @@
     {
       "path": "../../../vendor/cordis"
     },
+    {
+      "path": "../locale"
+    },
     {
       "path": "../ui-slots"
     },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 40fee92c16..612cea101f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -747,10 +747,6 @@ importers:
         version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@vendor+loader)
 
   packages/client/locale:
-    dependencies:
-      clsx:
-        specifier: ^2.0.0
-        version: 2.1.1
     devDependencies:
       '@deepseek-ai/dsh-client-runtime':
         specifier: workspace:^
@@ -859,6 +855,9 @@ importers:
 
   packages/client/ui-layout:
     devDependencies:
+      '@deepseek-ai/dsh-client-locale':
+        specifier: workspace:^
+        version: link:../locale
       '@deepseek-ai/dsh-client-runtime':
         specifier: workspace:^
         version: link:../runtime

From a04ce7afbb6dde19d5e2973794f183667f27c1c4 Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 04:15:56 +0800
Subject: [PATCH 10/15] refactor(client): shared declaration-aware registration
 deferral
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The five settings-surface registrants carried near-identical
spec-check/ledger-judge/subscribe scaffolding (three jscpd clones);
ui-slots now owns deferRegistration() — ledger-judged presence, refresh
for registrant-localized labels, one-call disposal — and every
registrant shrinks to its registration body.
---
 packages/client/locale/src/client/index.ts    | 23 ++-----
 packages/client/ui-models/src/client/index.ts | 32 +++------
 .../client/ui-settings/src/client/index.ts    | 46 ++++---------
 packages/client/ui-slots/src/deferred.ts      | 66 +++++++++++++++++++
 packages/client/ui-slots/src/index.ts         |  1 +
 packages/client/ui-theme/src/client/index.ts  | 23 ++-----
 6 files changed, 97 insertions(+), 94 deletions(-)
 create mode 100644 packages/client/ui-slots/src/deferred.ts

diff --git a/packages/client/locale/src/client/index.ts b/packages/client/locale/src/client/index.ts
index 444594f9b8..ea6f9d8da9 100644
--- a/packages/client/locale/src/client/index.ts
+++ b/packages/client/locale/src/client/index.ts
@@ -5,7 +5,7 @@
  * its own settings surface.
  */
 import type { Context } from 'cordis'
-import type { BoundActions } from '@deepseek-ai/dsh-client-ui-slots'
+import { deferRegistration, type BoundActions } from '@deepseek-ai/dsh-client-ui-slots'
 import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
 import { en } from '../locales/en.ts'
 import { zh } from '../locales/zh.ts'
@@ -233,28 +233,15 @@ export function apply(ctx: ClientContext): void {
       setLocale: (id) => { locale.setLocale(id) },
     }
   }
-  // Declaration-aware registration; the LEDGER is the has-registered judge
-  // (not a local flag): after an HMR collapse re-declares the slot, the
-  // cascade already removed our entry, and a stale disposer must not block
-  // the re-registration.
   ctx.effect(() => {
-    let dispose: (() => void) | undefined
-    const tryRegister = (): void => {
-      if (ctx.slots.spec('settings.general.item') === undefined) return
-      if (ctx.slots.entries('settings.general.item').some(e => e.component === LanguageRow)) return
-      dispose = ctx.slots.register({
+    const deferred = deferRegistration(ctx.slots, 'settings.general.item', LanguageRow, () =>
+      ctx.slots.register({
         name: 'settings.general.item',
         id: 'language',
         order: 0,
         store,
         inject: injected,
-      }, LanguageRow)
-    }
-    const unsubscribe = ctx.slots.subscribe('settings.general.item', () => { tryRegister() })
-    tryRegister()
-    return () => {
-      unsubscribe()
-      dispose?.()
-    }
+      }, LanguageRow))
+    return () => { deferred.dispose() }
   }, 'locale: language settings row registration')
 }
diff --git a/packages/client/ui-models/src/client/index.ts b/packages/client/ui-models/src/client/index.ts
index 4f080ec928..5abcb65bcf 100644
--- a/packages/client/ui-models/src/client/index.ts
+++ b/packages/client/ui-models/src/client/index.ts
@@ -5,6 +5,7 @@
  * discipline: packages/client/AGENTS.md.
  */
 import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
+import { deferRegistration } from '@deepseek-ai/dsh-client-ui-slots'
 // Type-only: pulls the shell's SlotMap merge (the 'settings.section' entry).
 import type {} from '@deepseek-ai/dsh-client-ui-settings/client'
 // Type-only: pulls the locale plugin's Context merge (ctx.locale).
@@ -31,37 +32,20 @@ export function apply(ctx: ClientContext): void {
     ]
     return () => { for (const dispose of disposers) dispose() }
   }, 'ui-models: nav copy dictionaries')
-  // Declaration-aware registration; the LEDGER is the has-registered judge
-  // (not a local flag): after an HMR collapse re-declares the slot, the
-  // cascade already removed our entry, and a stale disposer must not block
-  // the re-registration.
   ctx.effect(() => {
-    let dispose: (() => void) | undefined
-    const tryRegister = (): void => {
-      if (ctx.slots.spec('settings.section') === undefined) return
-      if (ctx.slots.entries('settings.section').some(e => e.component === ModelsSection)) return
-      dispose = ctx.slots.register({
+    const deferred = deferRegistration(ctx.slots, 'settings.section', ModelsSection, () =>
+      ctx.slots.register({
         name: 'settings.section',
         id: 'models',
         order: 10,
         label: ctx.locale.bind('settings.models')('nav'),
-      }, ModelsSection)
-    }
-    // Nav labels are registrant-localized: re-register on locale change so
-    // the ledger carries fresh text (the version bump re-renders the shell).
-    // Dispose-then-requery: after an HMR collapse the disposer is stale and
-    // the ledger/spec re-check keeps this path an idempotent no-op.
-    const offLocale = ctx.on('locale/change', () => {
-      dispose?.()
-      dispose = undefined
-      tryRegister()
-    })
-    const unsubscribe = ctx.slots.subscribe('settings.section', () => { tryRegister() })
-    tryRegister()
+      }, ModelsSection))
+    // Nav labels are registrant-localized: refresh on locale change so the
+    // ledger carries fresh text (the version bump re-renders the shell).
+    const offLocale = ctx.on('locale/change', () => { deferred.refresh() })
     return () => {
       offLocale()
-      unsubscribe()
-      dispose?.()
+      deferred.dispose()
     }
   }, 'ui-models: settings section registration')
 }
diff --git a/packages/client/ui-settings/src/client/index.ts b/packages/client/ui-settings/src/client/index.ts
index c360a84201..9d379c301e 100644
--- a/packages/client/ui-settings/src/client/index.ts
+++ b/packages/client/ui-settings/src/client/index.ts
@@ -7,6 +7,7 @@
  * preference rows into. Export discipline: packages/client/AGENTS.md.
  */
 import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
+import { deferRegistration } from '@deepseek-ai/dsh-client-ui-slots'
 // Type-only: pulls the locale plugin's Context/Events merges (ctx.locale,
 // 'locale/change') into this program.
 import type {} from '@deepseek-ai/dsh-client-locale/client'
@@ -60,60 +61,37 @@ export function apply(ctx: ClientContext): void {
       }))
       .sort((a, b) => a.order - b.order),
   })
-  // Declaration-aware registration; the LEDGER is the has-registered judge
-  // (not a local flag): after an HMR collapse re-declares the slot, the
-  // cascade already removed our entry, and a stale disposer must not block
-  // the re-registration.
   ctx.effect(() => {
-    let dispose: (() => void) | undefined
-    const tryRegister = (): void => {
-      if (ctx.slots.spec('sidebar.settings') === undefined) return
-      if (ctx.slots.entries('sidebar.settings').some(e => e.component === SettingsRoot)) return
-      dispose = ctx.slots.register({
+    const deferred = deferRegistration(ctx.slots, 'sidebar.settings', SettingsRoot, () =>
+      ctx.slots.register({
         name: 'sidebar.settings',
         children: { 'settings.section': { kind: 'list', scope: 'root' } },
         inject: injected,
-      }, SettingsRoot)
-    }
-    const unsubscribe = ctx.slots.subscribe('sidebar.settings', () => { tryRegister() })
-    tryRegister()
-    return () => {
-      unsubscribe()
-      dispose?.()
-    }
+      }, SettingsRoot))
+    return () => { deferred.dispose() }
   }, 'ui-settings: shell registration')
 
   // The shell's own General section: first page, declares the item slot the
   // feature plugins (locale, ui-theme, …) contribute preference rows into.
-  // Same ledger-judged deferral; label re-registers on locale change.
   const generalInjected = (): GeneralSectionInjected => ({
     t: ctx.locale.bind('settings'),
   })
   ctx.effect(() => {
-    let dispose: (() => void) | undefined
-    const tryRegister = (): void => {
-      if (ctx.slots.spec('settings.section') === undefined) return
-      if (ctx.slots.entries('settings.section').some(e => e.component === GeneralSection)) return
-      dispose = ctx.slots.register({
+    const deferred = deferRegistration(ctx.slots, 'settings.section', GeneralSection, () =>
+      ctx.slots.register({
         name: 'settings.section',
         id: 'general',
         order: 0,
         label: ctx.locale.bind('settings')('general.nav'),
         children: { 'settings.general.item': { kind: 'list', scope: 'root' } },
         inject: generalInjected,
-      }, GeneralSection)
-    }
-    const offLocale = ctx.on('locale/change', () => {
-      dispose?.()
-      dispose = undefined
-      tryRegister()
-    })
-    const unsubscribe = ctx.slots.subscribe('settings.section', () => { tryRegister() })
-    tryRegister()
+      }, GeneralSection))
+    // Nav labels are registrant-localized: refresh on locale change so the
+    // ledger carries fresh text (the version bump re-renders the shell).
+    const offLocale = ctx.on('locale/change', () => { deferred.refresh() })
     return () => {
       offLocale()
-      unsubscribe()
-      dispose?.()
+      deferred.dispose()
     }
   }, 'ui-settings: general section registration')
 }
diff --git a/packages/client/ui-slots/src/deferred.ts b/packages/client/ui-slots/src/deferred.ts
new file mode 100644
index 0000000000..af85c27f97
--- /dev/null
+++ b/packages/client/ui-slots/src/deferred.ts
@@ -0,0 +1,66 @@
+/**
+ * Declaration-aware registration deferral: the shared timing machinery for
+ * registering into a slot whose declaring entry activates in unconstrained
+ * order (dshClient.inject edges never sequence apply). Presence is judged on
+ * the LEDGER, not a local flag — after an HMR collapse re-declares the slot,
+ * the cascade has already removed the entry while the local disposer went
+ * stale, and a flag guard would block the re-registration.
+ */
+
+/** Minimal registry face the deferral reads (SlotsService satisfies it). */
+export interface DeferralRegistry {
+  /** Declared spec lookup (undefined = not declared yet). */
+  spec(name: string): unknown
+  /** Current entries of the slot (component identity is the presence judge). */
+  entries(name: string): readonly { component: unknown }[]
+  /** Subscribe to the slot's ledger changes; returns the unsubscriber. */
+  subscribe(name: string, listener: () => void): () => void
+}
+
+/** Handle over one deferred registration. */
+export interface DeferredRegistration {
+  /**
+   * Drop the current registration (stale disposers are harmless no-ops) and
+   * immediately re-attempt — the refresh path for registrants whose options
+   * carry localized text.
+   */
+  refresh(): void
+  /** Unsubscribe and unregister (idempotent through the slot core). */
+  dispose(): void
+}
+
+/**
+ * Register into `name` as soon as its declaration is on the ledger, and
+ * re-register whenever the declaration reappears after a collapse.
+ * @param registry - the slot registry face.
+ * @param name - target slot name.
+ * @param component - the component whose ledger presence marks "registered".
+ * @param register - performs the actual registration; returns its disposer.
+ * @returns the deferral handle (dispose in the owning effect's disposer).
+ */
+export function deferRegistration(
+  registry: DeferralRegistry,
+  name: string,
+  component: unknown,
+  register: () => () => void,
+): DeferredRegistration {
+  let dispose: (() => void) | undefined
+  const tryRegister = (): void => {
+    if (registry.spec(name) === undefined) return
+    if (registry.entries(name).some(e => e.component === component)) return
+    dispose = register()
+  }
+  const unsubscribe = registry.subscribe(name, () => { tryRegister() })
+  tryRegister()
+  return {
+    refresh() {
+      dispose?.()
+      dispose = undefined
+      tryRegister()
+    },
+    dispose() {
+      unsubscribe()
+      dispose?.()
+    },
+  }
+}
diff --git a/packages/client/ui-slots/src/index.ts b/packages/client/ui-slots/src/index.ts
index 677bc4e0df..e3bc57797d 100644
--- a/packages/client/ui-slots/src/index.ts
+++ b/packages/client/ui-slots/src/index.ts
@@ -18,6 +18,7 @@ import type { BoundActions, HandleOf, PropsStore, SnapshotSelectorHook, StoreDec
 
 export * from './store.ts'
 export * from './renderer.ts'
+export * from './deferred.ts'
 
 /** Slot contract table. Owners extend via declaration merging; entries are {@link SlotEntryDef}. */
 export interface SlotMap {}
diff --git a/packages/client/ui-theme/src/client/index.ts b/packages/client/ui-theme/src/client/index.ts
index ac79913062..dd11c98f06 100644
--- a/packages/client/ui-theme/src/client/index.ts
+++ b/packages/client/ui-theme/src/client/index.ts
@@ -7,7 +7,7 @@
  * section — the theme feature owns its own settings surface.
  */
 import type { Context } from 'cordis'
-import type { BoundActions } from '@deepseek-ai/dsh-client-ui-slots'
+import { deferRegistration, type BoundActions } from '@deepseek-ai/dsh-client-ui-slots'
 import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
 // Type-only: pulls the locale plugin's Context merge (ctx.locale).
 import type {} from '@deepseek-ai/dsh-client-locale/client'
@@ -262,28 +262,15 @@ export function apply(ctx: ClientContext): void {
       setTheme: (id) => { theme.setTheme(id) },
     }
   }
-  // Declaration-aware registration; the LEDGER is the has-registered judge
-  // (not a local flag): after an HMR collapse re-declares the slot, the
-  // cascade already removed our entry, and a stale disposer must not block
-  // the re-registration.
   ctx.effect(() => {
-    let dispose: (() => void) | undefined
-    const tryRegister = (): void => {
-      if (ctx.slots.spec('settings.general.item') === undefined) return
-      if (ctx.slots.entries('settings.general.item').some(e => e.component === AppearanceRow)) return
-      dispose = ctx.slots.register({
+    const deferred = deferRegistration(ctx.slots, 'settings.general.item', AppearanceRow, () =>
+      ctx.slots.register({
         name: 'settings.general.item',
         id: 'appearance',
         order: 10,
         store,
         inject: injected,
-      }, AppearanceRow)
-    }
-    const unsubscribe = ctx.slots.subscribe('settings.general.item', () => { tryRegister() })
-    tryRegister()
-    return () => {
-      unsubscribe()
-      dispose?.()
-    }
+      }, AppearanceRow))
+    return () => { deferred.dispose() }
   }, 'ui-theme: appearance settings row registration')
 }

From 15c0b6290b26006a162968267733cf0de6953d38 Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 11:18:46 +0800
Subject: [PATCH 11/15] docs(notes): state the rejected per-section split
 without implementation history

---
 .../2026-07-25-client-settings-locale-theme.i18n.yaml         | 4 ++--
 .../architecture/2026-07-25-client-settings-locale-theme.md   | 2 +-
 .../2026-07-25-client-settings-locale-theme.zh.md             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
index 39d7377c54..1e820bfc3a 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   pnpm run verify-translation-pairing --write
-2026-07-25-client-settings-locale-theme.md: 658e6bd3c2da39a98e476c60f10f3f51ad82e5ea
-2026-07-25-client-settings-locale-theme.zh.md: dfe93a0ca1f53380c653886c73fe0c32b08d8443
+2026-07-25-client-settings-locale-theme.md: 19a46c5444ea6c56c656b6a17cd024c5897d432c
+2026-07-25-client-settings-locale-theme.zh.md: d8e77ad3106780f6e39583e0bb02c2614fe67829
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
index 658e6bd3c2..19a46c5444 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
@@ -102,7 +102,7 @@ Locale ships with 中文 and English built in; `setLocale`/`setTheme` are the on
 
 **Settings importing and enumerating the sections.** Adding a page would require modifying the shell plugin, breaking the composition model where each feature occupies a slot from its own plugin.
 
-**One `ui-settings-*` package per section (the first-cut implementation).** It divorces the settings surface from the feature itself: changing Theme behavior touches two packages, the package count grows linearly with settings items, and settings-general depending back on the locale/theme services forms an intermediate layer that exists purely for the package split. After converging on feature-owner self-registration, General belongs to the shell (it belongs to no single feature) and preference rows ship with their feature packages.
+**One `ui-settings-*` package per section.** It divorces the settings surface from the feature itself: changing Theme behavior touches two packages, the package count grows linearly with settings items, and settings-general depending back on the locale/theme services forms an intermediate layer that exists purely for the package split. Under feature-owner self-registration that layer does not exist: General belongs to the shell (it belongs to no single feature) and preference rows ship with their feature packages.
 
 **Injecting the Locale/Theme snapshots into React directly.** Inject results are cached by entry identity, so volatile values go stale; hand-rolling a React hook per service also bypasses the slot store's unified binding.
 
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
index dfe93a0ca1..d8e77ad310 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
@@ -102,7 +102,7 @@ Locale 内置中文和 English；`setLocale`/`setTheme` 是唯一写入口，未
 
 **Settings import 并枚举各 section。** 新增页面必须修改壳插件，破坏「每个功能由自己的插件占坑」的组合模型。
 
-**每个 section 单开 `ui-settings-*` 包（首版实现）。** 设置面与功能本体分家：改 Theme 行为要动两个包，包数随设置项线性膨胀，且 settings-general 反向依赖 locale/theme 服务形成纯粹为拆包而生的中间层。收敛为功能属主自注册后，General 归壳（不属任何单一功能），preference 行随功能包交付。
+**每个 section 单开 `ui-settings-*` 包。** 设置面与功能本体分家：改 Theme 行为要动两个包，包数随设置项线性膨胀，且 settings-general 反向依赖 locale/theme 服务，形成纯粹为拆包而生的中间层。功能属主自注册下不存在这层：General 归壳（不属任何单一功能），preference 行随功能包交付。
 
 **把 Locale/Theme snapshot 直接注入 React。** inject 结果按 entry identity 缓存，易变值会陈旧；为每个 service 自造 React hook 也绕开 slot store 的统一绑定。
 

From 9a4be33899b942d50301ec655a4ba110be64d24f Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 12:09:38 +0800
Subject: [PATCH 12/15] docs(notes): record slot-declaration-as-service as
 future work

deferRegistration() stays the shipped form; the note pins the follow-up
direction (bridge declarations into slot:<name> services, migrate
registrants to nested ctx.inject, delete the helper) and the boundaries
a separate PR must settle.
---
 .../2026-07-25-client-settings-locale-theme.i18n.yaml       | 4 ++--
 .../architecture/2026-07-25-client-settings-locale-theme.md | 6 +++++-
 .../2026-07-25-client-settings-locale-theme.zh.md           | 6 +++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
index 1e820bfc3a..a6d124a3e0 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   pnpm run verify-translation-pairing --write
-2026-07-25-client-settings-locale-theme.md: 19a46c5444ea6c56c656b6a17cd024c5897d432c
-2026-07-25-client-settings-locale-theme.zh.md: d8e77ad3106780f6e39583e0bb02c2614fe67829
+2026-07-25-client-settings-locale-theme.md: 0cfa244f7e9856aede3d01a80404a794374e16be
+2026-07-25-client-settings-locale-theme.zh.md: 7caa79d5409b2a11078efb8e52273dc70f89f085
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
index 19a46c5444..0cfa244f7e 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
@@ -51,7 +51,11 @@ root
             └─ models (order 10)         ui-models 注册
 ```
 
-Section and item contributions both use declaration-aware deferral and do not depend on the client manifest's apply order. The `settings.general.item` SlotMap entry's canonical home is the ui-settings contract; locale/ui-theme, because of the reference cycle (the shell consumes ctx.locale), consume that entry as verbatim duplicated merges, with declaration merging guaranteeing the copies agree.
+Section and item contributions both use declaration-aware deferral (ui-slots' `deferRegistration()`: ledger-judged presence, `refresh()` for localized labels, one-call disposal) and do not depend on the client manifest's apply order. The `settings.general.item` SlotMap entry's canonical home is the ui-settings contract; locale/ui-theme, because of the reference cycle (the shell consumes ctx.locale), consume that entry as verbatim duplicated merges, with declaration merging guaranteeing the copies agree.
+
+### Future work: promote slot declarations to first-class injectable waits
+
+`deferRegistration()` is behaviorally isomorphic to `ctx.inject` — one waits on a ledger declaration, the other on service presence, with matching disappear/reappear lifecycle semantics; the difference is that the fiber form's disposer lifetime naturally equals the declaration's lifetime, so the stale-disposer presence-judging machinery disappears entirely. Direction (a separate PR): SlotsService bridges each slot into a `slot:<name>` service (value = the slot spec) at declaration commit / cascade removal, registrants migrate from `deferRegistration()` to a nested `ctx.inject(['slot:<name>'], cb)`, then `deferRegistration()` is deleted and packages/client/AGENTS.md checklist item 4 is rewritten. Boundaries to pin down: the nested fiber's harmless wait must not be named by the boot fail-loud scan (needs a test); the `slot:` namespace and the silent-wait-on-typo stance; provide keys are flat names (`slot:a.b` is one key, not a property path on `ctx.slots`). This phase keeps the `deferRegistration()` function form.
 
 ### Service contracts
 
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
index d8e77ad310..7caa79d540 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
@@ -51,7 +51,11 @@ root
             └─ models (order 10)         ui-models 注册
 ```
 
-section/item contribution 均使用 declaration-aware deferral，不依赖 client manifest 的 apply 顺序。`settings.general.item` 的 SlotMap 条目正家在 ui-settings contract；locale/ui-theme 因引用环（壳消费 ctx.locale）以逐字重复合并的方式消费该条目，declaration merging 保证副本一致。
+section/item contribution 均使用 declaration-aware deferral（ui-slots 的 `deferRegistration()`：ledger 判在位、`refresh()` 换本地化 label、一键 dispose），不依赖 client manifest 的 apply 顺序。`settings.general.item` 的 SlotMap 条目正家在 ui-settings contract；locale/ui-theme 因引用环（壳消费 ctx.locale）以逐字重复合并的方式消费该条目，declaration merging 保证副本一致。
+
+### Future work：坑位声明升格为可 inject 的一等等待物
+
+`deferRegistration()` 与 `ctx.inject` 行为同构——一个等 ledger 声明、一个等服务在场，消失/重现的生命周期语义一致；差别只在 fiber 版的 disposer 生命周期天然等于声明生命周期，stale-disposer 判在位机器可整体消失。方向（另开 PR）：SlotsService 在声明落账/级联拆除处把每个坑位桥接成 `slot:<name>` 服务（value 为坑位 spec），注册方从 `deferRegistration()` 迁为嵌套 `ctx.inject(['slot:<name>'], cb)`，随后删除 `deferRegistration()` 并改写 packages/client/AGENTS.md checklist 第 4 条。待钉死的边界：嵌套 fiber 的无害等待不被 boot fail-loud 扫描点名（需测试）；`slot:` 名字空间与 typo 静默等待的口径；provide 键是平面名（`slot:a.b` 是一个键，不是 `ctx.slots` 的属性路径）。本期维持 `deferRegistration()` 函数形式。
 
 ### Service contracts
 

From a04a223babfa8630493534f46fd9d9bd9c6fc0de Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 12:40:17 +0800
Subject: [PATCH 13/15] refactor(gui): copy-free settings shell;
 ui-settings-general owns ownerless copy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The shell is now a pure composition face: no dictionaries, no locale
dependency, and three new chrome content seats (settings.trigger /
settings.header / settings.close) whose slot content also carries the
accessible names (trigger text, dialog aria-labelledby, visually hidden
close label). ui-settings-general returns as the owner of copy that
belongs to no single feature: chrome content, the General section with
its item slot, and the settings dictionaries. Slot types split homes —
trigger/header/close/section live in the shell contract; the
settings.general.item entry moves to the locale package (the common
dependency of every item registrant), with ui-theme consuming it
through a re-export seam; the verbatim duplicate merges are gone and
the dependency graph is a clean DAG.
---
 ...-25-client-settings-locale-theme.i18n.yaml |   4 +-
 ...2026-07-25-client-settings-locale-theme.md |  18 ++-
 ...6-07-25-client-settings-locale-theme.zh.md |  18 ++-
 apps/cli/cordis.yml                           |   3 +
 apps/cli/package.json                         |   7 +-
 apps/cli/tsconfig.json                        |   3 +
 apps/web/tests/session-title.snapshot.ts      |   3 +-
 apps/web/tests/smoke-real.e2e.ts              |   2 +-
 apps/web/tests/workspace-flow.snapshot.ts     |   3 +-
 packages/client/locale/src/client/index.ts    |   1 +
 .../locale/src/client/settings-contract.ts    |  30 ++--
 packages/client/ui-settings-general/README.md |  15 ++
 .../client/ui-settings-general/package.json   |  67 ++++++++
 .../src/client/GeneralSection.module.css      |   0
 .../src/client/GeneralSection.tsx             |  22 ++-
 .../src/client/chrome.module.css              |   7 +
 .../ui-settings-general/src/client/chrome.tsx |  56 +++++++
 .../ui-settings-general/src/client/index.ts   |  87 ++++++++++
 .../src/client/locales.ts                     |   0
 .../ui-settings-general/src/css-modules.d.ts  |   6 +
 .../client/ui-settings-general/src/index.ts   |   4 +
 .../ui-settings-general/src/invariant.ts      |  32 ++++
 .../ui-settings-general/tests/apply.spec.ts   | 150 ++++++++++++++++++
 .../tests/components.spec.tsx}                |  53 +++++--
 .../tests/invariant.spec.ts                   |  18 +++
 .../client/ui-settings-general/tsconfig.json  |  33 ++++
 .../ui-settings-general/tsdown.config.ts      |   3 +
 packages/client/ui-settings/README.md         |   4 +-
 packages/client/ui-settings/package.json      |   4 +-
 .../src/client/SettingsRoot.module.css        |  10 ++
 .../ui-settings/src/client/SettingsRoot.tsx   |  43 +++--
 .../ui-settings/src/client/contract/slots.ts  |  97 +++++------
 .../client/ui-settings/src/client/index.ts    |  76 +++------
 .../client/ui-settings/tests/apply.spec.ts    | 144 ++++-------------
 .../ui-settings/tests/settings-root.spec.tsx  |  57 +++++--
 packages/client/ui-settings/tsconfig.json     |   3 -
 .../ui-theme/src/client/settings-contract.ts  |  22 +--
 pnpm-lock.yaml                                |  36 ++++-
 .../verify-package-readme-model-experience.ts |   1 +
 tsconfig.base.json                            |   1 +
 tsconfig.client.json                          |   1 +
 41 files changed, 808 insertions(+), 336 deletions(-)
 create mode 100644 packages/client/ui-settings-general/README.md
 create mode 100644 packages/client/ui-settings-general/package.json
 rename packages/client/{ui-settings => ui-settings-general}/src/client/GeneralSection.module.css (100%)
 rename packages/client/{ui-settings => ui-settings-general}/src/client/GeneralSection.tsx (66%)
 create mode 100644 packages/client/ui-settings-general/src/client/chrome.module.css
 create mode 100644 packages/client/ui-settings-general/src/client/chrome.tsx
 create mode 100644 packages/client/ui-settings-general/src/client/index.ts
 rename packages/client/{ui-settings => ui-settings-general}/src/client/locales.ts (100%)
 create mode 100644 packages/client/ui-settings-general/src/css-modules.d.ts
 create mode 100644 packages/client/ui-settings-general/src/index.ts
 create mode 100644 packages/client/ui-settings-general/src/invariant.ts
 create mode 100644 packages/client/ui-settings-general/tests/apply.spec.ts
 rename packages/client/{ui-settings/tests/general-section.spec.tsx => ui-settings-general/tests/components.spec.tsx} (51%)
 create mode 100644 packages/client/ui-settings-general/tests/invariant.spec.ts
 create mode 100644 packages/client/ui-settings-general/tsconfig.json
 create mode 100644 packages/client/ui-settings-general/tsdown.config.ts

diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
index a6d124a3e0..15d611d8ce 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   pnpm run verify-translation-pairing --write
-2026-07-25-client-settings-locale-theme.md: 0cfa244f7e9856aede3d01a80404a794374e16be
-2026-07-25-client-settings-locale-theme.zh.md: 7caa79d5409b2a11078efb8e52273dc70f89f085
+2026-07-25-client-settings-locale-theme.md: b6a127037c50066fe9aa501bb73005b9c56869fa
+2026-07-25-client-settings-locale-theme.zh.md: a871f06945fb420016df95b23167e72f59c3e5c5
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
index 0cfa244f7e..b6a127037c 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
@@ -10,9 +10,9 @@ The browser client's existing Settings is written directly inside the Sidebar, a
 
 ## Proposal
 
-**Collaboration doctrine (how every later module joins Settings): feature owners self-register.** The Settings shell provides only the composition surface (the top-level section list plus the item list inside General) and neither imports nor enumerates any feature; for a feature to appear in Settings, its own plugin registers into the corresponding slot — locale registers the Language row, ui-theme registers the Appearance row, ui-models registers the Models top-level panel. No separate `ui-settings-*` package is created for "a feature's settings page": the settings surface belongs to the feature package itself (shipping the Theme feature means Theme's settings choices ship with ui-theme). The only content the shell carries itself is the first top-level directory, General (skeleton rows plus the item slot declaration), because it belongs to no single feature.
+**Collaboration doctrine (how every later module joins Settings): feature owners self-register.** The Settings shell is a pure composition surface: it only declares slots and renders the chrome structure — zero copy, no locale dependency, and neither importing nor enumerating any feature; for a feature to appear in Settings, its own plugin registers into the corresponding slot — locale registers the Language row, ui-theme registers the Appearance row, ui-models registers the Models top-level panel. No separate `ui-settings-*` package is created for "a feature's settings page": the settings surface belongs to the feature package itself (shipping the Theme feature means Theme's settings choices ship with ui-theme). Content that belongs to no single feature (the trigger/title/close chrome copy, the General directory with its skeleton rows, the `settings` dictionary) is owned by `ui-settings-general` — the owner of the ownerless copy, not a feature satellite package.
 
-The Sidebar declares the `sidebar.settings` single slot; `ui-settings` occupies it and declares the `settings.section` list slot. Each section is contributed by a feature plugin; the Settings shell only reads entry metadata from the slot ledger to build the navigation, rendering the current section via `only`. General is registered by the shell itself (order 0) and declares the `settings.general.item` list slot, into which the feature plugins' preference rows slot by order.
+The Sidebar declares the `sidebar.settings` single slot; `ui-settings` occupies it and declares four slots: `settings.trigger` / `settings.header` / `settings.close` (chrome content seats, single) and `settings.section` (top-level pages, list). Accessible names all resolve from slot content: the trigger's accessible name is its text content, the dialog points at the header content node via aria-labelledby, and close is a visually hidden text seat. Each section is contributed by a feature plugin; the shell only reads entry metadata from the slot ledger to build the navigation, rendering the current section via `only`. General is registered by `ui-settings-general` (order 0) and declares the `settings.general.item` list slot, into which the feature plugins' preference rows slot by order.
 
 The Settings entry is the Settings row in the sidebar Foot; clicking it directly opens a 1080×700 centered overlay (black 24% mask); the close button, a mask click, and ESC all close it. There is no intermediate menu form of any kind.
 
@@ -28,13 +28,14 @@ The theme service never touches the DOM. `ui-layout` reads the Theme getter init
 
 | Registration surface | Owning plugin | First-phase content |
 |---|---|---|
-| General section (order 0) | built into the `ui-settings` shell | Permission and Tool Call visual skeletons (no write operations) plus the `settings.general.item` slot declaration |
+| chrome content (trigger/header/close) | `ui-settings-general` | Settings entry-row icon and copy, panel title, close hidden text |
+| General section (order 0) | `ui-settings-general` | Permission and Tool Call visual skeletons (no write operations) plus the `settings.general.item` slot declaration |
 | Language row (item order 0) | `locale` | Selector dropdown; 中文/English genuinely switch |
 | Appearance row (item order 10) | `ui-theme` | Light/Dark/System three cubes genuinely switch (the selected state reflects preference) |
 | Models section (order 10) | `ui-models` | Navigation item only, with an empty content area; later model-management features land in that package |
 | Plugin | none | Not built this phase, and the navigation does not show the item (once a later plugin feature package registers the section it appears automatically) |
 
-The first phase localizes only the copy inside the Settings overlay; dictionaries stay close to their owners — shell copy (the chrome plus the General skeletons) lives in the `settings` namespace, and feature-row copy lives in each feature package (`settings.locale`, `settings.theme`, `settings.models`).
+The first phase localizes only the copy inside the Settings overlay; dictionaries stay close to their owners — the chrome plus the General skeletons live in `ui-settings-general`'s `settings` namespace, and feature-row copy lives in each feature package (`settings.locale`, `settings.theme`, `settings.models`).
 
 ### Slot topology
 
@@ -42,16 +43,19 @@ The first phase localizes only the copy inside the Settings overlay; dictionarie
 root
 └─ sidebar
    └─ sidebar.settings                   single/root
-      └─ ui-settings（壳）
+      └─ ui-settings（壳，零文案）
+         ├─ settings.trigger             single/root  ui-settings-general 注册
+         ├─ settings.header              single/root  ui-settings-general 注册
+         ├─ settings.close               single/root  ui-settings-general 注册
          └─ settings.section             list/root
-            ├─ general (order 0)         ui-settings 壳自带
+            ├─ general (order 0)         ui-settings-general 注册
             │  └─ settings.general.item  list/root
             │     ├─ language (0)        locale 注册
             │     └─ appearance (10)     ui-theme 注册
             └─ models (order 10)         ui-models 注册
 ```
 
-Section and item contributions both use declaration-aware deferral (ui-slots' `deferRegistration()`: ledger-judged presence, `refresh()` for localized labels, one-call disposal) and do not depend on the client manifest's apply order. The `settings.general.item` SlotMap entry's canonical home is the ui-settings contract; locale/ui-theme, because of the reference cycle (the shell consumes ctx.locale), consume that entry as verbatim duplicated merges, with declaration merging guaranteeing the copies agree.
+Section and item contributions both use declaration-aware deferral (ui-slots' `deferRegistration()`: ledger-judged presence, `refresh()` for localized labels, one-call disposal) and do not depend on the client manifest's apply order. The SlotMap types split homes: trigger/header/close/section have their canonical home in the ui-settings contract (the consumers, general and models, both depend on the shell — no cycle); `settings.general.item`'s canonical home is the locale package — it is the lowest common dependency of all item registrants (a settings row always carries copy), while the declarer general's contract is unreachable from locale/ui-theme (it would form a cycle); ui-theme consumes it through a re-export seam.
 
 ### Future work: promote slot declarations to first-class injectable waits
 
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
index 7caa79d540..a871f06945 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
@@ -10,9 +10,9 @@ Status: proposed
 
 ## Proposal
 
-**协作导向（后续所有模块接入 Settings 的方式）：功能属主自注册。** Settings 壳只提供组合面（一级 section 列表 + General 内的 item 列表），不 import 也不枚举任何功能；一个功能要出现在 Settings 里，由它自己的插件向对应坑位注册——locale 注册 Language 行，ui-theme 注册 Appearance 行，ui-models 注册 Models 一级面板。不为「某功能的设置页」单开 `ui-settings-*` 包：设置面属于功能包本身（做 Theme 功能，Theme 的设置选择就随 ui-theme 一起交付）。壳自带的唯一内容是第一个一级目录 General（骨架行 + item 坑位声明），因为它不属于任何单一功能。
+**协作导向（后续所有模块接入 Settings 的方式）：功能属主自注册。** Settings 壳是纯组合面：只声明坑位、渲染 chrome 结构，零文案、不依赖 locale、不 import 也不枚举任何功能；一个功能要出现在 Settings 里，由它自己的插件向对应坑位注册——locale 注册 Language 行，ui-theme 注册 Appearance 行，ui-models 注册 Models 一级面板。不为「某功能的设置页」单开 `ui-settings-*` 包：设置面属于功能包本身（做 Theme 功能，Theme 的设置选择就随 ui-theme 一起交付）。不属于任何单一功能的内容（trigger/标题/close 的 chrome 文案、General 目录与骨架行、`settings` 字典）由 `ui-settings-general` 拥有——它是「无主文案」的属主，不是功能卫星包。
 
-Sidebar 声明 `sidebar.settings` 单坑位，`ui-settings` 占用它并声明 `settings.section` list 坑位。每个 section 由功能插件贡献；Settings 壳只从 slot ledger 读取 entry metadata 生成导航，通过 `only` 渲染当前 section。General 由壳自己注册（order 0）并声明 `settings.general.item` list 坑位，功能插件的偏好行按 order 排入。
+Sidebar 声明 `sidebar.settings` 单坑位，`ui-settings` 占用它并声明四个坑：`settings.trigger` / `settings.header` / `settings.close`（chrome 内容座，single）与 `settings.section`（一级页面，list）。无障碍名全部解析自坑内容：trigger 的可达名即其文本内容，dialog 经 aria-labelledby 指向 header 内容节点，close 是视觉隐藏文本座。每个 section 由功能插件贡献；壳只从 slot ledger 读取 entry metadata 生成导航，通过 `only` 渲染当前 section。General 由 `ui-settings-general` 注册（order 0）并声明 `settings.general.item` list 坑位，功能插件的偏好行按 order 排入。
 
 Settings 入口是 sidebar Foot 的 Settings 行，点击直接打开 1080×700 居中浮层（黑 24% 遮罩）；close 按钮、点击遮罩、ESC 均关闭。无任何中间菜单形态。
 
@@ -28,13 +28,14 @@ Theme service 不操作 DOM。`ui-layout` 初始读取 Theme getter，随后订
 
 | 注册面 | 属主插件 | 首期内容 |
 |---|---|---|
-| General section（order 0）| `ui-settings` 壳自带 | Permission、Tool Call 视觉骨架（无写操作）+ `settings.general.item` 坑位声明 |
+| chrome 内容（trigger/header/close）| `ui-settings-general` | 设置入口行图标+文案、面板标题、close 隐藏文本 |
+| General section（order 0）| `ui-settings-general` | Permission、Tool Call 视觉骨架（无写操作）+ `settings.general.item` 坑位声明 |
 | Language 行（item order 0）| `locale` | Selector 下拉，中文/English 真实可切 |
 | Appearance 行（item order 10）| `ui-theme` | Light/Dark/System 三 cube 真实可切（选中态看 preference） |
 | Models section（order 10）| `ui-models` | 仅导航项，内容区为空；后续模型管理功能落在该包 |
 | Plugin | 无 | 首期不做，导航不出现该项（后续插件功能包注册 section 即自动出现） |
 
-首期只翻译 Settings 浮层内文案；字典就近——壳文案（chrome + General 骨架）归 `settings` namespace，功能行文案归各功能包（`settings.locale`、`settings.theme`、`settings.models`）。
+首期只翻译 Settings 浮层内文案；字典就近——chrome + General 骨架归 `ui-settings-general` 的 `settings` namespace，功能行文案归各功能包（`settings.locale`、`settings.theme`、`settings.models`）。
 
 ### Slot topology
 
@@ -42,16 +43,19 @@ Theme service 不操作 DOM。`ui-layout` 初始读取 Theme getter，随后订
 root
 └─ sidebar
    └─ sidebar.settings                   single/root
-      └─ ui-settings（壳）
+      └─ ui-settings（壳，零文案）
+         ├─ settings.trigger             single/root  ui-settings-general 注册
+         ├─ settings.header              single/root  ui-settings-general 注册
+         ├─ settings.close               single/root  ui-settings-general 注册
          └─ settings.section             list/root
-            ├─ general (order 0)         ui-settings 壳自带
+            ├─ general (order 0)         ui-settings-general 注册
             │  └─ settings.general.item  list/root
             │     ├─ language (0)        locale 注册
             │     └─ appearance (10)     ui-theme 注册
             └─ models (order 10)         ui-models 注册
 ```
 
-section/item contribution 均使用 declaration-aware deferral（ui-slots 的 `deferRegistration()`：ledger 判在位、`refresh()` 换本地化 label、一键 dispose），不依赖 client manifest 的 apply 顺序。`settings.general.item` 的 SlotMap 条目正家在 ui-settings contract；locale/ui-theme 因引用环（壳消费 ctx.locale）以逐字重复合并的方式消费该条目，declaration merging 保证副本一致。
+section/item contribution 均使用 declaration-aware deferral（ui-slots 的 `deferRegistration()`：ledger 判在位、`refresh()` 换本地化 label、一键 dispose），不依赖 client manifest 的 apply 顺序。SlotMap 类型分家：trigger/header/close/section 正家在 ui-settings contract（消费者 general/models 均依赖壳，无环）；`settings.general.item` 正家在 locale 包——它是全部 item 注册方的最低公共依赖（设置行必带文案），而声明方 general 的 contract 对 locale/ui-theme 不可达（会成环）；ui-theme 经 re-export seam 消费。
 
 ### Future work：坑位声明升格为可 inject 的一等等待物
 
diff --git a/apps/cli/cordis.yml b/apps/cli/cordis.yml
index 39803aa603..a30d5735f8 100644
--- a/apps/cli/cordis.yml
+++ b/apps/cli/cordis.yml
@@ -233,6 +233,9 @@
 - id: ui-settings
   name: '@deepseek-ai/dsh-client-ui-settings'
 
+- id: ui-settings-general
+  name: '@deepseek-ai/dsh-client-ui-settings-general'
+
 - id: ui-models
   name: '@deepseek-ai/dsh-client-ui-models'
 
diff --git a/apps/cli/package.json b/apps/cli/package.json
index ddf8a08a87..810cc85bb9 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -28,10 +28,11 @@
     "@deepseek-ai/dsh-client-runtime": "workspace:^",
     "@deepseek-ai/dsh-client-ui-conversation": "workspace:^",
     "@deepseek-ai/dsh-client-ui-layout": "workspace:^",
-    "@deepseek-ai/dsh-client-ui-question": "workspace:^",
-    "@deepseek-ai/dsh-client-ui-sidebar": "workspace:^",
-    "@deepseek-ai/dsh-client-ui-settings": "workspace:^",
     "@deepseek-ai/dsh-client-ui-models": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-question": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-settings": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-settings-general": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-sidebar": "workspace:^",
     "@deepseek-ai/dsh-client-ui-theme": "workspace:^",
     "@deepseek-ai/dsh-client-ui-trajectory": "workspace:^",
     "@deepseek-ai/dsh-client-ui-workspace": "workspace:^",
diff --git a/apps/cli/tsconfig.json b/apps/cli/tsconfig.json
index 3000fd1f8d..05947889b2 100644
--- a/apps/cli/tsconfig.json
+++ b/apps/cli/tsconfig.json
@@ -44,6 +44,9 @@
     {
       "path": "../../packages/client/ui-settings"
     },
+    {
+      "path": "../../packages/client/ui-settings-general"
+    },
     {
       "path": "../../packages/client/ui-models"
     },
diff --git a/apps/web/tests/session-title.snapshot.ts b/apps/web/tests/session-title.snapshot.ts
index 35356fa0b3..4a11e54e2f 100644
--- a/apps/web/tests/session-title.snapshot.ts
+++ b/apps/web/tests/session-title.snapshot.ts
@@ -13,7 +13,8 @@ const PLUGINS: readonly (WebBootEntry & { dir: string })[] = [
   { id: '@deepseek-ai/dsh-client-locale', dir: 'locale', url: '/plugins/locale.js', rev: 'fx', inject: [], immediately: true },
   { id: '@deepseek-ai/dsh-client-ui-layout', dir: 'ui-layout', url: '/plugins/ui-layout.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-runtime'] },
   { id: '@deepseek-ai/dsh-client-ui-sidebar', dir: 'ui-sidebar', url: '/plugins/ui-sidebar.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] },
-  { id: '@deepseek-ai/dsh-client-ui-settings', dir: 'ui-settings', url: '/plugins/ui-settings.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-sidebar', '@deepseek-ai/dsh-client-locale'] },
+  { id: '@deepseek-ai/dsh-client-ui-settings', dir: 'ui-settings', url: '/plugins/ui-settings.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-sidebar'] },
+  { id: '@deepseek-ai/dsh-client-ui-settings-general', dir: 'ui-settings-general', url: '/plugins/ui-settings-general.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings', '@deepseek-ai/dsh-client-locale'] },
   { id: '@deepseek-ai/dsh-client-ui-models', dir: 'ui-models', url: '/plugins/ui-models.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings'] },
   { id: '@deepseek-ai/dsh-client-ui-conversation', dir: 'ui-conversation', url: '/plugins/ui-conversation.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] },
   { id: '@deepseek-ai/dsh-client-ui-workspace', dir: 'ui-workspace', url: '/plugins/ui-workspace.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-runtime', '@deepseek-ai/dsh-client-ui-conversation', '@deepseek-ai/dsh-client-ui-sidebar'] },
diff --git a/apps/web/tests/smoke-real.e2e.ts b/apps/web/tests/smoke-real.e2e.ts
index 70d1d81523..a268db107a 100644
--- a/apps/web/tests/smoke-real.e2e.ts
+++ b/apps/web/tests/smoke-real.e2e.ts
@@ -147,7 +147,7 @@ async function detailsTrack(page: Page): Promise<number> {
 // Readiness gate: `dsh web` serves ALL nine manifest plugins; until every UI
 // plugin's client bundle exists and exports apply, the loader fail-louds and
 // the frame never appears.
-const UI_PLUGIN_DIRS = ['connection', 'runtime', 'ui-theme', 'locale', 'ui-layout', 'ui-sidebar', 'ui-conversation', 'ui-question', 'ui-trajectory']
+const UI_PLUGIN_DIRS = ['connection', 'runtime', 'ui-theme', 'locale', 'ui-layout', 'ui-sidebar', 'ui-settings', 'ui-settings-general', 'ui-models', 'ui-conversation', 'ui-question', 'ui-trajectory']
 const ROUND_DONE_MARKER = 'WEB_ROUND_DONE'
 const notReady = UI_PLUGIN_DIRS.filter((dir) => {
   const bundle = join(REPO_ROOT, 'packages/client', dir, 'lib/client.js')
diff --git a/apps/web/tests/workspace-flow.snapshot.ts b/apps/web/tests/workspace-flow.snapshot.ts
index 738357a551..2130d27306 100644
--- a/apps/web/tests/workspace-flow.snapshot.ts
+++ b/apps/web/tests/workspace-flow.snapshot.ts
@@ -13,7 +13,8 @@ const PLUGINS: readonly (WebBootEntry & { dir: string })[] = [
   { id: '@deepseek-ai/dsh-client-locale', dir: 'locale', url: '/plugins/locale.js', rev: 'fx', inject: [], immediately: true },
   { id: '@deepseek-ai/dsh-client-ui-layout', dir: 'ui-layout', url: '/plugins/ui-layout.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-runtime'] },
   { id: '@deepseek-ai/dsh-client-ui-sidebar', dir: 'ui-sidebar', url: '/plugins/ui-sidebar.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] },
-  { id: '@deepseek-ai/dsh-client-ui-settings', dir: 'ui-settings', url: '/plugins/ui-settings.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-sidebar', '@deepseek-ai/dsh-client-locale'] },
+  { id: '@deepseek-ai/dsh-client-ui-settings', dir: 'ui-settings', url: '/plugins/ui-settings.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-sidebar'] },
+  { id: '@deepseek-ai/dsh-client-ui-settings-general', dir: 'ui-settings-general', url: '/plugins/ui-settings-general.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings', '@deepseek-ai/dsh-client-locale'] },
   { id: '@deepseek-ai/dsh-client-ui-models', dir: 'ui-models', url: '/plugins/ui-models.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-settings'] },
   { id: '@deepseek-ai/dsh-client-ui-conversation', dir: 'ui-conversation', url: '/plugins/ui-conversation.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] },
   {
diff --git a/packages/client/locale/src/client/index.ts b/packages/client/locale/src/client/index.ts
index ea6f9d8da9..cb6bb6f861 100644
--- a/packages/client/locale/src/client/index.ts
+++ b/packages/client/locale/src/client/index.ts
@@ -15,6 +15,7 @@ import { createLanguageRowStore } from './settings-store.ts'
 
 export type { LanguageRowComponentProps, LanguageRowInjected } from './LanguageRow.tsx'
 export type { LanguageOptionRow, LanguageRowState } from './settings-store.ts'
+export type { SettingsGeneralItemOwnerProps } from './settings-contract.ts'
 
 /** Translate a key with optional params. */
 export type Translate = (key: string, params?: Record<string, unknown>) => string
diff --git a/packages/client/locale/src/client/settings-contract.ts b/packages/client/locale/src/client/settings-contract.ts
index add314122c..e032707645 100644
--- a/packages/client/locale/src/client/settings-contract.ts
+++ b/packages/client/locale/src/client/settings-contract.ts
@@ -1,18 +1,26 @@
 /**
- * Settings-surface slot merge consumed by this package's Language row. The
- * AUTHORITATIVE home for 'settings.general.item' is the ui-settings contract
- * (declaring is claiming: the shell's General entry declares the slot); this
- * file repeats the entry verbatim because the shell consumes ctx.locale
- * (project reference ui-settings -> locale), so importing the shell's types
- * from here would close a reference cycle. TypeScript declaration merging
- * rejects diverging duplicates, so every program that sees both copies (the
- * shell's own build, the client aggregate) enforces identity.
+ * The `settings.general.item` slot type — one preference row inside the
+ * settings General section, contributed by the feature plugin that owns the
+ * preference (locale → Language, ui-theme → Appearance). Options: `id` (row
+ * key), `order` (row position). Rows draw their own internals (row layout,
+ * separators via CSS); the section column only stacks them.
+ *
+ * TYPE HOME RATIONALE: the slot is declared at runtime by
+ * ui-settings-general's General entry, but its type lives here — this
+ * package is the common dependency of every item registrant (any settings
+ * row carries copy, so every registrant already depends on locale), whereas
+ * the declarer's own contract is unreachable for locale/ui-theme without a
+ * reference cycle.
  */
 declare module '@deepseek-ai/dsh-client-ui-slots' {
   interface SlotMap {
-    /** One preference row inside the General section (duplicate-identical merge; authority: ui-settings contract). */
-    'settings.general.item': { kind: 'list'; scope: 'root'; owner: { children?: never } }
+    /** One preference row inside the settings General section (see module JSDoc). */
+    'settings.general.item': { kind: 'list'; scope: 'root'; owner: SettingsGeneralItemOwnerProps }
   }
 }
 
-export {}
+/** Owner share of a General preference row (the section supplies nothing). */
+export interface SettingsGeneralItemOwnerProps {
+  /** Marker field: item owner props are intentionally empty. */
+  children?: never
+}
diff --git a/packages/client/ui-settings-general/README.md b/packages/client/ui-settings-general/README.md
new file mode 100644
index 0000000000..0e0025279b
--- /dev/null
+++ b/packages/client/ui-settings-general/README.md
@@ -0,0 +1,15 @@
+# @deepseek-ai/dsh-client-ui-settings-general
+
+Settings ownerless-copy plugin: registers everything on the Settings surface that belongs to no single feature — the shell's trigger/header/close chrome content, the General section (Permission/Tool Call skeleton rows + the `settings.general.item` slot declaration), and the `settings` dictionaries. Feature-owned rows (Language, Appearance) and sections (Models) stay with their feature packages.
+
+## Model Experience
+
+None, as the plugin renders browser settings UI; nothing here reaches a model request.
+
+#### KV Cache effect
+
+None; this package neither assembles nor sends a provider request.
+
+## Known Limitations and Deferred Work
+
+- **Permission and Tool Call are display skeletons** — the backing host services and RPC methods do not exist yet; the controls are disabled and write nothing. When they gain real backing, each moves to its owning feature plugin per the self-registration doctrine.
diff --git a/packages/client/ui-settings-general/package.json b/packages/client/ui-settings-general/package.json
new file mode 100644
index 0000000000..798a7710f0
--- /dev/null
+++ b/packages/client/ui-settings-general/package.json
@@ -0,0 +1,67 @@
+{
+  "name": "@deepseek-ai/dsh-client-ui-settings-general",
+  "description": "Settings ownerless-copy plugin: the General section (skeleton rows + item slot), the shell trigger/header chrome content, and the settings dictionaries",
+  "version": "0.0.1",
+  "private": true,
+  "type": "module",
+  "main": "lib/index.js",
+  "types": "lib/types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/types/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./invariant": {
+      "types": "./lib/types/invariant.d.ts",
+      "default": "./lib/invariant.js"
+    },
+    "./client": {
+      "types": "./lib/types/client/index.d.ts",
+      "default": "./lib/client.js"
+    },
+    "./src/*": "./src/*",
+    "./package.json": "./package.json"
+  },
+  "dshClient": {
+    "inject": [
+      "@deepseek-ai/dsh-client-runtime",
+      "@deepseek-ai/dsh-client-ui-settings",
+      "@deepseek-ai/dsh-client-locale"
+    ],
+    "platform": "web"
+  },
+  "scripts": {
+    "bundle": "tsdown",
+    "watch": "tsdown --watch"
+  },
+  "license": "BSD-3-Clause",
+  "peerDependencies": {
+    "@deepseek-ai/dsh-client-locale": "^0.0.1",
+    "@deepseek-ai/dsh-client-runtime": "^0.0.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.0.1",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.0.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.0.1",
+    "@deepseek-ai/dsh-invariants": "^0.0.1",
+    "cordis": "^4.0.0-rc.7",
+    "react": "^18.2.0"
+  },
+  "devDependencies": {
+    "@deepseek-ai/dsh-client-locale": "workspace:^",
+    "@deepseek-ai/dsh-client-runtime": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-primitives": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-settings": "workspace:^",
+    "@deepseek-ai/dsh-client-ui-slots": "workspace:^",
+    "@deepseek-ai/dsh-invariants": "workspace:^",
+    "@types/react": "~18.3.1",
+    "cordis": "^4.0.0-rc.7",
+    "react": "^18.2.0"
+  },
+  "files": [
+    "lib/index.js",
+    "lib/invariant.js",
+    "lib/client.js",
+    "lib/types/**/*.d.ts",
+    "lib/types/**/*.d.ts.map",
+    "src"
+  ]
+}
diff --git a/packages/client/ui-settings/src/client/GeneralSection.module.css b/packages/client/ui-settings-general/src/client/GeneralSection.module.css
similarity index 100%
rename from packages/client/ui-settings/src/client/GeneralSection.module.css
rename to packages/client/ui-settings-general/src/client/GeneralSection.module.css
diff --git a/packages/client/ui-settings/src/client/GeneralSection.tsx b/packages/client/ui-settings-general/src/client/GeneralSection.tsx
similarity index 66%
rename from packages/client/ui-settings/src/client/GeneralSection.tsx
rename to packages/client/ui-settings-general/src/client/GeneralSection.tsx
index 31714a9238..8c75e76022 100644
--- a/packages/client/ui-settings/src/client/GeneralSection.tsx
+++ b/packages/client/ui-settings-general/src/client/GeneralSection.tsx
@@ -1,14 +1,24 @@
 /**
- * Shell-owned General section (figma 501:29983 'Options'): Permission and
- * Tool Call skeleton rows, then the feature-contributed preference rows from
- * the `settings.general.item` slot (locale → Language, ui-theme →
- * Appearance). The section column stacks rows; each row draws its own
- * internals and separator.
+ * The General section (figma 501:29983 'Options'): Permission and Tool Call
+ * skeleton rows, then the feature-contributed preference rows from the
+ * `settings.general.item` slot (locale → Language, ui-theme → Appearance).
+ * The section column stacks rows; each row draws its own internals and
+ * separator.
  */
 import { IconChevronDownOutline14 } from '@deepseek-ai/dsh-client-ui-primitives'
-import type { GeneralSectionComponentProps } from './contract/slots.ts'
+import type { PropsRenderSlots, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
 import css from './GeneralSection.module.css'
 
+/** Injected face of the General section: the settings-namespace translate. */
+export interface GeneralSectionInjected {
+  /** Translate a `settings` dictionary key to the active-locale text. */
+  t: (key: string) => string
+}
+
+/** Full component props: section owner share + item render share + inject face. */
+export type GeneralSectionComponentProps =
+  PropsRuntime<'settings.section'> & PropsRenderSlots<'settings.general.item'> & GeneralSectionInjected
+
 /**
  * Render the General section content column.
  * @param props - composed slot props (contract/slots.ts).
diff --git a/packages/client/ui-settings-general/src/client/chrome.module.css b/packages/client/ui-settings-general/src/client/chrome.module.css
new file mode 100644
index 0000000000..3291b3cd66
--- /dev/null
+++ b/packages/client/ui-settings-general/src/client/chrome.module.css
@@ -0,0 +1,7 @@
+/* Trigger row label (the shell's button provides layout/colors; the label
+ * only guards against overflow during the sidebar collapse crossfade). */
+
+.triggerLabel {
+  overflow: hidden;
+  white-space: nowrap;
+}
diff --git a/packages/client/ui-settings-general/src/client/chrome.tsx b/packages/client/ui-settings-general/src/client/chrome.tsx
new file mode 100644
index 0000000000..dc7ec94a29
--- /dev/null
+++ b/packages/client/ui-settings-general/src/client/chrome.tsx
@@ -0,0 +1,56 @@
+/**
+ * Shell chrome content registered into the shell's trigger/header seats: the
+ * trigger row icon + label (figma sidebar foot) and the panel title text.
+ * The shell renders the surrounding chrome (button, nav heading row) and
+ * reads each entry's `label` option for aria text.
+ */
+import { IconSettingsOutline14 } from '@deepseek-ai/dsh-client-ui-primitives'
+import type { PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
+import css from './chrome.module.css'
+
+/** Injected face of both chrome seats: the settings-namespace translate. */
+export interface ChromeInjected {
+  /** Translate a `settings` dictionary key to the active-locale text. */
+  t: (key: string) => string
+}
+
+/** Trigger content props: the sidebar column state + translate. */
+export type TriggerContentProps = PropsRuntime<'settings.trigger'> & ChromeInjected
+
+/** Header content props: translate only. */
+export type HeaderContentProps = PropsRuntime<'settings.header'> & ChromeInjected
+
+/**
+ * Render the trigger row content (icon; label only in the wide column).
+ * @param props - composed slot props.
+ * @returns the trigger content fragment.
+ */
+export function TriggerContent({ wide, t }: TriggerContentProps) {
+  return (
+    <>
+      <IconSettingsOutline14 size={wide ? 14 : 18} />
+      {wide && <span className={css.triggerLabel}>{t('trigger')}</span>}
+    </>
+  )
+}
+
+/**
+ * Render the panel title text.
+ * @param props - composed slot props.
+ * @returns the title text node.
+ */
+export function HeaderContent({ t }: HeaderContentProps) {
+  return <>{t('title')}</>
+}
+
+/** Close-button label text props: translate only. */
+export type CloseLabelProps = PropsRuntime<'settings.close'> & ChromeInjected
+
+/**
+ * Render the close button's visually-hidden label text.
+ * @param props - composed slot props.
+ * @returns the label text node.
+ */
+export function CloseLabel({ t }: CloseLabelProps) {
+  return <>{t('close')}</>
+}
diff --git a/packages/client/ui-settings-general/src/client/index.ts b/packages/client/ui-settings-general/src/client/index.ts
new file mode 100644
index 0000000000..afb37d8b92
--- /dev/null
+++ b/packages/client/ui-settings-general/src/client/index.ts
@@ -0,0 +1,87 @@
+/**
+ * Settings ownerless-copy plugin, browser half: registers everything on the
+ * Settings surface that belongs to no single feature — the trigger/header
+ * chrome content, the General section (skeleton rows + the
+ * `settings.general.item` slot declaration), and the `settings`
+ * dictionaries. Feature-owned rows and sections stay with their features.
+ * Export discipline: packages/client/AGENTS.md.
+ */
+import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
+import { deferRegistration } from '@deepseek-ai/dsh-client-ui-slots'
+// Type-only: pulls the shell's SlotMap merges (trigger/header/section/item).
+import type {} from '@deepseek-ai/dsh-client-ui-settings/client'
+import type { ChromeInjected } from './chrome.tsx'
+import { CloseLabel, HeaderContent, TriggerContent } from './chrome.tsx'
+import type { GeneralSectionInjected } from './GeneralSection.tsx'
+import { GeneralSection } from './GeneralSection.tsx'
+import { en, zh } from './locales.ts'
+
+export type {
+  ChromeInjected, CloseLabelProps, HeaderContentProps, TriggerContentProps,
+} from './chrome.tsx'
+export type {
+  GeneralSectionComponentProps, GeneralSectionInjected,
+} from './GeneralSection.tsx'
+
+/** Dictionary namespace owned by this plugin (shell chrome + General copy). */
+const NS = 'settings'
+
+/**
+ * Required services (cordis fiber inject). The target slots are declared by
+ * ui-settings' apply, whose activation order relative to this one is NOT
+ * constrained; registration goes through declaration-aware deferral.
+ */
+export const inject = ['slots', 'locale']
+
+/**
+ * Register the `settings` dictionaries, the chrome content, and the General
+ * section, each once its slot declaration is on the ledger.
+ * @param ctx - client root context.
+ */
+export function apply(ctx: ClientContext): void {
+  ctx.effect(() => {
+    const disposers = [
+      ctx.locale.register(NS, 'zh', zh),
+      ctx.locale.register(NS, 'en', en),
+    ]
+    return () => { for (const dispose of disposers) dispose() }
+  }, 'ui-settings-general: dictionaries')
+
+  const t = ctx.locale.bind(NS)
+  const chromeInjected = (): ChromeInjected => ({ t })
+  const generalInjected = (): GeneralSectionInjected => ({ t })
+
+  // All four seats refresh on locale change: re-registration bumps each
+  // slot's ledger version, which re-renders the outlets through their own
+  // subscriptions (outlet memoization would swallow a parent-only render).
+  ctx.effect(() => {
+    const trigger = deferRegistration(ctx.slots, 'settings.trigger', TriggerContent, () =>
+      ctx.slots.register({ name: 'settings.trigger', inject: chromeInjected }, TriggerContent))
+    const header = deferRegistration(ctx.slots, 'settings.header', HeaderContent, () =>
+      ctx.slots.register({ name: 'settings.header', inject: chromeInjected }, HeaderContent))
+    const close = deferRegistration(ctx.slots, 'settings.close', CloseLabel, () =>
+      ctx.slots.register({ name: 'settings.close', inject: chromeInjected }, CloseLabel))
+    const general = deferRegistration(ctx.slots, 'settings.section', GeneralSection, () =>
+      ctx.slots.register({
+        name: 'settings.section',
+        id: 'general',
+        order: 0,
+        label: t('general.nav'),
+        children: { 'settings.general.item': { kind: 'list', scope: 'root' } },
+        inject: generalInjected,
+      }, GeneralSection))
+    const offLocale = ctx.on('locale/change', () => {
+      trigger.refresh()
+      header.refresh()
+      close.refresh()
+      general.refresh()
+    })
+    return () => {
+      offLocale()
+      trigger.dispose()
+      header.dispose()
+      close.dispose()
+      general.dispose()
+    }
+  }, 'ui-settings-general: chrome and section registrations')
+}
diff --git a/packages/client/ui-settings/src/client/locales.ts b/packages/client/ui-settings-general/src/client/locales.ts
similarity index 100%
rename from packages/client/ui-settings/src/client/locales.ts
rename to packages/client/ui-settings-general/src/client/locales.ts
diff --git a/packages/client/ui-settings-general/src/css-modules.d.ts b/packages/client/ui-settings-general/src/css-modules.d.ts
new file mode 100644
index 0000000000..bc5e482353
--- /dev/null
+++ b/packages/client/ui-settings-general/src/css-modules.d.ts
@@ -0,0 +1,6 @@
+declare module '*.module.css' {
+  const classes: Record<string, string>
+  export default classes
+}
+
+declare module '*.css'
diff --git a/packages/client/ui-settings-general/src/index.ts b/packages/client/ui-settings-general/src/index.ts
new file mode 100644
index 0000000000..94b9bdf674
--- /dev/null
+++ b/packages/client/ui-settings-general/src/index.ts
@@ -0,0 +1,4 @@
+/** Host loader entry for the browser implementation exported from `./client`. */
+
+/** Host plugin body — no host-side behavior for the general settings plugin. */
+export function apply(): void {}
diff --git a/packages/client/ui-settings-general/src/invariant.ts b/packages/client/ui-settings-general/src/invariant.ts
new file mode 100644
index 0000000000..29f762834d
--- /dev/null
+++ b/packages/client/ui-settings-general/src/invariant.ts
@@ -0,0 +1,32 @@
+/**
+ * Package-owned invariant companion for `@deepseek-ai/dsh-client-ui-settings-general`.
+ * @module @deepseek-ai/dsh-client-ui-settings-general/invariant
+ */
+
+/* jscpd:ignore-start */
+import type { Context } from 'cordis'
+import type { InvariantInstaller } from '@deepseek-ai/dsh-invariants'
+
+const PACKAGE_NAME = '@deepseek-ai/dsh-client-ui-settings-general'
+
+/** Cordis companion plugin name. */
+export const name = 'client-ui-settings-general-invariant'
+/** Service required before the companion can reserve package ownership. */
+export const inject = ['invariants']
+
+/**
+ * No runtime invariant: a copy-owning registrant contributing chrome content
+ * and the General section into shell-declared slots — it emits no cordis
+ * events and owns no cross-plugin mutable relation; slot conflicts already
+ * fail loud in the slot core at load time.
+ */
+const install: InvariantInstaller = () => {}
+
+/**
+ * Register this package's invariant companion.
+ * @param ctx - Cordis context carrying the invariant service.
+ * @returns the installed registration's disposer after setup succeeds.
+ */
+export const apply = (ctx: Context): Promise<() => void> =>
+  Promise.resolve(ctx.invariants.register(PACKAGE_NAME, install))
+/* jscpd:ignore-end */
diff --git a/packages/client/ui-settings-general/tests/apply.spec.ts b/packages/client/ui-settings-general/tests/apply.spec.ts
new file mode 100644
index 0000000000..d01be576b7
--- /dev/null
+++ b/packages/client/ui-settings-general/tests/apply.spec.ts
@@ -0,0 +1,150 @@
+/** Ownerless-copy registrations: the four seats, the dictionaries, locale refresh, and HMR recovery. */
+import { Context } from 'cordis'
+import { describe, expect, it } from 'vitest'
+import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
+import { LocaleService } from '@deepseek-ai/dsh-client-locale/client'
+import { apply, inject } from '@deepseek-ai/dsh-client-ui-settings-general/client'
+import type { GeneralSectionInjected } from '@deepseek-ai/dsh-client-ui-settings-general/client'
+import { CloseLabel, HeaderContent, TriggerContent } from '../src/client/chrome.tsx'
+import { GeneralSection } from '../src/client/GeneralSection.tsx'
+
+/** The four seats this plugin fills (slot name → expected component). */
+const SEATS = [
+  ['settings.trigger', TriggerContent],
+  ['settings.header', HeaderContent],
+  ['settings.close', CloseLabel],
+  ['settings.section', GeneralSection],
+] as const
+
+async function bench() {
+  const ctx = new Context()
+  await ctx.plugin(SlotsService).await()
+  const locale = new LocaleService(ctx)
+  ctx.provide('locale', locale)
+  return { ctx, slots: ctx.get('slots') as SlotsService, locale }
+}
+
+/** Declare the shell's four child slots the way ui-settings' entry does. */
+function declare(slots: SlotsService): () => void {
+  return slots.register(
+    {
+      name: 'root',
+      children: {
+        'settings.trigger': { kind: 'single', scope: 'root' },
+        'settings.header': { kind: 'single', scope: 'root' },
+        'settings.close': { kind: 'single', scope: 'root' },
+        'settings.section': { kind: 'list', scope: 'root' },
+      },
+    } as never,
+    () => null,
+  )
+}
+
+function generalEntry(slots: SlotsService) {
+  return slots.entries('settings.section').find(e => e.component === GeneralSection)
+}
+
+describe('ui-settings-general apply', () => {
+  it('declares the services it uses', () => {
+    expect(inject).toEqual(['slots', 'locale'])
+  })
+
+  it('fills all four seats for declarations before or after apply', async () => {
+    const before = await bench()
+    declare(before.slots)
+    await before.ctx.plugin({ inject: [...inject], apply }).await()
+    for (const [name, component] of SEATS) {
+      expect(before.slots.entries(name)[0]!.component).toBe(component)
+    }
+    const entry = generalEntry(before.slots)!
+    expect(entry.options).toEqual({ id: 'general', order: 0, label: '通用设置' })
+    expect(before.slots.spec('settings.general.item')).toEqual({ kind: 'list', scope: 'root' })
+    const injected = (entry.inject as unknown as () => GeneralSectionInjected)()
+    expect(injected.t('permission.title')).toBe('权限')
+    // The chrome seats share one inject face: the settings-ns translate.
+    const chrome = (before.slots.entries('settings.trigger')[0]!.inject as unknown as () => GeneralSectionInjected)()
+    expect(chrome.t('trigger')).toBe('设置')
+
+    const after = await bench()
+    await after.ctx.plugin({ inject: [...inject], apply }).await()
+    for (const [name] of SEATS) expect(after.slots.entries(name)).toHaveLength(0)
+    declare(after.slots)
+    await Promise.resolve()
+    for (const [name, component] of SEATS) {
+      expect(after.slots.entries(name)[0]!.component).toBe(component)
+      // The self-inflicted ledger notifications hit the duplicate guard.
+      expect(after.slots.entries(name)).toHaveLength(1)
+    }
+  })
+
+  it('registers the zh/en settings dictionaries and frees the seats on teardown', async () => {
+    const b = await bench()
+    declare(b.slots)
+    const fiber = b.ctx.plugin({ inject: [...inject], apply })
+    await fiber.await()
+    expect(b.locale.bind('settings')('title')).toBe('设置')
+    b.locale.setLocale('en')
+    expect(b.locale.bind('settings')('close')).toBe('Close')
+    b.locale.setLocale('zh')
+    await fiber.dispose()
+    // The (ns, locale) seats are free again — the dictionary disposers ran.
+    expect(() => b.locale.register('settings', 'zh', {})).not.toThrow()
+    expect(() => b.locale.register('settings', 'en', {})).not.toThrow()
+  })
+
+  it('refreshes all four seats on locale change with fresh General label text', async () => {
+    const b = await bench()
+    declare(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    const zhVersions = SEATS.map(([name]) => b.slots.getVersion(name))
+    b.locale.setLocale('en')
+    // Every seat re-registered (version moved) and the label re-resolved.
+    SEATS.forEach(([name], i) => {
+      expect(b.slots.getVersion(name)).toBeGreaterThan(zhVersions[i]!)
+      expect(b.slots.entries(name)).toHaveLength(1)
+    })
+    expect(generalEntry(b.slots)!.options.label).toBe('General')
+    b.locale.setLocale('zh')
+    expect(generalEntry(b.slots)!.options.label).toBe('通用设置')
+  })
+
+  it('locale change while the slots are undeclared stays a no-op', async () => {
+    const b = await bench()
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    b.locale.setLocale('en')
+    for (const [name] of SEATS) expect(b.slots.entries(name)).toHaveLength(0)
+    b.locale.setLocale('zh')
+  })
+
+  it('re-registers after an HMR collapse of the declaring chain (stale disposers must not block)', async () => {
+    const b = await bench()
+    const redeclare = declare(b.slots)
+    await b.ctx.plugin({ inject: [...inject], apply }).await()
+    // Declarer unload: the cascade removes every seat entry and the item
+    // declaration while our local disposers go stale.
+    redeclare()
+    for (const [name] of SEATS) expect(b.slots.entries(name)).toHaveLength(0)
+    expect(b.slots.spec('settings.general.item')).toBeUndefined()
+    declare(b.slots)
+    await Promise.resolve()
+    for (const [name, component] of SEATS) {
+      expect(b.slots.entries(name)[0]!.component).toBe(component)
+    }
+    expect(b.slots.spec('settings.general.item')).toEqual({ kind: 'list', scope: 'root' })
+    // The recovered registrations still ride the locale path.
+    b.locale.setLocale('en')
+    expect(generalEntry(b.slots)!.options.label).toBe('General')
+    b.locale.setLocale('zh')
+  })
+
+  it('removes every seat and the item declaration on teardown', async () => {
+    const b = await bench()
+    declare(b.slots)
+    const fiber = b.ctx.plugin({ inject: [...inject], apply })
+    await fiber.await()
+    expect(b.slots.spec('settings.general.item')).toBeDefined()
+    await fiber.dispose()
+    for (const [name] of SEATS) expect(b.slots.entries(name)).toHaveLength(0)
+    expect(b.slots.spec('settings.general.item')).toBeUndefined()
+  })
+})
diff --git a/packages/client/ui-settings/tests/general-section.spec.tsx b/packages/client/ui-settings-general/tests/components.spec.tsx
similarity index 51%
rename from packages/client/ui-settings/tests/general-section.spec.tsx
rename to packages/client/ui-settings-general/tests/components.spec.tsx
index ce09aabf93..2a041c6cf4 100644
--- a/packages/client/ui-settings/tests/general-section.spec.tsx
+++ b/packages/client/ui-settings-general/tests/components.spec.tsx
@@ -1,29 +1,50 @@
 // @vitest-environment jsdom
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { cleanup, render, screen } from '@testing-library/react'
-import type { GeneralSectionComponentProps } from '../src/client/contract/slots.ts'
+import type { GeneralSectionComponentProps } from '../src/client/GeneralSection.tsx'
 import { GeneralSection } from '../src/client/GeneralSection.tsx'
+import { CloseLabel, HeaderContent, TriggerContent } from '../src/client/chrome.tsx'
 import { en } from '../src/client/locales.ts'
 
 afterEach(cleanup)
 
-function mount() {
-  const renderSlot = vi.fn(
-    ((key: string) => <div data-testid={`slot-${key}`} />) as GeneralSectionComponentProps['renderSlot'],
-  )
-  // Global standard kit stubs: the section consumes neither hook.
-  const unusedHook = (() => { throw new Error('unused by GeneralSection') }) as never
-  const props: GeneralSectionComponentProps = {
-    useSessions: unusedHook,
-    useWorkspaces: unusedHook,
-    t: (key) => en[key] ?? key,
-    renderSlot,
-  }
-  const view = render(<GeneralSection {...props} />)
-  return { view, renderSlot }
-}
+const t = (key: string) => en[key] ?? key
+
+// Global standard kit stubs: none of these components consume the hooks.
+const unusedHook = (() => { throw new Error('unused by settings-general components') }) as never
+const kit = { useSessions: unusedHook, useWorkspaces: unusedHook }
+
+describe('chrome content', () => {
+  it('TriggerContent renders the icon with the label in the wide column', () => {
+    const { container } = render(<TriggerContent {...kit} wide t={t} />)
+    expect(container.querySelector('svg')).toBeTruthy()
+    expect(screen.getByText('Settings')).toBeTruthy()
+  })
+
+  it('TriggerContent drops the label in the rail state', () => {
+    const { container } = render(<TriggerContent {...kit} wide={false} t={t} />)
+    expect(container.querySelector('svg')).toBeTruthy()
+    expect(screen.queryByText('Settings')).toBeNull()
+  })
+
+  it('HeaderContent and CloseLabel render their translated text', () => {
+    render(<HeaderContent {...kit} t={t} />)
+    render(<CloseLabel {...kit} t={t} />)
+    expect(screen.getByText('Settings')).toBeTruthy()
+    expect(screen.getByText('Close')).toBeTruthy()
+  })
+})
 
 describe('GeneralSection', () => {
+  function mount() {
+    const renderSlot = vi.fn(
+      ((key: string) => <div data-testid={`slot-${key}`} />) as GeneralSectionComponentProps['renderSlot'],
+    )
+    const props: GeneralSectionComponentProps = { ...kit, t, renderSlot }
+    const view = render(<GeneralSection {...props} />)
+    return { view, renderSlot }
+  }
+
   it('renders the Permission skeleton row with the disabled selector', () => {
     mount()
     expect(screen.getByText('Permission')).toBeTruthy()
diff --git a/packages/client/ui-settings-general/tests/invariant.spec.ts b/packages/client/ui-settings-general/tests/invariant.spec.ts
new file mode 100644
index 0000000000..7b0527c0ff
--- /dev/null
+++ b/packages/client/ui-settings-general/tests/invariant.spec.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest'
+import { Context } from 'cordis'
+import * as GeneralInvariant from '@deepseek-ai/dsh-client-ui-settings-general/invariant'
+import InvariantService from '@deepseek-ai/dsh-invariants'
+
+describe('invariant companion', () => {
+  it('registers under the package name with an empty installer', async () => {
+    const ctx = new Context()
+    await ctx.plugin(InvariantService, { enabled: true })
+    await expect(ctx.plugin(GeneralInvariant).await()).resolves.toBeDefined()
+  })
+
+  it('node-half apply is a no-op host placeholder', async () => {
+    const { apply } = await import('@deepseek-ai/dsh-client-ui-settings-general')
+    apply()
+    expect(true).toBe(true) // reaching here without throw is the contract
+  })
+})
diff --git a/packages/client/ui-settings-general/tsconfig.json b/packages/client/ui-settings-general/tsconfig.json
new file mode 100644
index 0000000000..5ef01ba51c
--- /dev/null
+++ b/packages/client/ui-settings-general/tsconfig.json
@@ -0,0 +1,33 @@
+{
+  "extends": "../../../tsconfig.base.client.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "lib/types"
+  },
+  "include": [
+    "src"
+  ],
+  "references": [
+    {
+      "path": "../../../vendor/cordis"
+    },
+    {
+      "path": "../ui-slots"
+    },
+    {
+      "path": "../ui-primitives"
+    },
+    {
+      "path": "../runtime"
+    },
+    {
+      "path": "../ui-settings"
+    },
+    {
+      "path": "../locale"
+    },
+    {
+      "path": "../../support/invariants"
+    }
+  ]
+}
diff --git a/packages/client/ui-settings-general/tsdown.config.ts b/packages/client/ui-settings-general/tsdown.config.ts
new file mode 100644
index 0000000000..bf67c4f10f
--- /dev/null
+++ b/packages/client/ui-settings-general/tsdown.config.ts
@@ -0,0 +1,3 @@
+import { clientBundle } from '../tsdown.client.ts'
+
+export default clientBundle('@deepseek-ai/dsh-client-ui-settings-general', ['lib/types/index.js', 'lib/types/invariant.js'])
diff --git a/packages/client/ui-settings/README.md b/packages/client/ui-settings/README.md
index 64250c7917..49a56a8f80 100644
--- a/packages/client/ui-settings/README.md
+++ b/packages/client/ui-settings/README.md
@@ -1,6 +1,6 @@
 # @deepseek-ai/dsh-client-ui-settings
 
-Settings shell plugin: the sidebar trigger row and the modal settings panel occupying `sidebar.settings`; declares the `settings.section` list slot that section plugins contribute pages into. The shell projects the section ledger into navigation and renders only the active section (`only` filtering).
+Settings shell plugin: a pure composition face. It occupies `sidebar.settings` with the trigger chrome and the modal settings panel, and declares the slots registrants fill: `settings.trigger` / `settings.header` / `settings.close` (chrome content) and `settings.section` (one page per feature). The shell ships no copy and reads no locale state — all text arrives from registrants (ui-settings-general owns chrome and General; features own their sections and rows), so the section ledger bump is its only re-render trigger.
 
 ## Model Experience
 
@@ -12,4 +12,4 @@ None; this package neither assembles nor sends a provider request.
 
 ## Known Limitations and Deferred Work
 
-- **Panel is browser-preference scope only** — host-side settings (permission mode, tool-call mode) render as skeletons in the General section; no RPC surface exists yet.
+- **Panel is browser-preference scope only** — host-side settings surfaces (permission mode, tool-call mode) have no RPC backing yet; their skeletons live in ui-settings-general.
diff --git a/packages/client/ui-settings/package.json b/packages/client/ui-settings/package.json
index 8f71d90c8b..efadf3190f 100644
--- a/packages/client/ui-settings/package.json
+++ b/packages/client/ui-settings/package.json
@@ -25,8 +25,7 @@
   "dshClient": {
     "inject": [
       "@deepseek-ai/dsh-client-runtime",
-      "@deepseek-ai/dsh-client-ui-sidebar",
-      "@deepseek-ai/dsh-client-locale"
+      "@deepseek-ai/dsh-client-ui-sidebar"
     ],
     "platform": "web"
   },
@@ -47,7 +46,6 @@
     "react": "^18.2.0"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-client-locale": "workspace:^",
     "@deepseek-ai/dsh-client-runtime": "workspace:^",
     "@deepseek-ai/dsh-client-ui-primitives": "workspace:^",
     "@deepseek-ai/dsh-client-ui-sidebar": "workspace:^",
diff --git a/packages/client/ui-settings/src/client/SettingsRoot.module.css b/packages/client/ui-settings/src/client/SettingsRoot.module.css
index bf557c0a04..e2b2c878df 100644
--- a/packages/client/ui-settings/src/client/SettingsRoot.module.css
+++ b/packages/client/ui-settings/src/client/SettingsRoot.module.css
@@ -190,3 +190,13 @@
   padding: 0 24px 8px;
   overflow-y: auto;
 }
+
+/* Visually-hidden text seat (close button accessible name from slot content). */
+.hiddenLabel {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
+  clip: rect(0 0 0 0);
+  white-space: nowrap;
+}
diff --git a/packages/client/ui-settings/src/client/SettingsRoot.tsx b/packages/client/ui-settings/src/client/SettingsRoot.tsx
index 3a27acdf6c..04fa39a03c 100644
--- a/packages/client/ui-settings/src/client/SettingsRoot.tsx
+++ b/packages/client/ui-settings/src/client/SettingsRoot.tsx
@@ -1,15 +1,15 @@
 /**
  * Settings shell root: the sidebar-foot trigger row plus the centered modal
- * panel (figma 501:29947, 1080x700) with the section nav rail. Modal open
- * state and the active section id are component-local viewing state; the
- * section ledger arrives through the injected face (nav labels are
- * registrant-localized — the shell owns no locale/theme subscription).
+ * panel (figma 501:29947, 1080x700) with the section nav rail. The shell is
+ * a pure composition face — every piece of text (trigger label, panel title,
+ * close label, sections) arrives from registrants through slots; accessible
+ * names resolve to that content (trigger: its own text; dialog:
+ * aria-labelledby the title node; close: visually-hidden slot text). Modal
+ * open state and the active section id are component-local viewing state.
  */
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useId, useRef, useState } from 'react'
 import clsx from 'clsx'
-import {
-  IconCloseOutline16, IconDataOutline16, IconSettingsOutline14, IconSettingsOutline16,
-} from '@deepseek-ai/dsh-client-ui-primitives'
+import { IconCloseOutline16, IconDataOutline16, IconSettingsOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
 import type { SettingsRootComponentProps } from './contract/slots.ts'
 import css from './SettingsRoot.module.css'
 
@@ -20,7 +20,6 @@ function navIcon(id: string) {
 }
 
 type PanelProps = {
-  translate: SettingsRootComponentProps['translate']
   rows: ReturnType<SettingsRootComponentProps['sections']>
   renderSlot: SettingsRootComponentProps['renderSlot']
   onClose: () => void
@@ -31,11 +30,12 @@ type PanelProps = {
  * header button, a mask click, and document-level Escape (mounted only while
  * open, so the listener lifetime is the panel's).
  */
-function SettingsPanel({ translate, rows, renderSlot, onClose }: PanelProps) {
+function SettingsPanel({ rows, renderSlot, onClose }: PanelProps) {
   // Local selection; entries can unmount underneath it, so the render-time
   // projection falls back to the first row when the id is gone.
   const [activeId, setActiveId] = useState<string | undefined>(undefined)
   const active = rows.find((r) => r.id === activeId)?.id ?? rows[0]?.id
+  const titleId = useId()
 
   useEffect(() => {
     const onKeyDown = (e: KeyboardEvent) => {
@@ -52,9 +52,9 @@ function SettingsPanel({ translate, rows, renderSlot, onClose }: PanelProps) {
   return (
     <div className={css.overlay} role="presentation">
       <div className={css.mask} aria-hidden="true" onClick={onClose} />
-      <div className={css.panel} role="dialog" aria-modal="true" aria-label={translate('settings:title')}>
-        <nav className={css.nav} aria-label={translate('settings:title')}>
-          <div className={css.navTitle}>{translate('settings:title')}</div>
+      <div className={css.panel} role="dialog" aria-modal="true" aria-labelledby={titleId}>
+        <nav className={css.nav}>
+          <div className={css.navTitle} id={titleId}>{renderSlot('settings.header', {})}</div>
           <div className={css.navList}>
             {rows.map((row) => (
               <button
@@ -72,8 +72,9 @@ function SettingsPanel({ translate, rows, renderSlot, onClose }: PanelProps) {
         </nav>
         <div className={css.content}>
           <div className={css.header}>
-            <button ref={closeButton} type="button" className={css.close} aria-label={translate('settings:close')} onClick={onClose}>
+            <button ref={closeButton} type="button" className={css.close} onClick={onClose}>
               <IconCloseOutline16 size={14} />
+              <span className={css.hiddenLabel}>{renderSlot('settings.close', {})}</span>
             </button>
           </div>
           <div className={css.options}>
@@ -91,13 +92,13 @@ function SettingsPanel({ translate, rows, renderSlot, onClose }: PanelProps) {
  * @returns the settings shell element tree.
  */
 export function SettingsRoot(props: SettingsRootComponentProps) {
-  const { wide, translate, subscribeSections, sectionsVersion, sections, renderSlot } = props
+  const { wide, subscribeSections, sectionsVersion, sections, renderSlot } = props
   const [open, setOpen] = useState(false)
   const close = useCallback(() => { setOpen(false) }, [])
 
-  // The ledger tick is the shell's only subscription: sections re-register
-  // with freshly localized labels on locale change, so the version bump also
-  // re-renders the shell's own translate()-read chrome copy.
+  // The ledger tick keeps the nav rows fresh: registrants re-register with
+  // freshly localized text on locale change, and the trigger/header/close
+  // seats re-render through their own outlets' subscriptions.
   // State = ledger version: same-version notifications dedupe to no render.
   const [, setSectionsRev] = useState(() => sectionsVersion())
   useEffect(
@@ -111,15 +112,13 @@ export function SettingsRoot(props: SettingsRootComponentProps) {
       <button
         type="button"
         className={clsx(css.trigger, !wide && css.rail)}
-        aria-label={translate('settings:trigger')}
         aria-haspopup="dialog"
         aria-expanded={open}
         onClick={() => { setOpen(true) }}
       >
-        <IconSettingsOutline14 size={wide ? 14 : 18} />
-        {wide && <span className={css.triggerLabel}>{translate('settings:trigger')}</span>}
+        {renderSlot('settings.trigger', { wide })}
       </button>
-      {open && <SettingsPanel translate={translate} rows={rows} renderSlot={renderSlot} onClose={close} />}
+      {open && <SettingsPanel rows={rows} renderSlot={renderSlot} onClose={close} />}
     </>
   )
 }
diff --git a/packages/client/ui-settings/src/client/contract/slots.ts b/packages/client/ui-settings/src/client/contract/slots.ts
index 87db2f8999..1a263108bc 100644
--- a/packages/client/ui-settings/src/client/contract/slots.ts
+++ b/packages/client/ui-settings/src/client/contract/slots.ts
@@ -1,11 +1,11 @@
 /**
- * Settings shell slot contract. The shell occupies the sidebar-owned
- * `sidebar.settings` hole, declares the `settings.section` list slot that
- * feature plugins contribute top-level pages into, and ships the first
- * section itself: General, whose `settings.general.item` list slot receives
- * preference rows from the features that own them (locale → Language,
- * ui-theme → Appearance). A feature owns its settings surface — adding a
- * setting never means editing the shell.
+ * Settings shell slot contract — the canonical home of every settings slot
+ * type. The shell is a pure composition face with zero copy of its own: it
+ * occupies the sidebar-owned `sidebar.settings` hole and declares the slots
+ * below; ALL text (trigger label, panel title, close aria, section content)
+ * arrives from registrants. A feature owns its settings surface — adding a
+ * setting never means editing the shell; copy that belongs to no single
+ * feature (chrome, the General section) is owned by ui-settings-general.
  */
 import type { PropsRenderSlots, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
 // Type-only: pulls ui-sidebar's SlotMap merge (the 'sidebar.settings' entry)
@@ -14,28 +14,54 @@ import type {} from '@deepseek-ai/dsh-client-ui-sidebar/client'
 
 declare module '@deepseek-ai/dsh-client-ui-slots' {
   interface SlotMap {
+    /**
+     * The sidebar-foot trigger row content: icon + label, supplied as slot
+     * content (the accessible name comes from the content — rail state
+     * renders the label visually hidden). The shell renders the button
+     * chrome and owns open state. Absent contribution degrades to an
+     * icon-only button without an accessible name (broken-composition state;
+     * the shipped composition always registers the seat).
+     */
+    'settings.trigger': { kind: 'single'; scope: 'root'; owner: SettingsTriggerOwnerProps }
+    /**
+     * The panel title text seat. Content renders inside the nav heading row;
+     * the dialog's accessible name points at that node via aria-labelledby.
+     * Absent contribution leaves the heading empty.
+     */
+    'settings.header': { kind: 'single'; scope: 'root'; owner: SettingsHeaderOwnerProps }
+    /**
+     * The close button's visually-hidden label text (the button itself —
+     * icon, geometry, focus — is shell chrome). Absent contribution leaves
+     * the button without an accessible name (broken-composition state).
+     */
+    'settings.close': { kind: 'single'; scope: 'root'; owner: SettingsHeaderOwnerProps }
     /**
      * One settings page per list entry. Registrant options carry the nav
      * identity: `id` (section key, drives `only` filtering), `order` (nav
      * position), `label` (registrant-localized display text — the registrant
      * re-registers with fresh text on locale change, so the shell never
-     * subscribes locale/theme state; the ledger bump doubles as the shell's
+     * subscribes locale state; the ledger bump doubles as the shell's
      * re-render trigger). Sections render inside the panel content column.
+     * (`settings.general.item`, declared by ui-settings-general's General
+     * entry, is typed in the locale package — the common dependency of every
+     * item registrant; the shell neither declares nor renders it.)
      */
     'settings.section': { kind: 'list'; scope: 'root'; owner: SettingsSectionOwnerProps }
-    /**
-     * One preference row inside the General section, contributed by the
-     * feature plugin that owns the preference (locale → Language, ui-theme →
-     * Appearance). Options: `id` (row key), `order` (row position). Rows
-     * draw their own internals (row layout, separators via CSS); the section
-     * column only stacks them. NOTE: packages/client/locale and ui-theme
-     * repeat this entry verbatim (reference-cycle avoidance) — declaration
-     * merging enforces the copies stay identical; edit all three together.
-     */
-    'settings.general.item': { kind: 'list'; scope: 'root'; owner: { children?: never } }
   }
 }
 
+/** Owner share of the trigger content seat: the sidebar column state. */
+export interface SettingsTriggerOwnerProps {
+  /** Whether the sidebar renders wide content (false = 56px rail, icon only). */
+  wide: boolean
+}
+
+/** Owner share of the header title seat (the shell supplies nothing). */
+export interface SettingsHeaderOwnerProps {
+  /** Marker field: header owner props are intentionally empty. */
+  children?: never
+}
+
 /**
  * Owner share of a settings section entry. The shell owns modal visibility
  * and navigation; sections receive nothing but the render site (their data
@@ -48,16 +74,9 @@ export interface SettingsSectionOwnerProps {
 
 /**
  * Registrant-private injected share of the settings shell (assembled in
- * apply): locale-resolved nav labels come through `translate`.
+ * apply): ledger projections only — the shell reads no locale state.
  */
 export type SettingsRootInjected = {
-  /**
-   * Resolve a "<ns>:<key>" locale reference to the active-locale text —
-   * shell chrome copy only (trigger/title/close); nav labels arrive already
-   * localized. Read at render time; the locale-change re-render rides the
-   * section ledger bump, not a shell-owned subscription.
-   */
-  translate: (ref: string) => string
   /** Read the settings.section ledger version (nav invalidation). */
   sectionsVersion: () => number
   /** Subscribe to settings.section ledger changes. */
@@ -68,27 +87,11 @@ export type SettingsRootInjected = {
 
 /**
  * Full component props of the settings shell root: the sidebar owner share
- * (wide/rail state) plus the declared section render share and the injected
- * face. No store is registered — modal open state and active section id are
+ * (wide/rail state) plus the declared render shares and the injected face.
+ * No store is registered — modal open state and active section id are
  * component-local viewing state.
  */
 export type SettingsRootComponentProps =
-  PropsRuntime<'sidebar.settings'> & PropsRenderSlots<'settings.section'> & SettingsRootInjected
-
-/**
- * Injected share of the shell-owned General section: the shell's own
- * `settings` namespace translate function for the skeleton rows (Permission,
- * Tool Call). Live preference rows arrive through the item slot with their
- * own faces.
- */
-export type GeneralSectionInjected = {
-  /** Translate a `settings` dictionary key to the active-locale text. */
-  t: (key: string) => string
-}
-
-/**
- * Full component props of the shell-owned General section: the section owner
- * share, the declared item render share, and the injected face.
- */
-export type GeneralSectionComponentProps =
-  PropsRuntime<'settings.section'> & PropsRenderSlots<'settings.general.item'> & GeneralSectionInjected
+  PropsRuntime<'sidebar.settings'>
+  & PropsRenderSlots<'settings.trigger' | 'settings.header' | 'settings.close' | 'settings.section'>
+  & SettingsRootInjected
diff --git a/packages/client/ui-settings/src/client/index.ts b/packages/client/ui-settings/src/client/index.ts
index 9d379c301e..7cb3dfd6d4 100644
--- a/packages/client/ui-settings/src/client/index.ts
+++ b/packages/client/ui-settings/src/client/index.ts
@@ -1,24 +1,21 @@
 /**
- * Settings shell plugin, browser half. Occupies the sidebar-owned
- * `sidebar.settings` hole with the trigger row + modal panel, declares the
- * `settings.section` list slot, projects that ledger into the panel
- * navigation, and ships the first section itself: General, which declares
- * the `settings.general.item` slot that feature plugins contribute
- * preference rows into. Export discipline: packages/client/AGENTS.md.
+ * Settings shell plugin, browser half. A pure composition face: occupies the
+ * sidebar-owned `sidebar.settings` hole with the trigger chrome + modal
+ * panel, declares the `settings.trigger` / `settings.header` /
+ * `settings.section` slots, and projects the section ledger into the panel
+ * navigation. The shell ships no copy and reads no locale state — all text
+ * arrives from registrants (ui-settings-general owns the chrome and General
+ * content; features own their rows and sections). Export discipline:
+ * packages/client/AGENTS.md.
  */
 import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
 import { deferRegistration } from '@deepseek-ai/dsh-client-ui-slots'
-// Type-only: pulls the locale plugin's Context/Events merges (ctx.locale,
-// 'locale/change') into this program.
-import type {} from '@deepseek-ai/dsh-client-locale/client'
-import type { GeneralSectionInjected, SettingsRootInjected } from './contract/slots.ts'
+import type { SettingsRootInjected } from './contract/slots.ts'
 import { SettingsRoot } from './SettingsRoot.tsx'
-import { GeneralSection } from './GeneralSection.tsx'
-import { en, zh } from './locales.ts'
 
 export type {
-  GeneralSectionComponentProps, GeneralSectionInjected,
-  SettingsRootComponentProps, SettingsRootInjected, SettingsSectionOwnerProps,
+  SettingsHeaderOwnerProps, SettingsRootComponentProps, SettingsRootInjected,
+  SettingsSectionOwnerProps, SettingsTriggerOwnerProps,
 } from './contract/slots.ts'
 
 /**
@@ -27,29 +24,15 @@ export type {
  * constrained (dshClient.inject edges are informational); registration goes
  * through declaration-aware deferral.
  */
-export const inject = ['slots', 'locale']
+export const inject = ['slots']
 
 /**
- * Register the settings shell into `sidebar.settings` and the shell-owned
- * General section into `settings.section`, each once its declaration is on
- * the ledger.
+ * Register the settings shell into `sidebar.settings` once the declaration is
+ * on the ledger.
  * @param ctx - client root context.
  */
 export function apply(ctx: ClientContext): void {
-  ctx.effect(() => {
-    const disposers = [
-      ctx.locale.register('settings', 'zh', zh),
-      ctx.locale.register('settings', 'en', en),
-    ]
-    return () => { for (const dispose of disposers) dispose() }
-  }, 'ui-settings: shell copy dictionaries')
-
   const injected = (): SettingsRootInjected => ({
-    translate: (ref) => {
-      const colon = ref.indexOf(':')
-      if (colon === -1) return ref
-      return ctx.locale.bind(ref.slice(0, colon))(ref.slice(colon + 1))
-    },
     sectionsVersion: () => ctx.slots.getVersion('settings.section'),
     subscribeSections: listener => ctx.slots.subscribe('settings.section', listener),
     sections: () => ctx.slots.entries('settings.section')
@@ -65,33 +48,14 @@ export function apply(ctx: ClientContext): void {
     const deferred = deferRegistration(ctx.slots, 'sidebar.settings', SettingsRoot, () =>
       ctx.slots.register({
         name: 'sidebar.settings',
-        children: { 'settings.section': { kind: 'list', scope: 'root' } },
+        children: {
+          'settings.trigger': { kind: 'single', scope: 'root' },
+          'settings.header': { kind: 'single', scope: 'root' },
+          'settings.close': { kind: 'single', scope: 'root' },
+          'settings.section': { kind: 'list', scope: 'root' },
+        },
         inject: injected,
       }, SettingsRoot))
     return () => { deferred.dispose() }
   }, 'ui-settings: shell registration')
-
-  // The shell's own General section: first page, declares the item slot the
-  // feature plugins (locale, ui-theme, …) contribute preference rows into.
-  const generalInjected = (): GeneralSectionInjected => ({
-    t: ctx.locale.bind('settings'),
-  })
-  ctx.effect(() => {
-    const deferred = deferRegistration(ctx.slots, 'settings.section', GeneralSection, () =>
-      ctx.slots.register({
-        name: 'settings.section',
-        id: 'general',
-        order: 0,
-        label: ctx.locale.bind('settings')('general.nav'),
-        children: { 'settings.general.item': { kind: 'list', scope: 'root' } },
-        inject: generalInjected,
-      }, GeneralSection))
-    // Nav labels are registrant-localized: refresh on locale change so the
-    // ledger carries fresh text (the version bump re-renders the shell).
-    const offLocale = ctx.on('locale/change', () => { deferred.refresh() })
-    return () => {
-      offLocale()
-      deferred.dispose()
-    }
-  }, 'ui-settings: general section registration')
 }
diff --git a/packages/client/ui-settings/tests/apply.spec.ts b/packages/client/ui-settings/tests/apply.spec.ts
index 2346012553..d7fdfbd546 100644
--- a/packages/client/ui-settings/tests/apply.spec.ts
+++ b/packages/client/ui-settings/tests/apply.spec.ts
@@ -1,19 +1,15 @@
-/** Settings shell registration: declaration-aware deferral, the injected face, and HMR recovery. */
+/** Settings shell registration: declaration-aware deferral, the ledger projections, and HMR recovery. */
 import { Context } from 'cordis'
 import { describe, expect, it, vi } from 'vitest'
 import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
-import { LocaleService } from '@deepseek-ai/dsh-client-locale/client'
 import { apply, inject } from '@deepseek-ai/dsh-client-ui-settings/client'
-import type { GeneralSectionInjected, SettingsRootInjected } from '@deepseek-ai/dsh-client-ui-settings/client'
+import type { SettingsRootInjected } from '@deepseek-ai/dsh-client-ui-settings/client'
 import { SettingsRoot } from '../src/client/SettingsRoot.tsx'
-import { GeneralSection } from '../src/client/GeneralSection.tsx'
 
 async function bench() {
   const ctx = new Context()
   await ctx.plugin(SlotsService).await()
-  const locale = new LocaleService(ctx)
-  ctx.provide('locale', locale)
-  return { ctx, slots: ctx.get('slots') as SlotsService, locale }
+  return { ctx, slots: ctx.get('slots') as SlotsService }
 }
 
 function declare(slots: SlotsService): () => void {
@@ -28,17 +24,27 @@ function injectedOf(slots: SlotsService): SettingsRootInjected {
   return (entry.inject as () => SettingsRootInjected)()
 }
 
+/** The shell's four child declarations (chrome seats + the section list). */
+const CHILD_SPECS = {
+  'settings.trigger': { kind: 'single', scope: 'root' },
+  'settings.header': { kind: 'single', scope: 'root' },
+  'settings.close': { kind: 'single', scope: 'root' },
+  'settings.section': { kind: 'list', scope: 'root' },
+} as const
+
 describe('ui-settings apply', () => {
-  it('declares the services it uses', () => {
-    expect(inject).toEqual(['slots', 'locale'])
+  it('declares only the slot registry (a pure composition face, no locale)', () => {
+    expect(inject).toEqual(['slots'])
   })
 
-  it('registers the shell for declarations that arrive before or after apply', async () => {
+  it('registers the shell and declares the four child slots, before or after the declaration', async () => {
     const before = await bench()
     declare(before.slots)
     await before.ctx.plugin({ inject: [...inject], apply }).await()
     expect(before.slots.entries('sidebar.settings')[0]!.component).toBe(SettingsRoot)
-    expect(before.slots.spec('settings.section')).toEqual({ kind: 'list', scope: 'root' })
+    for (const [name, spec] of Object.entries(CHILD_SPECS)) {
+      expect(before.slots.spec(name as never)).toEqual(spec)
+    }
 
     const after = await bench()
     await after.ctx.plugin({ inject: [...inject], apply }).await()
@@ -50,43 +56,17 @@ describe('ui-settings apply', () => {
     expect(after.slots.entries('sidebar.settings')).toHaveLength(1)
   })
 
-  it('registers the zh/en shell dictionaries and disposes them with the fiber', async () => {
-    const b = await bench()
-    declare(b.slots)
-    const fiber = b.ctx.plugin({ inject: [...inject], apply })
-    await fiber.await()
-    expect(b.locale.bind('settings')('title')).toBe('设置')
-    b.locale.setLocale('en')
-    expect(b.locale.bind('settings')('close')).toBe('Close')
-    await fiber.dispose()
-    // The (ns, locale) seats are free again — the dictionary disposers ran.
-    expect(() => b.locale.register('settings', 'zh', {})).not.toThrow()
-    expect(() => b.locale.register('settings', 'en', {})).not.toThrow()
-  })
-
-  it('exposes translate over "<ns>:<key>" refs with literal echo for plain text', async () => {
-    const b = await bench()
-    declare(b.slots)
-    await b.ctx.plugin({ inject: [...inject], apply }).await()
-    const injected = injectedOf(b.slots)
-    expect(injected.translate('settings:title')).toBe('设置')
-    expect(injected.translate('no colon ref')).toBe('no colon ref')
-  })
-
   it('projects the section ledger into ordered nav rows with option defaults', async () => {
     const b = await bench()
     declare(b.slots)
     await b.ctx.plugin({ inject: [...inject], apply }).await()
     const injected = injectedOf(b.slots)
-    // The shell ships its own General section (order 0) — the ledger is never
-    // empty once apply settles.
-    expect(injected.sections()).toEqual([{ id: 'general', order: 0, label: '通用设置' }])
+    // The shell ships no sections of its own — registrants fill the ledger.
+    expect(injected.sections()).toEqual([])
     b.slots.register({ name: 'settings.section', id: 'z', order: 20, label: 'Z' } as never, () => null)
-    // No order and no label: both projection defaults apply (order 0 ties
-    // keep registration sequence, so 'a' lands after the General entry).
+    // No order and no label: both projection defaults apply.
     b.slots.register({ name: 'settings.section', id: 'a' } as never, () => null)
     expect(injected.sections()).toEqual([
-      { id: 'general', order: 0, label: '通用设置' },
       { id: 'a', order: 0, label: '' },
       { id: 'z', order: 20, label: 'Z' },
     ])
@@ -104,92 +84,28 @@ describe('ui-settings apply', () => {
     const redeclare = declare(b.slots)
     await b.ctx.plugin({ inject: [...inject], apply }).await()
     expect(b.slots.entries('sidebar.settings')).toHaveLength(1)
-    // Declarer unload: the cascade removes our entry and the slot spec while
-    // our local disposer variable goes stale.
+    // Declarer unload: the cascade removes our entry and every child
+    // declaration while our local disposer variable goes stale.
     redeclare()
     expect(b.slots.entries('sidebar.settings')).toHaveLength(0)
+    expect(b.slots.spec('settings.trigger')).toBeUndefined()
     declare(b.slots)
     await Promise.resolve()
     expect(b.slots.entries('sidebar.settings')[0]!.component).toBe(SettingsRoot)
-    expect(b.slots.spec('settings.section')).toEqual({ kind: 'list', scope: 'root' })
+    for (const [name, spec] of Object.entries(CHILD_SPECS)) {
+      expect(b.slots.spec(name as never)).toEqual(spec)
+    }
   })
 
-  it('unregisters the shell and collapses settings.section on teardown', async () => {
+  it('unregisters the shell and collapses all four child slots on teardown', async () => {
     const b = await bench()
     declare(b.slots)
     const fiber = b.ctx.plugin({ inject: [...inject], apply })
     await fiber.await()
     await fiber.dispose()
     expect(b.slots.entries('sidebar.settings')).toHaveLength(0)
-    expect(b.slots.spec('settings.section')).toBeUndefined()
-  })
-})
-
-describe('ui-settings general section', () => {
-  it('registers the shell-owned General entry and declares the item slot', async () => {
-    const b = await bench()
-    declare(b.slots)
-    await b.ctx.plugin({ inject: [...inject], apply }).await()
-    const entry = b.slots.entries('settings.section')[0]!
-    expect(entry.component).toBe(GeneralSection)
-    expect(entry.options).toEqual({ id: 'general', order: 0, label: '通用设置' })
-    expect(b.slots.spec('settings.general.item')).toEqual({ kind: 'list', scope: 'root' })
-    const injected = (entry.inject as () => GeneralSectionInjected)()
-    expect(injected.t('permission.title')).toBe('权限')
-  })
-
-  it('re-registers with fresh label text on locale change', async () => {
-    const b = await bench()
-    declare(b.slots)
-    await b.ctx.plugin({ inject: [...inject], apply }).await()
-    b.locale.setLocale('en')
-    expect(b.slots.entries('settings.section')[0]!.options.label).toBe('General')
-    b.locale.setLocale('zh')
-    expect(b.slots.entries('settings.section')[0]!.options.label).toBe('通用设置')
-  })
-
-  it('locale change while settings.section is undeclared stays a no-op', async () => {
-    const b = await bench()
-    // No sidebar.settings declaration: the shell never registers, so
-    // settings.section is never declared either.
-    await b.ctx.plugin({ inject: [...inject], apply }).await()
-    b.locale.setLocale('en')
-    expect(b.slots.entries('settings.section')).toHaveLength(0)
-    b.locale.setLocale('zh')
-  })
-
-  it('re-registers after an HMR collapse of the whole chain (stale disposer must not block)', async () => {
-    const b = await bench()
-    const redeclare = declare(b.slots)
-    await b.ctx.plugin({ inject: [...inject], apply }).await()
-    expect(b.slots.entries('settings.section')).toHaveLength(1)
-    // Root declarer unload: the cascade removes the shell entry, the
-    // settings.section declaration, and the General entry below it.
-    redeclare()
-    expect(b.slots.entries('settings.section')).toHaveLength(0)
-    expect(b.slots.spec('settings.general.item')).toBeUndefined()
-    declare(b.slots)
-    // Two deferral hops: the shell re-registers (re-declaring
-    // settings.section), then General re-registers into it.
-    await Promise.resolve()
-    await Promise.resolve()
-    const entry = b.slots.entries('settings.section')[0]!
-    expect(entry.component).toBe(GeneralSection)
-    expect(b.slots.spec('settings.general.item')).toEqual({ kind: 'list', scope: 'root' })
-    // The recovered registration still rides the locale path.
-    b.locale.setLocale('en')
-    expect(b.slots.entries('settings.section')[0]!.options.label).toBe('General')
-    b.locale.setLocale('zh')
-  })
-
-  it('removes the General entry and its item declaration on teardown', async () => {
-    const b = await bench()
-    declare(b.slots)
-    const fiber = b.ctx.plugin({ inject: [...inject], apply })
-    await fiber.await()
-    expect(b.slots.spec('settings.general.item')).toBeDefined()
-    await fiber.dispose()
-    expect(b.slots.entries('settings.section')).toHaveLength(0)
-    expect(b.slots.spec('settings.general.item')).toBeUndefined()
+    for (const name of Object.keys(CHILD_SPECS)) {
+      expect(b.slots.spec(name as never)).toBeUndefined()
+    }
   })
 })
diff --git a/packages/client/ui-settings/tests/settings-root.spec.tsx b/packages/client/ui-settings/tests/settings-root.spec.tsx
index ab56365075..9584d500e5 100644
--- a/packages/client/ui-settings/tests/settings-root.spec.tsx
+++ b/packages/client/ui-settings/tests/settings-root.spec.tsx
@@ -6,14 +6,15 @@ import { SettingsRoot } from '../src/client/SettingsRoot.tsx'
 
 afterEach(cleanup)
 
-const DICT: Record<string, string> = {
-  'settings:trigger': 'Settings',
-  'settings:title': 'Settings',
-  'settings:close': 'Close',
-}
-
 type Row = { id: string; order: number; label: string }
 
+/** Slot-content stand-ins: the shell renders whatever the seats contribute. */
+const SEAT_CONTENT: Record<string, string> = {
+  'settings.trigger': 'Settings',
+  'settings.header': 'Settings Title',
+  'settings.close': 'Close',
+}
+
 function mount({
   wide = true,
   rows = [
@@ -26,8 +27,10 @@ function mount({
   let version = 0
   const listeners = new Set<() => void>()
   const renderSlot = vi.fn(
-    ((_key: string, _owner: unknown, opts?: { only?: string }) =>
-      <div data-testid={`section-${opts?.only ?? 'all'}`} />) as SettingsRootComponentProps['renderSlot'],
+    ((key: string, _owner: unknown, opts?: { only?: string }) => {
+      if (key === 'settings.section') return <div data-testid={`section-${opts?.only ?? 'all'}`} />
+      return SEAT_CONTENT[key]
+    }) as SettingsRootComponentProps['renderSlot'],
   )
   // Global standard kit stubs: the shell consumes neither hook.
   const unusedHook = (() => { throw new Error('unused by SettingsRoot') }) as never
@@ -35,7 +38,6 @@ function mount({
     useSessions: unusedHook,
     useWorkspaces: unusedHook,
     wide,
-    translate: (ref) => DICT[ref] ?? ref,
     sectionsVersion: () => version,
     subscribeSections: (listener) => {
       listeners.add(listener)
@@ -60,19 +62,41 @@ function openPanel() {
 }
 
 describe('SettingsRoot trigger', () => {
-  it('renders the wide row with the label and opens the dialog', () => {
-    mount()
+  it('renders the trigger seat content as the accessible name (no aria-label of its own)', () => {
+    const { renderSlot } = mount()
     const trigger = screen.getByRole('button', { name: 'Settings' })
-    expect(trigger.textContent).toContain('Settings')
+    expect(trigger.hasAttribute('aria-label')).toBe(false)
+    expect(renderSlot).toHaveBeenCalledWith('settings.trigger', { wide: true })
     expect(trigger.getAttribute('aria-expanded')).toBe('false')
     fireEvent.click(trigger)
     expect(screen.getByRole('dialog')).toBeTruthy()
     expect(screen.getByRole('button', { name: 'Settings', expanded: true })).toBeTruthy()
   })
 
-  it('drops the label in the rail state', () => {
-    mount({ wide: false })
-    expect(screen.getByRole('button', { name: 'Settings' }).textContent).toBe('')
+  it('hands the rail state to the trigger seat', () => {
+    const { renderSlot } = mount({ wide: false })
+    expect(renderSlot).toHaveBeenCalledWith('settings.trigger', { wide: false })
+  })
+})
+
+describe('SettingsPanel chrome seats', () => {
+  it('names the dialog via aria-labelledby pointing at the header seat node', () => {
+    mount()
+    openPanel()
+    const dialog = screen.getByRole('dialog')
+    const titleId = dialog.getAttribute('aria-labelledby')!
+    expect(titleId).toBeTruthy()
+    const title = document.getElementById(titleId)!
+    expect(title.textContent).toBe('Settings Title')
+    expect(screen.getByRole('dialog', { name: 'Settings Title' })).toBeTruthy()
+  })
+
+  it('names the close button through the visually-hidden close seat text', () => {
+    mount()
+    openPanel()
+    const close = screen.getByRole('button', { name: 'Close' })
+    expect(close.hasAttribute('aria-label')).toBe(false)
+    expect(close.textContent).toContain('Close')
   })
 })
 
@@ -143,7 +167,8 @@ describe('SettingsPanel navigation', () => {
     const { renderSlot } = mount({ rows: [] })
     openPanel()
     expect(screen.getByRole('dialog')).toBeTruthy()
-    expect(renderSlot).not.toHaveBeenCalled()
+    const sectionCalls = renderSlot.mock.calls.filter(c => c[0] === 'settings.section')
+    expect(sectionCalls).toHaveLength(0)
   })
 
   it('drops the ledger subscription on unmount', () => {
diff --git a/packages/client/ui-settings/tsconfig.json b/packages/client/ui-settings/tsconfig.json
index db90b908bf..d94f0fab96 100644
--- a/packages/client/ui-settings/tsconfig.json
+++ b/packages/client/ui-settings/tsconfig.json
@@ -23,9 +23,6 @@
     {
       "path": "../ui-sidebar"
     },
-    {
-      "path": "../locale"
-    },
     {
       "path": "../../support/invariants"
     }
diff --git a/packages/client/ui-theme/src/client/settings-contract.ts b/packages/client/ui-theme/src/client/settings-contract.ts
index 4354ca8728..60bfffebb5 100644
--- a/packages/client/ui-theme/src/client/settings-contract.ts
+++ b/packages/client/ui-theme/src/client/settings-contract.ts
@@ -1,17 +1,9 @@
 /**
- * Settings-surface slot merge consumed by this package's Appearance row. The
- * AUTHORITATIVE home for 'settings.general.item' is the ui-settings contract
- * (declaring is claiming: the shell's General entry declares the slot); this
- * file repeats the entry verbatim because the settings shell sits above the
- * feature layer, so importing its types from here would invert the layering.
- * TypeScript declaration merging rejects diverging duplicates, so every
- * program that sees both copies enforces identity.
+ * Re-export seam for the `settings.general.item` slot type consumed by this
+ * package's Appearance row. The canonical home is the locale package (the
+ * common dependency of every item registrant); this file exists so row
+ * modules import the type from within their own package.
  */
-declare module '@deepseek-ai/dsh-client-ui-slots' {
-  interface SlotMap {
-    /** One preference row inside the General section (duplicate-identical merge; authority: ui-settings contract). */
-    'settings.general.item': { kind: 'list'; scope: 'root'; owner: { children?: never } }
-  }
-}
-
-export {}
+export type { SettingsGeneralItemOwnerProps } from '@deepseek-ai/dsh-client-locale/client'
+// Side-effect type import: pulls the SlotMap merge into this program.
+import type {} from '@deepseek-ai/dsh-client-locale/client'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 612cea101f..d5c9ecd18d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -149,6 +149,9 @@ importers:
       '@deepseek-ai/dsh-client-ui-settings':
         specifier: workspace:^
         version: link:../../packages/client/ui-settings
+      '@deepseek-ai/dsh-client-ui-settings-general':
+        specifier: workspace:^
+        version: link:../../packages/client/ui-settings-general
       '@deepseek-ai/dsh-client-ui-sidebar':
         specifier: workspace:^
         version: link:../../packages/client/ui-sidebar
@@ -993,9 +996,6 @@ importers:
         specifier: ^2.0.0
         version: 2.1.1
     devDependencies:
-      '@deepseek-ai/dsh-client-locale':
-        specifier: workspace:^
-        version: link:../locale
       '@deepseek-ai/dsh-client-runtime':
         specifier: workspace:^
         version: link:../runtime
@@ -1021,6 +1021,36 @@ importers:
         specifier: ^18.2.0
         version: 18.3.1
 
+  packages/client/ui-settings-general:
+    devDependencies:
+      '@deepseek-ai/dsh-client-locale':
+        specifier: workspace:^
+        version: link:../locale
+      '@deepseek-ai/dsh-client-runtime':
+        specifier: workspace:^
+        version: link:../runtime
+      '@deepseek-ai/dsh-client-ui-primitives':
+        specifier: workspace:^
+        version: link:../ui-primitives
+      '@deepseek-ai/dsh-client-ui-settings':
+        specifier: workspace:^
+        version: link:../ui-settings
+      '@deepseek-ai/dsh-client-ui-slots':
+        specifier: workspace:^
+        version: link:../ui-slots
+      '@deepseek-ai/dsh-invariants':
+        specifier: workspace:^
+        version: link:../../support/invariants
+      '@types/react':
+        specifier: ~18.3.1
+        version: 18.3.31
+      cordis:
+        specifier: ^4.0.0-rc.7
+        version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)
+      react:
+        specifier: ^18.2.0
+        version: 18.3.1
+
   packages/client/ui-sidebar:
     dependencies:
       clsx:
diff --git a/scripts/verify-package-readme-model-experience.ts b/scripts/verify-package-readme-model-experience.ts
index 91554c5c5c..8273453526 100644
--- a/scripts/verify-package-readme-model-experience.ts
+++ b/scripts/verify-package-readme-model-experience.ts
@@ -60,6 +60,7 @@ const SENTENCE_MODEL_EXPERIENCE: Readonly<Record<string, SentenceContract>> = {
   'packages/client/ui-workspace': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/ui-theme': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/ui-settings': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
+  'packages/client/ui-settings-general': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/ui-models': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/locale': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
   'packages/client/web': { kind: 'none', reason: 'Browser-side UI plugin layer; registers no model surface.' },
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 49a502571e..378b5fb437 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -116,6 +116,7 @@
       "@deepseek-ai/dsh-client-ui-workspace": ["./packages/client/ui-workspace/src"],
       "@deepseek-ai/dsh-client-ui-theme": ["./packages/client/ui-theme/src"],
       "@deepseek-ai/dsh-client-ui-settings": ["./packages/client/ui-settings/src"],
+      "@deepseek-ai/dsh-client-ui-settings-general": ["./packages/client/ui-settings-general/src"],
       "@deepseek-ai/dsh-client-ui-models": ["./packages/client/ui-models/src"],
       "@deepseek-ai/dsh-client-locale": ["./packages/client/locale/src"],
       "@deepseek-ai/dsh-client-web": ["./packages/client/web/src"],
diff --git a/tsconfig.client.json b/tsconfig.client.json
index 55ff2d9a8c..afadb08b14 100644
--- a/tsconfig.client.json
+++ b/tsconfig.client.json
@@ -39,6 +39,7 @@
     { "path": "./packages/client/ui-trajectory" },
     { "path": "./packages/client/ui-theme" },
     { "path": "./packages/client/ui-settings" },
+    { "path": "./packages/client/ui-settings-general" },
     { "path": "./packages/client/ui-models" },
     { "path": "./packages/client/locale" },
     { "path": "./packages/client/web" },

From 7e20322c401dda65ef63154b7821a0e51c10920c Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 12:43:17 +0800
Subject: [PATCH 14/15] docs(notes): retitle the rejected alternative as
 per-feature satellite packages

The rejected shape is a settings satellite per feature; the ownerless
copy stays with ui-settings-general, which carries no feature surface.
---
 .../2026-07-25-client-settings-locale-theme.i18n.yaml         | 4 ++--
 .../architecture/2026-07-25-client-settings-locale-theme.md   | 2 +-
 .../2026-07-25-client-settings-locale-theme.zh.md             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
index 15d611d8ce..ad6c575d1e 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.i18n.yaml
@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   pnpm run verify-translation-pairing --write
-2026-07-25-client-settings-locale-theme.md: b6a127037c50066fe9aa501bb73005b9c56869fa
-2026-07-25-client-settings-locale-theme.zh.md: a871f06945fb420016df95b23167e72f59c3e5c5
+2026-07-25-client-settings-locale-theme.md: 87077b3fd3f0bd8a3375a71aebf947cbd9961799
+2026-07-25-client-settings-locale-theme.zh.md: a64a4afdf6565a527a25136694aa79305eeabb3c
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
index b6a127037c..87077b3fd3 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.md
@@ -110,7 +110,7 @@ Locale ships with 中文 and English built in; `setLocale`/`setTheme` are the on
 
 **Settings importing and enumerating the sections.** Adding a page would require modifying the shell plugin, breaking the composition model where each feature occupies a slot from its own plugin.
 
-**One `ui-settings-*` package per section.** It divorces the settings surface from the feature itself: changing Theme behavior touches two packages, the package count grows linearly with settings items, and settings-general depending back on the locale/theme services forms an intermediate layer that exists purely for the package split. Under feature-owner self-registration that layer does not exist: General belongs to the shell (it belongs to no single feature) and preference rows ship with their feature packages.
+**A per-feature `ui-settings-*` satellite package for each section.** It divorces the settings surface from the feature itself: changing Theme behavior touches two packages, the package count grows linearly with settings items, and the satellite packages depending back on the locale/theme services form an intermediate layer that exists purely for the package split. Under feature-owner self-registration that layer does not exist: preference rows ship with their feature packages, and `ui-settings-general` takes in only the ownerless copy (the chrome and the General skeletons), carrying no feature's settings surface.
 
 **Injecting the Locale/Theme snapshots into React directly.** Inject results are cached by entry identity, so volatile values go stale; hand-rolling a React hook per service also bypasses the slot store's unified binding.
 
diff --git a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
index a871f06945..a64a4afdf6 100644
--- a/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
+++ b/.agents/notes/proposed/architecture/2026-07-25-client-settings-locale-theme.zh.md
@@ -110,7 +110,7 @@ Locale 内置中文和 English；`setLocale`/`setTheme` 是唯一写入口，未
 
 **Settings import 并枚举各 section。** 新增页面必须修改壳插件，破坏「每个功能由自己的插件占坑」的组合模型。
 
-**每个 section 单开 `ui-settings-*` 包。** 设置面与功能本体分家：改 Theme 行为要动两个包，包数随设置项线性膨胀，且 settings-general 反向依赖 locale/theme 服务，形成纯粹为拆包而生的中间层。功能属主自注册下不存在这层：General 归壳（不属任何单一功能），preference 行随功能包交付。
+**按功能为每个 section 单开 `ui-settings-*` 卫星包。** 设置面与功能本体分家：改 Theme 行为要动两个包，包数随设置项线性膨胀，且卫星包反向依赖 locale/theme 服务，形成纯粹为拆包而生的中间层。功能属主自注册下不存在这层：preference 行随功能包交付；`ui-settings-general` 只收无主文案（chrome 与 General 骨架），不承载任何功能的设置面。
 
 **把 Locale/Theme snapshot 直接注入 React。** inject 结果按 entry identity 缓存，易变值会陈旧；为每个 service 自造 React hook 也绕开 slot store 的统一绑定。
 

From fabc843c228f055d241aa811657599e1542adb99 Mon Sep 17 00:00:00 2001
From: imccyu <276526105+imccyu@users.noreply.github.com>
Date: Sun, 26 Jul 2026 12:48:30 +0800
Subject: [PATCH 15/15] docs(gui): regenerate graphs for the returning
 ui-settings-general package

---
 docs/config-catalog.md          | 1 +
 docs/event-producer-consumer.md | 2 +-
 docs/module-graph.md            | 8 ++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/config-catalog.md b/docs/config-catalog.md
index 1940811d35..e88468b012 100644
--- a/docs/config-catalog.md
+++ b/docs/config-catalog.md
@@ -2025,6 +2025,7 @@ These load from a `cordis.yml` entry with no `config:` block; they declare no co
 - `@deepseek-ai/dsh-client-ui-models` ([`packages/client/ui-models/src/index.ts`](../packages/client/ui-models/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-question` — requires `tools` · `userInteraction` ([`packages/client/ui-question/src/index.ts`](../packages/client/ui-question/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-settings` ([`packages/client/ui-settings/src/index.ts`](../packages/client/ui-settings/src/index.ts))
+- `@deepseek-ai/dsh-client-ui-settings-general` ([`packages/client/ui-settings-general/src/index.ts`](../packages/client/ui-settings-general/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-sidebar` ([`packages/client/ui-sidebar/src/index.ts`](../packages/client/ui-sidebar/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-theme` ([`packages/client/ui-theme/src/index.ts`](../packages/client/ui-theme/src/index.ts))
 - `@deepseek-ai/dsh-client-ui-trajectory` ([`packages/client/ui-trajectory/src/index.ts`](../packages/client/ui-trajectory/src/index.ts))
diff --git a/docs/event-producer-consumer.md b/docs/event-producer-consumer.md
index 53cd56f4cf..5127f55f67 100644
--- a/docs/event-producer-consumer.md
+++ b/docs/event-producer-consumer.md
@@ -63,7 +63,7 @@ This matrix shows which packages dispatch each harness-owned event and which pac
 | `internal/dispatch` | - | [`compact`](../packages/compact/compact), [`fs`](../packages/fs/fs), [`goal`](../packages/goal/goal), [`goal-session`](../packages/goal/goal-session), [`hook-protocol`](../packages/hooks/hook-protocol), [`llm-retry`](../packages/llm/llm-retry), [`permission`](../packages/ui/permission), [`plan-mode`](../packages/plan/plan-mode), [`pty-local`](../packages/pty/pty-local), `runtime`, [`sandbox-policy`](../packages/sandbox/sandbox-policy), [`scope`](../packages/core/scope), [`session`](../packages/core/session), [`subagent`](../packages/subagent/subagent), [`time-context`](../packages/context/time-context), [`tool-todo`](../packages/todo/tool-todo), [`tools`](../packages/core/tools), [`user-approval`](../packages/ui/user-approval), [`workflow`](../packages/workflow/workflow) |
 | `internal/plugin` | - | `hmr`, `modules`, `webserver` |
 | `internal/status` | - | [`agent`](../packages/core/agent) |
-| `locale/change` | `locale` (`emit`) | `locale`, `ui-models`, `ui-settings` |
+| `locale/change` | `locale` (`emit`) | `locale`, `ui-models`, `ui-settings-general` |
 | `slots/changed` | `runtime` (`emit`) | - |
 | `theme/change` | `ui-theme` (`emit`) | `ui-layout`, `ui-theme` |
 
diff --git a/docs/module-graph.md b/docs/module-graph.md
index 4903e432cd..93a57362a7 100644
--- a/docs/module-graph.md
+++ b/docs/module-graph.md
@@ -145,6 +145,7 @@ flowchart TD
     pkg_client_ui_primitives["client-ui-primitives"]
     pkg_client_ui_question["client-ui-question"]
     pkg_client_ui_settings["client-ui-settings"]
+    pkg_client_ui_settings_general["client-ui-settings-general"]
     pkg_client_ui_sidebar["client-ui-sidebar"]
     pkg_client_ui_slots["client-ui-slots"]
     pkg_client_ui_theme["client-ui-theme"]
@@ -296,6 +297,12 @@ flowchart TD
   pkg_system_prompt --> pkg_scope
   pkg_web --> pkg_invariants
   pkg_web --> pkg_llm
+  pkg_client_ui_settings_general --> pkg_client_locale
+  pkg_client_ui_settings_general --> pkg_client_runtime
+  pkg_client_ui_settings_general --> pkg_client_ui_primitives
+  pkg_client_ui_settings_general --> pkg_client_ui_settings
+  pkg_client_ui_settings_general --> pkg_client_ui_slots
+  pkg_client_ui_settings_general --> pkg_invariants
   pkg_client_ui_theme --> pkg_client_locale
   pkg_client_ui_theme --> pkg_client_runtime
   pkg_client_ui_theme --> pkg_client_ui_primitives
@@ -847,6 +854,7 @@ flowchart TD
 | [`session`](../packages/core/session) | `core` | [`brand`](../packages/util/brand), [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm), [`scope`](../packages/core/scope) |
 | [`system-prompt`](../packages/core/system-prompt) | `core` | [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm), [`scope`](../packages/core/scope) |
 | [`web`](../packages/web/web) | `web` | [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm) |
+| [`client-ui-settings-general`](../packages/client/ui-settings-general) | `client` | [`client-locale`](../packages/client/locale), [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-settings`](../packages/client/ui-settings), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
 | [`client-ui-theme`](../packages/client/ui-theme) | `client` | [`client-locale`](../packages/client/locale), [`client-runtime`](../packages/client/runtime), [`client-ui-primitives`](../packages/client/ui-primitives), [`client-ui-slots`](../packages/client/ui-slots), [`invariants`](../packages/support/invariants) |
 | [`lsp`](../packages/lsp/lsp) | `lsp` | [`brand`](../packages/util/brand), [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm) |
 | [`sandbox`](../packages/sandbox/sandbox) | `sandbox` | [`invariants`](../packages/support/invariants), [`llm`](../packages/llm/llm) |