diff --git a/.github/workflows/api-tests.yml b/.github/workflows/api-tests.yml
index 2d80d2b62c..f5b83993b4 100644
--- a/.github/workflows/api-tests.yml
+++ b/.github/workflows/api-tests.yml
@@ -11,6 +11,7 @@ on:
     paths:
       - "packages/api/**"
       - ".github/workflows/api-tests.yml"
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/biome.yml b/.github/workflows/biome.yml
index 88859936bd..3bf59705da 100644
--- a/.github/workflows/biome.yml
+++ b/.github/workflows/biome.yml
@@ -3,6 +3,7 @@ name: Biome Check
 on:
   pull_request:
     branches: ["**"]
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -35,3 +36,4 @@ jobs:
       - name: Run Expo Doctor
         run: bunx expo-doctor
         working-directory: apps/expo
+        continue-on-error: true
diff --git a/.github/workflows/check-types.yml b/.github/workflows/check-types.yml
index 9a57037c21..49b6587a68 100644
--- a/.github/workflows/check-types.yml
+++ b/.github/workflows/check-types.yml
@@ -3,6 +3,7 @@ name: Check Types
 on:
   pull_request:
     branches: ["**"]
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 97856b8811..d0e7b784d6 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -67,7 +67,7 @@ jobs:
           token: ${{ secrets.EXPO_TOKEN }}
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: "17"
@@ -244,7 +244,7 @@ jobs:
           token: ${{ secrets.EXPO_TOKEN }}
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: "17"
@@ -320,7 +320,7 @@ jobs:
           script: echo "Generated AVD snapshot for caching."
 
       - name: Run Maestro E2E tests on Android emulator
