feat(sidebar): sort topics by activity, add collapse/expand all by ttmouse · Pull Request #3698 · esengine/DeepSeek-Reasonix

ttmouse · 2026-06-09T12:00:53Z

侧边栏改进

主题按活动时间排序

侧边栏中的主题（global + project）现在按 lastActivityAt 降序排列，最近活跃的靠前
同活动时间时按标题字母序排序
替换旧的 orderedTopicIDs() 实现

全部折叠/展开

Projects 标题旁增加一个折叠/展开全部按钮（双向箭头图标）
动态判断当前状态：全部已展开时显示 "Collapse all"，否则显示 "Expand all"
样式与旁边的 "+" 按钮一致

Go changes only

desktop/tabs.go: add sortTopicIDsByActivity, topic read tracking infrastructure
desktop/frontend/src/components/ProjectTree.tsx: add collapse/expand button
desktop/frontend/src/locales/en.ts, zh.ts: i18n labels
desktop/frontend/src/styles.css: collapse button styles

Files changed

6 files, +307/−23 lines

- 删除 TabBar 组件及其所有相关 state/handlers（tabOrderIds、tabRevealSignal、 visibleTabs、handleTabChange/Close/Reorder/NewTab 等） - 删除 workspace-tabs-bar 容器及 .workspace-tabs-bar CSS - 将右侧面板切换按钮移入 topicbar__actions 末尾，使用与 Copy/Export 一致的 topicbar__action-btn topicbar__action-btn--icon 样式 - 删除之前误加的 chat-pane__topbar 独立条及其 CSS - 还原被构建过程误删的 dist/.gitkeep

- 非编辑模式：h1 直接显示 tab.topicTitle，不再包含 workspace 前缀 - 编辑模式：去掉 topicbarProjectPrefix / 前缀 - 删除不再需要的 topicbarProjectPrefix 变量

移除 .project-tree__topic 的 margin-right: var(--project-tree-action-column)，该 36px 右间距是为一级菜单的 '+' 按钮预留的，二级菜单没有操作按钮，却保留了该间距导致右侧出现多余空白，无法撑满全宽。

删除项目行左侧无实际意义的 Folder 图标，只保留展开箭头和颜色标识圆点。这样一二级菜单的视觉更简洁统一。

- 将 .project-tree__topic 的 margin-left 从 22px 改为 11px - 文字起始位置 = 11px (margin) + 30px (padding: 14+16) = 41px - 与一级菜单文字起始位置 8+12+7+7+7=41px 完全对齐

给 .sidebar__new、.project-tree__search、.project-tree__header 添加 flex-shrink: 0，防止当项目列表内容过多时被 flex 容器压缩高度。

在新增项目按钮左侧增加一个双向箭头按钮，点击切换全部折叠/展开。 - 递归收集所有可展开节点 key 判断当前状态 - 动态 Tooltip：全部已展开→'Collapse all'，否则→'Expand all' - 样式与旁边的 '+' 按钮一致

- 双击二级菜单直接进入重命名模式 - 选中状态改为圆角，移除左侧彩色条纹 - 右侧显示相对时间（3 分钟、1 天等），去掉'前'字 - 折叠/展开按钮图标区分状态：展开时 ⥮，折叠时 ⇅

The unread indicator dot in the left sidebar topic list used `var(--fg-muted)` which was never defined anywhere in the project, making the dot transparent and invisible. Replaced with `var(--fg-dim)`, a defined gray variable available in both dark and light themes.

…betically Introduce sortTopicIDsByActivity() that accepts a callback to get each topic's activity timestamp, and returns IDs sorted most-recent-first. Updates both global and project topic list sections in ListProjectTree to pass the activity from on-disk sessions or open tabs. The old orderedTopicIDs() remains (unused) and will be removed in a follow-up commit.

Replaced by sortTopicIDsByActivity() in the previous commit.

All 5 remaining uses of the undefined var(--fg-muted) are now replaced with defined variables: - workspace-branch-indicator → var(--fg-faint) - settings-model-current__meta span → var(--fg-dim) - provider-readonly-field--stacked span → var(--fg-faint) - provider-model-fetch-row span → var(--fg-faint) - right-panel__tab → var(--fg-dim) This was the same root cause as the invisible unread dot: --fg-muted was never defined in the project.

