diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 95d69f0883..300d1f3a7e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,9 +86,22 @@ jobs:
       - name: Install root dependencies
         run: pnpm --filter root install
 
-      # This will use the `changedFilePatterns` to check that a changeset has been added
-      # if any matched file has been changed
-      - run: pnpm changeset status --since origin/next
+      - name: Check and Validate Changes in /cli
+        run: |
+          git fetch origin next:next
+          changes=$(git diff --name-only next...${{ github.sha }} | grep '^cli/' || true)
+          if [[ -n "$changes" ]]; then
+            echo "Changes detected in /cli: $changes"
+            pnpm changeset status --since origin/next
+            exit_status=$?
+            if [[ $exit_status -eq 0 ]]; then
+              echo "Changeset validation succeeded."
+            else
+              echo "Changeset validation failed."
+            fi
+          else
+            echo "No changes detected in /cli"
+          fi
 
   prettier:
     runs-on: ubuntu-latest