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 ? (
+
+ ) : (
+
+ )}