diff --git a/package.json b/package.json
index ff983ad27..9c7d19285 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "lefthook": "catalog:",
     "oxfmt": "catalog:",
     "oxlint": "catalog:",
-    "oxlint-tsgolint": "^0.16.0",
+    "oxlint-tsgolint": "catalog:",
     "playwright": "catalog:",
     "rimraf": "catalog:",
     "tailwindcss": "catalog:",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5d93bf639..d6a2c236a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -309,6 +309,9 @@ catalogs:
     oxlint:
       specifier: ^1.55.0
       version: 1.55.0
+    oxlint-tsgolint:
+      specifier: ^0.16.0
+      version: 0.16.0
     pinia-plugin-persistedstate:
       specifier: ^4.7.1
       version: 4.7.1
@@ -569,7 +572,7 @@ importers:
         specifier: 'catalog:'
         version: 1.55.0(oxlint-tsgolint@0.16.0)
       oxlint-tsgolint:
-        specifier: ^0.16.0
+        specifier: 'catalog:'
         version: 0.16.0
       playwright:
         specifier: 'catalog:'
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index af5e8107e..d60fadb15 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -126,6 +126,7 @@ catalog:
   ora: ^9.3.0
   oxfmt: ^0.40.0
   oxlint: ^1.55.0
+  oxlint-tsgolint: ^0.16.0
   pinia: ^3.0.4
   pinia-plugin-persistedstate: ^4.7.1
   pkg-types: ^2.3.0
diff --git a/scripts/vsh/src/lint/index.ts b/scripts/vsh/src/lint/index.ts
index 8540644a0..93dec555c 100644
--- a/scripts/vsh/src/lint/index.ts
+++ b/scripts/vsh/src/lint/index.ts
@@ -22,6 +22,9 @@ async function runLint({ format }: LintCommandOptions) {
     await execaCommand(`oxlint . --fix`, {
       stdio: 'inherit',
     });
+    await execaCommand(`oxlint . --type-aware --fix`, {
+      stdio: 'inherit',
+    });
     await execaCommand(`eslint . --cache --fix`, {
       stdio: 'inherit',
     });
@@ -31,7 +34,10 @@ async function runLint({ format }: LintCommandOptions) {
     execaCommand(`oxfmt .`, {
       stdio: 'inherit',
     }),
-    execaCommand(`oxlint . --fix`, {
+    execaCommand(`oxlint .`, {
+      stdio: 'inherit',
+    }),
+    execaCommand(`oxlint . --type-aware`, {
       stdio: 'inherit',
     }),
     execaCommand(`eslint . --cache`, {