♻️ refactor(web): consolidate design-system primitives and responsive data views

common/constants.go

@@ -80,7 +80,7 @@ var SessionCookieTrustedURLs []string
 var OptionMap map[string]string
 var OptionMapRWMutex sync.RWMutex
 
-var ItemsPerPage = 10
+var ItemsPerPage = 20
 var MaxRecentItems = 1000
 
 var PasswordLoginEnabled = true

controller/channel.go

@@ -1488,7 +1488,7 @@ func ManageMultiKeys(c *gin.Context) {
 			page = 1
 		}
 		if pageSize <= 0 {
-			pageSize = 50 // Default page size
+			pageSize = common.ItemsPerPage
 		}
 
 		// Statistics for all keys (unchanged by filtering)

web/bun.lock

@@ -83,7 +83,6 @@
         "@tanstack/react-query": "^5.101.2",
         "@tanstack/react-router": "^1.170.17",
         "@tanstack/react-table": "^8.21.3",
-        "@tanstack/react-virtual": "^3.14.5",
         "@visactor/react-vchart": "^2.1.2",
         "@visactor/vchart": "^2.1.2",
         "ai": "^7.0.14",
@@ -92,6 +91,7 @@
         "class-variance-authority": "^0.7.1",
         "clsx": "catalog:",
         "cmdk": "^1.1.1",
+        "date-fns": "^4.4.0",
         "dayjs": "catalog:",
         "dompurify": "3.4.11",
         "i18next": "^26.3.4",
@@ -112,7 +112,7 @@
         "react-icons": "catalog:",
         "react-resizable-panels": "^4.12.0",
         "react-top-loading-bar": "^3.0.2",
-        "recharts": "3.9.1",
+        "recharts": "3.8.0",
         "shiki": "^4.3.0",
         "sonner": "^2.0.7",
         "sse.js": "catalog:",
@@ -122,7 +122,6 @@
         "tokenlens": "^1.3.1",
         "tw-animate-css": "^1.4.0",
         "use-stick-to-bottom": "^1.1.6",
-        "vaul": "^1.1.2",
         "zod": "^4.4.3",
         "zustand": "^5.0.14",
       },
@@ -958,8 +957,6 @@
 
     "@tanstack/react-table": ["@tanstack/react-table@8.21.3", "", { "dependencies": { "@tanstack/table-core": "8.21.3" }, "peerDependencies": { "react": ">=16.8", "react-dom": ">=16.8" } }, "sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww=="],
 
