diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5611edd8..7d9479cf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,7 +39,7 @@ jobs:
         run: npm ci --legacy-peer-deps
 
       - name: Validate PR commits
-        run: npx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.sha }} --verbose
+        run: npx commitlint --from=origin/${{ github.event.pull_request.base.ref }} --to=HEAD --verbose
 
   # ─────────────────────────────────────────────────────────
   # TypeScript / React Native Checks
@@ -50,6 +50,9 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -69,7 +72,30 @@ jobs:
         run: npm ci --legacy-peer-deps
 
       - name: Check formatting (Prettier)
+        id: prettier-check
         run: npm run format:check
+        continue-on-error: true
+
+      - name: Auto-fix formatting issues
+        if: steps.prettier-check.outcome == 'failure'
+        run: |
+          echo "Formatting inconsistencies detected. Executing auto-fixer..."
+          npm run format:write || npx prettier --write "src/**/*.{ts,tsx,js,json,md}"
+
+      - name: Commit and Push formatting fixes
+        if: steps.prettier-check.outcome == 'failure'
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 'chore: automated code formatting fixes via CI pipeline'
+          commit_user_name: 'github-actions[bot]'
+          commit_user_email: 'github-actions[bot]@users.noreply.github.com'
+
+      - name: Enforce strict layout check
+        if: steps.prettier-check.outcome == 'failure'
+        run: |
+          echo "❌ Code styles were inconsistent. Automated modifications have been pushed to your branch."
+          echo "Please pull latest changes locally or wait for the subsequent workflow run execution pass."
+          exit 1
 
       - name: Run ESLint
         run: npm run lint
@@ -265,9 +291,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
+            ~/cargo/registry/index/
+            ~/cargo/registry/cache/
+            ~/cargo/git/db/
             contracts/target/
           key: ${{ runner.os }}-cargo-${{ env.RUST_VERSION }}-${{ hashFiles('contracts/Cargo.lock') }}
           restore-keys: |
@@ -293,9 +319,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
+            ~/cargo/registry/index/
+            ~/cargo/registry/cache/
+            ~/cargo/git/db/
             contracts/target/
           key: ${{ runner.os }}-cargo-${{ env.RUST_VERSION }}-${{ hashFiles('contracts/Cargo.lock') }}
           restore-keys: |
@@ -321,9 +347,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
+            ~/cargo/registry/index/
+            ~/cargo/registry/cache/
+            ~/cargo/git/db/
             contracts/target/
           key: ${{ runner.os }}-cargo-${{ env.RUST_VERSION }}-${{ hashFiles('contracts/Cargo.lock') }}
           restore-keys: |
@@ -350,10 +376,8 @@ jobs:
       - name: Prepare reports directory
         run: mkdir -p load-tests/reports
 
-      # k6 exits non-zero when a threshold in config/options.js is breached,
-      # which fails this job — that is the CI gate on performance regressions.
       - name: Run k6 Load Test (${{ matrix.scenario }})
-        uses: grafana/k6-action@v0.5.1
+        uses: grafana/k6-action@v0
         with:
           filename: load-tests/run.js
           flags: --env SCENARIO=${{ matrix.scenario }} --quiet
@@ -398,10 +422,9 @@ jobs:
 
       - name: Check bundle size (PR)
         if: github.event_name == 'pull_request'
-        uses: andresz1/size-limit-action@v1
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          build_script: 'npm run build'
+        run: npx size-limit
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build app
         if: github.event_name != 'pull_request'
@@ -487,4 +510,4 @@ jobs:
             echo "One or more CI checks failed"
             exit 1
           fi
-          echo "All CI checks passed successfully!"
+          echo "All CI checks passed successfully!"
\ No newline at end of file
diff --git a/FORMATTING.md b/FORMATTING.md
new file mode 100644
index 00000000..605c1edb
--- /dev/null
+++ b/FORMATTING.md
@@ -0,0 +1,29 @@
+# SubTrackr Code Style & Formatting Guidelines
+
+To maintain visual clarity, code style consistency, and minimize Git diff noise, this project automatically enforces strict code formatting.
+
+## Style Rules
+
+- **Engine**: Prettier & ESLint
+- **Language Targets**: TypeScript (\.ts\, \.tsx\), JavaScript (\.js\), JSON (\.json\), Markdown (\.md\)
+- **Formatting Constraints**: Configured automatically via \.prettierrc\ and \.eslintrc.json\.
+
+## Local Development Workflows
+
+Before submitting a Pull Request, run the local styling script blocks to verify adherence:
+
+\\\ash
+
+# Check if any files contain formatting errors
+
+npm run format:check
+
+# Manually write styling fixes across all directories
+
+npm run format:write
+\\\
+
+## Continuous Integration (CI) Actions
+
+- Every Pull Request triggers an automated style validation step.
+- If formatting violations are detected, the CI runner will automatically attempt to run the formatter, commit the stylistic corrections directly back to your branch, and exit safely with clean error feedback logs.