From 6705d521f441b7bb558f6cd9c082f445cac192c3 Mon Sep 17 00:00:00 2001 From: weichen Date: Thu, 1 Oct 2026 23:33:42 +0000 Subject: [PATCH] Advance UI and frontend for the S4 shell overhaul Why: The molv theme and the rebuilt shell land together, so the design doc and the submodule pins stay in one change. Evidence: UI npm test 79 passed; frontend tsc -b and npm test 61 passed. Impact: DESIGN.md records the molv token table; modules/ui and modules/frontend point at the shell branches. Refs: feature/s4-shell-overhaul Co-authored-by: Cursor --- .task/feature-s4-shell-overhaul.md | 5 +++-- DESIGN.md | 15 +++++++++++++++ modules/frontend | 2 +- modules/ui | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.task/feature-s4-shell-overhaul.md b/.task/feature-s4-shell-overhaul.md index b2ff9ecf..79da13a1 100644 --- a/.task/feature-s4-shell-overhaul.md +++ b/.task/feature-s4-shell-overhaul.md @@ -6,11 +6,12 @@ - 权威仓:ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-Dev.git;目标分支:main;R0(initial_base_sha)= 959179f88fafa06daeab121929112069d34e8419 - 工作区:/home/weichen/projects/Agent-System-Dev-wt-feature-s4-shell-overhaul(worktree);分支:feature/s4-shell-overhaul -- 授权与交付终点:<本次允许的动作与终点;未授权事项写明> +- 授权与交付终点:按 S4 目标形态改造壳层与交互,提交 UI / Frontend / Dev 三仓 PR。不改后端与 Core 契约,不合入。 ## 目标与非目标 -<预期结果、受影响入口/模块/契约;明确不做什么。> +- 目标:顶栏(项目 + 阶段徽章 + 待处理铃铛)、以项目为中心的左栏与体系工具、右栏全部/待处理筛选与收纳、对话整列拖拽与内联确认卡折叠/阻断、深读弹层的插件槽位、墨绿可选主题。 +- 非目标:不移植演示脚本与假的追溯/需求/变更/文档/记忆数据;不改后端;领域弹层只在 `/api/workspaces` 有声明时出现。 ## 同步记录 diff --git a/DESIGN.md b/DESIGN.md index 700169d0..231785f7 100644 --- a/DESIGN.md +++ b/DESIGN.md @@ -56,6 +56,21 @@ Agent-System-Dev 是桌面优先、Web 兼容的 AI 工作台。界面应**冷 - 语义:`--ok #46bf72`、`--warn #ff8a30`、`--err #ff5c5c`(浅色 `#1e8a3e/#e07b00/#e03131`)。 语义色只表语义;确认等待类统一绿色语言,不用红/橙装饰。 +### 2.5 墨绿主题(可选,`data-theme='molv'`) + +暖纸白工作区、深海军蓝左栏与顶栏、翠绿强调。只覆盖表面与语义色;字号标尺、圆角、间距沿用 §3–§5,不另起一套。左栏与顶栏消费 `--bg-sidebar` / `--text-sidebar*`(深色与浅色下别名到面板与正文,墨绿下翻成海军蓝)。 + +| 令牌 | 墨绿 | 用途 | +|---|---|---| +| `--bg-inset` | `#e0e0db` | 窗口间隙 | +| `--bg` | `#f2f2f0` | 对话主区 | +| `--bg-panel` | `#fbfbfa` | 右栏等面板 | +| `--bg-sidebar` | `#082d4f` | 左栏、顶栏 | +| `--text` | `#082d4f` | 主读文本 | +| `--text-sidebar` | `#e9f0f6` | 左栏与顶栏文字 | +| `--accent` | `#165f49` | 交互强调(翠绿) | +| `--primary` / `--primary-foreground` | `#082d4f` / `#f3f8f5` | 主按钮 | + ## 3. 字号标尺(唯一字号体系) 全局唯一可调变量 `--ui-font-size`(默认 14px),派生: diff --git a/modules/frontend b/modules/frontend index f718095d..d1ea616b 160000 --- a/modules/frontend +++ b/modules/frontend @@ -1 +1 @@ -Subproject commit f718095d783d7e13c445a490c52551b29a3f93a8 +Subproject commit d1ea616b0810e491e055c0df7d633ada1aed4034 diff --git a/modules/ui b/modules/ui index bd3baff9..d6d092d5 160000 --- a/modules/ui +++ b/modules/ui @@ -1 +1 @@ -Subproject commit bd3baff9ea43c05597dcc92ce4c17b5a9fd255ac +Subproject commit d6d092d563c9cded6a18a389f7733a7f10cb960a