The refresh button (RefreshCw icon) sits on the right side of the workspace-branch-indicator, calling loadChanges() on click. It shows a spin animation while loading and is disabled during the request.

Replace the static branch name span in the git branch indicator with a clickable button that opens a dropdown listing all local branches. Clicking a branch in the list calls GitCheckout on the backend and refreshes the changes view.

- Green pulse dot → accent-color spinning ring (process-card__spin style) - Add will-change: transform for smooth animation on topic switch

- Go backend emits agent:turn-done event for reliable turn-complete detection - frontend bridge adds onTurnDone() listener - sound.ts supports 5 configurable sounds (synth + 4 WAV files) - Settings panel UI for sound selection

- AskCard plays attention chime on mount - App.tsx uses onTurnDone event for success chime (no tab-switch misfire) - Settings panel General section: two-row sound picker (success + attention) - i18n: EN/ZH notification sound labels

- New generative-music.ts engine: oscillator → ADSR → lowpass filter → reverb - Token-driven playback: fires a note per 4 text/reasoning tokens (not timer loop) - 4 presets (classic/ethereal/digital/retro) + off switch in Settings - C major pentatonic scale round-robin with random pitch detune - 100ms throttle + 4:1 token sampling to handle high-speed DeepSeek output - Fade-out on stop, preview in settings panel

- 标题栏 min-height 56px→44px，字号 18px→15px，字重 680→600 - 左侧边栏左右 padding 10px→6px - 右侧分割线 resizer 背景 transparent→var(--chat-bg)，消除黑色露底 - 重构 composer 工具栏/状态栏布局，移除 composer-runstatus 改用 statusbar 内联

- resizer 背景从 var(--chat-bg) 改为 var(--workspace-files-bg)，消除分割线与 dock 之间的黑色间距 - 移除 .footer 的 border-top，消除聊天区与底部任务栏之间的分隔线

- composer-card 添加 margin-left: -1px; margin-right: -1px，使 border-box 下 1px 边框不占用内容区，内容与无边框元素左对齐

- 给 .transcript 增加 scrollbar-gutter: stable，预留滚动条空间，使内容区宽度不受滚动条出现/消失影响，与底部输入框对齐

- 移除 .transcript 的 scrollbar-width: thin 和 scrollbar-gutter - Chromium 下 scrollbar-width 会强制 classic 滚动条占用布局空间 - 恢复默认 overlay 滚动条（浮动在内容上不占空间），使历史消息内容区与底部输入框始终同宽对齐

- overflow-y: overlay 让滚动条浮在内容之上不占布局空间 - 解决 WKWebView 中滚动条占据 ~8px 导致 transcript 内容区比 footer 窄，margin:auto 居中时历史消息偏左的问题

…remove unused logoWordmark

ttmouse · 2026-06-09T12:04:17Z

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 554bceaeef

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-06-09T12:10:03Z

 	if abs, err := filepath.Abs(workspaceRoot); err == nil {
 		workspaceRoot = abs
 	}
 	saveWorkspace(workspaceRoot)


Restore project registration when opening tabs

When a project session is resumed from All History, onResumeSession opens the tab via OpenProjectTab(session.workspaceRoot, session.topicId) before resuming the session; if that workspace is not already in desktop-projects.json (for example an older/imported session or a project removed from the sidebar), this method now only saves the active workspace and never re-adds the project. ListProjectTree builds project sections solely from loadProjectsFile().Projects, so the resumed project/topic remains absent from the sidebar even though the tab is open; the removed addProject(workspaceRoot, "") call used to keep that path registered.

Useful? React with 👍 / 👎.

ttmouse · 2026-06-09T13:20:30Z

生成中显示的停止按钮新增 CSS 动画：0.25s 顺时针转90°、 0.75s 停顿，1s 周期循环。利用正方形转90°与0°视觉一致的特性，一次旋转即完成视觉闭环。 - 动画装在 .composer-meta__action-btn--stop:not(:disabled) svg - ease-in-out 缓动，节奏不抢戏但能感知系统在运行

