diff --git a/.agents/skills/superset-settings/SKILL.md b/.agents/skills/superset-settings/SKILL.md
index 33cf3edabdc..d6e8c04739c 100644
--- a/.agents/skills/superset-settings/SKILL.md
+++ b/.agents/skills/superset-settings/SKILL.md
@@ -131,7 +131,7 @@ Booleans accept `true/false/on/off/1/0/yes/no`.
 
 | Section | Keys |
 | --- | --- |
-| behavior | `confirmOnQuit`, `fileOpenMode` (`split-pane\|new-tab`), `showResourceMonitor`, `openLinksInApp`, `defaultEditor` (vscode, cursor, zed, ...) |
+| behavior | `confirmOnQuit`, `fileOpenMode` (`split-pane\|new-tab`), `showResourceMonitor`, `showUsageInSidebar`, `openLinksInApp`, `defaultEditor` (vscode, cursor, zed, ...) |
 | git | `branchPrefixMode` (`none\|github\|author\|custom`), `branchPrefixCustom`, `worktreeBaseDir`; host-wide, written through the local host service, so the app (or `superset start`) must be running |
 | notifications | `selectedRingtoneId` (shamisen, arcade, ping, quick, doowap, woman, african, afrobeat, edm, comeback, shabala), `notificationSoundsMuted`, `notificationVolume` (0-100) |
 | terminal | `terminalLinkBehavior` (`external-editor\|file-viewer`), `terminalParkedRuntimeCap` (2-64), `showPresetsBar`, `useCompactTerminalAddButton`, `autoApplyDefaultPreset`, `waitForSetupBeforeAgent` |
diff --git a/apps/desktop/src/lib/trpc/routers/settings/index.ts b/apps/desktop/src/lib/trpc/routers/settings/index.ts
index 24226cb26fd..27fcfc958f9 100644
--- a/apps/desktop/src/lib/trpc/routers/settings/index.ts
+++ b/apps/desktop/src/lib/trpc/routers/settings/index.ts
@@ -55,6 +55,7 @@ import {
 	DEFAULT_OPEN_LINKS_IN_APP,
 	DEFAULT_SHOW_PRESETS_BAR,
 	DEFAULT_SHOW_RESOURCE_MONITOR,
+	DEFAULT_SHOW_USAGE_IN_SIDEBAR,
 	DEFAULT_TERMINAL_COPY_ON_SELECT,
 	DEFAULT_TERMINAL_LINK_BEHAVIOR,
 	DEFAULT_TERMINAL_PARKED_RUNTIME_CAP,
@@ -1107,6 +1108,30 @@ export const createSettingsRouter = () => {
 				return { success: true };
 			}),
 