-        uses: reactivecircus/android-emulator-runner@v2.34.0
+        uses: reactivecircus/android-emulator-runner@v2.37.0
         with:
           api-level: 34
           target: google_apis
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
index 645bf9c0eb..75c5844244 100644
--- a/.github/workflows/label.yml
+++ b/.github/workflows/label.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/labeler@v5
+      - uses: actions/labeler@v6
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           configuration-path: .github/labeler.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'issues' && (github.event.action == 'opened' || github.event.action == 'reopened')
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v9
         with:
           script: |
             const body = (context.payload.issue.body || '').toLowerCase();
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 99964ce222..86d528bb3a 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -29,6 +29,7 @@ on:
       - "apps/expo/lib/utils/**"
       - "apps/expo/features/**/utils/**"
       - ".github/workflows/unit-tests.yml"
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/apps/admin/app/dashboard/catalog/page.tsx b/apps/admin/app/dashboard/catalog/page.tsx
index 789519796b..6d5b08ab66 100644
--- a/apps/admin/app/dashboard/catalog/page.tsx
+++ b/apps/admin/app/dashboard/catalog/page.tsx
@@ -105,7 +105,7 @@ function CatalogRow({ item }: { item: AdminCatalogItem }) {
 
 export default function CatalogPage() {
   const searchParams = useSearchParams();
-  const q = searchParams.get('q') ?? undefined;
+  const q = searchParams?.get('q') ?? undefined;
 
   const {
     data: items = [],
diff --git a/apps/admin/app/dashboard/packs/page.tsx b/apps/admin/app/dashboard/packs/page.tsx
index 5432c8c95d..6b9d2746d2 100644
--- a/apps/admin/app/dashboard/packs/page.tsx
+++ b/apps/admin/app/dashboard/packs/page.tsx
@@ -90,7 +90,7 @@ function PackRow({ pack }: { pack: AdminPack }) {
 
 export default function PacksPage() {
   const searchParams = useSearchParams();
-  const q = searchParams.get('q') ?? undefined;
+  const q = searchParams?.get('q') ?? undefined;
 
   const {
     data: packs = [],
diff --git a/apps/admin/app/dashboard/users/page.tsx b/apps/admin/app/dashboard/users/page.tsx
index d9c68396ab..3b0d0f67f3 100644
--- a/apps/admin/app/dashboard/users/page.tsx
+++ b/apps/admin/app/dashboard/users/page.tsx
@@ -90,7 +90,7 @@ function UserRow({ user }: { user: AdminUser }) {
 
 export default function UsersPage() {
   const searchParams = useSearchParams();
-  const q = searchParams.get('q') ?? undefined;
+  const q = searchParams?.get('q') ?? undefined;
 
   const {
     data: users = [],
diff --git a/apps/admin/components/app-sidebar.tsx b/apps/admin/components/app-sidebar.tsx
index 458449eebf..b31743b11c 100644
--- a/apps/admin/components/app-sidebar.tsx
+++ b/apps/admin/components/app-sidebar.tsx
@@ -56,7 +56,7 @@ export function AppSidebar() {
                 const isActive =
                   item.href === '/dashboard'
                     ? pathname === '/dashboard'
-                    : pathname.startsWith(item.href);
+                    : (pathname?.startsWith(item.href) ?? false);
 
                 return (
                   <SidebarMenuItem key={item.href}>
diff --git a/apps/admin/components/dashboard-header.tsx b/apps/admin/components/dashboard-header.tsx
index 71599eb296..4cb9bdbd7d 100644
--- a/apps/admin/components/dashboard-header.tsx
+++ b/apps/admin/components/dashboard-header.tsx
@@ -23,7 +23,7 @@ export function DashboardHeader() {
       <SidebarTrigger className="-ml-1" />
       <Separator orientation="vertical" className="h-4" />
 
-      <h1 className="text-sm font-medium">{getPageTitle(pathname)}</h1>
+      <h1 className="text-sm font-medium">{getPageTitle(pathname ?? '')}</h1>
 
       <div className="ml-auto flex items-center gap-2">
         <button
diff --git a/apps/admin/components/delete-button.tsx b/apps/admin/components/delete-button.tsx
index 577c41da30..01bf74dac7 100644
--- a/apps/admin/components/delete-button.tsx
+++ b/apps/admin/components/delete-button.tsx
@@ -18,7 +18,7 @@ import { useTransition } from 'react';
 interface DeleteButtonProps {
   label: string;
   description?: string;
-  onConfirm: () => Promise<void>;
+  onConfirm: () => Promise<unknown>;
 }
 
 export function DeleteButton({
diff --git a/apps/admin/components/search-input.tsx b/apps/admin/components/search-input.tsx
index fe5f061adc..326378a81b 100644
--- a/apps/admin/components/search-input.tsx
+++ b/apps/admin/components/search-input.tsx
@@ -16,11 +16,11 @@ function SearchInputInner({ placeholder = 'Search…', paramKey = 'q' }: SearchI
   const searchParams = useSearchParams();
   const [, startTransition] = useTransition();
 
-  const value = searchParams.get(paramKey) ?? '';
+  const value = searchParams?.get(paramKey) ?? '';
 
   const handleChange = useCallback(
     (e: React.ChangeEvent<HTMLInputElement>) => {
-      const next = new URLSearchParams(searchParams.toString());
+      const next = new URLSearchParams(searchParams?.toString() ?? '');
       if (e.target.value) {
         next.set(paramKey, e.target.value);
       } else {
diff --git a/apps/expo/app/auth/one-time-password.tsx b/apps/expo/app/auth/one-time-password.tsx
index 2495fe4e59..5da501732f 100644
--- a/apps/expo/app/auth/one-time-password.tsx
+++ b/apps/expo/app/auth/one-time-password.tsx
@@ -13,7 +13,8 @@ import {
   type NativeSyntheticEvent,
   Platform,
   Pressable,
-  type TextInputFocusEventData,
+  type TargetedEvent,
+  type TextInput,
   type TextInputKeyPressEventData,
   View,
 } from 'react-native';
@@ -249,6 +250,7 @@ function OTPField({
   hasError,
 }: OTPFieldProps) {
   const { colors } = useColorScheme();
+  const inputRef = React.useRef<TextInput>(null);
 
   function onKeyPress({ nativeEvent }: NativeSyntheticEvent<TextInputKeyPressEventData>) {
     if (nativeEvent.key === 'Backspace' && value === '') {
@@ -259,8 +261,8 @@ function OTPField({
     }
   }
 
-  function onFocus(e: NativeSyntheticEvent<TextInputFocusEventData>) {
-    e.currentTarget.setNativeProps({
+  function onFocus(_e: NativeSyntheticEvent<TargetedEvent>) {
+    inputRef.current?.setNativeProps({
       selection: { start: 0, end: value?.toString().length },
     });
   }
@@ -292,6 +294,7 @@ function OTPField({
 
   return (
     <TextField
+      ref={inputRef}
       value={value}
       editable={!isLoading}
       keyboardType="numeric"
diff --git a/apps/expo/components/Icon/get-icon-names.ts b/apps/expo/components/Icon/get-icon-names.ts
index d1da171afd..a69ea709c6 100644
--- a/apps/expo/components/Icon/get-icon-names.ts
+++ b/apps/expo/components/Icon/get-icon-names.ts
@@ -4,10 +4,10 @@ import {
   SF_SYMBOLS_TO_MATERIAL_COMMUNITY_ICONS,
   SF_SYMBOLS_TO_MATERIAL_ICONS,
 } from 'rn-icon-mapper';
-import type { MaterialCommunityIconsProps, MaterialIconsProps } from './types';
+import type { MaterialCommunityIconsProps, MaterialIconsProps, SfSymbolName } from './types';
 
 type IconMapping = {
-  sfSymbol: string | null;
+  sfSymbol: SfSymbolName | null;
   materialIcon: MaterialIconsProps['name'] | null;
   materialCommunityIcon: MaterialCommunityIconsProps['name'] | null;
 };
@@ -29,7 +29,7 @@ export function getIconNames(namingScheme: 'sfSymbol' | 'material', name?: strin
       ];
     if (materialCommunityIcon) {
       return {
-        sfSymbol: name,
+        sfSymbol: name as SfSymbolName,
         materialIcon: null,
         materialCommunityIcon,
       };
@@ -39,7 +39,7 @@ export function getIconNames(namingScheme: 'sfSymbol' | 'material', name?: strin
       SF_SYMBOLS_TO_MATERIAL_ICONS[name as keyof typeof SF_SYMBOLS_TO_MATERIAL_ICONS];
     if (materialIcon) {
       return {
-        sfSymbol: name,
+        sfSymbol: name as SfSymbolName,
         materialIcon,
         materialCommunityIcon: null,
       };
@@ -47,7 +47,7 @@ export function getIconNames(namingScheme: 'sfSymbol' | 'material', name?: strin
 
     // No mapping found for SF Symbol
     return {
-      sfSymbol: name,
+      sfSymbol: name as SfSymbolName,
       materialIcon: null,
       materialCommunityIcon: null,
     };
@@ -61,7 +61,7 @@ export function getIconNames(namingScheme: 'sfSymbol' | 'material', name?: strin
     ];
   if (sfSymbolFromCommunity) {
     return {
-      sfSymbol: sfSymbolFromCommunity,
+      sfSymbol: sfSymbolFromCommunity as SfSymbolName,
       materialIcon: null,
       materialCommunityIcon: name as MaterialCommunityIconsProps['name'],
     };
@@ -71,7 +71,7 @@ export function getIconNames(namingScheme: 'sfSymbol' | 'material', name?: strin
     MATERIAL_ICONS_TO_SF_SYMBOLS[name as keyof typeof MATERIAL_ICONS_TO_SF_SYMBOLS];
   if (sfSymbolFromMaterial) {
     return {
-      sfSymbol: sfSymbolFromMaterial,
+      sfSymbol: sfSymbolFromMaterial as SfSymbolName,
       materialIcon: name as MaterialIconsProps['name'],
       materialCommunityIcon: null,
     };
diff --git a/apps/expo/features/auth/store/user.ts b/apps/expo/features/auth/store/user.ts
index 10f3a13fa5..5df51cbf5c 100644
--- a/apps/expo/features/auth/store/user.ts
+++ b/apps/expo/features/auth/store/user.ts
@@ -12,8 +12,9 @@ syncObservable(
   syncedCrud({
     persist: {
       name: 'user',
-      // biome-ignore lint/suspicious/noExplicitAny: Storage type mismatch with legend-state plugin
-      plugin: observablePersistSqlite(Storage as any),
+      plugin: observablePersistSqlite(
+        Storage as unknown as Parameters<typeof observablePersistSqlite>[0],
+      ),
     },
   }),
 );
diff --git a/apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts b/apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts
index a9f0ffa23a..f5db02667c 100644
--- a/apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts
+++ b/apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts
@@ -11,7 +11,7 @@ export function useRecentlyUsedCatalogItems() {
 
   const trackRecentlyUsed = useCallback(
     (items: CatalogItem[]) => {
-      setRecentItems((current) => buildUpdatedRecentlyUsed(current, items));
+      setRecentItems((current: CatalogItem[]) => buildUpdatedRecentlyUsed(current, items));
     },
     [setRecentItems],
   );
diff --git a/apps/expo/features/catalog/lib/cacheCatalogItemImage.ts b/apps/expo/features/catalog/lib/cacheCatalogItemImage.ts
index 7cc9adc51e..e33322022c 100644
--- a/apps/expo/features/catalog/lib/cacheCatalogItemImage.ts
+++ b/apps/expo/features/catalog/lib/cacheCatalogItemImage.ts
@@ -1,6 +1,6 @@
 import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
 import { getImageExtension } from 'expo-app/lib/utils/imageUtils';
-import { nanoid } from 'nanoid/non-secure';
+import { nanoid } from 'nanoid';
 
 export async function cacheCatalogItemImage(imageUrl?: string): Promise<string | null> {
   if (!imageUrl) {
diff --git a/apps/expo/features/feed/screens/CreatePostScreen.tsx b/apps/expo/features/feed/screens/CreatePostScreen.tsx
index 42b6c037bf..e696029a72 100644
--- a/apps/expo/features/feed/screens/CreatePostScreen.tsx
+++ b/apps/expo/features/feed/screens/CreatePostScreen.tsx
@@ -4,7 +4,7 @@ import { uploadImage } from 'expo-app/features/packs/utils/uploadImage';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import * as ImagePicker from 'expo-image-picker';
-import { nanoid } from 'nanoid/non-secure';
+import { nanoid } from 'nanoid';
 import { useCallback, useState } from 'react';
 import {
   Alert,
diff --git a/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts b/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts
index e3176d4046..ea9fbc9155 100644
--- a/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts
+++ b/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts
@@ -1,5 +1,5 @@
 import { obs } from 'expo-app/lib/store';
-import { nanoid } from 'nanoid/non-secure';
+import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 import { packTemplatesStore } from '../store/packTemplates';
 import type { PackTemplateInput, PackTemplateInStore } from '../types';
diff --git a/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts b/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts
index 519833a574..8e4dd5e963 100644
--- a/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts
+++ b/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts
@@ -1,7 +1,7 @@
 // useCreatePackTemplateItem.ts
 
 import { obs } from 'expo-app/lib/store';
-import { nanoid } from 'nanoid/non-secure';
+import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 import { packTemplateItemsStore } from '../store/packTemplateItems';
 import { packTemplatesStore } from '../store/packTemplates';
diff --git a/apps/expo/features/pack-templates/store/packTemplateItems.ts b/apps/expo/features/pack-templates/store/packTemplateItems.ts
index d5b34e2aa9..28fafb0b44 100644
--- a/apps/expo/features/pack-templates/store/packTemplateItems.ts
+++ b/apps/expo/features/pack-templates/store/packTemplateItems.ts
@@ -63,7 +63,9 @@ syncObservable(
     updatePartial: true,
     mode: 'merge',
     persist: {
-      plugin: observablePersistSqlite(Storage as any),
+      plugin: observablePersistSqlite(
+        Storage as unknown as Parameters<typeof observablePersistSqlite>[0],
+      ),
       retrySync: true,
       name: 'packTemplateItems',
     },
diff --git a/apps/expo/features/pack-templates/store/packTemplates.ts b/apps/expo/features/pack-templates/store/packTemplates.ts
index bd4f8c8ca6..00153e65f7 100644
--- a/apps/expo/features/pack-templates/store/packTemplates.ts
+++ b/apps/expo/features/pack-templates/store/packTemplates.ts
@@ -47,7 +47,9 @@ syncObservable(
     fieldDeleted: 'deleted',
     mode: 'merge',
     persist: {
-      plugin: observablePersistSqlite(Storage as any),
+      plugin: observablePersistSqlite(
+        Storage as unknown as Parameters<typeof observablePersistSqlite>[0],
+      ),
       retrySync: true,
       name: 'packTemplates',
     },
diff --git a/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts b/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts
index 5cd1bae5b6..5d5e837314 100644
--- a/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts
+++ b/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts
@@ -10,7 +10,7 @@ export const computePackTemplateWeights = (
   let totalWeightGrams = 0;
 
   // Calculate weights based on items
-  template.items.forEach((item) => {
+  for (const item of template.items) {
     const itemWeightInGrams =
       convertToGrams(item.weight, item.weightUnit as WeightUnit) * item.quantity;
 
@@ -21,7 +21,7 @@ export const computePackTemplateWeights = (
     if (!item.consumable && !item.worn) {
       baseWeightGrams += itemWeightInGrams;
     }
-  });
+  }
 
   // Convert back to preferred unit
   const baseWeight = convertFromGrams(baseWeightGrams, preferredUnit);
diff --git a/apps/expo/features/packs/hooks/useCreatePack.ts b/apps/expo/features/packs/hooks/useCreatePack.ts
index dd519145bf..38c4a7d918 100644
--- a/apps/expo/features/packs/hooks/useCreatePack.ts
+++ b/apps/expo/features/packs/hooks/useCreatePack.ts
@@ -1,6 +1,6 @@
 import { packsStore } from 'expo-app/features/packs/store';
 import { obs } from 'expo-app/lib/store';
-import { nanoid } from 'nanoid/non-secure';
+import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 import type { PackInput, PackInStore } from '../types';
 
diff --git a/apps/expo/features/packs/hooks/useCreatePackFromPack.ts b/apps/expo/features/packs/hooks/useCreatePackFromPack.ts
index ec31f09cc9..287c8dee5b 100644
--- a/apps/expo/features/packs/hooks/useCreatePackFromPack.ts
+++ b/apps/expo/features/packs/hooks/useCreatePackFromPack.ts
@@ -1,7 +1,7 @@
 import { packItemsStore, packsStore } from 'expo-app/features/packs/store';
 import { recordPackWeight } from 'expo-app/features/packs/store/packWeightHistory';
 import type { Pack, PackInput, PackInStore } from 'expo-app/features/packs/types';
-import { nanoid } from 'nanoid/non-secure';
+import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 
 export function useCreatePackFromPack() {
diff --git a/apps/expo/features/packs/hooks/useCreatePackItem.ts b/apps/expo/features/packs/hooks/useCreatePackItem.ts
index e41682038e..a9d677971b 100644
--- a/apps/expo/features/packs/hooks/useCreatePackItem.ts
+++ b/apps/expo/features/packs/hooks/useCreatePackItem.ts
@@ -1,6 +1,6 @@
 import { packItemsStore, packsStore } from 'expo-app/features/packs/store';
 import { obs } from 'expo-app/lib/store';
-import { nanoid } from 'nanoid/non-secure';
+import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 import { recordPackWeight } from '../store/packWeightHistory';
 import type { PackItem, PackItemInput } from '../types';
diff --git a/apps/expo/features/packs/hooks/useCreatePackWithItems.ts b/apps/expo/features/packs/hooks/useCreatePackWithItems.ts
index dd5ead606a..f83a0499a7 100644
--- a/apps/expo/features/packs/hooks/useCreatePackWithItems.ts
+++ b/apps/expo/features/packs/hooks/useCreatePackWithItems.ts
@@ -18,12 +18,12 @@ export function useCreatePackWithItems() {
       const id = createPack(packInfo);
 
       if (items && items.length > 0) {
-        items.forEach((item) => {
+        for (const item of items) {
           createPackItem({
             packId: id,
             itemData: item,
           });
-        });
+        }
       }
 
       return id;
diff --git a/apps/expo/features/packs/hooks/useImagePicker.ts b/apps/expo/features/packs/hooks/useImagePicker.ts
index 4d640eab18..bde40fae25 100644
--- a/apps/expo/features/packs/hooks/useImagePicker.ts
+++ b/apps/expo/features/packs/hooks/useImagePicker.ts
@@ -1,7 +1,7 @@
 import { assertDefined } from '@packrat/guards';
 import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
 import * as ImagePicker from 'expo-image-picker';
-import { nanoid } from 'nanoid/non-secure';
+import { nanoid } from 'nanoid';
 import { useState } from 'react';
 
 export type SelectedImage = {
diff --git a/apps/expo/features/packs/hooks/usePackWeightHistory.ts b/apps/expo/features/packs/hooks/usePackWeightHistory.ts
index 73e98ea715..e10ea7a6dd 100644
--- a/apps/expo/features/packs/hooks/usePackWeightHistory.ts
+++ b/apps/expo/features/packs/hooks/usePackWeightHistory.ts
@@ -27,7 +27,7 @@ const getMonthlyWeightAverages = (data: PackWeightHistoryEntry[]) => {
 
   const monthData: Record<string, { totalWeight: number; count: number }> = {};
 
-  data.forEach((entry) => {
+  for (const entry of data) {
     const date = new Date(entry.localCreatedAt);
     const key = `${date.getFullYear()}-${date.getMonth()}`; // "YYYY-M"
     if (!monthData[key]) {
@@ -37,7 +37,7 @@ const getMonthlyWeightAverages = (data: PackWeightHistoryEntry[]) => {
     monthData[key].totalWeight += entry.weight;
 
     monthData[key].count += 1;
-  });
+  }
 
   const monthlyAverages = Object.entries(monthData).map(([key, { totalWeight, count }]) => {
     const [year, monthIndex] = key.split('-').map(Number);
diff --git a/apps/expo/features/packs/store/packItems.ts b/apps/expo/features/packs/store/packItems.ts
index 98df5cfbc0..dfe1898c25 100644
--- a/apps/expo/features/packs/store/packItems.ts
+++ b/apps/expo/features/packs/store/packItems.ts
@@ -58,7 +58,9 @@ syncObservable(
     updatePartial: true,
     mode: 'merge',
     persist: {
-      plugin: observablePersistSqlite(Storage as any),
+      plugin: observablePersistSqlite(
+        Storage as unknown as Parameters<typeof observablePersistSqlite>[0],
+      ),
       retrySync: true,
       name: 'packItems',
     },
diff --git a/apps/expo/features/packs/store/packWeightHistory.ts b/apps/expo/features/packs/store/packWeightHistory.ts
index 5cc626a419..1bd986cb13 100644
--- a/apps/expo/features/packs/store/packWeightHistory.ts
+++ b/apps/expo/features/packs/store/packWeightHistory.ts
@@ -6,7 +6,7 @@ import { isAuthed } from 'expo-app/features/auth/store';
 import axiosInstance, { handleApiError } from 'expo-app/lib/api/client';
 import { obs } from 'expo-app/lib/store';
 import Storage from 'expo-sqlite/kv-store';
-import { nanoid } from 'nanoid/non-secure';
+import { nanoid } from 'nanoid';
 import type { PackWeightHistoryEntry } from '../types';
 import { computePackWeights } from '../utils';
 import { packItemsStore } from './packItems';
@@ -42,7 +42,9 @@ syncObservable(
     fieldCreatedAt: 'createdAt',
     mode: 'merge',
     persist: {
-      plugin: observablePersistSqlite(Storage as any),
+      plugin: observablePersistSqlite(
+        Storage as unknown as Parameters<typeof observablePersistSqlite>[0],
+      ),
       retrySync: true,
       name: 'packWeigthHistory',
     },
diff --git a/apps/expo/features/packs/store/packingMode.ts b/apps/expo/features/packs/store/packingMode.ts
index cbb81c9e3b..f2252c7952 100644
--- a/apps/expo/features/packs/store/packingMode.ts
+++ b/apps/expo/features/packs/store/packingMode.ts
@@ -7,7 +7,9 @@ export const packingModeStore = observable<Record<string, Record<string, boolean
 
 syncObservable(packingModeStore, {
   persist: {
-    plugin: observablePersistSqlite(Storage as any),
+    plugin: observablePersistSqlite(
+      Storage as unknown as Parameters<typeof observablePersistSqlite>[0],
+    ),
     retrySync: true,
     name: 'packingMode',
   },
diff --git a/apps/expo/features/packs/store/packs.ts b/apps/expo/features/packs/store/packs.ts
index fc2b95b0ec..f6464b9267 100644
--- a/apps/expo/features/packs/store/packs.ts
+++ b/apps/expo/features/packs/store/packs.ts
@@ -46,7 +46,9 @@ syncObservable(
     fieldDeleted: 'deleted',
     mode: 'merge',
     persist: {
-      plugin: observablePersistSqlite(Storage as any),
+      plugin: observablePersistSqlite(
+        Storage as unknown as Parameters<typeof observablePersistSqlite>[0],
+      ),
       retrySync: true,
       name: 'packs',
     },
diff --git a/apps/expo/features/packs/utils/computeCategories.ts b/apps/expo/features/packs/utils/computeCategories.ts
index 7bda34999e..9646f31335 100644
--- a/apps/expo/features/packs/utils/computeCategories.ts
+++ b/apps/expo/features/packs/utils/computeCategories.ts
@@ -22,7 +22,7 @@ export function computeCategorySummaries(pack: Pack): CategorySummary[] {
     }
   > = {};
 
-  items.forEach((item) => {
+  for (const item of items) {
     const category = item.category?.trim() || 'Other';
     const weight = item.weight;
     const unit = item.weightUnit;
@@ -38,7 +38,7 @@ export function computeCategorySummaries(pack: Pack): CategorySummary[] {
 
     categoryMap[category].weightInGrams += convertedWeight;
     categoryMap[category].items += 1;
-  });
+  }
 
   return Object.entries(categoryMap).map(([name, data]) => {
     const percentage =
diff --git a/apps/expo/features/packs/utils/computePackWeights.ts b/apps/expo/features/packs/utils/computePackWeights.ts
index 8789a5ad10..25590e19f0 100644
--- a/apps/expo/features/packs/utils/computePackWeights.ts
+++ b/apps/expo/features/packs/utils/computePackWeights.ts
@@ -11,7 +11,7 @@ export const computePackWeights = (
   let totalWeightGrams = 0;
 
   // Calculate weights based on items
-  pack.items.forEach((item) => {
+  for (const item of pack.items) {
     // Convert item weight to grams for calculation
     const itemWeightInGrams =
       convertToGrams(item.weight, item.weightUnit as WeightUnit) * item.quantity;
@@ -23,7 +23,7 @@ export const computePackWeights = (
     if (!item.consumable && !item.worn) {
       baseWeightGrams += itemWeightInGrams;
     }
-  });
+  }
 
   // Convert back to preferred unit
   const baseWeight = convertFromGrams(baseWeightGrams, preferredUnit);
diff --git a/apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts b/apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts
index cc9c6b4cbf..bcb16fa563 100644
--- a/apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts
+++ b/apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts
@@ -1,4 +1,4 @@
-import { nanoid } from 'nanoid/non-secure';
+import { nanoid } from 'nanoid';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import {
   trailConditionReportsStore,
diff --git a/apps/expo/features/trips/hooks/useCreateTrip.ts b/apps/expo/features/trips/hooks/useCreateTrip.ts
index c47c03d4f8..30cf45edbd 100644
--- a/apps/expo/features/trips/hooks/useCreateTrip.ts
+++ b/apps/expo/features/trips/hooks/useCreateTrip.ts
@@ -1,6 +1,6 @@
 import { tripsStore } from 'expo-app/features/trips/store/trips';
 import { obs } from 'expo-app/lib/store';
-import { nanoid } from 'nanoid/non-secure';
+import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 import type { TripInput, TripInStore } from '../types';
 
diff --git a/apps/expo/features/trips/store/trips.ts b/apps/expo/features/trips/store/trips.ts
index a64b293c6f..18b78cd20c 100644
--- a/apps/expo/features/trips/store/trips.ts
+++ b/apps/expo/features/trips/store/trips.ts
@@ -50,7 +50,9 @@ syncObservable(
     fieldDeleted: 'deleted',
     mode: 'merge',
     persist: {
-      plugin: observablePersistSqlite(Storage as any),
+      plugin: observablePersistSqlite(
+        Storage as unknown as Parameters<typeof observablePersistSqlite>[0],
+      ),
       retrySync: true,
       name: 'trips',
     },
diff --git a/apps/expo/features/weather/hooks/useWeatherAlert.ts b/apps/expo/features/weather/hooks/useWeatherAlert.ts
index 740407fb49..e2cb7cad36 100644
--- a/apps/expo/features/weather/hooks/useWeatherAlert.ts
+++ b/apps/expo/features/weather/hooks/useWeatherAlert.ts
@@ -12,7 +12,44 @@ export type WeatherAlert = {
   details: string;
 };
 
-export function generateAlerts(data: any, activeLocation: any): WeatherAlert[] {
+type WeatherApiHour = {
+  condition?: { text?: string };
+  wind_kph?: number;
+};
+
+type WeatherApiAlert = {
+  event?: string;
+  effective?: string;
+  expires?: string;
+  areas?: string;
+  severity?: string;
+  desc?: string;
+  instruction?: string;
+};
+
+type WeatherApiData = {
+  location?: { name?: string };
+  alerts?: { alert?: WeatherApiAlert[] };
+  current?: {
+    temp_c?: number;
+    wind_kph?: number;
+    uv?: number;
+    air_quality?: { 'us-epa-index'?: number };
+    condition?: { text?: string };
+  };
+  forecast?: {
+    forecastday?: Array<{
+      date?: string;
+      hour?: WeatherApiHour[];
+      day?: { maxtemp_c?: number };
+    }>;
+  };
+};
+
+export function generateAlerts(
+  data: WeatherApiData,
+  activeLocation: { name?: string } | null,
+): WeatherAlert[] {
   const locationName = data?.location?.name || activeLocation?.name || 'Unknown';
   const apiAlerts = data?.alerts?.alert;
 
@@ -20,7 +57,7 @@ export function generateAlerts(data: any, activeLocation: any): WeatherAlert[] {
 
   // If API provides alerts
   if (apiAlerts && apiAlerts.length > 0) {
-    return apiAlerts.map((a: any, index: number) => ({
+    return apiAlerts.map((a, index: number) => ({
       id: `${a.event}-${a.effective}-${index}`,
       type: a.event || 'Weather Alert',
       location: a.areas || locationName,
@@ -126,7 +163,7 @@ export function generateAlerts(data: any, activeLocation: any): WeatherAlert[] {
   const todayHours = forecastDays[0]?.hour || [];
 
   // 🌧 Rain coming soon
-  const willRain = todayHours.some((h: any) => h.condition?.text?.toLowerCase().includes('rain'));
+  const willRain = todayHours.some((h) => h.condition?.text?.toLowerCase().includes('rain'));
   if (willRain) {
     alerts.push({
       id: 'rain-soon',
@@ -139,7 +176,7 @@ export function generateAlerts(data: any, activeLocation: any): WeatherAlert[] {
   }
 
   // 💨 Wind coming
-  const highWindComing = todayHours.some((h: any) => h.wind_kph >= 30);
+  const highWindComing = todayHours.some((h) => (h.wind_kph ?? 0) >= 30);
   if (highWindComing) {
     alerts.push({
       id: 'wind-soon',
@@ -153,12 +190,12 @@ export function generateAlerts(data: any, activeLocation: any): WeatherAlert[] {
 
   // 🌡 Tomorrow heat
   const tomorrow = forecastDays[1];
-  if (tomorrow?.day?.maxtemp_c >= 35) {
+  if (tomorrow && (tomorrow.day?.maxtemp_c ?? 0) >= 35) {
     alerts.push({
       id: 'heat-tomorrow',
       type: 'Heat Alert (Tomorrow)',
       location: locationName,
-      dates: tomorrow.date,
+      dates: tomorrow.date ?? 'Tomorrow',
       severity: 'High',
       details: 'High temperature expected tomorrow.',
     });
diff --git a/apps/expo/features/wildlife/hooks/useWildlifeHistory.ts b/apps/expo/features/wildlife/hooks/useWildlifeHistory.ts
index d4432ac91f..5f076e8a3a 100644
--- a/apps/expo/features/wildlife/hooks/useWildlifeHistory.ts
+++ b/apps/expo/features/wildlife/hooks/useWildlifeHistory.ts
@@ -1,6 +1,6 @@
 import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
 import { useAtom } from 'jotai';
-import { nanoid } from 'nanoid/non-secure';
+import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 import { baseWildlifeHistoryAtom, wildlifeHistoryAtom } from '../atoms/wildlifeAtoms';
 import type { IdentificationResult, WildlifeIdentification } from '../types';
diff --git a/apps/expo/lib/api/client.ts b/apps/expo/lib/api/client.ts
index a357650011..4e4696cfc3 100644
--- a/apps/expo/lib/api/client.ts
+++ b/apps/expo/lib/api/client.ts
@@ -38,14 +38,14 @@ let failedQueue: Array<{
 
 // Process the queue of failed requests
 const processQueue = (error: Error | null, token: string | null = null) => {
-  failedQueue.forEach((request) => {
+  for (const request of failedQueue) {
     if (error) {
       request.reject(error);
     } else if (token && request.config.headers) {
       request.config.headers.Authorization = `Bearer ${token}`;
       request.resolve(axios(request.config));
     }
-  });
+  }
 
   failedQueue = [];
 };
diff --git a/apps/expo/lib/utils/compute-pack.ts b/apps/expo/lib/utils/compute-pack.ts
index c6ad217169..7ac2651328 100644
--- a/apps/expo/lib/utils/compute-pack.ts
+++ b/apps/expo/lib/utils/compute-pack.ts
@@ -42,7 +42,7 @@ export const computePackWeights = (pack: Pack, preferredUnit: WeightUnit = 'g'):
   let totalWeightGrams = 0;
 
   // Calculate weights based on items
-  pack.items.forEach((item) => {
+  for (const item of pack.items) {
     // Convert item weight to grams for calculation
     const itemWeightInGrams = convertToGrams(item.weight, item.weightUnit) * item.quantity;
 
@@ -53,7 +53,7 @@ export const computePackWeights = (pack: Pack, preferredUnit: WeightUnit = 'g'):
     if (!item.consumable && !item.worn) {
       baseWeightGrams += itemWeightInGrams;
     }
-  });
+  }
 
   // Convert back to preferred unit
   const baseWeight = convertFromGrams(baseWeightGrams, preferredUnit);
diff --git a/apps/expo/lib/utils/dateUtils.ts b/apps/expo/lib/utils/dateUtils.ts
index f671b27cc0..d0f7cdfd5e 100644
--- a/apps/expo/lib/utils/dateUtils.ts
+++ b/apps/expo/lib/utils/dateUtils.ts
@@ -6,10 +6,12 @@ import { isValid, parse, parseISO } from 'date-fns';
  *
  * Returns `null` for missing or invalid input.
  */
+const DATE_ONLY_PATTERN = /^\d{4}-\d{2}-\d{2}$/;
+
 export function parseLocalDate(dateString?: string): Date | null {
   if (!dateString || typeof dateString !== 'string') return null;
 
-  const dateOnlyPattern = /^\d{4}-\d{2}-\d{2}$/;
+  const dateOnlyPattern = DATE_ONLY_PATTERN;
   if (dateOnlyPattern.test(dateString)) {
     const date = parse(dateString, 'yyyy-MM-dd', new Date());
     return isValid(date) ? date : null;
diff --git a/apps/expo/lib/utils/domain-specific-extensions.ts b/apps/expo/lib/utils/domain-specific-extensions.ts
index e340930181..05174865ad 100644
--- a/apps/expo/lib/utils/domain-specific-extensions.ts
+++ b/apps/expo/lib/utils/domain-specific-extensions.ts
@@ -3,6 +3,8 @@
  * This helps us avoid network requests for known domains
  */
 
+const CLOUDINARY_FORMAT_RE = /\/([^/]+)\/(jpe?g|png|gif|webp|avif)\//;
+
 // Update the DomainPattern type to support function-based extension resolution
 type DomainPattern = {
   pattern: RegExp;
@@ -30,7 +32,7 @@ const domainPatterns: DomainPattern[] = [
   {
     pattern: /cloudinary\.com\/.*\/image\/upload\/.*\/([^/]+)\/(jpe?g|png|gif|webp|avif)\//,
     extension: (url) => {
-      const match = url.match(/\/([^/]+)\/(jpe?g|png|gif|webp|avif)\//);
+      const match = url.match(CLOUDINARY_FORMAT_RE);
       return match && match[2] !== undefined ? match[2].toLowerCase() : 'jpg';
     },
   },
diff --git a/apps/expo/lib/utils/imageUtils.ts b/apps/expo/lib/utils/imageUtils.ts
index f20393cbd5..a13bb64343 100644
--- a/apps/expo/lib/utils/imageUtils.ts
+++ b/apps/expo/lib/utils/imageUtils.ts
@@ -10,9 +10,11 @@ import { getDomainSpecificExtension } from './domain-specific-extensions';
  * @param url The image URL
  * @returns The inferred extension or null if it couldn't be determined
  */
+const IMAGE_EXTENSION_RE = /\.(jpe?g|png|gif|webp|avif|svg)($|\?)/i;
+
 export const inferImageExtension = (url: string): string | null => {
   // Check if URL already has an extension
-  const extensionMatch = url.match(/\.(jpe?g|png|gif|webp|avif|svg)($|\?)/i);
+  const extensionMatch = url.match(IMAGE_EXTENSION_RE);
   if (extensionMatch && extensionMatch[1] !== undefined) {
     return extensionMatch[1].toLowerCase();
   }
diff --git a/apps/expo/package.json b/apps/expo/package.json
index 4c51a4397b..fde527f620 100644
--- a/apps/expo/package.json
+++ b/apps/expo/package.json
@@ -49,6 +49,7 @@
     "@expo/vector-icons": "^15.0.3",
     "@gorhom/bottom-sheet": "^5.1.2",
     "@legendapp/state": "^3.0.0-beta.30",
+    "@packrat-ai/nativewindui": "^2.0.2",
     "@packrat/guards": "workspace:*",
     "@react-native-ai/apple": "~0.10.0",
     "@react-native-ai/llama": "~0.10.0",
@@ -113,6 +114,7 @@
     "i18next": "^25.8.18",
     "jotai": "^2.12.2",
     "llama.rn": "0.10.1",
+    "nanoid": "^3.3.11",
     "nativewind": "^4.2.3",
     "radash": "catalog:",
     "react": "catalog:",
diff --git a/apps/expo/types/global.d.ts b/apps/expo/types/global.d.ts
new file mode 100644
index 0000000000..be804772ea
--- /dev/null
+++ b/apps/expo/types/global.d.ts
@@ -0,0 +1,8 @@
+/**
+ * Type declarations for modules that don't ship their own TypeScript definitions.
+ */
+
+// react-native internal polyfill helper — no public .d.ts provided by the package
+declare module 'react-native/Libraries/Utilities/PolyfillFunctions' {
+  export function polyfillGlobal(name: string, getValue: () => unknown): void;
+}
diff --git a/apps/guides/app/dev/generate/page.tsx b/apps/guides/app/dev/generate/page.tsx
index 58bc88d4e3..0a0873ce18 100644
--- a/apps/guides/app/dev/generate/page.tsx
+++ b/apps/guides/app/dev/generate/page.tsx
@@ -302,7 +302,7 @@ export default function GeneratePage() {
                   <Label htmlFor="difficulty">Difficulty</Label>
                   <Select
                     value={difficulty}
-                    onValueChange={(value) => setDifficulty(value as DifficultyLevel)}
+                    onValueChange={(value: string) => setDifficulty(value as DifficultyLevel)}
                   >
                     <SelectTrigger>
                       <SelectValue placeholder="Select difficulty" />
@@ -406,7 +406,7 @@ export default function GeneratePage() {
                   max={20}
                   step={1}
                   value={[batchCount]}
-                  onValueChange={(value) => {
+                  onValueChange={(value: number[]) => {
                     const count = value[0];
                     assertDefined(count);
                     setBatchCount(count);
diff --git a/apps/guides/components/footer.tsx b/apps/guides/components/footer.tsx
index 08541fc984..bf6b71100d 100644
--- a/apps/guides/components/footer.tsx
+++ b/apps/guides/components/footer.tsx
@@ -4,7 +4,7 @@ import { useQuery } from '@tanstack/react-query';
 import { assertDefined } from 'guides-app/lib/assertDefined';
 import { getAllCategories } from 'guides-app/lib/categories';
 import { footerConfig, siteConfig } from 'guides-app/lib/config';
-import { Backpack, Facebook, Github, Instagram, Twitter } from 'lucide-react';
+import { Backpack, Globe } from 'lucide-react';
 import Link from 'next/link';
 
 export default function Footer() {
@@ -31,28 +31,28 @@ export default function Footer() {
               href={siteConfig.links.twitter}
               className="text-gray-500 hover:text-apple-blue transition-colors"
             >
-              <Twitter className="h-5 w-5" />
+              <Globe className="h-5 w-5" />
               <span className="sr-only">Twitter</span>
             </Link>
             <Link
               href={siteConfig.links.instagram}
               className="text-gray-500 hover:text-apple-blue transition-colors"
             >
-              <Instagram className="h-5 w-5" />
+              <Globe className="h-5 w-5" />
               <span className="sr-only">Instagram</span>
             </Link>
             <Link
               href={siteConfig.links.facebook}
               className="text-gray-500 hover:text-apple-blue transition-colors"
             >
-              <Facebook className="h-5 w-5" />
+              <Globe className="h-5 w-5" />
               <span className="sr-only">Facebook</span>
             </Link>
             <Link
               href={siteConfig.links.github}
               className="text-gray-500 hover:text-apple-blue transition-colors"
             >
-              <Github className="h-5 w-5" />
+              <Globe className="h-5 w-5" />
               <span className="sr-only">GitHub</span>
             </Link>
           </div>
diff --git a/apps/guides/lib/categories.ts b/apps/guides/lib/categories.ts
index 16b07d2427..77e452eaf3 100644
--- a/apps/guides/lib/categories.ts
+++ b/apps/guides/lib/categories.ts
@@ -5,11 +5,11 @@ export function getAllCategories(): string[] {
 
   const categories = new Set<string>();
 
-  posts.forEach((post) => {
-    post.categories?.forEach((category) => {
+  for (const post of posts) {
+    for (const category of post.categories ?? []) {
       categories.add(category);
-    });
-  });
+    }
+  }
 
   return Array.from(categories).sort();
 }
diff --git a/apps/guides/lib/enhanceGuideContent.ts b/apps/guides/lib/enhanceGuideContent.ts
index ec12e23e89..4b5a145d69 100644
--- a/apps/guides/lib/enhanceGuideContent.ts
+++ b/apps/guides/lib/enhanceGuideContent.ts
@@ -126,16 +126,18 @@ export async function enhanceGuideContent(
 
               // Track products for reporting
               if (searchResults.items) {
-                searchResults.items.forEach(
-                  (item: { name: string; productUrl: string; similarity?: number }) => {
-                    productsUsed.push({
-                      name: item.name,
-                      url: item.productUrl,
-                      context: query,
-                      similarity: item.similarity,
-                    });
-                  },
-                );
+                for (const item of searchResults.items as {
+                  name: string;
+                  productUrl: string;
+                  similarity?: number;
+                }[]) {
+                  productsUsed.push({
+                    name: item.name,
+                    url: item.productUrl,
+                    context: query,
+                    similarity: item.similarity,
+                  });
+                }
               }
 
               console.log(`✅ Found ${searchResults.items?.length || 0} relevant products`);
diff --git a/apps/guides/mdx-components.tsx b/apps/guides/mdx-components.tsx
index 99f8743664..29ae583530 100644
--- a/apps/guides/mdx-components.tsx
+++ b/apps/guides/mdx-components.tsx
@@ -1,11 +1,8 @@
+import type { MDXComponents as MDXComponentsType } from 'mdx/types';
 import Image, { type ImageProps } from 'next/image';
 import Link, { type LinkProps } from 'next/link';
 
-type MDXComponents = {
-  [key: string]: React.ComponentType<React.HTMLAttributes<HTMLElement>>;
-};
-
-export function useMDXComponents(components: MDXComponents): MDXComponents {
+export function useMDXComponents(components: MDXComponentsType): MDXComponentsType {
   return {
     // Use custom components
     img: (props: ImageProps) => (
diff --git a/apps/guides/package.json b/apps/guides/package.json
index bb82b2b747..4a722bf2fa 100644
--- a/apps/guides/package.json
+++ b/apps/guides/package.json
@@ -76,9 +76,11 @@
     "remark": "^15.0.1",
     "remark-gfm": "^4.0.1",
     "remark-html": "^16.0.1",
+    "remark-parse": "^11.0.0",
     "slugify": "^1.6.6",
     "sonner": "^1.7.4",
     "tailwind-merge": "^2.5.5",
+    "unified": "^11.0.0",
     "vaul": "^1.1.2",
     "zod": "catalog:"
   },
diff --git a/apps/guides/scripts/build-content.ts b/apps/guides/scripts/build-content.ts
index 63d8c03b40..1af3cac1ff 100644
--- a/apps/guides/scripts/build-content.ts
+++ b/apps/guides/scripts/build-content.ts
@@ -13,6 +13,7 @@ import { unified } from 'unified';
 
 const postsDirectory = path.join(process.cwd(), 'content/posts');
 const outputFile = path.join(process.cwd(), 'lib/content.ts');
+const MDX_EXTENSION_RE = /\.mdx$/;
 
 async function buildContent() {
   console.log('Building content...');
@@ -27,7 +28,7 @@ async function buildContent() {
       const { data, content } = matter(fileContents);
 
       return {
-        slug: filename.replace(/\.mdx$/, ''),
+        slug: filename.replace(MDX_EXTENSION_RE, ''),
         title: data.title,
         description: data.description,
         date: data.date,
diff --git a/apps/guides/scripts/enhance-content.ts b/apps/guides/scripts/enhance-content.ts
index abc84fdba4..438b70b8f6 100644
--- a/apps/guides/scripts/enhance-content.ts
+++ b/apps/guides/scripts/enhance-content.ts
@@ -197,9 +197,9 @@ async function enhanceFile(
           `  🔍 [DRY RUN] Would enhance ${fileName} with ${result.productsUsed.length} products:`,
         ),
       );
-      result.productsUsed.forEach((product) => {
+      for (const product of result.productsUsed) {
         console.log(chalk.cyan(`    - ${product.name} (${product.context})`));
-      });
+      }
       return { enhanced: true, productsAdded: result.productsUsed.length };
     }
 
@@ -219,9 +219,9 @@ async function enhanceFile(
     );
 
     if (options.verbose) {
-      result.productsUsed.forEach((product) => {
+      for (const product of result.productsUsed) {
         console.log(chalk.gray(`    - ${product.name}`));
-      });
+      }
     }
 
     return { enhanced: true, productsAdded: result.productsUsed.length };
diff --git a/apps/guides/scripts/generate-content.ts b/apps/guides/scripts/generate-content.ts
index 8fc3823edd..4f1dfbb7cb 100644
--- a/apps/guides/scripts/generate-content.ts
+++ b/apps/guides/scripts/generate-content.ts
@@ -9,6 +9,9 @@ import path from 'path';
 import slugify from 'slugify';
 import { enhanceGuideContent } from '../lib/enhanceGuideContent';
 
+const JSON_CODE_BLOCK_RE = /```json\s*([\s\S]*?)\s*```/;
+const JSON_ARRAY_RE = /\[\s*\{[\s\S]*\}\s*\]/;
+
 // Types
 type ContentCategory =
   | 'gear-essentials'
@@ -110,13 +113,13 @@ function getRandomAuthor(): string {
 // Extract JSON from text that might contain markdown code blocks
 function extractJsonFromText(text: string): string {
   // Look for JSON content between code blocks
-  const jsonMatch = text.match(/```json\s*([\s\S]*?)\s*```/);
+  const jsonMatch = text.match(JSON_CODE_BLOCK_RE);
   if (jsonMatch?.[1]) {
     return jsonMatch[1].trim();
   }
 
   // If no code blocks, try to find JSON array directly
-  const arrayMatch = text.match(/\[\s*\{[\s\S]*\}\s*\]/);
+  const arrayMatch = text.match(JSON_ARRAY_RE);
   if (arrayMatch) {
     return arrayMatch[0];
   }
@@ -204,11 +207,11 @@ async function generateTopicIdeas(
       ContentCategory,
       number
     >;
-    existingContent.forEach((content) => {
-      content.categories.forEach((category) => {
+    for (const content of existingContent) {
+      for (const category of content.categories) {
         categoryDistribution[category] = (categoryDistribution[category] || 0) + 1;
-      });
-    });
+      }
+    }
 
     // Find underrepresented categories
     const sortedCategories = Object.entries(categoryDistribution)
@@ -477,49 +480,49 @@ function generateContentReport(): void {
 
   // Category distribution
   const categoryDistribution: Record<string, number> = {};
-  existingContent.forEach((content) => {
-    content.categories.forEach((category) => {
+  for (const content of existingContent) {
+    for (const category of content.categories) {
       const displayName = CATEGORY_DISPLAY_NAMES[category];
       categoryDistribution[displayName] = (categoryDistribution[displayName] || 0) + 1;
-    });
-  });
+    }
+  }
 
   console.log(chalk.blue(`\nCategory Distribution:`));
-  Object.entries(categoryDistribution)
-    .sort(([, countA], [, countB]) => countB - countA)
-    .forEach(([category, count]) => {
-      const percentage = ((count / existingContent.length) * 100).toFixed(1);
-      console.log(`${category}: ${count} (${percentage}%)`);
-    });
+  for (const [category, count] of Object.entries(categoryDistribution).sort(
+    ([, countA], [, countB]) => countB - countA,
+  )) {
+    const percentage = ((count / existingContent.length) * 100).toFixed(1);
+    console.log(`${category}: ${count} (${percentage}%)`);
+  }
 
   // Difficulty distribution
   const difficultyDistribution: Record<string, number> = {};
-  existingContent.forEach((content) => {
+  for (const content of existingContent) {
     difficultyDistribution[content.difficulty] =
       (difficultyDistribution[content.difficulty] || 0) + 1;
-  });
+  }
 
   console.log(chalk.blue(`\nDifficulty Distribution:`));
-  Object.entries(difficultyDistribution)
-    .sort(([, countA], [, countB]) => countB - countA)
-    .forEach(([difficulty, count]) => {
-      const percentage = ((count / existingContent.length) * 100).toFixed(1);
-      console.log(`${difficulty}: ${count} (${percentage}%)`);
-    });
+  for (const [difficulty, count] of Object.entries(difficultyDistribution).sort(
+    ([, countA], [, countB]) => countB - countA,
+  )) {
+    const percentage = ((count / existingContent.length) * 100).toFixed(1);
+    console.log(`${difficulty}: ${count} (${percentage}%)`);
+  }
 
   // Author distribution
   const authorDistribution: Record<string, number> = {};
-  existingContent.forEach((content) => {
+  for (const content of existingContent) {
     authorDistribution[content.author] = (authorDistribution[content.author] || 0) + 1;
-  });
+  }
 
   console.log(chalk.blue(`\nAuthor Distribution:`));
-  Object.entries(authorDistribution)
-    .sort(([, countA], [, countB]) => countB - countA)
-    .forEach(([author, count]) => {
-      const percentage = ((count / existingContent.length) * 100).toFixed(1);
-      console.log(`${author}: ${count} (${percentage}%)`);
-    });
+  for (const [author, count] of Object.entries(authorDistribution).sort(
+    ([, countA], [, countB]) => countB - countA,
+  )) {
+    const percentage = ((count / existingContent.length) * 100).toFixed(1);
+    console.log(`${author}: ${count} (${percentage}%)`);
+  }
 }
 
 // Export functions for use in the frontend
diff --git a/apps/guides/scripts/sync-to-r2.ts b/apps/guides/scripts/sync-to-r2.ts
index b187d8e898..8981cab72f 100644
--- a/apps/guides/scripts/sync-to-r2.ts
+++ b/apps/guides/scripts/sync-to-r2.ts
@@ -25,7 +25,7 @@ const requiredEnvVars = [
 ];
 
 for (const envVar of requiredEnvVars) {
-  if (!env[envVar]) {
+  if (!(env as unknown as Record<string, string | undefined>)[envVar]) {
     console.error(`❌ Missing required environment variable: ${envVar}`);
     process.exit(1);
   }
diff --git a/bun.lock b/bun.lock
index e195d43502..63563236d0 100644
--- a/bun.lock
+++ b/bun.lock
@@ -65,6 +65,7 @@
         "@expo/vector-icons": "^15.0.3",
         "@gorhom/bottom-sheet": "^5.1.2",
         "@legendapp/state": "^3.0.0-beta.30",
+        "@packrat-ai/nativewindui": "^2.0.2",
         "@packrat/guards": "workspace:*",
         "@react-native-ai/apple": "~0.10.0",
         "@react-native-ai/llama": "~0.10.0",
@@ -129,6 +130,7 @@
         "i18next": "^25.8.18",
         "jotai": "^2.12.2",
         "llama.rn": "0.10.1",
+        "nanoid": "^3.3.11",
         "nativewind": "^4.2.3",
         "radash": "catalog:",
         "react": "catalog:",
@@ -235,9 +237,11 @@
         "remark": "^15.0.1",
         "remark-gfm": "^4.0.1",
         "remark-html": "^16.0.1",
+        "remark-parse": "^11.0.0",
         "slugify": "^1.6.6",
         "sonner": "^1.7.4",
         "tailwind-merge": "^2.5.5",
+        "unified": "^11.0.0",
         "vaul": "^1.1.2",
         "zod": "catalog:",
       },
@@ -343,7 +347,7 @@
         "@aws-sdk/s3-request-presigner": "^3.787.0",
         "@cloudflare/containers": "^0.0.30",
         "@hono/sentry": "^1.2.2",
-        "@hono/zod-openapi": "^1.2.4",
+        "@hono/zod-openapi": "1.2.4",
         "@hono/zod-validator": "^0.7.6",
         "@mozilla/readability": "^0.6.0",
         "@neondatabase/serverless": "^1.0.0",
@@ -376,6 +380,7 @@
         "@cloudflare/workers-types": "^4.20250405.0",
         "@types/bun": "latest",
         "@types/pg": "^8.11.15",
+        "@types/ws": "^8.5.14",
         "@vitest/coverage-v8": "~3.1.0",
         "concurrently": "^8.2.2",
         "drizzle-orm": "^0.44.4",
@@ -388,6 +393,7 @@
       "name": "@packrat/cli",
       "version": "2.0.18",
       "dependencies": {
+        "@duckdb/node-api": "1.5.0-r.1",
         "@packrat/analytics": "workspace:*",
         "chalk": "catalog:",
         "citty": "^0.2.1",
@@ -409,18 +415,54 @@
       "name": "@packrat/ui",
       "version": "2.0.18",
       "dependencies": {
-        "@packrat-ai/nativewindui": "^2.0.1-alpha.0",
+        "@packrat-ai/nativewindui": "^2.0.2",
       },
     },
     "packages/web-ui": {
       "name": "@packrat/web-ui",
       "version": "2.0.18",
       "dependencies": {
+        "@radix-ui/react-accordion": "catalog:",
+        "@radix-ui/react-alert-dialog": "catalog:",
+        "@radix-ui/react-aspect-ratio": "catalog:",
+        "@radix-ui/react-avatar": "catalog:",
+        "@radix-ui/react-checkbox": "catalog:",
+        "@radix-ui/react-collapsible": "catalog:",
+        "@radix-ui/react-context-menu": "catalog:",
+        "@radix-ui/react-dialog": "catalog:",
+        "@radix-ui/react-dropdown-menu": "catalog:",
+        "@radix-ui/react-hover-card": "catalog:",
+        "@radix-ui/react-label": "catalog:",
+        "@radix-ui/react-menubar": "catalog:",
+        "@radix-ui/react-navigation-menu": "catalog:",
+        "@radix-ui/react-popover": "catalog:",
+        "@radix-ui/react-progress": "catalog:",
+        "@radix-ui/react-radio-group": "catalog:",
+        "@radix-ui/react-scroll-area": "catalog:",
+        "@radix-ui/react-select": "catalog:",
+        "@radix-ui/react-separator": "catalog:",
+        "@radix-ui/react-slider": "catalog:",
         "@radix-ui/react-slot": "catalog:",
+        "@radix-ui/react-switch": "catalog:",
+        "@radix-ui/react-tabs": "catalog:",
+        "@radix-ui/react-toast": "catalog:",
+        "@radix-ui/react-toggle": "catalog:",
+        "@radix-ui/react-toggle-group": "catalog:",
+        "@radix-ui/react-tooltip": "catalog:",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
+        "cmdk": "1.0.4",
+        "embla-carousel-react": "8.5.1",
+        "input-otp": "1.4.1",
+        "lucide-react": "^0.454.0",
+        "next-themes": "^0.4.6",
+        "react-day-picker": "8.10.1",
+        "react-hook-form": "^7.58.1",
+        "react-resizable-panels": "^2.1.9",
+        "sonner": "^1.7.4",
         "tailwind-merge": "^2.5.5",
         "tailwindcss-animate": "^1.0.7",
+        "vaul": "^1.1.2",
       },
       "devDependencies": {
         "@types/react": "~19.1.10",
@@ -1126,7 +1168,7 @@
 
     "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],
 
-    "@packrat-ai/nativewindui": ["@packrat-ai/nativewindui@2.0.1", "https://npm.pkg.github.com/download/@packrat-ai/nativewindui/2.0.1/c8f3e4e6113c8d464803f637dbfb6fe5fa9a5e36", { "peerDependencies": { "@expo/vector-icons": ">=15.0.0", "@gorhom/bottom-sheet": "^5.1.2", "@react-native-community/datetimepicker": "^8.4.0", "@react-native-community/slider": "^5.0.0", "@react-native-picker/picker": "^2.11.0", "@react-native-segmented-control/segmented-control": "^2.5.0", "@react-navigation/drawer": "^7.1.1", "@react-navigation/elements": "^2.3.1", "@react-navigation/native": "^7.0.14", "@rn-primitives/alert-dialog": "^1.1.0", "@rn-primitives/avatar": "^1.0.4", "@rn-primitives/checkbox": "^1.1.0", "@rn-primitives/context-menu": "^1.1.0", "@rn-primitives/dropdown-menu": "^1.1.0", "@rn-primitives/hooks": "^1.1.0", "@rn-primitives/portal": "^1.1.0", "@rn-primitives/slot": "^1.1.0", "@shopify/flash-list": "^2.0.0", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", "expo-blur": "~15.0.8", "expo-device": "~8.0.0", "expo-glass-effect": "*", "expo-haptics": "~15.0.8", "expo-image": "~3.0.11", "expo-linear-gradient": "~15.0.8", "expo-navigation-bar": "~5.0.10", "expo-router": "~6.0.23", "expo-symbols": "~1.0.8", "nativewind": "^4.1.21", "react": ">=19.0.0", "react-native": ">=0.79.0", "react-native-keyboard-controller": "^1.16.7", "react-native-reanimated": ">=3.17.0", "react-native-safe-area-context": ">=5.4.0", "react-native-screens": ">=4.11.0", "react-native-uitextview": "^1.1.4", "rn-icon-mapper": "^0.0.1", "tailwind-merge": "^2.2.1" } }, "sha512-zMzFalxu6MKuBMIIDzeiMj/7wM9qn8kFkAbWm3IxBWTHHSsl/Zic053DCJZS1GQcY0Ke2Om3TmUTuBujERuwvA=="],
+    "@packrat-ai/nativewindui": ["@packrat-ai/nativewindui@2.0.2", "https://npm.pkg.github.com/download/@packrat-ai/nativewindui/2.0.2/e207a4e5a270a475bbfe11c48cc09386d2f72028", { "peerDependencies": { "@expo/vector-icons": ">=15.0.0", "@gorhom/bottom-sheet": "^5.1.2", "@react-native-community/datetimepicker": "^8.4.0", "@react-native-community/slider": "^5.0.0", "@react-native-picker/picker": "^2.11.0", "@react-native-segmented-control/segmented-control": "^2.5.0", "@react-navigation/drawer": "^7.1.1", "@react-navigation/elements": "^2.3.1", "@react-navigation/native": "^7.0.14", "@rn-primitives/alert-dialog": "^1.1.0", "@rn-primitives/avatar": "^1.0.4", "@rn-primitives/checkbox": "^1.1.0", "@rn-primitives/context-menu": "^1.1.0", "@rn-primitives/dropdown-menu": "^1.1.0", "@rn-primitives/hooks": "^1.1.0", "@rn-primitives/portal": "^1.1.0", "@rn-primitives/slot": "^1.1.0", "@shopify/flash-list": "^2.0.0", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", "expo-blur": "~15.0.8", "expo-device": "~8.0.0", "expo-glass-effect": "*", "expo-haptics": "~15.0.8", "expo-image": "~3.0.11", "expo-linear-gradient": "~15.0.8", "expo-navigation-bar": "~5.0.10", "expo-router": "~6.0.23", "expo-symbols": "~1.0.8", "nativewind": "^4.2.3", "react": ">=19.0.0", "react-native": ">=0.79.0", "react-native-keyboard-controller": "^1.16.7", "react-native-reanimated": ">=3.17.0", "react-native-safe-area-context": ">=5.4.0", "react-native-screens": ">=4.11.0", "react-native-uitextview": "^1.1.4", "rn-icon-mapper": "^0.0.1", "tailwind-merge": "^2.2.1" } }, "sha512-o5oOGvw5wa+NKiHtoRRsys7YWPG7N7pEF+ZvS0/jnRUE5udpVDEn2yVNfMABvp3JZIO4leYoFNo0L+69z4ms3g=="],
 
     "@packrat/analytics": ["@packrat/analytics@workspace:packages/analytics"],
 
@@ -1664,6 +1706,8 @@
 
     "@types/uuid": ["@types/uuid@9.0.8", "", {}, "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA=="],
 
+    "@types/ws": ["@types/ws@8.18.1", "", { "dependencies": { "@types/node": "*" } }, "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg=="],
+
     "@types/yargs": ["@types/yargs@17.0.33", "", { "dependencies": { "@types/yargs-parser": "*" } }, "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA=="],
 
     "@types/yargs-parser": ["@types/yargs-parser@21.0.3", "", {}, "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="],
diff --git a/docs/plans/2026-04-14-chore-finalize-dependabot-consolidation-plan.md b/docs/plans/2026-04-14-chore-finalize-dependabot-consolidation-plan.md
new file mode 100644
index 0000000000..6341362c45
--- /dev/null
+++ b/docs/plans/2026-04-14-chore-finalize-dependabot-consolidation-plan.md
@@ -0,0 +1,228 @@
+---
+title: Finalize chore/all-dependabot-updates (PR #2118) — consolidate new Dependabot PRs and audit hacks
+type: chore
+status: active
+date: 2026-04-14
+---
+
+# Finalize `chore/all-dependabot-updates` (PR #2118)
+
+## Overview
+
+PR #2118 (`chore/all-dependabot-updates`) already consolidates 23 Dependabot PRs (#2088–#2117). Since it was opened, Dependabot opened **27 additional PRs (#2121–#2148)**. CI currently passes on #2118 (api-tests, check-types, biome, unit-tests all green; only E2E jobs fail, consistent with pre-existing flake).
+
+However, the branch contains **several local hacks** introduced while chasing a `@cloudflare/vitest-pool-workers` 0.14.x + miniflare 4.20260409 + `pg-cloudflare` compatibility regression. Some of these hacks are redundant; at least one can be simplified.
+
+This plan takes over the PR, cleans up redundant workarounds while preserving CI green, brings in the new Dependabot PRs, and verifies `expo-doctor` (source of truth for React-Native-adjacent versions) still passes.
+
+## Problem Statement / Motivation
+
+1. **27 new Dependabot PRs are open against `development`** and will conflict with #2118 on merge unless consolidated.
+2. **The branch accreted hacks** during merge/CI stabilization (patches, a mock, a stub, overrides). Some are redundant; all should be audited so we understand which are load-bearing and which can go.
+3. **Expo Doctor is the authoritative check** for React Native + Expo package version alignment (per user). `@sentry/react-native`, `react-native-maps`, and other RN-adjacent bumps must not fail `expo doctor`.
+4. **No hacky tricks should ship merged** unless we understand *why* each one exists and can't be removed.
+
+## Proposed Solution
+
+**Lead with the root-cause spike; fall back to hack-preservation only if the spike fails.**
+
+Reviewers (code-simplicity + architecture-strategist) converged: the Workers test pool is correct — the API is 100% Cloudflare — but the **test DB client diverges from prod**. Production uses `@neondatabase/serverless`; tests fall into a `pg` + `pg-cloudflare` branch in `packages/api/src/db/index.ts` only because test URLs aren't Neon URLs. That single divergence forces H4/H5/H6 (pg-cloudflare alias, two patches) and indirectly pressures H1/H2/H3 (the workerd/wrangler/vitest-pool-workers freeze).
+
+### Phase 0 — Root-cause spike (throwaway branch, ~60 min timebox)
+
+Align tests with prod by using the same driver in both:
+
+1. Stand up a Neon-compatible HTTP/WS proxy in front of the existing Docker Postgres (`@neondatabase/serverless`'s `neon-proxy` or the open-source `neondatabase/wsproxy`).
+2. Point `NEON_DATABASE_URL` in `test/setup.ts` at the proxy.
+3. Remove the `isStandardPostgresUrl` branch in `packages/api/src/db/index.ts` (tests now take the same code path as prod).
+4. Delete `patches/pg-cloudflare@1.3.0.patch`, `patches/pg-protocol@1.13.0.patch`, the `pg-cloudflare` wrangler alias, and `src/stubs/pg-cloudflare-stub.ts`.
+5. Attempt to bump `@cloudflare/vitest-pool-workers` and unpin `workerd` + `wrangler`.
+6. Independently, bump `@hono/sentry` past `^1.2.2` (recent versions dropped toucan-js for `@sentry/cloudflare`, likely dropping H7).
+
+**Spike success criteria:** `bun test:api:unit` and integration tests pass with H4/H5/H6 deleted and (stretch) H1/H2/H3/H7 also deleted.
+
+**If spike succeeds →** fold the changes into `chore/all-dependabot-updates` as the first commit, then proceed to consolidation.
+
+**If spike fails →** keep the current pins, document each with a one-line comment + exit criterion ("revisit when vitest-pool-workers ≥ 0.15 ships"), and proceed to consolidation with hacks intact.
+
+### Phase 1 — Consolidate remaining Dependabot PRs
+
+Apply the additive subset (#2121, #2123–#2125, #2129, #2130, #2132–#2143) per the disposition table below. Skip PRs whose versions are already equal-or-newer on this branch and mark them for auto-close after merge.
+
+### Phase 2 — Verification & merge prep
+
+Run `expo doctor` (source of truth for RN), `bun check-types`, `bun check` (Biome), `bun test:api:unit`, `bun test:expo`, `bunx expo-doctor`. Push (no force). Confirm CI. Update PR body. Hand back.
+
+## Current state snapshot (2026-04-14)
+
+Local: `~/Code/PackRat`, branch `chore/all-dependabot-updates`, 254 commits ahead of `development`, merge base recent, `MERGEABLE=true`.
+
+CI on #2118 (latest run): `api-tests` ✅ · `check-types` ✅ · `biome` ✅ · `Expo Unit Tests` ✅ · `API Unit Tests` ✅ · Cloudflare Pages previews ✅ · Android/iOS E2E ❌ (pre-existing, not blocking).
+
+## Hacks inventory (confirmed)
+
+| # | Artifact | Location | Status |
+|---|---|---|---|
+| H1 | `workerd` pinned to `1.20260310.1` | root `package.json` `overrides` | **Load-bearing** — required for `vitest-pool-workers@0.14.3` + miniflare combo. Document, keep. |
+| H2 | `wrangler` pinned to `4.81.1` | `packages/api/package.json` | **Load-bearing** — locks workerd transitive to compatible version. Document, keep. |
+| H3 | `@cloudflare/vitest-pool-workers` pinned to `0.14.3` | `packages/api/package.json` | **Load-bearing** — newer versions reopen the pg-cloudflare bug. Document, keep. |
+| H4 | `packages/api/src/stubs/pg-cloudflare-stub.ts` + wrangler `alias` `"pg-cloudflare"` → stub | `packages/api/src/stubs/`, `packages/api/wrangler.jsonc:189-194` | **Load-bearing** — replaces `cloudflare:sockets`-based `pg-cloudflare` with `node:net` socket for local test Postgres. This is the canonical fix; keep as the *single* mechanism. |
+| H5 | `patches/pg-cloudflare@1.3.0.patch` (rewrites `dist/empty.js`) | `patches/` | **Likely redundant with H4** — wrangler alias already replaces the import at build time. Attempt to remove; if api-tests fail, restore. |
+| H6 | `patches/pg-protocol@1.13.0.patch` (strips ESM export condition) | `patches/` | **Suspect** — original rationale was miniflare resolving ESM unexpectedly. With H3 pinned, may no longer be needed. Attempt to remove; if tests fail, restore with inline comment. |
+| H7 | `vi.mock('@hono/sentry', …)` | `packages/api/test/setup.ts:419-438` | **Load-bearing** — documented CJS/ESM dual-export bug in `toucan-js@4.1.1` → `@sentry/core@8.9.2`. Keep. Verify upstream fix candidate: bumping `@hono/sentry` or `toucan-js` may let us drop this. Track as follow-up, do not block. |
+| H8 | `vi.mock('youtube-transcript', …)` | `packages/api/test/setup.ts` | **Load-bearing** — workerd 1.20260409.1 chokes on package internals. Keep, comment already explains. |
+
+**Audit outcome:** attempt to remove H5 and H6 only. Everything else stays, with improved inline comments linking to upstream issues (one line each, no docstrings).
+
+## New Dependabot PRs (#2121–#2148) — disposition
+
+Superseded by versions already on the branch (close after merge, do **not** re-apply):
+- #2122 `@vitest/coverage-v8` 4.1.4 (apps/expo) — already
+- #2126 expo-sdk group — already merged
+- #2127 drizzle group — already merged
+- #2128 `vitest` 4.1.4 (root) — already
+- #2144 `@ai-sdk/google` 3.0.62 — already
+- #2145 `drizzle-kit` 0.31.10 — already
+- #2146 `@scalar/hono-api-reference` 0.10.7 — already
+- #2147 `vitest` 4.1.4 (packages/api) — already
+- #2148 `@ai-sdk/perplexity` 3.0.29 — already
+
+To apply to this branch (grouped for a single install + typecheck cycle):
+
+**React-Native / Expo-adjacent (verify with `expo doctor` after):**
+- #2123 `@sentry/react-native` 7.2.0 → 8.7.0 *(major)*
+- #2125 / #2129 `react-native-maps` 1.20.1 → 1.27.2 *(major)* — apply to `apps/expo` only if expo-doctor approves; otherwise pin to last doctor-approved version and leave a comment. If doctor disapproves both current and target, **follow doctor's recommended version** regardless of Dependabot's number.
+
+**Lint tooling (expected fallout: ESLint config breakage, since these are ESLint v8 → v10 jumps):**
+- #2121 / #2130 `eslint-config-universe` 12.1.0 → 15.0.3 *(major)*
+- #2124 `eslint` 8.57.1 → 10.2.0 *(major)*
+
+*Decision gate:* If `eslint` v10 + `eslint-config-universe` v15 require flat-config migration and the repo still uses `.eslintrc*`, **defer all three** to a dedicated follow-up PR. Note rationale in PR body; do not block this PR on an ESLint 9 flat-config migration.
+
+**Web apps (lower risk — guides/landing):**
+- #2132 / #2137 `sonner` 1.7.4 → 2.0.7 *(major)* — verify no breaking API in toast usage
+- #2134 `@types/react` 19.0.14 → 19.2.14 (landing)
+- #2136 / #2142 `cmdk` 1.0.4 → 1.1.1
+- #2138 `postcss-import` 15.1.0 → 16.1.1 *(major)*
+- #2139 `lucide-react` 0.454.0 → 1.8.0 *(MAJOR, 0.x → 1.x)* — icon names may rename; typecheck both guides + landing
+- #2140 `react-day-picker` 8.10.1 → 9.14.0 *(major)* — API rename; check usage in landing
+- #2141 `recharts` 2.15.0 → 3.8.1 (guides) *(major, already bumped in expo branch to 3.8.1; align)*
+- #2143 `react-resizable-panels` 2.1.9 → 4.10.0 *(MAJOR skip)*
+
+**CI action bumps (low risk):**
+- #2133 `actions/github-script` v7 → v9
+- #2135 `actions/setup-java` v4 → v5
+
+## Technical Considerations
+
+- **Install must succeed first.** If any new version combination breaks `bun install`, revert that single bump and log it.
+- **Do not edit `bun.lock` by hand.** Let `bun install` regenerate.
+- **Respect `"catalog"` in root `package.json`.** Some packages (react, tailwind, zod, typescript) are catalog-managed — bumps must go through catalog.
+- **Respect user feedback memories:** no `.js` extensions in TS imports, no Proof uploads, no force-push, don't close PRs — merge-or-supersede.
+- **Expo Doctor is authoritative:** any conflict between Dependabot's suggested version and `expo doctor`'s recommendation → follow doctor.
+- **Biome 2.4.6 line width 100 + single quotes.** New code and regenerated files must pass `bun check`.
+- **No backwards-compat shims** — per house rules, don't leave `// TODO` placeholders, re-exports, or commented-out code.
+
+## System-Wide Impact
+
+- **Interaction graph:** dependency resolution → `bun.lock` regen → `preinstall` (`configure-deps.ts` pulls `PACKRAT_NATIVEWIND_UI_GITHUB_TOKEN` via `gh auth token`) → `postinstall` (lefthook install + env script) → workspace symlinks materialize.
+- **Error propagation:** a bad lock entry surfaces as a workspace-wide resolution error on first `bun install`, not at test time. Failures at typecheck indicate API breakage from a major bump.
+- **State lifecycle risks:** patch files are applied at install time; if `patches/pg-*.patch` is removed from disk **without** being removed from `bun.lock`, bun will fail noisily (good). Remove patch file + run install in one step.
+- **API surface parity:** `@sentry/react-native` major bump may change the `init()` signature; audit `apps/expo/app/_layout.tsx` (or wherever Sentry inits) before pushing.
+- **Integration test scenarios:**
+  1. `bun test:api:unit` still passes with wrangler alias still in place after patches removed.
+  2. `bun run test:expo` passes with `@sentry/react-native` v8.
+  3. `bunx expo-doctor` passes (all 17 checks) in `apps/expo`.
+  4. `bun check-types` clean across monorepo.
+  5. Cloudflare Pages previews for both `packrat-guides` and `packrat-landing` deploy successfully.
+
+## Acceptance Criteria
+
+Code/dep state:
+- [ ] `patches/pg-protocol@1.13.0.patch` removed if tests still pass without it; otherwise restored with a one-line comment explaining why it stays.
+- [ ] `patches/pg-cloudflare@1.3.0.patch` removed if wrangler alias alone is sufficient; otherwise restored with a one-line comment.
+- [ ] Remaining hacks (H1–H4, H7, H8) each have ≤1-line comment explaining *why* (if missing).
+- [ ] Applicable new Dependabot versions (#2121–#2143 subset per disposition above) applied.
+- [ ] `bun.lock` regenerated cleanly via `bun install` (not hand-edited).
+- [ ] Root `package.json` `overrides` unchanged except where intentional.
+
+Verification:
+- [ ] `bun install` completes without warnings beyond pre-existing.
+- [ ] `bun check-types` clean.
+- [ ] `bun check` (Biome) clean.
+- [ ] `bun test:api:unit` passes.
+- [ ] `bun test:expo` passes.
+- [ ] `cd apps/expo && bunx expo-doctor` passes all 17 checks.
+- [ ] GitHub Actions on pushed branch: `api-tests`, `check-types`, `biome`, `Expo Unit Tests`, `API Unit Tests` green.
+- [ ] Cloudflare Pages previews build.
+- [ ] PR #2118 body updated to reflect new highlights and the hacks-kept/hacks-removed summary.
+
+Process:
+- [ ] No PRs closed. Dependabot PRs superseded by this branch are left open; they'll auto-close when #2118 merges to `development`.
+- [ ] No force-push to `origin/chore/all-dependabot-updates` without explicit user approval (per user memory).
+
+## Execution Plan (what the implementer will do)
+
+### Phase 1 — Hack audit
+1. Confirm checkout of `chore/all-dependabot-updates` and clean tree.
+2. Delete `patches/pg-protocol@1.13.0.patch`. Run `bun install && bun test:api:unit`. If pass → commit; if fail → restore and commit comment explaining why it stays.
+3. Delete `patches/pg-cloudflare@1.3.0.patch`. Run `bun install && bun test:api:unit`. Same branching logic.
+4. Ensure the 3 pinned versions (workerd override, wrangler 4.81.1, vitest-pool-workers 0.14.3) each have a one-line comment. Do not bump.
+
+### Phase 2 — Consolidation
+1. Apply CI action bumps (#2133, #2135) via workflow-file edits.
+2. In one pass, edit `apps/guides/package.json`, `apps/landing/package.json`, `apps/expo/package.json`, `packages/api/package.json` with the target versions from the "To apply" table.
+3. Run `bun install` once. If lockfile churn looks off, abort and inspect — don't mass-retry.
+4. For the ESLint v10 cluster: **attempt**; if config breakage is non-trivial, revert the three ESLint lines in this commit and mention in PR body.
+5. Run `cd apps/expo && bunx expo-doctor`. If `@sentry/react-native@8.7.0` or `react-native-maps@1.27.2` fails, downgrade to doctor-approved version.
+
+### Phase 3 — Verify & push
+1. `bun check-types` → `bun check` → `bun test:api:unit` → `bun test:expo` in that order.
+2. Commit each logical group separately (action bumps, web-app bumps, expo bumps, patch removals) so the PR diff reads cleanly.
+3. `git push origin chore/all-dependabot-updates` (no force).
+4. Wait for CI, report results to user.
+5. If all green, update PR body with a "Hacks kept (why) / Hacks removed" section. Hand back for merge.
+
+## Alternative Approaches Considered
+
+- **Close #2118 and start over from `development`.** Rejected: loses 254 commits of conflict resolution, and user memory explicitly says "don't close PRs, prefer merge."
+- **Force-push a squashed version.** Rejected: user memory says no force-push without explicit permission.
+- **Split into per-group PRs (ESLint, RN, web, CI).** Tempting for cleanliness but user asked to consolidate into #2118. Do the split only if the ESLint migration gets messy (then carve that off).
+- **Upgrade `@cloudflare/vitest-pool-workers` past 0.14.3 to drop patches.** Rejected: earlier attempts in this branch's history (`db492cbe5`, `d33db17c2`) show newer versions reintroduce failures. Defer.
+
+## Dependencies & Risks
+
+**Risks:**
+- `@sentry/react-native` v7 → v8 is a major: `init()` option renames possible. Audit call sites first.
+- `lucide-react` 0.x → 1.x renamed some icons. Typecheck will catch; update imports.
+- `react-day-picker` v8 → v9 renamed props (`DayPicker` API overhaul). Grep landing for `DayPicker` usage.
+- ESLint v10 mandates flat config — may cascade into a bigger migration than fits this PR.
+- `bun install` takes ~120 s; never cancel.
+
+**Mitigations:**
+- Commit per group → easy revert per group.
+- Keep the three pinned deps (H1–H3) untouched.
+- If any single bump costs more than ~30 min to unbreak, defer it to a follow-up issue and note in PR body.
+
+## Sources & References
+
+### Internal
+- PR #2118 `chore: consolidate all dependabot dependency updates` — https://github.com/PackRat-AI/PackRat/pull/2118
+- Hack comments:
+  - `packages/api/wrangler.jsonc:189-194` (pg-cloudflare alias rationale)
+  - `packages/api/test/setup.ts:419-438` (`@hono/sentry` mock rationale)
+- Config touchpoints:
+  - `packages/api/vitest.config.mts`, `packages/api/vitest.unit.config.ts`
+  - Root `package.json` `overrides` block
+  - `patches/pg-protocol@1.13.0.patch`, `patches/pg-cloudflare@1.3.0.patch`
+- CLAUDE.md — monorepo conventions (catalog, path aliases, private package auth)
+
+### Dependabot PRs to process
+`#2121, #2123, #2124, #2125, #2129, #2130, #2132, #2133, #2134, #2135, #2136, #2137, #2138, #2139, #2140, #2141, #2142, #2143` (to apply)
+`#2122, #2126, #2127, #2128, #2144, #2145, #2146, #2147, #2148` (auto-closeable after merge)
+
+### External (deferred — fetch at execution time if needed via context7)
+- `@sentry/react-native` v8 migration guide
+- `eslint` v9 → v10 flat-config notes
+- `react-day-picker` v9 migration guide
+- `lucide-react` v1.0 release notes
diff --git a/docs/plans/2026-04-14-chore-narrow-pr-2170-spike-scope-plan.md b/docs/plans/2026-04-14-chore-narrow-pr-2170-spike-scope-plan.md
new file mode 100644
index 0000000000..12989a3c71
--- /dev/null
+++ b/docs/plans/2026-04-14-chore-narrow-pr-2170-spike-scope-plan.md
@@ -0,0 +1,94 @@
+---
+title: Narrow PR #2170 spike scope — retarget base + relocate stray plan docs
+type: chore
+status: active
+date: 2026-04-14
+---
+
+# Narrow PR #2170 spike scope
+
+## Overview
+
+PR #2170 (`spike/align-test-db-with-prod`) previously targeted `development` while branched off `chore/all-dependabot-updates` (#2118), which made the diff show 116 files / +2530/-1682 — everything in #2118 plus the 3 real spike commits. The base has now been re-pointed to `chore/all-dependabot-updates`, collapsing the diff to **10 files / +1077/-176**. Two stray plan docs remain in the diff; relocating them finishes the job.
+
+## What changed from the original plan
+
+- ~~Rebase onto `development`~~ — **dropped.** The spike genuinely depends on #2118's workerd pin / vitest-pool-workers fixes to run at all (textbook stacked-PR case per Pacheco 2025 / stacking.dev). Changing the PR target from `development` → `chore/all-dependabot-updates` is a one-click fix that achieves the same diff-narrowing without rebase, force-push, or conflict resolution. **Done.**
+- ~~Move `workerd` override from root to `packages/api`~~ — **dropped.** Two reasons: (a) the override originates in #2118 (commit `3fa37830b`), not the spike, so it's not the spike's concern; (b) Bun only honors `overrides`/`resolutions` at the workspace root — nested blocks are silently ignored ([bun/6608](https://github.com/oven-sh/bun/issues/6608), [bun/14774](https://github.com/oven-sh/bun/issues/14774)). The original plan's proposed move would have silently regressed the pin. Leave at root.
+- ~~Cherry-pick `…-finalize-dependabot-consolidation-plan.md` onto #2118~~ — **kept, expanded.** Two plan docs need relocation, not one.
+
+## Remaining problem
+
+The narrowed 10-file diff still contains two plan documents that belong on #2118, not the spike:
+
+- `docs/plans/2026-04-14-chore-finalize-dependabot-consolidation-plan.md` — the plan for #2118 itself.
+- `docs/plans/2026-04-14-feat-finish-elysia-migration-pr-2083-plan.md` — unrelated to both the spike and #2118.
+
+The repo convention (see `2026-03-14-feat-dual-mode-local-and-cloudflare-iceberg-plan.md` already on `development`) is that plan docs live on the branch that enacts their work and accumulate on `development` as durable project memory. Neither doc's natural home is the spike branch.
+
+## Proposed solution
+
+1. **Move `2026-04-14-chore-finalize-dependabot-consolidation-plan.md` onto `chore/all-dependabot-updates`.** It's the plan for that PR.
+2. **Decide where `2026-04-14-feat-finish-elysia-migration-pr-2083-plan.md` belongs** (PR #2083 presumably) and move it there, or to `development` via a trivial PR if #2083 is closed.
+3. **Drop both from the spike branch** via `git rm` + commit, OR let them fall out naturally when #2118 merges them first and the spike rebases on updated #2118.
+
+## Acceptance criteria
+
+- [ ] `gh pr view 2170 --json files --jq '.files[].path'` returns only the 8 spike-surface files (no `docs/plans/*`).
+- [ ] The consolidation plan doc lives on `chore/all-dependabot-updates` (confirmed via `git log chore/all-dependabot-updates -- docs/plans/2026-04-14-chore-finalize-dependabot-consolidation-plan.md`).
+- [ ] The Elysia-migration plan doc has an appropriate home (PR #2083 branch, or `development`).
+- [ ] api-tests CI job produces an interpretable signal on the narrowed spike.
+
+## Implementation steps
+
+```bash
+# From the spike worktree
+cd /Volumes/CrucialX10/andrewbierman/Code/PackRat-2170
+
+# 1. Capture the plan docs
+git show HEAD:docs/plans/2026-04-14-chore-finalize-dependabot-consolidation-plan.md \
+  > /tmp/consolidation-plan.md
+git show HEAD:docs/plans/2026-04-14-feat-finish-elysia-migration-pr-2083-plan.md \
+  > /tmp/elysia-plan.md
+
+# 2. Remove from spike
+git rm docs/plans/2026-04-14-chore-finalize-dependabot-consolidation-plan.md \
+       docs/plans/2026-04-14-feat-finish-elysia-migration-pr-2083-plan.md
+git commit -m "chore: relocate plan docs to their owning branches"
+
+# 3. Add to #2118
+cd ~/Code/PackRat  # already on chore/all-dependabot-updates
+cp /tmp/consolidation-plan.md docs/plans/2026-04-14-chore-finalize-dependabot-consolidation-plan.md
+git add docs/plans/2026-04-14-chore-finalize-dependabot-consolidation-plan.md
+git commit -m "docs: add consolidation plan for #2118"
+
+# 4. Elysia plan — put where #2083 lives, or propose a tiny PR to development
+# (needs confirmation which PR/branch)
+
+# 5. Push. Force-push the spike ONLY with explicit user approval, using:
+#    git push --force-with-lease --force-if-includes origin spike/align-test-db-with-prod
+```
+
+## Out of scope
+
+- **Root `tsconfig.json` rewrite** (inlined Expo preset options). Originates in #2118; belongs on #2118's review, not the spike.
+- **Root `overrides: { workerd }`** placement. Same — #2118's concern, and Bun only honors it at root anyway.
+- **Wider tsconfig refactor** (fixing `packages/api/tsconfig.json`'s missing `lib`/`target`, deleting unused `tsconfig.base.json`). Separate plan.
+
+## Follow-up: prevent recurrence
+
+Root cause of the original contamination was the absence of a rule about where spike branches should branch from. Proposed (separate task, not this plan's scope):
+
+- **Lefthook pre-push check** (`lefthook.yml` exists) that warns when pushing a branch whose merge-base with `origin/development` is not on `development` — unless the branch name starts with `spike/stacked/` or the last commit message contains `Stacked-on: #NNNN`.
+- **CLAUDE.md "Branching" rule**: "Spike branches branch from `development` unless the spike explicitly tests an in-flight PR's hypothesis, in which case it targets that PR's branch and declares `Stacked-on: #NNNN` in the PR description."
+
+## Sources & references
+
+- PR #2170 — https://github.com/PackRat-AI/PackRat/pull/2170 (target now: `chore/all-dependabot-updates`)
+- PR #2118 — https://github.com/PackRat-AI/PackRat/pull/2118
+- `docs/plans/2026-04-14-chore-finalize-dependabot-consolidation-plan.md` — H1–H8 hack inventory, spike frames this PR as Phase 0
+- Bun overrides docs — https://bun.sh/docs/install/overrides (workspace-root-only; nested ignored)
+- bun#6608, bun#14774 — open issues confirming nested override limitation
+- [Pacheco 2025 — stacked PRs on GitHub](https://www.davepacheco.net/blog/2025/stacked-prs-on-github/)
+- [Google eng-practices — small CLs](https://google.github.io/eng-practices/review/developer/small-cls.html)
+- Memory: `feedback_no_force_push.md` — force-push requires explicit user permission
diff --git a/packages/analytics/src/core/entity-resolver.ts b/packages/analytics/src/core/entity-resolver.ts
index b114b5554c..4b0a9c4a50 100644
--- a/packages/analytics/src/core/entity-resolver.ts
+++ b/packages/analytics/src/core/entity-resolver.ts
@@ -96,9 +96,9 @@ function levenshtein(a: string, b: string): number {
     assertDefined(row);
     assertDefined(prevRow);
     for (let j = 1; j <= n; j++) {
-      const diag = prevRow[j - 1];
-      const up = prevRow[j];
-      const left = row[j - 1];
+      const diag: number | undefined = prevRow[j - 1];
+      const up: number | undefined = prevRow[j];
+      const left: number | undefined = row[j - 1];
       assertDefined(diag);
       assertDefined(up);
       assertDefined(left);
diff --git a/packages/analytics/test/core/entity-resolver.test.ts b/packages/analytics/test/core/entity-resolver.test.ts
index 2d78d52e15..2a5cfc96f9 100644
--- a/packages/analytics/test/core/entity-resolver.test.ts
+++ b/packages/analytics/test/core/entity-resolver.test.ts
@@ -35,9 +35,9 @@ function levenshtein(a: string, b: string): number {
     assertDefined(row);
     assertDefined(prevRow);
     for (let j = 1; j <= n; j++) {
-      const diag = prevRow[j - 1];
-      const up = prevRow[j];
-      const left = row[j - 1];
+      const diag: number | undefined = prevRow[j - 1];
+      const up: number | undefined = prevRow[j];
+      const left: number | undefined = row[j - 1];
       assertDefined(diag);
       assertDefined(up);
       assertDefined(left);
diff --git a/packages/api/container_src/server.ts b/packages/api/container_src/server.ts
index 4929486ae5..dd0b156cff 100644
--- a/packages/api/container_src/server.ts
+++ b/packages/api/container_src/server.ts
@@ -330,7 +330,7 @@ async function downloadAndRehostImages(
   const rehostedUrls: string[] = [];
   let failedCount = 0;
 
-  results.forEach((result, index) => {
+  for (const [index, result] of results.entries()) {
     if (result.status === 'fulfilled' && result.value) {
       rehostedUrls.push(result.value);
     } else {
@@ -339,7 +339,7 @@ async function downloadAndRehostImages(
         console.error(`Image ${index + 1} rehosting failed:`, result.reason);
       }
     }
-  });
+  }
 
   const expiresAt = new Date(Date.now() + 5 * 60 * 1000).toISOString();
 
diff --git a/packages/api/package.json b/packages/api/package.json
index 77674ba9e8..6ba94c26ab 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -22,7 +22,7 @@
     "@aws-sdk/s3-request-presigner": "^3.787.0",
     "@cloudflare/containers": "^0.0.30",
     "@hono/sentry": "^1.2.2",
-    "@hono/zod-openapi": "^1.2.4",
+    "@hono/zod-openapi": "1.2.4",
     "@hono/zod-validator": "^0.7.6",
     "@mozilla/readability": "^0.6.0",
     "@neondatabase/serverless": "^1.0.0",
@@ -55,6 +55,7 @@
     "@cloudflare/workers-types": "^4.20250405.0",
     "@types/bun": "latest",
     "@types/pg": "^8.11.15",
+    "@types/ws": "^8.5.14",
     "@vitest/coverage-v8": "~3.1.0",
     "concurrently": "^8.2.2",
     "drizzle-orm": "^0.44.4",
diff --git a/packages/api/src/routes/guides/getCategoriesRoute.ts b/packages/api/src/routes/guides/getCategoriesRoute.ts
index 7f033398ae..4ecf8a7f68 100644
--- a/packages/api/src/routes/guides/getCategoriesRoute.ts
+++ b/packages/api/src/routes/guides/getCategoriesRoute.ts
@@ -46,11 +46,11 @@ export const handler: RouteHandler<typeof routeDefinition> = async (c) => {
     const results = await Promise.all(promises);
 
     // Collect all categories
-    results.forEach((categories) => {
-      categories.forEach((category) => {
+    for (const categories of results) {
+      for (const category of categories) {
         categoriesSet.add(category);
-      });
-    });
+      }
+    }
 
     // Convert set to sorted array
     const categories = Array.from(categoriesSet).sort();
diff --git a/packages/api/src/routes/packTemplates/generateFromOnlineContent.ts b/packages/api/src/routes/packTemplates/generateFromOnlineContent.ts
index 34221b1a4e..3ea968a4ac 100644
--- a/packages/api/src/routes/packTemplates/generateFromOnlineContent.ts
+++ b/packages/api/src/routes/packTemplates/generateFromOnlineContent.ts
@@ -16,17 +16,18 @@ import { assertDefined } from '@packrat/guards';
 import { generateObject } from 'ai';
 import { sql } from 'drizzle-orm';
 import type { Context } from 'hono';
-import { nanoid } from 'nanoid';
 import { fetchTranscript } from 'youtube-transcript';
 import { z } from 'zod';
 
+const URL_QUERY_STRIP_RE = /[?&].*$/;
+
 /**
  * Generate a deterministic content ID from a URL for duplicate detection
  * when the TikTok or YouTube service doesn't provide a content ID
  */
 function generateContentIdFromUrl(url: string): string {
   // Normalize the URL by removing query parameters and converting to lowercase
-  const normalizedUrl = url.toLowerCase().replace(/[?&].*$/, '');
+  const normalizedUrl = url.toLowerCase().replace(URL_QUERY_STRIP_RE, '');
 
   // Create a simple hash for deterministic ID generation
   let hash = 0;
@@ -297,8 +298,10 @@ generateFromOnlineContentRoutes.openapi(generateFromOnlineContentRoute, async (c
     } catch (apiError) {
       console.error('TikTok service call failed:', apiError);
       c.get('sentry').captureException(apiError, {
-        extra: { tiktokUrl: contentUrl, errorType: 'tiktok_service_error' },
-      } as any);
+        captureContext: {
+          extra: { tiktokUrl: contentUrl, errorType: 'tiktok_service_error' },
+        },
+      });
       return c.json(
         {
           error: `Failed to fetch data from TikTok URL: ${apiError instanceof Error ? apiError.message : 'TikTok service unavailable'}`,
@@ -391,11 +394,11 @@ generateFromOnlineContentRoutes.openapi(generateFromOnlineContentRoute, async (c
 
     // Prepare DB records
     const now = new Date();
-    const templateId = `pt_${nanoid()}`;
+    const templateId = `pt_${crypto.randomUUID().replace(/-/g, '')}`;
 
     // Insert the pack template and its items in a single transaction to ensure atomicity
     const { newTemplate, insertedItems } = await db.transaction(async (tx) => {
-      const [createdTemplate] = await tx
+      const templateRows = await tx
         .insert(packTemplates)
         .values({
           id: templateId,
@@ -413,12 +416,14 @@ generateFromOnlineContentRoutes.openapi(generateFromOnlineContentRoute, async (c
           localUpdatedAt: now,
         })
         .returning();
+      const createdTemplate = templateRows[0];
+      if (!createdTemplate) throw new Error('Pack template insert returned no rows');
 
       // Insert template items — prefer catalog match, fall back to detected item data
       const itemRecords = analysis.items.map((detected, index) => {
         const catalogMatches = batchResult.items[index] ?? [];
         const bestMatch = catalogMatches[0];
-        const itemId = `pti_${nanoid()}`;
+        const itemId = `pti_${crypto.randomUUID().replace(/-/g, '')}`;
 
         return {
           id: itemId,
@@ -447,7 +452,16 @@ generateFromOnlineContentRoutes.openapi(generateFromOnlineContentRoute, async (c
       return { newTemplate: createdTemplate, insertedItems: insertedItemsResult };
     });
 
-    return c.json({ ...newTemplate, items: insertedItems }, 201);
+    return c.json(
+      {
+        ...newTemplate,
+        image: newTemplate.image ?? null,
+        contentSource: newTemplate.contentSource ?? null,
+        contentId: newTemplate.contentId ?? null,
+        items: insertedItems,
+      },
+      201,
+    );
   } catch (error) {
     console.error('Error generating pack template:', error);
     c.get('sentry').captureException(error);
diff --git a/packages/api/src/services/__tests__/imageDetectionService.test.ts b/packages/api/src/services/__tests__/imageDetectionService.test.ts
index 727d9932ac..a35d4ccf84 100644
--- a/packages/api/src/services/__tests__/imageDetectionService.test.ts
+++ b/packages/api/src/services/__tests__/imageDetectionService.test.ts
@@ -30,9 +30,9 @@ vi.mock('@packrat/api/utils/ai/models', () => ({
 }));
 
 vi.mock('../catalogService', () => ({
-  CatalogService: vi.fn().mockImplementation(() => ({
-    batchVectorSearch: vi.fn().mockResolvedValue({ items: [] }),
-  })),
+  CatalogService: vi.fn().mockImplementation(function (this: unknown) {
+    return { batchVectorSearch: vi.fn().mockResolvedValue({ items: [] }) };
+  }),
 }));
 
 // ---------------------------------------------------------------------------
@@ -185,9 +185,9 @@ describe('ImageDetectionService', () => {
       const mockBatchVectorSearch = vi.fn().mockResolvedValue({
         items: [[{ id: 1, name: 'Tent', score: 0.9 }]],
       });
-      MockCatalogService.mockImplementation(() => ({
-        batchVectorSearch: mockBatchVectorSearch,
-      }));
+      MockCatalogService.mockImplementation(function (this: unknown) {
+        return { batchVectorSearch: mockBatchVectorSearch };
+      });
 
       mockGenerateObject.mockResolvedValue({
         object: {
@@ -224,9 +224,9 @@ describe('ImageDetectionService', () => {
           [{ id: 2, name: 'Sleeping Bag', score: 0.8 }],
         ],
       });
-      MockCatalogService.mockImplementation(() => ({
-        batchVectorSearch: mockBatchVectorSearch,
-      }));
+      MockCatalogService.mockImplementation(function (this: unknown) {
+        return { batchVectorSearch: mockBatchVectorSearch };
+      });
 
       mockGenerateObject.mockResolvedValue({
         object: {
@@ -282,9 +282,9 @@ describe('ImageDetectionService', () => {
           [], // no matches
         ],
       });
-      MockCatalogService.mockImplementation(() => ({
-        batchVectorSearch: mockBatchVectorSearch,
-      }));
+      MockCatalogService.mockImplementation(function (this: unknown) {
+        return { batchVectorSearch: mockBatchVectorSearch };
+      });
 
       mockGenerateObject.mockResolvedValue({
         object: {
@@ -317,9 +317,9 @@ describe('ImageDetectionService', () => {
       const MockCatalogService = CatalogService as ReturnType<typeof vi.fn>;
 
       const mockBatchVectorSearch = vi.fn().mockRejectedValue(new Error('Catalog unavailable'));
-      MockCatalogService.mockImplementation(() => ({
-        batchVectorSearch: mockBatchVectorSearch,
-      }));
+      MockCatalogService.mockImplementation(function (this: unknown) {
+        return { batchVectorSearch: mockBatchVectorSearch };
+      });
 
       mockGenerateObject.mockResolvedValue({
         object: {
@@ -358,9 +358,9 @@ describe('ImageDetectionService', () => {
       const mockBatchVectorSearch = vi.fn().mockResolvedValue({
         items: [[{ id: 1, name: 'Tent', score: 0.9 }]],
       });
-      MockCatalogService.mockImplementation(() => ({
-        batchVectorSearch: mockBatchVectorSearch,
-      }));
+      MockCatalogService.mockImplementation(function (this: unknown) {
+        return { batchVectorSearch: mockBatchVectorSearch };
+      });
 
       mockGenerateObject.mockResolvedValue({
         object: {
diff --git a/packages/api/src/services/__tests__/packService.test.ts b/packages/api/src/services/__tests__/packService.test.ts
index 3a01169ace..5f33b55d58 100644
--- a/packages/api/src/services/__tests__/packService.test.ts
+++ b/packages/api/src/services/__tests__/packService.test.ts
@@ -35,10 +35,9 @@ const mockVectorSearch = vi.fn().mockResolvedValue({ items: [], totalCount: 0 })
 const mockBatchVectorSearch = vi.fn().mockResolvedValue({ items: [[]] });
 
 vi.mock('@packrat/api/services/catalogService', () => ({
-  CatalogService: vi.fn().mockImplementation(() => ({
-    vectorSearch: mockVectorSearch,
-    batchVectorSearch: mockBatchVectorSearch,
-  })),
+  CatalogService: vi.fn().mockImplementation(function (this: unknown) {
+    return { vectorSearch: mockVectorSearch, batchVectorSearch: mockBatchVectorSearch };
+  }),
 }));
 
 vi.mock('@packrat/api/utils/env-validation', () => ({
diff --git a/packages/api/src/services/aiService.ts b/packages/api/src/services/aiService.ts
index 8ac301b64b..9cd0cb89f7 100644
--- a/packages/api/src/services/aiService.ts
+++ b/packages/api/src/services/aiService.ts
@@ -13,6 +13,8 @@ interface SearchResult {
 const WEB_SEARCH_SYSTEM_PROMPT =
   'You are a helpful research assistant. Provide accurate, up-to-date information with proper citations. Be concise but comprehensive.';
 
+const MDX_EXTENSION_RE = /\.mdx$/;
+
 export class AIService {
   private env: Env;
   private guidesRAG: AutoRAG | null = null;
@@ -88,7 +90,7 @@ export class AIService {
    * @returns
    */
   private filenameToUrl(filename: string): string {
-    const slug = filename.replace(/\.mdx$/, '').trim();
+    const slug = filename.replace(MDX_EXTENSION_RE, '').trim();
     const baseUrl = this.env.PACKRAT_GUIDES_BASE_URL;
     return new URL(`guide/${slug}`, baseUrl).toString();
   }
diff --git a/packages/api/src/services/catalogService.ts b/packages/api/src/services/catalogService.ts
index ce4ac583b1..02fc690b03 100644
--- a/packages/api/src/services/catalogService.ts
+++ b/packages/api/src/services/catalogService.ts
@@ -150,7 +150,7 @@ export class CatalogService {
       };
     }
 
-    const [itemsWithCounts, [{ totalCount }]] = await Promise.all([
+    const [itemsWithCounts, totalCountResult] = await Promise.all([
       this.db
         .select({
           ...getTableColumns(catalogItems),
@@ -160,7 +160,7 @@ export class CatalogService {
         .leftJoin(
           sql`(
             SELECT catalog_item_id, COUNT(*) as count
-            FROM pack_items 
+            FROM pack_items
             WHERE deleted = false
             GROUP BY catalog_item_id
           ) as pack_item_counts`,
@@ -172,6 +172,7 @@ export class CatalogService {
         .offset(offset),
       this.db.select({ totalCount: count() }).from(catalogItems).where(where),
     ]);
+    const totalCount = totalCountResult[0]?.totalCount ?? 0;
 
     const items = itemsWithCounts.map(({ pack_item_count, ...item }) => item);
 
@@ -228,7 +229,7 @@ export class CatalogService {
 
     const { embedding: _embedding, ...columnsToSelect } = getTableColumns(catalogItems);
 
-    const [items, [{ totalCount }]] = await Promise.all([
+    const [items, vectorTotalCountResult] = await Promise.all([
       this.db
         .select({
           ...columnsToSelect,
@@ -246,6 +247,7 @@ export class CatalogService {
         .from(catalogItems)
         .where(gt(similarity, 0.1)),
     ]);
+    const totalCount = vectorTotalCountResult[0]?.totalCount ?? 0;
 
     return {
       items,
@@ -402,12 +404,12 @@ export class CatalogService {
     const BATCH_SIZE = 100;
 
     // Get count of items without embeddings
-    const [{ totalCount }] = await this.db
+    const queueTotalCountResult = await this.db
       .select({ totalCount: count() })
       .from(catalogItems)
       .where(isNull(catalogItems.embedding));
 
-    const total = Number(totalCount);
+    const total = Number(queueTotalCountResult[0]?.totalCount ?? 0);
     console.log(`Queuing ${total} items for embeddings`);
 
     if (total === 0) {
@@ -471,10 +473,13 @@ export class CatalogService {
 
       // Update items with embeddings
       for (let i = 0; i < itemsToEmbed.length; i++) {
+        const item = itemsToEmbed[i];
+        const embedding = embeddings[i];
+        if (!item || embedding === undefined) continue;
         await this.db
           .update(catalogItems)
-          .set({ embedding: embeddings[i], updatedAt: new Date() })
-          .where(eq(catalogItems.id, itemsToEmbed[i].id));
+          .set({ embedding, updatedAt: new Date() })
+          .where(eq(catalogItems.id, item.id));
       }
 
       console.log(`Completed batch: ${itemsToEmbed.length} embeddings generated`);
diff --git a/packages/api/src/utils/auth.ts b/packages/api/src/utils/auth.ts
index 0c10494a94..19a0b202fd 100644
--- a/packages/api/src/utils/auth.ts
+++ b/packages/api/src/utils/auth.ts
@@ -5,6 +5,11 @@ import type { Context } from 'hono';
 import { sign, verify } from 'hono/jwt';
 import type { JWTPayload } from 'hono/utils/jwt/types';
 
+const UPPERCASE_RE = /[A-Z]/;
+const LOWERCASE_RE = /[a-z]/;
+const DIGIT_RE = /[0-9]/;
+const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+
 // Generate a random token
 export function generateToken(length = 32): string {
   return randomBytes(length).toString('hex');
@@ -77,21 +82,21 @@ export function validatePassword(password: string): {
     };
   }
 
-  if (!/[A-Z]/.test(password)) {
+  if (!UPPERCASE_RE.test(password)) {
     return {
       valid: false,
       message: 'Password must contain at least one uppercase letter',
     };
   }
 
-  if (!/[a-z]/.test(password)) {
+  if (!LOWERCASE_RE.test(password)) {
     return {
       valid: false,
       message: 'Password must contain at least one lowercase letter',
     };
   }
 
-  if (!/[0-9]/.test(password)) {
+  if (!DIGIT_RE.test(password)) {
     return {
       valid: false,
       message: 'Password must contain at least one number',
@@ -103,8 +108,7 @@ export function validatePassword(password: string): {
 
 // Validate email format
 export function validateEmail(email: string): boolean {
-  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-  return emailRegex.test(email);
+  return EMAIL_RE.test(email);
 }
 
 // Validate API key
diff --git a/packages/api/src/utils/compute-pack.ts b/packages/api/src/utils/compute-pack.ts
index d9abc257d0..8020bee2ff 100644
--- a/packages/api/src/utils/compute-pack.ts
+++ b/packages/api/src/utils/compute-pack.ts
@@ -49,7 +49,7 @@ export const computePackWeights = (
   let totalWeightGrams = 0;
 
   // Calculate weights based on items
-  pack.items.forEach((item) => {
+  for (const item of pack.items) {
     // Convert item weight to grams for calculation
     const itemWeightInGrams =
       convertToGrams(item.weight, item.weightUnit as WeightUnit) * item.quantity;
@@ -61,7 +61,7 @@ export const computePackWeights = (
     if (!item.consumable && !item.worn) {
       baseWeightGrams += itemWeightInGrams;
     }
-  });
+  }
 
   // Convert back to preferred unit
   const baseWeight = convertFromGrams(baseWeightGrams, preferredUnit);
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5c7ba2f1cb..778325a622 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -8,6 +8,7 @@
     "packrat": "bun run src/index.ts"
   },
   "dependencies": {
+    "@duckdb/node-api": "1.5.0-r.1",
     "@packrat/analytics": "workspace:*",
     "chalk": "catalog:",
     "citty": "^0.2.1",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index dfc0e08f04..3ccf0fca48 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -3,6 +3,6 @@
   "version": "2.0.18",
   "private": true,
   "dependencies": {
-    "@packrat-ai/nativewindui": "^2.0.1-alpha.0"
+    "@packrat-ai/nativewindui": "^2.0.2"
   }
 }
diff --git a/packages/web-ui/package.json b/packages/web-ui/package.json
index 1d7ad098da..d5055aa056 100644
--- a/packages/web-ui/package.json
+++ b/packages/web-ui/package.json
@@ -17,11 +17,47 @@
     "check-types": "tsc --noEmit"
   },
   "dependencies": {
+    "@radix-ui/react-accordion": "catalog:",
+    "@radix-ui/react-alert-dialog": "catalog:",
+    "@radix-ui/react-aspect-ratio": "catalog:",
+    "@radix-ui/react-avatar": "catalog:",
+    "@radix-ui/react-checkbox": "catalog:",
+    "@radix-ui/react-collapsible": "catalog:",
+    "@radix-ui/react-context-menu": "catalog:",
+    "@radix-ui/react-dialog": "catalog:",
+    "@radix-ui/react-dropdown-menu": "catalog:",
+    "@radix-ui/react-hover-card": "catalog:",
+    "@radix-ui/react-label": "catalog:",
+    "@radix-ui/react-menubar": "catalog:",
+    "@radix-ui/react-navigation-menu": "catalog:",
+    "@radix-ui/react-popover": "catalog:",
+    "@radix-ui/react-progress": "catalog:",
+    "@radix-ui/react-radio-group": "catalog:",
+    "@radix-ui/react-scroll-area": "catalog:",
+    "@radix-ui/react-select": "catalog:",
+    "@radix-ui/react-separator": "catalog:",
+    "@radix-ui/react-slider": "catalog:",
     "@radix-ui/react-slot": "catalog:",
+    "@radix-ui/react-switch": "catalog:",
+    "@radix-ui/react-tabs": "catalog:",
+    "@radix-ui/react-toast": "catalog:",
+    "@radix-ui/react-toggle": "catalog:",
+    "@radix-ui/react-toggle-group": "catalog:",
+    "@radix-ui/react-tooltip": "catalog:",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
+    "cmdk": "1.0.4",
+    "embla-carousel-react": "8.5.1",
+    "input-otp": "1.4.1",
+    "lucide-react": "^0.454.0",
+    "next-themes": "^0.4.6",
+    "react-day-picker": "8.10.1",
+    "react-hook-form": "^7.58.1",
+    "react-resizable-panels": "^2.1.9",
+    "sonner": "^1.7.4",
     "tailwind-merge": "^2.5.5",
-    "tailwindcss-animate": "^1.0.7"
+    "tailwindcss-animate": "^1.0.7",
+    "vaul": "^1.1.2"
   },
   "devDependencies": {
     "@types/react": "~19.1.10",
diff --git a/packages/web-ui/src/components/sheet.tsx b/packages/web-ui/src/components/sheet.tsx
index 40cfb42f2f..734edc93d8 100644
--- a/packages/web-ui/src/components/sheet.tsx
+++ b/packages/web-ui/src/components/sheet.tsx
@@ -50,7 +50,9 @@ const sheetVariants = cva(
 
 interface SheetContentProps
   extends React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
-    VariantProps<typeof sheetVariants> {}
+    VariantProps<typeof sheetVariants> {
+  children?: React.ReactNode;
+}
 
 const SheetContent = React.forwardRef<
   React.ElementRef<typeof SheetPrimitive.Content>,
diff --git a/packages/web-ui/src/hooks/use-toast.ts b/packages/web-ui/src/hooks/use-toast.ts
index 44a22ac606..24943f6c73 100644
--- a/packages/web-ui/src/hooks/use-toast.ts
+++ b/packages/web-ui/src/hooks/use-toast.ts
@@ -92,9 +92,9 @@ export const reducer = (state: State, action: Action): State => {
       if (toastId) {
         addToRemoveQueue(toastId);
       } else {
-        state.toasts.forEach((toast) => {
+        for (const toast of state.toasts) {
           addToRemoveQueue(toast.id);
-        });
+        }
       }
 
       return {
@@ -129,9 +129,9 @@ let memoryState: State = { toasts: [] };
 
 function dispatch(action: Action) {
   memoryState = reducer(memoryState, action);
-  listeners.forEach((listener) => {
+  for (const listener of listeners) {
     listener(memoryState);
-  });
+  }
 }
 
 type Toast = Omit<ToasterToast, 'id'>;