时间筛选面板： - 菜单改为左侧对齐，去边框描边 - 面板宽度收窄（min-width: 108px→84px） - 字体缩小至12px，字重400，不加粗 - 选中项颜色改为 accent 蓝色 - 筛选激活时图标旁显示短标签（10/1h/3h/24h） - 按钮间距统一6px，自适应宽度 ApprovalModal：工具审批弹窗新增 attention chime 提示音

Merge 上游时 auto-merge 用上游版本覆盖了 SettingsPanel.tsx，导致通知音效设置（生成完成 + AI提问）丢失。手动恢复 import、 state 和 UI 代码。

Merge 上游时 SettingsPanel.tsx 被上游版本覆盖，丢失了生成式背景音乐预设选择器。恢复 import、state 和 UI。

通知音效（生成完成、AI提问）下拉框统一改为 mem-select，预览按钮统一改为 chip，与生成式背景音乐保持一致。

…n-v2

…pen support Each copy of the .app at a different path now gets its own Wails SingleInstanceLock ID (com.reasonix.desktop.<sha256[:8]>), allowing them to run side by side. The same binary still prevents double-launch.

…(regression from sidebar sort refactor)

esengine

The two headline features — activity-sorted topics and collapse/expand all — are wanted. But the branch ships 72 files / +11.8k lines: the whole fork (sounds, BrowserPanel, GitPanel, a second internal/bot tree that collides with the bot gateway already on main-v2, go.mod churn), not the 6-file change the description scopes. We can't approve fork CI on these contents. Please re-cut: branch from current origin/main-v2, cherry-pick just the sidebar change, and force-push (or open fresh) — then it gets a fast review.

SivanCola and others added 30 commits June 8, 2026 11:35

feat: add bot channel settings UI

9933a69

feat: add guided bot connection setup

40d680a

标题栏去掉重复的项目名前缀

7681fc2

- 非编辑模式：h1 直接显示 tab.topicTitle，不再包含 workspace 前缀 - 编辑模式：去掉 topicbarProjectPrefix / 前缀 - 删除不再需要的 topicbarProjectPrefix 变量

移除侧边栏文件夹图标

aaf1ecb

删除项目行左侧无实际意义的 Folder 图标，只保留展开箭头和颜色标识圆点。这样一二级菜单的视觉更简洁统一。

调整二级菜单缩进，文字与一级菜单左对齐

fc6a70d

- 将 .project-tree__topic 的 margin-left 从 22px 改为 11px - 文字起始位置 = 11px (margin) + 30px (padding: 14+16) = 41px - 与一级菜单文字起始位置 8+12+7+7+7=41px 完全对齐

fix: 侧边栏搜索栏被内容挤压变窄

8611b00

给 .sidebar__new、.project-tree__search、.project-tree__header 添加 flex-shrink: 0，防止当项目列表内容过多时被 flex 容器压缩高度。

侧边栏二级菜单多项 UI 优化

fa14e12

- 双击二级菜单直接进入重命名模式 - 选中状态改为圆角，移除左侧彩色条纹 - 右侧显示相对时间（3 分钟、1 天等），去掉'前'字 - 折叠/展开按钮图标区分状态：展开时 ⥮，折叠时 ⇅

Fix project tree activity status

e60c0a5

Show git branch in workspace changes

6f2057a

chore(gitignore): add .alma-snapshots to ignore list

70cee35

chore(desktop): remove unused orderedTopicIDs function

48c8300

Replaced by sortTopicIDsByActivity() in the previous commit.

feat(desktop): add refresh button to git branch indicator in changes tab

7e160e8

The refresh button (RefreshCw icon) sits on the right side of the workspace-branch-indicator, calling loadChanges() on click. It shows a spin animation while loading and is disabled during the request.

feat(desktop): add GitBranches and GitCheckout backend methods

5da8ea6

feat: replace sidebar running indicator with spinning ring

2fe8e7c

- Green pulse dot → accent-color spinning ring (process-card__spin style) - Add will-change: transform for smooth animation on topic switch

feat: add notification sound system with WAV file support

b8c6fe0

- Go backend emits agent:turn-done event for reliable turn-complete detection - frontend bridge adds onTurnDone() listener - sound.ts supports 5 configurable sounds (synth + 4 WAV files) - Settings panel UI for sound selection

fix: 右侧分割线背景匹配 dock，移除底部 footer 上边框

d26112b