+		getShowUsageInSidebar: publicProcedure.query(() => {
+			const row = getSettings();
+			return row.showUsageInSidebar ?? DEFAULT_SHOW_USAGE_IN_SIDEBAR;
+		}),
+
+		setShowUsageInSidebar: publicProcedure
+			.input(z.object({ enabled: z.boolean() }))
+			.mutation(({ input }) => {
+				// Target the row getSettings() reads: legacy DBs can hold a non-1
+				// row id, and upserting id 1 there would split settings across
+				// two rows.
+				const { id } = getSettings();
+				localDb
+					.insert(settings)
+					.values({ id, showUsageInSidebar: input.enabled })
+					.onConflictDoUpdate({
+						target: settings.id,
+						set: { showUsageInSidebar: input.enabled },
+					})
+					.run();
+
+				return { success: true };
+			}),
+
 		getWorktreeBaseDir: publicProcedure.query(() => {
 			const row = getSettings();
 			return row.worktreeBaseDir ?? null;
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarHeader/DashboardSidebarHeader.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarHeader/DashboardSidebarHeader.tsx
index 15a3f18ce67..149594c465d 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarHeader/DashboardSidebarHeader.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarHeader/DashboardSidebarHeader.tsx
@@ -17,6 +17,7 @@ import { HiOutlineClipboardDocumentList } from "react-icons/hi2";
 import {
 	LuClock,
 	LuFileText,
+	LuGauge,
 	LuLayers,
 	LuPlus,
 	LuPuzzle,
@@ -50,6 +51,10 @@ import {
 	useTasksFilterStore,
 } from "renderer/routes/_authenticated/_dashboard/tasks/stores/tasks-filter-state";
 import { useHostWorkspaces } from "renderer/routes/_authenticated/providers/HostWorkspacesProvider";
+import {
+	getUsageLastSection,
+	usageSectionPath,
+} from "renderer/routes/_authenticated/settings/usage/utils/usageLastSection";
 import { STROKE_WIDTH_THICK } from "renderer/screens/main/components/WorkspaceSidebar/constants";
 import {
 	useOpenEmptyProjectModal,
@@ -204,6 +209,8 @@ export function DashboardSidebarHeader({
 	};
 
 	const isPagesEnabled = useFeatureFlagEnabled(FEATURE_FLAGS.PAGES) ?? false;
+	const { data: isUsageInSidebarEnabled } =
+		electronTrpc.settings.getShowUsageInSidebar.useQuery();
 
 	const handlePagesClick = () => {
 		navigate({ to: "/pages" });
@@ -227,6 +234,12 @@ export function DashboardSidebarHeader({
 		});
 	};
 
+	const handleUsageClick = () => {
+		// Reopen whichever Usage section (token / machine resources) was
+		// visited last.
+		navigate({ to: usageSectionPath(getUsageLastSection()) });
+	};
+
 	if (isCollapsed) {
 		return (
 			<div className="flex flex-col">
@@ -392,6 +405,26 @@ export function DashboardSidebarHeader({
 						</TooltipContent>
 					</Tooltip>
 
+					{isUsageInSidebarEnabled && (
+						<Tooltip delayDuration={300}>
+							<TooltipTrigger asChild>
+								<button
+									type="button"
+									onClick={handleUsageClick}
+									aria-label={t({
+										message: "Usage",
+									})}
+									className="flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-fill-hover"
+								>
+									<LuGauge className="size-3.5" strokeWidth={1.5} />
+								</button>
+							</TooltipTrigger>
+							<TooltipContent side="right">
+								<Trans>Usage</Trans>
+							</TooltipContent>
+						</Tooltip>
+					)}
+
 					{isPagesEnabled && (
 						<Tooltip delayDuration={300}>
 							<TooltipTrigger asChild>
@@ -647,6 +680,25 @@ export function DashboardSidebarHeader({
 				</span>
 			</button>
 
+			{isUsageInSidebarEnabled && (
+				<button
+					type="button"
+					onClick={handleUsageClick}
+					aria-label={t({
+						message: "Usage",
+					})}
+					className="flex h-7 w-full items-center gap-2 rounded-md px-2 text-[13px] font-medium text-muted-foreground transition-colors hover:bg-fill-hover hover:text-foreground"
+				>
+					<LuGauge
+						className="size-4 shrink-0 text-muted-foreground"
+						strokeWidth={1.5}
+					/>
+					<span className="flex-1 text-left">
+						<Trans>Usage</Trans>
+					</span>
+				</button>
+			)}
+
 			{isPagesEnabled && (
 				<button
 					type="button"
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/usage/components/UsageHistorySection/UsageHistorySection.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/components/UsageHistorySection/UsageHistorySection.tsx
index c1a0c33fdc7..8566e088474 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/usage/components/UsageHistorySection/UsageHistorySection.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/components/UsageHistorySection/UsageHistorySection.tsx
@@ -2,7 +2,7 @@ import { Trans, useLingui } from "@lingui/react/macro";
 import { Tabs, TabsList, TabsTrigger } from "@superset/ui/tabs";
 import { cn } from "@superset/ui/utils";
 import { useState } from "react";
-import { LuX } from "react-icons/lu";
+import { LuRefreshCw, LuX } from "react-icons/lu";
 import {
 	getPresetIcon,
 	useIsDarkTheme,
@@ -80,6 +80,12 @@ export function UsageHistorySection({ hostUrl }: { hostUrl: string | null }) {
 				<h2 className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">
 					<Trans>Token usage</Trans>
 				</h2>
+				{historyQuery.isFetching && history && (
+					<output className="flex items-center gap-1.5 text-[10px] text-muted-foreground">
+						<LuRefreshCw className="size-3 animate-spin" aria-hidden="true" />
+						<Trans>Scanning transcript logs…</Trans>
+					</output>
+				)}
 				{firstDay && lastDay && (
 					<span className="text-[10px] text-muted-foreground">
 						<Trans>
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/usage/components/UsageSidebarToggle/UsageSidebarToggle.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/components/UsageSidebarToggle/UsageSidebarToggle.tsx
new file mode 100644
index 00000000000..6c5b1191280
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/components/UsageSidebarToggle/UsageSidebarToggle.tsx
@@ -0,0 +1,57 @@
+import { Trans } from "@lingui/react/macro";
+import { Label } from "@superset/ui/label";
+import { Switch } from "@superset/ui/switch";
+import { electronTrpc } from "renderer/lib/electron-trpc";
+
+export function UsageSidebarToggle() {
+	const utils = electronTrpc.useUtils();
+	const { data: usageInSidebarEnabled, isLoading: isUsageInSidebarLoading } =
+		electronTrpc.settings.getShowUsageInSidebar.useQuery();
+	const setShowUsageInSidebar =
+		electronTrpc.settings.setShowUsageInSidebar.useMutation({
+			onMutate: async ({ enabled }) => {
+				await utils.settings.getShowUsageInSidebar.cancel();
+				const previous = utils.settings.getShowUsageInSidebar.getData();
+				utils.settings.getShowUsageInSidebar.setData(undefined, enabled);
+				return { previous };
+			},
+			onError: (_err, _vars, context) => {
+				if (context?.previous !== undefined) {
+					utils.settings.getShowUsageInSidebar.setData(
+						undefined,
+						context.previous,
+					);
+				}
+			},
+			onSettled: () => {
+				utils.settings.getShowUsageInSidebar.invalidate();
+			},
+		});
+
+	return (
+		<div className="flex shrink-0 items-center gap-3">
+			<Label
+				htmlFor="usage-in-sidebar"
+				className="text-xs text-muted-foreground"
+			>
+				<Trans>Show usage tab on sidebar</Trans>
+			</Label>
+			<span id="usage-in-sidebar-description" className="sr-only">
+				<Trans>
+					Show a Usage button in the home sidebar, under Pull requests
+				</Trans>
+			</span>
+			<Switch
+				id="usage-in-sidebar"
+				aria-describedby="usage-in-sidebar-description"
+				checked={usageInSidebarEnabled ?? false}
+				onCheckedChange={(enabled) => setShowUsageInSidebar.mutate({ enabled })}
+				disabled={
+					isUsageInSidebarLoading ||
+					usageInSidebarEnabled === undefined ||
+					setShowUsageInSidebar.isPending
+				}
+			/>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/usage/components/UsageSidebarToggle/index.ts b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/components/UsageSidebarToggle/index.ts
new file mode 100644
index 00000000000..6754b91c5fb
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/components/UsageSidebarToggle/index.ts
@@ -0,0 +1 @@
+export { UsageSidebarToggle } from "./UsageSidebarToggle";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/usage/hooks/useHostUsageHistory/useHostUsageHistory.test.ts b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/hooks/useHostUsageHistory/useHostUsageHistory.test.ts
new file mode 100644
index 00000000000..20a805d1856
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/hooks/useHostUsageHistory/useHostUsageHistory.test.ts
@@ -0,0 +1,103 @@
+import { afterEach, expect, mock, test } from "bun:test";
+import { QueryClient, QueryObserver } from "@tanstack/react-query";
+import { hostUsageHistoryOptions } from "./useHostUsageHistory";
+
+const clients: QueryClient[] = [];
+afterEach(() => {
+	for (const client of clients) client.clear();
+	clients.length = 0;
+});
+function setup() {
+	const client = new QueryClient({
+		defaultOptions: { queries: { retry: false, gcTime: 5 * 60_000 } },
+	});
+	clients.push(client);
+	return client;
+}
+const previous = {
+	days: 30,
+	buckets: [],
+	models: [],
+	projects: [],
+	projectDetails: {},
+	modelDetails: {},
+	scannedFiles: 1,
+	pricingTableUpdated: "2026-09-10",
+	totals: {
+		tokens: 123,
+		usd: 4,
+		uncachedInput: 123,
+		cachedInput: 0,
+		cacheWrite: 0,
+		output: 0,
+		reasoningOutput: 0,
+		cacheSavingsUsd: 0,
+		approximate: false,
+	},
+};
+
+test("retains stale history across remounts and a failed background scan", async () => {
+	const client = setup();
+	const options = hostUsageHistoryOptions("http://host-a", 30);
+	client.setQueryData(options.queryKey, previous, { updatedAt: 1 });
+	const request = mock(async () => {
+		throw new Error("offline");
+	});
+	const first = new QueryObserver(client, { ...options, queryFn: request });
+	const unsubscribe = first.subscribe(() => {});
+	expect(first.getCurrentResult().data).toEqual(previous);
+	expect(first.getCurrentResult().isFetching).toBe(true);
+	await first.refetch();
+	unsubscribe();
+	expect(
+		client.getQueryCache().find({ queryKey: options.queryKey })?.gcTime,
+	).toBe(24 * 60 * 60_000);
+	const next = new QueryObserver(client, { ...options, queryFn: request });
+	const stop = next.subscribe(() => {});
+	expect(next.getCurrentResult().data).toEqual(previous);
+	await next.refetch();
+	expect(next.getCurrentResult().isError).toBe(true);
+	expect(next.getCurrentResult().data).toEqual(previous);
+	stop();
+});
+
+test("a completed background scan replaces cached results", async () => {
+	const client = setup();
+	const options = hostUsageHistoryOptions("http://host-a", 30);
+	client.setQueryData(options.queryKey, previous, { updatedAt: 1 });
+	const fresh = { ...previous, totals: { ...previous.totals, tokens: 456 } };
+	const observer = new QueryObserver(client, {
+		...options,
+		queryFn: async () => fresh,
+	});
+	const stop = observer.subscribe(() => {});
+	expect(observer.getCurrentResult().data).toEqual(previous);
+	await observer.refetch();
+	expect(observer.getCurrentResult().data).toEqual(fresh);
+	stop();
+});
+
+test("range switches reuse this host's data, never another host's", () => {
+	const client = setup();
+	client.setQueryData(
+		hostUsageHistoryOptions("http://host-a", 30).queryKey,
+		previous,
+	);
+	const observer = new QueryObserver(client, {
+		...hostUsageHistoryOptions("http://host-a", 30),
+		enabled: false,
+	});
+	const stop = observer.subscribe(() => {});
+	observer.setOptions({
+		...hostUsageHistoryOptions("http://host-a", 7),
+		enabled: false,
+	});
+	expect(observer.getCurrentResult().data).toEqual(previous);
+	expect(observer.getCurrentResult().isPlaceholderData).toBe(true);
+	observer.setOptions({
+		...hostUsageHistoryOptions("http://host-b", 7),
+		enabled: false,
+	});
+	expect(observer.getCurrentResult().data).toBeUndefined();
+	stop();
+});
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/usage/hooks/useHostUsageHistory/useHostUsageHistory.ts b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/hooks/useHostUsageHistory/useHostUsageHistory.ts
index b788d3ed2a0..1389629f2a2 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/usage/hooks/useHostUsageHistory/useHostUsageHistory.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/hooks/useHostUsageHistory/useHostUsageHistory.ts
@@ -1,5 +1,5 @@
 import type { AppRouter } from "@superset/host-service";
-import { keepPreviousData, useQuery } from "@tanstack/react-query";
+import { queryOptions, useQuery } from "@tanstack/react-query";
 import type { inferRouterOutputs } from "@trpc/server";
 import { getHostServiceClientByUrl } from "renderer/lib/host-service-client";
 
@@ -7,15 +7,16 @@ type RouterOutputs = inferRouterOutputs<AppRouter>;
 export type UsageHistory = RouterOutputs["usage"]["history"];
 
 const HISTORY_STALE_MS = 5 * 60 * 1000;
+const HISTORY_CACHE_MS = 24 * 60 * 60 * 1000;
 
 /**
  * Token/cost history from the host's transcript logs. Expensive on the host
  * (multi-GB scan in its worker pool), so no interval polling — refetched on
- * range change and after staleness. `keepPreviousData` keeps the old chart
- * up while a new range loads.
+ * range change and after staleness. Retain results across a day of navigation
+ * so returning to Usage refreshes in the background instead of blanking it.
  */
-export function useHostUsageHistory(hostUrl: string | null, days: number) {
-	return useQuery({
+export function hostUsageHistoryOptions(hostUrl: string | null, days: number) {
+	return queryOptions({
 		queryKey: ["host-usage-history", hostUrl, days] as const,
 		enabled: !!hostUrl,
 		queryFn: () => {
@@ -23,6 +24,13 @@ export function useHostUsageHistory(hostUrl: string | null, days: number) {
 			return getHostServiceClientByUrl(hostUrl).usage.history.query({ days });
 		},
 		staleTime: HISTORY_STALE_MS,
-		placeholderData: keepPreviousData,
+		gcTime: HISTORY_CACHE_MS,
+		// A range change may reuse this host's chart, never another host's data.
+		placeholderData: (previousData, previousQuery) =>
+			previousQuery?.queryKey[1] === hostUrl ? previousData : undefined,
 	});
 }
+
+export function useHostUsageHistory(hostUrl: string | null, days: number) {
+	return useQuery(hostUsageHistoryOptions(hostUrl, days));
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/usage/hooks/useHostUsageQuota/useHostUsageQuota.ts b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/hooks/useHostUsageQuota/useHostUsageQuota.ts
index 9b00b0a5566..6438092d976 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/usage/hooks/useHostUsageQuota/useHostUsageQuota.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/hooks/useHostUsageQuota/useHostUsageQuota.ts
@@ -10,6 +10,7 @@ export type UsageQuotaWindow = UsageAccount["windows"][number];
 
 export const HOST_USAGE_QUOTA_QUERY_KEY = ["host-usage-quota"] as const;
 const USAGE_REFETCH_INTERVAL_MS = 5 * 60_000;
+const USAGE_CACHE_MS = 24 * 60 * 60_000;
 
 /**
  * Subscription quota for every AI CLI login on the given host. The host
@@ -30,6 +31,8 @@ export function useHostUsageQuota(hostUrl: string | null) {
 		},
 		refetchInterval: USAGE_REFETCH_INTERVAL_MS,
 		staleTime: USAGE_REFETCH_INTERVAL_MS,
+		// Keep the last accounts visible when returning after a long absence.
+		gcTime: USAGE_CACHE_MS,
 	});
 
 	const refresh = useCallback(async () => {
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/usage/layout.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/layout.tsx
index 6ca31e370f1..1617c191fb2 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/usage/layout.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/usage/layout.tsx
@@ -1,6 +1,8 @@
 import { createFileRoute, Outlet, useLocation } from "@tanstack/react-router";
+import { useIsV2CloudEnabled } from "renderer/hooks/useIsV2CloudEnabled";
 import { useScrollReset } from "renderer/routes/_authenticated/settings/hooks/useScrollReset";
 import { UsageSectionToggle } from "./components/UsageSectionToggle";
+import { UsageSidebarToggle } from "./components/UsageSidebarToggle";
 
 export const Route = createFileRoute("/_authenticated/settings/usage")({
 	component: UsageLayout,
@@ -8,13 +10,15 @@ export const Route = createFileRoute("/_authenticated/settings/usage")({
 
 function UsageLayout() {
 	const { pathname } = useLocation();
+	const isV2 = useIsV2CloudEnabled();
 	const contentRef = useScrollReset<HTMLDivElement>(pathname);
 
 	return (
 		<div className="flex h-full w-full flex-1 flex-col overflow-hidden">
 			{/* Aligned to the same content column the usage pages center themselves on. */}
-			<div className="mx-auto w-full max-w-5xl shrink-0 px-6 pt-4">
+			<div className="mx-auto flex w-full max-w-5xl shrink-0 flex-wrap items-center justify-between gap-4 px-6 pt-4">
 				<UsageSectionToggle />
+				{isV2 && <UsageSidebarToggle />}
 			</div>
 			<div ref={contentRef} className="min-h-0 flex-1 overflow-y-auto">
 				<Outlet />
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.test.ts b/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.test.ts
index b741ee1bc5e..a256044dcfb 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.test.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "bun:test";
 import {
+	getVisibleItemsForSection,
 	SETTING_ITEM_ID,
 	type SettingsItem,
 	searchSettings,
@@ -77,3 +78,37 @@ describe("settings search - hosts", () => {
 		expect(ids).toContain(SETTING_ITEM_ID.HOST_DELETE);
 	});
 });
+
+describe("settings search - usage in sidebar", () => {
+	it('searching "sidebar" in Usage returns the usage-in-sidebar switch for v2 users', () => {
+		const ids = getVisibleItemsForSection({
+			section: "usage",
+			searchQuery: "sidebar",
+			isV2: true,
+		});
+		expect(ids).toContain(SETTING_ITEM_ID.USAGE_IN_SIDEBAR);
+	});
+
+	it("hides the usage-in-sidebar switch from v1 users", () => {
+		const ids = getVisibleItemsForSection({
+			section: "usage",
+			searchQuery: "sidebar",
+			isV2: false,
+		});
+		expect(ids).not.toContain(SETTING_ITEM_ID.USAGE_IN_SIDEBAR);
+	});
+
+	it('searching "shortcut" matches the usage-in-sidebar item', () => {
+		const ids = getIds(searchSettings("shortcut"));
+		expect(ids).toContain(SETTING_ITEM_ID.USAGE_IN_SIDEBAR);
+	});
+
+	it("lists the usage-in-sidebar switch in Usage without a search for v2 users", () => {
+		const ids = getVisibleItemsForSection({
+			section: "usage",
+			searchQuery: "",
+			isV2: true,
+		});
+		expect(ids).toContain(SETTING_ITEM_ID.USAGE_IN_SIDEBAR);
+	});
+});
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts b/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts
index 096b53dfb1e..1f8bcfa8315 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts
@@ -39,6 +39,7 @@ export const SETTING_ITEM_ID = {
 	BEHAVIOR_FILE_OPEN_MODE: "behavior-file-open-mode",
 	BEHAVIOR_CHANGES_OPEN_TARGET: "behavior-changes-open-target",
 	BEHAVIOR_RESOURCE_MONITOR: "behavior-resource-monitor",
+	USAGE_IN_SIDEBAR: "usage-in-sidebar",
 	BEHAVIOR_OPEN_LINKS_IN_APP: "behavior-open-links-in-app",
 	BEHAVIOR_STAR_GITHUB: "behavior-star-github",
 
@@ -183,6 +184,8 @@ export const SETTING_ITEM_VARIANT: Record<SettingItemId, SettingVariant> = {
 	// The top-bar Changes control is a v2-only surface.
 	[SETTING_ITEM_ID.BEHAVIOR_CHANGES_OPEN_TARGET]: "v2",
 	[SETTING_ITEM_ID.BEHAVIOR_RESOURCE_MONITOR]: "shared",
+	// The home sidebar (DashboardSidebar) only renders for v2 users.
+	[SETTING_ITEM_ID.USAGE_IN_SIDEBAR]: "v2",
 	[SETTING_ITEM_ID.BEHAVIOR_OPEN_LINKS_IN_APP]: "v1",
 	[SETTING_ITEM_ID.BEHAVIOR_STAR_GITHUB]: "shared",
 
@@ -844,6 +847,23 @@ export const SETTINGS_ITEMS: SettingsItem[] = [
 			"terminal",
 		],
 	},
+	{
+		id: SETTING_ITEM_ID.USAGE_IN_SIDEBAR,
+		section: "usage",
+		title: "Show usage tab on sidebar",
+		description: "Show a Usage button in the home sidebar, under Pull requests",
+		keywords: [
+			"sidebar",
+			"rail",
+			"button",
+			"shortcut",
+			"nav",
+			"home",
+			"gauge",
+			"pull requests",
+			"usage",
+		],
+	},
 	{
 		id: SETTING_ITEM_ID.GIT_WORKTREE_LOCATION,
 		section: "git",
diff --git a/apps/desktop/src/shared/constants.ts b/apps/desktop/src/shared/constants.ts
index 2457f87b9df..197e9f54667 100644
--- a/apps/desktop/src/shared/constants.ts
+++ b/apps/desktop/src/shared/constants.ts
@@ -65,6 +65,7 @@ export const DEFAULT_SHOW_PRESETS_BAR = true;
 export const DEFAULT_USE_COMPACT_TERMINAL_ADD_BUTTON = true;
 export const DEFAULT_TELEMETRY_ENABLED = true;
 export const DEFAULT_SHOW_RESOURCE_MONITOR = true;
+export const DEFAULT_SHOW_USAGE_IN_SIDEBAR = false;
 export const DEFAULT_OPEN_LINKS_IN_APP = false;
 export const DEFAULT_EXPOSE_HOST_SERVICE_VIA_RELAY = false;
 
diff --git a/packages/cli/src/lib/settings/hardening.test.ts b/packages/cli/src/lib/settings/hardening.test.ts
index 5e505544c59..f0215cb5d61 100644
--- a/packages/cli/src/lib/settings/hardening.test.ts
+++ b/packages/cli/src/lib/settings/hardening.test.ts
@@ -4,7 +4,7 @@ import { mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { readThemeState } from "./app-state";
 import { readHostGitSettings, writeHostGitSetting } from "./host-settings";
-import { readSettingsRow } from "./local-settings";
+import { readSettingsRow, writeSetting } from "./local-settings";
 import { createLocalSettingsDb, withTempSupersetHome } from "./test-helpers";
 
 const home = withTempSupersetHome("superset-cli-hardening-");
@@ -17,6 +17,21 @@ describe("state-dependent failure hardening", () => {
 		expect(readSettingsRow()?.confirmOnQuit).toBe(true);
 	});
 
+	test("updates the legacy row without splitting settings when writing Usage visibility", () => {
+		createLocalDb(7);
+		writeSetting("showUsageInSidebar", true);
+		expect(readSettingsRow()?.showUsageInSidebar).toBe(true);
+		expect(readSettingsRow()?.confirmOnQuit).toBe(true);
+		const sqlite = new Database(join(home.dir, "local.db"));
+		try {
+			expect(sqlite.query("SELECT id FROM settings").all()).toEqual([
+				{ id: 7 },
+			]);
+		} finally {
+			sqlite.close();
+		}
+	});
+
 	test("reads a WAL-mode database whose sidecars were checkpointed away", () => {
 		createLocalDb(1);
 		const sqlite = new Database(join(home.dir, "local.db"));
diff --git a/packages/cli/src/lib/settings/local-settings.ts b/packages/cli/src/lib/settings/local-settings.ts
index 8fcf229630a..4441147ea4d 100644
--- a/packages/cli/src/lib/settings/local-settings.ts
+++ b/packages/cli/src/lib/settings/local-settings.ts
@@ -75,23 +75,7 @@ export function writeSetting(
  * need to update a value and its initialization marker together.
  */
 export function writeSettings(patch: Partial<InsertSettings>): void {
-	const { sqlite, db } = openLocalDb();
-	try {
-		db.insert(settings)
-			.values({ id: 1, ...patch })
-			.onConflictDoUpdate({ target: settings.id, set: patch })
-			.run();
-	} catch (error) {
-		if (isMissingTableError(error)) {
-			throw new CLIError(
-				"The Superset local database has no settings table",
-				"Launch the Superset desktop app once to run its migrations, then retry.",
-			);
-		}
-		throw error;
-	} finally {
-		sqlite.close();
-	}
+	updateSettingsAtomically(() => ({ patch, result: undefined }));
 }
 
 /**
diff --git a/packages/cli/src/lib/settings/registry.ts b/packages/cli/src/lib/settings/registry.ts
index 4974299e8ef..0969360c5d3 100644
--- a/packages/cli/src/lib/settings/registry.ts
+++ b/packages/cli/src/lib/settings/registry.ts
@@ -87,6 +87,13 @@ export const SETTINGS: SettingDefinition[] = [
 		description: "Show the CPU/memory resource monitor",
 		defaultValue: true,
 	},
+	{
+		key: "showUsageInSidebar",
+		type: "boolean",
+		section: "usage",
+		description: "Show a Usage button in the home sidebar",
+		defaultValue: false,
+	},
 	{
 		key: "openLinksInApp",
 		type: "boolean",
diff --git a/packages/i18n/locales/cs/messages.po b/packages/i18n/locales/cs/messages.po
index 4619fdb428d..01995e23b9e 100644
--- a/packages/i18n/locales/cs/messages.po
+++ b/packages/i18n/locales/cs/messages.po
@@ -12137,6 +12137,9 @@ msgstr "Zkratka se už používá"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "Zobrazit před ukončením aplikace potvrzovací dialog"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "Zobrazovat tlačítko Využití v postranním panelu domovské obrazovky pod pull requesty"
+
 msgid "Show all {count}"
 msgstr "Zobrazit všech {count}"
 
@@ -12251,6 +12254,9 @@ msgstr "Zobrazovat stav a posílat oznámení pro tohoto agenta."
 msgid "Show translation"
 msgstr "Zobrazit překlad"
 
+msgid "Show usage tab on sidebar"
+msgstr "Zobrazit kartu využití v postranním panelu"
+
 msgid "showArrow opt-in"
 msgstr "showArrow zapnuto"
 
diff --git a/packages/i18n/locales/de/messages.po b/packages/i18n/locales/de/messages.po
index 742ddb6de11..83f36689fdb 100644
--- a/packages/i18n/locales/de/messages.po
+++ b/packages/i18n/locales/de/messages.po
@@ -12137,6 +12137,9 @@ msgstr "Kürzel bereits belegt"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "Beim Beenden der App einen Bestätigungsdialog anzeigen"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "Eine Schaltfläche „Nutzung“ in der Seitenleiste der Startansicht unter „Pull Requests“ anzeigen"
+
 msgid "Show all {count}"
 msgstr "Alle {count} anzeigen"
 
@@ -12251,6 +12254,9 @@ msgstr "Status anzeigen und Benachrichtigungen für diesen Agenten senden."
 msgid "Show translation"
 msgstr "Übersetzung anzeigen"
 
+msgid "Show usage tab on sidebar"
+msgstr "Nutzungs-Tab in der Seitenleiste anzeigen"
+
 msgid "showArrow opt-in"
 msgstr "showArrow aktiviert"
 
diff --git a/packages/i18n/locales/en/messages.po b/packages/i18n/locales/en/messages.po
index 68d5b60f35c..9a1981d06f3 100644
--- a/packages/i18n/locales/en/messages.po
+++ b/packages/i18n/locales/en/messages.po
@@ -12137,6 +12137,9 @@ msgstr "Shortcut already in use"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "Show a confirmation dialog when quitting the app"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "Show a Usage button in the home sidebar, under Pull requests"
+
 msgid "Show all {count}"
 msgstr "Show all {count}"
 
@@ -12251,6 +12254,9 @@ msgstr "Show status and send notifications for this agent."
 msgid "Show translation"
 msgstr "Show translation"
 
+msgid "Show usage tab on sidebar"
+msgstr "Show usage tab on sidebar"
+
 msgid "showArrow opt-in"
 msgstr "showArrow opt-in"
 
diff --git a/packages/i18n/locales/es/messages.po b/packages/i18n/locales/es/messages.po
index 16c96c3d61b..e07af754c38 100644
--- a/packages/i18n/locales/es/messages.po
+++ b/packages/i18n/locales/es/messages.po
@@ -12137,6 +12137,9 @@ msgstr "El atajo ya está en uso"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "Mostrar un diálogo de confirmación al salir de la app"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "Mostrar un botón de Uso en la barra lateral de inicio, debajo de Pull requests"
+
 msgid "Show all {count}"
 msgstr "Mostrar los {count}"
 
@@ -12251,6 +12254,9 @@ msgstr "Muestra el estado y envía notificaciones para este agente."
 msgid "Show translation"
 msgstr "Ver la traducción"
 
+msgid "Show usage tab on sidebar"
+msgstr "Mostrar la pestaña de uso en la barra lateral"
+
 msgid "showArrow opt-in"
 msgstr "showArrow opcional"
 
diff --git a/packages/i18n/locales/fr/messages.po b/packages/i18n/locales/fr/messages.po
index 27debe4c265..e52c913aa03 100644
--- a/packages/i18n/locales/fr/messages.po
+++ b/packages/i18n/locales/fr/messages.po
@@ -12137,6 +12137,9 @@ msgstr "Raccourci déjà utilisé"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "Afficher une boîte de dialogue de confirmation à la fermeture de l'application"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "Afficher un bouton Utilisation dans la barre latérale d'accueil, sous Pull requests"
+
 msgid "Show all {count}"
 msgstr "Afficher les {count}"
 
@@ -12251,6 +12254,9 @@ msgstr "Afficher le statut et envoyer des notifications pour cet agent."
 msgid "Show translation"
 msgstr "Afficher la traduction"
 
+msgid "Show usage tab on sidebar"
+msgstr "Afficher l’onglet d’utilisation dans la barre latérale"
+
 msgid "showArrow opt-in"
 msgstr "showArrow en option"
 
diff --git a/packages/i18n/locales/id/messages.po b/packages/i18n/locales/id/messages.po
index 82ba18ba8d6..261a4aaac00 100644
--- a/packages/i18n/locales/id/messages.po
+++ b/packages/i18n/locales/id/messages.po
@@ -12137,6 +12137,9 @@ msgstr "Pintasan sudah dipakai"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "Tampilkan dialog konfirmasi saat keluar dari aplikasi"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "Tampilkan tombol Penggunaan di sidebar beranda, di bawah Pull request"
+
 msgid "Show all {count}"
 msgstr "Tampilkan semua {count}"
 
@@ -12251,6 +12254,9 @@ msgstr "Tampilkan status dan kirim notifikasi untuk agen ini."
 msgid "Show translation"
 msgstr "Tampilkan terjemahan"
 
+msgid "Show usage tab on sidebar"
+msgstr "Tampilkan tab penggunaan di bilah samping"
+
 msgid "showArrow opt-in"
 msgstr "showArrow opsional"
 
diff --git a/packages/i18n/locales/it/messages.po b/packages/i18n/locales/it/messages.po
index bf8dccdf6e6..6fd4aeae43d 100644
--- a/packages/i18n/locales/it/messages.po
+++ b/packages/i18n/locales/it/messages.po
@@ -12137,6 +12137,9 @@ msgstr "Scorciatoia già in uso"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "Mostra una finestra di conferma quando esci dall'app"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "Mostra un pulsante Utilizzo nella barra laterale della home, sotto Pull request"
+
 msgid "Show all {count}"
 msgstr "Mostra tutti i {count}"
 
@@ -12251,6 +12254,9 @@ msgstr "Mostra lo stato e invia notifiche per questo agente."
 msgid "Show translation"
 msgstr "Mostra la traduzione"
 
+msgid "Show usage tab on sidebar"
+msgstr "Mostra la scheda di utilizzo nella barra laterale"
+
 msgid "showArrow opt-in"
 msgstr "showArrow opzionale"
 
diff --git a/packages/i18n/locales/ja/messages.po b/packages/i18n/locales/ja/messages.po
index 744f995c2f4..4512c56ebe6 100644
--- a/packages/i18n/locales/ja/messages.po
+++ b/packages/i18n/locales/ja/messages.po
@@ -12137,6 +12137,9 @@ msgstr "ショートカットは使用中です"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "アプリ終了時に確認ダイアログを表示"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "ホームのサイドバーの「プルリクエスト」の下に「使用量」ボタンを表示"
+
 msgid "Show all {count}"
 msgstr "{count}件すべて表示"
 
@@ -12251,6 +12254,9 @@ msgstr "このエージェントのステータス表示と通知を有効にし
 msgid "Show translation"
 msgstr "翻訳を表示"
 
+msgid "Show usage tab on sidebar"
+msgstr "サイドバーに使用状況タブを表示"
+
 msgid "showArrow opt-in"
 msgstr "showArrowで有効化"
 
diff --git a/packages/i18n/locales/ko/messages.po b/packages/i18n/locales/ko/messages.po
index 2acc08bc73d..4e67cd2eddb 100644
--- a/packages/i18n/locales/ko/messages.po
+++ b/packages/i18n/locales/ko/messages.po
@@ -12137,6 +12137,9 @@ msgstr "이미 사용 중인 단축키"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "앱을 종료할 때 확인 대화 상자를 표시합니다"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "홈 사이드바의 풀 리퀘스트 아래에 사용량 버튼을 표시합니다"
+
 msgid "Show all {count}"
 msgstr "{count}개 모두 보기"
 
@@ -12251,6 +12254,9 @@ msgstr "이 에이전트의 상태를 표시하고 알림을 보냅니다."
 msgid "Show translation"
 msgstr "번역 보기"
 
+msgid "Show usage tab on sidebar"
+msgstr "사이드바에 사용량 탭 표시"
+
 msgid "showArrow opt-in"
 msgstr "showArrow 선택 사용"
 
diff --git a/packages/i18n/locales/nl/messages.po b/packages/i18n/locales/nl/messages.po
index 67721a6ab71..e430194bd29 100644
--- a/packages/i18n/locales/nl/messages.po
+++ b/packages/i18n/locales/nl/messages.po
@@ -12137,6 +12137,9 @@ msgstr "Sneltoets al in gebruik"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "Toon een bevestiging bij het afsluiten van de app"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "Toon een knop Gebruik in de zijbalk van het startscherm, onder Pull requests"
+
 msgid "Show all {count}"
 msgstr "Alle {count} tonen"
 
@@ -12251,6 +12254,9 @@ msgstr "Status tonen en meldingen sturen voor deze agent."
 msgid "Show translation"
 msgstr "Vertaling tonen"
 
+msgid "Show usage tab on sidebar"
+msgstr "Gebruikstabblad tonen in zijbalk"
+
 msgid "showArrow opt-in"
 msgstr "showArrow inschakelen"
 
diff --git a/packages/i18n/locales/pl/messages.po b/packages/i18n/locales/pl/messages.po
index 1049e0d37a5..6785c69fa18 100644
--- a/packages/i18n/locales/pl/messages.po
+++ b/packages/i18n/locales/pl/messages.po
@@ -12137,6 +12137,9 @@ msgstr "Skrót jest już używany"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "Pokaż okno potwierdzenia przy zamykaniu aplikacji"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "Pokazuj przycisk Zużycie na pasku bocznym strony głównej, pod pull requestami"
+
 msgid "Show all {count}"
 msgstr "Pokaż wszystkie ({count})"
 
@@ -12251,6 +12254,9 @@ msgstr "Pokazuj status i wysyłaj powiadomienia dla tego agenta."
 msgid "Show translation"
 msgstr "Pokaż tłumaczenie"
 
+msgid "Show usage tab on sidebar"
+msgstr "Pokaż kartę użycia na pasku bocznym"
+
 msgid "showArrow opt-in"
 msgstr "showArrow włączone"
 
diff --git a/packages/i18n/locales/pt-BR/messages.po b/packages/i18n/locales/pt-BR/messages.po
index 5b397259488..5e12102dacf 100644
--- a/packages/i18n/locales/pt-BR/messages.po
+++ b/packages/i18n/locales/pt-BR/messages.po
@@ -12137,6 +12137,9 @@ msgstr "Atalho já em uso"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "Mostra uma confirmação ao encerrar o app"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "Mostra um botão “Uso” na barra lateral da página inicial, abaixo de “Pull requests”"
+
 msgid "Show all {count}"
 msgstr "Mostrar todos os {count}"
 
@@ -12251,6 +12254,9 @@ msgstr "Mostra o status e envia notificações para este agente."
 msgid "Show translation"
 msgstr "Mostrar a tradução"
 
+msgid "Show usage tab on sidebar"
+msgstr "Mostrar aba de uso na barra lateral"
+
 msgid "showArrow opt-in"
 msgstr "showArrow opcional"
 
diff --git a/packages/i18n/locales/ru/messages.po b/packages/i18n/locales/ru/messages.po
index 17cfad32fe1..76e108e6432 100644
--- a/packages/i18n/locales/ru/messages.po
+++ b/packages/i18n/locales/ru/messages.po
@@ -12137,6 +12137,9 @@ msgstr "Сочетание уже используется"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "Показывать подтверждение при выходе из приложения"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "Показывать кнопку «Использование» в боковой панели главного экрана под пул-реквестами"
+
 msgid "Show all {count}"
 msgstr "Показать все {count}"
 
@@ -12251,6 +12254,9 @@ msgstr "Показывать статус и отправлять уведомл
 msgid "Show translation"
 msgstr "Показать перевод"
 
+msgid "Show usage tab on sidebar"
+msgstr "Показывать вкладку использования на боковой панели"
+
 msgid "showArrow opt-in"
 msgstr "showArrow по желанию"
 
diff --git a/packages/i18n/locales/tr/messages.po b/packages/i18n/locales/tr/messages.po
index 5a8dd065ef3..a593729ab28 100644
--- a/packages/i18n/locales/tr/messages.po
+++ b/packages/i18n/locales/tr/messages.po
@@ -12137,6 +12137,9 @@ msgstr "Kısayol zaten kullanımda"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "Uygulamadan çıkarken onay penceresi göster"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "Ana sayfa kenar çubuğunda, pull request'lerin altında bir Kullanım düğmesi göster"
+
 msgid "Show all {count}"
 msgstr "Tümünü göster ({count})"
 
@@ -12251,6 +12254,9 @@ msgstr "Bu ajan için durum göster ve bildirim gönder."
 msgid "Show translation"
 msgstr "Çeviriyi göster"
 
+msgid "Show usage tab on sidebar"
+msgstr "Kenar çubuğunda kullanım sekmesini göster"
+
 msgid "showArrow opt-in"
 msgstr "showArrow açık"
 
diff --git a/packages/i18n/locales/vi/messages.po b/packages/i18n/locales/vi/messages.po
index e4ecccbc6bd..6ce2bb856bf 100644
--- a/packages/i18n/locales/vi/messages.po
+++ b/packages/i18n/locales/vi/messages.po
@@ -12137,6 +12137,9 @@ msgstr "Phím tắt đã được dùng"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "Hiện hộp thoại xác nhận khi thoát ứng dụng"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "Hiện nút Mức sử dụng trong thanh bên trang chủ, bên dưới Pull request"
+
 msgid "Show all {count}"
 msgstr "Hiện tất cả {count}"
 
@@ -12251,6 +12254,9 @@ msgstr "Hiển thị trạng thái và gửi thông báo cho agent này."
 msgid "Show translation"
 msgstr "Xem bản dịch"
 
+msgid "Show usage tab on sidebar"
+msgstr "Hiển thị thẻ mức sử dụng trên thanh bên"
+
 msgid "showArrow opt-in"
 msgstr "bật showArrow"
 
diff --git a/packages/i18n/locales/zh-CN/messages.po b/packages/i18n/locales/zh-CN/messages.po
index ca160215a85..e05135534ca 100644
--- a/packages/i18n/locales/zh-CN/messages.po
+++ b/packages/i18n/locales/zh-CN/messages.po
@@ -12137,6 +12137,9 @@ msgstr "快捷键已被使用"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "退出应用时显示确认对话框"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "在主页侧边栏的“拉取请求”下方显示“用量”按钮"
+
 msgid "Show all {count}"
 msgstr "显示全部{count}条"
 
@@ -12251,6 +12254,9 @@ msgstr "为此智能体显示状态并发送通知。"
 msgid "Show translation"
 msgstr "显示译文"
 
+msgid "Show usage tab on sidebar"
+msgstr "在侧边栏显示用量选项卡"
+
 msgid "showArrow opt-in"
 msgstr "showArrow按需开启"
 
diff --git a/packages/i18n/locales/zh-TW/messages.po b/packages/i18n/locales/zh-TW/messages.po
index ab23f99d285..41ed3282799 100644
--- a/packages/i18n/locales/zh-TW/messages.po
+++ b/packages/i18n/locales/zh-TW/messages.po
@@ -12137,6 +12137,9 @@ msgstr "快速鍵已被使用"
 msgid "Show a confirmation dialog when quitting the app"
 msgstr "退出應用時顯示確認對話方塊"
 
+msgid "Show a Usage button in the home sidebar, under Pull requests"
+msgstr "在首頁側邊欄的「拉取請求」下方顯示「用量」按鈕"
+
 msgid "Show all {count}"
 msgstr "顯示全部{count}條"
 
@@ -12251,6 +12254,9 @@ msgstr "為此代理程式顯示狀態併發送通知。"
 msgid "Show translation"
 msgstr "顯示譯文"
 
+msgid "Show usage tab on sidebar"
+msgstr "在側邊欄顯示用量分頁"
+
 msgid "showArrow opt-in"
 msgstr "showArrow按需開啟"
 
diff --git a/packages/local-db/drizzle/0056_add_show_usage_in_sidebar_setting.sql b/packages/local-db/drizzle/0056_add_show_usage_in_sidebar_setting.sql
new file mode 100644
index 00000000000..c94e5e9026d
--- /dev/null
+++ b/packages/local-db/drizzle/0056_add_show_usage_in_sidebar_setting.sql
@@ -0,0 +1 @@
+ALTER TABLE `settings` ADD `show_usage_in_sidebar` integer;
\ No newline at end of file
diff --git a/packages/local-db/drizzle/meta/0056_snapshot.json b/packages/local-db/drizzle/meta/0056_snapshot.json
new file mode 100644
index 00000000000..6ccb8f5aaa6
--- /dev/null
+++ b/packages/local-db/drizzle/meta/0056_snapshot.json
@@ -0,0 +1,1748 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "615028a1-a502-40db-94e4-2eb5190e2902",
+  "prevId": "dd7843f9-4d99-475b-b105-d98f92332baf",
+  "tables": {
+    "browser_history": {
+      "name": "browser_history",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "favicon_url": {
+          "name": "favicon_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_visited_at": {
+          "name": "last_visited_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "visit_count": {
+          "name": "visit_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        }
+      },
+      "indexes": {
+        "browser_history_url_unique": {
+          "name": "browser_history_url_unique",
+          "columns": [
+            "url"
+          ],
+          "isUnique": true
+        },
+        "browser_history_url_idx": {
+          "name": "browser_history_url_idx",
+          "columns": [
+            "url"
+          ],
+          "isUnique": false
+        },
+        "browser_history_last_visited_at_idx": {
+          "name": "browser_history_last_visited_at_idx",
+          "columns": [
+            "last_visited_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "downloads": {
+      "name": "downloads",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "filename": {
+          "name": "filename",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "save_path": {
+          "name": "save_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "mime_type": {
+          "name": "mime_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "total_bytes": {
+          "name": "total_bytes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "received_bytes": {
+          "name": "received_bytes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "downloads_started_at_idx": {
+          "name": "downloads_started_at_idx",
+          "columns": [
+            "started_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "organization_members": {
+      "name": "organization_members",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "organization_members_organization_id_idx": {
+          "name": "organization_members_organization_id_idx",
+          "columns": [
+            "organization_id"
+          ],
+          "isUnique": false
+        },
+        "organization_members_user_id_idx": {
+          "name": "organization_members_user_id_idx",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "organization_members_organization_id_organizations_id_fk": {
+          "name": "organization_members_organization_id_organizations_id_fk",
+          "tableFrom": "organization_members",
+          "tableTo": "organizations",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "organization_members_user_id_users_id_fk": {
+          "name": "organization_members_user_id_users_id_fk",
+          "tableFrom": "organization_members",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "organizations": {
+      "name": "organizations",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_org": {
+          "name": "github_org",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "organizations_slug_unique": {
+          "name": "organizations_slug_unique",
+          "columns": [
+            "slug"
+          ],
+          "isUnique": true
+        },
+        "organizations_slug_idx": {
+          "name": "organizations_slug_idx",
+          "columns": [
+            "slug"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "projects": {
+      "name": "projects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "main_repo_path": {
+          "name": "main_repo_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "tab_order": {
+          "name": "tab_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_opened_at": {
+          "name": "last_opened_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "config_toast_dismissed": {
+          "name": "config_toast_dismissed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "default_branch": {
+          "name": "default_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "workspace_base_branch": {
+          "name": "workspace_base_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_owner": {
+          "name": "github_owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "branch_prefix_mode": {
+          "name": "branch_prefix_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "branch_prefix_custom": {
+          "name": "branch_prefix_custom",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "worktree_base_dir": {
+          "name": "worktree_base_dir",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "hide_image": {
+          "name": "hide_image",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "icon_url": {
+          "name": "icon_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "neon_project_id": {
+          "name": "neon_project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "default_app": {
+          "name": "default_app",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "projects_main_repo_path_idx": {
+          "name": "projects_main_repo_path_idx",
+          "columns": [
+            "main_repo_path"
+          ],
+          "isUnique": false
+        },
+        "projects_last_opened_at_idx": {
+          "name": "projects_last_opened_at_idx",
+          "columns": [
+            "last_opened_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "screenshots": {
+      "name": "screenshots",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "filename": {
+          "name": "filename",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "save_path": {
+          "name": "save_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "width": {
+          "name": "width",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "height": {
+          "name": "height",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thumbnail": {
+          "name": "thumbnail",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "captured_at": {
+          "name": "captured_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "screenshots_captured_at_idx": {
+          "name": "screenshots_captured_at_idx",
+          "columns": [
+            "captured_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "settings": {
+      "name": "settings",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "last_active_workspace_id": {
+          "name": "last_active_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_presets": {
+          "name": "terminal_presets",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_presets_initialized": {
+          "name": "terminal_presets_initialized",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "agent_preset_overrides": {
+          "name": "agent_preset_overrides",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "agent_custom_definitions": {
+          "name": "agent_custom_definitions",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "agent_preset_permissions_migrated_at": {
+          "name": "agent_preset_permissions_migrated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "selected_ringtone_id": {
+          "name": "selected_ringtone_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "language": {
+          "name": "language",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "active_organization_id": {
+          "name": "active_organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "confirm_on_quit": {
+          "name": "confirm_on_quit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_link_behavior": {
+          "name": "terminal_link_behavior",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "persist_terminal": {
+          "name": "persist_terminal",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": true
+        },
+        "auto_apply_default_preset": {
+          "name": "auto_apply_default_preset",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "wait_for_setup_before_agent": {
+          "name": "wait_for_setup_before_agent",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "branch_prefix_mode": {
+          "name": "branch_prefix_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "branch_prefix_custom": {
+          "name": "branch_prefix_custom",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notification_sounds_muted": {
+          "name": "notification_sounds_muted",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notification_volume": {
+          "name": "notification_volume",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "delete_local_branch": {
+          "name": "delete_local_branch",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "file_open_mode": {
+          "name": "file_open_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "show_presets_bar": {
+          "name": "show_presets_bar",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "use_compact_terminal_add_button": {
+          "name": "use_compact_terminal_add_button",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_font_family": {
+          "name": "terminal_font_family",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_font_size": {
+          "name": "terminal_font_size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_line_height": {
+          "name": "terminal_line_height",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_letter_spacing": {
+          "name": "terminal_letter_spacing",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_font_weight": {
+          "name": "terminal_font_weight",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_ligatures": {
+          "name": "terminal_ligatures",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_minimum_contrast": {
+          "name": "terminal_minimum_contrast",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_cursor_style": {
+          "name": "terminal_cursor_style",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_cursor_blink": {
+          "name": "terminal_cursor_blink",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_parked_runtime_cap": {
+          "name": "terminal_parked_runtime_cap",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "terminal_copy_on_select": {
+          "name": "terminal_copy_on_select",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "editor_font_family": {
+          "name": "editor_font_family",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "editor_font_size": {
+          "name": "editor_font_size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "editor_line_height": {
+          "name": "editor_line_height",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "editor_letter_spacing": {
+          "name": "editor_letter_spacing",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "editor_font_weight": {
+          "name": "editor_font_weight",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "editor_ligatures": {
+          "name": "editor_ligatures",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "show_resource_monitor": {
+          "name": "show_resource_monitor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "show_usage_in_sidebar": {
+          "name": "show_usage_in_sidebar",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "worktree_base_dir": {
+          "name": "worktree_base_dir",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "open_links_in_app": {
+          "name": "open_links_in_app",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "browser_homepage_url": {
+          "name": "browser_homepage_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "default_editor": {
+          "name": "default_editor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expose_host_service_via_relay": {
+          "name": "expose_host_service_via_relay",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "disabled_agent_hooks": {
+          "name": "disabled_agent_hooks",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "installed_plugins": {
+          "name": "installed_plugins",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "disabled_skills": {
+          "name": "disabled_skills",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "tasks": {
+      "name": "tasks",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status_color": {
+          "name": "status_color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_type": {
+          "name": "status_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_position": {
+          "name": "status_position",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "priority": {
+          "name": "priority",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repository_id": {
+          "name": "repository_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "assignee_id": {
+          "name": "assignee_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "creator_id": {
+          "name": "creator_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "estimate": {
+          "name": "estimate",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "due_date": {
+          "name": "due_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "labels": {
+          "name": "labels",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pr_url": {
+          "name": "pr_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "external_provider": {
+          "name": "external_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "external_id": {
+          "name": "external_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "external_key": {
+          "name": "external_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "external_url": {
+          "name": "external_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_synced_at": {
+          "name": "last_synced_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sync_error": {
+          "name": "sync_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "tasks_slug_unique": {
+          "name": "tasks_slug_unique",
+          "columns": [
+            "slug"
+          ],
+          "isUnique": true
+        },
+        "tasks_slug_idx": {
+          "name": "tasks_slug_idx",
+          "columns": [
+            "slug"
+          ],
+          "isUnique": false
+        },
+        "tasks_organization_id_idx": {
+          "name": "tasks_organization_id_idx",
+          "columns": [
+            "organization_id"
+          ],
+          "isUnique": false
+        },
+        "tasks_assignee_id_idx": {
+          "name": "tasks_assignee_id_idx",
+          "columns": [
+            "assignee_id"
+          ],
+          "isUnique": false
+        },
+        "tasks_status_idx": {
+          "name": "tasks_status_idx",
+          "columns": [
+            "status"
+          ],
+          "isUnique": false
+        },
+        "tasks_created_at_idx": {
+          "name": "tasks_created_at_idx",
+          "columns": [
+            "created_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "tasks_organization_id_organizations_id_fk": {
+          "name": "tasks_organization_id_organizations_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "organizations",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "tasks_assignee_id_users_id_fk": {
+          "name": "tasks_assignee_id_users_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "users",
+          "columnsFrom": [
+            "assignee_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "tasks_creator_id_users_id_fk": {
+          "name": "tasks_creator_id_users_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "users",
+          "columnsFrom": [
+            "creator_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        },
+        "users_email_idx": {
+          "name": "users_email_idx",
+          "columns": [
+            "email"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "v1_migration_state": {
+      "name": "v1_migration_state",
+      "columns": {
+        "v1_id": {
+          "name": "v1_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "kind": {
+          "name": "kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "v2_id": {
+          "name": "v2_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "reason": {
+          "name": "reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "migrated_at": {
+          "name": "migrated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "v1_migration_state_v2_id_idx": {
+          "name": "v1_migration_state_v2_id_idx",
+          "columns": [
+            "v2_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "v1_migration_state_organization_id_v1_id_kind_pk": {
+          "columns": [
+            "organization_id",
+            "v1_id",
+            "kind"
+          ],
+          "name": "v1_migration_state_organization_id_v1_id_kind_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "workspace_sections": {
+      "name": "workspace_sections",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "tab_order": {
+          "name": "tab_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "is_collapsed": {
+          "name": "is_collapsed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "workspace_sections_project_id_idx": {
+          "name": "workspace_sections_project_id_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "workspace_sections_project_id_projects_id_fk": {
+          "name": "workspace_sections_project_id_projects_id_fk",
+          "tableFrom": "workspace_sections",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "workspaces": {
+      "name": "workspaces",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "worktree_id": {
+          "name": "worktree_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "tab_order": {
+          "name": "tab_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_opened_at": {
+          "name": "last_opened_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "is_unread": {
+          "name": "is_unread",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": false
+        },
+        "is_unnamed": {
+          "name": "is_unnamed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": false
+        },
+        "deleting_at": {
+          "name": "deleting_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "port_base": {
+          "name": "port_base",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "section_id": {
+          "name": "section_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "workspaces_project_id_idx": {
+          "name": "workspaces_project_id_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "workspaces_worktree_id_idx": {
+          "name": "workspaces_worktree_id_idx",
+          "columns": [
+            "worktree_id"
+          ],
+          "isUnique": false
+        },
+        "workspaces_last_opened_at_idx": {
+          "name": "workspaces_last_opened_at_idx",
+          "columns": [
+            "last_opened_at"
+          ],
+          "isUnique": false
+        },
+        "workspaces_section_id_idx": {
+          "name": "workspaces_section_id_idx",
+          "columns": [
+            "section_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "workspaces_project_id_projects_id_fk": {
+          "name": "workspaces_project_id_projects_id_fk",
+          "tableFrom": "workspaces",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspaces_worktree_id_worktrees_id_fk": {
+          "name": "workspaces_worktree_id_worktrees_id_fk",
+          "tableFrom": "workspaces",
+          "tableTo": "worktrees",
+          "columnsFrom": [
+            "worktree_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspaces_section_id_workspace_sections_id_fk": {
+          "name": "workspaces_section_id_workspace_sections_id_fk",
+          "tableFrom": "workspaces",
+          "tableTo": "workspace_sections",
+          "columnsFrom": [
+            "section_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "worktrees": {
+      "name": "worktrees",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "base_branch": {
+          "name": "base_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "git_status": {
+          "name": "git_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_status": {
+          "name": "github_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_by_superset": {
+          "name": "created_by_superset",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        }
+      },
+      "indexes": {
+        "worktrees_project_id_idx": {
+          "name": "worktrees_project_id_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "worktrees_branch_idx": {
+          "name": "worktrees_branch_idx",
+          "columns": [
+            "branch"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "worktrees_project_id_projects_id_fk": {
+          "name": "worktrees_project_id_projects_id_fk",
+          "tableFrom": "worktrees",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/local-db/drizzle/meta/_journal.json b/packages/local-db/drizzle/meta/_journal.json
index e3768fd1ca3..c6efb87fefa 100644
--- a/packages/local-db/drizzle/meta/_journal.json
+++ b/packages/local-db/drizzle/meta/_journal.json
@@ -393,6 +393,13 @@
       "when": 1788309290755,
       "tag": "0055_drop_clerk_columns",
       "breakpoints": true
+    },
+    {
+      "idx": 56,
+      "version": "6",
+      "when": 1788567930469,
+      "tag": "0056_add_show_usage_in_sidebar_setting",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/local-db/src/schema/schema.ts b/packages/local-db/src/schema/schema.ts
index 1b8f5df6a7f..312d08eddb5 100644
--- a/packages/local-db/src/schema/schema.ts
+++ b/packages/local-db/src/schema/schema.ts
@@ -254,6 +254,7 @@ export const settings = sqliteTable("settings", {
 	editorFontWeight: integer("editor_font_weight"),
 	editorLigatures: integer("editor_ligatures", { mode: "boolean" }),
 	showResourceMonitor: integer("show_resource_monitor", { mode: "boolean" }),
+	showUsageInSidebar: integer("show_usage_in_sidebar", { mode: "boolean" }),
 	worktreeBaseDir: text("worktree_base_dir"),
 	openLinksInApp: integer("open_links_in_app", { mode: "boolean" }),
 	browserHomepageUrl: text("browser_homepage_url"),