diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a8be46..b6eabb7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,10 +32,6 @@ jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
-    # TODO(fix-lint-baseline): drop continue-on-error once .convoys/fix-lint-baseline
-    # lands. The codebase has ~100 pre-existing ESLint errors (conditional React
-    # hooks, unescaped entities, etc.). Lint output is still visible in PR logs.
-    continue-on-error: true
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -43,7 +39,19 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: npm
       - run: npm ci
-      - run: npm run lint --if-present
+      # TODO(fix-lint-baseline): drop the `|| true` wrapper once .convoys/fix-lint-baseline
+      # lands. The codebase has ~100 pre-existing ESLint errors (conditional React
+      # hooks, unescaped entities, etc.). For now lint runs and posts output as a
+      # warning annotation so the PR check stays green while the debt is visible.
+      - name: Lint (non-blocking until fix-lint-baseline)
+        run: |
+          set +e
+          npm run lint --if-present
+          status=$?
+          if [ "$status" -ne 0 ]; then
+            echo "::warning title=Lint errors (non-blocking)::ESLint reported errors above. Tracked in .convoys/ship-readiness.md as P1 #11.5 (fix-lint-baseline). Remove the wrapper in .github/workflows/ci.yml after baseline is fixed."
+          fi
+          exit 0
 
   schema-map-fresh:
     name: Schema map up to date