-    "@tanstack/react-virtual": ["@tanstack/react-virtual@3.14.5", "", { "dependencies": { "@tanstack/virtual-core": "3.17.3" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-4EKRXh7zBLkbKbFmG3AUVkircuHd+7OdT1pocJSepxtfBd3qnrJgJ5rtPkRYyo9fmyVb2+pI2xPy5oYvMLQy6A=="],
-
     "@tanstack/router-core": ["@tanstack/router-core@1.171.8", "", { "dependencies": { "@tanstack/history": "1.162.0", "cookie-es": "^3.0.0", "seroval": "^1.5.4", "seroval-plugins": "^1.5.4" } }, "sha512-PbrTBbofFcacrH3RLgHYILRqTFnAGq+gXrXoA/vo7qUSkJpSO4GWfLtrtCahD4VayzRm19IPwcjPPLEugag6pw=="],
 
     "@tanstack/router-devtools-core": ["@tanstack/router-devtools-core@1.168.0", "", { "dependencies": { "clsx": "^2.1.1", "goober": "^2.1.16" }, "peerDependencies": { "@tanstack/router-core": "^1.170.0", "csstype": "^3.0.10" }, "optionalPeers": ["csstype"] }, "sha512-wQoQhlBK7nlZgqzaqdYXKWNTpdHdsaREdaPhFZVH0/Ador+F+eM3/NF2i3f2LPeS0GgKraZUQXe1Q/1+KHyEYg=="],
@@ -974,8 +971,6 @@
 
     "@tanstack/table-core": ["@tanstack/table-core@8.21.3", "", {}, "sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg=="],
 
-    "@tanstack/virtual-core": ["@tanstack/virtual-core@3.17.3", "", {}, "sha512-8Np/TFELpI0ySuJoVmjvOrQYXH/8sTX0Biv9szhFhY39xOdAAY+smrMxjxOum/ux3eM8MUJQsEJ0/R0UpvC8dw=="],
-
     "@tanstack/virtual-file-routes": ["@tanstack/virtual-file-routes@1.162.0", "", {}, "sha512-uhOeFyxLcU41HzvrxsGpiWdcMbScY1EDgbZ5K7DVRMYInbLYWAC0EA/kx9wXAoSM8q82bUG2hRl8+EAjE6XAbA=="],
 
     "@tiptap/core": ["@tiptap/core@3.24.0", "", { "peerDependencies": { "@tiptap/pm": "3.24.0" } }, "sha512-GTAsXAI32p4hEZgPzvUv2RPrObxamy9AFhmhG10fXSvN/cDUs8naEYVIqDV3Sh99jMwQEbTFKW1E1mcspsY6ow=="],
@@ -1860,7 +1855,7 @@
 
     "ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
 
-    "immer": ["immer@11.1.8", "", {}, "sha512-/tbkHMW7y10Lx6i1crLjD4/OhNkRG+Fo7byZHtah0547nIeXYcpIXaUh0IAQY6gO5459qpGGYapcEOHtFXkIuA=="],
+    "immer": ["immer@10.2.0", "", {}, "sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw=="],
 
     "import-fresh": ["import-fresh@3.3.1", "", { "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" } }, "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ=="],
 
@@ -2538,7 +2533,7 @@
 
     "recast": ["recast@0.23.11", "", { "dependencies": { "ast-types": "^0.16.1", "esprima": "~4.0.0", "source-map": "~0.6.1", "tiny-invariant": "^1.3.3", "tslib": "^2.0.1" } }, "sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA=="],
 
-    "recharts": ["recharts@3.9.1", "", { "dependencies": { "@reduxjs/toolkit": "^1.9.0 || 2.x.x", "clsx": "^2.1.1", "decimal.js-light": "^2.5.1", "es-toolkit": "^1.39.3", "eventemitter3": "^5.0.1", "immer": "^11.1.8", "react-redux": "8.x.x || 9.x.x", "reselect": "5.2.0", "tiny-invariant": "^1.3.3", "use-sync-external-store": "^1.2.2", "victory-vendor": "^37.0.2" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-is": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-WMcwlXcB7l+BbxiEdyClkG+1sxrMHNZpzT577LEvU4+rXPd8oTAy1wXk72hnk2KOOmxuLvw3z5DtXT7HEAydtg=="],
+    "recharts": ["recharts@3.8.0", "", { "dependencies": { "@reduxjs/toolkit": "^1.9.0 || 2.x.x", "clsx": "^2.1.1", "decimal.js-light": "^2.5.1", "es-toolkit": "^1.39.3", "eventemitter3": "^5.0.1", "immer": "^10.1.1", "react-redux": "8.x.x || 9.x.x", "reselect": "5.1.1", "tiny-invariant": "^1.3.3", "use-sync-external-store": "^1.2.2", "victory-vendor": "^37.0.2" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-is": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-Z/m38DX3L73ExO4Tpc9/iZWHmHnlzWG4njQbxsF5aSjwqmHNDDIm0rdEBArkwsBvR8U6EirlEHiQNYWCVh9sGQ=="],
 
     "recma-build-jsx": ["recma-build-jsx@1.0.0", "", { "dependencies": { "@types/estree": "^1.0.0", "estree-util-build-jsx": "^3.0.0", "vfile": "^6.0.0" } }, "sha512-8GtdyqaBcDfva+GUKDr3nev3VpKAhup1+RvkMvUxURHpW7QyIvk9F5wz7Vzo06CEMSilw6uArgRqhpiUcWp8ew=="],
 
@@ -2590,7 +2585,7 @@
 
     "require-from-string": ["require-from-string@2.0.2", "", {}, "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="],
 
-    "reselect": ["reselect@5.2.0", "", {}, "sha512-AgZ3UOZm3YndfrJ4OYjgrT7bmCm/1iqkjvEfH/oYjzh6PD2qw4QuT3jjnXIrpdt4MTpMXclMT3lXbmRY+XRakw=="],
+    "reselect": ["reselect@5.1.1", "", {}, "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w=="],
 
     "resize-observer-polyfill": ["resize-observer-polyfill@1.5.1", "", {}, "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="],
 
@@ -2878,8 +2873,6 @@
 
     "vary": ["vary@1.1.2", "", {}, "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="],
 
-    "vaul": ["vaul@1.1.2", "", { "dependencies": { "@radix-ui/react-dialog": "^1.1.1" }, "peerDependencies": { "react": "^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc" } }, "sha512-ZFkClGpWyI2WUQjdLJ/BaGuV6AVQiJ3uELGk3OYtP+B6yCO7Cmn9vPFXVJkRaGkOJu3m8bQMgtyzNHixULceQA=="],
-
     "vfile": ["vfile@6.0.3", "", { "dependencies": { "@types/unist": "^3.0.0", "vfile-message": "^4.0.0" } }, "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q=="],
 
     "vfile-location": ["vfile-location@5.0.3", "", { "dependencies": { "@types/unist": "^3.0.0", "vfile": "^6.0.0" } }, "sha512-5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg=="],
@@ -2926,6 +2919,8 @@
 
     "zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="],
 
+    "@base-ui/utils/reselect": ["reselect@5.2.0", "", {}, "sha512-AgZ3UOZm3YndfrJ4OYjgrT7bmCm/1iqkjvEfH/oYjzh6PD2qw4QuT3jjnXIrpdt4MTpMXclMT3lXbmRY+XRakw=="],
+
     "@codemirror/autocomplete/@codemirror/view": ["@codemirror/view@6.43.3", "", { "dependencies": { "@codemirror/state": "^6.7.0", "crelt": "^1.0.6", "style-mod": "^4.1.0", "w3c-keyname": "^2.2.4" } }, "sha512-MwEwCAr/o0agJefhC2+reBv5kfOQpMcDRUNQrRYZgWlhH8IwQcerMZrpqWyUFSyO0ebgN2cnh/w87F7G4BGSng=="],
 
     "@codemirror/lang-html/@codemirror/view": ["@codemirror/view@6.43.3", "", { "dependencies": { "@codemirror/state": "^6.7.0", "crelt": "^1.0.6", "style-mod": "^4.1.0", "w3c-keyname": "^2.2.4" } }, "sha512-MwEwCAr/o0agJefhC2+reBv5kfOQpMcDRUNQrRYZgWlhH8IwQcerMZrpqWyUFSyO0ebgN2cnh/w87F7G4BGSng=="],
@@ -2974,6 +2969,8 @@
 
     "@lobehub/ui/@shikijs/core": ["@shikijs/core@4.1.0", "", { "dependencies": { "@shikijs/primitive": "4.1.0", "@shikijs/types": "4.1.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.5" } }, "sha512-jLJtSJeuFffqX6/inRE1zqU5aFv2hrszvYgq3OjbAgFRZiWv7abKMDdQzYxuSDfmUPQozZvI/kuy6VMTvnvqTQ=="],
 
+    "@lobehub/ui/immer": ["immer@11.1.8", "", {}, "sha512-/tbkHMW7y10Lx6i1crLjD4/OhNkRG+Fo7byZHtah0547nIeXYcpIXaUh0IAQY6gO5459qpGGYapcEOHtFXkIuA=="],
+
     "@lobehub/ui/katex": ["katex@0.16.47", "", { "dependencies": { "commander": "^8.3.0" }, "bin": { "katex": "cli.js" } }, "sha512-Eeo8Ys1doU1z+x8AZsPpQu+p/QcZBI5PeOo7QGQdy2x2m0MU/hYagBbGOmXwr5KVbEfVuWv9LpnQWeehogurjg=="],
 
     "@lobehub/ui/lucide-react": ["lucide-react@1.17.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-9FA9evdox/JQL5PT57fdA1x/yg8T7knJ98+zjTL3UfKza6pflQUUh3XtaQIHKvnsJw1lmsEyHVlt5jchYxOQ5w=="],
@@ -3016,7 +3013,7 @@
 
     "@rc-component/trigger/@rc-component/portal": ["@rc-component/portal@2.2.0", "", { "dependencies": { "@rc-component/util": "^1.2.1", "clsx": "^2.1.1" }, "peerDependencies": { "react": ">=18.0.0", "react-dom": ">=18.0.0" } }, "sha512-oc6FlA+uXCMiwArHsJyHcIkX4q6uKyndrPol2eWX8YPkAnztHOPsFIRtmWG4BMlGE5h7YIRE3NiaJ5VS8Lb1QQ=="],
 
-    "@reduxjs/toolkit/reselect": ["reselect@5.1.1", "", {}, "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w=="],
+    "@reduxjs/toolkit/immer": ["immer@11.1.8", "", {}, "sha512-/tbkHMW7y10Lx6i1crLjD4/OhNkRG+Fo7byZHtah0547nIeXYcpIXaUh0IAQY6gO5459qpGGYapcEOHtFXkIuA=="],
 
     "@rspack/binding-wasm32-wasi/@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.1.6", "", { "dependencies": { "@tybys/wasm-util": "^0.10.3" }, "peerDependencies": { "@emnapi/core": "^1.7.1", "@emnapi/runtime": "^1.7.1" } }, "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg=="],
 
@@ -3462,8 +3459,6 @@
 
     "type-is/mime-types/mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="],
 
-    "@lobehub/ui/@base-ui/react/@base-ui/utils/reselect": ["reselect@5.1.1", "", {}, "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w=="],
-
     "@lobehub/ui/motion/framer-motion/motion-dom": ["motion-dom@12.40.0", "", { "dependencies": { "motion-utils": "^12.39.0" } }, "sha512-HxU3ZaBwNPVQUBQf1xxgq+7JrPNZvjLVxgbpEZL7RrWJnsxOf0/OM+yrHG9ogLQ31Do/r57Oz2gQWPK+6q62mg=="],
 
     "@ts-morph/common/minimatch/brace-expansion/balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="],

web/classic/src/components/settings/ChannelSelectorModal.jsx

@@ -59,7 +59,7 @@ const ChannelSelectorModal = forwardRef(
   ) => {
     const [searchText, setSearchText] = useState('');
     const [currentPage, setCurrentPage] = useState(1);
-    const [pageSize, setPageSize] = useState(10);
+    const [pageSize, setPageSize] = useState(20);
     const isMobile = useIsMobile();
 
     const [filteredData, setFilteredData] = useState([]);

web/classic/src/components/table/channels/modals/MultiKeyManageModal.jsx

@@ -58,7 +58,7 @@ const MultiKeyManageModal = ({ visible, onCancel, channel, onRefresh }) => {
 
   // Pagination states
   const [currentPage, setCurrentPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
+  const [pageSize, setPageSize] = useState(20);
   const [total, setTotal] = useState(0);
   const [totalPages, setTotalPages] = useState(0);
 
@@ -99,7 +99,7 @@ const MultiKeyManageModal = ({ visible, onCancel, channel, onRefresh }) => {
         setKeyStatusList(data.keys || []);
         setTotal(data.total || 0);
         setCurrentPage(data.page || 1);
-        setPageSize(data.page_size || 10);
+        setPageSize(data.page_size || 20);
         setTotalPages(data.total_pages || 0);
 
         // Update statistics (these are always the overall statistics)

web/classic/src/components/table/users/modals/UserSubscriptionsModal.jsx

@@ -84,7 +84,7 @@ const UserSubscriptionsModal = ({ visible, onCancel, user, t, onSuccess }) => {
 
   const [subs, setSubs] = useState([]);
   const [currentPage, setCurrentPage] = useState(1);
-  const pageSize = 10;
+  const pageSize = 20;
 
   const planTitleMap = useMemo(() => {
     const map = new Map();

web/classic/src/components/topup/modals/TopupHistoryModal.jsx

@@ -61,7 +61,7 @@ const TopupHistoryModal = ({ visible, onCancel, t }) => {
   const [topups, setTopups] = useState([]);
   const [total, setTotal] = useState(0);
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
+  const [pageSize, setPageSize] = useState(20);
   const [keyword, setKeyword] = useState('');
   const isMobile = useIsMobile();
 

web/classic/src/constants/channel.constants.js

@@ -196,4 +196,4 @@ export const MODEL_FETCHABLE_CHANNEL_TYPES = new Set([
   1, 4, 14, 34, 17, 26, 27, 24, 47, 25, 20, 23, 31, 40, 42, 48, 43,
 ]);
 
-export const MODEL_TABLE_PAGE_SIZE = 10;
+export const MODEL_TABLE_PAGE_SIZE = 20;

web/classic/src/constants/common.constant.js

@@ -17,7 +17,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 For commercial licensing, please contact support@quantumnous.com
 */
 
-export const ITEMS_PER_PAGE = 10; // this value must keep same as the one defined in backend!
+export const ITEMS_PER_PAGE = 20; // this value must keep same as the one defined in backend!
 
 export const DEFAULT_ENDPOINT = '/api/pricing';
 

web/classic/src/constants/dashboard.constants.js

@@ -144,6 +144,6 @@ export const STORAGE_KEYS = {
 export const DEFAULTS = {
   PAGE_SIZE: 20,
   CHART_HEIGHT: 96,
-  MODEL_TABLE_PAGE_SIZE: 10,
+  MODEL_TABLE_PAGE_SIZE: 20,
   MAX_TREND_POINTS: 7,
 };

web/classic/src/hooks/subscriptions/useSubscriptionsData.jsx

@@ -32,7 +32,7 @@ export const useSubscriptionsData = () => {
 
   // Pagination (client-side for now)
   const [activePage, setActivePage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
+  const [pageSize, setPageSize] = useState(20);
 
   // Drawer states
   const [showEdit, setShowEdit] = useState(false);

web/classic/src/pages/Setting/Chat/SettingsChats.jsx

@@ -469,7 +469,7 @@ export default function SettingsChats(props) {
                 dataSource={filteredConfigs}
                 rowKey='id'
                 pagination={{
-                  pageSize: 10,
+                  pageSize: 20,
                   showSizeChanger: false,
                   showQuickJumper: true,
                   showTotal: (total, range) =>

web/classic/src/pages/Setting/Dashboard/SettingsAPIInfo.jsx

@@ -59,7 +59,7 @@ const SettingsAPIInfo = ({ options, refresh }) => {
     color: 'blue',
   });
   const [currentPage, setCurrentPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
+  const [pageSize, setPageSize] = useState(20);
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
 
   // 面板启用状态 state

web/classic/src/pages/Setting/Dashboard/SettingsAnnouncements.jsx

@@ -67,7 +67,7 @@ const SettingsAnnouncements = ({ options, refresh }) => {
     extra: '',
   });
   const [currentPage, setCurrentPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
+  const [pageSize, setPageSize] = useState(20);
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
 
   // 面板启用状态

web/classic/src/pages/Setting/Dashboard/SettingsFAQ.jsx

@@ -56,7 +56,7 @@ const SettingsFAQ = ({ options, refresh }) => {
     answer: '',
   });
   const [currentPage, setCurrentPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
+  const [pageSize, setPageSize] = useState(20);
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
 
   // 面板启用状态

web/classic/src/pages/Setting/Dashboard/SettingsUptimeKuma.jsx

@@ -56,7 +56,7 @@ const SettingsUptimeKuma = ({ options, refresh }) => {
     slug: '',
   });
   const [currentPage, setCurrentPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
+  const [pageSize, setPageSize] = useState(20);
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
   const [panelEnabled, setPanelEnabled] = useState(true);
 

web/classic/src/pages/Setting/Ratio/UpstreamRatioSync.jsx

@@ -122,7 +122,7 @@ export default function UpstreamRatioSync(props) {
 
   // 分页相关状态
   const [currentPage, setCurrentPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
+  const [pageSize, setPageSize] = useState(20);
 
   // 搜索相关状态
   const [searchKeyword, setSearchKeyword] = useState('');

web/classic/src/pages/Setting/Ratio/hooks/useModelPricingEditorState.js

@@ -23,7 +23,7 @@ import {
   splitBillingExprAndRequestRules,
 } from '../components/requestRuleExpr';
 
-export const PAGE_SIZE = 10;
+export const PAGE_SIZE = 20;
 export const PRICE_SUFFIX = '$/1M tokens';
 const EMPTY_CANDIDATE_MODEL_NAMES = [];
 

web/default/.oxlintrc.json

@@ -44,6 +44,33 @@
     "no-duplicate-imports": "error",
     "no-nested-ternary": "error",
     "no-new-wrappers": "error",
+    "no-restricted-imports": [
+      "error",
+      {
+        "patterns": [
+          {
+            "group": [
+              "@/components/ui/alert-dialog",
+              "@/components/ui/button",
+              "@/components/ui/combobox",
+              "@/components/ui/combobox-input",
+              "@/components/ui/command",
+              "@/components/ui/dialog",
+              "@/components/ui/input",
+              "@/components/ui/input-group",
+              "@/components/ui/pagination",
+              "@/components/ui/select",
+              "@/components/ui/sidebar",
+              "@/components/ui/table",
+              "@/components/ui/tabs",
+              "@/components/ui/toggle",
+              "@/components/ui/toggle-group"
+            ],
+            "message": "Import policy-bearing controls from @/components/design-system so responsive sizing stays centralized."
+          }
+        ]
+      }
+    ],
     "no-regex-spaces": "error",
     "no-unsafe-finally": "warn",
     "no-unsafe-negation": "error",
@@ -196,6 +223,19 @@
         "react/only-export-components": "off"
       }
     },
+    {
+      "files": ["src/components/design-system/**/*.{ts,tsx}"],
+      "rules": {
+        "no-restricted-imports": "off",
+        "react/only-export-components": [
+          "error",
+          {
+            "allowConstantExport": true,
+            "allowExportNames": ["useComboboxAnchor", "useSidebar"]
+          }
+        ]
+      }
+    },
     {
       "files": ["**/scripts/**/*.{js,mjs,cjs}"],
       "rules": {

web/default/AGENTS.md

@@ -145,6 +145,19 @@
 - 标题三档契约：页题 `text-lg font-semibold tracking-tight`；卡片/区块题 `text-base font-semibold`；面板/小节题 `text-sm font-medium`。禁止响应式跳字号的标题（如 `text-base sm:text-lg`）。
 - 表头不使用 `uppercase + tracking-wider`。
 
+**控件尺寸（移动优先响应式）**
+
+- `src/components/ui/` 是 shadcn CLI 管理的原始源码层：允许通过 `bunx --bun shadcn@latest add <component> --dry-run/--diff` 审查并合并上游更新，但**禁止**在这里加入产品级响应式策略、业务语义或一次性样式。不得用 `--overwrite` 覆盖本地代码，除非用户明确批准。
+- `src/components/design-system/` 是产品设计系统适配层，只包装确实承载稳定跨站策略的控件（尺寸、产品级 variant、复合控件内部的策略传递）；不要为了“统一入口”代理所有 shadcn 组件。业务代码对受管控件必须从该目录导入，`.oxlintrc.json` 的 `no-restricted-imports` 会阻止绕过边界。
+- 控件标准高度是响应式的：**手机（<640px）28px，桌面（`sm:` 起）32px**。断点由 `design-system` 适配层统一注入（`Button`/`Toggle` default 与 icon 档、`Input`、`InputGroup`、`SelectTrigger` default 档、`TabsList`、`Combobox`、`CommandInput`、分页、表头 `h-9 sm:h-10`），业务代码**不写**断点类即可获得正确尺寸。
+- 独立场景（工具栏、表单、对话框、卡片/列表行操作、页脚）一律用默认档，**禁止** `size='sm'`，也**禁止**用 `className` 写 `h-7`/`h-8`/`h-9`/`size-8` 等钉死尺寸——钉死的类会在某一断点上与内置的 `sm:h-8`/`sm:size-8` 打架（twMerge 不会跨断点去重）。
+- 密集场景（表格单元格内、行内编辑器一行多控件、紧凑抽屉行）统一 `size='sm'`（28px 恒定）；微型场景用 `xs`（24px 恒定）。`sm`/`xs`/`icon-sm`/`icon-xs` 是**固定档**，不随断点缩放；需要"固定自定义尺寸"的特例（如覆盖层小按钮）应以固定档为基底再覆写，绝不以 default/icon 为基底。
+- 图标按钮用 `icon`（28→32px 响应式）/`icon-sm`（28px 恒定）/`icon-xs`（24px 恒定）并带 `aria-label`；禁止 `size-*`、`h-* w-*`、`p-0` 组合模拟。头部全局操作（侧栏开关/主题/语言/通知/头像）统一 `icon`。
+- CTA 档 `xl`（40→44px 响应式）：auth 页主按钮（登录/注册/OTP/重置/OAuth/Passkey）与营销页 hero 按钮统一 `size='xl'`，禁止再写 `h-11`。
+- 确需自定义高度时必须**成对覆盖两个断点**：内容自适应写 `h-auto sm:h-auto`，特大输入写 `h-9 sm:h-10` 这类成对值；`min-h-*` 不与内置高度冲突可单独使用。flex-wrap 的 `TabsList` 用 `group-data-horizontal/tabs:h-auto sm:group-data-horizontal/tabs:h-auto`。
+- 手机端的“视觉紧凑”不得牺牲可操作性：所有指针目标至少满足 WCAG 2.2 AA 的 24×24 CSS px；相邻 28px 控件必须保留足够间距，主要提交/认证/高频操作优先使用 40px 的 `xl` 档。不要在手机端新增小于 `xs` 的交互目标。
+- 仅有例外：日历格（`--cell-size`）、OTP 输入格、营销页装饰元素。新增例外须在评审说明。
+
 **圆角与阴影**
 
 - 圆角单源 `--radius`（默认 0.625rem），组件用派生档 `rounded-md/lg/xl`；禁止在业务代码里写死圆角像素或混用 `rounded-2xl`/`rounded-4xl` 表达同类容器。
@@ -163,7 +176,7 @@
 ### 3.11 文件组织
 
 - **功能模块**：置于 `src/features/<feature>/`，内含 `components/`、`lib/`、`hooks/`，以及按需的 `api.ts`、`types.ts`、`constants.ts`、入口组件等。
-- **通用**：通用组件放 `src/components/`，通用工具与类型放 `src/lib/`；组件文件 PascalCase，工具/类型文件 kebab-case 或 `types.ts`，类型使用 PascalCase 命名并 `export type`。
+- **通用**：通用组件放 `src/components/`，其中 `components/ui/` 仅存 shadcn 原始源码、`components/design-system/` 存产品策略适配器；通用工具与类型放 `src/lib/`。组件文件 PascalCase，工具/类型文件 kebab-case 或 `types.ts`，类型使用 PascalCase 命名并 `export type`。
 
 ### 3.12 可访问性
 
@@ -214,3 +227,6 @@
 - **2026-01-31**：在 3.2 中补充「类型检查」要求：改动 TS/TSX 后须执行 typecheck 并修复至无错。
 - **2026-06-21**：在 3.2 中补充「Lint 检查」要求：完成代码改动前须修复所涉及文件的所有 lint error。
 - **2026-07-11**：新增 3.10.1「设计系统纪律」：语义色硬约束（去彩虹徽章/硬编码调色板）、排版契约（字号/字重/标题三档/mono 边界）、圆角单源、后台零入场动效、徽章与图标单轨。
+- **2026-07-11**：3.10.1 新增「控件尺寸」：控件默认 32px（`h-8`）单一标准；独立场景禁用 `size='sm'` 与 `className` 高度硬改；密集行内统一 `sm`、微型 `xs`；图标按钮走 `icon/icon-sm/icon-xs` 档位。
+- **2026-07-11**：控件尺寸升级为移动优先响应式：设计系统统一手机 28px / 桌面 32px（default、icon 档随断点缩放，`sm`/`xs`/`icon-sm`/`icon-xs` 恒定）；新增 CTA 档 `xl`（40→44px），auth 与 hero 主按钮统一迁入；调用点禁止钉死 `h-*`/`size-*`，自定义高度必须成对覆盖两个断点（如 `h-auto sm:h-auto`）。
+- **2026-07-11**：将响应式尺寸策略从 shadcn 原始源码迁至 `components/design-system/` 适配层；业务受管控件统一改从适配层导入，并由 lint 禁止绕过；`components/ui/` 恢复为可用 CLI `--diff` 维护的上游源码边界。

web/default/package.json

@@ -34,7 +34,6 @@
     "@tanstack/react-query": "^5.101.2",
     "@tanstack/react-router": "^1.170.17",
     "@tanstack/react-table": "^8.21.3",
-    "@tanstack/react-virtual": "^3.14.5",
     "@visactor/react-vchart": "^2.1.2",
     "@visactor/vchart": "^2.1.2",
     "ai": "^7.0.14",
@@ -43,6 +42,7 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "catalog:",
     "cmdk": "^1.1.1",
+    "date-fns": "^4.4.0",
     "dayjs": "catalog:",
     "dompurify": "3.4.11",
     "i18next": "^26.3.4",
@@ -63,7 +63,7 @@
     "react-icons": "catalog:",
     "react-resizable-panels": "^4.12.0",
     "react-top-loading-bar": "^3.0.2",
-    "recharts": "3.9.1",
+    "recharts": "3.8.0",
     "shiki": "^4.3.0",
     "sonner": "^2.0.7",
     "sse.js": "catalog:",
@@ -73,7 +73,6 @@
     "tokenlens": "^1.3.1",
     "tw-animate-css": "^1.4.0",
     "use-stick-to-bottom": "^1.1.6",
-    "vaul": "^1.1.2",
     "zod": "^4.4.3",
     "zustand": "^5.0.14"
   },

web/default/src/components/ai-elements/actions.tsx

@@ -20,7 +20,7 @@ For commercial licensing, please contact support@quantumnous.com
 
 import type { ComponentProps } from 'react'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   Tooltip,
   TooltipContent,
@@ -48,13 +48,13 @@ export const Action = ({
   label,
   className,
   variant = 'ghost',
-  size = 'sm',
+  size = 'icon',
   ...props
 }: ActionProps) => {
   const button = (
     <Button
       className={cn(
-        'text-muted-foreground hover:text-foreground relative size-9 p-1.5',
+        'text-muted-foreground hover:text-foreground relative',
         className
       )}
       size={size}

web/default/src/components/ai-elements/artifact.tsx

@@ -22,7 +22,7 @@ import { type LucideIcon, XIcon } from 'lucide-react'
 import type { ComponentProps, HTMLAttributes } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   Tooltip,
   TooltipContent,
@@ -63,17 +63,14 @@ export type ArtifactCloseProps = ComponentProps<typeof Button>
 export const ArtifactClose = ({
   className,
   children,
-  size = 'sm',
+  size = 'icon',
   variant = 'ghost',
   ...props
 }: ArtifactCloseProps) => {
   const { t } = useTranslation()
   return (
     <Button
-      className={cn(
+      className={cn('text-muted-foreground hover:text-foreground', className)}
-        'text-muted-foreground hover:text-foreground size-8 p-0',
-        className
-      )}
       size={size}
       type='button'
       variant={variant}
@@ -124,16 +121,13 @@ export const ArtifactAction = ({
   icon: Icon,
   children,
   className,
-  size = 'sm',
+  size = 'icon',
   variant = 'ghost',
   ...props
 }: ArtifactActionProps) => {
   const button = (
     <Button
-      className={cn(
+      className={cn('text-muted-foreground hover:text-foreground', className)}
-        'text-muted-foreground hover:text-foreground size-8 p-0',
-        className
-      )}
       size={size}
       type='button'
       variant={variant}

web/default/src/components/ai-elements/branch.tsx

@@ -32,7 +32,7 @@ import {
 } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import { cn } from '@/lib/utils'
 
 type BranchContextType = {
@@ -178,14 +178,14 @@ export const BranchPrevious = ({
     <Button
       aria-label={t('Previous branch')}
       className={cn(
-        'text-muted-foreground size-7 shrink-0 transition-colors',
+        'text-muted-foreground shrink-0 transition-colors',
         'hover:bg-accent hover:text-foreground',
         'disabled:pointer-events-none disabled:opacity-50',
         className
       )}
       disabled={totalBranches <= 1}
       onClick={goToPrevious}
-      size='icon'
+      size='icon-sm'
       type='button'
       variant='ghost'
       {...props}
@@ -209,14 +209,14 @@ export const BranchNext = ({
     <Button
       aria-label={t('Next branch')}
       className={cn(
-        'text-muted-foreground size-7 shrink-0 transition-colors',
+        'text-muted-foreground shrink-0 transition-colors',
         'hover:bg-accent hover:text-foreground',
         'disabled:pointer-events-none disabled:opacity-50',
         className
       )}
       disabled={totalBranches <= 1}
       onClick={goToNext}
-      size='icon'
+      size='icon-sm'
       type='button'
       variant='ghost'
       {...props}

web/default/src/components/ai-elements/code-block.tsx

@@ -46,7 +46,7 @@ import {
 import { useTranslation } from 'react-i18next'
 import type { BundledLanguage } from 'shiki'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   Tooltip,
   TooltipContent,
@@ -507,9 +507,8 @@ export const CodeBlock = ({
                   render={
                     <Button
                       aria-label={isCodeCollapsed ? t('Expand') : t('Collapse')}
-                      className='size-8'
                       onClick={() => setIsCollapsed((value) => !value)}
-                      size='icon-sm'
+                      size='icon'
                       type='button'
                       variant='ghost'
                     >
@@ -532,9 +531,8 @@ export const CodeBlock = ({
                 render={
                   <Button
                     aria-label={t('Download')}
-                    className='size-8'
                     onClick={downloadCode}
-                    size='icon-sm'
+                    size='icon'
                     type='button'
                     variant='ghost'
                   >
@@ -641,9 +639,9 @@ export const CodeBlockCopyButton = ({
   const button = (
     <Button
       aria-label={isCopied ? t('Copied!') : t('Copy code')}
-      className={cn('size-8 shrink-0', className)}
+      className={cn('shrink-0', className)}
       onClick={copyToClipboard}
-      size='icon-sm'
+      size='icon'
       type='button'
       variant='ghost'
       {...props}

web/default/src/components/ai-elements/confirmation.tsx

@@ -26,8 +26,8 @@ import {
   useContext,
 } from 'react'
 
+import { Button } from '@/components/design-system/button'
 import { Alert, AlertDescription } from '@/components/ui/alert'
-import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
 
 // Workaround for missing types in 'ai' package
@@ -169,5 +169,5 @@ export const ConfirmationActions = ({
 export type ConfirmationActionProps = ComponentProps<typeof Button>
 
 export const ConfirmationAction = (props: ConfirmationActionProps) => (
-  <Button className='h-8 px-3 text-sm' type='button' {...props} />
+  <Button type='button' {...props} />
 )

web/default/src/components/ai-elements/context.tsx

@@ -23,7 +23,7 @@ import { type ComponentProps, createContext, useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 import { getUsage } from 'tokenlens'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   HoverCard,
   HoverCardContent,

web/default/src/components/ai-elements/conversation.tsx

@@ -23,7 +23,7 @@ import { type ComponentProps, useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { StickToBottom, useStickToBottomContext } from 'use-stick-to-bottom'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import { cn } from '@/lib/utils'
 
 export type ConversationProps = ComponentProps<typeof StickToBottom>

web/default/src/components/ai-elements/inline-citation.tsx

@@ -29,8 +29,8 @@ import {
 } from 'react'
 import { useTranslation } from 'react-i18next'
 
+import { Button } from '@/components/design-system/button'
 import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
 import {
   Carousel,
   type CarouselApi,

web/default/src/components/ai-elements/open-in-chat.tsx

@@ -24,7 +24,7 @@ import {
 import { type ComponentProps, createContext, useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   DropdownMenu,
   DropdownMenuContent,

web/default/src/components/ai-elements/plan.tsx

@@ -22,7 +22,7 @@ import { ChevronsUpDownIcon } from 'lucide-react'
 import { type ComponentProps, createContext, useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   Card,
   CardAction,
@@ -156,7 +156,7 @@ export const PlanTrigger = ({ className, ...props }: PlanTriggerProps) => {
     <CollapsibleTrigger
       render={
         <Button
-          className={cn('size-8', className)}
+          className={cn(className)}
           data-slot='plan-trigger'
           size='icon'
           variant='ghost'

web/default/src/components/ai-elements/prompt-input.tsx

@@ -55,7 +55,7 @@ import {
 } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   Command,
   CommandEmpty,
@@ -64,7 +64,20 @@ import {
   CommandItem,
   CommandList,
   CommandSeparator,
-} from '@/components/ui/command'
+} from '@/components/design-system/command'
+import {
+  InputGroup,
+  InputGroupAddon,
+  InputGroupButton,
+  InputGroupTextarea,
+} from '@/components/design-system/input-group'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/design-system/select'
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -76,19 +89,6 @@ import {
   HoverCardContent,
   HoverCardTrigger,
 } from '@/components/ui/hover-card'
-import {
-  InputGroup,
-  InputGroupAddon,
-  InputGroupButton,
-  InputGroupTextarea,
-} from '@/components/ui/input-group'
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select'
 import { cn } from '@/lib/utils'
 
 // ============================================================================
@@ -326,6 +326,7 @@ export function PromptInputAttachment({
           </div>
           <Button
             aria-label={t('Remove attachment')}
+            size='icon-xs'
             className='absolute inset-0 size-5 cursor-pointer rounded p-0 opacity-0 transition-opacity group-hover:pointer-events-auto group-hover:opacity-100 [&>svg]:size-2.5'
             onClick={(e) => {
               e.stopPropagation()

web/default/src/components/ai-elements/queue.tsx

@@ -21,7 +21,7 @@ For commercial licensing, please contact support@quantumnous.com
 import { ChevronDownIcon, PaperclipIcon } from 'lucide-react'
 import type { ComponentProps } from 'react'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   Collapsible,
   CollapsibleContent,
@@ -236,7 +236,7 @@ export const QueueSectionTrigger = ({
       <Button
         variant='ghost'
         className={cn(
-          'group bg-muted/40 text-muted-foreground hover:bg-muted h-auto w-full justify-between px-3 py-2 text-left',
+          'group bg-muted/40 text-muted-foreground hover:bg-muted h-auto sm:h-auto w-full justify-between px-3 py-2 text-left',
           className
         )}
         type='button'

web/default/src/components/ai-elements/suggestion.tsx

@@ -20,7 +20,7 @@ For commercial licensing, please contact support@quantumnous.com
 
 import type { ComponentProps } from 'react'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import { ScrollArea, ScrollBar } from '@/components/ui/scroll-area'
 import { cn } from '@/lib/utils'
 

web/default/src/components/ai-elements/web-preview.tsx

@@ -29,13 +29,13 @@ import {
 } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
+import { Input } from '@/components/design-system/input'
 import {
   Collapsible,
   CollapsibleContent,
   CollapsibleTrigger,
 } from '@/components/ui/collapsible'
-import { Input } from '@/components/ui/input'
 import {
   Tooltip,
   TooltipContent,
@@ -135,10 +135,10 @@ export const WebPreviewNavigationButton = ({
       <TooltipTrigger
         render={
           <Button
-            className='hover:text-foreground h-8 w-8 p-0'
+            className='hover:text-foreground'
             disabled={disabled}
             onClick={onClick}
-            size='sm'
+            size='icon'
             variant='ghost'
             {...props}
           />
@@ -185,7 +185,7 @@ export const WebPreviewUrl = ({
 
   return (
     <Input
-      className='h-8 flex-1 text-sm'
+      className='flex-1 text-sm'
       onChange={onChange ?? handleChange}
       onKeyDown={handleKeyDown}
       placeholder={t('Enter URL...')}

web/default/src/components/command-menu.tsx

@@ -30,7 +30,7 @@ import {
   CommandItem,
   CommandList,
   CommandSeparator,
-} from '@/components/ui/command'
+} from '@/components/design-system/command'
 import { useSearch } from '@/context/search-provider'
 import { useTheme } from '@/context/theme-provider'
 import { useSidebarData } from '@/hooks/use-sidebar-data'

web/default/src/components/config-drawer.tsx

@@ -32,13 +32,14 @@ import { IconSidebarSidebar } from '@/assets/custom/icon-sidebar-sidebar'
 import { IconThemeDark } from '@/assets/custom/icon-theme-dark'
 import { IconThemeLight } from '@/assets/custom/icon-theme-light'
 import { IconThemeSystem } from '@/assets/custom/icon-theme-system'
+import { Button } from '@/components/design-system/button'
+import { useSidebar } from '@/components/design-system/sidebar'
 import {
   sideDrawerContentClassName,
   sideDrawerFooterClassName,
   sideDrawerFormClassName,
   sideDrawerHeaderClassName,
 } from '@/components/drawer-layout'
-import { Button } from '@/components/ui/button'
 import {
   Sheet,
   SheetContent,
@@ -62,8 +63,6 @@ import {
 } from '@/lib/theme-customization'
 import { cn } from '@/lib/utils'
 
-import { useSidebar } from './ui/sidebar'
-
 const Item = RadioPrimitive.Root
 
 export function ConfigDrawer() {
@@ -145,9 +144,8 @@ function SectionTitle(props: {
       {props.title}
       {props.showReset && props.onReset && (
         <Button
-          size='icon'
+          size='icon-xs'
           variant='secondary'
-          className='size-4'
           onClick={props.onReset}
           aria-label='Reset'
         >

web/default/src/components/confirm-dialog.tsx

@@ -26,8 +26,8 @@ import {
   AlertDialogFooter,
   AlertDialogHeader,
   AlertDialogTitle,
-} from '@/components/ui/alert-dialog'
+} from '@/components/design-system/alert-dialog'
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import { cn } from '@/lib/utils'
 
 type ConfirmDialogProps = {

web/default/src/components/copy-button.tsx

@@ -20,7 +20,7 @@ import { Check, Copy } from 'lucide-react'
 import { type ReactNode } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   Tooltip,
   TooltipContent,
@@ -35,7 +35,7 @@ interface CopyButtonProps {
   className?: string
   iconClassName?: string
   variant?: 'ghost' | 'outline' | 'default' | 'secondary' | 'destructive'
-  size?: 'default' | 'sm' | 'lg' | 'icon'
+  size?: 'default' | 'sm' | 'lg' | 'icon' | 'icon-sm' | 'icon-xs'
   tooltip?: string
   successTooltip?: string
   'aria-label'?: string

web/default/src/components/data-table/core/column-header.tsx

@@ -25,7 +25,7 @@ import {
 } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -58,8 +58,7 @@ export function DataTableColumnHeader<TData, TValue>({
           render={
             <Button
               variant='ghost'
-              size='sm'
+              className='data-popup-open:bg-accent -ms-3'
-              className='data-popup-open:bg-accent -ms-3 h-8'
             />
           }
         >

web/default/src/components/data-table/core/content-sized-columns.ts

@@ -16,6 +16,9 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact support@quantumnous.com
 */
-export function isContentSizedColumn(columnId: string): boolean {
+export function isContentSizedColumn(
-  return columnId === 'actions'
+  columnId: string,
+  contentSized = false
+): boolean {
+  return contentSized || columnId === 'actions'
 }

web/default/src/components/data-table/core/data-table-colgroup.tsx

@@ -27,7 +27,8 @@ export function DataTableColgroup<TData>({
 }) {
   const columns = table.getVisibleLeafColumns()
   const sizedColumns = columns.filter(
-    (column) => !isContentSizedColumn(column.id)
+    (column) =>
+      !isContentSizedColumn(column.id, column.columnDef.meta?.contentSized)
   )
   const totalSize = sizedColumns.reduce((sum, col) => sum + col.getSize(), 0)
 
@@ -38,7 +39,8 @@ export function DataTableColgroup<TData>({
           table,
           column.id,
           column.getSize(),
-          totalSize
+          totalSize,
+          column.columnDef.meta?.contentSized
         )
 
         return <col key={column.id} style={{ width }} />
@@ -51,9 +53,10 @@ function getColumnWidth<TData>(
   table: TanstackTable<TData>,
   columnId: string,
   columnSize: number,
-  totalSize: number
+  totalSize: number,
+  contentSized?: boolean
 ) {
-  if (isContentSizedColumn(columnId)) {
+  if (isContentSizedColumn(columnId, contentSized)) {
     return undefined
   }
 

web/default/src/components/data-table/core/data-table-header.tsx

@@ -24,7 +24,11 @@ import {
 import type { KeyboardEvent, MouseEvent } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { TableHead, TableHeader, TableRow } from '@/components/ui/table'
+import {
+  TableHead,
+  TableHeader,
+  TableRow,
+} from '@/components/design-system/table'
 import { cn } from '@/lib/utils'
 
 import { DataTableColumnHeader } from './column-header'
@@ -245,7 +249,10 @@ function shouldRenderColumnResizer<TData>(
     table.options.enableColumnResizing === true &&
     !header.isPlaceholder &&
     header.column.getCanResize() &&
-    !isContentSizedColumn(header.column.id)
+    !isContentSizedColumn(
+      header.column.id,
+      header.column.columnDef.meta?.contentSized
+    )
   )
 }
 
@@ -253,7 +260,13 @@ function getHeaderSizeStyle<TData>(
   header: Header<TData, unknown>,
   applyHeaderSize: boolean | undefined
 ) {
-  if (!applyHeaderSize || isContentSizedColumn(header.column.id)) {
+  if (
+    !applyHeaderSize ||
+    isContentSizedColumn(
+      header.column.id,
+      header.column.columnDef.meta?.contentSized
+    )
+  ) {
     return undefined
   }
 

web/default/src/components/data-table/core/data-table-row.tsx

@@ -16,25 +16,18 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact support@quantumnous.com
 */
-import {
+import { flexRender, type Row } from '@tanstack/react-table'
-  flexRender,
-  type Cell,
-  type Row,
-  type Table as TanstackTable,
-} from '@tanstack/react-table'
 import * as React from 'react'
 
-import { TableCell, TableRow } from '@/components/ui/table'
+import { TableCell, TableRow } from '@/components/design-system/table'
 import { cn } from '@/lib/utils'
 
-import { TruncatedCell } from './truncated-cell'
 import type { DataTableColumnClassName } from './types'
 
 type DataTableRowProps<TData> = {
   row: Row<TData>
   className?: string
   getColumnClassName?: DataTableColumnClassName
-  cellRenderColumns?: TanstackTable<TData>['options']['columns']
 } & Omit<React.ComponentProps<typeof TableRow>, 'children'>
 
 type DataTableRowInnerProps<TData> = DataTableRowProps<TData> & {
@@ -46,13 +39,8 @@ function DataTableRowInner<TData>({
   isSelected,
   className,
   getColumnClassName,
-  cellRenderColumns,
   ...rowProps
 }: DataTableRowInnerProps<TData>) {
-  // Destructured only to keep it out of `rowProps` (it is not a valid DOM attr)
-  // and to feed the memo comparator below; it is intentionally unused here.
-  void cellRenderColumns
-
   return (
     <TableRow
       data-state={isSelected ? 'selected' : undefined}
@@ -60,19 +48,25 @@ function DataTableRowInner<TData>({
       {...rowProps}
     >
       {row.getVisibleCells().map((cell) => {
-        const renderedCell = renderCellContent(cell)
+        const contentMode = cell.column.columnDef.meta?.contentMode ?? 'wrap'
 
         return (
           <TableCell
             key={cell.id}
             data-column-id={cell.column.id}
+            data-content-mode={contentMode}
             className={cn(
               'max-w-full min-w-0',
-              renderedCell.isPrimitive && 'overflow-hidden',
+              contentMode === 'full' &&
+                'max-w-none overflow-visible [&_.truncate]:overflow-visible [&_.truncate]:text-clip [&_[data-slot=status-badge]]:max-w-none [&_[data-slot=status-badge]]:overflow-visible [&_[data-slot=status-badge-label]]:overflow-visible [&_[data-slot=status-badge-label]]:text-clip',
+              contentMode === 'wrap' &&
+                'whitespace-normal break-words [overflow-wrap:anywhere] [&_.truncate]:overflow-visible [&_.truncate]:text-clip [&_.truncate]:whitespace-normal [&_.whitespace-nowrap]:whitespace-normal [&_[data-slot=status-badge]]:h-auto [&_[data-slot=status-badge]]:overflow-visible [&_[data-slot=status-badge-label]]:overflow-visible [&_[data-slot=status-badge-label]]:text-clip [&_[data-slot=status-badge-label]]:whitespace-normal',
+              contentMode === 'summary' &&
+                'whitespace-normal break-words [overflow-wrap:anywhere]',
               getColumnClassName?.(cell.column.id, 'cell')
             )}
           >
-            {renderedCell.content}
+            {flexRender(cell.column.columnDef.cell, cell.getContext())}
           </TableCell>
         )
       })}
@@ -80,50 +74,6 @@ function DataTableRowInner<TData>({
   )
 }
 
-const MemoizedDataTableRow = React.memo(DataTableRowInner, (prev, next) => {
-  // Do not read row.getIsSelected() inside the comparator: TanStack row objects
-  // keep a stable reference while their selection state mutates, so reading it
-  // here compares identical live values and misses selection changes. Selection
-  // is lifted to the `isSelected` prop, captured per render in DataTableRow.
-  //
-  // Column cell renderers (and getColumnClassName) can close over external
-  // state while the row stays stable, so column definitions and the class
-  // resolver are part of the render identity and must be compared too.
-  return (
-    prev.row === next.row &&
-    prev.className === next.className &&
-    prev.isSelected === next.isSelected &&
-    prev.getColumnClassName === next.getColumnClassName &&
-    prev.cellRenderColumns === next.cellRenderColumns
-  )
-}) as typeof DataTableRowInner
-
 export function DataTableRow<TData>(props: DataTableRowProps<TData>) {
-  return (
+  return <DataTableRowInner {...props} isSelected={props.row.getIsSelected()} />
-    <MemoizedDataTableRow {...props} isSelected={props.row.getIsSelected()} />
-  )
-}
-
-function renderCellContent<TData>(cell: Cell<TData, unknown>) {
-  const content = flexRender(cell.column.columnDef.cell, cell.getContext())
-  const textContent = getPrimitiveTextContent(content)
-
-  if (!textContent) {
-    return { content, isPrimitive: false }
-  }
-
-  return {
-    content: (
-      <TruncatedCell tooltipContent={textContent}>{content}</TruncatedCell>
-    ),
-    isPrimitive: true,
-  }
-}
-
-function getPrimitiveTextContent(content: React.ReactNode): string | null {
-  if (typeof content === 'string' || typeof content === 'number') {
-    return String(content)
-  }
-
-  return null
 }

web/default/src/components/data-table/core/data-table-view.tsx

@@ -19,7 +19,12 @@ For commercial licensing, please contact support@quantumnous.com
 import type { Row, Table as TanstackTable } from '@tanstack/react-table'
 import * as React from 'react'
 
-import { Table, TableBody, TableCell, TableRow } from '@/components/ui/table'
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableRow,
+} from '@/components/design-system/table'
 import { cn } from '@/lib/utils'
 
 import {
@@ -49,10 +54,7 @@ export { DataTableRowActionMenu } from './row-action-menu'
 
 export function DataTableView<TData>(props: DataTableViewProps<TData>) {
   const rows = props.rows ?? props.table.getRowModel().rows
-  const colSpan = React.useMemo(
+  const colSpan = props.table.getVisibleLeafColumns().length
-    () => props.table.getVisibleLeafColumns().length,
-    [props.table]
-  )
   const columnClassName = useResolvedColumnClassName(
     props.table,
     props.getColumnClassName,
@@ -62,7 +64,7 @@ export function DataTableView<TData>(props: DataTableViewProps<TData>) {
   return (
     <div
       className={cn(
-        'overflow-hidden rounded-lg border',
+        'w-full min-w-0 overflow-hidden rounded-lg border',
         props.containerClassName
       )}
       {...props.containerProps}
@@ -101,7 +103,15 @@ function UnifiedTableView<TData>({
 
   return (
     <div className={props.tableContainerClassName}>
-      <Table className={props.tableClassName} style={tableSizing.style}>
+      <Table
+        className={props.tableClassName}
+        style={tableSizing.style}
+        containerProps={{
+          role: props.scrollLabel ? 'region' : undefined,
+          tabIndex: 0,
+          'aria-label': props.scrollLabel,
+        }}
+      >
         {tableSizing.colgroup}
         <DataTableHeader
           table={props.table}
@@ -138,12 +148,15 @@ function SplitHeaderTableView<TData>({
     >
       <div
         className={cn(
-          'min-h-0 flex-1 overflow-auto',
+          'min-h-0 min-w-0 flex-1 overscroll-contain overflow-auto',
           '**:data-[slot=table-header]:[--table-header-bg:var(--table-header)]',
           '**:data-[slot=table-header]:bg-(--table-header-bg)',
           props.splitHeaderScrollClassName,
           props.bodyContainerClassName
         )}
+        role={props.scrollLabel ? 'region' : undefined}
+        tabIndex={0}
+        aria-label={props.scrollLabel}
       >
         <table
           data-slot='table'
@@ -157,7 +170,7 @@ function SplitHeaderTableView<TData>({
           <DataTableHeader
             table={props.table}
             applyHeaderSize={props.applyHeaderSize}
-            className={cn('sticky top-0 z-10', props.tableHeaderClassName)}
+            className={cn('sticky top-0 z-20', props.tableHeaderClassName)}
             rowClassName={props.tableHeaderRowClassName}
             getColumnClassName={getColumnClassName}
           />
@@ -325,7 +338,6 @@ function renderDefaultRow<TData>(
       row={row}
       className={cn(props.tableBodyRowClassName, props.getRowClassName?.(row))}
       getColumnClassName={getColumnClassName}
-      cellRenderColumns={props.table.options.columns}
     />
   )
 }

web/default/src/components/data-table/core/pagination.tsx

@@ -25,7 +25,7 @@ import {
 } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   Select,
   SelectContent,
@@ -33,7 +33,7 @@ import {
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from '@/components/ui/select'
+} from '@/components/design-system/select'
 import { cn, getPageNumbers } from '@/lib/utils'
 
 type DataTablePaginationProps<TData> = {
@@ -83,7 +83,7 @@ export function DataTablePagination<TData>({
               table.setPageSize(Number(value))
             }}
           >
-            <SelectTrigger className='text-foreground h-8 w-[64px] font-medium tabular-nums sm:w-[70px]'>
+            <SelectTrigger className='text-foreground w-[64px] font-medium tabular-nums sm:w-[70px]'>
               <SelectValue placeholder={pageSize} />
             </SelectTrigger>
             <SelectContent side='top' alignItemWithTrigger={false}>
@@ -100,8 +100,9 @@ export function DataTablePagination<TData>({
 
         <div className='flex min-w-0 shrink-0 items-center gap-1 @lg/pagination:gap-1.5 @xl/pagination:gap-2'>
           <Button
+            size='icon'
             variant='outline'
-            className='text-muted-foreground hover:text-foreground disabled:text-muted-foreground/50 size-8 p-0 @max-lg/pagination:hidden'
+            className='text-muted-foreground hover:text-foreground disabled:text-muted-foreground/50 @max-lg/pagination:hidden'
             onClick={() => table.setPageIndex(0)}
             disabled={!table.getCanPreviousPage()}
           >
@@ -109,8 +110,9 @@ export function DataTablePagination<TData>({
             <DoubleArrowLeftIcon className='h-4 w-4' />
           </Button>
           <Button
+            size='icon'
             variant='outline'
-            className='text-muted-foreground hover:text-foreground disabled:text-muted-foreground/50 size-8 p-0'
+            className='text-muted-foreground hover:text-foreground disabled:text-muted-foreground/50'
             onClick={() => table.previousPage()}
             disabled={!table.getCanPreviousPage()}
           >
@@ -128,7 +130,7 @@ export function DataTablePagination<TData>({
                 <Button
                   variant={currentPage === pageNumber ? 'default' : 'outline'}
                   className={cn(
-                    'h-8 min-w-8 px-2 tabular-nums',
+                    'min-w-8 px-2 tabular-nums',
                     currentPage === pageNumber
                       ? 'font-semibold'
                       : 'text-muted-foreground hover:text-foreground'
@@ -145,8 +147,9 @@ export function DataTablePagination<TData>({
           ))}
 
           <Button
+            size='icon'
             variant='outline'
-            className='text-muted-foreground hover:text-foreground disabled:text-muted-foreground/50 size-8 p-0'
+            className='text-muted-foreground hover:text-foreground disabled:text-muted-foreground/50'
             onClick={() => table.nextPage()}
             disabled={!table.getCanNextPage()}
           >
@@ -154,8 +157,9 @@ export function DataTablePagination<TData>({
             <ChevronRightIcon className='h-4 w-4' />
           </Button>
           <Button
+            size='icon'
             variant='outline'
-            className='text-muted-foreground hover:text-foreground disabled:text-muted-foreground/50 size-8 p-0 @max-lg/pagination:hidden'
+            className='text-muted-foreground hover:text-foreground disabled:text-muted-foreground/50 @max-lg/pagination:hidden'
             onClick={() => table.setPageIndex(table.getPageCount() - 1)}
             disabled={!table.getCanNextPage()}
           >

web/default/src/components/data-table/core/row-action-menu.tsx

@@ -19,7 +19,7 @@ For commercial licensing, please contact support@quantumnous.com
 import { MoreHorizontal } from 'lucide-react'
 import * as React from 'react'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -42,7 +42,7 @@ export function DataTableRowActionMenu(props: DataTableRowActionMenuProps) {
         render={
           <Button
             variant='ghost'
-            size='icon'
+            size='icon-sm'
             className='data-popup-open:bg-muted'
             aria-label={props.ariaLabel}
           />

web/default/src/components/data-table/core/table-empty.tsx

@@ -19,6 +19,7 @@ For commercial licensing, please contact support@quantumnous.com
 import { Database } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 
+import { TableRow, TableCell } from '@/components/design-system/table'
 import {
   Empty,
   EmptyDescription,
@@ -26,7 +27,6 @@ import {
   EmptyMedia,
   EmptyTitle,
 } from '@/components/ui/empty'
-import { TableRow, TableCell } from '@/components/ui/table'
 
 interface TableEmptyProps {
   /**

web/default/src/components/data-table/core/table-sizing.ts

@@ -26,7 +26,10 @@ export function getTableSizeStyle<TData>(
 ): React.CSSProperties {
   const width = table
     .getVisibleLeafColumns()
-    .filter((column) => !isContentSizedColumn(column.id))
+    .filter(
+      (column) =>
+        !isContentSizedColumn(column.id, column.columnDef.meta?.contentSized)
+    )
     .reduce((total, column) => total + column.getSize(), 0)
 
   return {

web/default/src/components/data-table/core/table-skeleton.tsx

@@ -18,8 +18,8 @@ For commercial licensing, please contact support@quantumnous.com
 */
 import type { Table } from '@tanstack/react-table'
 
+import { TableRow, TableCell } from '@/components/design-system/table'
 import { Skeleton } from '@/components/ui/skeleton'
-import { TableRow, TableCell } from '@/components/ui/table'
 import { cn } from '@/lib/utils'
 
 const SKELETON_WIDTHS = [

web/default/src/components/data-table/core/truncated-cell.tsx

@@ -50,7 +50,7 @@ export function TruncatedCell({
     return (
       <div
         className={cn(
-          'block max-w-full min-w-0 truncate',
+          'block max-w-full min-w-0 whitespace-normal break-words [overflow-wrap:anywhere]',
           cellClassName,
           className
         )}
@@ -64,7 +64,8 @@ export function TruncatedCell({
     <Tooltip>
       <TooltipTrigger
         render={
-          <div
+          <span
+            tabIndex={0}
             className={cn(
               'block max-w-full min-w-0 truncate',
               cellClassName,
@@ -73,7 +74,9 @@ export function TruncatedCell({
           />
         }
       >
-        <div className={cn('truncate', contentClassName)}>{children}</div>
+        <span className={cn('block truncate', contentClassName)}>
+          {children}
+        </span>
       </TooltipTrigger>
       <TooltipContent
         side={side}

web/default/src/components/data-table/core/types.ts

@@ -42,6 +42,7 @@ export type DataTableViewProps<TData> = {
   rows?: Row<TData>[]
   emptyTitle?: string
   emptyDescription?: string
+  scrollLabel?: string
   emptyIcon?: React.ReactNode
   emptyAction?: React.ReactNode
   emptyContent?: React.ReactNode

web/default/src/components/data-table/index.ts

@@ -23,6 +23,12 @@ export { BadgeListCell } from './core/badge-list-cell'
 export { TruncatedCell } from './core/truncated-cell'
 export { DataTableViewOptions } from './toolbar/view-options'
 export { DataTableToolbar } from './toolbar/toolbar'
+export {
+  DataTableFilterField,
+  DataTableFilterInput,
+  DataTableFilterPanel,
+  type DataTableFilterPanelProps,
+} from './toolbar/filter-panel'
 export { DataTableBulkActions } from './toolbar/bulk-actions'
 export {
   StaticDataTable,
@@ -38,13 +44,21 @@ export {
   type DataTablePinnedColumn,
   type DataTableRenderRowHelpers,
 } from './core/data-table-view'
-export { MobileCardList } from './layout/mobile-card-list'
+export {
+  MobileCardList,
+  type MobileCardListProps,
+} from './layout/mobile-card-list'
 export {
   DataTableCardGrid,
   type DataTableCardGridProps,
   type DataTableCardHelpers,
 } from './layout/card-grid'
 export { CardRowContent } from './layout/card-row-content'
+export {
+  DataTableCardDetails,
+  DataTableCardField,
+  type DataTableContentMode,
+} from './layout/card-field'
 export { tableHasCompactMeta } from './layout/card-cell-utils'
 export {
   DataTablePage,

web/default/src/components/data-table/layout/card-cell-utils.ts

@@ -46,14 +46,10 @@ export function renderCellContent<TData>(
   return cell.getValue() as ReactNode
 }
 
-/**
+/** Whether visible columns declare a title/status card hierarchy. */
- * Whether any visible column declares `mobileTitle`/`mobileBadge` meta. When
- * true the compact two-tier layout is used; otherwise the condensed
- * label:value fallback layout is used.
- */
 export function tableHasCompactMeta<TData>(table: Table<TData>): boolean {
   return table.getVisibleLeafColumns().some((col) => {
     const meta = col.columnDef.meta
-    return Boolean(meta?.mobileTitle || meta?.mobileBadge)
+    return meta?.cardRole === 'title' || meta?.cardRole === 'badge'
   })
 }

web/default/src/components/data-table/layout/card-field.tsx

@@ -0,0 +1,121 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import { ChevronDown } from 'lucide-react'
+import { useState, type ReactNode } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { Button } from '@/components/design-system/button'
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from '@/components/ui/collapsible'
+import { cn } from '@/lib/utils'
+
+export type DataTableContentMode = 'full' | 'wrap' | 'summary'
+
+interface DataTableCardFieldProps {
+  children: ReactNode
+  className?: string
+  contentMode?: DataTableContentMode
+  label?: ReactNode
+  span?: 1 | 2
+  valueClassName?: string
+}
+
+export function DataTableCardField({
+  children,
+  className,
+  contentMode = 'wrap',
+  label,
+  span = 1,
+  valueClassName,
+}: DataTableCardFieldProps) {
+  return (
+    <div
+      data-slot='data-table-card-field'
+      className={cn('min-w-0', span === 2 && 'col-span-2', className)}
+    >
+      {label && (
+        <div className='text-muted-foreground mb-1 text-xs leading-none font-medium select-none'>
+          {label}
+        </div>
+      )}
+      <div
+        data-slot='data-table-card-value'
+        className={cn(
+          'min-w-0 text-sm leading-snug',
+          (contentMode === 'full' || contentMode === 'wrap') &&
+            'whitespace-normal break-words [overflow-wrap:anywhere] [&_.truncate]:overflow-visible [&_.truncate]:text-clip [&_.truncate]:whitespace-normal [&_.whitespace-nowrap]:whitespace-normal [&_[data-slot=status-badge]]:h-auto [&_[data-slot=status-badge]]:overflow-visible [&_[data-slot=status-badge-label]]:overflow-visible [&_[data-slot=status-badge-label]]:text-clip [&_[data-slot=status-badge-label]]:whitespace-normal',
+          contentMode === 'full' && 'break-all',
+          valueClassName
+        )}
+      >
+        {children ?? '-'}
+      </div>
+    </div>
+  )
+}
+
+interface DataTableCardDetailsProps {
+  children: ReactNode
+  className?: string
+  count?: number
+  defaultOpen?: boolean
+}
+
+export function DataTableCardDetails({
+  children,
+  className,
+  count,
+  defaultOpen = false,
+}: DataTableCardDetailsProps) {
+  const { t } = useTranslation()
+  const [open, setOpen] = useState(defaultOpen)
+
+  return (
+    <Collapsible
+      open={open}
+      onOpenChange={setOpen}
+      className={cn('mt-2', className)}
+    >
+      <CollapsibleTrigger
+        render={
+          <Button
+            type='button'
+            variant='ghost'
+            size='xs'
+            className='text-muted-foreground hover:text-foreground group/details -ml-2'
+          />
+        }
+      >
+        {open ? t('Less') : t('More')}
+        {!open && count != null && count > 0 && (
+          <span className='tabular-nums'>({count})</span>
+        )}
+        <ChevronDown className='size-3.5 transition-transform duration-150 group-data-[panel-open]/details:rotate-180' />
+      </CollapsibleTrigger>
+      <CollapsibleContent>
+        <div className='mt-1.5 grid grid-cols-2 gap-x-3 gap-y-2 border-t pt-2'>
+          {children}
+        </div>
+      </CollapsibleContent>
+    </Collapsible>
+  )
+}

web/default/src/components/data-table/layout/card-grid.tsx

@@ -37,7 +37,7 @@ import { CardRowContent } from './card-row-content'
 /** Helpers passed to a custom {@link DataTableCardGridProps.renderCard}. */
 export type DataTableCardHelpers = {
   /**
-   * Whether the table declares compact card meta (`mobileTitle`/`mobileBadge`).
+   * Whether the table declares title/status `cardRole` metadata.
    * Provided so custom renderers can match the default layout decision.
    */
   compact: boolean
@@ -53,6 +53,7 @@ export interface DataTableCardGridProps<TData> {
   emptyTitle?: string
   emptyDescription?: string
   emptyIcon?: React.ReactNode
+  emptyAction?: React.ReactNode
   getRowKey?: (row: Row<TData>) => string | number
   getRowClassName?: (row: Row<TData>) => string | undefined
   /**
@@ -151,6 +152,7 @@ export function DataTableCardGrid<TData>(props: DataTableCardGridProps<TData>) {
             <EmptyTitle>{resolvedEmptyTitle}</EmptyTitle>
             <EmptyDescription>{resolvedEmptyDescription}</EmptyDescription>
           </EmptyHeader>
+          {props.emptyAction}
         </Empty>
       </div>
     )

web/default/src/components/data-table/layout/card-row-content.tsx

@@ -17,18 +17,24 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 For commercial licensing, please contact support@quantumnous.com
 */
 import type { Cell, Row } from '@tanstack/react-table'
-import * as React from 'react'
-
-import { StatusBadgeTypeContext } from '@/components/status-badge'
 
 import { getCellLabel, renderCellContent } from './card-cell-utils'
+import { DataTableCardDetails, DataTableCardField } from './card-field'
+
+type CardRole = 'title' | 'badge' | 'primary' | 'secondary' | 'hidden'
+
+function getCardRole<TData>(cell: Cell<TData, unknown>): CardRole {
+  const meta = cell.column.columnDef.meta
+  if (meta?.cardRole) return meta.cardRole
+  return 'primary'
+}
 
 function orderCardCells<TData>(
   cells: Cell<TData, unknown>[]
 ): Cell<TData, unknown>[] {
   return [...cells].sort((a, b) => {
-    const aOrder = a.column.columnDef.meta?.mobileOrder
+    const aOrder = a.column.columnDef.meta?.cardOrder
-    const bOrder = b.column.columnDef.meta?.mobileOrder
+    const bOrder = b.column.columnDef.meta?.cardOrder
 
     if (aOrder == null && bOrder == null) return 0
     if (aOrder == null) return 1
@@ -37,178 +43,98 @@ function orderCardCells<TData>(
   })
 }
 
-/**
+function CardFields<TData>({ cells }: { cells: Cell<TData, unknown>[] }) {
- * Shared, column-meta-driven card content rendering for TanStack rows.
+  return cells.map((cell) => {
- *
+    const meta = cell.column.columnDef.meta
- * Both {@link MobileCardList} (mobile) and {@link DataTableCardGrid} (desktop
+    return (
- * card view) render the same inner content; only the surrounding container
+      <DataTableCardField
- * differs (single bordered list vs. responsive grid of cards). Keeping the
+        key={cell.id}
- * per-row content here guarantees the two stay visually consistent.
+        label={getCellLabel(cell)}
- *
+        contentMode={meta?.contentMode}
- * Column meta extensions (see `card-cell-utils.ts`):
+        span={meta?.cardSpan}
- * - `mobileTitle`  — card header (left, larger text)
+      >
- * - `mobileBadge`  — inline with title (right, e.g. status badge)
+        {renderCellContent(cell)}
- * - `mobileHidden` — hidden in card content
+      </DataTableCardField>
- */
-
-/**
- * Compact content — structured layout with title header + side-by-side fields.
- * Used when columns define mobileTitle or mobileBadge meta.
- *
- * Visual structure:
- *   [Title content]             [Badge]
- *   [Field1 label] [Field2 label]
- *   [Field1 value] [Field2 value]
- *                          [Actions ⋯]
- */
-function CompactContent<TData>({ row }: { row: Row<TData> }) {
-  const allCells = row
-    .getVisibleCells()
-    .filter((cell) => cell.column.id !== 'select')
-
-  // Read each cell's meta once, then reuse for all categorisation checks.
-  const cellMetas = React.useMemo(
-    () => allCells.map((c) => c.column.columnDef.meta),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [allCells.map((c) => c.id).join(',')]
-  )
-
-  const titleCell = allCells.find((_, i) => cellMetas[i]?.mobileTitle)
-  const badgeCell = allCells.find((_, i) => cellMetas[i]?.mobileBadge)
-  const actionsCell = allCells.find((c) => c.column.id === 'actions')
-  const fieldCells = orderCardCells(
-    allCells.filter(
-      (c, i) =>
-        c !== titleCell &&
-        c !== badgeCell &&
-        c !== actionsCell &&
-        !cellMetas[i]?.mobileHidden
     )
-  )
+  })
-
-  return (
-    <>
-      {/* Row 1: Title + Badge */}
-      <div className='flex items-center justify-between gap-2'>
-        {titleCell && (
-          <div className='min-w-0 flex-1 text-sm font-medium [&_[data-slot=status-badge]]:max-w-full [&_[data-slot=status-badge]]:whitespace-normal'>
-            {renderCellContent(titleCell)}
-          </div>
-        )}
-        {badgeCell && (
-          <div className='flex-none [&_[data-slot=status-badge]]:max-w-none'>
-            {renderCellContent(badgeCell)}
-          </div>
-        )}
-      </div>
-
-      {/* Row 2: Key fields wrap into compact columns instead of squeezing */}
-      {fieldCells.length > 0 && (
-        <div className='mt-1.5 grid grid-cols-2 gap-x-3 gap-y-1.5'>
-          {fieldCells.map((cell) => {
-            const label = getCellLabel(cell)
-            return (
-              <div key={cell.id} className='min-w-0 flex-1 overflow-hidden'>
-                {label && (
-                  <div className='text-muted-foreground mb-0.5 text-xs leading-none select-none'>
-                    {label}
-                  </div>
-                )}
-                <div className='min-w-0 overflow-hidden text-xs'>
-                  <StatusBadgeTypeContext.Provider value='text'>
-                    {renderCellContent(cell) ?? '-'}
-                  </StatusBadgeTypeContext.Provider>
-                </div>
-              </div>
-            )
-          })}
-        </div>
-      )}
-
-      {/* Actions */}
-      {actionsCell && (
-        <div className='mt-1 -mb-0.5 flex justify-end'>
-          {renderCellContent(actionsCell)}
-        </div>
-      )}
-    </>
-  )
 }
 
 /**
- * Fallback content — condensed label:value pairs for tables without
+ * Shared row content for both the mobile list and optional desktop card grid.
- * mobileTitle/mobileBadge. Still respects mobileHidden.
+ * Primary values never clip silently; lower-priority values remain available
- */
+ * through the shared progressive details disclosure.
-function FallbackContent<TData>({ row }: { row: Row<TData> }) {
-  const allCells = row
-    .getVisibleCells()
-    .filter((cell) => cell.column.id !== 'select')
-
-  const cellMetas = React.useMemo(
-    () => allCells.map((c) => c.column.columnDef.meta),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [allCells.map((c) => c.id).join(',')]
-  )
-
-  const actionsCell = allCells.find((c) => c.column.id === 'actions')
-  const contentCells = orderCardCells(
-    allCells.filter(
-      (c, i) => c.column.id !== 'actions' && !cellMetas[i]?.mobileHidden
-    )
-  )
-
-  return (
-    <>
-      {contentCells.map((cell) => {
-        const label = getCellLabel(cell)
-
-        if (!label) {
-          return (
-            <div key={cell.id} className='flex justify-end overflow-hidden'>
-              <StatusBadgeTypeContext.Provider value='text'>
-                {renderCellContent(cell)}
-              </StatusBadgeTypeContext.Provider>
-            </div>
-          )
-        }
-
-        return (
-          <div
-            key={cell.id}
-            className='flex items-start justify-between gap-2 overflow-hidden'
-          >
-            <span className='text-muted-foreground shrink-0 text-xs font-medium select-none'>
-              {label}
-            </span>
-            <div className='flex min-w-0 flex-1 items-center justify-end overflow-hidden text-xs'>
-              <StatusBadgeTypeContext.Provider value='text'>
-                {renderCellContent(cell) ?? '-'}
-              </StatusBadgeTypeContext.Provider>
-            </div>
-          </div>
-        )
-      })}
-      {actionsCell && (
-        <div className='-mb-0.5 flex justify-end pt-0.5'>
-          {renderCellContent(actionsCell)}
-        </div>
-      )}
-    </>
-  )
-}
-
-/**
- * Renders a single row's card content, auto-selecting the compact or fallback
- * layout. Callers compute `compact` once per table (via `tableHasCompactMeta`)
- * and pass it down to avoid recomputation per row.
  */
 export function CardRowContent<TData>(props: {
   row: Row<TData>
   compact: boolean
 }) {
-  return props.compact ? (
+  const cells = props.row
-    <CompactContent row={props.row} />
+    .getVisibleCells()
-  ) : (
+    .filter((cell) => cell.column.id !== 'select')
-    <FallbackContent row={props.row} />
+  const titleCell = cells.find((cell) => getCardRole(cell) === 'title')
+  const badgeCell = cells.find((cell) => getCardRole(cell) === 'badge')
+  const actionsCell = cells.find((cell) => cell.column.id === 'actions')
+  const fieldCells = orderCardCells(
+    cells.filter(
+      (cell) =>
+        cell !== titleCell &&
+        cell !== badgeCell &&
+        cell !== actionsCell &&
+        getCardRole(cell) === 'primary'
+    )
+  )
+  const secondaryCells = orderCardCells(
+    cells.filter(
+      (cell) =>
+        cell !== titleCell &&
+        cell !== badgeCell &&
+        cell !== actionsCell &&
+        getCardRole(cell) === 'secondary'
+    )
+  )
+
+  return (
+    <>
+      {props.compact && (titleCell || badgeCell) && (
+        <div className='flex min-w-0 items-start justify-between gap-3'>
+          <div className='min-w-0 flex-1 text-sm font-medium [overflow-wrap:anywhere] break-words whitespace-normal [&_.truncate]:overflow-visible [&_.truncate]:text-clip [&_.truncate]:whitespace-normal [&_[data-slot=status-badge-label]]:whitespace-normal [&_[data-slot=status-badge]]:h-auto [&_[data-slot=status-badge]]:max-w-full'>
+            {titleCell ? renderCellContent(titleCell) : null}
+          </div>
+          {badgeCell && (
+            <DataTableCardField
+              contentMode={badgeCell.column.columnDef.meta?.contentMode}
+              className='max-w-1/2 shrink'
+              valueClassName='flex justify-end text-right'
+            >
+              {renderCellContent(badgeCell)}
+            </DataTableCardField>
+          )}
+        </div>
+      )}
+
+      {fieldCells.length > 0 && (
+        <div
+          className={
+            props.compact
+              ? 'mt-2 grid grid-cols-2 gap-x-3 gap-y-2'
+              : 'grid grid-cols-2 gap-x-3 gap-y-2'
+          }
+        >
+          <CardFields cells={fieldCells} />
+        </div>
+      )}
+
+      {secondaryCells.length > 0 && (
+        <DataTableCardDetails count={secondaryCells.length}>
+          <CardFields cells={secondaryCells} />
+        </DataTableCardDetails>
+      )}
+
+      {actionsCell && (
+        <div className='mt-2 -mb-0.5 flex justify-end border-t pt-2'>
+          {renderCellContent(actionsCell)}
+        </div>
+      )}
+    </>
   )
 }

web/default/src/components/data-table/layout/data-table-page.tsx

@@ -64,6 +64,11 @@ export type DataTablePageProps<TData> = {
    */
   columns: ColumnDef<TData, unknown>[]
 
+  /**
+   * Localized accessible name for the keyboard-scrollable table region.
+   */
+  tableLabel?: string
+
   /**
    * Initial loading state — renders {@link TableSkeleton} or mobile skeleton.
    */
@@ -319,6 +324,7 @@ export function DataTablePage<TData>(props: DataTablePageProps<TData>) {
     <>
       <div
         className={cn(
+          'w-full min-w-0',
           props.fixedHeight !== false
             ? 'flex h-full min-h-0 flex-col gap-2.5 sm:gap-3'
             : 'space-y-2.5 sm:space-y-3',
@@ -406,6 +412,7 @@ function renderMobile<TData>(
           isLoading={props.isLoading}
           emptyTitle={props.emptyTitle}
           emptyDescription={props.emptyDescription}
+          scrollLabel={props.tableLabel}
           emptyIcon={props.emptyIcon}
           emptyAction={props.emptyAction}
           skeletonKeyPrefix={props.skeletonKeyPrefix}
@@ -417,11 +424,7 @@ function renderMobile<TData>(
           )}
           getColumnClassName={props.getColumnClassName}
           pinnedColumns={props.pinnedColumns}
-          containerClassName={cn(
+          containerClassName={props.tableClassName}
-            'transition-opacity duration-150',
-            isFetchingOnly && 'pointer-events-none opacity-60',
-            props.tableClassName
-          )}
           getRowClassName={(row) =>
             props.getRowClassName?.(row, { isMobile: false })
           }
@@ -435,6 +438,7 @@ function renderMobile<TData>(
           emptyTitle={props.emptyTitle}
           emptyDescription={props.emptyDescription}
           emptyIcon={props.emptyIcon}
+          emptyAction={props.emptyAction}
           renderCard={props.renderCard}
           gridClassName={props.cardGridClassName ?? 'grid grid-cols-1 gap-3'}
           skeletonKeyPrefix={props.skeletonKeyPrefix}
@@ -449,6 +453,8 @@ function renderMobile<TData>(
           isLoading={props.isLoading}
           emptyTitle={props.emptyTitle}
           emptyDescription={props.emptyDescription}
+          emptyIcon={props.emptyIcon}
+          emptyAction={props.emptyAction}
           getRowKey={props.mobileProps?.getRowKey}
           getRowClassName={mobileGetRowClassName}
         />
@@ -456,7 +462,17 @@ function renderMobile<TData>(
     }
   }
 
-  return <div className='min-h-0 flex-1 overflow-y-auto'>{mobileContent}</div>
+  return (
+    <div
+      aria-busy={props.isLoading || props.isFetching || undefined}
+      className={cn(
+        'min-h-0 min-w-0 flex-1 overflow-x-hidden overflow-y-auto transition-opacity duration-150',
+        isFetchingOnly && 'opacity-60'
+      )}
+    >
+      {mobileContent}
+    </div>
+  )
 }
 
 function renderDesktop<TData>(
@@ -478,8 +494,9 @@ function renderDesktop<TData>(
         className={cn(
           fixedHeight && 'min-h-0 flex-1 overflow-y-auto',
           'transition-opacity duration-150',
-          isFetchingOnly && 'pointer-events-none opacity-60'
+          isFetchingOnly && 'opacity-60'
         )}
+        aria-busy={props.isLoading || props.isFetching || undefined}
       >
         <DataTableCardGrid
           table={props.table}
@@ -487,6 +504,7 @@ function renderDesktop<TData>(
           emptyTitle={props.emptyTitle}
           emptyDescription={props.emptyDescription}
           emptyIcon={props.emptyIcon}
+          emptyAction={props.emptyAction}
           renderCard={props.renderCard}
           gridClassName={props.cardGridClassName}
           skeletonKeyPrefix={props.skeletonKeyPrefix}
@@ -504,6 +522,7 @@ function renderDesktop<TData>(
       isLoading={props.isLoading}
       emptyTitle={props.emptyTitle}
       emptyDescription={props.emptyDescription}
+      scrollLabel={props.tableLabel}
       emptyIcon={props.emptyIcon}
       emptyAction={props.emptyAction}
       skeletonKeyPrefix={props.skeletonKeyPrefix}
@@ -520,9 +539,12 @@ function renderDesktop<TData>(
       containerClassName={cn(
         fixedHeight && 'min-h-0 flex-1',
         'transition-opacity duration-150',
-        isFetchingOnly && 'pointer-events-none opacity-60',
+        isFetchingOnly && 'opacity-60',
         props.tableClassName
       )}
+      containerProps={{
+        'aria-busy': props.isLoading || props.isFetching || undefined,
+      }}
       getRowClassName={(row) =>
         props.getRowClassName?.(row, { isMobile: false })
       }

web/default/src/components/data-table/layout/mobile-card-list.tsx

@@ -34,13 +34,16 @@ import { cn } from '@/lib/utils'
 import { tableHasCompactMeta } from './card-cell-utils'
 import { CardRowContent } from './card-row-content'
 
-interface MobileCardListProps<TData> {
+export interface MobileCardListProps<TData> {
   table: Table<TData>
   isLoading?: boolean
   emptyTitle?: string
   emptyDescription?: string
+  emptyIcon?: React.ReactNode
+  emptyAction?: React.ReactNode
   getRowKey?: (row: Row<TData>) => string | number
   getRowClassName?: (row: Row<TData>) => string | undefined
+  renderCard?: (row: Row<TData>) => React.ReactNode
 }
 
 function ListSkeleton() {
@@ -93,7 +96,7 @@ function FallbackListSkeleton() {
  *
  * Per-row content is shared with the desktop card view via
  * {@link CardRowContent}; see `card-row-content.tsx` for the column-meta
- * extensions (`mobileTitle`, `mobileBadge`, `mobileHidden`).
+ * extensions (`cardRole`, `cardOrder`, `cardSpan`, `contentMode`).
  */
 export function MobileCardList<TData>(props: MobileCardListProps<TData>) {
   const {
@@ -128,18 +131,19 @@ export function MobileCardList<TData>(props: MobileCardListProps<TData>) {
         <Empty className='border-none p-0'>
           <EmptyHeader>
             <EmptyMedia variant='icon'>
-              <Database className='size-6' />
+              {props.emptyIcon ?? <Database className='size-6' />}
             </EmptyMedia>
             <EmptyTitle>{resolvedEmptyTitle}</EmptyTitle>
             <EmptyDescription>{resolvedEmptyDescription}</EmptyDescription>
           </EmptyHeader>
+          {props.emptyAction}
         </Empty>
       </div>
     )
   }
 
   return (
-    <div className='divide-y overflow-hidden rounded-lg border'>
+    <div className='min-w-0 divide-y overflow-hidden rounded-lg border'>
       {rows.map((row) => {
         const key = getRowKey ? getRowKey(row) : row.id
         return (
@@ -150,7 +154,11 @@ export function MobileCardList<TData>(props: MobileCardListProps<TData>) {
               getRowClassName?.(row)
             )}
           >
-            <CardRowContent row={row} compact={hasCompactMeta} />
+            {props.renderCard ? (
+              props.renderCard(row)
+            ) : (
+              <CardRowContent row={row} compact={hasCompactMeta} />
+            )}
           </div>
         )
       })}

web/default/src/components/data-table/static/static-data-table.tsx

@@ -25,7 +25,7 @@ import {
   TableHead,
   TableHeader,
   TableRow,
-} from '@/components/ui/table'
+} from '@/components/design-system/table'
 import { cn } from '@/lib/utils'
 
 import { TruncatedCell } from '../core/truncated-cell'

web/default/src/components/data-table/static/static-row-actions.tsx

@@ -18,7 +18,7 @@ For commercial licensing, please contact support@quantumnous.com
 */
 import { Pencil, Trash2 } from 'lucide-react'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   DropdownMenuItem,
   DropdownMenuShortcut,

web/default/src/components/data-table/toolbar/bulk-actions.tsx

@@ -21,8 +21,8 @@ import { X } from 'lucide-react'
 import { useState, useEffect, useLayoutEffect, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 
+import { Button } from '@/components/design-system/button'
 import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
 import { Separator } from '@/components/ui/separator'
 import {
   Tooltip,
@@ -184,9 +184,8 @@ export function DataTableBulkActions<TData>({
               render={
                 <Button
                   variant='outline'
-                  size='icon'
+                  size='icon-xs'
                   onClick={handleClearSelection}
-                  className='size-6'
                   aria-label={t('Clear selection')}
                   title={t('Clear selection (Escape)')}
                 />

web/default/src/components/data-table/toolbar/faceted-filter.tsx

@@ -16,13 +16,12 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact support@quantumnous.com
 */
-import { type Column } from '@tanstack/react-table'
+import type { Column } from '@tanstack/react-table'
-import { Check as CheckIcon, PlusCircle as PlusCircledIcon } from 'lucide-react'
+import { Check as CheckIcon, ChevronDown } from 'lucide-react'
-import * as React from 'react'
+import type { ComponentType, ReactNode } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Badge } from '@/components/ui/badge'
+import { Button } from '@/components/design-system/button'
-import { Button } from '@/components/ui/button'
 import {
   Command,
   CommandEmpty,
@@ -31,13 +30,12 @@ import {
   CommandItem,
   CommandList,
   CommandSeparator,
-} from '@/components/ui/command'
+} from '@/components/design-system/command'
 import {
   Popover,
   PopoverContent,
   PopoverTrigger,
 } from '@/components/ui/popover'
-import { Separator } from '@/components/ui/separator'
 import { cn } from '@/lib/utils'
 
 type DataTableFacetedFilterProps<TData, TValue> = {
@@ -46,15 +44,15 @@ type DataTableFacetedFilterProps<TData, TValue> = {
   options: {
     label: string
     value: string
-    icon?: React.ComponentType<{ className?: string }>
+    icon?: ComponentType<{ className?: string }>
-    iconNode?: React.ReactNode
+    iconNode?: ReactNode
     count?: number
   }[]
   /** Enable single select mode (only one option can be selected at a time) */
   singleSelect?: boolean
 }
 
-function DataTableFacetedFilterInner<TData, TValue>({
+export function DataTableFacetedFilter<TData, TValue>({
   column,
   title,
   options,
@@ -64,6 +62,21 @@ function DataTableFacetedFilterInner<TData, TValue>({
   const facets = column?.getFacetedUniqueValues()
   const filterValue = column?.getFilterValue() as string[] | undefined
   const selectedValues = new Set(filterValue)
+  const resolvedTitle = title ?? t('Filter')
+  const selectedOptions = options.filter((option) =>
+    selectedValues.has(option.value)
+  )
+
+  let selectedSummary: string | null = null
+  if (selectedValues.size === 1 && selectedOptions.length === 1) {
+    selectedSummary = t(selectedOptions[0].label)
+  } else if (selectedValues.size === 2 && selectedOptions.length === 2) {
+    selectedSummary = selectedOptions
+      .map((option) => t(option.label))
+      .join(', ')
+  } else if (selectedValues.size > 0) {
+    selectedSummary = `${selectedValues.size} ${t('selected')}`
+  }
 
   const handleOptionSelect = (optionValue: string) => {
     const nextSelectedValues = getNextSelectedValues(
@@ -81,57 +94,69 @@ function DataTableFacetedFilterInner<TData, TValue>({
     <Popover>
       <PopoverTrigger
         render={
-          <Button variant='outline' size='sm' className='h-8 border-dashed' />
+          <Button
+            variant='outline'
+            className='w-full min-w-0 justify-start font-normal'
+            aria-label={
+              selectedSummary
+                ? `${resolvedTitle}: ${selectedSummary}`
+                : resolvedTitle
+            }
+          />
         }
       >
-        <PlusCircledIcon className='size-4' />
+        <span className='text-muted-foreground min-w-0 truncate text-left'>
-        {title}
+          {resolvedTitle}
-        {selectedValues?.size > 0 && (
+        </span>
+        {selectedSummary && (
           <>
-            <Separator orientation='vertical' className='mx-2 h-4' />
+            <span className='text-muted-foreground' aria-hidden='true'>
-            <Badge
+              :
-              variant='secondary'
+            </span>
-              className='rounded-sm px-1 font-normal lg:hidden'
+            <span className='text-foreground min-w-0 flex-1 truncate text-left'>
-            >
+              {selectedSummary}
-              {selectedValues.size}
+            </span>
-            </Badge>
-            <div className='hidden space-x-1 lg:flex'>
-              {selectedValues.size > 2 ? (
-                <Badge
-                  variant='secondary'
-                  className='rounded-sm px-1 font-normal'
-                >
-                  {selectedValues.size} {t('selected')}
-                </Badge>
-              ) : (
-                options
-                  .filter((option) => selectedValues.has(option.value))
-                  .map((option) => (
-                    <Badge
-                      variant='secondary'
-                      key={option.value}
-                      className='rounded-sm px-1 font-normal'
-                    >
-                      {t(option.label)}
-                    </Badge>
-                  ))
-              )}
-            </div>
           </>
         )}
+        <ChevronDown className='text-muted-foreground ms-auto size-3.5 shrink-0 transition-transform duration-150 group-data-[popup-open]/button:rotate-180' />
       </PopoverTrigger>
-      <PopoverContent className='max-w-[360px] min-w-[200px] p-0' align='start'>
+      <PopoverContent
+        className='w-(--anchor-width) max-w-[360px] min-w-52 p-0'
+        align='start'
+      >
         <Command>
-          <CommandInput placeholder={title} />
+          <CommandInput
+            placeholder={resolvedTitle}
+            aria-label={resolvedTitle}
+          />
           <CommandList>
             <CommandEmpty>{t('No results found.')}</CommandEmpty>
             <CommandGroup>
               {options.map((option) => {
                 const isSelected = selectedValues.has(option.value)
+                let optionIcon: ReactNode = null
+                if (option.iconNode) {
+                  optionIcon = (
+                    <span className='text-muted-foreground flex size-4 items-center justify-center'>
+                      {option.iconNode}
+                    </span>
+                  )
+                } else if (option.icon) {
+                  optionIcon = (
+                    <option.icon className='text-muted-foreground size-4' />
+                  )
+                }
+
+                const optionCount =
+                  typeof option.count === 'number'
+                    ? option.count
+                    : facets?.get(option.value)
+
                 return (
                   <CommandItem
                     key={option.value}
                     onSelect={() => handleOptionSelect(option.value)}
+                    aria-selected={isSelected}
                   >
                     <div
                       className={cn(
@@ -141,30 +166,23 @@ function DataTableFacetedFilterInner<TData, TValue>({
                           : 'opacity-50 [&_svg]:invisible'
                       )}
                     >
-                      <CheckIcon className={cn('text-background h-4 w-4')} />
+                      <CheckIcon
+                        className={cn('text-background h-4 w-4')}
+                        aria-hidden='true'
+                      />
                     </div>
-                    {option.iconNode ? (
+                    {optionIcon}
-                      <span className='text-muted-foreground flex size-4 items-center justify-center'>
-                        {option.iconNode}
-                      </span>
-                    ) : option.icon ? (
-                      <option.icon className='text-muted-foreground size-4' />
-                    ) : null}
                     <span
                       className='min-w-0 flex-1 truncate'
                       title={t(option.label)}
                     >
                       {t(option.label)}
                     </span>
-                    {typeof option.count === 'number' ? (
+                    {optionCount != null && (
-                      <span className='text-muted-foreground ms-auto flex h-4 min-w-4 items-center justify-center font-mono text-xs'>
+                      <span className='text-muted-foreground ms-auto flex h-4 min-w-4 items-center justify-center text-xs tabular-nums'>
-                        {option.count}
+                        {optionCount}
                       </span>
-                    ) : facets?.get(option.value) ? (
+                    )}
-                      <span className='ms-auto flex h-4 w-4 items-center justify-center font-mono text-xs'>
-                        {facets.get(option.value)}
-                      </span>
-                    ) : null}
                   </CommandItem>
                 )
               })}
@@ -189,10 +207,6 @@ function DataTableFacetedFilterInner<TData, TValue>({
   )
 }
 
-export const DataTableFacetedFilter = React.memo(
-  DataTableFacetedFilterInner
-) as typeof DataTableFacetedFilterInner
-
 function getNextSelectedValues(
   selectedValues: Set<string>,
   optionValue: string,
@@ -209,5 +223,5 @@ function getNextSelectedValues(
     nextSelectedValues.add(optionValue)
   }
 
-  return Array.from(nextSelectedValues)
+  return [...nextSelectedValues]
 }

web/default/src/components/data-table/toolbar/filter-panel.tsx

@@ -0,0 +1,307 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import type { Table } from '@tanstack/react-table'
+import { ChevronDown, Loader2 } from 'lucide-react'
+import { useState, type ComponentProps, type ReactNode } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { Button } from '@/components/design-system/button'
+import { Input } from '@/components/design-system/input'
+import { Badge } from '@/components/ui/badge'
+import {
+  Drawer,
+  DrawerContent,
+  DrawerDescription,
+  DrawerFooter,
+  DrawerHeader,
+  DrawerTitle,
+  DrawerTrigger,
+} from '@/components/ui/drawer'
+import { useMediaQuery } from '@/hooks'
+import { cn } from '@/lib/utils'
+
+import { DataTableViewOptions } from './view-options'
+
+export interface DataTableFilterPanelProps<TData> {
+  table: Table<TData>
+  primaryFilters: ReactNode
+  advancedFilters?: ReactNode
+  mobilePinnedFilters?: ReactNode
+  mobileFilters?: ReactNode
+  mobileFilterCount?: number
+  stats?: ReactNode
+  actionStart?: ReactNode
+  viewToggle?: ReactNode
+  hideViewOptions?: boolean
+  hasActiveFilters: boolean
+  hasAdvancedActiveFilters?: boolean
+  advancedFilterCount?: number
+  searchLoading?: boolean
+  onReset: () => void
+  onSearch?: () => void
+  className?: string
+}
+
+interface DataTableFilterFieldProps {
+  children: ReactNode
+  wide?: boolean
+  className?: string
+}
+
+export function DataTableFilterField(props: DataTableFilterFieldProps) {
+  return (
+    <div
+      className={cn(
+        'min-w-0 [&>button]:w-full [&>input]:w-full [&_[data-slot=select-trigger]]:w-full [&_[data-slot=select-trigger]]:text-sm [&_[data-slot=select-value]]:leading-5',
+        props.wide && 'sm:col-span-2',
+        props.className
+      )}
+    >
+      {props.children}
+    </div>
+  )
+}
+
+export function DataTableFilterInput(props: ComponentProps<typeof Input>) {
+  return (
+    <Input
+      {...props}
+      className={cn('min-w-0 text-sm leading-5', props.className)}
+    />
+  )
+}
+
+export function DataTableFilterPanel<TData>(
+  props: DataTableFilterPanelProps<TData>
+) {
+  const { t } = useTranslation()
+  const [advancedOpen, setAdvancedOpen] = useState(false)
+  const [mobileFiltersOpen, setMobileFiltersOpen] = useState(false)
+  const isMobile = useMediaQuery('(max-width: 640px)')
+
+  const hasAdvancedFilters = props.advancedFilters != null
+  const hasMobileFilters =
+    props.mobileFilters != null || props.advancedFilters != null
+  const activeAdvancedCount =
+    props.advancedFilterCount ?? (props.hasAdvancedActiveFilters ? 1 : 0)
+  const activeMobileFilterCount = props.mobileFilterCount ?? activeAdvancedCount
+
+  const handleMobileReset = () => {
+    props.onReset()
+    setMobileFiltersOpen(false)
+  }
+
+  const handleMobileSubmit = () => {
+    props.onSearch?.()
+    setMobileFiltersOpen(false)
+  }
+
+  const advancedToggle = hasAdvancedFilters ? (
+    <Button
+      type='button'
+      variant='ghost'
+      onClick={() => setAdvancedOpen((open) => !open)}
+      aria-expanded={advancedOpen}
+      className={cn(
+        'text-muted-foreground hover:text-foreground gap-1 px-2',
+        props.hasAdvancedActiveFilters &&
+          !advancedOpen &&
+          'text-primary hover:text-primary'
+      )}
+    >
+      {advancedOpen ? t('Collapse') : t('Expand')}
+      {activeAdvancedCount > 0 && (
+        <Badge variant='secondary' className='ml-0.5'>
+          {activeAdvancedCount}
+        </Badge>
+      )}
+      <ChevronDown
+        className={cn(
+          'size-3.5 transition-transform duration-200',
+          advancedOpen && 'rotate-180'
+        )}
+      />
+    </Button>
+  ) : null
+
+  const viewOptions = !props.hideViewOptions ? (
+    <DataTableViewOptions table={props.table} />
+  ) : null
+
+  if (isMobile && props.mobilePinnedFilters != null) {
+    return (
+      <Drawer open={mobileFiltersOpen} onOpenChange={setMobileFiltersOpen}>
+        <div
+          className={cn(
+            'bg-card/50 min-w-0 rounded-lg border p-2.5',
+            props.className
+          )}
+        >
+          <div className='grid min-w-0 gap-2'>{props.mobilePinnedFilters}</div>
+
+          <div className='mt-2 flex min-w-0 flex-col gap-2'>
+            {props.stats}
+            <div className='flex flex-wrap items-center justify-end gap-1.5'>
+              {props.actionStart}
+              {hasMobileFilters && (
+                <DrawerTrigger
+                  render={
+                    <Button
+                      type='button'
+                      variant='ghost'
+                      className={cn(
+                        'text-muted-foreground hover:text-foreground gap-1 px-2',
+                        activeMobileFilterCount > 0 &&
+                          'text-primary hover:text-primary'
+                      )}
+                    >
+                      {t('Filter')}
+                      {activeMobileFilterCount > 0 && (
+                        <Badge variant='secondary' className='ml-0.5'>
+                          {activeMobileFilterCount}
+                        </Badge>
+                      )}
+                    </Button>
+                  }
+                />
+              )}
+              {!hasMobileFilters && (
+                <Button
+                  type='button'
+                  variant='ghost'
+                  onClick={props.onReset}
+                  disabled={!props.hasActiveFilters}
+                  className='text-muted-foreground hover:text-foreground px-2'
+                >
+                  {t('Reset')}
+                </Button>
+              )}
+              {props.onSearch && (
+                <Button
+                  type='button'
+                  onClick={props.onSearch}
+                  disabled={props.searchLoading}
+                >
+                  {props.searchLoading && <Loader2 className='animate-spin' />}
+                  {t('Search')}
+                </Button>
+              )}
+              {props.viewToggle}
+              {viewOptions}
+            </div>
+          </div>
+        </div>
+
+        {hasMobileFilters && (
+          <DrawerContent className='max-h-[85dvh] p-0'>
+            <div className='mx-auto flex w-full max-w-md flex-1 flex-col overflow-hidden'>
+              <DrawerHeader className='border-border/70 border-b px-4 py-3 text-left'>
+                <DrawerTitle>{t('Filter')}</DrawerTitle>
+                <DrawerDescription>{t('Filters')}</DrawerDescription>
+              </DrawerHeader>
+              <div className='flex min-h-0 flex-1 flex-col gap-2 overflow-y-auto px-4 py-3'>
+                {props.mobileFilters ?? (
+                  <>
+                    {props.primaryFilters}
+                    {props.advancedFilters}
+                  </>
+                )}
+              </div>
+              <DrawerFooter className='border-border/70 grid grid-cols-2 gap-2 border-t px-4 py-3'>
+                <Button
+                  type='button'
+                  variant='outline'
+                  onClick={handleMobileReset}
+                  disabled={!props.hasActiveFilters}
+                >
+                  {t('Reset')}
+                </Button>
+                <Button
+                  type='button'
+                  onClick={handleMobileSubmit}
+                  disabled={props.searchLoading}
+                >
+                  {props.searchLoading && <Loader2 className='animate-spin' />}
+                  {props.onSearch ? t('Search') : t('Done')}
+                </Button>
+              </DrawerFooter>
+            </div>
+          </DrawerContent>
+        )}
+      </Drawer>
+    )
+  }
+
+  return (
+    <div
+      className={cn(
+        'bg-card/50 min-w-0 rounded-lg border p-2.5 sm:p-3',
+        props.className
+      )}
+    >
+      <div className='flex min-w-0 flex-wrap items-start gap-2'>
+        <div className='grid min-w-0 flex-1 grid-cols-1 gap-2 sm:grid-cols-[repeat(auto-fit,minmax(10rem,1fr))] [&>input]:w-full'>
+          {props.primaryFilters}
+        </div>
+        {advancedToggle && (
+          <div className='flex shrink-0 items-center justify-end'>
+            {advancedToggle}
+          </div>
+        )}
+      </div>
+
+      {advancedOpen && props.advancedFilters && (
+        <div className='mt-2 grid grid-cols-1 gap-2 sm:grid-cols-[repeat(auto-fit,minmax(10rem,1fr))] [&>input]:w-full'>
+          {props.advancedFilters}
+        </div>
+      )}
+
+      <div className='mt-2 flex min-w-0 flex-wrap items-center gap-2'>
+        {props.stats}
+        <div className='ms-auto flex flex-wrap items-center justify-end gap-1.5 sm:gap-2'>
+          {props.actionStart}
+          <Button
+            type='button'
+            variant={props.onSearch ? 'outline' : 'ghost'}
+            onClick={props.onReset}
+            disabled={!props.hasActiveFilters}
+            className={cn(
+              !props.onSearch &&
+                'text-muted-foreground hover:text-foreground px-2'
+            )}
+          >
+            {t('Reset')}
+          </Button>
+          {props.onSearch && (
+            <Button
+              type='button'
+              onClick={props.onSearch}
+              disabled={props.searchLoading}
+            >
+              {props.searchLoading && <Loader2 className='animate-spin' />}
+              {t('Search')}
+            </Button>
+          )}
+          {props.viewToggle}
+          {viewOptions}
+        </div>
+      </div>
+    </div>
+  )
+}

web/default/src/components/data-table/toolbar/toolbar.tsx

@@ -17,18 +17,15 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 For commercial licensing, please contact support@quantumnous.com
 */
 import type { Table } from '@tanstack/react-table'
-import { ChevronDown, Loader2, X as Cross2Icon } from 'lucide-react'
 import * as React from 'react'
 import { useState, type ReactNode } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Input } from '@/components/design-system/input'
-import { Input } from '@/components/ui/input'
 import { useDebounce } from '@/hooks'
-import { cn } from '@/lib/utils'
 
 import { DataTableFacetedFilter } from './faceted-filter'
-import { DataTableViewOptions } from './view-options'
+import { DataTableFilterField, DataTableFilterPanel } from './filter-panel'
 
 type FilterDef = {
   columnId: string
@@ -153,7 +150,6 @@ export type DataTableToolbarProps<TData> = {
  */
 export function DataTableToolbar<TData>(props: DataTableToolbarProps<TData>) {
   const { t } = useTranslation()
-  const [expanded, setExpanded] = useState(false)
   const [isSearchComposing, setIsSearchComposing] = useState(false)
 
   const filters = props.filters ?? []
@@ -246,32 +242,29 @@ export function DataTableToolbar<TData>(props: DataTableToolbarProps<TData>) {
   const searchInput = (
     <Input
       placeholder={placeholder}
+      aria-label={placeholder}
       value={searchValue}
       onChange={handleSearchChange}
       onCompositionStart={handleSearchCompositionStart}
       onCompositionEnd={handleSearchCompositionEnd}
-      className='w-full sm:w-[200px] lg:w-[240px]'
+      className='w-full'
     />
   )
 
-  const filterChips = React.useMemo(
+  const filterChips = filters.map((filter) => {
-    () =>
+    const column = props.table.getColumn(filter.columnId)
-      filters.map((filter) => {
+    if (!column) return null
-        const column = props.table.getColumn(filter.columnId)
+    return (
-        if (!column) return null
+      <DataTableFilterField key={filter.columnId}>
-        return (
+        <DataTableFacetedFilter
-          <DataTableFacetedFilter
+          column={column}
-            key={filter.columnId}
+          title={filter.title}
-            column={column}
+          options={filter.options}
-            title={filter.title}
+          singleSelect={filter.singleSelect}
-            options={filter.options}
+        />
-            singleSelect={filter.singleSelect}
+      </DataTableFilterField>
-          />
+    )
-        )
+  })
-      }),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [props.filters, props.table]
-  )
 
   const handleReset = () => {
     setIsSearchComposing(false)
@@ -281,118 +274,53 @@ export function DataTableToolbar<TData>(props: DataTableToolbarProps<TData>) {
     props.onReset?.()
   }
 
-  // Reset: outline text-only for form mode (always visible, disabled when
+  const primarySearch =
-  // nothing to reset); ghost text + X for filter-as-you-type mode (only
+    props.customSearch !== undefined ? props.customSearch : searchInput
-  // visible when active filters exist).
+  const useWidePrimarySearch =
-  let resetButton: ReactNode = null
+    filters.length + (props.additionalSearch != null ? 1 : 0) <= 3
-  if (hasSearch) {
+  const secondaryMobileFilters =
-    resetButton = (
+    props.additionalSearch != null ||
-      <Button variant='outline' onClick={handleReset} disabled={!isFiltered}>
+    filterChips.some(Boolean) ||
-        {t('Reset')}
+    hasExpandable ? (
-      </Button>
+      <>
-    )
+        {props.additionalSearch}
-  } else if (isFiltered) {
+        {filterChips}
-    resetButton = (
+        {props.expandable}
-      <Button
+      </>
-        variant='ghost'
+    ) : undefined
-        onClick={handleReset}
+  const nonSearchColumnFilterCount = props.table
-        className='text-muted-foreground hover:text-foreground gap-1 px-2'
+    .getState()
-      >
+    .columnFilters.filter((filter) => filter.id !== props.searchKey).length
-        {t('Reset')}
+  const mobileFilterCount =
-        <Cross2Icon />
+    nonSearchColumnFilterCount + (props.hasExpandedActiveFilters ? 1 : 0)
-      </Button>
-    )
-  }
-
-  const searchButton = hasSearch ? (
-    <Button onClick={props.onSearch} disabled={props.searchLoading}>
-      {props.searchLoading && <Loader2 className='animate-spin' />}
-      {t('Search')}
-    </Button>
-  ) : null
-
-  const viewOptionsNode = !props.hideViewOptions ? (
-    <DataTableViewOptions table={props.table} />
-  ) : null
-
-  const viewToggleNode = props.viewToggle ?? null
-
-  const expandToggle = hasExpandable ? (
-    <Button
-      variant='ghost'
-      onClick={() => setExpanded((p) => !p)}
-      aria-expanded={expanded}
-      className={cn(
-        'text-muted-foreground hover:text-foreground gap-1 px-2',
-        props.hasExpandedActiveFilters &&
-          !expanded &&
-          'text-primary hover:text-primary'
-      )}
-    >
-      {expanded ? t('Collapse') : t('Expand')}
-      <ChevronDown
-        className={cn(
-          'size-3.5 transition-transform duration-200',
-          expanded && 'rotate-180'
-        )}
-      />
-    </Button>
-  ) : null
-
-  const hasLeftActions = props.leftActions != null
-
-  if (hasLeftActions) {
-    return (
-      <div className={cn('flex flex-col gap-2', props.className)}>
-        <div className='flex flex-wrap items-center gap-2 sm:gap-3'>
-          {props.customSearch !== undefined ? props.customSearch : searchInput}
-          {props.additionalSearch}
-          {filterChips}
-          <div className='ms-auto flex shrink-0 items-center gap-1.5 sm:gap-2'>
-            {expandToggle}
-          </div>
-        </div>
-
-        {expanded && hasExpandable && (
-          <div className='flex flex-wrap items-center gap-2 sm:gap-3'>
-            {props.expandable}
-          </div>
-        )}
-
-        <div className='flex flex-wrap items-center gap-2 sm:gap-3'>
-          {props.leftActions}
-          <div className='ms-auto flex shrink-0 items-center gap-1.5 sm:gap-2'>
-            {props.preActions}
-            {resetButton}
-            {searchButton}
-            {viewToggleNode}
-            {viewOptionsNode}
-          </div>
-        </div>
-      </div>
-    )
-  }
 
   return (
-    <div
+    <DataTableFilterPanel
-      className={cn(
+      table={props.table}
-        'flex flex-wrap items-center gap-2 sm:gap-3',
+      primaryFilters={
-        props.className
+        <>
-      )}
+          <DataTableFilterField wide={useWidePrimarySearch}>
-    >
+            {primarySearch}
-      {props.customSearch !== undefined ? props.customSearch : searchInput}
+          </DataTableFilterField>
-      {props.additionalSearch}
+          {props.additionalSearch}
-      {filterChips}
+          {filterChips}
-      {expanded && hasExpandable && props.expandable}
+        </>
-
+      }
-      <div className='ms-auto flex shrink-0 items-center gap-1.5 sm:gap-2'>
+      advancedFilters={props.expandable}
-        {props.preActions}
+      mobilePinnedFilters={primarySearch}
-        {resetButton}
+      mobileFilters={secondaryMobileFilters}
-        {searchButton}
+      mobileFilterCount={mobileFilterCount}
-        {viewToggleNode}
+      stats={props.leftActions}
-        {viewOptionsNode}
+      actionStart={props.preActions}
-        {expandToggle}
+      viewToggle={props.viewToggle}
-      </div>
+      hideViewOptions={props.hideViewOptions}
-    </div>
+      hasActiveFilters={isFiltered}
+      hasAdvancedActiveFilters={props.hasExpandedActiveFilters}
+      advancedFilterCount={props.hasExpandedActiveFilters ? 1 : 0}
+      searchLoading={props.searchLoading}
+      onReset={handleReset}
+      onSearch={hasSearch ? props.onSearch : undefined}
+      className={props.className}
+    />
   )
 }

web/default/src/components/data-table/toolbar/view-mode-toggle.tsx

@@ -69,7 +69,7 @@ export function DataTableViewModeToggle(props: DataTableViewModeToggleProps) {
       role='group'
       aria-label={t('View mode')}
       className={cn(
-        'bg-muted/60 inline-flex h-8 items-center rounded-lg border p-0.5',
+        'bg-muted/60 inline-flex h-7 items-center rounded-lg border p-0.5 sm:h-8',
         props.className
       )}
     >

web/default/src/components/data-table/toolbar/view-options.tsx

@@ -20,7 +20,7 @@ import { type Table } from '@tanstack/react-table'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   DropdownMenu,
   DropdownMenuCheckboxItem,

web/default/src/components/date-picker.tsx

@@ -20,7 +20,7 @@ import { Calendar as CalendarIcon } from 'lucide-react'
 import { enUS, fr, ja, ru, vi, zhCN } from 'react-day-picker/locale'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import { Calendar } from '@/components/ui/calendar'
 import {
   Popover,

web/default/src/components/datetime-picker.tsx

@@ -21,9 +21,9 @@ import * as React from 'react'
 import { enUS, fr, ja, ru, vi, zhCN } from 'react-day-picker/locale'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
+import { Input } from '@/components/design-system/input'
 import { Calendar } from '@/components/ui/calendar'
-import { Input } from '@/components/ui/input'
 import {
   Popover,
   PopoverContent,

web/default/src/components/design-system/README.md

@@ -0,0 +1,42 @@
+# Design-system adapters
+
+This directory is the product-policy boundary above the shadcn source in
+`src/components/ui/`.
+
+## Import rule
+
+- Application and feature code imports policy-bearing controls from
+  `@/components/design-system/*`.
+- Files in this directory may import `@/components/ui/*`.
+- Do not make `components/ui` depend on this directory.
+- Do not proxy a shadcn component unless it carries a stable cross-application
+  policy. Components without product policy continue to be imported directly
+  from `components/ui`.
+
+The lint configuration enforces this rule for the managed controls.
+
+## Responsive sizing
+
+Default controls are 28px below the `sm` breakpoint and 32px at `sm` and above.
+Dense and micro sizes remain fixed:
+
+- `sm` / `icon-sm`: 28px
+- `xs` / `icon-xs`: 24px
+- `xl`: 40px below `sm`, 44px at `sm` and above
+
+Call sites should select a semantic size and use `className` only for layout.
+They must not pin a managed control to a fixed `h-*` or `size-*` value.
+
+## Updating shadcn
+
+Keep `components.json` pointed at `@/components/ui`. Preview upstream changes
+before merging:
+
+```sh
+bunx --bun shadcn@latest add <component> --dry-run
+bunx --bun shadcn@latest add <component> --diff <file>
+```
+
+Merge the upstream source into `components/ui`, then verify that the adapter's
+prop forwarding and class overrides still match the upstream API. Never use
+`--overwrite` without explicit approval.

web/default/src/components/design-system/alert-dialog.tsx

@@ -0,0 +1,80 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import { AlertDialog as AlertDialogPrimitive } from '@base-ui/react/alert-dialog'
+import * as React from 'react'
+
+import { Button } from '@/components/design-system/button'
+import {
+  AlertDialog,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogMedia,
+  AlertDialogOverlay,
+  AlertDialogPortal,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from '@/components/ui/alert-dialog'
+import { cn } from '@/lib/utils'
+
+function AlertDialogAction({
+  className,
+  ...props
+}: React.ComponentProps<typeof Button>) {
+  return (
+    <Button
+      data-slot='alert-dialog-action'
+      className={cn(className)}
+      {...props}
+    />
+  )
+}
+
+function AlertDialogCancel({
+  className,
+  variant = 'outline',
+  size = 'default',
+  ...props
+}: AlertDialogPrimitive.Close.Props &
+  Pick<React.ComponentProps<typeof Button>, 'variant' | 'size'>) {
+  return (
+    <AlertDialogPrimitive.Close
+      data-slot='alert-dialog-cancel'
+      className={cn(className)}
+      render={<Button variant={variant} size={size} />}
+      {...props}
+    />
+  )
+}
+
+export {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogMedia,
+  AlertDialogOverlay,
+  AlertDialogPortal,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+}

web/default/src/components/design-system/button.tsx

@@ -0,0 +1,65 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import { cva, type VariantProps } from 'class-variance-authority'
+import * as React from 'react'
+
+import { Button as ShadcnButton } from '@/components/ui/button'
+import { cn } from '@/lib/utils'
+
+const responsiveButtonSizeVariants = cva('', {
+  variants: {
+    size: {
+      default:
+        "h-7 gap-1 px-2.5 text-[0.8rem] has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3.5 sm:h-8 sm:gap-1.5 sm:text-sm sm:has-data-[icon=inline-end]:pr-2 sm:has-data-[icon=inline-start]:pl-2 sm:[&_svg:not([class*='size-'])]:size-4",
+      xs: null,
+      sm: null,
+      lg: 'h-8 sm:h-9',
+      xl: 'h-10 gap-2 px-4 sm:h-11 sm:px-5',
+      icon: 'size-7 sm:size-8',
+      'icon-xs': null,
+      'icon-sm': null,
+      'icon-lg': 'size-8 sm:size-9',
+    },
+  },
+  defaultVariants: {
+    size: 'default',
+  },
+})
+
+type ButtonSize = NonNullable<
+  VariantProps<typeof responsiveButtonSizeVariants>['size']
+>
+
+type ButtonProps = Omit<React.ComponentProps<typeof ShadcnButton>, 'size'> & {
+  size?: ButtonSize
+}
+
+function Button({ className, size = 'default', ...props }: ButtonProps) {
+  return (
+    <ShadcnButton
+      data-control-size={size}
+      size={size === 'xl' ? 'lg' : size}
+      className={cn(responsiveButtonSizeVariants({ size }), className)}
+      {...props}
+    />
+  )
+}
+
+export { Button }
+export type { ButtonProps, ButtonSize }

web/default/src/components/design-system/combobox-input.tsx

@@ -0,0 +1,37 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import * as React from 'react'
+
+import {
+  ComboboxInput as ShadcnComboboxInput,
+  type ComboboxInputOption,
+} from '@/components/ui/combobox-input'
+import { cn } from '@/lib/utils'
+
+function ComboboxInput({
+  className,
+  ...props
+}: React.ComponentProps<typeof ShadcnComboboxInput>) {
+  return (
+    <ShadcnComboboxInput className={cn('h-7 sm:h-8', className)} {...props} />
+  )
+}
+
+export { ComboboxInput }
+export type { ComboboxInputOption }

web/default/src/components/design-system/combobox.tsx

@@ -0,0 +1,139 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import { Combobox as ComboboxPrimitive } from '@base-ui/react'
+import * as React from 'react'
+
+import {
+  ComboboxInput as LegacyComboboxInput,
+  type ComboboxInputOption,
+} from '@/components/design-system/combobox-input'
+import {
+  ComboboxChip,
+  ComboboxChips as ShadcnComboboxChips,
+  ComboboxChipsInput,
+  ComboboxCollection,
+  ComboboxContent as ShadcnComboboxContent,
+  ComboboxEmpty,
+  ComboboxGroup,
+  ComboboxInput as ShadcnComboboxInput,
+  ComboboxItem,
+  ComboboxLabel,
+  ComboboxList,
+  ComboboxSeparator,
+  ComboboxTrigger,
+  ComboboxValue,
+  useComboboxAnchor,
+} from '@/components/ui/combobox'
+import { cn } from '@/lib/utils'
+
+type LegacyComboboxProps = {
+  options: ComboboxInputOption[]
+  value?: string
+  onValueChange?: (value: string | null) => void
+  placeholder?: string
+  searchPlaceholder?: string
+  emptyText?: string
+  allowCustomValue?: boolean
+  className?: string
+  id?: string
+  openOnFocus?: boolean
+}
+
+function Combobox(props: LegacyComboboxProps): React.ReactElement
+function Combobox<Value, Multiple extends boolean | undefined = false>(
+  props: ComboboxPrimitive.Root.Props<Value, Multiple>
+): React.ReactElement
+function Combobox(
+  props:
+    | ComboboxPrimitive.Root.Props<unknown, boolean | undefined>
+    | LegacyComboboxProps
+) {
+  if ('options' in props) {
+    return (
+      <LegacyComboboxInput
+        id={props.id}
+        options={props.options}
+        value={props.value ?? ''}
+        onValueChange={(value) => props.onValueChange?.(value)}
+        placeholder={props.searchPlaceholder ?? props.placeholder}
+        emptyText={props.emptyText}
+        className={props.className}
+        allowCustomValue={props.allowCustomValue}
+        openOnFocus={props.openOnFocus}
+      />
+    )
+  }
+
+  return <ComboboxPrimitive.Root {...props} />
+}
+
+function ComboboxInput({
+  className,
+  ...props
+}: React.ComponentProps<typeof ShadcnComboboxInput>) {
+  return (
+    <ShadcnComboboxInput className={cn('h-7 sm:h-8', className)} {...props} />
+  )
+}
+
+function ComboboxContent({
+  className,
+  ...props
+}: React.ComponentProps<typeof ShadcnComboboxContent>) {
+  return (
+    <ShadcnComboboxContent
+      className={cn(
+        '*:data-[slot=input-group]:h-7 sm:*:data-[slot=input-group]:h-8',
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function ComboboxChips({
+  className,
+  ...props
+}: React.ComponentProps<typeof ShadcnComboboxChips>) {
+  return (
+    <ShadcnComboboxChips
+      className={cn('min-h-7 sm:min-h-8', className)}
+      {...props}
+    />
+  )
+}
+
+export {
+  Combobox,
+  ComboboxChip,
+  ComboboxChips,
+  ComboboxChipsInput,
+  ComboboxCollection,
+  ComboboxContent,
+  ComboboxEmpty,
+  ComboboxGroup,
+  ComboboxInput,
+  ComboboxItem,
+  ComboboxLabel,
+  ComboboxList,
+  ComboboxSeparator,
+  ComboboxTrigger,
+  ComboboxValue,
+  useComboboxAnchor,
+}

web/default/src/components/design-system/command.tsx

@@ -0,0 +1,77 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import { SearchIcon } from '@hugeicons/core-free-icons'
+import { HugeiconsIcon } from '@hugeicons/react'
+import { Command as CommandPrimitive } from 'cmdk'
+import * as React from 'react'
+
+import {
+  InputGroup,
+  InputGroupAddon,
+} from '@/components/design-system/input-group'
+import {
+  Command,
+  CommandDialog,
+  CommandEmpty,
+  CommandGroup,
+  CommandItem,
+  CommandList,
+  CommandSeparator,
+  CommandShortcut,
+} from '@/components/ui/command'
+import { cn } from '@/lib/utils'
+
+function CommandInput({
+  className,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive.Input>) {
+  return (
+    <div data-slot='command-input-wrapper' className='p-1 pb-0'>
+      <InputGroup className='border-input/30 bg-input/30 rounded-lg! shadow-none! *:data-[slot=input-group-addon]:pl-2!'>
+        <CommandPrimitive.Input
+          data-slot='command-input'
+          className={cn(
+            'w-full text-sm outline-hidden disabled:cursor-not-allowed disabled:opacity-50',
+            className
+          )}
+          {...props}
+        />
+        <InputGroupAddon>
+          <HugeiconsIcon
+            icon={SearchIcon}
+            strokeWidth={2}
+            className='size-4 shrink-0 opacity-50'
+          />
+        </InputGroupAddon>
+      </InputGroup>
+    </div>
+  )
+}
+
+export {
+  Command,
+  CommandDialog,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+  CommandSeparator,
+  CommandShortcut,
+}

web/default/src/components/design-system/dialog.tsx

@@ -0,0 +1,74 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import { Dialog as DialogPrimitive } from '@base-ui/react/dialog'
+import * as React from 'react'
+
+import { Button } from '@/components/design-system/button'
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogOverlay,
+  DialogPortal,
+  DialogTitle,
+  DialogTrigger,
+} from '@/components/ui/dialog'
+import { cn } from '@/lib/utils'
+
+function DialogFooter({
+  className,
+  showCloseButton = false,
+  children,
+  ...props
+}: React.ComponentProps<'div'> & {
+  showCloseButton?: boolean
+}) {
+  return (
+    <div
+      data-slot='dialog-footer'
+      className={cn(
+        'bg-muted/50 -mx-4 -mb-4 flex flex-col-reverse gap-2 rounded-b-xl border-t p-4 sm:flex-row sm:justify-end',
+        className
+      )}
+      {...props}
+    >
+      {children}
+      {showCloseButton && (
+        <DialogPrimitive.Close render={<Button variant='outline' />}>
+          Close
+        </DialogPrimitive.Close>
+      )}
+    </div>
+  )
+}
+
+export {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogOverlay,
+  DialogPortal,
+  DialogTitle,
+  DialogTrigger,
+}

web/default/src/components/design-system/input-group.tsx

@@ -0,0 +1,79 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import * as React from 'react'
+
+import {
+  InputGroup as ShadcnInputGroup,
+  InputGroupAddon,
+  InputGroupButton as ShadcnInputGroupButton,
+  InputGroupInput as ShadcnInputGroupInput,
+  InputGroupText,
+  InputGroupTextarea,
+} from '@/components/ui/input-group'
+import { cn } from '@/lib/utils'
+
+function InputGroup({
+  className,
+  ...props
+}: React.ComponentProps<typeof ShadcnInputGroup>) {
+  return (
+    <ShadcnInputGroup
+      data-control-size='default'
+      className={cn('h-7 sm:h-8', className)}
+      {...props}
+    />
+  )
+}
+
+function InputGroupButton({
+  className,
+  size = 'xs',
+  ...props
+}: React.ComponentProps<typeof ShadcnInputGroupButton>) {
+  return (
+    <ShadcnInputGroupButton
+      data-control-size={size}
+      size={size}
+      className={cn(
+        size === 'sm' && 'h-7 sm:h-8',
+        size === 'icon-sm' && 'size-7 sm:size-8',
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function InputGroupInput({
+  className,
+  ...props
+}: React.ComponentProps<typeof ShadcnInputGroupInput>) {
+  return (
+    <ShadcnInputGroupInput className={cn('h-full', className)} {...props} />
+  )
+}
+
+export {
+  InputGroup,
+  InputGroupAddon,
+  InputGroupButton,
+  InputGroupInput,
+  InputGroupText,
+  InputGroupTextarea,
+}

web/default/src/components/design-system/input.tsx

@@ -0,0 +1,37 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import * as React from 'react'
+
+import { Input as ShadcnInput } from '@/components/ui/input'
+import { cn } from '@/lib/utils'
+
+function Input({
+  className,
+  ...props
+}: React.ComponentProps<typeof ShadcnInput>) {
+  return (
+    <ShadcnInput
+      data-control-size='default'
+      className={cn('h-7 sm:h-8', className)}
+      {...props}
+    />
+  )
+}
+
+export { Input }

web/default/src/components/design-system/pagination.tsx

@@ -0,0 +1,55 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import * as React from 'react'
+
+import {
+  Pagination as ShadcnPagination,
+  PaginationContent,
+  PaginationEllipsis,
+  PaginationItem,
+  PaginationLink,
+  PaginationNext,
+  PaginationPrevious,
+} from '@/components/ui/pagination'
+import { cn } from '@/lib/utils'
+
+function Pagination({
+  className,
+  ...props
+}: React.ComponentProps<typeof ShadcnPagination>) {
+  return (
+    <ShadcnPagination
+      className={cn(
+        '[&_[data-slot=pagination-link]]:h-7 [&_[data-slot=pagination-link]:not(:has(span))]:w-7 [&_[data-slot=pagination-ellipsis]]:size-7 sm:[&_[data-slot=pagination-link]]:h-8 sm:[&_[data-slot=pagination-link]:not(:has(span))]:w-8 sm:[&_[data-slot=pagination-ellipsis]]:size-8',
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+export {
+  Pagination,
+  PaginationContent,
+  PaginationEllipsis,
+  PaginationItem,
+  PaginationLink,
+  PaginationNext,
+  PaginationPrevious,
+}

web/default/src/components/design-system/select.tsx

@@ -0,0 +1,64 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import * as React from 'react'
+
+import {
+  Select,
+  SelectContent,
+  SelectGroup,
+  SelectItem,
+  SelectLabel,
+  SelectScrollDownButton,
+  SelectScrollUpButton,
+  SelectSeparator,
+  SelectTrigger as ShadcnSelectTrigger,
+  SelectValue,
+} from '@/components/ui/select'
+import { cn } from '@/lib/utils'
+
+function SelectTrigger({
+  className,
+  size = 'default',
+  ...props
+}: React.ComponentProps<typeof ShadcnSelectTrigger>) {
+  return (
+    <ShadcnSelectTrigger
+      data-control-size={size}
+      size={size}
+      className={cn(
+        size === 'default' && 'h-7 text-[0.8rem] sm:h-8 sm:text-sm',
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+export {
+  Select,
+  SelectContent,
+  SelectGroup,
+  SelectItem,
+  SelectLabel,
+  SelectScrollDownButton,
+  SelectScrollUpButton,
+  SelectSeparator,
+  SelectTrigger,
+  SelectValue,
+}

web/default/src/components/design-system/sidebar.tsx

@@ -0,0 +1,95 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import * as React from 'react'
+
+import {
+  Sidebar,
+  SidebarContent,
+  SidebarFooter,
+  SidebarGroup,
+  SidebarGroupAction,
+  SidebarGroupContent,
+  SidebarGroupLabel,
+  SidebarHeader,
+  SidebarInput as ShadcnSidebarInput,
+  SidebarInset,
+  SidebarMenu,
+  SidebarMenuAction,
+  SidebarMenuBadge,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarMenuSkeleton,
+  SidebarMenuSub,
+  SidebarMenuSubButton,
+  SidebarMenuSubItem,
+  SidebarProvider,
+  SidebarRail,
+  SidebarSeparator,
+  SidebarTrigger as ShadcnSidebarTrigger,
+  useSidebar,
+} from '@/components/ui/sidebar'
+import { cn } from '@/lib/utils'
+
+function SidebarTrigger({
+  className,
+  ...props
+}: React.ComponentProps<typeof ShadcnSidebarTrigger>) {
+  return (
+    <ShadcnSidebarTrigger
+      className={cn('size-7 sm:size-8', className)}
+      {...props}
+    />
+  )
+}
+
+function SidebarInput({
+  className,
+  ...props
+}: React.ComponentProps<typeof ShadcnSidebarInput>) {
+  return (
+    <ShadcnSidebarInput className={cn('h-7 sm:h-8', className)} {...props} />
+  )
+}
+
+export {
+  Sidebar,
+  SidebarContent,
+  SidebarFooter,
+  SidebarGroup,
+  SidebarGroupAction,
+  SidebarGroupContent,
+  SidebarGroupLabel,
+  SidebarHeader,
+  SidebarInput,
+  SidebarInset,
+  SidebarMenu,
+  SidebarMenuAction,
+  SidebarMenuBadge,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarMenuSkeleton,
+  SidebarMenuSub,
+  SidebarMenuSubButton,
+  SidebarMenuSubItem,
+  SidebarProvider,
+  SidebarRail,
+  SidebarSeparator,
+  SidebarTrigger,
+  useSidebar,
+}

web/default/src/components/design-system/table.tsx

@@ -0,0 +1,49 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import * as React from 'react'
+
+import {
+  Table,
+  TableBody,
+  TableCaption,
+  TableCell,
+  TableFooter,
+  TableHead as ShadcnTableHead,
+  TableHeader,
+  TableRow,
+} from '@/components/ui/table'
+import { cn } from '@/lib/utils'
+
+function TableHead({
+  className,
+  ...props
+}: React.ComponentProps<typeof ShadcnTableHead>) {
+  return <ShadcnTableHead className={cn('h-9 sm:h-10', className)} {...props} />
+}
+
+export {
+  Table,
+  TableBody,
+  TableCaption,
+  TableCell,
+  TableFooter,
+  TableHead,
+  TableHeader,
+  TableRow,
+}

web/default/src/components/design-system/tabs.tsx

@@ -0,0 +1,57 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import * as React from 'react'
+
+import {
+  Tabs,
+  TabsContent,
+  TabsList as ShadcnTabsList,
+  TabsTrigger as ShadcnTabsTrigger,
+} from '@/components/ui/tabs'
+import { cn } from '@/lib/utils'
+
+function TabsList({
+  className,
+  ...props
+}: React.ComponentProps<typeof ShadcnTabsList>) {
+  return (
+    <ShadcnTabsList
+      data-control-size='default'
+      className={cn(
+        'group-data-horizontal/tabs:h-7 sm:group-data-horizontal/tabs:h-8',
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function TabsTrigger({
+  className,
+  ...props
+}: React.ComponentProps<typeof ShadcnTabsTrigger>) {
+  return (
+    <ShadcnTabsTrigger
+      className={cn('text-[0.8rem] sm:text-sm', className)}
+      {...props}
+    />
+  )
+}
+
+export { Tabs, TabsContent, TabsList, TabsTrigger }

web/default/src/components/design-system/toggle-group.tsx

@@ -0,0 +1,46 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import * as React from 'react'
+
+import {
+  ToggleGroup as ShadcnToggleGroup,
+  ToggleGroupItem,
+} from '@/components/ui/toggle-group'
+import { cn } from '@/lib/utils'
+
+function ToggleGroup({
+  className,
+  size = 'default',
+  ...props
+}: React.ComponentProps<typeof ShadcnToggleGroup>) {
+  return (
+    <ShadcnToggleGroup
+      data-control-size={size}
+      size={size}
+      className={cn(
+        size === 'default' &&
+          "[&_[data-slot=toggle-group-item]]:h-7 [&_[data-slot=toggle-group-item]]:min-w-7 [&_[data-slot=toggle-group-item]]:text-[0.8rem] [&_[data-slot=toggle-group-item]_svg:not([class*='size-'])]:size-3.5 sm:[&_[data-slot=toggle-group-item]]:h-8 sm:[&_[data-slot=toggle-group-item]]:min-w-8 sm:[&_[data-slot=toggle-group-item]]:text-sm sm:[&_[data-slot=toggle-group-item]_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+export { ToggleGroup, ToggleGroupItem }

web/default/src/components/design-system/toggle.tsx

@@ -0,0 +1,59 @@
+/*
+Copyright (C) 2023-2026 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+import { cva, type VariantProps } from 'class-variance-authority'
+import * as React from 'react'
+
+import { Toggle as ShadcnToggle } from '@/components/ui/toggle'
+import { cn } from '@/lib/utils'
+
+const responsiveToggleSizeVariants = cva('', {
+  variants: {
+    size: {
+      default:
+        "h-7 min-w-7 text-[0.8rem] has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3.5 sm:h-8 sm:min-w-8 sm:text-sm sm:has-data-[icon=inline-end]:pr-2 sm:has-data-[icon=inline-start]:pl-2 sm:[&_svg:not([class*='size-'])]:size-4",
+      sm: null,
+      lg: 'h-8 min-w-8 sm:h-9 sm:min-w-9',
+    },
+  },
+  defaultVariants: {
+    size: 'default',
+  },
+})
+
+type ToggleSize = NonNullable<
+  VariantProps<typeof responsiveToggleSizeVariants>['size']
+>
+
+type ToggleProps = Omit<React.ComponentProps<typeof ShadcnToggle>, 'size'> & {
+  size?: ToggleSize
+}
+
+function Toggle({ className, size = 'default', ...props }: ToggleProps) {
+  return (
+    <ShadcnToggle
+      data-control-size={size}
+      size={size}
+      className={cn(responsiveToggleSizeVariants({ size }), className)}
+      {...props}
+    />
+  )
+}
+
+export { Toggle }
+export type { ToggleProps, ToggleSize }

web/default/src/components/dialog.tsx

@@ -26,7 +26,7 @@ import {
   DialogHeader,
   DialogTitle,
   DialogTrigger,
-} from '@/components/ui/dialog'
+} from '@/components/design-system/dialog'
 import { cn } from '@/lib/utils'
 
 type DialogProps = React.ComponentProps<typeof DialogRoot> & {

web/default/src/components/error-state.tsx

@@ -20,8 +20,8 @@ import { AlertTriangle, type LucideIcon } from 'lucide-react'
 import type { ReactNode } from 'react'
 import { useTranslation } from 'react-i18next'
 
+import { Button } from '@/components/design-system/button'
 import { FadeIn } from '@/components/page-transition'
-import { Button } from '@/components/ui/button'
 import {
   Empty,
   EmptyContent,
@@ -61,7 +61,7 @@ export function ErrorState(props: ErrorStateProps) {
         </EmptyHeader>
         <EmptyContent>
           {props.onRetry != null && (
-            <Button variant='outline' size='sm' onClick={props.onRetry}>
+            <Button variant='outline' onClick={props.onRetry}>
               {t('Retry')}
             </Button>
           )}

web/default/src/components/group-badge.tsx

@@ -22,23 +22,18 @@ import { cn } from '@/lib/utils'
 
 import { StatusBadge, type StatusBadgeProps } from './status-badge'
 
-type GroupBadgeProps = Omit<
+type GroupBadgeProps = Omit<StatusBadgeProps, 'children' | 'variant'> & {
-  StatusBadgeProps,
-  'autoColor' | 'label' | 'variant'
-> & {
   group?: string | null
   label?: string
   ratio?: number | null
 }
 
-function getGroupRatioClassName(ratio: number): string {
+function getGroupRatioVariant(
-  if (ratio > 1) {
+  ratio: number
-    return 'bg-warning/10 text-warning'
+): NonNullable<StatusBadgeProps['variant']> {
-  }
+  if (ratio > 1) return 'warning'
-  if (ratio < 1) {
+  if (ratio < 1) return 'info'
-    return 'bg-info/10 text-info'
+  return 'neutral'
-  }
-  return 'bg-muted text-muted-foreground'
 }
 
 function getGroupLabel(params: {
@@ -56,19 +51,10 @@ function getGroupLabel(params: {
 
 export function GroupBadge(props: GroupBadgeProps) {
   const { t } = useTranslation()
-  const {
+  const { group, label: labelOverride, ratio, className, ...badgeProps } = props
-    group,
-    label: labelOverride,
-    ratio,
-    copyable = false,
-    showDot,
-    className,
-    ...badgeProps
-  } = props
   const groupName = group?.trim()
   const isAutoGroup = groupName === 'auto'
   const isEmptyGroup = !groupName
-  const isSpecialGroup = isAutoGroup || isEmptyGroup
   const label = getGroupLabel({
     labelOverride,
     groupName,
@@ -80,13 +66,11 @@ export function GroupBadge(props: GroupBadgeProps) {
   const badge = (
     <StatusBadge
       {...badgeProps}
-      copyable={copyable}
+      variant='neutral'
-      label={label}
-      showDot={showDot ?? (isSpecialGroup ? false : undefined)}
-      variant={isSpecialGroup ? 'neutral' : undefined}
-      autoColor={isSpecialGroup ? undefined : groupName}
       className={cn('min-w-0 shrink overflow-hidden', className)}
-    />
+    >
+      {label}
+    </StatusBadge>
   )
 
   if (ratio == null) {
@@ -96,14 +80,12 @@ export function GroupBadge(props: GroupBadgeProps) {
   return (
     <span className='inline-flex max-w-full min-w-0 items-center gap-2 text-xs'>
       <span className='max-w-full min-w-0 overflow-hidden'>{badge}</span>
-      <span
+      <StatusBadge
-        className={cn(
+        variant={getGroupRatioVariant(ratio)}
-          'inline-flex h-5 shrink-0 items-center rounded-full px-1.5 text-xs leading-none font-medium tabular-nums',
+        className='shrink-0 tabular-nums'
-          getGroupRatioClassName(ratio)
-        )}
       >
-        <span>{ratio}x</span>
+        {ratio}x
-      </span>
+      </StatusBadge>
     </span>
   )
 }

web/default/src/components/json-code-editor.tsx

@@ -26,7 +26,7 @@ import {
 } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import { Textarea } from '@/components/ui/textarea'
 import { cn } from '@/lib/utils'
 
@@ -242,8 +242,7 @@ export function JsonCodeEditor({
           <Button
             type='button'
             variant='ghost'
-            size='sm'
+            size='xs'
-            className='h-6 px-2 text-xs'
             onClick={formatJson}
             disabled={disabled || !jsonStatus.valid || !value.trim()}
           >

web/default/src/components/json-editor.tsx

@@ -20,8 +20,8 @@ import { Code, Table, Plus, Trash2 } from 'lucide-react'
 import { useState, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
-import { Input } from '@/components/ui/input'
+import { Input } from '@/components/design-system/input'
 import { Textarea } from '@/components/ui/textarea'
 import { cn } from '@/lib/utils'
 
@@ -192,7 +192,6 @@ export function JsonEditor({
           <Button
             type='button'
             variant='outline'
-            size='sm'
             onClick={toggleMode}
             disabled={disabled}
           >
@@ -212,8 +211,7 @@ export function JsonEditor({
             <Button
               type='button'
               variant='link'
-              size='sm'
+              className='h-auto p-0 sm:h-auto'
-              className='h-auto p-0'
               onClick={handleFillTemplate}
               disabled={disabled}
             >
@@ -260,7 +258,6 @@ export function JsonEditor({
                     aria-label='Delete row'
                     onClick={() => handleDeleteRow(row.id)}
                     disabled={disabled}
-                    className='h-10 w-10'
                   >
                     <Trash2 className='h-4 w-4' aria-hidden='true' />
                   </Button>
@@ -275,7 +272,6 @@ export function JsonEditor({
           <Button
             type='button'
             variant='outline'
-            size='sm'
             onClick={handleAddRow}
             disabled={disabled}
             className='w-full'

web/default/src/components/language-switcher.tsx

@@ -20,7 +20,7 @@ import { Languages, Check } from 'lucide-react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/design-system/button'
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -55,9 +55,7 @@ export function LanguageSwitcher() {
 
   return (
     <DropdownMenu modal={false}>
-      <DropdownMenuTrigger
+      <DropdownMenuTrigger render={<Button variant='ghost' size='icon' />}>
-        render={<Button variant='ghost' size='icon' className='h-9 w-9' />}
-      >
         <Languages className='size-[1.2rem]' />
         <span className='sr-only'>{t('Change language')}</span>
       </DropdownMenuTrigger>

web/default/src/components/layout/components/app-sidebar.tsx

@@ -18,7 +18,11 @@ For commercial licensing, please contact support@quantumnous.com
 */
 import { AnimatePresence, motion, useReducedMotion } from 'motion/react'
 
-import { Sidebar, SidebarContent, SidebarRail } from '@/components/ui/sidebar'
+import {
+  Sidebar,
+  SidebarContent,
+  SidebarRail,
+} from '@/components/design-system/sidebar'
 import { useLayout } from '@/context/layout-provider'
 import { useSidebarView } from '@/hooks/use-sidebar-view'
 import { MOTION_TRANSITION, MOTION_VARIANTS } from '@/lib/motion'
@@ -52,7 +56,13 @@ export function AppSidebar() {
     <Sidebar collapsible={collapsible} variant={variant}>
       {view && <SidebarViewHeader view={view} />}
 
-      <SidebarContent className='py-2'>
+      <SidebarContent
+        className={
+          view
+            ? 'py-2'
+            : 'py-2 md:pt-[calc(var(--app-header-height,3rem)+0.5rem)]'
+        }
+      >
         <AnimatePresence mode='wait' initial={false}>
           <motion.div
             key={key}

web/default/src/components/layout/components/authenticated-layout.tsx

@@ -16,9 +16,12 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact support@quantumnous.com
 */
+import {
+  SidebarInset,
+  SidebarProvider,
+} from '@/components/design-system/sidebar'
 import { AnimatedOutlet } from '@/components/page-transition'
 import { SkipToMain } from '@/components/skip-to-main'
-import { SidebarInset, SidebarProvider } from '@/components/ui/sidebar'
 import { LayoutProvider } from '@/context/layout-provider'
 import { SearchProvider } from '@/context/search-provider'
 import { getCookie } from '@/lib/cookies'
@@ -46,7 +49,7 @@ export function AuthenticatedLayout(props: AuthenticatedLayoutProps) {
               className={cn(
                 '@container/content',
                 'h-[calc(100svh-var(--app-header-height,0px))]',
-                'min-h-0 overflow-hidden',
+                'min-h-0 min-w-0 overflow-hidden',
                 'peer-data-[variant=inset]:h-[calc(100svh-var(--app-header-height,0px)-(var(--spacing)*4))]'
               )}
             >

web/default/src/components/layout/components/chat-presets-item.tsx

@@ -22,6 +22,14 @@ import { useMemo, useCallback, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { toast } from 'sonner'
 
+import {
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarMenuSub,
+  SidebarMenuSubButton,
+  SidebarMenuSubItem,
+  useSidebar,
+} from '@/components/design-system/sidebar'
 import {
   Collapsible,
   CollapsibleContent,
@@ -33,14 +41,6 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu'
-import {
-  SidebarMenuButton,
-  SidebarMenuItem,
-  SidebarMenuSub,
-  SidebarMenuSubButton,
-  SidebarMenuSubItem,
-  useSidebar,
-} from '@/components/ui/sidebar'
 import { fetchActiveChatKey } from '@/features/chat/hooks/use-active-chat-key'
 import { useChatPresets } from '@/features/chat/hooks/use-chat-presets'
 import {

web/default/src/components/layout/components/header.tsx

@@ -16,7 +16,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact support@quantumnous.com
 */
-import { SidebarTrigger } from '@/components/ui/sidebar'
+import { SidebarTrigger } from '@/components/design-system/sidebar'
 import { cn } from '@/lib/utils'
 
 type HeaderProps = React.HTMLAttributes<HTMLElement>
@@ -31,7 +31,7 @@ export function Header({ className, children, ...props }: HeaderProps) {
       {...props}
     >
       <div className='flex h-full items-center gap-1.5 px-2 sm:gap-2 sm:px-3'>
-        <SidebarTrigger variant='ghost' className='size-8' />
+        <SidebarTrigger variant='ghost' size='icon' />
         {children}
       </div>
     </header>

web/default/src/components/layout/components/mobile-drawer.tsx

@@ -21,9 +21,9 @@ import { X, User, Wallet, LogOut } from 'lucide-react'
 import { AnimatePresence, motion, type Variants } from 'motion/react'
 import { useTranslation } from 'react-i18next'
 
+import { Button } from '@/components/design-system/button'
 import { SignOutDialog } from '@/components/sign-out-dialog'
 import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
-import { Button } from '@/components/ui/button'
 import { Skeleton } from '@/components/ui/skeleton'
 import useDialogState from '@/hooks/use-dialog'
 import { useUserDisplay } from '@/hooks/use-user-display'
@@ -135,7 +135,7 @@ function MobileUserProfile({ user, onNavigate }: MobileUserProfileProps) {
         <Button
           variant='ghost'
           onClick={() => setSignOutOpen(true)}
-          className='text-destructive hover:text-destructive/80 h-auto w-full justify-start gap-2.5 p-2.5 hover:bg-transparent'
+          className='text-destructive hover:text-destructive/80 h-auto w-full justify-start gap-2.5 p-2.5 hover:bg-transparent sm:h-auto'
         >
           <LogOut className='size-4' />
           {t('Sign out')}
@@ -159,8 +159,7 @@ function MobileSignInButton({ onNavigate }: MobileSignInButtonProps) {
   return (
     <Button
       variant='secondary'
-      size='sm'
+      className='w-full'
-      className='h-10 w-full'
       render={<Link to='/sign-in' onClick={onNavigate} />}
     >
       {t('Sign in')}

web/default/src/components/layout/components/nav-group.tsx

@@ -20,6 +20,17 @@ import { Link, useLocation } from '@tanstack/react-router'
 import { ChevronRight } from 'lucide-react'
 import { type ReactNode, useState, useEffect } from 'react'
 
+import {
+  SidebarGroup,
+  SidebarGroupLabel,
+  SidebarMenu,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarMenuSub,
+  SidebarMenuSubButton,
+  SidebarMenuSubItem,
+  useSidebar,
+} from '@/components/design-system/sidebar'
 import { Badge } from '@/components/ui/badge'
 import {
   Collapsible,
@@ -35,17 +46,6 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu'
-import {
-  SidebarGroup,
-  SidebarGroupLabel,
-  SidebarMenu,
-  SidebarMenuButton,
-  SidebarMenuItem,
-  SidebarMenuSub,
-  SidebarMenuSubButton,
-  SidebarMenuSubItem,
-  useSidebar,
-} from '@/components/ui/sidebar'
 
 import { checkIsActive } from '../lib/url-utils'
 import {

web/default/src/components/layout/components/public-header.tsx

@@ -20,12 +20,12 @@ import { Link, useNavigate, useRouterState } from '@tanstack/react-router'
 import { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
+import { Button } from '@/components/design-system/button'
 import { Dialog } from '@/components/dialog'
 import { LanguageSwitcher } from '@/components/language-switcher'
 import { NotificationPopover } from '@/components/notification-popover'
 import { ProfileDropdown } from '@/components/profile-dropdown'
 import { ThemeSwitch } from '@/components/theme-switch'
-import { Button } from '@/components/ui/button'
 import { Skeleton } from '@/components/ui/skeleton'
 import { useNotifications } from '@/hooks/use-notifications'
 import { useSystemConfig } from '@/hooks/use-system-config'
@@ -286,8 +286,7 @@ export function PublicHeader(props: PublicHeaderProps) {
                     <ProfileDropdown />
                   ) : (
                     <Button
-                      size='sm'
+                      className='font-medium'
-                      className='h-8 rounded-lg px-3.5 text-xs font-medium'
                       render={<Link to='/sign-in' />}
                     >
                       {t('Sign in')}
@@ -307,7 +306,6 @@ export function PublicHeader(props: PublicHeaderProps) {
                 type='button'
                 variant='ghost'
                 size='icon'
-                className='size-9'
                 onClick={() => setMobileOpen((v) => !v)}
                 aria-label={t('Toggle navigation menu')}
               >

web/default/src/components/layout/components/sidebar-view-header.tsx

@@ -26,7 +26,7 @@ import {
   SidebarMenuButton,
   SidebarMenuItem,
   useSidebar,
-} from '@/components/ui/sidebar'
+} from '@/components/design-system/sidebar'
 import { cn } from '@/lib/utils'
 
 import type { SidebarView } from '../types'
@@ -46,7 +46,7 @@ export function SidebarViewHeader(props: SidebarViewHeaderProps) {
   const { setOpenMobile } = useSidebar()
 
   return (
-    <SidebarHeader className='border-sidebar-border border-b px-2 py-2'>
+    <SidebarHeader className='border-sidebar-border border-b px-2 py-2 md:mt-[var(--app-header-height,3rem)]'>
       <SidebarMenu>
         <SidebarMenuItem>
           <SidebarMenuButton

web/default/src/components/layout/components/system-brand.tsx

@@ -23,7 +23,7 @@ import {
   SidebarMenu,
   SidebarMenuButton,
   SidebarMenuItem,
-} from '@/components/ui/sidebar'
+} from '@/components/design-system/sidebar'
 import { useStatus } from '@/hooks/use-status'
 import { useSystemConfig } from '@/hooks/use-system-config'
 import { cn } from '@/lib/utils'