diff --git a/apps/server/src/lib/create-app.ts b/apps/server/src/lib/create-app.ts
index fd28129..c52d743 100644
--- a/apps/server/src/lib/create-app.ts
+++ b/apps/server/src/lib/create-app.ts
@@ -8,6 +8,7 @@ import { secureHeaders } from 'hono/secure-headers';
 
 import { notFound, onError } from '../middlewares/common.js';
 import { pinoLogger } from '../middlewares/pino-logger.js';
+import { rateLimit } from '../middlewares/rate-limit.js';
 
 import { env } from './env-config.js';
 import { errorResponse, HttpStatus } from './response.js';
@@ -68,15 +69,15 @@ export default function createApp() {
       )
     );
 
-  // if (!env.isTest) {
-  //   app.use('*', async (c, next) => {
-  //     if (c.req.path === '/health') {
-  //       return next();
-  //     }
+  if (!env.isTest) {
+    app.use('*', async (c, next) => {
+      if (c.req.path === '/health') {
+        return next();
+      }
 
-  //     return rateLimit(c as any, next);
-  //   });
-  // }
+      return rateLimit(c, next);
+    });
+  }
 
   app.notFound(notFound);
   app.onError(onError);
diff --git a/apps/server/src/middlewares/rate-limit.ts b/apps/server/src/middlewares/rate-limit.ts
index 1b58e4f..dc41bbc 100644
--- a/apps/server/src/middlewares/rate-limit.ts
+++ b/apps/server/src/middlewares/rate-limit.ts
@@ -1,9 +1,12 @@
+import type { Context } from 'hono';
 import type { RedisClient } from 'hono-rate-limiter';
 import { RedisStore, rateLimiter } from 'hono-rate-limiter';
 import { Redis } from 'ioredis';
 
 import redisConfig from '@/config/redis.config.js';
 
+import type { AppBindings } from '@/lib/types.js';
+
 const redisClient = new Redis(redisConfig);
 
 // node-redis workaround using ioredis to adapt the redis client for hono-rate-limiter
