Skip to content

Commit b52ffd8

Browse files
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 handoff
2 parents fb143ef + 372ec55 commit b52ffd8

96 files changed

Lines changed: 5319 additions & 3904 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CLAUDE.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ src/
7979
├── atoms/ # Global Jotai atoms
8080
├── stores/ # Global Zustand stores
8181
├── trpc.ts # Real tRPC client
82-
└── mock-api.ts # DEPRECATED - being replaced with real tRPC
82+
└── api-bridge.ts # Wraps tRPC calls + stubs for web-only features
8383
```
8484

8585
## Database (Drizzle ORM)
@@ -243,7 +243,6 @@ npm version patch --no-git-tag-version # 0.0.27 → 0.0.28
243243
- tRPC routers structure
244244

245245
**In Progress:**
246-
- Replacing `mock-api.ts` with real tRPC calls in renderer
247246
- ProjectSelector component (local folder picker)
248247

249248
**Planned:**

build/icon-blue-original.png

65.9 KB
Loading

build/icon.icns

-160 KB
Binary file not shown.

build/icon.ico

341 KB
Binary file not shown.

build/icon.png

-39.2 KB
Loading

bun.lock

Lines changed: 74 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

drizzle/0008_steep_warlock.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE `chats` ADD `accent_color` text;

drizzle/0009_premium_morbius.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE `projects` ADD `accent_color` text;

0 commit comments

Comments
 (0)