Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@src/proxy.ts`:
- Around line 7-8: The current module-scoped Map rateLimitMap is process-local
and must be replaced with a shared store (e.g., Redis or a Next.js KV) so limits
are consistent across replicas; update any code that reads/writes rateLimitMap
to instead use a shared client (create/initialize a single Redis/KV client used
by the proxy handler), store per-identifier counters and expiry in the shared
store, and perform atomic increments and TTL handling (e.g., INCR + EXPIRE or an
equivalent atomic operation) to implement count and resetTime logic; ensure keys
include the same identifier used before (IP or user ID) and update functions
that referenced rateLimitMap to read the counter and reset timestamp from
Redis/KV and to enforce limits based on those values.

In `@src/server/api/routers/listings/admin.ts`:
- Around line 225-228: bulkApprove and bulkReject change listing visibility but
don't invalidate per-device compatibility cache; add the same invalidation used
for single-item approval. In the bulkApprove and bulkReject handlers call the
existing invalidateCatalogCompatibilityCacheForDevice for each affected
listing's deviceId (import it via the same dynamic import pattern used around
listingToApprove), deduplicate deviceIds and run invalidations (e.g.,
Promise.all) after the DB update so every touched device cache is cleared;
reference functions/handlers bulkApprove, bulkReject and the helper
invalidateCatalogCompatibilityCacheForDevice.

In `@src/server/api/routers/pcListings.ts`:
- Around line 482-497: The admin update path (updateAdmin) must perform the same
SEO invalidation as the user update: when the existing pcListing has status
ApprovalStatus.APPROVED and fields that affect SEO change, call
invalidatePcListingSeoForUpdate with the old keys (pcListing.id,
pcListing.gameId, pcListing.cpuId, pcListing.gpuId) and the new keys from
updatedPcListing (updatedPcListing.gameId, updatedPcListing.cpuId,
updatedPcListing.gpuId); add this logic into the updateAdmin flow (mirror the
block that currently exists for user edits) so admin edits to approved listings
also revalidate listing path, list pages, sitemap, and derived tags.

In `@src/server/db/seo-queries.ts`:
- Around line 1-3: Reorder the import statements to satisfy the import/order
rule by placing the external package import for ApprovalStatus from
'`@orm/client`' before the next/cache import; specifically update the imports so
ApprovalStatus from '`@orm/client`' appears above the imports for cacheLife and
cacheTag from 'next/cache' (keep the prisma import from '`@/server/db`' where
appropriate among internal/alias imports).

In `@src/server/services/catalog.service.test.ts`:
- Around line 1-2: ESLint import/order requires module imports (Role and type
PrismaClient from '`@orm/client`') to appear before test framework imports
(beforeEach, describe, expect, it, vi from 'vitest'); fix by moving the import {
Role, type PrismaClient } from '`@orm/client`' above the import { beforeEach,
describe, expect, it, vi } from 'vitest' so the '`@orm/client`' symbols appear
first.

---

Nitpick comments:
In `@eslint.config.mjs`:
- Around line 52-60: The config enables new compiler-aware react-hooks rule IDs
(e.g., 'react-hooks/purity', 'react-hooks/refs',
'react-hooks/set-state-in-effect', 'react-hooks/static-components', etc.) but
package.json currently pins eslint-plugin-react-hooks to 5.2.0; either remove
these newer rule keys from eslint.config.mjs or update the package.json entry
for eslint-plugin-react-hooks to a version that exposes those rules (bump the
version instead of a strict 5.2.0 pin), then run install and verify ESLint no
longer errors on unknown rule IDs; reference the rule names in the config and
the eslint-plugin-react-hooks dependency in package.json when making the change.
- Around line 31-32: Restore Next's TypeScript flat preset by adding
"eslint-config-next/typescript" back into the exported config array alongside
nextCoreWebVitals and eslintConfigPrettier; update the array that currently
contains nextCoreWebVitals and eslintConfigPrettier to include
"eslint-config-next/typescript" (preserving the existing entries) so Next 16's
flat-config TypeScript preset is used instead of hand-maintaining TS rules.

In `@src/app/api/catalog/compatibility/route.ts`:
- Around line 61-63: The response header change in route.ts replaced shared
caching with 'private, no-store', which removes client-side caching and
increases server/API-quota load; update the 'Cache-Control' value used where
headers are set (the 'Cache-Control' entry in
src/app/api/catalog/compatibility/route.ts) to a short client-only policy such
as a private max-age plus optional stale-while-revalidate (e.g., private,
max-age=60, stale-while-revalidate=30) so individual clients can cache identical
requests briefly while still preventing shared CDN caching and preserving
role-scoped visibility and quota semantics.

In `@src/server/db/seo-queries.test.ts`:
- Around line 29-31: Add tests that mirror the existing patterns for
getApprovedGamesForSitemap/getGameForSEO by importing the remaining exports from
'./seo-queries' (getUserForSEO, getApprovedListingsForSitemap,
getApprovedPcListingsForSitemap) and asserting their output shapes and cache
tag/profile contracts; specifically, create test cases that call getUserForSEO
with a sample user id and verify returned fields and cache tags, call
getApprovedListingsForSitemap and getApprovedPcListingsForSitemap to return
lists and verify each item shape plus sitemap-friendly fields and that cache
tags/profiles match the same contract used by getApprovedGamesForSitemap (e.g.,
tag names, id formats, and any ttl/variant expectations). Ensure you reuse
existing fixtures/mocks and test helpers from the file so the new tests follow
the same setup/teardown and assertion style as the current
getApprovedGamesForSitemap tests.

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In
`@src/app/admin/emulators/`[emulatorId]/custom-fields/EmulatorCustomFieldsClientPage.tsx:
- Around line 117-143: The component EmulatorCustomFieldsClientPage currently
checks customFieldDefinitionsQuery.error but not categoriesQuery.error; add an
explicit error branch for categoriesQuery (similar to the existing custom fields
check) that returns a FeedbackCard titled e.g. "Failed to load categories" and
uses categoriesQuery.error.message ?? 'Please try again later.' and the same
backToEmulatorsAction so failed category fetches aren't silently treated as
empty arrays; ensure this check sits after the loading block and before
rendering the main UI.
- Around line 3-11: The import ordering violates ESLint import/order because the
`Role` import from '`@orm`' is placed after application/internal imports; reorder
the imports so external packages (lucide-react, next/link, react), then
absolute/internal libs (e.g., '`@/components/`...', '`@/lib/api`', '`@/utils/`...'),
and finally project alias imports like `import { Role } from '`@orm`'` to satisfy
import/order and restore CI linting for EmulatorCustomFieldsClientPage.tsx.

In `@src/app/admin/emulators/`[emulatorId]/EditEmulatorClientPage.tsx:
- Around line 3-9: The imports are out of order per ESLint import/order: move
the Role import from '`@orm/client`' so it sits with external/third-party imports
(e.g., alongside 'lucide-react' and 'next/navigation') before your app aliased
imports (like '`@/components/ui`' and '`@/lib/api`'), ensuring import groups are:
external packages (ArrowLeft, notFound/useRouter, Role from '`@orm/client`'), then
internal aliases (Button/PageSkeletonLoading, api, hasPermission/PERMISSIONS,
EmulatorEditForm); update the import statement that references Role to use
'`@orm/client`' if needed and place it into that external group to satisfy the
linter.

In `@src/app/admin/games/`[id]/AdminGameEditClientPage.tsx:
- Line 20: The current check in AdminGameEditClientPage conflates fetch errors
and missing records by returning notFound() when gameQuery.error is truthy;
instead, handle them separately: keep the notFound() call only for when
gameQuery.data is null/undefined, and add explicit error handling for
gameQuery.error (e.g., throw the error, return an error UI/component, or call an
error handler) so that operational failures are not misclassified as 404. Locate
the conditional using gameQuery and notFound() and split it into two branches:
one that returns notFound() for missing data and one that surfaces or logs
gameQuery.error appropriately.

In `@src/app/admin/listings/`[id]/edit/EditListingClientPage.tsx:
- Around line 29-31: Replace the direct rendering of the raw backend error in
the EditListingClientPage component (the usage of listingQuery.error.message)
with a generic, user-safe message such as "Unable to load listing. Please try
again later." and ensure the real error is recorded for developers (e.g.,
console.error(listingQuery.error) or send to telemetry) so debugging information
is not exposed in the UI but still available for diagnostics.

In `@src/app/api/admin/listings/`[id]/config/route.ts:
- Around line 2-6: Move the Role import so it precedes the Next.js server
imports to satisfy import/order: import Role from '`@orm`' (the Role symbol)
before importing connection, NextRequest, and NextResponse from 'next/server';
ensure external library imports remain grouped and internal/project imports
(e.g., '`@/server/db`', '`@/server/utils/emulator-config/emulator-detector`',
'`@/utils/permission-system`') keep their relative order after external imports.

In `@src/app/api/admin/notifications/analytics/route.ts`:
- Around line 2-6: Reorder the top-level imports to satisfy import/order: move
the Role import (from '`@orm`') so it appears before the external/module imports
like NextRequest and connection (from 'next/server'); keep the other imports
(prisma, notificationAnalyticsService, hasRolePermission) in the same relative
order and ensure imports for Role, connection, and NextRequest are grouped
correctly to resolve the lint failure.

---

Nitpick comments:
In `@src/app/admin/AdminLayoutClient.tsx`:
- Around line 14-15: Remove the redundant alias by importing hasRolePermission
directly (use import { hasRolePermission } from '`@/utils/permissions`') and
reorder the imports so the Role import from `@orm` appears before the
external/internal utils import; update the import lines referencing
hasRolePermission and Role in AdminLayoutClient.tsx accordingly.

In `@src/app/layout.tsx`:
- Around line 63-65: The Suspense wrapper around the Navbar uses
fallback={null}, which can cause layout shift; replace the null fallback with a
height-preserving placeholder component (e.g., NavbarSkeleton or a simple div
with the same height/spacing as Navbar) and use that as the Suspense fallback so
the page reserves the Navbar space while the real Navbar (component name:
Navbar) is loading; update the Suspense JSX to fallback={<NavbarSkeleton />} (or
similar) and ensure the skeleton matches Navbar's expected height and padding.

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In
`@src/app/admin/emulators/`[emulatorId]/custom-fields/EmulatorCustomFieldsClientPage.tsx:
- Around line 127-135: The new "Emulator not found" branch is unreachable
because the pre-existing access gate (the !canAccess check that depends on
emulatorQuery.data) runs first; update the logic so
isTRPCNotFoundError(emulatorQuery.error) is checked before or independently of
canAccess: either move the isTRPCNotFoundError(emulatorQuery.error) branch above
the !canAccess check, or compute canAccess in a way that does not rely on
emulatorQuery.data when emulatorQuery.error indicates a not-found error,
ensuring the isTRPCNotFoundError(...) condition will render the FeedbackCard for
missing emulators rather than being short-circuited by !canAccess.

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In `@src/app/admin/emulators/`[emulatorId]/EditEmulatorClientPage.tsx:
- Around line 67-110: The onRetry handlers use inconsistent retry mechanisms:
swap the full-page reload to use the query-specific refetch so both error states
use the same strategy; update the AdminErrorState onRetry for the systems
missing-data branch to call systemsQuery.refetch() (matching the other
systemsQuery and emulatorsQuery onRetry usages) and ensure all onRetry handlers
consistently invoke emulatorsQuery.refetch() or systemsQuery.refetch() as
appropriate rather than window.location.reload().

In `@src/app/admin/games/`[id]/AdminGameEditClientPage.tsx:
- Around line 36-44: The no-data fallback in AdminGameEditClientPage uses
window.location.reload() for AdminErrorState.onRetry which is inconsistent with
the other error path that calls gameQuery.refetch(); update the onRetry handler
to call gameQuery.refetch() instead (i.e., pass a function that invokes the
existing gameQuery.refetch method) so the component uses the same retry
mechanism and avoids a full page reload.

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@src/app/admin/users/page.tsx`:
- Line 36: Move the external module import for Role from '`@orm`' so it follows
the project's import ordering rule (external modules before internal/project
imports); update the import statement for Role (import { Role } from '`@orm`') to
appear with other external/third-party imports above the internal imports in
page.tsx to satisfy the import/order lint rule and restore CI.