@@ -18,32 +21,45 @@ const redisAdapter: RedisClient = {
 const ONE_HOUR_WINDOW = 60 * 60 * 1000;
 
 function makeStore(prefix: string) {
-  return new RedisStore({
+  return new RedisStore<AppBindings>({
     client: redisAdapter,
     prefix
   });
 }
 
-function keyByUser(c: any): string {
+function keyByIp(c: Context<AppBindings>): string {
+  return (
+    c.req.header('x-forwarded-for')?.split(',')[0]?.trim() || c.req.header('x-real-ip') || 'unknown'
+  );
+}
+
+function keyByUser(c: Context<AppBindings>): string {
   return c.get('user')?.id ?? 'anon';
 }
 
-async function keyByIpAndEmail(c: any): Promise<string> {
+async function keyByIpAndEmail(c: Context<AppBindings>): Promise<string> {
   let email = 'unknown';
 
   try {
     const body = await c.req.json();
-    email = typeof body?.email === 'string' ? body.email.toLowerCase() : email;
+    if (typeof body === 'object' && body !== null && 'email' in body) {
+      const candidateEmail = body.email;
+      email = typeof candidateEmail === 'string' ? candidateEmail.toLowerCase() : email;
+    }
   } catch {
     // keep unknown email key for malformed requests
   }
 
-  const forwardedFor = c.req.header('x-forwarded-for')?.split(',')[0]?.trim();
-  const ip = forwardedFor || c.req.header('x-real-ip') || 'unknown';
-
-  return `${ip}:${email}`;
+  return `${keyByIp(c)}:${email}`;
 }
 
+export const rateLimit = rateLimiter<AppBindings>({
+  windowMs: 15 * 60 * 1000,
+  limit: 300,
+  keyGenerator: keyByIp,
+  store: makeStore('rl:global:')
+});
+
 export const authRegisterRateLimit = rateLimiter({
   windowMs: ONE_HOUR_WINDOW,
   limit: 10,
diff --git a/apps/server/src/routes/tags/tags.test.ts b/apps/server/src/routes/tags/tags.test.ts
index 4d0dca0..eaf85df 100644
--- a/apps/server/src/routes/tags/tags.test.ts
+++ b/apps/server/src/routes/tags/tags.test.ts
@@ -64,7 +64,11 @@ function buildClient() {
     })
   );
 
-  return { client, seedGroup: tagsAdapter.seedGroup, seedTag: tagsAdapter.seedTag };
+  return {
+    client,
+    seedGroup: tagsAdapter.seedGroup,
+    seedTag: tagsAdapter.seedTag
+  };
 }
 
 let client: ReturnType<typeof buildClient>['client'];
@@ -109,7 +113,13 @@ describe('tags routes', () => {
 
     it('creates a new category', async () => {
       const response = await client.tags.groups.$post(
-        { json: { name: 'Science', color: '#6366F1', description: 'Science articles' } },
+        {
+          json: {
+            name: 'Science',
+            color: '#6366F1',
+            description: 'Science articles'
+          }
+        },
         { headers: { Cookie: authCookie } }
       );
       expect(response.status).toBe(HttpStatus.CREATED);
@@ -276,44 +286,44 @@ describe('tags routes', () => {
     });
   });
 
-  // describe('PUT /api/tags/:tagId/:groupId', () => {
-  //   it('returns 401 without auth', async () => {
-  //     const response = await client.tags[':tagId'][':groupId'].$put({
-  //       param: { tagId: TAG_ID, groupId: GROUP_ID },
-  //       json: { name: 'Updated' }
-  //     });
-  //     expect(response.status).toBe(HttpStatus.UNAUTHORIZED);
-  //   });
-
-  //   it('returns 404 for unknown tag', async () => {
-  //     const response = await client.tags[':tagId'][':groupId'].$put(
-  //       { param: { tagId: UNKNOWN_ID, groupId: GROUP_ID }, json: { name: 'Updated' } },
-  //       { headers: { Cookie: authCookie } }
-  //     );
-  //     expect(response.status).toBe(HttpStatus.NOT_FOUND);
-  //   });
-
-  //   it('returns 400 when no fields provided', async () => {
-  //     const response = await client.tags[':tagId'][':groupId'].$put(
-  //       { param: { tagId: TAG_ID, groupId: GROUP_ID }, json: {} },
-  //       { headers: { Cookie: authCookie } }
-  //     );
-  //     expect(response.status).toBe(HttpStatus.BAD_REQUEST);
-  //   });
-
-  //   it('updates the tag name', async () => {
-  //     const response = await client.tags[':tagId'][':groupId'].$put(
-  //       { param: { tagId: TAG_ID, groupId: GROUP_ID }, json: { name: 'TypeScript Updated' } },
-  //       { headers: { Cookie: authCookie } }
-  //     );
-  //     expect(response.status).toBe(HttpStatus.OK);
-  //     if (response.status === HttpStatus.OK) {
-  //       const json = await response.json();
-  //       expect(json.result.name).toBe('TypeScript Updated');
-  //       expect(json.result.id).toBe(TAG_ID);
-  //     }
-  //   });
-  // });
+  describe('PUT /api/tags/:tagId', () => {
+    it('returns 401 without auth', async () => {
+      const response = await client.tags[':tagId'].$put({
+        param: { tagId: TAG_ID },
+        json: { name: 'Updated' }
+      });
+      expect(response.status).toBe(HttpStatus.UNAUTHORIZED);
+    });
+
+    it('returns 404 for unknown tag', async () => {
+      const response = await client.tags[':tagId'].$put(
+        { param: { tagId: UNKNOWN_ID }, json: { name: 'Updated' } },
+        { headers: { Cookie: authCookie } }
+      );
+      expect(response.status).toBe(HttpStatus.NOT_FOUND);
+    });
+
+    it('returns 400 when no fields provided', async () => {
+      const response = await client.tags[':tagId'].$put(
+        { param: { tagId: TAG_ID }, json: {} },
+        { headers: { Cookie: authCookie } }
+      );
+      expect(response.status).toBe(HttpStatus.BAD_REQUEST);
+    });
+
+    it('updates the tag name', async () => {
+      const response = await client.tags[':tagId'].$put(
+        { param: { tagId: TAG_ID }, json: { name: 'TypeScript Updated' } },
+        { headers: { Cookie: authCookie } }
+      );
+      expect(response.status).toBe(HttpStatus.OK);
+      if (response.status === HttpStatus.OK) {
+        const json = await response.json();
+        expect(json.result.name).toBe('TypeScript Updated');
+        expect(json.result.id).toBe(TAG_ID);
+      }
+    });
+  });
 
   describe('POST /api/tags/:tagId/move', () => {
     it('returns 401 without auth', async () => {
@@ -346,30 +356,30 @@ describe('tags routes', () => {
     });
   });
 
-  // describe('DELETE /api/tags/:tagId/:groupId', () => {
-  //   it('returns 401 without auth', async () => {
-  //     const response = await client.tags[':tagId'][':groupId'].$delete({
-  //       param: { tagId: TAG_ID, groupId: GROUP_ID }
-  //     });
-  //     expect(response.status).toBe(HttpStatus.UNAUTHORIZED);
-  //   });
-
-  //   it('returns 404 for unknown tag', async () => {
-  //     const response = await client.tags[':tagId'][':groupId'].$delete(
-  //       { param: { tagId: UNKNOWN_ID, groupId: GROUP_ID } },
-  //       { headers: { Cookie: authCookie } }
-  //     );
-  //     expect(response.status).toBe(HttpStatus.NOT_FOUND);
-  //   });
-
-  //   it('deletes the tag', async () => {
-  //     const response = await client.tags[':tagId'][':groupId'].$delete(
-  //       { param: { tagId: TAG_ID, groupId: GROUP_ID } },
-  //       { headers: { Cookie: authCookie } }
-  //     );
-  //     expect(response.status).toBe(HttpStatus.OK);
-  //   });
-  // });
+  describe('DELETE /api/tags/:tagId', () => {
+    it('returns 401 without auth', async () => {
+      const response = await client.tags[':tagId'].$delete({
+        param: { tagId: TAG_ID }
+      });
+      expect(response.status).toBe(HttpStatus.UNAUTHORIZED);
+    });
+
+    it('returns 404 for unknown tag', async () => {
+      const response = await client.tags[':tagId'].$delete(
+        { param: { tagId: UNKNOWN_ID } },
+        { headers: { Cookie: authCookie } }
+      );
+      expect(response.status).toBe(HttpStatus.NOT_FOUND);
+    });
+
+    it('deletes the tag', async () => {
+      const response = await client.tags[':tagId'].$delete(
+        { param: { tagId: TAG_ID } },
+        { headers: { Cookie: authCookie } }
+      );
+      expect(response.status).toBe(HttpStatus.OK);
+    });
+  });
 
   describe('DELETE /api/tags/bulk', () => {
     it('returns 401 without auth', async () => {
diff --git a/apps/web/src/features/articles/components/article-card.tsx b/apps/web/src/features/articles/components/article-card.tsx
index c784b49..ac2a17c 100644
--- a/apps/web/src/features/articles/components/article-card.tsx
+++ b/apps/web/src/features/articles/components/article-card.tsx
@@ -500,7 +500,6 @@ function ListCardCompact({
   return (
     <div className="group bg-card [@media(hover:hover)]:hover:bg-accent/30 relative flex w-full flex-col overflow-hidden rounded-xl border transition-colors">
       <div className="flex gap-3 p-3">
-        {/* Thumbnail */}
         <div className="bg-muted relative h-16 w-16 shrink-0 overflow-hidden rounded-lg">
           {isLoading ? (
             <Skeleton className="absolute inset-0 rounded-none" />
@@ -581,14 +580,12 @@ function ListCardCompact({
             </div>
           </div>
 
-          {/* Excerpt */}
           {isLoading ? (
             <Skeleton className="h-3 w-4/5 rounded-md" />
           ) : (
             <p className="text-muted-foreground line-clamp-1 text-xs">{excerpt}</p>
           )}
 
-          {/* Meta row: priority · source · time · progress · tags */}
           {isLoading ? (
             <Skeleton className="h-3 w-28 rounded-md" />
           ) : (
@@ -672,11 +669,10 @@ function ListCardCompact({
         </div>
       </div>
 
-      {/* Ambient reading progress bar at card bottom */}
       {!isLoading && readingProgress > 0 && (
         <div className="bg-muted h-0.5 w-full overflow-hidden">
           <div
-            className="bg-primary h-full w-full origin-left motion-safe:transition-[transform] motion-safe:duration-500 motion-safe:[transition-timing-function:cubic-bezier(0.215,0.61,0.355,1)]"
+            className="bg-primary h-full w-full origin-left motion-safe:transition-[transform] motion-safe:duration-500 motion-safe:ease-[cubic-bezier(0.215,0.61,0.355,1)]"
             style={{ transform: `scaleX(${readingProgress / 100})` }}
           />
         </div>
diff --git a/apps/web/src/features/home/components/continue-reading-card.tsx b/apps/web/src/features/home/components/continue-reading-card.tsx
index 0891afb..f7cc8a6 100644
--- a/apps/web/src/features/home/components/continue-reading-card.tsx
+++ b/apps/web/src/features/home/components/continue-reading-card.tsx
@@ -31,7 +31,6 @@ function ContinueReadingCard({
       type="button"
     >
       <div className="flex items-center gap-4 p-4">
-        {/* Cover image — consistent square across all viewports */}
         <div className="bg-muted relative h-16 w-16 shrink-0 overflow-hidden rounded-xl">
           {coverImage ? (
             <img
@@ -48,7 +47,6 @@ function ContinueReadingCard({
           )}
         </div>
 
-        {/* Content */}
         <div className="min-w-0 flex-1">
           <p className="text-card-foreground line-clamp-2 text-sm font-semibold leading-snug">
             {title}
@@ -58,7 +56,6 @@ function ContinueReadingCard({
           </p>
         </div>
 
-        {/* Directional affordance */}
         <ArrowRightIcon
           className="text-muted-foreground shrink-0 motion-safe:transition-transform motion-safe:duration-150 [@media(hover:hover)]:group-hover:translate-x-0.5"
           size={16}
@@ -66,10 +63,9 @@ function ContinueReadingCard({
         />
       </div>
 
-      {/* Visual reading progress */}
       <div className="bg-muted h-0.5 w-full overflow-hidden">
         <div
-          className="bg-primary h-full w-full origin-left motion-safe:transition-[transform] motion-safe:duration-400 motion-safe:[transition-timing-function:cubic-bezier(0.215,0.61,0.355,1)]"
+          className="bg-primary h-full w-full origin-left motion-safe:transition-[transform] motion-safe:duration-400 motion-safe:ease-[cubic-bezier(0.215,0.61,0.355,1)]"
           style={{ transform: `scaleX(${progress / 100})` }}
         />
       </div>
diff --git a/apps/web/src/features/import-articles/components/import-progress.tsx b/apps/web/src/features/import-articles/components/import-progress.tsx
index c14152d..543e0c7 100644
--- a/apps/web/src/features/import-articles/components/import-progress.tsx
+++ b/apps/web/src/features/import-articles/components/import-progress.tsx
@@ -31,21 +31,6 @@ export function ImportProgress() {
     return () => clearInterval(interval);
   }, []);
 
-  // if (loading) {
-  //   return (
-  //     <div className="mx-auto flex min-h-screen max-w-lg flex-col items-center justify-center gap-6">
-  //       <ArrowsClockwiseIcon className="animate-spin" size={36} />
-  //       <div className="flex flex-col gap-2 text-center">
-  //         <h1 className="text-foreground">Preparing your import</h1>
-  //         <div className="text-muted-foreground">
-  //           We&apos;re getting things ready for your import. This should only
-  //           take a moment.
-  //         </div>
-  //       </div>
-  //     </div>
-  //   )
-  // }
-
   if (status === 'extraction') {
     return (
       <ExtractionProgress
diff --git a/apps/web/src/features/reader/components/floating-progress-indicator.tsx b/apps/web/src/features/reader/components/floating-progress-indicator.tsx
index 024493a..a8ef7f6 100644
--- a/apps/web/src/features/reader/components/floating-progress-indicator.tsx
+++ b/apps/web/src/features/reader/components/floating-progress-indicator.tsx
@@ -108,11 +108,9 @@ export default function FloatingProgressIndicator({
         className
       )}
     >
-      {/* Expanded State */}
       {isExpanded && (
         <div className="animate-in slide-in-from-bottom-2 fade-in absolute right-0 bottom-16 z-50 mb-2 duration-200">
           <div className="bg-card relative z-50 min-w-50 rounded-xl border border-gray-200 p-3 shadow-lg">
-            {/* Progress Info */}
             <div className="mb-3 flex items-center justify-between">
               <div className="flex items-center gap-2">
                 <BookOpenIcon className="text-gray-600" size={16} />
@@ -127,7 +125,6 @@ export default function FloatingProgressIndicator({
               )}
             </div>
 
-            {/* Progress Bar */}
             <div className="relative mb-3">
               <div className="h-2 rounded-full bg-gray-200">
                 <div
@@ -135,7 +132,6 @@ export default function FloatingProgressIndicator({
                   style={{ width: `${progressPercent}%` }}
                 />
               </div>
-              {/* Progress dots for visual appeal */}
               <div className="absolute top-0 right-0 left-0 flex h-2 items-center justify-between px-1">
                 {[0, 25, 50, 75, 100].map((point) => (
                   <div
@@ -149,7 +145,6 @@ export default function FloatingProgressIndicator({
               </div>
             </div>
 
-            {/* Navigation Buttons */}
             <div className="flex gap-2">
               <button
                 className="flex flex-1 items-center justify-center gap-1 rounded-lg bg-gray-100 px-3 py-2 text-sm font-medium text-zinc-700 transition-colors hover:bg-gray-200"
@@ -178,7 +173,6 @@ export default function FloatingProgressIndicator({
         </div>
       )}
 
-      {/* Floating Button */}
       <button
         className={cn(
           'bg-card sepia-theme:hover:bg-card text-card-foreground flex h-10 items-center justify-center rounded-full px-3 py-2 shadow-lg transition-all duration-200 hover:bg-zinc-600/50 active:scale-95',
diff --git a/apps/web/src/features/reader/components/resume-position-banner.tsx b/apps/web/src/features/reader/components/resume-position-banner.tsx
index da624ed..e7407a1 100644
--- a/apps/web/src/features/reader/components/resume-position-banner.tsx
+++ b/apps/web/src/features/reader/components/resume-position-banner.tsx
@@ -19,11 +19,10 @@ export default function ResumePositionBanner({
 }: ResumePositionBannerProps) {
   const { t } = useTranslation('common');
   const [isVisible, setIsVisible] = useState(false);
-  // Capture progress at mount so it doesn't update as the user scrolls
+
   const [snapshotPercent] = useState(Math.round(progress));
 
   useEffect(() => {
-    // Delay mount animation so the slide-up plays on entry
     const timer = setTimeout(() => setIsVisible(true), 100);
     return () => clearTimeout(timer);
   }, []);
diff --git a/apps/web/src/features/settings/components/account-section.tsx b/apps/web/src/features/settings/components/account-section.tsx
index 0a55f58..fb30677 100644
--- a/apps/web/src/features/settings/components/account-section.tsx
+++ b/apps/web/src/features/settings/components/account-section.tsx
@@ -117,7 +117,6 @@ export function AccountSection() {
       title={t('settings.account.title')}
     >
       <div className="space-y-6">
-        {/* Avatar */}
         <div className="flex items-center gap-4">
           <Avatar className="h-16 w-16">
             {avatarPreview && <AvatarImage src={avatarPreview} />}
@@ -146,10 +145,8 @@ export function AccountSection() {
           />
         </div>
 
-        {/* Name */}
         <Field>
           <FieldLabel>{t('settings.account.nameLabel')}</FieldLabel>
-          {/* Outer grid: input takes 1fr, button wrapper takes auto (content-sized) */}
           <div className="grid grid-cols-[1fr_auto]">
             <Input
               onChange={(e) => setName(e.target.value)}
@@ -157,7 +154,6 @@ export function AccountSection() {
               type="text"
               value={name}
             />
-            {/* Inner grid nested in auto column: 1fr here = button's natural width */}
             <div
               className={cn(
                 'grid min-w-0 transition-[grid-template-columns] duration-150 motion-reduce:transition-none',
@@ -187,7 +183,6 @@ export function AccountSection() {
           </div>
         </Field>
 
-        {/* Email */}
         <div>
           <Field>
             <FieldLabel>{t('settings.account.emailLabel')}</FieldLabel>
@@ -228,7 +223,6 @@ export function AccountSection() {
             </div>
           </Field>
 
-          {/* Animated password confirmation — grid-rows expand + opacity + translateY */}
           <div
             className={cn(
               'grid transition-[grid-template-rows] duration-200 motion-reduce:transition-none',
diff --git a/apps/web/src/lib/create-selector-hooks.ts b/apps/web/src/lib/create-selector-hooks.ts
index 452f8a9..4634385 100644
--- a/apps/web/src/lib/create-selector-hooks.ts
+++ b/apps/web/src/lib/create-selector-hooks.ts
@@ -10,7 +10,7 @@ export const createSelectorHooks = <S extends UseBoundStore<StoreApi<object>>>(_
   for (const k of Object.keys(store.getState())) {
     const hookName = `use${k.charAt(0).toUpperCase()}${k.slice(1)}`;
 
-    (store as any)[hookName] = () => store((s) => s[k as keyof typeof s]);
+    Object.assign(store, { [hookName]: () => store((s) => s[k as keyof typeof s]) });
   }
   return store;
 };
diff --git a/apps/web/src/pages/import-articles.tsx b/apps/web/src/pages/import-articles.tsx
index 224e6c8..265e24d 100644
--- a/apps/web/src/pages/import-articles.tsx
+++ b/apps/web/src/pages/import-articles.tsx
@@ -74,12 +74,10 @@ function ImportArticlesPage() {
     );
   }
 
-  // Focus management on step change
   useEffect(() => {
     stepRef.current?.focus();
   }, [step]);
 
-  // Keyboard shortcuts
   useEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
       if (event.key === 'Escape') {
@@ -217,7 +215,6 @@ function ImportArticlesPage() {
     <main aria-label="Article import wizard" className="flex max-w-350 flex-col gap-6" role="main">
       <WizardStepIndicator currentStep={step} steps={STEP_LABELS.map((key) => t(key))} />
 
-      {/* Header */}
       <header>
         <h1 className="text-foreground text-3xl font-bold tracking-tight">
           {t(STEP_LABELS[step])}
@@ -225,7 +222,6 @@ function ImportArticlesPage() {
         <p className="text-muted-foreground mt-1">{t(STEP_DESCRIPTIONS[step])}</p>
       </header>
 
-      {/* Error Alert */}
       {error && (
         <div
           className="border-destructive/50 bg-destructive/10 text-destructive mb-2 flex items-center gap-2 rounded-lg border p-3 text-sm"
@@ -236,7 +232,6 @@ function ImportArticlesPage() {
         </div>
       )}
 
-      {/* Step Content */}
       <div
         aria-label={`Step ${step + 1} content`}
         className="focus-visible:ring-primary focus-visible:ring-2 focus-visible:outline-none"
@@ -247,7 +242,6 @@ function ImportArticlesPage() {
         {renderStep()}
       </div>
 
-      {/* Navigation */}
       <div className="flex items-center justify-between border-t pt-6">
         <div className="flex">
           {step !== STEP_UPLOAD && (
diff --git a/context/current-feature.md b/context/current-feature.md
deleted file mode 100644
index 635a05d..0000000
--- a/context/current-feature.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Current Feature
-
-**Slug:** none
-**Status:** None
-**Path:** none
-**Branch:** none
-
-## Current Focus
-
-- No active feature.
-
-## Notes
-
-- None.