- resizer 背景从 var(--chat-bg) 改为 var(--workspace-files-bg)，消除分割线与 dock 之间的黑色间距 - 移除 .footer 的 border-top，消除聊天区与底部任务栏之间的分隔线

fix: composer-card 负 margin 抵消边框偏移，与历史消息左对齐

11d676a

- composer-card 添加 margin-left: -1px; margin-right: -1px，使 border-box 下 1px 边框不占用内容区，内容与无边框元素左对齐

fix: 历史消息区 scrollbar-gutter:stable 解决滚动条偏移对齐

b2d7823

- 给 .transcript 增加 scrollbar-gutter: stable，预留滚动条空间，使内容区宽度不受滚动条出现/消失影响，与底部输入框对齐

ttmouse requested a review from esengine as a code owner June 9, 2026 12:00

github-actions Bot added v2 Go rewrite (1.x) — main-v2 branch, active development desktop Wails desktop app (desktop/**) labels Jun 9, 2026

fixup: merge resolution — add workspaceDisplayName, tabRevealSignal, …

19edbd9

…remove unused logoWordmark

chatgpt-codex-connector Bot reviewed Jun 9, 2026

View reviewed changes

ttmouse added 13 commits June 9, 2026 21:29

Merge upstream/main-v2 into main-v2

d4e0749

feat(sidebar): 新增时间筛选「最新10条」选项

d83d864

Merge upstream/main-v2 into main-v2 (bot settings + browser coexist)

a1b6882

fix: 恢复被 merge 覆盖的声音设置面板

e6b74fa

Merge 上游时 auto-merge 用上游版本覆盖了 SettingsPanel.tsx，导致通知音效设置（生成完成 + AI提问）丢失。手动恢复 import、 state 和 UI 代码。

fix: 恢复被 merge 覆盖的生成式背景音乐设置

f2df285

Merge 上游时 SettingsPanel.tsx 被上游版本覆盖，丢失了生成式背景音乐预设选择器。恢复 import、state 和 UI。

style: 统一设置面板音效控件样式

dbdaa69

通知音效（生成完成、AI提问）下拉框统一改为 mem-select，预览按钮统一改为 chip，与生成式背景音乐保持一致。

style: 统一设置面板下拉框宽度为160px

1226871

Merge remote-tracking branch 'refs/remotes/upstream/main-v2' into mai…

917359d

…n-v2

fix: add topic read tracking and activity timestamps for sidebar sorting

37390ee

fix: restore addProject and emitProjectTreeChanged in OpenProjectTab …

9072e03

…(regression from sidebar sort refactor)

ttmouse force-pushed the pr/sidebar-clean branch from ef8ea77 to 9072e03 Compare June 10, 2026 04:33

github-actions Bot added tui Terminal UI / CLI (internal/cli, internal/control) config Configuration & setup (internal/config) labels Jun 10, 2026

ttmouse closed this Jun 10, 2026

ttmouse deleted the pr/sidebar-clean branch June 10, 2026 04:35

ttmouse restored the pr/sidebar-clean branch June 10, 2026 04:37

ttmouse reopened this Jun 10, 2026

esengine mentioned this pull request Jun 11, 2026

feat: close tab with Cmd+W when tab bar is visible #3458

Open

esengine requested changes Jun 11, 2026

View reviewed changes

esengine mentioned this pull request Jun 11, 2026

feat: 移除 Tab 栏，优化顶部布局 #3439

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(sidebar): sort topics by activity, add collapse/expand all#3698

feat(sidebar): sort topics by activity, add collapse/expand all#3698
ttmouse wants to merge 77 commits into
esengine:main-v2from
ttmouse:pr/sidebar-clean

ttmouse commented Jun 9, 2026

Uh oh!

ttmouse commented Jun 9, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

chatgpt-codex-connector Bot Jun 9, 2026

Uh oh!

ttmouse commented Jun 9, 2026

Uh oh!

esengine left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

ttmouse commented Jun 9, 2026

侧边栏改进

主题按活动时间排序

全部折叠/展开

Go changes only

Files changed

Uh oh!

ttmouse commented Jun 9, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 9, 2026

Choose a reason for hiding this comment

Uh oh!

ttmouse commented Jun 9, 2026

Uh oh!

esengine left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants