Merge branch 'worktree-agent-af80e237' into Develop

# Conflicts:
#	.planning/REQUIREMENTS.md
#	.planning/STATE.md

src/client/routes/settings.tsx

@@ -1,5 +1,6 @@
 import { createFileRoute, Link } from "@tanstack/react-router";
 import { useRef, useState } from "react";
+import { ProfileSection } from "../components/ProfileSection";
 import {
 	useApiKeys,
 	useAuth,
@@ -219,7 +220,13 @@ function SettingsPage() {
 				<h1 className="text-xl font-semibold text-gray-900">Settings</h1>
 			</div>
 
-			<div className="bg-white rounded-xl border border-gray-100 p-5 space-y-6">
+			{auth?.user && (
+				<div className="bg-white rounded-xl border border-gray-100 p-5 space-y-6">
+					<ProfileSection />
+				</div>
+			)}
+
+			<div className="bg-white rounded-xl border border-gray-100 p-5 space-y-6 mt-4">
 				<div className="flex items-center justify-between">
 					<div>
 						<h3 className="text-sm font-medium text-gray-900">Weight Unit</h3>