diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fe9a3949..bb3818d6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,3 +8,8 @@ repos:
         args: [ --fix ]
       # Run the formatter.
       - id: ruff-format
+
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: v2.6.0
+    hooks:
+      - id: pyproject-fmt
diff --git a/pyproject.toml b/pyproject.toml
index 308aca15..726bb99d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,16 +1,16 @@
 [build-system]
-requires = ["setuptools >= 61.0"]
 build-backend = "setuptools.build_meta"
 
+requires = [ "setuptools>=61" ]
+
 [project]
 name = "comfy-cli"
-license = { text = "GPL-3.0-only" }
 version = "0.0.0"                                            # Will be filled in by the CI/CD pipeline. Check publish_package.py.
-requires-python = ">= 3.9"
 description = "A CLI tool for installing and using ComfyUI."
 readme = "README.md"
-keywords = ["comfyui", "stable diffusion"]
+keywords = [ "comfyui", "stable diffusion" ]
 
+license = { text = "GPL-3.0-only" }
 maintainers = [
   { name = "Yoland Yan", email = "yoland@drip.art" },
   { name = "James Kwon", email = "hongilkwon316@gmail.com" },
@@ -18,15 +18,24 @@ maintainers = [
   { name = "Dr.Lt.Data", email = "dr.lt.data@gmail.com" },
 ]
 
+requires-python = ">=3.9"
 classifiers = [
   "Development Status :: 4 - Beta",
   "Intended Audience :: Developers",
   "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
 ]
 
 dependencies = [
-  "charset-normalizer>=3.0.0",
-  "GitPython",
+  "charset-normalizer>=3",
+  "click<=8.1.8",
+  "cookiecutter",
+  "gitpython",
   "httpx",
   "mixpanel",
   "packaging",
@@ -36,38 +45,30 @@ dependencies = [
   "questionary",
   "requests",
   "rich",
+  "ruff",
+  "semver~=3.0.2",
   "tomlkit",
-  "typer>=0.9.0",
-  "typing-extensions>=4.7.0",
+  "typer>=0.9",
+  "typing-extensions>=4.7",
   "uv",
   "websocket-client",
-  "ruff",
-  "semver~=3.0.2",
-  "cookiecutter",
-  "click<=8.1.8"
 ]
 
-[project.optional-dependencies]
-dev = ["pre-commit", "pytest", "ruff", "pytest-cov"]
-
-[project.scripts]
-comfy = "comfy_cli.__main__:main"
-comfy-cli = "comfy_cli.__main__:main"
-comfycli = "comfy_cli.__main__:main"
-
-[project.urls]
-Repository = "https://github.com/drip-art/comfy-cli.git"
+optional-dependencies.dev = [ "pre-commit", "pytest", "pytest-cov", "ruff" ]
+urls.Repository = "https://github.com/drip-art/comfy-cli.git"
+scripts.comfy = "comfy_cli.__main__:main"
+scripts.comfy-cli = "comfy_cli.__main__:main"
+scripts.comfycli = "comfy_cli.__main__:main"
 
 [tool.setuptools.packages.find]
-where = ["."]
-include = ["comfy_cli*"]
+where = [ "." ]
+include = [ "comfy_cli*" ]
 
 [tool.ruff]
-line-length = 120
 target-version = "py39"
 
-[tool.ruff.lint]
-select = [
+line-length = 120
+lint.select = [
   "E4", # default
   "E7", # default
   "E9", # default
diff --git a/tests/uv/mock_comfy/custom_nodes/x/pyproject.toml b/tests/uv/mock_comfy/custom_nodes/x/pyproject.toml
index e69de29b..8b137891 100644
--- a/tests/uv/mock_comfy/custom_nodes/x/pyproject.toml
+++ b/tests/uv/mock_comfy/custom_nodes/x/pyproject.toml
@@ -0,0 +1 @@
+
diff --git a/tests/uv/mock_comfy/pyproject.toml b/tests/uv/mock_comfy/pyproject.toml
index e69de29b..8b137891 100644
--- a/tests/uv/mock_comfy/pyproject.toml
+++ b/tests/uv/mock_comfy/pyproject.toml
@@ -0,0 +1 @@
+