Customize desktop status bar (rebased #4152) / 自定义桌面底部信息栏#4188
Merged
Conversation
This was referenced Jun 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rebases #4152 onto current
main-v2and resolves the conflicts so it can land. All credit to @SivanCola — this is their work; I'm only carrying the rebase across because #4071 and #4151 moved the shared frontend files after the PR was opened and the conflicts were blocking auto-merge.Original PR: #4152
Summary
turn_coststatus item and clarify the cumulative item as session cost.Conflict resolution
lib/bridge.ts,config/render_test.go: additive import merges (keptnormalizeTokenModefrom Add token economy composer mode / 增加省 token 协作模式 #4151 andreflect/path/filepathfrom both sides).components/SettingsPanel.tsx: kept both the notification-sound field (feat: 通知音效系统 — 生成完成 + 等待操作提示音 #4176) and the new status-bar fields. The two happened to share an identical trailing</div></SettingsField>close that git factored out of the hunk, so I re-added the notification-sound field's own close to keep the JSX balanced.Verification (local)
go test ./internal/config— greengo build ./...(root +desktop/) — greenpnpm --dir desktop/frontend typecheck— clean apart from the usual ungenerated-wailsjsbinding errors thatwails generateresolves in CIdesktoptest failures seen locally (TestUpdateMCPServerSplitsPastedCommandLineTempDir-cleanup flake;TestAddSkillPathRestoresConventionRootWithoutCustomPathpicking up the machine's real~/.agents/skills) reproduce on cleanmain-v2and are unrelated to this change.Closes #4152