From 2c15cf83a95465b8cbba9d7288e1e7e73ac2f661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Flor=C3=AAncio?= Date: Sat, 23 May 2026 21:19:30 +0100 Subject: [PATCH] feat(web): add tree view for changes panel (#1026) --- .../internal/user/controller/controller.go | 1 + apps/backend/internal/user/dto/dto.go | 3 + apps/backend/internal/user/models/models.go | 1 + apps/backend/internal/user/service/service.go | 17 ++ .../internal/user/service/service_test.go | 54 ++++ apps/backend/internal/user/store/sqlite.go | 8 + .../settings/editors-settings-state.tsx | 1 + .../components/settings/general-settings.tsx | 70 +++++ .../task/changes-panel-file-row.tsx | 69 +++-- .../task/changes-panel-repo-groups.tsx | 11 +- .../changes-panel-timeline-grouping.test.tsx | 6 + .../task/changes-panel-timeline.tsx | 103 ++++++- .../task/changes-panel-tree.test.tsx | 107 +++++++ .../components/task/changes-panel-tree.tsx | 277 ++++++++++++++++++ apps/web/hooks/use-user-display-settings.ts | 1 + apps/web/lib/api/domains/settings-api.ts | 1 + apps/web/lib/ssr/user-settings.test.ts | 20 +- apps/web/lib/ssr/user-settings.ts | 6 + .../state/slices/settings/settings-slice.ts | 1 + apps/web/lib/state/slices/settings/types.ts | 1 + apps/web/lib/types/backend.ts | 1 + apps/web/lib/types/http.ts | 1 + apps/web/lib/ws/handlers/users.ts | 1 + 23 files changed, 716 insertions(+), 45 deletions(-) create mode 100644 apps/web/components/task/changes-panel-tree.test.tsx create mode 100644 apps/web/components/task/changes-panel-tree.tsx diff --git a/apps/backend/internal/user/controller/controller.go b/apps/backend/internal/user/controller/controller.go index de66b84109..2b6cb8c8f9 100644 --- a/apps/backend/internal/user/controller/controller.go +++ b/apps/backend/internal/user/controller/controller.go @@ -67,6 +67,7 @@ func (c *Controller) UpdateUserSettings(ctx context.Context, req dto.UpdateUserS TerminalLinkBehavior: req.TerminalLinkBehavior, TerminalFontFamily: req.TerminalFontFamily, TerminalFontSize: req.TerminalFontSize, + ChangesPanelLayout: req.ChangesPanelLayout, }) if err != nil { return dto.UserSettingsResponse{}, err diff --git a/apps/backend/internal/user/dto/dto.go b/apps/backend/internal/user/dto/dto.go index 0a1529d159..450f11b2d7 100644 --- a/apps/backend/internal/user/dto/dto.go +++ b/apps/backend/internal/user/dto/dto.go @@ -38,6 +38,7 @@ type UserSettingsDTO struct { TerminalLinkBehavior string `json:"terminal_link_behavior"` TerminalFontFamily string `json:"terminal_font_family"` TerminalFontSize int `json:"terminal_font_size"` + ChangesPanelLayout string `json:"changes_panel_layout"` UpdatedAt string `json:"updated_at"` } @@ -80,6 +81,7 @@ type UpdateUserSettingsRequest struct { TerminalLinkBehavior *string `json:"terminal_link_behavior,omitempty"` TerminalFontFamily *string `json:"terminal_font_family,omitempty"` TerminalFontSize *int `json:"terminal_font_size,omitempty"` + ChangesPanelLayout *string `json:"changes_panel_layout,omitempty"` } func FromUser(user *models.User) UserDTO { @@ -117,6 +119,7 @@ func FromUserSettings(settings *models.UserSettings) UserSettingsDTO { TerminalLinkBehavior: settings.TerminalLinkBehavior, TerminalFontFamily: settings.TerminalFontFamily, TerminalFontSize: settings.TerminalFontSize, + ChangesPanelLayout: settings.ChangesPanelLayout, UpdatedAt: settings.UpdatedAt.Format(time.RFC3339), } } diff --git a/apps/backend/internal/user/models/models.go b/apps/backend/internal/user/models/models.go index df9543510a..4b48a5ff47 100644 --- a/apps/backend/internal/user/models/models.go +++ b/apps/backend/internal/user/models/models.go @@ -37,6 +37,7 @@ type UserSettings struct { TerminalLinkBehavior string `json:"terminal_link_behavior"` // "new_tab" | "browser_panel" TerminalFontFamily string `json:"terminal_font_family"` TerminalFontSize int `json:"terminal_font_size"` + ChangesPanelLayout string `json:"changes_panel_layout"` // "flat" | "tree" CreatedAt time.Time `json:"created_at"` UpdatedAt time.Time `json:"updated_at"` } diff --git a/apps/backend/internal/user/service/service.go b/apps/backend/internal/user/service/service.go index d0c76cb493..b9da43a285 100644 --- a/apps/backend/internal/user/service/service.go +++ b/apps/backend/internal/user/service/service.go @@ -52,6 +52,7 @@ type UpdateUserSettingsRequest struct { TerminalLinkBehavior *string TerminalFontFamily *string TerminalFontSize *int + ChangesPanelLayout *string } func NewService(repo store.Repository, eventBus bus.EventBus, log *logger.Logger) *Service { @@ -174,6 +175,9 @@ func applyBasicSettings(settings *models.UserSettings, req *UpdateUserSettingsRe if err := applyTerminalLinkBehavior(settings, req.TerminalLinkBehavior); err != nil { return err } + if err := applyChangesPanelLayout(settings, req.ChangesPanelLayout); err != nil { + return err + } if req.TerminalFontFamily != nil { settings.TerminalFontFamily = strings.TrimSpace(*req.TerminalFontFamily) } @@ -199,6 +203,18 @@ func applyTerminalLinkBehavior(settings *models.UserSettings, value *string) err return nil } +func applyChangesPanelLayout(settings *models.UserSettings, value *string) error { + if value == nil { + return nil + } + v := strings.TrimSpace(*value) + if v != "flat" && v != "tree" { + return errors.New("changes_panel_layout must be 'flat' or 'tree'") + } + settings.ChangesPanelLayout = v + return nil +} + // applyChatSubmitKey validates and applies the chat_submit_key setting. func (s *Service) applyChatSubmitKey(settings *models.UserSettings, req *UpdateUserSettingsRequest) error { if req.ChatSubmitKey == nil { @@ -310,6 +326,7 @@ func (s *Service) publishUserSettingsEvent(ctx context.Context, settings *models "terminal_link_behavior": settings.TerminalLinkBehavior, "terminal_font_family": settings.TerminalFontFamily, "terminal_font_size": settings.TerminalFontSize, + "changes_panel_layout": settings.ChangesPanelLayout, "updated_at": settings.UpdatedAt.Format(time.RFC3339), } if err := s.eventBus.Publish(ctx, events.UserSettingsUpdated, bus.NewEvent(events.UserSettingsUpdated, "user-service", data)); err != nil { diff --git a/apps/backend/internal/user/service/service_test.go b/apps/backend/internal/user/service/service_test.go index c294442b31..1e3a1efdbb 100644 --- a/apps/backend/internal/user/service/service_test.go +++ b/apps/backend/internal/user/service/service_test.go @@ -134,6 +134,60 @@ func TestApplyBasicSettings_TerminalFontFamily(t *testing.T) { }) } +func TestApplyChangesPanelLayout(t *testing.T) { + t.Run("nil leaves settings unchanged", func(t *testing.T) { + settings := &models.UserSettings{ChangesPanelLayout: "tree"} + req := &UpdateUserSettingsRequest{} + if err := applyBasicSettings(settings, req); err != nil { + t.Fatalf("unexpected error: %v", err) + } + if settings.ChangesPanelLayout != "tree" { + t.Fatalf("expected ChangesPanelLayout=tree, got %s", settings.ChangesPanelLayout) + } + }) + + t.Run("sets tree when provided", func(t *testing.T) { + settings := &models.UserSettings{} + req := &UpdateUserSettingsRequest{ChangesPanelLayout: ptr("tree")} + if err := applyBasicSettings(settings, req); err != nil { + t.Fatalf("unexpected error: %v", err) + } + if settings.ChangesPanelLayout != "tree" { + t.Fatalf("expected ChangesPanelLayout=tree, got %s", settings.ChangesPanelLayout) + } + }) + + t.Run("sets flat when provided", func(t *testing.T) { + settings := &models.UserSettings{ChangesPanelLayout: "tree"} + req := &UpdateUserSettingsRequest{ChangesPanelLayout: ptr("flat")} + if err := applyBasicSettings(settings, req); err != nil { + t.Fatalf("unexpected error: %v", err) + } + if settings.ChangesPanelLayout != "flat" { + t.Fatalf("expected ChangesPanelLayout=flat, got %s", settings.ChangesPanelLayout) + } + }) + + t.Run("rejects invalid value", func(t *testing.T) { + settings := &models.UserSettings{} + req := &UpdateUserSettingsRequest{ChangesPanelLayout: ptr("grid")} + if err := applyBasicSettings(settings, req); err == nil { + t.Fatal("expected error for invalid layout, got nil") + } + }) + + t.Run("trims whitespace before validation", func(t *testing.T) { + settings := &models.UserSettings{} + req := &UpdateUserSettingsRequest{ChangesPanelLayout: ptr(" tree ")} + if err := applyBasicSettings(settings, req); err != nil { + t.Fatalf("unexpected error: %v", err) + } + if settings.ChangesPanelLayout != "tree" { + t.Fatalf("expected ChangesPanelLayout=tree, got %q", settings.ChangesPanelLayout) + } + }) +} + func TestApplyBasicSettings_TerminalFontSize(t *testing.T) { t.Run("nil leaves settings unchanged", func(t *testing.T) { settings := &models.UserSettings{TerminalFontSize: 14} diff --git a/apps/backend/internal/user/store/sqlite.go b/apps/backend/internal/user/store/sqlite.go index 1580720ae1..954c9f93b6 100644 --- a/apps/backend/internal/user/store/sqlite.go +++ b/apps/backend/internal/user/store/sqlite.go @@ -161,6 +161,7 @@ func (r *sqliteRepository) UpsertUserSettings(ctx context.Context, settings *mod "terminal_link_behavior": settings.TerminalLinkBehavior, "terminal_font_family": settings.TerminalFontFamily, "terminal_font_size": settings.TerminalFontSize, + "changes_panel_layout": settings.ChangesPanelLayout, }) if err != nil { return err @@ -205,6 +206,7 @@ func scanUserSettings(scanner interface{ Scan(dest ...any) error }, userID strin settings.ChatSubmitKey = "cmd_enter" settings.KeyboardShortcuts = map[string]interface{}{} settings.TerminalLinkBehavior = "new_tab" + settings.ChangesPanelLayout = "flat" settings.SidebarViews = []models.SidebarView{} return settings, nil } @@ -232,6 +234,7 @@ func scanUserSettings(scanner interface{ Scan(dest ...any) error }, userID strin TerminalLinkBehavior string `json:"terminal_link_behavior"` TerminalFontFamily string `json:"terminal_font_family"` TerminalFontSize int `json:"terminal_font_size"` + ChangesPanelLayout string `json:"changes_panel_layout"` } if err := json.Unmarshal([]byte(settingsRaw), &payload); err != nil { return nil, err @@ -291,5 +294,10 @@ func scanUserSettings(scanner interface{ Scan(dest ...any) error }, userID strin } settings.TerminalFontFamily = payload.TerminalFontFamily settings.TerminalFontSize = payload.TerminalFontSize + if payload.ChangesPanelLayout == "tree" { + settings.ChangesPanelLayout = "tree" + } else { + settings.ChangesPanelLayout = "flat" + } return settings, nil } diff --git a/apps/web/components/settings/editors-settings-state.tsx b/apps/web/components/settings/editors-settings-state.tsx index 81dd08ee69..2d2e76e3be 100644 --- a/apps/web/components/settings/editors-settings-state.tsx +++ b/apps/web/components/settings/editors-settings-state.tsx @@ -244,6 +244,7 @@ function buildUserSettingsFromResponse( terminalLinkBehavior: parseTerminalLinkBehavior(s.terminal_link_behavior), terminalFontFamily: s.terminal_font_family || null, terminalFontSize: s.terminal_font_size || null, + changesPanelLayout: s.changes_panel_layout === "tree" ? ("tree" as const) : ("flat" as const), ...mapEditorSettingsFields(s), }; } diff --git a/apps/web/components/settings/general-settings.tsx b/apps/web/components/settings/general-settings.tsx index 7812a29fb8..0203d71311 100644 --- a/apps/web/components/settings/general-settings.tsx +++ b/apps/web/components/settings/general-settings.tsx @@ -8,6 +8,7 @@ import { IconServer, IconKeyboard, IconTerminal2, + IconGitBranch, } from "@tabler/icons-react"; import { Badge } from "@kandev/ui/badge"; import { Card, CardContent, CardHeader, CardTitle } from "@kandev/ui/card"; @@ -116,6 +117,65 @@ function ChatSubmitKeyCard() { ); } +function ChangesPanelLayoutCard() { + const userSettings = useAppStore((state) => state.userSettings); + const setUserSettings = useAppStore((state) => state.setUserSettings); + const storeApi = useAppStoreApi(); + const [isSaving, setIsSaving] = useState(false); + + const handleChange = async (value: "flat" | "tree") => { + if (isSaving) return; + setIsSaving(true); + const current = storeApi.getState().userSettings; + const previous = current.changesPanelLayout; + try { + setUserSettings({ ...current, changesPanelLayout: value }); + await updateUserSettings({ + workspace_id: current.workspaceId || "", + repository_ids: current.repositoryIds || [], + changes_panel_layout: value, + }); + } catch { + setUserSettings({ ...storeApi.getState().userSettings, changesPanelLayout: previous }); + } finally { + setIsSaving(false); + } + }; + + return ( + + + Changes Panel Layout + + +
+ + +

+ Display changed files as a flat list with full paths, or as a folder tree. +

+
+
+
+ ); +} + function TerminalLinksCard() { const userSettings = useAppStore((state) => state.userSettings); const setUserSettings = useAppStore((state) => state.setUserSettings); @@ -450,6 +510,16 @@ export function GeneralSettings() { + } + title="Changes Panel" + description="Customize how changed files are displayed" + > + + + + + } title="Keyboard Shortcuts" diff --git a/apps/web/components/task/changes-panel-file-row.tsx b/apps/web/components/task/changes-panel-file-row.tsx index b4cd90610a..f60c777f61 100644 --- a/apps/web/components/task/changes-panel-file-row.tsx +++ b/apps/web/components/task/changes-panel-file-row.tsx @@ -13,8 +13,9 @@ import { Button } from "@kandev/ui/button"; import { cn } from "@/lib/utils"; import { Tooltip, TooltipContent, TooltipTrigger } from "@kandev/ui/tooltip"; import { LineStat } from "@/components/diff-stat"; -import type { FileInfo } from "@/lib/state/store"; +import { FileIcon } from "@/components/ui/file-icon"; import { FileStatusIcon } from "./file-status-icon"; +import type { ChangedFile } from "./changes-panel-helpers"; import type { OpenDiffOptions } from "./changes-diff-target"; const splitPath = (path: string) => { @@ -26,17 +27,6 @@ const splitPath = (path: string) => { }; }; -type ChangedFile = { - path: string; - status: FileInfo["status"]; - staged: boolean; - plus: number | undefined; - minus: number | undefined; - oldPath: string | undefined; - /** Multi-repo: name of the repo this file lives in. Empty for single-repo. */ - repositoryName?: string; -}; - type FileRowProps = { file: ChangedFile; isPending: boolean; @@ -52,6 +42,15 @@ type FileRowProps = { onUnstage: (path: string, repo?: string) => void; onDiscard: (path: string, repo?: string) => void; onEditFile: (path: string) => void; + /** + * Tree mode: skip the folder prefix, swap the left-side stage button for a + * filetype icon, and surface the stage action only on row hover (VS Code- + * style). The Unstaged / Staged section split keeps the staged state + * visually obvious even without the always-on left chip. + */ + treeMode?: boolean; + /** Tree mode: left padding in pixels driven by depth. */ + indentPx?: number; }; export function FileRow({ @@ -65,8 +64,11 @@ export function FileRow({ onUnstage, onDiscard, onEditFile, + treeMode, + indentPx, }: FileRowProps) { const { folder, file: name } = splitPath(file.path); + const showFolder = !treeMode && folder; const handleClick = (e: React.MouseEvent) => { if (e.button === 2) return; @@ -94,18 +96,25 @@ export function FileRow({ )} onClick={handleClick} > -
- +
+ {treeMode ? ( + + ) : ( + + )} + {(onRepoAction || onRepoSecondaryAction) && ( +
+ {onRepoAction && ( + + )} + {onRepoSecondaryAction && secondaryLabel && ( + + )} +
+ )} +
+ {!collapsed && ( + + )} +
+ ); +} + +function TreeDirRow({ row, onToggle }: { row: VisibleRow; onToggle: () => void }) { + return ( +
  • + +
  • + ); +} diff --git a/apps/web/hooks/use-user-display-settings.ts b/apps/web/hooks/use-user-display-settings.ts index 0109085a76..250e2bac23 100644 --- a/apps/web/hooks/use-user-display-settings.ts +++ b/apps/web/hooks/use-user-display-settings.ts @@ -51,6 +51,7 @@ function carryForwardSettings(current: DisplaySettings) { sidebarViews: current.sidebarViews ?? [], defaultUtilityAgentId: current.defaultUtilityAgentId ?? null, keyboardShortcuts: current.keyboardShortcuts ?? {}, + changesPanelLayout: current.changesPanelLayout ?? "flat", ...carryForwardTerminalSettings(current), }; } diff --git a/apps/web/lib/api/domains/settings-api.ts b/apps/web/lib/api/domains/settings-api.ts index 9e95648b30..044d1918a6 100644 --- a/apps/web/lib/api/domains/settings-api.ts +++ b/apps/web/lib/api/domains/settings-api.ts @@ -51,6 +51,7 @@ export async function updateUserSettings( terminal_link_behavior?: "new_tab" | "browser_panel"; terminal_font_family?: string; terminal_font_size?: number; + changes_panel_layout?: "flat" | "tree"; }, options?: ApiRequestOptions, ) { diff --git a/apps/web/lib/ssr/user-settings.test.ts b/apps/web/lib/ssr/user-settings.test.ts index 68e3004a12..04f425b0dd 100644 --- a/apps/web/lib/ssr/user-settings.test.ts +++ b/apps/web/lib/ssr/user-settings.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect } from "vitest"; -import { buildCoreFields, mapUserSettingsResponse } from "./user-settings"; +import { buildCoreFields, mapUserSettingsResponse, parseChangesPanelLayout } from "./user-settings"; describe("buildCoreFields", () => { it("maps terminal_font_family to terminalFontFamily", () => { @@ -84,4 +84,22 @@ describe("mapUserSettingsResponse", () => { const result = mapUserSettingsResponse(null); expect(result.terminalFontFamily).toBeNull(); }); + + it("defaults changesPanelLayout to flat when response is null", () => { + const result = mapUserSettingsResponse(null); + expect(result.changesPanelLayout).toBe("flat"); + }); +}); + +describe("parseChangesPanelLayout", () => { + it('returns "tree" for "tree"', () => { + expect(parseChangesPanelLayout("tree")).toBe("tree"); + }); + + it('returns "flat" for "flat", undefined, or unknown values', () => { + expect(parseChangesPanelLayout("flat")).toBe("flat"); + expect(parseChangesPanelLayout(undefined)).toBe("flat"); + expect(parseChangesPanelLayout("grid")).toBe("flat"); + expect(parseChangesPanelLayout("")).toBe("flat"); + }); }); diff --git a/apps/web/lib/ssr/user-settings.ts b/apps/web/lib/ssr/user-settings.ts index 36599b2432..74a3d127fe 100644 --- a/apps/web/lib/ssr/user-settings.ts +++ b/apps/web/lib/ssr/user-settings.ts @@ -8,11 +8,16 @@ export function parseTerminalLinkBehavior(value: string | undefined): "new_tab" return value === "browser_panel" ? "browser_panel" : "new_tab"; } +export function parseChangesPanelLayout(value: string | undefined): "flat" | "tree" { + return value === "tree" ? "tree" : "flat"; +} + function buildTerminalFields(s: UserSettingsData) { return { terminalLinkBehavior: parseTerminalLinkBehavior(s.terminal_link_behavior), terminalFontFamily: s.terminal_font_family || null, terminalFontSize: s.terminal_font_size || null, + changesPanelLayout: parseChangesPanelLayout(s.changes_panel_layout), }; } @@ -85,6 +90,7 @@ export function mapUserSettingsResponse(response: UserSettingsResponse | null) { terminalLinkBehavior: "new_tab" as const, terminalFontFamily: null, terminalFontSize: null, + changesPanelLayout: "flat" as const, ...buildLspFields(undefined), loaded: false, }; diff --git a/apps/web/lib/state/slices/settings/settings-slice.ts b/apps/web/lib/state/slices/settings/settings-slice.ts index edbf2d4af0..26ce9c67bf 100644 --- a/apps/web/lib/state/slices/settings/settings-slice.ts +++ b/apps/web/lib/state/slices/settings/settings-slice.ts @@ -43,6 +43,7 @@ export const defaultSettingsState: SettingsSliceState = { keyboardShortcuts: {}, terminalFontFamily: null, terminalFontSize: null, + changesPanelLayout: "flat", loaded: false, }, }; diff --git a/apps/web/lib/state/slices/settings/types.ts b/apps/web/lib/state/slices/settings/types.ts index 7949a87396..73f0947613 100644 --- a/apps/web/lib/state/slices/settings/types.ts +++ b/apps/web/lib/state/slices/settings/types.ts @@ -155,6 +155,7 @@ export type UserSettingsState = { terminalLinkBehavior: "new_tab" | "browser_panel"; terminalFontFamily: string | null; terminalFontSize: number | null; + changesPanelLayout: "flat" | "tree"; loaded: boolean; }; diff --git a/apps/web/lib/types/backend.ts b/apps/web/lib/types/backend.ts index f0ce16ced5..42d07f7947 100644 --- a/apps/web/lib/types/backend.ts +++ b/apps/web/lib/types/backend.ts @@ -381,6 +381,7 @@ export type UserSettingsUpdatedPayload = { default_utility_agent_id?: string; keyboard_shortcuts?: Record }>; terminal_link_behavior?: string; + changes_panel_layout?: "flat" | "tree"; updated_at?: string; }; diff --git a/apps/web/lib/types/http.ts b/apps/web/lib/types/http.ts index 4046f4d86d..709c31d4c3 100644 --- a/apps/web/lib/types/http.ts +++ b/apps/web/lib/types/http.ts @@ -430,6 +430,7 @@ export type UserSettings = { terminal_link_behavior?: string; terminal_font_family?: string; terminal_font_size?: number; + changes_panel_layout?: "flat" | "tree"; updated_at: string; }; diff --git a/apps/web/lib/ws/handlers/users.ts b/apps/web/lib/ws/handlers/users.ts index 921cd77618..1ddb7a71c5 100644 --- a/apps/web/lib/ws/handlers/users.ts +++ b/apps/web/lib/ws/handlers/users.ts @@ -30,6 +30,7 @@ export function registerUsersHandlers(store: StoreApi): WsHandlers { message.payload.terminal_link_behavior === "browser_panel" ? "browser_panel" : "new_tab", + changesPanelLayout: message.payload.changes_panel_layout === "tree" ? "tree" : "flat", loaded: true, }, }));