Commit b52ffd8
committed
Merge upstream PR 21st-dev#195: UI Sidebar + Chat Overhaul
Big upstream change set merged on top of our local fork:
- Sidebar architecture rework (project-grouped tree, expandable workspaces,
SubChatItem component, sort popover, Tabler icons, footer "Open Workspace"
button replacing the old Settings/Kanban/Archive triplet)
- Chat font size setting (12-16px) with em-based markdown scaling
- Terminal font size setting (10-24px) with dynamic line-height
- Workspace accent colors + DB migration 0008 (chats.accentColor)
- DB migration 0009
- active-chat.tsx split into chat-utils.tsx + diff-sidebar-section.tsx
- TypeScript strictness fixes across routers, hooks, and dialogs
- New deps: @tabler/icons-react, react-grab, sharp
Conflict resolution: agents-sidebar.tsx had 5 conflict regions vs our
PR 21st-dev#192 ChatIcon/ProjectIcon work - took upstream since the new sidebar
design intentionally drops the GitHub-avatar default and our PR 21st-dev#192's
intent (no GitHub logo for local chats) is achieved by upstream's redesign.
Preserved our local-only customizations:
- Auth bypass in auth-manager.ts (isAuthenticated -> true, stub user)
- main window loads index.html unconditionally (no login route)
- Help/Feedback buttons gone (upstream's new footer is a single Open
Workspace button, no Help/Feedback present)
- Opus 4.7 + opus[1m] model entries
- RenderErrorBoundary wrappers around 3 ChatViewInner instances
- setTimeout(100ms) focus fix for terminal -> chat handoff96 files changed
Lines changed: 5319 additions & 3904 deletions
File tree
- build
- drizzle
- meta
- openspec/changes/refactor-app-architecture
- scripts
- src
- main
- lib
- claude
- db/schema
- git/watcher
- trpc/routers
- windows
- renderer
- components
- dialogs
- settings-tabs
- ui
- contexts
- features
- agents
- atoms
- components
- context
- hooks
- lib
- main
- mentions
- stores
- ui
- utils
- changes/components/commit-input
- layout
- mentions/providers
- onboarding
- sidebar
- terminal
- lib
- atoms
- hooks
- stores
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
82 | | - | |
| 82 | + | |
83 | 83 | | |
84 | 84 | | |
85 | 85 | | |
| |||
243 | 243 | | |
244 | 244 | | |
245 | 245 | | |
246 | | - | |
247 | 246 | | |
248 | 247 | | |
249 | 248 | | |
| |||
Loading
Binary file not shown.
Binary file not shown.
Loading
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
0 commit comments